picoprog: use rtt and defmt for debug output

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>

Author: ArthurHeymans

Cargo.lock

@@ -20,7 +20,6 @@ embassy-stm32 = { version = "0.2.0" }
 embassy-sync = "0.6.2"
 embassy-time = "0.4.0"
 embassy-usb = { version = "0.4.0", features = ["max-handler-count-6", "max-interface-count-6"] }
-embassy-usb-logger = "0.4.0"
 embedded-hal = "1.0.0"
 embedded-hal-async = "1.0.0"
 futures = { version = "0.3.31", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] }
@@ -44,7 +43,6 @@ embassy-stm32 = { git = "https://github.com/embassy-rs/embassy", rev = "17301c00
 embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "17301c00e986c5b8536435ea31ebf5aaf13aed17" }
 embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "17301c00e986c5b8536435ea31ebf5aaf13aed17" }
 embassy-usb = { git = "https://github.com/embassy-rs/embassy", rev = "17301c00e986c5b8536435ea31ebf5aaf13aed17" }
-embassy-usb-logger = { git = "https://github.com/embassy-rs/embassy", rev = "17301c00e986c5b8536435ea31ebf5aaf13aed17" }
 
 [profile.release]
 debug = true

Cargo.toml

@@ -9,17 +9,18 @@ authors = ["Marvin Drees <marvin.drees@9elements.com>"]
 assign-resources.workspace = true
 cortex-m = { workspace = true, features = ["inline-asm", "critical-section"] }
 cortex-m-rt.workspace = true
-embassy-executor = { workspace = true, features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "nightly"] }
+embassy-executor = { workspace = true, features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "nightly", "defmt"] }
 embassy-futures.workspace = true
 embedded-hal.workspace = true
 embedded-hal-async.workspace = true
 serprog.workspace = true
 embassy-rp = { workspace = true, features = ["unstable-pac", "time-driver", "critical-section-impl", "rom-func-cache", "rom-v2-intrinsics", "rp2040"] }
-embassy-sync.workspace = true
+embassy-sync = { workspace = true, features = ["defmt"] }
 embassy-time.workspace = true
-embassy-usb = { workspace = true, features = ["max-handler-count-6", "max-interface-count-6"] }
-embassy-usb-logger.workspace = true
+embassy-usb = { workspace = true, features = ["max-handler-count-6", "max-interface-count-6", "defmt"] }
 heapless = { workspace = true, features = ["portable-atomic-critical-section", "ufmt"] }
 log.workspace = true
 static_cell.workspace = true
 ufmt.workspace = true
+defmt.workspace = true
+defmt-rtt.workspace = true

picoprog/Cargo.toml

@@ -32,4 +32,5 @@ fn main() {
     println!("cargo:rustc-link-arg-bins=--nmagic");
     println!("cargo:rustc-link-arg-bins=-Tlink.x");
     println!("cargo:rustc-link-arg-bins=-Tlink-rp.x");
+    println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
 }

picoprog/build.rs

@@ -8,6 +8,7 @@
 use assign_resources::assign_resources;
 use core::panic::PanicInfo;
 use cortex_m::peripheral::SCB;
+use defmt_rtt as _;
 use embassy_executor::Spawner;
 use embassy_rp::bind_interrupts;
 use embassy_rp::flash::{Async, Flash};
@@ -19,7 +20,6 @@ use embassy_rp::usb::{Driver, InterruptHandler as USBInterruptHandler};
 use embassy_usb::class::cdc_acm::{CdcAcmClass, State};
 use embassy_usb::driver::EndpointError;
 use embassy_usb::{Config as UsbConfig, UsbDevice};
-use embassy_usb_logger::with_class;
 use heapless::String;
 use static_cell::StaticCell;
 use ufmt::uwrite;
@@ -102,12 +102,6 @@ async fn main(spawner: Spawner) {
         builder
     };
 
-    let logger_class = {
-        static STATE: StaticCell<State> = StaticCell::new();
-        let state = STATE.init(State::new());
-        CdcAcmClass::new(&mut builder, state, 64)
-    };
-
     let uart_class = {
         static STATE: StaticCell<State> = StaticCell::new();
         let state = STATE.init(State::new());
@@ -123,7 +117,6 @@ async fn main(spawner: Spawner) {
     let usb = builder.build();
     // We can't really recover here so just unwrap
     spawner.spawn(usb_task(usb)).unwrap();
-    spawner.spawn(logger_task(logger_class)).unwrap();
     spawner.spawn(uart::uart_task(uart_class, r.uart)).unwrap();
     spawner.spawn(serprog_task(serprog_class, r.spi)).unwrap();
 
@@ -151,11 +144,6 @@ async fn usb_task(mut usb: CustomUsbDevice) -> ! {
     usb.run().await
 }
 
-#[embassy_executor::task]
-async fn logger_task(class: CdcAcmClass<'static, CustomUsbDriver>) {
-    with_class!(1024, log::LevelFilter::Info, class).await
-}
-
 #[embassy_executor::task]
 async fn serprog_task(class: CdcAcmClass<'static, CustomUsbDriver>, r: SpiResources) -> ! {
     let mut config = SpiConfig::default();