qtpy: Clean up

JohnAZoidberg · JohnAZoidberg · commit 529ec08827f5 · 2023-10-08T18:01:44.000+08:00
And change PID to 0x001F

Signed-off-by: Daniel Schaefer &lt;dhs@frame.work&gt;
diff --git a/README.md b/README.md
@@ -11,8 +11,9 @@ See pages of the individual modules for details about how they work and how
 they're controlled.
 
 - [LED Matrix](ledmatrix/README.md)
-- [2nd Display](b1display/README.md)
 - [Minimal C1 Input Module](c1minimal/README.md)
+- [2nd Display](b1display/README.md)
+- [QT PY RP2040](qtpy/README.md)
 
 ## Generic Features
 
diff --git a/ledmatrix_control.py b/ledmatrix_control.py
@@ -20,7 +20,7 @@
 FWK_MAGIC = [0x32, 0xAC]
 FWK_VID = 0x32AC
 LED_MATRIX_PID = 0x20
-QTPY_PID = 0x01AF
+QTPY_PID = 0x001F
 INPUTMODULE_PIDS = [LED_MATRIX_PID, QTPY_PID]
 
 
diff --git a/qtpy/README.md b/qtpy/README.md
@@ -1,7 +1,8 @@
 ## QT PY RP2040
 
-Easy to get started with, without having a Framework module.
-Has GPIO and WS2812/Neopixel compatible RGB LED.
+**NOT** an official Framework module.
+Just reference firmware that's easy to get started with, without having a
+Framework module. Has GPIO and WS2812/Neopixel compatible RGB LED.
 
 When booting up this LED is lit in green color.
 Its color and brightness can be controlled via the commands:
diff --git a/qtpy/src/main.rs b/qtpy/src/main.rs
@@ -1,4 +1,4 @@
-//! C1 Minimal Input Module
+//! QT PY RP2040 with Framework 16 Input Module Firmware
 //!
 //! Neopixel/WS2812 compatible RGB LED is connected to GPIO12.
 //! This pin doesn't support SPI TX.
@@ -53,15 +53,10 @@ pub type Ws2812<'a> = ws2812_pio::Ws2812<
 >;
 
 use fl16_inputmodules::control::*;
-use fl16_inputmodules::serialnum::{device_release, get_serialnum};
+use fl16_inputmodules::serialnum::device_release;
 
-// TODO: Need to adjust
-//                            FRA                - Framwork
-//                               000             - C1 Minimal Input Module (No assigned  value)
-//                                  AM           - Atemitech
-//                                    00         - Default Configuration
-//                                      00000000 - Device Identifier
-const DEFAULT_SERIAL: &str = "FRA000AM0000000000";
+const FRAMEWORK_VID: u16 = 0x32AC;
+const COMMUNITY_PID: u16 = 0x001F;
 
 #[entry]
 fn main() -> ! {
@@ -103,16 +98,9 @@ fn main() -> ! {
     // Set up the USB Communications Class Device driver
     let mut serial = SerialPort::new(&usb_bus);
 
-    let serialnum = if let Some(serialnum) = get_serialnum() {
-        serialnum.serialnum
-    } else {
-        DEFAULT_SERIAL
-    };
-
-    let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x32ac, 0x01AF))
+    let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(FRAMEWORK_VID, COMMUNITY_PID))
         .manufacturer("Adafruit")
-        .product("QT PY")
-        .serial_number(serialnum)
+        .product("QT PY - Framework 16 Inputmodule FW")
         .max_power(500)
         .device_release(device_release())
         .device_class(USB_CLASS_CDC)
@@ -194,9 +182,6 @@ fn handle_sleep(
 
             // Turn off LED
             ws2812.write([colors::BLACK].iter().cloned()).unwrap();
-
-            // TODO: Set up SLEEP# pin as interrupt and wfi
-            //cortex_m::asm::wfi();
         }
         (SimpleSleepState::Sleeping, true) => (),
         (SimpleSleepState::Sleeping, false) => {
