Merge pull request #25 from FrameworkComputer/lotus-name

Author: JohnAZoidberg

.github/workflows/firmware.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Upload Linux tool
         uses: actions/upload-artifact@v3
         with:
-          name: lotus_inputmodule_fw
+          name: inputmodule_fw
           path: |
             b1display.uf2
             c1minimal.uf2

Cargo.lock

@@ -8,17 +8,17 @@ members = [
     "b1display",
     "c1minimal",
     "ledmatrix",
-    "lotus-inputmodules",
+    "fl16-inputmodules",
     "inputmodule-control"
 ]
 # Don't build all of them by default.
-# Because that'll lead to all features enabled in `lotus-inputmodules` and it
+# Because that'll lead to all features enabled in `fl16-inputmodules` and it
 # doesn't currently support building with all features enabled at the same
 # time.
 # Can't add `inputmodule-control` because it must be built with the host system
 # target. But we set the default target to thumbv6m-none-eabi
 default-members = [
-    "lotus-inputmodules",
+    "fl16-inputmodules",
 ]
 
 #[patch.'https://github.com/rp-rs/rp-hal.git']

Cargo.toml

@@ -1,4 +1,4 @@
-# Framework Laptop 16 Input Module Firmware
+# Framework Laptop 16 - Input Module Firmware/Software
 
 This repository contains both the firmware for the Framework Laptop 16 input modules,
 as well as the tool to control them.
@@ -48,12 +48,12 @@ Common commands:
   VID     0x32AC
   PID     0x0020
   SN      FRAKDEAM0020110001
-  Product Lotus_LED_Matrix
+  Product LED_Matrix
 /dev/ttyACM1
   VID     0x32AC
   PID     0x0021
   SN      FRAKDEAM0000000000
-  Product Lotus_B1_Display
+  Product B1_Display
 ```
 
 ###### Apply command to single device
@@ -169,7 +169,7 @@ On Linux:
 
 ```sh
 > lsusb -d 32ac: -v 2> /dev/null | grep -P 'ID 32ac|bcdDevice'
