diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-04-02 04:35:06 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-04-02 04:35:06 +0200 |
| commit | 82803bffdab0842bf6c3e4bce21131d437b06669 (patch) | |
| tree | 588c65c93b31b897f53d389f7876dc2703eb0fa8 /examples/stm32f3/src/bin | |
| parent | a9e63167e1ec230ca3d28da771378f5f4936a840 (diff) | |
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 e8b8dc23f..b3643a26f 100644 --- a/examples/stm32f3/src/bin/blinky.rs +++ b/examples/stm32f3/src/bin/blinky.rs | |||
| @@ -2,14 +2,14 @@ | |||
| 2 | #![no_main] | 2 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 3 | #![feature(type_alias_impl_trait)] |
| 4 | 4 | ||
| 5 | #[path = "../example_common.rs"] | 5 | use defmt::*; |
| 6 | mod example_common; | ||
| 7 | |||
| 8 | use embassy::executor::Spawner; | 6 | use embassy::executor::Spawner; |
| 9 | use embassy::time::{Duration, Timer}; | 7 | use embassy::time::{Duration, Timer}; |
| 10 | use embassy_stm32::gpio::{Level, Output, Speed}; | 8 | use embassy_stm32::gpio::{Level, Output, Speed}; |
| 11 | use embassy_stm32::Peripherals; | 9 | use embassy_stm32::Peripherals; |
| 12 | use example_common::*; | 10 | |
| 11 | use defmt_rtt as _; // global logger | ||
| 12 | use panic_probe as _; | ||
| 13 | 13 | ||
| 14 | #[embassy::main] | 14 | #[embassy::main] |
| 15 | async fn main(_spawner: Spawner, p: Peripherals) { | 15 | async fn main(_spawner: Spawner, p: Peripherals) { |
diff --git a/examples/stm32f3/src/bin/button.rs b/examples/stm32f3/src/bin/button.rs index 131d4af42..207381bdd 100644 --- a/examples/stm32f3/src/bin/button.rs +++ b/examples/stm32f3/src/bin/button.rs | |||
| @@ -2,11 +2,11 @@ | |||
| 2 | #![no_main] | 2 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 3 | #![feature(type_alias_impl_trait)] |
| 4 | 4 | ||
| 5 | #[path = "../example_common.rs"] | ||
| 6 | mod example_common; | ||
| 7 | use cortex_m_rt::entry; | 5 | use cortex_m_rt::entry; |
| 6 | use defmt::*; | ||
| 7 | use defmt_rtt as _; // global logger | ||
| 8 | use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; | 8 | use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; |
| 9 | use example_common::*; | 9 | use panic_probe as _; |
| 10 | 10 | ||
| 11 | #[entry] | 11 | #[entry] |
| 12 | fn main() -> ! { | 12 | fn main() -> ! { |
diff --git a/examples/stm32f3/src/bin/button_events.rs b/examples/stm32f3/src/bin/button_events.rs index 0bd7b342f..99aab3027 100644 --- a/examples/stm32f3/src/bin/button_events.rs +++ b/examples/stm32f3/src/bin/button_events.rs | |||
| @@ -10,8 +10,7 @@ | |||
| 10 | #![no_main] | 10 | #![no_main] |
| 11 | #![feature(type_alias_impl_trait)] | 11 | #![feature(type_alias_impl_trait)] |
| 12 | 12 | ||
| 13 | #[path = "../example_common.rs"] | 13 | use defmt::*; |
| 14 | mod example_common; | ||
| 15 | use embassy::blocking_mutex::raw::NoopRawMutex; | 14 | use embassy::blocking_mutex::raw::NoopRawMutex; |
| 16 | use embassy::channel::mpsc::{self, Channel, Receiver, Sender}; | 15 | use embassy::channel::mpsc::{self, Channel, Receiver, Sender}; |
| 17 | use embassy::executor::Spawner; | 16 | use embassy::executor::Spawner; |
| @@ -21,7 +20,9 @@ use embassy_stm32::exti::ExtiInput; | |||
| 21 | use embassy_stm32::gpio::{AnyPin, Input, Level, Output, Pin, Pull, Speed}; | 20 | use embassy_stm32::gpio::{AnyPin, Input, Level, Output, Pin, Pull, Speed}; |
| 22 | use embassy_stm32::peripherals::PA0; | 21 | use embassy_stm32::peripherals::PA0; |
| 23 | use embassy_stm32::Peripherals; | 22 | use embassy_stm32::Peripherals; |
| 24 | use example_common::*; | 23 | |
| 24 | use defmt_rtt as _; // global logger | ||
| 25 | use panic_probe as _; | ||
| 25 | 26 | ||
| 26 | struct Leds<'a> { | 27 | struct Leds<'a> { |
| 27 | leds: [Output<'a, AnyPin>; 8], | 28 | leds: [Output<'a, AnyPin>; 8], |
diff --git a/examples/stm32f3/src/bin/button_exti.rs b/examples/stm32f3/src/bin/button_exti.rs index b11f38ea5..68d166367 100644 --- a/examples/stm32f3/src/bin/button_exti.rs +++ b/examples/stm32f3/src/bin/button_exti.rs | |||
| @@ -2,13 +2,13 @@ | |||
| 2 | #![no_main] | 2 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 3 | #![feature(type_alias_impl_trait)] |
| 4 | 4 | ||
| 5 | #[path = "../example_common.rs"] | 5 | use defmt::*; |
| 6 | mod example_common; | 6 | use defmt_rtt as _; // global logger |
| 7 | use embassy::executor::Spawner; | 7 | use embassy::executor::Spawner; |
| 8 | use embassy_stm32::exti::ExtiInput; | 8 | use embassy_stm32::exti::ExtiInput; |
| 9 | use embassy_stm32::gpio::{Input, Pull}; | 9 | use embassy_stm32::gpio::{Input, Pull}; |
| 10 | use embassy_stm32::Peripherals; | 10 | use embassy_stm32::Peripherals; |
| 11 | use example_common::*; | 11 | use panic_probe as _; |
| 12 | 12 | ||
| 13 | #[embassy::main] | 13 | #[embassy::main] |
| 14 | async fn main(_spawner: Spawner, p: Peripherals) { | 14 | async fn main(_spawner: Spawner, p: Peripherals) { |
diff --git a/examples/stm32f3/src/bin/hello.rs b/examples/stm32f3/src/bin/hello.rs index 9a67419fb..a79d6838c 100644 --- a/examples/stm32f3/src/bin/hello.rs +++ b/examples/stm32f3/src/bin/hello.rs | |||
| @@ -9,8 +9,8 @@ use embassy_stm32::time::Hertz; | |||
| 9 | use embassy_stm32::Config; | 9 | use embassy_stm32::Config; |
| 10 | use embassy_stm32::Peripherals; | 10 | use embassy_stm32::Peripherals; |
| 11 | 11 | ||
| 12 | #[path = "../example_common.rs"] | 12 | use defmt_rtt as _; // global logger |
| 13 | mod example_common; | 13 | use panic_probe as _; |
| 14 | 14 | ||
| 15 | fn config() -> Config { | 15 | fn config() -> Config { |
| 16 | let mut config = Config::default(); | 16 | let mut config = Config::default(); |
diff --git a/examples/stm32f3/src/bin/multiprio.rs b/examples/stm32f3/src/bin/multiprio.rs index 9d9754833..1c9401549 100644 --- a/examples/stm32f3/src/bin/multiprio.rs +++ b/examples/stm32f3/src/bin/multiprio.rs | |||
| @@ -57,9 +57,9 @@ | |||
| 57 | #![no_main] | 57 | #![no_main] |
| 58 | #![feature(type_alias_impl_trait)] | 58 | #![feature(type_alias_impl_trait)] |
| 59 | 59 | ||
| 60 | #[path = "../example_common.rs"] | 60 | use defmt::*; |
| 61 | mod example_common; | 61 | use defmt_rtt as _; // global logger |
| 62 | use example_common::*; | 62 | use panic_probe as _; |
| 63 | 63 | ||
| 64 | use cortex_m_rt::entry; | 64 | use cortex_m_rt::entry; |
| 65 | use embassy::executor::{Executor, InterruptExecutor}; | 65 | use embassy::executor::{Executor, InterruptExecutor}; |
diff --git a/examples/stm32f3/src/bin/spi_dma.rs b/examples/stm32f3/src/bin/spi_dma.rs index bd66b1202..6d80c4087 100644 --- a/examples/stm32f3/src/bin/spi_dma.rs +++ b/examples/stm32f3/src/bin/spi_dma.rs | |||
| @@ -2,16 +2,16 @@ | |||
| 2 | #![no_main] | 2 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 3 | #![feature(type_alias_impl_trait)] |
| 4 | 4 | ||
| 5 | #[path = "../example_common.rs"] | ||
| 6 | mod example_common; | ||
| 7 | use core::fmt::Write; | 5 | use core::fmt::Write; |
| 8 | use core::str::from_utf8; | 6 | use core::str::from_utf8; |
| 7 | use defmt::*; | ||
| 8 | use defmt_rtt as _; // global logger | ||
| 9 | use embassy::executor::Spawner; | 9 | use embassy::executor::Spawner; |
| 10 | use embassy_stm32::spi::{Config, Spi}; | 10 | use embassy_stm32::spi::{Config, Spi}; |
| 11 | use embassy_stm32::time::Hertz; | 11 | use embassy_stm32::time::Hertz; |
| 12 | use embassy_stm32::Peripherals; | 12 | use embassy_stm32::Peripherals; |
| 13 | use example_common::*; | ||
| 14 | use heapless::String; | 13 | use heapless::String; |
| 14 | use panic_probe as _; | ||
| 15 | 15 | ||
| 16 | #[embassy::main] | 16 | #[embassy::main] |
| 17 | async fn main(_spawner: Spawner, p: Peripherals) { | 17 | 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 0e67bb1f1..859749eb7 100644 --- a/examples/stm32f3/src/bin/usart_dma.rs +++ b/examples/stm32f3/src/bin/usart_dma.rs | |||
| @@ -2,15 +2,15 @@ | |||
| 2 | #![no_main] | 2 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 3 | #![feature(type_alias_impl_trait)] |
| 4 | 4 | ||
| 5 | #[path = "../example_common.rs"] | ||
| 6 | mod example_common; | ||
| 7 | use core::fmt::Write; | 5 | use core::fmt::Write; |
| 6 | use defmt::*; | ||
| 7 | use defmt_rtt as _; // global logger | ||
| 8 | use embassy::executor::Spawner; | 8 | use embassy::executor::Spawner; |
| 9 | use embassy_stm32::dma::NoDma; | 9 | use embassy_stm32::dma::NoDma; |
| 10 | use embassy_stm32::usart::{Config, Uart}; | 10 | use embassy_stm32::usart::{Config, Uart}; |
| 11 | use embassy_stm32::Peripherals; | 11 | use embassy_stm32::Peripherals; |
| 12 | use example_common::*; | ||
| 13 | use heapless::String; | 12 | use heapless::String; |
| 13 | use panic_probe as _; | ||
| 14 | 14 | ||
| 15 | #[embassy::main] | 15 | #[embassy::main] |
| 16 | async fn main(_spawner: Spawner, p: Peripherals) { | 16 | async fn main(_spawner: Spawner, p: Peripherals) { |
