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

8 files changed, 31 insertions, 54 deletions

diff --git a/examples/stm32f7/src/bin/blinky.rs b/examples/stm32f7/src/bin/blinky.rs
index 00d67dac0..8b85ca96d 100644
--- a/examples/stm32f7/src/bin/blinky.rs
+++ b/examples/stm32f7/src/bin/blinky.rs
@@ -2,13 +2,13 @@
 #![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::time::{Duration, Timer};
 use embassy_stm32::gpio::{Level, Output, Speed};
 use embassy_stm32::Peripherals;
-use example_common::*;
+use panic_probe as _;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
diff --git a/examples/stm32f7/src/bin/button.rs b/examples/stm32f7/src/bin/button.rs
index 24eef75b2..4f9af7fbd 100644
--- a/examples/stm32f7/src/bin/button.rs
+++ b/examples/stm32f7/src/bin/button.rs
@@ -2,11 +2,11 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
 use cortex_m_rt::entry;
+use defmt::*;
+use defmt_rtt as _; // global logger
 use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
-use example_common::*;
+use panic_probe as _;
 
 #[entry]
 fn main() -> ! {
diff --git a/examples/stm32f7/src/bin/button_exti.rs b/examples/stm32f7/src/bin/button_exti.rs
index 852fbe3c6..78f2e6ee2 100644
--- a/examples/stm32f7/src/bin/button_exti.rs
+++ b/examples/stm32f7/src/bin/button_exti.rs
@@ -2,13 +2,13 @@
 #![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::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_stm32::Peripherals;
-use example_common::*;
+use panic_probe as _;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
diff --git a/examples/stm32f7/src/bin/eth.rs b/examples/stm32f7/src/bin/eth.rs
index 15169d2dc..446756c29 100644
--- a/examples/stm32f7/src/bin/eth.rs
+++ b/examples/stm32f7/src/bin/eth.rs
@@ -2,14 +2,8 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use embassy_stm32::peripherals::ETH;
-use example_common::config;
-
 use cortex_m_rt::entry;
-use defmt::{info, unwrap};
-use defmt_rtt as _; // global logger
+use defmt::*;
 use embassy::executor::{Executor, Spawner};
 use embassy::io::AsyncWriteExt;
 use embassy::time::{Duration, Timer};
@@ -19,12 +13,16 @@ use embassy_net::{
 };
 use embassy_stm32::eth::lan8742a::LAN8742A;
 use embassy_stm32::eth::{Ethernet, State};
+use embassy_stm32::interrupt;
+use embassy_stm32::peripherals::ETH;
+use embassy_stm32::peripherals::RNG;
 use embassy_stm32::rng::Rng;
-use embassy_stm32::{interrupt, peripherals};
+use embassy_stm32::time::U32Ext;
+use embassy_stm32::Config;
 use heapless::Vec;
-use panic_probe as _;
 
-use peripherals::RNG;
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 #[embassy::task]
 async fn main_task(
@@ -88,6 +86,12 @@ static ETH: Forever<Ethernet<'static, ETH, LAN8742A, 4, 4>> = Forever::new();
 static CONFIG: Forever<StaticConfigurator> = Forever::new();
 static NET_RESOURCES: Forever<StackResources<1, 2, 8>> = Forever::new();
 
+fn config() -> Config {
+    let mut config = Config::default();
+    config.rcc.sys_ck = Some(200.mhz().into());
+    config
+}
+
 #[entry]
 fn main() -> ! {
     info!("Hello World!");
diff --git a/examples/stm32f7/src/bin/hello.rs b/examples/stm32f7/src/bin/hello.rs
index 56eb67bf3..92d87cedf 100644
--- a/examples/stm32f7/src/bin/hello.rs
+++ b/examples/stm32f7/src/bin/hello.rs
@@ -9,8 +9,8 @@ use embassy_stm32::time::Hertz;
 use embassy_stm32::Config;
 use embassy_stm32::Peripherals;
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 fn config() -> Config {
     let mut config = Config::default();
diff --git a/examples/stm32f7/src/bin/sdmmc.rs b/examples/stm32f7/src/bin/sdmmc.rs
index 57b913db9..dae07c303 100644
--- a/examples/stm32f7/src/bin/sdmmc.rs
+++ b/examples/stm32f7/src/bin/sdmmc.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::sdmmc::Sdmmc;
 use embassy_stm32::time::U32Ext;
 use embassy_stm32::{interrupt, Config, Peripherals};
-use example_common::*;
 
 fn config() -> Config {
     let mut config = Config::default();
diff --git a/examples/stm32f7/src/bin/usart_dma.rs b/examples/stm32f7/src/bin/usart_dma.rs
index 00deae8b3..69fa21a0d 100644
--- a/examples/stm32f7/src/bin/usart_dma.rs
+++ b/examples/stm32f7/src/bin/usart_dma.rs
@@ -2,14 +2,14 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
 use core::fmt::Write;
+use defmt::*;
+use defmt_rtt as _; // global logger
 use embassy::executor::Spawner;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::usart::{Config, Uart};
 use embassy_stm32::Peripherals;
-use example_common::*;
+use panic_probe as _;
 
 use heapless::String;
 
diff --git a/examples/stm32f7/src/example_common.rs b/examples/stm32f7/src/example_common.rs
deleted file mode 100644
index a786cb114..000000000
--- a/examples/stm32f7/src/example_common.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-#![macro_use]
-
-use defmt_rtt as _;
-use embassy_stm32::time::U32Ext;
-use embassy_stm32::Config;
-// 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
-    }
-}
-
-#[allow(unused)]
-pub fn config() -> Config {
-    let mut config = Config::default();
-    config.rcc.sys_ck = Some(200.mhz().into());
-    config
-}