-Bus 003 Device 078: ID 32ac:0021 Framework Lotus B1 Display
+Bus 003 Device 078: ID 32ac:0021 Framework Laptop 16 B1 Display
   bcdDevice            0.10
 ```
 

README.md

@@ -14,7 +14,7 @@ defmt-rtt = "0.4"
 #panic-probe = { version = "0.3", features = ["print-defmt"] }
 rp2040-panic-usb-boot = { git = "https://github.com/rwalkr/rp2040-panic-usb-boot" }
 
-# Not using a BSP, we've got a Lotus BSP's locally in this crate
+# Not using an external BSP crate, we've got the Framework Laptop 16 BSPs locally in this crate
 rp2040-hal = { version="0.7", features=["rt", "critical-section-impl"] }
 rp2040-boot2 = "0.2"
 
@@ -30,6 +30,6 @@ st7306-lcd = { git = "ssh://[email protected]/FrameworkComputer/st7306.git" }
 embedded-graphics = "0.7"
 tinybmp = "0.4.0"
 
-[dependencies.lotus-inputmodules]
-path = "../lotus-inputmodules"
+[dependencies.fl16-inputmodules]
+path = "../fl16-inputmodules"
 features = [ "b1display" ]

b1display/Cargo.toml

@@ -1,4 +1,4 @@
-//! Lotus LED Matrix Module
+//! LED Matrix Module
 #![no_std]
 #![no_main]
 #![allow(clippy::needless_range_loop)]
@@ -22,7 +22,7 @@ use st7306_lcd::{FpsConfig, HpmFps, LpmFps, PowerMode, ST7306};
 
 // Provide an alias for our BSP so we can switch targets quickly.
 // Uncomment the BSP you included in Cargo.toml, the rest of the code does not need to change.
-use lotus_inputmodules::lotus_lcd_hal as bsp;
+use fl16_inputmodules::lcd_hal as bsp;
 //use rp_pico as bsp;
 // use sparkfun_pro_micro_rp2040 as bsp;
 
@@ -47,12 +47,12 @@ use core::fmt::Debug;
 //use core::fmt::Write;
 //use heapless::String;
 
-use lotus_inputmodules::control::*;
-use lotus_inputmodules::graphics::*;
-use lotus_inputmodules::serialnum::{device_release, get_serialnum};
+use fl16_inputmodules::control::*;
+use fl16_inputmodules::graphics::*;
+use fl16_inputmodules::serialnum::{device_release, get_serialnum};
 
 //                            FRA                - Framwork
-//                               KDE             - Lotus C2 LED Matrix
+//                               KDE             - C1 LED Matrix
 //                                  AM           - Atemitech
 //                                    00         - Default Configuration
 //                                      00000000 - Device Identifier
@@ -120,8 +120,8 @@ fn main() -> ! {
     };
 
     let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x32ac, 0x0021))
-        .manufacturer("Framework")
-        .product("Lotus B1 Display")
+        .manufacturer("Framework Computer Inc")
+        .product("B1 Display")
         .serial_number(serialnum)
         .max_power(500) // TODO: Check how much
         .device_release(device_release()) // TODO: Assign dynamically based on crate version

b1display/src/main.rs

@@ -14,7 +14,7 @@ defmt-rtt = "0.4"
 #panic-probe = { version = "0.3", features = ["print-defmt"] }
 rp2040-panic-usb-boot = { git = "https://github.com/rwalkr/rp2040-panic-usb-boot" }
 
-# Not using a BSP, we've got a Lotus BSP's locally in this crate
+# Not using an external BSP, we've got the Framework Laptop BSPs locally in this crate
 rp2040-hal = { version="0.7", features=["rt", "critical-section-impl"] }
 rp2040-boot2 = "0.2"
 
@@ -29,6 +29,6 @@ fugit = "0.3.6"
 smart-leds = "0.3.0"
 ws2812-pio = "0.5.0"
 
-[dependencies.lotus-inputmodules]
-path = "../lotus-inputmodules"
+[dependencies.fl16-inputmodules]
+path = "../fl16-inputmodules"
 features = [ "c1minimal" ]

c1minimal/Cargo.toml

@@ -1,4 +1,4 @@
-//! Lotus C1 Minimal Input Module
+//! C1 Minimal Input Module
 //!
 //! Neopixel/WS2812 compatible RGB LED is connected to GPIO16.
 //! This pin doesn't support SPI TX.
@@ -21,7 +21,7 @@ use rp2040_panic_usb_boot as _;
 
 // Provide an alias for our BSP so we can switch targets quickly.
 // Uncomment the BSP you included in Cargo.toml, the rest of the code does not need to change.
-use lotus_inputmodules::lotus_minimal_hal as bsp;
+use fl16_inputmodules::minimal_hal as bsp;
 //use rp_pico as bsp;
 
 use bsp::hal::{
@@ -52,11 +52,11 @@ pub type Ws2812<'a> = ws2812_pio::Ws2812<
     Gpio16,
 >;
 
-use lotus_inputmodules::control::*;
-use lotus_inputmodules::serialnum::{device_release, get_serialnum};
+use fl16_inputmodules::control::*;
+use fl16_inputmodules::serialnum::{device_release, get_serialnum};
 
 //                            FRA                - Framwork
-//                               000             - Lotus C1 Minimal Input Module (No assigned  value)
+//                               000             - C1 Minimal Input Module (No assigned  value)
 //                                  AM           - Atemitech
 //                                    00         - Default Configuration
 //                                      00000000 - Device Identifier
@@ -109,8 +109,8 @@ fn main() -> ! {
     };
 
     let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x32ac, 0x0022))
-        .manufacturer("Framework")
-        .product("Lotus C1 Minimal Input Module")
+        .manufacturer("Framework Computer Inc")
+        .product("C1 Minimal Input Module")
         .serial_number(serialnum)
         .max_power(500) // TODO: Check how much
         .device_release(device_release())

c1minimal/src/main.rs

@@ -988,7 +988,7 @@ def gui():
 
         [sg.Button("Quit")]
     ]
-    window = sg.Window("Lotus LED Matrix Control", layout)
+    window = sg.Window("LED Matrix Control", layout)
     global STOP_THREAD
     while True:
         event, values = window.read()

control.py

@@ -1,6 +1,6 @@
 [package]
 edition = "2021"
-name = "lotus-inputmodules"
+name = "fl16-inputmodules"
 version = "0.1.4"
 
 [dependencies]
@@ -14,7 +14,7 @@ defmt-rtt = "0.4"
 #panic-probe = { version = "0.3", features = ["print-defmt"] }
 rp2040-panic-usb-boot = { git = "https://github.com/rwalkr/rp2040-panic-usb-boot" }
 
-# Not using a BSP, we've got a Lotus BSP's locally in this crate
+# Not using an external BSP, we've got the Framework Laptop 16 BSPs locally in this crate
 rp2040-hal = { version="0.7", features=["rt", "critical-section-impl"] }
 rp2040-boot2 = "0.2"