adafruit-mirror/Adafruit_CircuitPython_FruitJam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automatically configure display size based on CIRCUITPY_DISPLAY_WIDTH

Browse source
This commit is contained in:
Cooper Dalrymple 2025-08-12 13:50:01 -05:00
parent 17d3868ed6
commit f5b3367c2b
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
adafruit_fruitjam/peripherals.py
View file

@ -55,7 +55,7 @@ COLOR_DEPTH_LUT = {
}
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
@ -72,8 +72,22 @@ 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:
for size in VALID_DISPLAY_SIZES:
if width == size[0]:
height = size[1]
# if user does not specify a requested color_depth
if color_depth is None:
@ -202,7 +216,7 @@ class Peripherals:
"""
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):