Merge #690

690: Use embassy/defmt-timestamp-uptime in all examples. r=Dirbaio a=Dirbaio

bors r+

Co-authored-by: Dario Nieuwenhuis <[email protected]>

34 files changed, 123 insertions, 142 deletions

diff --git a/examples/nrf/src/bin/awaitable_timer.rs b/examples/nrf/src/bin/awaitable_timer.rs
index 98b656005..810b4bd6a 100644
--- a/examples/nrf/src/bin/awaitable_timer.rs
+++ b/examples/nrf/src/bin/awaitable_timer.rs
@@ -2,14 +2,14 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt::info;
+use embassy::executor::Spawner;
 use embassy_nrf::interrupt;
 use embassy_nrf::timer::Timer;
 use embassy_nrf::Peripherals;
-use example_common::info;
 
-use embassy::executor::Spawner;
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
diff --git a/examples/nrf/src/bin/blinky.rs b/examples/nrf/src/bin/blinky.rs
index 0fc004ed8..4828b08fb 100644
--- a/examples/nrf/src/bin/blinky.rs
+++ b/examples/nrf/src/bin/blinky.rs
@@ -2,14 +2,14 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy_nrf::gpio::{Level, Output, OutputDrive};
 use embassy_nrf::Peripherals;
 
+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.P0_13, Level::Low, OutputDrive::Standard);
diff --git a/examples/nrf/src/bin/buffered_uart.rs b/examples/nrf/src/bin/buffered_uart.rs
index a2602ea6c..2cd163a9f 100644
--- a/examples/nrf/src/bin/buffered_uart.rs
+++ b/examples/nrf/src/bin/buffered_uart.rs
@@ -2,16 +2,16 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
+use defmt::*;
 use embassy::executor::Spawner;
 use embassy::io::{AsyncBufReadExt, AsyncWriteExt};
 use embassy_nrf::buffered_uarte::State;
 use embassy_nrf::{buffered_uarte::BufferedUarte, interrupt, uarte, Peripherals};
-use example_common::*;
 use futures::pin_mut;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let mut config = uarte::Config::default();
diff --git a/examples/nrf/src/bin/executor_fairness_test.rs b/examples/nrf/src/bin/executor_fairness_test.rs
index 397bb16f6..7a356d14b 100644
--- a/examples/nrf/src/bin/executor_fairness_test.rs
+++ b/examples/nrf/src/bin/executor_fairness_test.rs
@@ -2,15 +2,15 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use example_common::*;
-
 use core::task::Poll;
