Skip to content

Automatically configure display size based on CIRCUITPY_DISPLAY_WIDTH #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 12, 2025
Merged

Automatically configure display size based on CIRCUITPY_DISPLAY_WIDTH #9

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5b3367
Automatically configure display size based on `CIRCUITPY_DISPLAY_WIDTH`
relic-se Aug 12, 2025
bfc6140
Optimize display height assignment
relic-se Aug 12, 2025
3cd3c6e
Fix formatting
relic-se Aug 12, 2025
6224c65
Update `request_display_config` docstring
relic-se Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions adafruit_fruitjam/peripherals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
}


def request_display_config(width, height, color_depth=None):
def request_display_config(width=None, height=None, color_depth=None):
"""
Request a display size configuration. If the display is un-initialized,
or is currently using a different configuration it will be initialized
Expand All @@ -72,9 +72,20 @@ def request_display_config(width, height, color_depth=None):
is 16.
:return: None
"""
if (width, height) not in VALID_DISPLAY_SIZES:
# if user does not specify width, use default configuration
if width is None and (width := os.getenv("CIRCUITPY_DISPLAY_WIDTH")) is None:
raise ValueError("No CIRCUITPY_DISPLAY_WIDTH specified in settings.toml.")

# check that we have a valid display size
if (height is not None and (width, height) not in VALID_DISPLAY_SIZES) or (
height is None and width not in [size[0] for size in VALID_DISPLAY_SIZES]
):
raise ValueError(f"Invalid display size. Must be one of: {VALID_DISPLAY_SIZES}")

# if user does not specify height, use matching height
if height is None:
height = next((h for w, h in VALID_DISPLAY_SIZES if width == w))

# if user does not specify a requested color_depth
if color_depth is None:
# use the maximum color depth for given width
Expand Down Expand Up @@ -202,7 +213,7 @@ def any_button_pressed(self) -> bool:
"""
Return whether any button is pressed
"""
return True in [button.value for (i, button) in enumerate(self._buttons)]
return True in [not button.value for (i, button) in enumerate(self._buttons)]

@property
def dac(self):
Expand Down