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

6 files changed, 15 insertions, 28 deletions

diff --git a/examples/rp/src/bin/blinky.rs b/examples/rp/src/bin/blinky.rs
index 96e45f697..6f199d07e 100644
--- a/examples/rp/src/bin/blinky.rs
+++ b/examples/rp/src/bin/blinky.rs
@@ -2,15 +2,15 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use defmt::*;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy_rp::{gpio, Peripherals};
 use gpio::{Level, Output};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let mut led = Output::new(p.PIN_25, Level::Low);
diff --git a/examples/rp/src/bin/button.rs b/examples/rp/src/bin/button.rs
index 6492367e5..2418ad012 100644
--- a/examples/rp/src/bin/button.rs
+++ b/examples/rp/src/bin/button.rs
@@ -2,13 +2,13 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use embassy::executor::Spawner;
 use embassy_rp::gpio::{Input, Level, Output, Pull};
 use embassy_rp::Peripherals;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let button = Input::new(p.PIN_28, Pull::Up);
diff --git a/examples/rp/src/bin/spi.rs b/examples/rp/src/bin/spi.rs
index 3348dc999..b38424363 100644
--- a/examples/rp/src/bin/spi.rs
+++ b/examples/rp/src/bin/spi.rs
@@ -2,9 +2,6 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use defmt::*;
 use embassy::executor::Spawner;
 use embassy_rp::spi;
@@ -12,6 +9,9 @@ use embassy_rp::spi::Spi;
 use embassy_rp::{gpio, Peripherals};
 use gpio::{Level, Output};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     info!("Hello World!");
diff --git a/examples/rp/src/bin/spi_display.rs b/examples/rp/src/bin/spi_display.rs
index b2854afcb..bc93e0617 100644
--- a/examples/rp/src/bin/spi_display.rs
+++ b/examples/rp/src/bin/spi_display.rs
@@ -2,11 +2,7 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use core::cell::RefCell;
-
 use defmt::*;
 use embassy::executor::Spawner;
 use embassy::time::Delay;
@@ -27,6 +23,9 @@ use crate::my_display_interface::SPIDeviceInterface;
 use crate::shared_spi::SpiDeviceWithCs;
 use crate::touch::Touch;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 //const DISPLAY_FREQ: u32 = 64_000_000;
 const TOUCH_FREQ: u32 = 200_000;
 
diff --git a/examples/rp/src/bin/uart.rs b/examples/rp/src/bin/uart.rs
index 8354f9f82..bc941dd8b 100644
--- a/examples/rp/src/bin/uart.rs
+++ b/examples/rp/src/bin/uart.rs
@@ -2,12 +2,12 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use embassy::executor::Spawner;
 use embassy_rp::{uart, Peripherals};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let config = uart::Config::default();
diff --git a/examples/rp/src/example_common.rs b/examples/rp/src/example_common.rs
deleted file mode 100644
index f7c4ef57a..000000000
--- a/examples/rp/src/example_common.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use core::sync::atomic::{AtomicUsize, Ordering};
-use defmt_rtt as _;
-use panic_probe as _;
-
-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
-}
-}