Merge pull request #6 from FrameworkComputer/minimal

Author: JohnAZoidberg

Cargo.lock

@@ -36,6 +36,10 @@ mipidsi = { version = "0.6.0", optional = true }
 embedded-graphics = { version = "0.7", optional = true }
 tinybmp = { version = "0.4.0", optional = true }
 
+# C1 Minimal
+smart-leds = { version = "0.3.0", optional = true }
+ws2812-pio = { version = "0.5.0", optional = true }
+
 [lib]
 name = "lotus_input"
 path = "src/lib.rs"
@@ -48,9 +52,14 @@ required-features = ["ledmatrix"]
 name = "b1display"
 required-features = ["b1display"]
 
+[[bin]]
+name = "c1minimal"
+required-features = ["c1minimal"]
+
 [features]
 ledmatrix = [ "is31fl3741" ]
 b1display = [ "display-interface-spi", "mipidsi", "embedded-graphics", "tinybmp" ]
+c1minimal = [ "smart-leds", "ws2812-pio" ]
 
 # cargo build/run
 [profile.dev]

Cargo.toml

@@ -1,6 +1,6 @@
 # Lotus Input Module Firmware
 
-See below sections for LED Matrix and LCD Display module details.
+See below sections for LED Matrix, LCD Display and C1 Minimal module details.
 
 Rust project setup based off of: https://github.com/rp-rs/rp2040-project-template
 
@@ -61,6 +61,9 @@ options:
   --wpm                 WPM Demo
   --snake               Snake
   --all-brightnesses    Show every pixel in a different brightness
+  --set-color {white,black,red,green,blue,cyan,yellow,purple}
+                        Set RGB color (C1 Minimal Input Module)
+  --get-color           Get RGB color (C1 Minimal Input Module)
   -v, --version         Get device version
   --serial-dev SERIAL_DEV
                         Change the serial dev. Probably /dev/ttyACM0 on Linux, COM0 on Windows
@@ -100,13 +103,15 @@ Build:
 ```sh
 cargo build --bin ledmatrix --features=ledmatrix
 cargo build --bin b1display --features=b1display
+cargo build --bin c1minimal --features=c1minimal
 ```
 
 Generate UF2 file:
 
 ```sh
 elf2uf2-rs target/thumbv6m-none-eabi/debug/ledmatrix ledmatrix.uf2
 elf2uf2-rs target/thumbv6m-none-eabi/debug/b1display b1dipslay.uf2
+elf2uf2-rs target/thumbv6m-none-eabi/debug/b1display c1minimal.uf2
 ```
 
 ## Flashing
@@ -160,3 +165,22 @@ It's a 9x34 (306) LED matrix, controlled by RP2040 MCU and IS31FL3741A LED contr
 Connection to the host system is via USB 2.0 and currently there is a USB Serial API to control it without reflashing.
 
 ## B1 Display
+
+## C1 Minimal Input Module
+
+It's a very minimal input module. Many GPIO pins are exposed so that headers
+can be soldered onto them. Additionally there are pads for a 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
+> ./control.py --brightness 255
+> ./control.py --get-brightness
+Current brightness: 255
+
+> ./control.py --set-color yellow
+> ./control.py --get-color
+Current color: RGB:(255, 255, 0)
+```

README.md

@@ -40,6 +40,9 @@
 ARG_2LEFT = 5
 ARG_2RIGHT = 6
 
+RGB_COLORS = ['white', 'black', 'red', 'green',
+              'blue', 'cyan', 'yellow', 'purple']
+
 SERIAL_DEV = None
 
 STOP_THREAD = False
@@ -94,6 +97,10 @@ def main():
                         help="Pong on the module", action="store_true")
     parser.add_argument(
         "--all-brightnesses", help="Show every pixel in a different brightness", action="store_true")
+    parser.add_argument(
+        "--set-color", help="Set RGB color (C1 Minimal Input Module)", choices=RGB_COLORS)
+    parser.add_argument(
+        "--get-color", help="Get RGB color (C1 Minimal Input Module)", action="store_true")
     parser.add_argument("-v", "--version",
                         help="Get device version", action="store_true")
     parser.add_argument("--serial-dev", help="Change the serial dev. Probably /dev/ttyACM0 on Linux, COM0 on Windows",
@@ -143,6 +150,11 @@ def main():
         image_greyscale(args.image_grey)
     elif args.all_brightnesses:
         all_brightnesses()
+    elif args.set_color:
+        set_color(args.set_color)
+    elif args.get_color:
+        (red, green, blue) = get_color()
+        print(f"Current color: RGB:({red}, {green}, {blue})")
     elif args.gui:
         gui()
     elif args.blink:
@@ -309,6 +321,39 @@ def commit_cols(s):
     send_serial(s, command)
 
 
+def get_color():
+    command = FWK_MAGIC + [0x13]
+    res = send_command(command, with_response=True)
+    return (int(res[0]), int(res[1]), int(res[2]))
+
+
+def set_color(color):
+    rgb = None
+    if color == 'white':
+        rgb = [0xFF, 0xFF, 0xFF]
+    elif color == 'black':
+        rgb = [0x00, 0x00, 0x00]
+    elif color == 'red':
+        rgb = [0xFF, 0x00, 0x00]
+    elif color == 'green':
+        rgb = [0x00, 0xFF, 0x00]
+    elif color == 'blue':
+        rgb = [0x00, 0x00, 0xFF]
+    elif color == 'yellow':
+        rgb = [0xFF, 0xFF, 0x00]
+    elif color == 'cyan':
+        rgb = [0x00, 0xFF, 0xFF]
+    elif color == 'purple':
+        rgb = [0xFF, 0x00, 0xFF]
+    else:
+        print(f"Unknown color: {color}")
+        return
+
+    if rgb:
+        command = FWK_MAGIC + [0x13] + rgb
+        send_command(command)
+
+
 def all_brightnesses():
     """Increase the brightness with each pixel.
     Only 0-255 available, so it can't fill all 306 LEDs"""