Merge pull request #80 from OctopusET/qtpy-rp2040

JohnAZoidberg · web-flow · commit 71dfc6e07ff3 · 2023-10-08T17:22:13.000+08:00
Fixes for the qtpy-rp2040 branch
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,7 @@ usbd-serial = "0.1.1"
 usbd-hid = "0.6.1"
 fugit = "0.3.7"
 # LED Matrix
-is31fl3741 = { git = "https://github.com/FrameworkComputer/is31fl3741-rs", branch = "sw-enablement" }
+is31fl3741 = "0.2.2"
 # B1 Display
 st7306 = { git = "https://github.com/FrameworkComputer/st7306-rs", branch = "update-deps" }
 embedded-graphics = "0.8"
diff --git a/ledmatrix_control.py b/ledmatrix_control.py
@@ -20,7 +20,8 @@
 FWK_MAGIC = [0x32, 0xAC]
 FWK_VID = 0x32AC
 LED_MATRIX_PID = 0x20
-INPUTMODULE_PIDS = [LED_MATRIX_PID]
+QTPY_PID = 0x01AF
+INPUTMODULE_PIDS = [LED_MATRIX_PID, QTPY_PID]
 
 
 class CommandVals(IntEnum):
@@ -614,12 +615,12 @@ def commit_cols(s):
     send_serial(s, command)
 
 
-def get_color():
+def get_color(dev):
     res = send_command(dev, CommandVals.SetColor, with_response=True)
     return (int(res[0]), int(res[1]), int(res[2]))
 
 
-def set_color(color):
+def set_color(dev, color):
     rgb = None
     if color == 'white':
         rgb = [0xFF, 0xFF, 0xFF]
@@ -825,7 +826,7 @@ def game_over(dev):
         time.sleep(0.75)
 
 
-def pong_embedded():
+def pong_embedded(dev):
     # Start game
     send_command(dev, CommandVals.StartGame, [Game.Pong])
 
@@ -849,14 +850,14 @@ def pong_embedded():
             send_command(dev, CommandVals.GameControl, [key_arg])
 
 
-def game_of_life_embedded(arg):
+def game_of_life_embedded(dev, arg):
     # Start game
     # TODO: Add a way to stop it
     print("Game", int(arg))
     send_command(dev, CommandVals.StartGame, [Game.GameOfLife, int(arg)])
 
 
-def snake_embedded():
+def snake_embedded(dev):
     # Start game
     send_command(dev, CommandVals.StartGame, [Game.Snake])
 
@@ -938,7 +939,7 @@ def snake(dev):
         render_matrix(dev, matrix)
 
 
-def wpm_demo():
+def wpm_demo(dev):
     """Capture keypresses and calculate the WPM of the last 10 seconds
     TODO: I'm not sure my calculation is right."""
     from getkey import getkey, keys
@@ -1363,92 +1364,92 @@ def gui(devices):
         #sg.popup_error_with_traceback(f'An error happened.  Here is the info:', e)
 
 
-def display_string(disp_str):
+def display_string(dev, disp_str):
     b = [ord(x) for x in disp_str]
-    send_command(CommandVals.SetText, [len(disp_str)] + b)
+    send_command(dev, CommandVals.SetText, [len(disp_str)] + b)
 
 
-def display_on_cmd(on):
-    send_command(CommandVals.DisplayOn, [on])
+def display_on_cmd(dev, on):
+    send_command(dev, CommandVals.DisplayOn, [on])
 
 
-def invert_screen_cmd(invert):
-    send_command(CommandVals.InvertScreen, [invert])
+def invert_screen_cmd(dev, invert):
+    send_command(dev, CommandVals.InvertScreen, [invert])
 
 
-def screen_saver_cmd(on):
-    send_command(CommandVals.ScreenSaver, [on])
+def screen_saver_cmd(dev, on):
+    send_command(dev, CommandVals.ScreenSaver, [on])
 
 
-def set_fps_cmd(mode):
-    res = send_command(CommandVals.SetFps, with_response=True)
+def set_fps_cmd(dev, mode):
+    res = send_command(dev, CommandVals.SetFps, with_response=True)
     current_fps = res[0]
 
     if mode == 'quarter':
         fps = current_fps & ~LOW_FPS_MASK
         fps |= 0b000
