Merge pull request #53 from fnafnio/defmt-update

update defmt and defmt-rtt to 0.2.0

8 files changed, 17 insertions, 20 deletions

diff --git a/embassy-nrf-examples/.cargo/config b/embassy-nrf-examples/.cargo/config
index 591288879..2bfb098ef 100644
--- a/embassy-nrf-examples/.cargo/config
+++ b/embassy-nrf-examples/.cargo/config
@@ -1,5 +1,5 @@
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
-runner = "probe-run --chip nRF52840_xxAA --defmt"
+runner = "probe-run --chip nRF52840_xxAA"
 
 rustflags = [
   # LLD (shipped with the Rust toolchain) is used as the default linker
diff --git a/embassy-nrf-examples/Cargo.toml b/embassy-nrf-examples/Cargo.toml
index 21f0bdd95..364fd8a51 100644
--- a/embassy-nrf-examples/Cargo.toml
+++ b/embassy-nrf-examples/Cargo.toml
@@ -20,8 +20,8 @@ defmt-error = []
 embassy = { version = "0.1.0", path = "../embassy", features = ["defmt", "defmt-trace"] }
 embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt", "defmt-trace", "52840"] }
 
-defmt = "0.1.3"
-defmt-rtt = "0.1.0"
+defmt = "0.2.0"
+defmt-rtt = "0.2.0"
 
 cortex-m = "0.7.1"
 cortex-m-rt = "0.6.13"
diff --git a/embassy-nrf-examples/src/bin/buffered_uart.rs b/embassy-nrf-examples/src/bin/buffered_uart.rs
index a1b2b4dd2..bad8ee467 100644
--- a/embassy-nrf-examples/src/bin/buffered_uart.rs
+++ b/embassy-nrf-examples/src/bin/buffered_uart.rs
@@ -64,7 +64,7 @@ async fn run() {
         info!("reading...");
         let mut buf = [0u8; 8];
         unwrap!(u.read_exact(&mut buf).await);
-        info!("read done, got {:[u8]}", buf);
+        info!("read done, got {}", buf);
 
         // Reverse buf
         for i in 0..4 {
diff --git a/embassy-nrf-examples/src/bin/multiprio.rs b/embassy-nrf-examples/src/bin/multiprio.rs
index 89c285fa5..1791a85e6 100644
--- a/embassy-nrf-examples/src/bin/multiprio.rs
+++ b/embassy-nrf-examples/src/bin/multiprio.rs
@@ -90,7 +90,7 @@ async fn run_med() {
 
         let end = Instant::now();
         let ms = end.duration_since(start).as_ticks() / 33;
-        info!("    [med] done in {:u64} ms", ms);
+        info!("    [med] done in {} ms", ms);
 
         Timer::after(Duration::from_ticks(23421)).await;
     }
@@ -107,7 +107,7 @@ async fn run_low() {
 
         let end = Instant::now();
         let ms = end.duration_since(start).as_ticks() / 33;
-        info!("[low] done in {:u64} ms", ms);
+        info!("[low] done in {} ms", ms);
 
         Timer::after(Duration::from_ticks(32983)).await;
     }
diff --git a/embassy-nrf-examples/src/bin/qspi.rs b/embassy-nrf-examples/src/bin/qspi.rs
index 39326fa00..850681d7c 100644
--- a/embassy-nrf-examples/src/bin/qspi.rs
+++ b/embassy-nrf-examples/src/bin/qspi.rs
@@ -73,7 +73,7 @@ async fn run() {
 
     let mut id = [1; 3];
     q.custom_instruction(0x9F, &[], &mut id).await.unwrap();
-    info!("id: {:[u8]}", id);
+    info!("id: {}", id);
 
     // Read status register
     let mut status = [0; 1];
diff --git a/embassy-nrf-examples/src/bin/rtc_raw.rs b/embassy-nrf-examples/src/bin/rtc_raw.rs
index 7c60bb565..017487da8 100644
--- a/embassy-nrf-examples/src/bin/rtc_raw.rs
+++ b/embassy-nrf-examples/src/bin/rtc_raw.rs
@@ -48,15 +48,12 @@ fn main() -> ! {
     loop {
         let val2 = rtc.now();
         if val2 < val {
-            info!(
-                "timer ran backwards! {:u32} -> {:u32}",
-                val as u32, val2 as u32
-            );
+            info!("timer ran backwards! {} -> {}", val as u32, val2 as u32);
         }
         val = val2;
 
         if val > printval + 32768 {
-            info!("tick {:u32}", val as u32);
+            info!("tick {}", val as u32);
             printval = val;
         }
     }
diff --git a/embassy-nrf-examples/src/bin/uart.rs b/embassy-nrf-examples/src/bin/uart.rs
index 8b540fca9..50cdfd1e6 100644
--- a/embassy-nrf-examples/src/bin/uart.rs
+++ b/embassy-nrf-examples/src/bin/uart.rs
@@ -76,7 +76,7 @@ async fn run(uart: pac::UARTE0, port: pac::P0) {
         let received = &mut buf[..received_len];
 
         if !received.is_empty() {
-            info!("read done, got {:[u8]}", received);
+            info!("read done, got {}", received);
 
             // Echo back received data
             unwrap!(uart.send(received).await);
diff --git a/embassy-nrf-examples/src/example_common.rs b/embassy-nrf-examples/src/example_common.rs
index 60bb02082..d16964d4f 100644
--- a/embassy-nrf-examples/src/example_common.rs
+++ b/embassy-nrf-examples/src/example_common.rs
@@ -8,11 +8,11 @@ pub use defmt::*;
 
 use core::sync::atomic::{AtomicUsize, Ordering};
 
-#[defmt::timestamp]
-fn timestamp() -> u64 {
-    static COUNT: AtomicUsize = AtomicUsize::new(0);
-    // NOTE(no-CAS) `timestamps` runs with interrupts disabled
-    let n = COUNT.load(Ordering::Relaxed);
-    COUNT.store(n + 1, Ordering::Relaxed);
-    n as u64
+defmt::timestamp! {"{=u64}", {
+        static COUNT: AtomicUsize = AtomicUsize::new(0);
+        // NOTE(no-CAS) `timestamps` runs with interrupts disabled
+        let n = COUNT.load(Ordering::Relaxed);
+        COUNT.store(n + 1, Ordering::Relaxed);
+        n as u64
+    }
 }