Use embassy/defmt-timestamp-uptime in all examples.

examples/stm32l0/Cargo.toml

@@ -10,7 +10,7 @@ default = ["nightly"]
 nightly = ["embassy-stm32/nightly", "embassy-lora", "lorawan-device", "lorawan-encoding"]
 
 [dependencies]
-embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] }
+embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime"] }
 embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32l072cz", "time-driver-any", "exti", "unstable-traits", "memory-x"]  }
 
 embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["sx127x", "time", "defmt"], optional = true}

examples/stm32l0/src/bin/blinky.rs

@@ -2,14 +2,14 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
+use defmt::*;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy_stm32::gpio::{Level, Output, Speed};
 use embassy_stm32::Peripherals;
-use example_common::*;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {

examples/stm32l0/src/bin/button.rs

@@ -2,12 +2,12 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt::*;
+use defmt_rtt as _; // global logger
 use embassy::executor::Spawner;
 use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
 use embassy_stm32::Peripherals;
-use example_common::*;
+use panic_probe as _;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {

examples/stm32l0/src/bin/button_exti.rs

@@ -2,14 +2,14 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
+use defmt::*;
 use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use example_common::*;
 
 fn config() -> embassy_stm32::Config {
     let mut config = embassy_stm32::Config::default();

examples/stm32l0/src/bin/lorawan.rs

@@ -6,8 +6,8 @@
 #![feature(generic_associated_types)]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 use embassy_lora::{sx127x::*, LoraTimer};
 use embassy_stm32::{

examples/stm32l0/src/bin/raw_spawn.rs

@@ -1,9 +1,9 @@
 #![no_std]
 #![no_main]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use example_common::*;
+use defmt::*;
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 use core::mem;
 use cortex_m_rt::entry;

examples/stm32l0/src/bin/spi.rs

@@ -2,12 +2,12 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
+use defmt::*;
 use embassy::executor::Spawner;
 use embassy_stm32::gpio::{Level, Output, Speed};
-use example_common::*;
 
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::spi::{Config, Spi};

examples/stm32l0/src/bin/usart_dma.rs

@@ -2,10 +2,10 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
-use example_common::*;
+use defmt::*;
 
 use embassy::executor::Spawner;
 use embassy_stm32::usart::{Config, Uart};

examples/stm32l0/src/bin/usart_irq.rs

@@ -2,10 +2,10 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
-use example_common::*;
+use defmt::*;
 
 use embassy::executor::Spawner;
 use embassy::io::{AsyncBufReadExt, AsyncWriteExt};

examples/stm32l0/src/example_common.rs

@@ -1,17 +0,0 @@
-#![macro_use]
-
-use defmt_rtt as _; // global logger
-use panic_probe as _;
-
-pub use defmt::*;
-
-use core::sync::atomic::{AtomicUsize, Ordering};
-
-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
-    }
-}