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/stm32f4/src/bin | |
| parent | a9e63167e1ec230ca3d28da771378f5f4936a840 (diff) | |
Use embassy/defmt-timestamp-uptime in all examples.
Diffstat (limited to 'examples/stm32f4/src/bin')
| -rw-r--r-- | examples/stm32f4/src/bin/adc.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/blinky.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/button.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/button_exti.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/can.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/hello.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/multiprio.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/sdmmc.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/spi.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/spi_dma.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/usart.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/usart_dma.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/usb_uart.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/usb_uart_ulpi.rs | 4 |
14 files changed, 39 insertions, 39 deletions
diff --git a/examples/stm32f4/src/bin/adc.rs b/examples/stm32f4/src/bin/adc.rs index 0a6ddbbca..f0b1ad232 100644 --- a/examples/stm32f4/src/bin/adc.rs +++ b/examples/stm32f4/src/bin/adc.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_rtt as _; // global logger |
| 6 | mod example_common; | 6 | use panic_probe as _; |
| 7 | 7 | ||
| 8 | use defmt::*; | ||
| 8 | use embassy::executor::Spawner; | 9 | use embassy::executor::Spawner; |
| 9 | use embassy::time::{Delay, Duration, Timer}; | 10 | use embassy::time::{Delay, Duration, Timer}; |
| 10 | use embassy_stm32::adc::Adc; | 11 | use embassy_stm32::adc::Adc; |
| 11 | use embassy_stm32::Peripherals; | 12 | use embassy_stm32::Peripherals; |
| 12 | use example_common::*; | ||
| 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/stm32f4/src/bin/blinky.rs b/examples/stm32f4/src/bin/blinky.rs index 00d67dac0..8b85ca96d 100644 --- a/examples/stm32f4/src/bin/blinky.rs +++ b/examples/stm32f4/src/bin/blinky.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::time::{Duration, Timer}; | 8 | use embassy::time::{Duration, Timer}; |
| 9 | use embassy_stm32::gpio::{Level, Output, Speed}; | 9 | use embassy_stm32::gpio::{Level, Output, Speed}; |
| 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/stm32f4/src/bin/button.rs b/examples/stm32f4/src/bin/button.rs index 24eef75b2..4f9af7fbd 100644 --- a/examples/stm32f4/src/bin/button.rs +++ b/examples/stm32f4/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/stm32f4/src/bin/button_exti.rs b/examples/stm32f4/src/bin/button_exti.rs index 852fbe3c6..78f2e6ee2 100644 --- a/examples/stm32f4/src/bin/button_exti.rs +++ b/examples/stm32f4/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/stm32f4/src/bin/can.rs b/examples/stm32f4/src/bin/can.rs index b36e41805..0f41d6860 100644 --- a/examples/stm32f4/src/bin/can.rs +++ b/examples/stm32f4/src/bin/can.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"] | 5 | use defmt_rtt as _; // global logger |
| 6 | mod example_common; | 6 | use panic_probe as _; |
| 7 | 7 | ||
| 8 | use cortex_m_rt::entry; | 8 | use cortex_m_rt::entry; |
| 9 | use defmt::*; | ||
| 9 | use embassy_stm32::can::bxcan::filter::Mask32; | 10 | use embassy_stm32::can::bxcan::filter::Mask32; |
| 10 | use embassy_stm32::can::bxcan::{Frame, StandardId}; | 11 | use embassy_stm32::can::bxcan::{Frame, StandardId}; |
| 11 | use embassy_stm32::can::Can; | 12 | use embassy_stm32::can::Can; |
| 12 | use embassy_stm32::gpio::{Input, Pull}; | 13 | use embassy_stm32::gpio::{Input, Pull}; |
| 13 | use example_common::*; | ||
| 14 | 14 | ||
| 15 | #[entry] | 15 | #[entry] |
| 16 | fn main() -> ! { | 16 | fn main() -> ! { |
diff --git a/examples/stm32f4/src/bin/hello.rs b/examples/stm32f4/src/bin/hello.rs index 56eb67bf3..92d87cedf 100644 --- a/examples/stm32f4/src/bin/hello.rs +++ b/examples/stm32f4/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/stm32f4/src/bin/multiprio.rs b/examples/stm32f4/src/bin/multiprio.rs index 9d9754833..1c9401549 100644 --- a/examples/stm32f4/src/bin/multiprio.rs +++ b/examples/stm32f4/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/stm32f4/src/bin/sdmmc.rs b/examples/stm32f4/src/bin/sdmmc.rs index 2ef367397..eab0fad4a 100644 --- a/examples/stm32f4/src/bin/sdmmc.rs +++ b/examples/stm32f4/src/bin/sdmmc.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_rtt as _; // global logger |
| 6 | mod example_common; | 6 | use panic_probe as _; |
| 7 | 7 | ||
| 8 | use defmt::*; | ||
| 8 | use embassy::executor::Spawner; | 9 | use embassy::executor::Spawner; |
| 9 | use embassy_stm32::sdmmc::Sdmmc; | 10 | use embassy_stm32::sdmmc::Sdmmc; |
| 10 | use embassy_stm32::time::U32Ext; | 11 | use embassy_stm32::time::U32Ext; |
| 11 | use embassy_stm32::{interrupt, Config, Peripherals}; | 12 | use embassy_stm32::{interrupt, Config, Peripherals}; |
| 12 | use example_common::*; | ||
| 13 | 13 | ||
| 14 | fn config() -> Config { | 14 | fn config() -> Config { |
| 15 | let mut config = Config::default(); | 15 | let mut config = Config::default(); |
diff --git a/examples/stm32f4/src/bin/spi.rs b/examples/stm32f4/src/bin/spi.rs index 6b04f1fed..69be81432 100644 --- a/examples/stm32f4/src/bin/spi.rs +++ b/examples/stm32f4/src/bin/spi.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"] | 5 | use defmt_rtt as _; // global logger |
| 6 | mod example_common; | 6 | use panic_probe as _; |
| 7 | 7 | ||
| 8 | use cortex_m_rt::entry; | 8 | use cortex_m_rt::entry; |
| 9 | use defmt::*; | ||
| 9 | use embassy_stm32::dma::NoDma; | 10 | use embassy_stm32::dma::NoDma; |
| 10 | use embassy_stm32::gpio::{Level, Output, Speed}; | 11 | use embassy_stm32::gpio::{Level, Output, Speed}; |
| 11 | use embassy_stm32::spi::{Config, Spi}; | 12 | use embassy_stm32::spi::{Config, Spi}; |
| 12 | use embassy_stm32::time::Hertz; | 13 | use embassy_stm32::time::Hertz; |
| 13 | use example_common::*; | ||
| 14 | 14 | ||
| 15 | #[entry] | 15 | #[entry] |
| 16 | fn main() -> ! { | 16 | fn main() -> ! { |
diff --git a/examples/stm32f4/src/bin/spi_dma.rs b/examples/stm32f4/src/bin/spi_dma.rs index 9171f7516..1bf9b856d 100644 --- a/examples/stm32f4/src/bin/spi_dma.rs +++ b/examples/stm32f4/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/stm32f4/src/bin/usart.rs b/examples/stm32f4/src/bin/usart.rs index b5ea98cca..a302667e2 100644 --- a/examples/stm32f4/src/bin/usart.rs +++ b/examples/stm32f4/src/bin/usart.rs | |||
| @@ -2,12 +2,12 @@ | |||
| 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::dma::NoDma; | 8 | use embassy_stm32::dma::NoDma; |
| 9 | use embassy_stm32::usart::{Config, Uart}; | 9 | use embassy_stm32::usart::{Config, Uart}; |
| 10 | use example_common::*; | 10 | use panic_probe as _; |
| 11 | 11 | ||
| 12 | #[entry] | 12 | #[entry] |
| 13 | fn main() -> ! { | 13 | fn main() -> ! { |
diff --git a/examples/stm32f4/src/bin/usart_dma.rs b/examples/stm32f4/src/bin/usart_dma.rs index 862a91ea8..cf45b71c5 100644 --- a/examples/stm32f4/src/bin/usart_dma.rs +++ b/examples/stm32f4/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) { |
diff --git a/examples/stm32f4/src/bin/usb_uart.rs b/examples/stm32f4/src/bin/usb_uart.rs index 63059d51f..251ed1eb0 100644 --- a/examples/stm32f4/src/bin/usb_uart.rs +++ b/examples/stm32f4/src/bin/usb_uart.rs | |||
| @@ -2,8 +2,8 @@ | |||
| 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_rtt as _; // global logger |
| 6 | mod example_common; | 6 | use panic_probe as _; |
| 7 | 7 | ||
| 8 | use defmt::{info, unwrap}; | 8 | use defmt::{info, unwrap}; |
| 9 | use defmt_rtt as _; // global logger | 9 | use defmt_rtt as _; // global logger |
diff --git a/examples/stm32f4/src/bin/usb_uart_ulpi.rs b/examples/stm32f4/src/bin/usb_uart_ulpi.rs index a55502728..f6c373602 100644 --- a/examples/stm32f4/src/bin/usb_uart_ulpi.rs +++ b/examples/stm32f4/src/bin/usb_uart_ulpi.rs | |||
| @@ -2,8 +2,8 @@ | |||
| 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_rtt as _; // global logger |
| 6 | mod example_common; | 6 | use panic_probe as _; |
| 7 | 7 | ||
| 8 | use defmt::{info, unwrap}; | 8 | use defmt::{info, unwrap}; |
| 9 | use defmt_rtt as _; // global logger | 9 | use defmt_rtt as _; // global logger |