+use defmt::{info, unwrap};
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Instant, Timer};
 use embassy_nrf::Peripherals;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::task]
 async fn run1() {
     loop {
diff --git a/examples/nrf/src/bin/gpiote_channel.rs b/examples/nrf/src/bin/gpiote_channel.rs
index f29dae022..339f779f8 100644
--- a/examples/nrf/src/bin/gpiote_channel.rs
+++ b/examples/nrf/src/bin/gpiote_channel.rs
@@ -2,15 +2,15 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use example_common::*;
-
+use defmt::info;
 use embassy::executor::Spawner;
 use embassy_nrf::gpio::{Input, Pull};
 use embassy_nrf::gpiote::{InputChannel, InputChannelPolarity};
 use embassy_nrf::Peripherals;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     info!("Starting!");
diff --git a/examples/nrf/src/bin/gpiote_port.rs b/examples/nrf/src/bin/gpiote_port.rs
index 3ea9a6e67..dc6bd301f 100644
--- a/examples/nrf/src/bin/gpiote_port.rs
+++ b/examples/nrf/src/bin/gpiote_port.rs
@@ -2,13 +2,13 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
+use defmt::{info, unwrap};
 use embassy::executor::Spawner;
 use embassy_nrf::gpio::{AnyPin, Input, Pin as _, Pull};
 use embassy_nrf::Peripherals;
-use example_common::*;
+
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 #[embassy::task(pool_size = 4)]
 async fn button_task(n: usize, mut pin: Input<'static, AnyPin>) {
diff --git a/examples/nrf/src/bin/mpsc.rs b/examples/nrf/src/bin/mpsc.rs
index d50736d82..0cb182755 100644
--- a/examples/nrf/src/bin/mpsc.rs
+++ b/examples/nrf/src/bin/mpsc.rs
@@ -2,9 +2,6 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use defmt::unwrap;
 use embassy::blocking_mutex::raw::NoopRawMutex;
 use embassy::channel::mpsc::{self, Channel, Sender, TryRecvError};
@@ -14,6 +11,9 @@ use embassy::util::Forever;
 use embassy_nrf::gpio::{Level, Output, OutputDrive};
 use embassy_nrf::Peripherals;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 enum LedState {
     On,
     Off,
diff --git a/examples/nrf/src/bin/multiprio.rs b/examples/nrf/src/bin/multiprio.rs
index 85e126908..e69f87d85 100644
--- a/examples/nrf/src/bin/multiprio.rs
+++ b/examples/nrf/src/bin/multiprio.rs
@@ -57,17 +57,17 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use example_common::*;
-
 use cortex_m_rt::entry;
+use defmt::{info, unwrap};
 use embassy::executor::{Executor, InterruptExecutor};
 use embassy::interrupt::InterruptExt;
 use embassy::time::{Duration, Instant, Timer};
 use embassy::util::Forever;
 use embassy_nrf::interrupt;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::task]
 async fn run_high() {
     loop {
diff --git a/examples/nrf/src/bin/nvmc.rs b/examples/nrf/src/bin/nvmc.rs
index f36895636..7a57399f8 100644
--- a/examples/nrf/src/bin/nvmc.rs
+++ b/examples/nrf/src/bin/nvmc.rs
@@ -2,14 +2,15 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt::{info, unwrap};
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy_nrf::nvmc::Nvmc;
 use embassy_nrf::Peripherals;
 use embedded_storage::nor_flash::{NorFlash, ReadNorFlash};
-use example_common::*;
+
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
diff --git a/examples/nrf/src/bin/ppi.rs b/examples/nrf/src/bin/ppi.rs
index 99246eeda..3c9a8148a 100644
--- a/examples/nrf/src/bin/ppi.rs
+++ b/examples/nrf/src/bin/ppi.rs
@@ -2,11 +2,8 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use example_common::*;
-
 use core::future::pending;
+use defmt::info;
 use embassy::executor::Spawner;
 use embassy_nrf::gpio::{Input, Level, Output, OutputDrive, Pull};
 use embassy_nrf::gpiote::{self, InputChannel, InputChannelPolarity};
@@ -14,6 +11,9 @@ use embassy_nrf::ppi::Ppi;
 use embassy_nrf::Peripherals;
 use gpiote::{OutputChannel, OutputChannelPolarity};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     info!("Starting!");
diff --git a/examples/nrf/src/bin/pwm.rs b/examples/nrf/src/bin/pwm.rs
index 68402ce22..7939e79e4 100644
--- a/examples/nrf/src/bin/pwm.rs
+++ b/examples/nrf/src/bin/pwm.rs
@@ -2,14 +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_nrf::pwm::{Prescaler, SimplePwm};
 use embassy_nrf::Peripherals;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 // for i in range(1024): print(int((math.sin(i/512*math.pi)*0.4+0.5)**2*32767), ', ', end='')
 static DUTY: [u16; 1024] = [
     8191, 8272, 8353, 8434, 8516, 8598, 8681, 8764, 8847, 8931, 9015, 9099, 9184, 9269, 9354, 9440,
diff --git a/examples/nrf/src/bin/pwm_double_sequence.rs b/examples/nrf/src/bin/pwm_double_sequence.rs
index 85938f32c..6fc429214 100644
--- a/examples/nrf/src/bin/pwm_double_sequence.rs
+++ b/examples/nrf/src/bin/pwm_double_sequence.rs
@@ -2,8 +2,6 @@
 #![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};
@@ -13,6 +11,9 @@ use embassy_nrf::pwm::{
 };
 use embassy_nrf::Peripherals;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let seq_words_0: [u16; 5] = [1000, 250, 100, 50, 0];
diff --git a/examples/nrf/src/bin/pwm_sequence.rs b/examples/nrf/src/bin/pwm_sequence.rs
index f42958145..3b2919ba5 100644
--- a/examples/nrf/src/bin/pwm_sequence.rs
+++ b/examples/nrf/src/bin/pwm_sequence.rs
@@ -2,8 +2,6 @@
 #![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};
@@ -12,6 +10,9 @@ use embassy_nrf::pwm::{
 };
 use embassy_nrf::Peripherals;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let seq_words: [u16; 5] = [1000, 250, 100, 50, 0];
diff --git a/examples/nrf/src/bin/pwm_sequence_ppi.rs b/examples/nrf/src/bin/pwm_sequence_ppi.rs
index 66717c592..1f3662c60 100644
--- a/examples/nrf/src/bin/pwm_sequence_ppi.rs
+++ b/examples/nrf/src/bin/pwm_sequence_ppi.rs
@@ -3,8 +3,6 @@
 #![feature(type_alias_impl_trait)]
 #![feature(array_from_fn)]
 
-#[path = "../example_common.rs"]
-mod example_common;
 use core::future::pending;
 use defmt::*;
 use embassy::executor::Spawner;
@@ -16,6 +14,9 @@ use embassy_nrf::pwm::{
 };
 use embassy_nrf::Peripherals;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let seq_words: [u16; 5] = [1000, 250, 100, 50, 0];
diff --git a/examples/nrf/src/bin/pwm_sequence_ws2812b.rs b/examples/nrf/src/bin/pwm_sequence_ws2812b.rs
index e5af7b462..8bfe1d50f 100644
--- a/examples/nrf/src/bin/pwm_sequence_ws2812b.rs
+++ b/examples/nrf/src/bin/pwm_sequence_ws2812b.rs
@@ -2,8 +2,6 @@
 #![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};
@@ -13,6 +11,9 @@ use embassy_nrf::pwm::{
 };
 use embassy_nrf::Peripherals;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 // WS2812B LED light demonstration. Drives just one light.
 // The following reference on WS2812B may be of use:
 // https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf.
diff --git a/examples/nrf/src/bin/pwm_servo.rs b/examples/nrf/src/bin/pwm_servo.rs
index c2ab0e7d1..40863bf3c 100644
--- a/examples/nrf/src/bin/pwm_servo.rs
+++ b/examples/nrf/src/bin/pwm_servo.rs
@@ -2,14 +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_nrf::pwm::{Prescaler, SimplePwm};
 use embassy_nrf::Peripherals;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let mut pwm = SimplePwm::new_1ch(p.PWM0, p.P0_05);
diff --git a/examples/nrf/src/bin/qspi.rs b/examples/nrf/src/bin/qspi.rs
index b2e6bfc15..ba60716c8 100644
--- a/examples/nrf/src/bin/qspi.rs
+++ b/examples/nrf/src/bin/qspi.rs
@@ -2,14 +2,13 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
-use defmt::assert_eq;
+use defmt::{assert_eq, info, unwrap};
 use embassy::executor::Spawner;
 use embassy_nrf::Peripherals;
 use embassy_nrf::{interrupt, qspi};
-use example_common::*;
+
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 const PAGE_SIZE: usize = 4096;
 
diff --git a/examples/nrf/src/bin/qspi_lowpower.rs b/examples/nrf/src/bin/qspi_lowpower.rs
index 4e264ef2f..a8184cd63 100644
--- a/examples/nrf/src/bin/qspi_lowpower.rs
+++ b/examples/nrf/src/bin/qspi_lowpower.rs
@@ -2,15 +2,15 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use core::mem;
+use defmt::{info, unwrap};
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy_nrf::Peripherals;
 use embassy_nrf::{interrupt, qspi};
-use example_common::*;
+
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 // Workaround for alignment requirements.
 // Nicer API will probably come in the future.
diff --git a/examples/nrf/src/bin/raw_spawn.rs b/examples/nrf/src/bin/raw_spawn.rs
index d0bd68674..1d9d3ed51 100644
--- a/examples/nrf/src/bin/raw_spawn.rs
+++ b/examples/nrf/src/bin/raw_spawn.rs
@@ -1,18 +1,17 @@
 #![no_std]
 #![no_main]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use example_common::*;
-
 use core::mem;
 use cortex_m_rt::entry;
-
+use defmt::{info, unwrap};
 use embassy::executor::raw::TaskStorage;
 use embassy::executor::Executor;
 use embassy::time::{Duration, Timer};
 use embassy::util::Forever;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 async fn run1() {
     loop {
         info!("BIG INFREQUENT TICK");
diff --git a/examples/nrf/src/bin/rng.rs b/examples/nrf/src/bin/rng.rs
index a35a9fa85..4b4b3a19b 100644
--- a/examples/nrf/src/bin/rng.rs
+++ b/examples/nrf/src/bin/rng.rs
@@ -2,15 +2,15 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use embassy::executor::Spawner;
 use embassy_nrf::interrupt;
 use embassy_nrf::rng::Rng;
 use embassy_nrf::Peripherals;
 use rand::Rng as _;
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let mut rng = Rng::new(p.RNG, interrupt::take!(RNG));
diff --git a/examples/nrf/src/bin/saadc.rs b/examples/nrf/src/bin/saadc.rs
index bc6b2b52c..5835be31f 100644
--- a/examples/nrf/src/bin/saadc.rs
+++ b/examples/nrf/src/bin/saadc.rs
@@ -2,13 +2,14 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt::info;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy_nrf::saadc::{ChannelConfig, Config, Saadc};
 use embassy_nrf::{interrupt, Peripherals};
-use example_common::*;
+
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, mut p: Peripherals) {
diff --git a/examples/nrf/src/bin/saadc_continuous.rs b/examples/nrf/src/bin/saadc_continuous.rs
index bdf552fba..5e357f79b 100644
--- a/examples/nrf/src/bin/saadc_continuous.rs
+++ b/examples/nrf/src/bin/saadc_continuous.rs
@@ -2,14 +2,15 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
+use defmt::info;
 use embassy::executor::Spawner;
 use embassy::time::Duration;
 use embassy_nrf::saadc::{ChannelConfig, Config, Saadc, SamplerState};
 use embassy_nrf::timer::Frequency;
 use embassy_nrf::{interrupt, Peripherals};
-use example_common::*;
+
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 // Demonstrates both continuous sampling and scanning multiple channels driven by a PPI linked timer
 
diff --git a/examples/nrf/src/bin/spim.rs b/examples/nrf/src/bin/spim.rs
index cda3baa26..f2a4ab388 100644
--- a/examples/nrf/src/bin/spim.rs
+++ b/examples/nrf/src/bin/spim.rs
@@ -2,14 +2,14 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
+use defmt::{info, unwrap};
 use embassy::executor::Spawner;
 use embassy_nrf::gpio::{Level, Output, OutputDrive};
 use embassy_nrf::Peripherals;
 use embassy_nrf::{interrupt, spim};
-use example_common::*;
+
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
diff --git a/examples/nrf/src/bin/temp.rs b/examples/nrf/src/bin/temp.rs
index 4b30b6ea3..aa807910f 100644
--- a/examples/nrf/src/bin/temp.rs
+++ b/examples/nrf/src/bin/temp.rs
@@ -2,16 +2,14 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use example_common::*;
-
-use embassy::{
-    executor::Spawner,
-    time::{Duration, Timer},
-};
+use defmt::info;
+use embassy::executor::Spawner;
+use embassy::time::{Duration, Timer};
 use embassy_nrf::{interrupt, temp::Temp, Peripherals};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let irq = interrupt::take!(TEMP);
diff --git a/examples/nrf/src/bin/timer.rs b/examples/nrf/src/bin/timer.rs
index f27081b74..ff8ee9a86 100644
--- a/examples/nrf/src/bin/timer.rs
+++ b/examples/nrf/src/bin/timer.rs
@@ -2,13 +2,13 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use embassy_nrf::Peripherals;
-use example_common::*;
-
+use defmt::{info, unwrap};
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
+use embassy_nrf::Peripherals;
+
+use defmt_rtt as _; // global logger
+use panic_probe as _;
 
 #[embassy::task]
 async fn run1() {
diff --git a/examples/nrf/src/bin/twim.rs b/examples/nrf/src/bin/twim.rs
index 1ac3a3945..08c614157 100644
--- a/examples/nrf/src/bin/twim.rs
+++ b/examples/nrf/src/bin/twim.rs
@@ -6,14 +6,14 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use defmt::*;
 use embassy::executor::Spawner;
 use embassy_nrf::twim::{self, Twim};
 use embassy_nrf::{interrupt, Peripherals};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 const ADDRESS: u8 = 0x50;
 
 #[embassy::main]
diff --git a/examples/nrf/src/bin/twim_lowpower.rs b/examples/nrf/src/bin/twim_lowpower.rs
index 4a0596437..45b347ea0 100644
--- a/examples/nrf/src/bin/twim_lowpower.rs
+++ b/examples/nrf/src/bin/twim_lowpower.rs
@@ -8,17 +8,16 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use core::mem;
-
 use defmt::*;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy_nrf::twim::{self, Twim};
 use embassy_nrf::{interrupt, Peripherals};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 const ADDRESS: u8 = 0x50;
 
 #[embassy::main]
diff --git a/examples/nrf/src/bin/uart.rs b/examples/nrf/src/bin/uart.rs
index 5dc89df66..91f7f4fdd 100644
--- a/examples/nrf/src/bin/uart.rs
+++ b/examples/nrf/src/bin/uart.rs
@@ -2,13 +2,13 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use example_common::*;
-
+use defmt::*;
 use embassy::executor::Spawner;
 use embassy_nrf::{interrupt, uarte, Peripherals};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let mut config = uarte::Config::default();
diff --git a/examples/nrf/src/bin/uart_idle.rs b/examples/nrf/src/bin/uart_idle.rs
index 88dc185af..89336faaf 100644
--- a/examples/nrf/src/bin/uart_idle.rs
+++ b/examples/nrf/src/bin/uart_idle.rs
@@ -2,13 +2,13 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use example_common::*;
-
+use defmt::*;
 use embassy::executor::Spawner;
 use embassy_nrf::{interrupt, uarte, Peripherals};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let mut config = uarte::Config::default();
diff --git a/examples/nrf/src/bin/uart_split.rs b/examples/nrf/src/bin/uart_split.rs
index 19d438c40..909429b1a 100644
--- a/examples/nrf/src/bin/uart_split.rs
+++ b/examples/nrf/src/bin/uart_split.rs
@@ -2,10 +2,7 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-use example_common::*;
-
+use defmt::*;
 use embassy::blocking_mutex::raw::NoopRawMutex;
 use embassy::channel::mpsc::{self, Channel, Sender};
 use embassy::executor::Spawner;
@@ -14,6 +11,9 @@ use embassy_nrf::peripherals::UARTE0;
 use embassy_nrf::uarte::UarteRx;
 use embassy_nrf::{interrupt, uarte, Peripherals};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _;
+
 static CHANNEL: Forever<Channel<NoopRawMutex, [u8; 8], 1>> = Forever::new();
 
 #[embassy::main]
diff --git a/examples/nrf/src/bin/usb_uart.rs b/examples/nrf/src/bin/usb_uart.rs
index c345df9e3..d283dccd1 100644
--- a/examples/nrf/src/bin/usb_uart.rs
+++ b/examples/nrf/src/bin/usb_uart.rs
@@ -2,21 +2,18 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use defmt::{info, unwrap};
-use defmt_rtt as _; // global logger
-use embassy::interrupt::InterruptExt;
-use futures::pin_mut;
-use panic_probe as _; // print out panic messages
-
 use embassy::executor::Spawner;
+use embassy::interrupt::InterruptExt;
 use embassy::io::{AsyncBufReadExt, AsyncWriteExt};
 use embassy_nrf::usb::{State, Usb, UsbBus, UsbSerial};
 use embassy_nrf::{interrupt, Peripherals};
+use futures::pin_mut;
 use usb_device::device::{UsbDeviceBuilder, UsbVidPid};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _; // print out panic messages
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let mut rx_buffer = [0u8; 64];
diff --git a/examples/nrf/src/bin/usb_uart_io.rs b/examples/nrf/src/bin/usb_uart_io.rs
index 8fc615262..ef2629844 100644
--- a/examples/nrf/src/bin/usb_uart_io.rs
+++ b/examples/nrf/src/bin/usb_uart_io.rs
@@ -2,13 +2,7 @@
 #![no_main]
 #![feature(type_alias_impl_trait)]
 
-#[path = "../example_common.rs"]
-mod example_common;
-
 use defmt::{info, unwrap};
-use defmt_rtt as _; // global logger
-use panic_probe as _; // print out panic messages
-
 use embassy::executor::Spawner;
 use embassy::interrupt::InterruptExt;
 use embassy::io::{read_line, AsyncWriteExt};
@@ -17,6 +11,9 @@ use embassy_nrf::{interrupt, Peripherals};
 use futures::pin_mut;
 use usb_device::device::{UsbDeviceBuilder, UsbVidPid};
 
+use defmt_rtt as _; // global logger
+use panic_probe as _; // print out panic messages
+
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
     let mut rx_buffer = [0u8; 64];
diff --git a/examples/nrf/src/bin/wdt.rs b/examples/nrf/src/bin/wdt.rs
index cc199be9d..431ccca8b 100644
--- a/examples/nrf/src/bin/wdt.rs
+++ b/examples/nrf/src/bin/wdt.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_nrf::gpio::{Input, Pull};
 use embassy_nrf::wdt::{Config, Watchdog};
 use embassy_nrf::Peripherals;
 
+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/nrf/src/example_common.rs b/examples/nrf/src/example_common.rs
deleted file mode 100644
index 54d633837..000000000
--- a/examples/nrf/src/example_common.rs
+++ /dev/null
@@ -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
-    }
-}