-        send_command(CommandVals.SetFps, [fps])
+        send_command(dev, CommandVals.SetFps, [fps])
         set_power_mode_cmd('low')
     elif mode == 'half':
         fps = current_fps & ~LOW_FPS_MASK
         fps |= 0b001
-        send_command(CommandVals.SetFps, [fps])
+        send_command(dev, CommandVals.SetFps, [fps])
         set_power_mode_cmd('low')
     elif mode == 'one':
         fps = current_fps & ~LOW_FPS_MASK
         fps |= 0b010
-        send_command(CommandVals.SetFps, [fps])
+        send_command(dev, CommandVals.SetFps, [fps])
         set_power_mode_cmd('low')
     elif mode == 'two':
         fps = current_fps & ~LOW_FPS_MASK
         fps |= 0b011
-        send_command(CommandVals.SetFps, [fps])
+        send_command(dev, CommandVals.SetFps, [fps])
         set_power_mode_cmd('low')
     elif mode == 'four':
         fps = current_fps & ~LOW_FPS_MASK
         fps |= 0b100
-        send_command(CommandVals.SetFps, [fps])
+        send_command(dev, CommandVals.SetFps, [fps])
         set_power_mode_cmd('low')
     elif mode == 'eight':
         fps = current_fps & ~LOW_FPS_MASK
         fps |= 0b101
-        send_command(CommandVals.SetFps, [fps])
+        send_command(dev, CommandVals.SetFps, [fps])
         set_power_mode_cmd('low')
     elif mode == 'sixteen':
         fps = current_fps & ~HIGH_FPS_MASK
         fps |= 0b00000000
-        send_command(CommandVals.SetFps, [fps])
+        send_command(dev, CommandVals.SetFps, [fps])
         set_power_mode_cmd('high')
     elif mode == 'thirtytwo':
         fps = current_fps & ~HIGH_FPS_MASK
         fps |= 0b00010000
-        send_command(CommandVals.SetFps, [fps])
+        send_command(dev, CommandVals.SetFps, [fps])
         set_power_mode_cmd('high')
 
 
-def set_power_mode_cmd(mode):
+def set_power_mode_cmd(dev, mode):
     if mode == 'low':
-        send_command(CommandVals.SetPowerMode, [0])
+        send_command(dev, CommandVals.SetPowerMode, [0])
     elif mode == 'high':
-        send_command(CommandVals.SetPowerMode, [1])
+        send_command(dev, CommandVals.SetPowerMode, [1])
     else:
         print("Unsupported power mode")
         sys.exit(1)
 
 
-def get_power_mode_cmd():
-    res = send_command(CommandVals.SetPowerMode, with_response=True)
+def get_power_mode_cmd(dev):
+    res = send_command(dev, CommandVals.SetPowerMode, with_response=True)
     current_mode = int(res[0])
     if current_mode == 0:
         print(f"Current Power Mode: Low Power")
     elif current_mode == 1:
         print(f"Current Power Mode: High Power")
 
 
-def get_fps_cmd():
-    res = send_command(CommandVals.SetFps, with_response=True)
+def get_fps_cmd(dev):
+    res = send_command(dev, CommandVals.SetFps, with_response=True)
     current_fps = res[0]
-    res = send_command(CommandVals.SetPowerMode, with_response=True)
+    res = send_command(dev, CommandVals.SetPowerMode, with_response=True)
     current_mode = int(res[0])
 
     if current_mode == 0:
diff --git a/qtpy/src/main.rs b/qtpy/src/main.rs
@@ -109,8 +109,7 @@ fn main() -> ! {
         DEFAULT_SERIAL
     };
 
-    // TODO: Choose other ID
-    let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x32ac, 0xFFFF))
+    let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x32ac, 0x01AF))
         .manufacturer("Adafruit")
         .product("QT PY")
         .serial_number(serialnum)
