diff options
| author | xoviat <[email protected]> | 2020-12-31 16:59:42 -0600 |
|---|---|---|
| committer | xoviat <[email protected]> | 2020-12-31 16:59:42 -0600 |
| commit | cc8d1628597d449e3b2e2e1545af25fc47b0a8a5 (patch) | |
| tree | 12db6080ad52d26a8bc2597399f4e54d92267f2e | |
| parent | cc0076a0eb9a45e5c87d2dea661336ba2473bb42 (diff) | |
begin integrate interrupt
| -rw-r--r-- | embassy-stm32f4/src/serial.rs | 4 | ||||
| -rw-r--r-- | examples-stm32f4/src/serial.rs | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/embassy-stm32f4/src/serial.rs b/embassy-stm32f4/src/serial.rs index bb47a9301..5042566db 100644 --- a/embassy-stm32f4/src/serial.rs +++ b/embassy-stm32f4/src/serial.rs | |||
| @@ -65,8 +65,10 @@ static STATE: State = State { | |||
| 65 | 65 | ||
| 66 | impl Serial<USART1, Stream7<DMA2>, Stream2<DMA2>> { | 66 | impl Serial<USART1, Stream7<DMA2>, Stream2<DMA2>> { |
| 67 | pub fn new( | 67 | pub fn new( |
| 68 | rxd: PA10<Alternate<AF7>>, | ||
| 69 | txd: PA9<Alternate<AF7>>, | 68 | txd: PA9<Alternate<AF7>>, |
| 69 | rxd: PA10<Alternate<AF7>>, | ||
| 70 | tx_int: interrupt::DMA2_STREAM2Interrupt, | ||
| 71 | rx_int: interrupt::DMA2_STREAM7Interrupt, | ||
| 70 | dma: DMA2, | 72 | dma: DMA2, |
| 71 | usart: USART1, | 73 | usart: USART1, |
| 72 | parity: Parity, | 74 | parity: Parity, |
diff --git a/examples-stm32f4/src/serial.rs b/examples-stm32f4/src/serial.rs index 1f5c0fb7a..296da4043 100644 --- a/examples-stm32f4/src/serial.rs +++ b/examples-stm32f4/src/serial.rs | |||
| @@ -9,6 +9,7 @@ use cortex_m::singleton; | |||
| 9 | use cortex_m_rt::entry; | 9 | use cortex_m_rt::entry; |
| 10 | use embassy::executor::{task, Executor}; | 10 | use embassy::executor::{task, Executor}; |
| 11 | use embassy::util::Forever; | 11 | use embassy::util::Forever; |
| 12 | use embassy_stm32f4::interrupt; | ||
| 12 | use embassy_stm32f4::serial; | 13 | use embassy_stm32f4::serial; |
| 13 | use stm32f4xx_hal::stm32; | 14 | use stm32f4xx_hal::stm32; |
| 14 | use stm32f4xx_hal::{prelude::*, serial::config}; | 15 | use stm32f4xx_hal::{prelude::*, serial::config}; |
| @@ -27,8 +28,10 @@ async fn run(dp: stm32::Peripherals, cp: cortex_m::Peripherals) { | |||
| 27 | .freeze(); | 28 | .freeze(); |
| 28 | 29 | ||
| 29 | let mut serial = serial::Serial::new( | 30 | let mut serial = serial::Serial::new( |
| 30 | gpioa.pa10.into_alternate_af7(), | ||
| 31 | gpioa.pa9.into_alternate_af7(), | 31 | gpioa.pa9.into_alternate_af7(), |
| 32 | gpioa.pa10.into_alternate_af7(), | ||
| 33 | interrupt::take!(DMA2_STREAM2), | ||
| 34 | interrupt::take!(DMA2_STREAM7), | ||
| 32 | dp.DMA2, | 35 | dp.DMA2, |
| 33 | dp.USART1, | 36 | dp.USART1, |
| 34 | config::Parity::ParityNone, | 37 | config::Parity::ParityNone, |
