Merge pull request #8 from FrameworkComputer/workspaces

Author: JohnAZoidberg

Cargo.lock

@@ -1,65 +1,24 @@
-[package]
-edition = "2021"
-name = "lotus_inputmodules"
-version = "0.1.2-pre"
-
-[dependencies]
-cortex-m = "0.7"
-cortex-m-rt = "0.7.3"
-embedded-hal = { version = "0.2.7", features = ["unproven"] }
-
-defmt = "0.3"
-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
-rp2040-hal = { version="0.7", features=["rt", "critical-section-impl"] }
-rp2040-boot2 = "0.2"
-
-# USB Serial
-usb-device= "0.2.9"
-
-heapless = "0.7.9"
-usbd-serial = "0.1.1"
-usbd-hid = "0.5.1"
-fugit = "0.3.6"
-
-# LED Matrix
-is31fl3741 = { git = "https://github.com/JohnAZoidberg/is31fl3741", branch = "all-at-once", optional = true }
-
-
-# B1 Display
-display-interface-spi = { version = "0.4.1", optional = true }
-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"
-
-[[bin]]
-name = "ledmatrix"
-required-features = ["ledmatrix"]
-
-[[bin]]
-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" ]
+[workspace]
+resolver = "2"
+members = [
+    "b1display",
+    "c1minimal",
+    "ledmatrix",
+    "lotus-inputmodules",
+]
+# 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.
+default-members = [
+    "lotus-inputmodules"
+]
+
+#[patch.'https://github.com/rp-rs/rp-hal.git']
+#rp2040-hal = { path = "./rp2040-hal" }
+#
+#[patch.crates-io]
+#rp2040-hal = { path = "./rp2040-hal" }
 
 # cargo build/run
 [profile.dev]

Cargo.toml

@@ -101,9 +101,9 @@ cargo install elf2uf2-rs --locked
 Build:
 
 ```sh
-cargo build --bin ledmatrix --features=ledmatrix
-cargo build --bin b1display --features=b1display
-cargo build --bin c1minimal --features=c1minimal
+cargo build -p ledmatrix
+cargo build -p b1display
+cargo build -p c1minimal
 ```
 
 Generate UF2 file:
@@ -121,7 +121,9 @@ First, put the module into bootloader mode, which will expose a filesystem
 This can be done by pressing the bootsel button while plugging it in.
 
 ```sh
-cargo run
+cargo run -p ledmatrix
+cargo run -p b1display
+cargo run -p c1minimal
 ```
 
 Or by copying the above generated UF2 file to the partition mounted when the

README.md

@@ -0,0 +1,35 @@
+[package]
+edition = "2021"
+name = "b1display"
+version = "0.1.2-pre"
+
+[dependencies]
+cortex-m = "0.7"
+cortex-m-rt = "0.7.3"
+embedded-hal = { version = "0.2.7", features = ["unproven"] }
+
+defmt = "0.3"
+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
+rp2040-hal = { version="0.7", features=["rt", "critical-section-impl"] }
+rp2040-boot2 = "0.2"
+
+# USB Serial
+usb-device= "0.2.9"
+
+heapless = "0.7.9"
+usbd-serial = "0.1.1"
+usbd-hid = "0.5.1"
+fugit = "0.3.6"
+
+st7306-lcd = { git = "ssh://[email protected]/FrameworkComputer/st7306.git" }
+embedded-graphics = "0.7"
+tinybmp = "0.4.0"
+
+[dependencies.lotus-inputmodules]
+path = "../lotus-inputmodules"
+features = [ "b1display" ]