Fixed touchscreen issue, moved stuff around

Author: makermelissa

adafruit_pyportal/__init__.py

@@ -27,8 +27,6 @@
 import gc
 import time
 import board
-import busio
-import pulseio
 import terminalio
 import supervisor
 from adafruit_portalbase import PortalBase
@@ -143,7 +141,7 @@ def __init__(
         if external_spi:  # If SPI Object Passed
             spi = external_spi
         else:  # Else: Make ESP32 connection
-            spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
+            spi = board.SPI()
 
         if image_json_path or image_url_path:
             if debug:
@@ -184,20 +182,17 @@ def __init__(
             debug=debug,
         )
 
-        self.peripherals = Peripherals(spi, debug=debug)
+        self.peripherals = Peripherals(spi, display=self.display, debug=debug)
+        self.set_backlight = self.peripherals.set_backlight
+        self.sd_check = self.peripherals.sd_check
+        self.play_file = self.peripherals.play_file
 
-        try:
-            if hasattr(board, "TFT_BACKLIGHT"):
-                self._backlight = pulseio.PWMOut(
-                    board.TFT_BACKLIGHT
-                )  # pylint: disable=no-member
-            elif hasattr(board, "TFT_LITE"):
-                self._backlight = pulseio.PWMOut(
-                    board.TFT_LITE
-                )  # pylint: disable=no-member
-        except ValueError:
-            self._backlight = None
-        self.set_backlight(1.0)  # turn on backlight
+        if hasattr(self.peripherals, "touchscreen"):
+            self.touchscreen = self.peripherals.touchscreen
+        if hasattr(self.peripherals, "mouse_cursor"):
+            self.mouse_cursor = self.peripherals.mouse_cursor
+        if hasattr(self.peripherals, "cursor"):
+            self.cursor = self.peripherals.cursor
 
         # show thank you and bootup file if available
         for bootscreen in ("/thankyou.bmp", "/pyportal_startup.bmp"):
@@ -293,34 +288,6 @@ def set_caption(self, caption_text, caption_position, caption_color):
         )
         self.set_text(caption_text, index)
 
-    def play_file(self, file_name, wait_to_finish=True):
-        """Play a wav file.
-
-        :param str file_name: The name of the wav file to play on the speaker.
-
-        """
-        self.peripherals.play_file(file_name, wait_to_finish)
-
-    def set_backlight(self, val):
-        """Adjust the TFT backlight.
-
-        :param val: The backlight brightness. Use a value between ``0`` and ``1``, where ``0`` is
-                    off, and ``1`` is 100% brightness.
-
-        """
-        val = max(0, min(1.0, val))
-        if self._backlight:
-            self._backlight.duty_cycle = int(val * 65535)
-        else:
-            self.display.auto_brightness = False
-            self.display.brightness = val
-
-    def sd_check(self):
-        """Returns True if there is an SD card preset and False
-        if there is no SD card.
-        """
-        return self.peripherals.sd_check()
-
     def image_converter_url(self, image_url, width, height, color_depth=16):
         """Generate a converted image url from the url passed in,
         with the given width and height. aio_username and aio_key must be

adafruit_pyportal/peripherals.py

@@ -24,8 +24,10 @@
 
 """
 
+import gc
 import board
 from digitalio import DigitalInOut
+import pulseio
 import audioio
 import audiocore
 import storage
@@ -47,11 +49,13 @@ class Peripherals:
     """Peripherals Helper Class for the PyPortal Library"""
 
     # pylint: disable=too-many-instance-attributes, too-many-locals, too-many-branches, too-many-statements
-    def __init__(self, spi, debug=False):
+    def __init__(self, spi, display, debug=False):
         # Speaker Enable
         self._speaker_enable = DigitalInOut(board.SPEAKER_ENABLE)
         self._speaker_enable.switch_to_output(False)
 
+        self._display = display
+
         if hasattr(board, "AUDIO_OUT"):
             self.audio = audioio.AudioOut(board.AUDIO_OUT)
         elif hasattr(board, "SPEAKER"):
@@ -73,6 +77,68 @@ def __init__(self, spi, debug=False):
         except OSError as error:
             print("No SD card found:", error)
 
+        try:
+            if hasattr(board, "TFT_BACKLIGHT"):
+                self._backlight = pulseio.PWMOut(
+                    board.TFT_BACKLIGHT
+                )  # pylint: disable=no-member
+            elif hasattr(board, "TFT_LITE"):
+                self._backlight = pulseio.PWMOut(
+                    board.TFT_LITE
+                )  # pylint: disable=no-member
+        except ValueError:
+            self._backlight = None
+        self.set_backlight(1.0)  # turn on backlight
+
+        if hasattr(board, "TOUCH_XL"):
+            import adafruit_touchscreen
+
+            if debug:
+                print("Init touchscreen")
+            # pylint: disable=no-member
+            self.touchscreen = adafruit_touchscreen.Touchscreen(
+                board.TOUCH_XL,
+                board.TOUCH_XR,
+                board.TOUCH_YD,
+                board.TOUCH_YU,
+                calibration=((5200, 59000), (5800, 57000)),
+                size=(board.DISPLAY.width, board.DISPLAY.height),
+            )
+            # pylint: enable=no-member
+
+            self.set_backlight(1.0)  # turn on backlight
+        elif hasattr(board, "BUTTON_CLOCK"):
+            from adafruit_cursorcontrol.cursorcontrol import Cursor
+            from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager
+
+            if debug:
+                print("Init cursor")
+            self.mouse_cursor = Cursor(
+                board.DISPLAY, display_group=self.splash, cursor_speed=8
+            )
+            self.mouse_cursor.hide()
+            self.cursor = CursorManager(self.mouse_cursor)
+        else:
+            raise AttributeError(
+                "PyPortal module requires either a touchscreen or gamepad."
+            )
+
+        gc.collect()
+
+    def set_backlight(self, val):
+        """Adjust the TFT backlight.
+
+        :param val: The backlight brightness. Use a value between ``0`` and ``1``, where ``0`` is
+                    off, and ``1`` is 100% brightness.
+
+        """
+        val = max(0, min(1.0, val))
+        if self._backlight:
+            self._backlight.duty_cycle = int(val * 65535)
+        else:
+            self._display.auto_brightness = False
+            self._display.brightness = val
+
     def play_file(self, file_name, wait_to_finish=True):
         """Play a wav file.