Merge pull request #3164 from RetiredWizard/fruitmatch3

Fruitjam Match3: Improve mouse compatibility

Author: FoamyGuy

Metro/Metro_RP2350_Match3/match3_game/code.py

@@ -26,12 +26,22 @@
 import adafruit_sdcard
 import msgpack
 import storage
-from match3_game_helpers import (
-    Match3Game,
-    STATE_GAMEOVER,
-    STATE_PLAYING_SETCALLED,
-    GameOverException,
-)
+try:
+    from match3_game_helpers import (
+        Match3Game,
+        STATE_GAMEOVER,
+        STATE_PLAYING_SETCALLED,
+        GameOverException,
+    )
+except ImportError:
+    # Needed for Fruit Jam OS if "Play again" is selected at end of game
+    os.chdir('/apps/Metro_RP2350_Match3')
+    from match3_game_helpers import (
+        Match3Game,
+        STATE_GAMEOVER,
+        STATE_PLAYING_SETCALLED,
+        GameOverException,
+    )
 
 original_autoreload_val = supervisor.runtime.autoreload
 supervisor.runtime.autoreload = False
@@ -244,34 +254,40 @@
 mouse_bufs = []
 # debouncers list for debouncing mouse left clicks
 mouse_debouncers = []
+mouse_sync = []
 
 # scan for connected USB devices
 for device in usb.core.find(find_all=True):
     # check if current device is has a boot mouse endpoint
-    mouse_interface_index, mouse_endpoint_address = (
-        adafruit_usb_host_descriptors.find_boot_mouse_endpoint(device)
-    )
-    if mouse_interface_index is not None and mouse_endpoint_address is not None:
-        # if it does have a boot mouse endpoint then add information to the
-        # usb info lists
-        mouse_interface_indexes.append(mouse_interface_index)
-        mouse_endpoint_addresses.append(mouse_endpoint_address)
-
-        # add the mouse device instance to list
-        mice.append(device)
-        print(
-            f"mouse interface: {mouse_interface_index} "
-            + f"endpoint_address: {hex(mouse_endpoint_address)}"
+    try:
+        mouse_interface_index, mouse_endpoint_address = (
+            adafruit_usb_host_descriptors.find_boot_mouse_endpoint(device)
         )
+        if mouse_interface_index is not None and mouse_endpoint_address is not None:
+            # if it does have a boot mouse endpoint then add information to the
+            # usb info lists
+            mouse_interface_indexes.append(mouse_interface_index)
+            mouse_endpoint_addresses.append(mouse_endpoint_address)
+
+            # add the mouse device instance to list
+            mice.append(device)
+            print(
+                f"mouse interface: {mouse_interface_index} "
+                + f"endpoint_address: {hex(mouse_endpoint_address)}"
+            )
+            mouse_sync.append(0)
 
-        # detach kernel driver if needed
-        kernel_driver_active_flags.append(device.is_kernel_driver_active(0))
-        if device.is_kernel_driver_active(0):
-            device.detach_kernel_driver(0)
+            # detach kernel driver if needed
+            kernel_driver_active_flags.append(device.is_kernel_driver_active(0))
+            if device.is_kernel_driver_active(0):
+                device.detach_kernel_driver(0)
 
-        # set the mouse configuration so it can be used
-        device.set_configuration()
+            # set the mouse configuration so it can be used
+            device.set_configuration()
 
+    except usb.core.USBError as e:
+        # The mouse might have glitched and may not be detected but at least we don't crash
+        print(e)
 
 def is_mouse1_left_clicked():
     """
@@ -332,23 +348,27 @@ def is_right_mouse_clicked(buf):
 winner = None
 
 
-def get_mouse_deltas(buffer, read_count):
+def get_mouse_deltas(buffer, read_count, sync):
     """
     Given a mouse packet buffer and a read count of number of bytes read,
     return the delta x and y values of the mouse.
     :param buffer: the buffer containing the packet data
     :param read_count: the number of bytes read from the mouse
     :return: tuple containing x and y delta values
     """
-    if read_count == 4:
+    if read_count == 4 or (read_count == 8 and sync > 50):
         delta_x = buffer[1]
         delta_y = buffer[2]
     elif read_count == 8:
         delta_x = buffer[2]
         delta_y = buffer[4]
+        if delta_y != 0:
+            sync = -999
+        elif delta_y == 0 and sync > -1:
+            sync += 1
     else:
         raise ValueError(f"Unsupported mouse packet size: {read_count}, must be 4 or 8")
-    return delta_x, delta_y
+    return delta_x, delta_y, sync
 
 
 def atexit_callback():
@@ -381,10 +401,12 @@ def atexit_callback():
         try:
             # read data from the mouse, small timeout so we move on
             # quickly if there is no data
+            data_len = 0
             data_len = mouse.read(
-                mouse_endpoint_addresses[i], mouse_bufs[i], timeout=10
+                mouse_endpoint_addresses[i], mouse_bufs[i], timeout=20
             )
-            mouse_deltas = get_mouse_deltas(mouse_bufs[i], data_len)
+            mouse_deltas = get_mouse_deltas(mouse_bufs[i], data_len, mouse_sync[i])
+            mouse_sync[i] = mouse_deltas[2]
             # if we got data, then update the mouse cursor on the display
             # using min and max to keep it within the bounds of the display
             mouse_tg.x = max(
@@ -405,6 +427,10 @@ def atexit_callback():
         except usb.core.USBTimeoutError:
             pass
 
+        # common non-fatal error
+        except usb.core.USBError:
+            pass
+
         # update the mouse debouncers
         mouse_debouncers[i].update()