diff options
author | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2022-04-02 04:35:06 +0200 |
---|---|---|
committer | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2022-04-02 04:35:06 +0200 |
commit | 82803bffdab0842bf6c3e4bce21131d437b06669 (patch) | |
tree | 588c65c93b31b897f53d389f7876dc2703eb0fa8 /examples/stm32f3/src/bin | |
parent | a9e63167e1ec230ca3d28da771378f5f4936a840 (diff) | |
download | embassy-82803bffdab0842bf6c3e4bce21131d437b06669.zip |
Use embassy/defmt-timestamp-uptime in all examples.
Diffstat (limited to 'examples/stm32f3/src/bin')
-rw-r--r-- | examples/stm32f3/src/bin/blinky.rs | 8 | ||||
-rw-r--r-- | examples/stm32f3/src/bin/button.rs | 6 | ||||
-rw-r--r-- | examples/stm32f3/src/bin/button_events.rs | 7 | ||||
-rw-r--r-- | examples/stm32f3/src/bin/button_exti.rs | 6 | ||||
-rw-r--r-- | examples/stm32f3/src/bin/hello.rs | 4 | ||||
-rw-r--r-- | examples/stm32f3/src/bin/multiprio.rs | 6 | ||||
-rw-r--r-- | examples/stm32f3/src/bin/spi_dma.rs | 6 | ||||
-rw-r--r-- | examples/stm32f3/src/bin/usart_dma.rs | 6 |
8 files changed, 25 insertions, 24 deletions
diff --git a/examples/stm32f3/src/bin/blinky.rs b/examples/stm32f3/src/bin/blinky.rs index e8b8dc23..b3643a26 100644 --- a/examples/stm32f3/src/bin/blinky.rs +++ b/examples/stm32f3/src/bin/blinky.rs @@ -2,14 +2,14 @@ #![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_stm32::gpio::{Level, Output, Speed}; use embassy_stm32::Peripherals; -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/stm32f3/src/bin/button.rs b/examples/stm32f3/src/bin/button.rs index 131d4af4..207381bd 100644 --- a/examples/stm32f3/src/bin/button.rs +++ b/examples/stm32f3/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/stm32f3/src/bin/button_events.rs b/examples/stm32f3/src/bin/button_events.rs index 0bd7b342..99aab302 100644 --- a/examples/stm32f3/src/bin/button_events.rs +++ b/examples/stm32f3/src/bin/button_events.rs @@ -10,8 +10,7 @@ #![no_main] #![feature(type_alias_impl_trait)] -#[path = "../example_common.rs"] -mod example_common; +use defmt::*; use embassy::blocking_mutex::raw::NoopRawMutex; use embassy::channel::mpsc::{self, Channel, Receiver, Sender}; use embassy::executor::Spawner; @@ -21,7 +20,9 @@ use embassy_stm32::exti::ExtiInput; use embassy_stm32::gpio::{AnyPin, Input, Level, Output, Pin, Pull, Speed}; use embassy_stm32::peripherals::PA0; use embassy_stm32::Peripherals; -use example_common::*; + +use defmt_rtt as _; // global logger +use panic_probe as _; struct Leds<'a> { leds: [Output<'a, AnyPin>; 8], diff --git a/examples/stm32f3/src/bin/button_exti.rs b/examples/stm32f3/src/bin/button_exti.rs index b11f38ea..68d16636 100644 --- a/examples/stm32f3/src/bin/button_exti.rs +++ b/examples/stm32f3/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/stm32f3/src/bin/hello.rs b/examples/stm32f3/src/bin/hello.rs index 9a67419f..a79d6838 100644 --- a/examples/stm32f3/src/bin/hello.rs +++ b/examples/stm32f3/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/stm32f3/src/bin/multiprio.rs b/examples/stm32f3/src/bin/multiprio.rs index 9d975483..1c940154 100644 --- a/examples/stm32f3/src/bin/multiprio.rs +++ b/examples/stm32f3/src/bin/multiprio.rs @@ -57,9 +57,9 @@ #![no_main] #![feature(type_alias_impl_trait)] -#[path = "../example_common.rs"] -mod example_common; -use example_common::*; +use defmt::*; +use defmt_rtt as _; // global logger +use panic_probe as _; use cortex_m_rt::entry; use embassy::executor::{Executor, InterruptExecutor}; diff --git a/examples/stm32f3/src/bin/spi_dma.rs b/examples/stm32f3/src/bin/spi_dma.rs index bd66b120..6d80c408 100644 --- a/examples/stm32f3/src/bin/spi_dma.rs +++ b/examples/stm32f3/src/bin/spi_dma.rs @@ -2,16 +2,16 @@ #![no_main] #![feature(type_alias_impl_trait)] -#[path = "../example_common.rs"] -mod example_common; use core::fmt::Write; use core::str::from_utf8; +use defmt::*; +use defmt_rtt as _; // global logger use embassy::executor::Spawner; use embassy_stm32::spi::{Config, Spi}; use embassy_stm32::time::Hertz; use embassy_stm32::Peripherals; -use example_common::*; use heapless::String; +use panic_probe as _; #[embassy::main] async fn main(_spawner: Spawner, p: Peripherals) { diff --git a/examples/stm32f3/src/bin/usart_dma.rs b/examples/stm32f3/src/bin/usart_dma.rs index 0e67bb1f..859749eb 100644 --- a/examples/stm32f3/src/bin/usart_dma.rs +++ b/examples/stm32f3/src/bin/usart_dma.rs @@ -2,15 +2,15 @@ #![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 heapless::String; +use panic_probe as _; #[embassy::main] async fn main(_spawner: Spawner, p: Peripherals) { |