wip

left/.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+target = "thumbv6m-none-eabi"

left/Cargo.toml

@@ -10,7 +10,6 @@ path = "../lib"
 package = "tangentbord1-lib"
 
 [dependencies]
-tgnt = { git = "https://git.nubo.sh/hulthe/tgnt.git", default-features = false }
 cortex-m-rt = "0.7"
 embassy-rp = { version = "0.1.0", features = ["time-driver", "critical-section-impl"] }
 embassy-executor = { version = "0.5.0", features = ["nightly", "executor-thread", "integrated-timers", "arch-cortex-m"] }
@@ -21,6 +20,9 @@ log = "0.4.17"
 postcard = { version = "1.0.4", features = ["alloc"] }
 
 [build-dependencies]
-tgnt = { git = "https://git.nubo.sh/hulthe/tgnt.git", default-features = false }
 ron = "0.8.0"
 postcard = { version = "1", features = ["use-std"] }
+
+[build-dependencies.tangentbord1]
+path = "../lib"
+package = "tangentbord1-lib"

left/build.rs

@@ -13,7 +13,7 @@ use std::io::Write;
 use std::path::PathBuf;
 use std::{env, fs};
 
-use tgnt::layer::Layer;
+use tangentbord1::layer::Layer;
 
 fn main() {
     memory();

left/src/main.rs

@@ -18,29 +18,19 @@ use tangentbord1::{
     event::Half,
     interrupts::Irqs,
     keyboard::KeyboardConfig,
-    logger::Logger,
+    layer::Layer,
+    logger::LogMultiplexer,
     rgb::Rgb,
     util::stall,
     ws2812::Ws2812,
     {allocator, rtt, uart, usb},
 };
-use tgnt::layer::Layer;
 
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) {
     let half = Half::Left;
 
     let rtt_write = rtt::init_rtt_logger();
-    let logger = Logger {
-        outputs: [rtt_write],
-    };
-    logger.init();
-
-    log::error!("log_level: error");
-    log::warn!("log_level: warn");
-    log::info!("log_level: info");
-    log::debug!("log_level: debug");
-    log::trace!("log_level: trace");
 
     allocator::init();
 
@@ -102,7 +92,18 @@ async fn main(_spawner: Spawner) {
 
     neopixel.write(&[Rgb::new(0x00, 0x99, 0x99)]).await;
 
-    usb::setup_logger_and_keyboard(board.USB, events1).await;
+    let usb_logger = usb::setup_logger_and_keyboard(board.USB, events1).await;
+
+    let logger = LogMultiplexer {
+        outputs: [rtt_write, usb_logger],
+    };
+    logger.init();
+
+    log::error!("log_level: error");
+    log::warn!("log_level: warn");
+    log::info!("log_level: info");
+    log::debug!("log_level: debug");
+    log::trace!("log_level: trace");
 
     neopixel.write(&[Rgb::new(0x00, 0x00, 0xFF)]).await;
     Timer::after_secs(5).await;
@@ -112,7 +113,5 @@ async fn main(_spawner: Spawner) {
         Timer::after_millis(10).await;
     }
 
-    loop {
-        Timer::after_secs(5).await;
-    }
+    stall().await
 }