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

Merge pull request #9 from relic-se/request_display_config-default
Some checks failed
Build CI / test (push) Has been cancelled
Details

Browse source 
Automatically configure display size based on `CIRCUITPY_DISPLAY_WIDTH`
This commit is contained in:
foamyguy 2025-08-12 15:42:27 -05:00 committed by GitHub
commit 9175c448f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
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, Request a display size configuration. If the display is un-initialized,
or is currently using a different configuration it will be initialized or is currently using a different configuration it will be initialized
@ -63,8 +63,11 @@ def request_display_config(width, height, color_depth=None):
This function will set the initialized display to ``supervisor.runtime.display`` This function will set the initialized display to ``supervisor.runtime.display``
:param width: The width of the display in pixels. :param width: The width of the display in pixels. Leave unspecified to default
:param height: The height of the display in pixels. to the ``CIRCUITPY_DISPLAY_WIDTH`` environmental variable if provided. Otherwise,
a ``ValueError`` exception will be thrown.
:param height: The height of the display in pixels. Leave unspecified to default
to the appropriate height for the provided width.
:param color_depth: The color depth of the display in bits. :param color_depth: The color depth of the display in bits.
Valid values are 1, 2, 4, 8, 16, 32. Larger resolutions must use Valid values are 1, 2, 4, 8, 16, 32. Larger resolutions must use
smaller color_depths due to RAM limitations. Default color_depth for smaller color_depths due to RAM limitations. Default color_depth for
@ -72,9 +75,20 @@ def request_display_config(width, height, color_depth=None):
is 16. is 16.
:return: None :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}") 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 user does not specify a requested color_depth
if color_depth is None: if color_depth is None:
# use the maximum color depth for given width # use the maximum color depth for given width