diff options
| author | Robert Walker <[email protected]> | 2021-12-29 08:17:51 +0100 |
|---|---|---|
| committer | Robert Walker <[email protected]> | 2021-12-29 08:17:51 +0100 |
| commit | 1028b5c671bbef06ff807a765571f6ca11dbfa8e (patch) | |
| tree | 38f1640ee3fb26cd074682c2b0d55636cf0c5649 | |
| parent | 4271226fc06130d30678739d4869db4fc1820fd8 (diff) | |
Review changes
| -rw-r--r-- | examples/stm32f7/src/bin/usart_dma.rs | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/examples/stm32f7/src/bin/usart_dma.rs b/examples/stm32f7/src/bin/usart_dma.rs index 77b5050f1..82af0bc22 100644 --- a/examples/stm32f7/src/bin/usart_dma.rs +++ b/examples/stm32f7/src/bin/usart_dma.rs | |||
| @@ -5,20 +5,17 @@ | |||
| 5 | #[path = "../example_common.rs"] | 5 | #[path = "../example_common.rs"] |
| 6 | mod example_common; | 6 | mod example_common; |
| 7 | use core::fmt::Write; | 7 | use core::fmt::Write; |
| 8 | use embassy::executor::Executor; | 8 | use embassy::executor::Spawner; |
| 9 | use embassy::util::Forever; | ||
| 10 | use embassy_stm32::dma::NoDma; | 9 | use embassy_stm32::dma::NoDma; |
| 11 | use embassy_stm32::usart::{Config, Uart}; | 10 | use embassy_stm32::usart::{Config, Uart}; |
| 11 | use embassy_stm32::Peripherals; | ||
| 12 | use embassy_traits::uart::Write as _Write; | 12 | use embassy_traits::uart::Write as _Write; |
| 13 | use example_common::*; | 13 | use example_common::*; |
| 14 | 14 | ||
| 15 | use cortex_m_rt::entry; | ||
| 16 | use heapless::String; | 15 | use heapless::String; |
| 17 | 16 | ||
| 18 | #[embassy::task] | 17 | #[embassy::main] |
| 19 | async fn main_task() { | 18 | async fn main(_spawner: Spawner, p: Peripherals) { |
| 20 | let p = embassy_stm32::init(Default::default()); | ||
| 21 | |||
| 22 | let config = Config::default(); | 19 | let config = Config::default(); |
| 23 | let mut usart = Uart::new(p.UART7, p.PA8, p.PA15, p.DMA1_CH1, NoDma, config); | 20 | let mut usart = Uart::new(p.UART7, p.PA8, p.PA15, p.DMA1_CH1, NoDma, config); |
| 24 | 21 | ||
| @@ -26,21 +23,8 @@ async fn main_task() { | |||
| 26 | let mut s: String<128> = String::new(); | 23 | let mut s: String<128> = String::new(); |
| 27 | core::write!(&mut s, "Hello DMA World {}!\r\n", n).unwrap(); | 24 | core::write!(&mut s, "Hello DMA World {}!\r\n", n).unwrap(); |
| 28 | 25 | ||
| 29 | usart.write(s.as_bytes()).await.ok(); | 26 | unwrap!(usart.write(s.as_bytes()).await); |
| 30 | 27 | ||
| 31 | info!("wrote DMA"); | 28 | info!("wrote DMA"); |
| 32 | } | 29 | } |
| 33 | } | 30 | } |
| 34 | |||
| 35 | static EXECUTOR: Forever<Executor> = Forever::new(); | ||
| 36 | |||
| 37 | #[entry] | ||
| 38 | fn main() -> ! { | ||
| 39 | info!("Hello World!"); | ||
| 40 | |||
| 41 | let executor = EXECUTOR.put(Executor::new()); | ||
| 42 | |||
| 43 | executor.run(|spawner| { | ||
| 44 | unwrap!(spawner.spawn(main_task())); | ||
| 45 | }) | ||
| 46 | } | ||
