From 6015a6ab60af3bf1ac721267df0f7f6a6d3646d1 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Fri, 3 Nov 2023 10:30:22 -0500 Subject: [PATCH 1/4] Update to use root_group for CP 9 compatibility --- examples/clue_ams_remote_advanced.py | 2 +- examples/clue_ble_color_patchwork.py | 2 +- examples/clue_spirit_level.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/clue_ams_remote_advanced.py b/examples/clue_ams_remote_advanced.py index 1f2b002..1b21ac8 100644 --- a/examples/clue_ams_remote_advanced.py +++ b/examples/clue_ams_remote_advanced.py @@ -84,7 +84,7 @@ volume_inner = Rect(15, 170, 1, 20, fill=0xFFFFFF, outline=0xFFFFFF) group.append(volume_inner) -display.show(group) +display.root_group = group time.sleep(0.01) width1 = 1 diff --git a/examples/clue_ble_color_patchwork.py b/examples/clue_ble_color_patchwork.py index bd73e0f..4b8a561 100644 --- a/examples/clue_ble_color_patchwork.py +++ b/examples/clue_ble_color_patchwork.py @@ -207,7 +207,7 @@ def change_advertisement(color): group.append(patchwork_group) # Add the Group to the Display -display.show(group) +display.root_group = group cur_color = 0 diff --git a/examples/clue_spirit_level.py b/examples/clue_spirit_level.py index ed36a70..02d075e 100755 --- a/examples/clue_spirit_level.py +++ b/examples/clue_spirit_level.py @@ -23,7 +23,7 @@ bubble_group.append(level_bubble) clue_group.append(bubble_group) -display.show(clue_group) +display.root_group = clue_group while True: x, y, _ = clue.acceleration From ef36b5600d95fb0ebfab0c892187328174a7d3b8 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 8 Jan 2024 14:57:31 -0600 Subject: [PATCH 2/4] update simpletext display inner class for root_group displayio API 9.x --- adafruit_clue.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/adafruit_clue.py b/adafruit_clue.py index 1628233..85d4bbf 100644 --- a/adafruit_clue.py +++ b/adafruit_clue.py @@ -59,6 +59,7 @@ import audiopwmio import audiocore import touchio +from displayio import CIRCUITPYTHON_TERMINAL __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_CLUE.git" @@ -150,11 +151,11 @@ def add_text_line(self, color: Union[int, Tuple[int, int, int]] = 0xFFFFFF): def show(self): """Call show() to display the data list.""" - self._display.show(self.text_group) + self._display.root_group = self.text_group def show_terminal(self): """Revert to terminalio screen.""" - self._display.show(None) + self._display.root_group = CIRCUITPYTHON_TERMINAL class Clue: # pylint: disable=too-many-instance-attributes, too-many-public-methods From be1c565d5e10d96c0302d548a105c6c00959d10c Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 8 Jan 2024 15:04:57 -0600 Subject: [PATCH 3/4] change import for sphinx --- adafruit_clue.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_clue.py b/adafruit_clue.py index 85d4bbf..84d6a05 100644 --- a/adafruit_clue.py +++ b/adafruit_clue.py @@ -59,7 +59,7 @@ import audiopwmio import audiocore import touchio -from displayio import CIRCUITPYTHON_TERMINAL +import displayio __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_CLUE.git" @@ -155,7 +155,7 @@ def show(self): def show_terminal(self): """Revert to terminalio screen.""" - self._display.root_group = CIRCUITPYTHON_TERMINAL + self._display.root_group = displayio.CIRCUITPYTHON_TERMINAL class Clue: # pylint: disable=too-many-instance-attributes, too-many-public-methods From 31ad24fc1382063ff71502da3ed415de78781da6 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 8 Jan 2024 15:24:03 -0600 Subject: [PATCH 4/4] remove constructor import displayio --- adafruit_clue.py | 1 - 1 file changed, 1 deletion(-) diff --git a/adafruit_clue.py b/adafruit_clue.py index 84d6a05..1c6ad8d 100644 --- a/adafruit_clue.py +++ b/adafruit_clue.py @@ -78,7 +78,6 @@ def __init__( # pylint: disable=too-many-arguments colors: Optional[Tuple[Tuple[int, int, int], ...]] = None, ): # pylint: disable=import-outside-toplevel - import displayio import terminalio from adafruit_display_text import label