diff options
| author | Dario Nieuwenhuis <[email protected]> | 2021-07-15 05:42:06 +0200 |
|---|---|---|
| committer | Bob McWhirter <[email protected]> | 2021-07-16 14:41:20 -0400 |
| commit | 3d1391ef2d634ca6a90c68be7cc69af02e3dc33b (patch) | |
| tree | b73e2ca0a00486acff55fc200e2d3087c70b4ba1 /examples/stm32f4 | |
| parent | 69fb1b5418a4fb355d48b3b4357d0cd7562b5c4d (diff) | |
stm32/dma: impl all variants
Diffstat (limited to 'examples/stm32f4')
| -rw-r--r-- | examples/stm32f4/src/bin/spi.rs | 2 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/usart.rs | 3 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/usart_dma.rs | 11 |
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/stm32f4/src/bin/spi.rs b/examples/stm32f4/src/bin/spi.rs index dda0ee4ed..aa48ceed5 100644 --- a/examples/stm32f4/src/bin/spi.rs +++ b/examples/stm32f4/src/bin/spi.rs | |||
| @@ -61,7 +61,7 @@ fn main() -> ! { | |||
| 61 | let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh); | 61 | let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh); |
| 62 | 62 | ||
| 63 | loop { | 63 | loop { |
| 64 | let mut buf = [0x0A; 4]; | 64 | let mut buf = [0x0Au8; 4]; |
| 65 | unwrap!(cs.set_low()); | 65 | unwrap!(cs.set_low()); |
| 66 | unwrap!(spi.transfer(&mut buf)); | 66 | unwrap!(spi.transfer(&mut buf)); |
| 67 | unwrap!(cs.set_high()); | 67 | unwrap!(cs.set_high()); |
diff --git a/examples/stm32f4/src/bin/usart.rs b/examples/stm32f4/src/bin/usart.rs index 42f154b05..31525036a 100644 --- a/examples/stm32f4/src/bin/usart.rs +++ b/examples/stm32f4/src/bin/usart.rs | |||
| @@ -12,6 +12,7 @@ use cortex_m::prelude::_embedded_hal_blocking_serial_Write; | |||
| 12 | use embassy::executor::Executor; | 12 | use embassy::executor::Executor; |
| 13 | use embassy::time::Clock; | 13 | use embassy::time::Clock; |
| 14 | use embassy::util::Forever; | 14 | use embassy::util::Forever; |
| 15 | use embassy_stm32::dma::NoDma; | ||
| 15 | use embassy_stm32::usart::{Config, Uart}; | 16 | use embassy_stm32::usart::{Config, Uart}; |
| 16 | use example_common::*; | 17 | use example_common::*; |
| 17 | 18 | ||
| @@ -23,7 +24,7 @@ async fn main_task() { | |||
| 23 | let p = embassy_stm32::init(Default::default()); | 24 | let p = embassy_stm32::init(Default::default()); |
| 24 | 25 | ||
| 25 | let config = Config::default(); | 26 | let config = Config::default(); |
| 26 | let mut usart = Uart::new(p.USART3, p.PD9, p.PD8, config); | 27 | let mut usart = Uart::new(p.USART3, p.PD9, p.PD8, NoDma, NoDma, config); |
| 27 | 28 | ||
| 28 | usart.bwrite_all(b"Hello Embassy World!\r\n").unwrap(); | 29 | usart.bwrite_all(b"Hello Embassy World!\r\n").unwrap(); |
| 29 | info!("wrote Hello, starting echo"); | 30 | info!("wrote Hello, starting echo"); |
diff --git a/examples/stm32f4/src/bin/usart_dma.rs b/examples/stm32f4/src/bin/usart_dma.rs index 66ca6242b..39e199d58 100644 --- a/examples/stm32f4/src/bin/usart_dma.rs +++ b/examples/stm32f4/src/bin/usart_dma.rs | |||
| @@ -13,26 +13,25 @@ use cortex_m_rt::entry; | |||
| 13 | use embassy::executor::Executor; | 13 | use embassy::executor::Executor; |
| 14 | use embassy::time::Clock; | 14 | use embassy::time::Clock; |
| 15 | use embassy::util::Forever; | 15 | use embassy::util::Forever; |
| 16 | use embassy_stm32::dma::NoDma; | ||
| 16 | use embassy_stm32::usart::{Config, Uart}; | 17 | use embassy_stm32::usart::{Config, Uart}; |
| 18 | use embassy_traits::uart::Write as _; | ||
| 17 | use example_common::*; | 19 | use example_common::*; |
| 18 | use heapless::String; | 20 | use heapless::String; |
| 19 | use stm32f4::stm32f429 as pac; | 21 | use stm32f4::stm32f429 as pac; |
| 20 | 22 | ||
| 21 | #[embassy::task] | 23 | #[embassy::task] |
| 22 | async fn main_task() { | 24 | async fn main_task() { |
| 23 | let mut p = embassy_stm32::init(Default::default()); | 25 | let p = embassy_stm32::init(Default::default()); |
| 24 | 26 | ||
| 25 | let config = Config::default(); | 27 | let config = Config::default(); |
| 26 | let mut usart = Uart::new(p.USART3, p.PD9, p.PD8, config); | 28 | let mut usart = Uart::new(p.USART3, p.PD9, p.PD8, p.DMA1_3, NoDma, config); |
| 27 | 29 | ||
| 28 | for n in 0u32.. { | 30 | for n in 0u32.. { |
| 29 | let mut s: String<128> = String::new(); | 31 | let mut s: String<128> = String::new(); |
| 30 | core::write!(&mut s, "Hello DMA World {}!\r\n", n).unwrap(); | 32 | core::write!(&mut s, "Hello DMA World {}!\r\n", n).unwrap(); |
| 31 | 33 | ||
| 32 | usart | 34 | usart.write(s.as_bytes()).await.unwrap(); |
| 33 | .write_dma(&mut p.DMA1_3, s.as_bytes()) | ||
| 34 | .await | ||
| 35 | .unwrap(); | ||
| 36 | info!("wrote DMA"); | 35 | info!("wrote DMA"); |
| 37 | } | 36 | } |
| 38 | } | 37 | } |
