FruitJam PyPaint: Add support for Composite HID devices

Author: RetiredWizard

Fruit_Jam/Fruit_Jam_PyPaint/code.py

@@ -17,13 +17,17 @@
 """
 
 import gc
+import sys
 import time
 import supervisor
+import atexit
 import board
 import displayio
+import terminalio
+from adafruit_display_text import label
 
 try:
-    from adafruit_usb_host_mouse import find_and_init_boot_mouse
+    from adafruit_usb_host_mouse import find_and_init_boot_mouse, find_and_init_report_mouse
     usb_available = True
 except ImportError:
     usb_available = False
@@ -208,13 +212,16 @@ def __init__(self, splash, cursor_bmp, screen_width, screen_height, sensitivity=
     def find_mouse(self): # pylint: disable=too-many-statements, too-many-locals
         """Find and initialize the USB mouse."""
         self.mouse = find_and_init_boot_mouse()
+        if self.mouse is None:
+            self.mouse = find_and_init_report_mouse()
+            self.sensitivity = 1
         if self.mouse is None:
             print("No mouse found.")
             return False
 
         # Change the mouse resolution so it's not too sensitive
         self.mouse.display_size = (supervisor.runtime.display.width*self.sensitivity,
-                                  supervisor.runtime.display.height*self.sensitivity)
+            (supervisor.runtime.display.height - terminalio.FONT.get_bounding_box()[1])*self.sensitivity)
         return True
 
     def poll(self):
@@ -324,12 +331,24 @@ def _cursor_bitmap_3():
 
         self._display = display
         self._w = self._display.width
-        self._h = self._display.height
+        self._h = self._display.height - terminalio.FONT.get_bounding_box()[1]
         self._x = self._w // 2
         self._y = self._h // 2
 
         self._splash = displayio.Group()
 
+        self._info_label = label.Label(
+            terminalio.FONT,
+            text = "Right Click->Palette:Exit  Right Click->Canvas:Fill"[:self._w],
+            color = 0xFFFFFF,
+            x = 0,
+            y = self._h
+        )
+        self._info_label.anchor_point = (0.0, 1.0)
+        self._info_label.anchored_position = (2, display.height - 2)
+
+        self._splash.append(self._info_label)
+
         self._bg_bitmap = displayio.Bitmap(self._w, self._h, 1)
         self._bg_palette = displayio.Palette(1)
         self._bg_palette[0] = Color.BLACK
@@ -386,7 +405,7 @@ def _cursor_bitmap_3():
             if not self._poller.mouse:
                 raise RuntimeError("No mouse found. Please connect a USB mouse.")
         else:
-            raise AttributeError("PyPaint requires a touchscreen or cursor.")
+            raise AttributeError("PyPaint requires a mouse, touchscreen or cursor.")
 
         self._a_pressed = False
         self._last_a_pressed = False
@@ -603,6 +622,8 @@ def _handle_b_release(self, location):
         if location[0] >= self._w // 10:  # not in color picker
             self._fill(location[0], location[1], self._pencolor)
             self._poller.poke()
+        else:
+            supervisor.reload()
 
     @property
     def _was_a_just_pressed(self):
@@ -646,6 +667,23 @@ def run(self):
                 self._handle_motion(self._last_location, self._location)
             time.sleep(0.1)
 
-
 painter = Paint()
+
+def atexit_callback():
+    """
+    re-attach USB devices to kernel if needed.
+    :return:
+    """
+    print("inside atexit callback")
+    if type(painter._poller) == MousePoller:
+        mouse = painter._poller.mouse
+        if mouse.was_attached and not mouse.device.is_kernel_driver_active(0):
+            mouse.device.attach_kernel_driver(0)
+            # The keyboard buffer seems to have data left over from when it was detached
+            # This clears it before the next process starts
+            while supervisor.runtime.serial_bytes_available:
+                sys.stdin.read(1)
+
+atexit.register(atexit_callback)
+
 painter.run()