Merge pull request #11 from FrameworkComputer/inputmodule-command

Author: JohnAZoidberg

Cargo.lock

@@ -1,17 +1,24 @@
+# Not stable yet :(
+# Trackign issue: https://github.com/rust-lang/cargo/issues/9406
+# cargo-features = ["per-package-target"]
+
 [workspace]
 resolver = "2"
 members = [
     "b1display",
     "c1minimal",
     "ledmatrix",
     "lotus-inputmodules",
+    "inputmodule-control"
 ]
 # Don't build all of them by default.
 # Because that'll lead to all features enabled in `lotus-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"
+    "lotus-inputmodules",
 ]
 
 #[patch.'https://github.com/rp-rs/rp-hal.git']

Cargo.toml

@@ -86,6 +86,16 @@ Examples
 ./control.py --brightness 50
 ```
 
+## Control via Rust binary
+
+Currently have to specify the build target because it's not possible to specify a per package build target.
+Tracking issue: https://github.com/rust-lang/cargo/issues/9406
+
+```
+> cargo build --target x86_64-unknown-linux-gnu -p inputmodule-control
+> cargo run --target x86_64-unknown-linux-gnu -p inputmodule-control
+```
+
 ## Building
 
 Dependencies: Rust

README.md

@@ -0,0 +1,13 @@
+[package]
+edition = "2021"
+name = "inputmodule-control"
+version = "0.1.2-pre"
+
+[dependencies]
+clap = { version = "4.0", features = ["derive"] }
+serialport = "4.2.0"
+
+# For ledmatrix
+image = "0.24.5"
+rand = "0.8.5"
+chrono = "0.4.23"

inputmodule-control/Cargo.toml

@@ -0,0 +1,36 @@
+use clap::Parser;
+
+/// B1 Display
+#[derive(Parser, Debug)]
+#[command(arg_required_else_help = true)]
+pub struct B1DisplaySubcommand {
+    /// Set sleep status or get, if no value provided
+    #[arg(long)]
+    pub sleeping: Option<Option<bool>>,
+
+    /// Jump to the bootloader
+    #[arg(long)]
+    pub bootloader: bool,
+
+    /// Crash the firmware (TESTING ONLY!)
+    #[arg(long)]
+    pub panic: bool,
+
+    /// Serial device, like /dev/ttyACM0 or COM0
+    #[arg(long)]
+    pub serial_dev: Option<String>,
+
+    /// Get the device version
+    #[arg(short, long)]
+    pub version: bool,
+
+    /// Turn display on/off
+    // TODO: Allow getting current state
+    #[arg(long)]
+    pub display_on: Option<bool>,
+
+    /// Invert screen on/off
+    // TODO: Allow getting current state
+    #[arg(long)]
+    pub invert_screen: Option<bool>,
+}

inputmodule-control/src/b1display.rs

@@ -0,0 +1,43 @@
+use clap::Parser;
+
+#[derive(Clone, Copy, Debug, PartialEq, clap::ValueEnum)]
+pub enum Color {
+    White,
+    Black,
+    Red,
+    Green,
+    Blue,
+    Yellow,
+    Cyan,
+    Purple,
+}
+
+#[derive(Parser, Debug)]
+#[command(arg_required_else_help = true)]
+pub struct C1MinimalSubcommand {
+    /// Set sleep status or get, if no value provided
+    #[arg(long)]
+    pub sleeping: Option<Option<bool>>,
+
+    /// Jump to the bootloader
+    #[arg(long)]
+    pub bootloader: bool,
+
+    /// Crash the firmware (TESTING ONLY!)
+    #[arg(long)]
+    pub panic: bool,
+
+    /// Serial device, like /dev/ttyACM0 or COM0
+    #[arg(long)]
+    pub serial_dev: Option<String>,
+
+    /// Get the device version
+    #[arg(short, long)]
+    pub version: bool,
+
+    /// Set color
+    // TODO: Allow getting current state
+    #[arg(long)]
+    #[clap(value_enum)]
+    pub set_color: Option<Color>,
+}