From fb48d6c4cc9c3b3a891b0e1be8d6d066719b7545 Mon Sep 17 00:00:00 2001 From: brentru Date: Tue, 23 Jul 2019 17:32:13 -0400 Subject: [PATCH 1/3] patch compatibility with PyPortal, conditionally import cursor or touchscreen --- adafruit_pyoa.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/adafruit_pyoa.py b/adafruit_pyoa.py index f3d967e..1fb5b05 100644 --- a/adafruit_pyoa.py +++ b/adafruit_pyoa.py @@ -50,9 +50,15 @@ import board from digitalio import DigitalInOut import displayio -import adafruit_touchscreen -from adafruit_cursorcontrol.cursorcontrol import Cursor -from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager +try: + import adafruit_touchscreen +except ImportError: + pass +try: + from adafruit_cursorcontrol.cursorcontrol import Cursor + from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager +except ImportError: + pass import audioio from adafruit_display_text.label import Label from adafruit_button import Button From 8dd56411b0f2bd86a501699dc21bd5c818dc71eb Mon Sep 17 00:00:00 2001 From: brentru Date: Tue, 23 Jul 2019 17:38:39 -0400 Subject: [PATCH 2/3] set a mouse_cursor attribute, check attribute before hiding --- adafruit_pyoa.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/adafruit_pyoa.py b/adafruit_pyoa.py index 1fb5b05..82469ee 100644 --- a/adafruit_pyoa.py +++ b/adafruit_pyoa.py @@ -96,6 +96,7 @@ def __init__(self): self.backlight_fade(0) board.DISPLAY.show(self.root_group) self.touchscreen = None + self.mouse_cursor = None if hasattr(board, 'TOUCH_XL'): self.touchscreen = adafruit_touchscreen.Touchscreen(board.TOUCH_XL, board.TOUCH_XR, board.TOUCH_YD, board.TOUCH_YU, @@ -158,14 +159,16 @@ def load_game(self, game_directory): def _fade_to_black(self): """Turn down the lights.""" - self.mouse_cursor.is_hidden = True + if self.mouse_cursor: + self.mouse_cursor.is_hidden = True self.backlight_fade(0) # turn off background so we can render the text self.set_background(None, with_fade=False) self.set_text(None, None) for _ in range(len(self._button_group)): self._button_group.pop() - self.mouse_cursor.is_hidden = False + if self.mouse_cursor: + self.mouse_cursor.is_hidden = False def _display_buttons(self, card): """Display the buttons of a card. From 6686f5d845104284c0f7fd651da7b868eb3dedab Mon Sep 17 00:00:00 2001 From: brentru Date: Wed, 24 Jul 2019 12:25:28 -0400 Subject: [PATCH 3/3] import, dont try --- adafruit_pyoa.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/adafruit_pyoa.py b/adafruit_pyoa.py index 82469ee..a97c24e 100644 --- a/adafruit_pyoa.py +++ b/adafruit_pyoa.py @@ -50,15 +50,9 @@ import board from digitalio import DigitalInOut import displayio -try: - import adafruit_touchscreen -except ImportError: - pass -try: - from adafruit_cursorcontrol.cursorcontrol import Cursor - from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager -except ImportError: - pass +import adafruit_touchscreen +from adafruit_cursorcontrol.cursorcontrol import Cursor +from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager import audioio from adafruit_display_text.label import Label from adafruit_button import Button