Add QT Py Module

JohnAZoidberg · JohnAZoidberg · commit f2846d9152b1 · 2023-09-19T10:35:10.000+08:00
Signed-off-by: Daniel Schaefer &lt;dhs@frame.work&gt;
diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml
@@ -32,20 +32,26 @@ jobs:
       - run: cargo install cargo-make
 
       - run: cargo install flip-link
+      # Debug version
       - run: cargo make --cwd b1display
       - run: cargo make --cwd c1minimal
+      - run: cargo make --cwd ledmatrix
+      - run: cargo make --cwd qtpy
+      # Release version
       - run: cargo make --cwd ledmatrix build-release
       - run: cargo make --cwd ledmatrix build-release-10k
       - run: cargo make --cwd ledmatrix build-release-evt
       - run: cargo make --cwd b1display build-release
       - run: cargo make --cwd c1minimal build-release
+      - run: cargo make --cwd qtpy build-release
 
       - name: Convert to UF2 format
         run: |
             sudo apt-get update
             sudo apt-get install -y libudev-dev
             cargo make --cwd b1display uf2
             cargo make --cwd c1minimal uf2
+            cargo make --cwd qtpy uf2
             cargo make --cwd ledmatrix build-release-10k-uf2
             cargo make --cwd ledmatrix build-release-evt-uf2
             cargo make --cwd ledmatrix uf2
@@ -55,6 +61,7 @@ jobs:
             sudo apt-get update
             sudo apt-get install -y llvm
             cargo make --cwd b1display bin
+            cargo make --cwd qtpy bin
             cargo make --cwd c1minimal bin
             cargo make --cwd ledmatrix bin
 
@@ -99,6 +106,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libudev-dev
           cargo make clippy --cwd b1display
+          cargo make clippy --cwd qtpy
           cargo make clippy --cwd c1minimal
           cargo make clippy --cwd ledmatrix
 
@@ -110,6 +118,7 @@ jobs:
         run: |
           cargo pkgid -p fl16-inputmodules | cut -d "#" -f2 >> versions.tmp
           cargo pkgid -p b1display | cut -d "#" -f2 >> versions.tmp
+          cargo pkgid -p qtpy | cut -d "#" -f2 >> versions.tmp
           cargo pkgid -p c1minimal | cut -d "#" -f2 >> versions.tmp
           cargo pkgid -p ledmatrix | cut -d "#" -f2 >> versions.tmp
           uniq -c versions.tmp | [ $(wc -l) -eq 1 ]
@@ -127,4 +136,5 @@ jobs:
           cargo fmt -p b1display -- --check
           cargo fmt -p c1minimal -- --check
           cargo fmt -p ledmatrix -- --check
+          cargo fmt -p qtpy -- --check
           cargo fmt -p fl16-inputmodules -- --check
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,6 +10,7 @@ members = [
     "ledmatrix",
     "fl16-inputmodules",
     "inputmodule-control",
+    "qtpy",
 ]
 # Don't build all of them by default.
 # Because that'll lead to all features enabled in `fl16-inputmodules` and it
@@ -63,6 +64,12 @@ incremental = true
 # To allow single-stepping through code use 0. Will cause timing issues, though
 opt-level = 3
 
+[profile.dev.package.qtpy]
+codegen-units = 1
+incremental = true
+# To allow single-stepping through code use 0. Will cause timing issues, though
+opt-level = 3
+
 # Faster and smaller code but much slower to compile.
 # Increase in rebuild time from <1s to 20s
 [profile.release]
diff --git a/fl16-inputmodules/Cargo.toml b/fl16-inputmodules/Cargo.toml
@@ -47,3 +47,4 @@ default = []
 ledmatrix = ["is31fl3741"]
 b1display = ["st7306", "embedded-graphics", "tinybmp"]
 c1minimal = ["smart-leds", "ws2812-pio"]
+qtpy = ["c1minimal"]
diff --git a/fl16-inputmodules/src/lib.rs b/fl16-inputmodules/src/lib.rs
@@ -27,7 +27,7 @@ pub mod graphics;
 #[cfg(feature = "b1display")]
 pub mod lcd_hal;
 
-#[cfg(feature = "c1minimal")]
+#[cfg(all(feature = "c1minimal", not(feature = "qtpy")))]
 pub mod minimal_hal;
 
 pub mod control;
diff --git a/qtpy/Cargo.toml b/qtpy/Cargo.toml
@@ -0,0 +1,38 @@
+[package]
+edition = "2021"
+name = "qtpy"
+version = "0.1.7"
+
+[dependencies]
+cortex-m.workspace = true
+cortex-m-rt.workspace = true
+embedded-hal.workspace = true
+
+defmt.workspace = true
+defmt-rtt.workspace = true
+
+#panic-probe.workspace = true
+rp2040-panic-usb-boot.workspace = true
+
+# Not using an external BSP, we've got the Framework Laptop 16 BSPs locally in this crate
+rp2040-hal.workspace = true
+rp2040-boot2.workspace = true
+
+# USB Serial
+usb-device.workspace = true
+heapless.workspace = true
+usbd-serial.workspace = true
+usbd-hid.workspace = true
+fugit.workspace = true
+
+# C1 Minimal
+smart-leds.workspace = true
+ws2812-pio.workspace = true
+
+# QT Py
+adafruit-qt-py-rp2040 = "0.6.0"
+
+[dependencies.fl16-inputmodules]
+path = "../fl16-inputmodules"
+# Same feature as c1minimal
+features = [ "c1minimal", "qtpy" ]
diff --git a/qtpy/Makefile.toml b/qtpy/Makefile.toml
@@ -0,0 +1,12 @@
+extend = "../Makefile.toml"
+
+[tasks.uf2]
+command = "elf2uf2-rs"
+args = ["../target/thumbv6m-none-eabi/release/qtpy", "../target/thumbv6m-none-eabi/release/qtpy.uf2"]
+dependencies = ["build-release"]
+install_crate = "elf2uf2-rs"
+
+[tasks.bin]
+command = "llvm-objcopy"
+args = ["-Obinary", "../target/thumbv6m-none-eabi/release/qtpy", "../target/thumbv6m-none-eabi/release/qtpy.bin"]
+dependencies = ["build-release"]
diff --git a/qtpy/README.md b/qtpy/README.md
@@ -0,0 +1,17 @@
+## QT PY RP2040
+
+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:
+
+```sh
+> ./ledmatrix_control.py --brightness 255
+> ./ledmatrix_control.py --get-brightness
+Current brightness: 255
+
+> ./ledmatrix_control.py --set-color yellow
+> ./ledmatrix_control.py --get-color
+Current color: RGB:(255, 255, 0)
+```
diff --git a/qtpy/src/main.rs b/qtpy/src/main.rs
