diff options
| author | Dario Nieuwenhuis <[email protected]> | 2024-04-16 02:00:43 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2024-04-16 02:00:55 +0200 |
| commit | d6b1233f16407e3501efcd1885460645a75ed57b (patch) | |
| tree | 1bda1d6cd4316c24dc5f7c2cc362d3513167c860 /tests | |
| parent | 524c24c8b3ee3693c3bacd20deede29eb1107159 (diff) | |
stm32/usart: remove DMA generic params.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/stm32/src/bin/usart.rs | 8 | ||||
| -rw-r--r-- | tests/stm32/src/bin/usart_rx_ringbuffered.rs | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tests/stm32/src/bin/usart.rs b/tests/stm32/src/bin/usart.rs index 9b20eb784..a6e34674d 100644 --- a/tests/stm32/src/bin/usart.rs +++ b/tests/stm32/src/bin/usart.rs | |||
| @@ -6,7 +6,6 @@ mod common; | |||
| 6 | use common::*; | 6 | use common::*; |
| 7 | use defmt::{assert, assert_eq, unreachable}; | 7 | use defmt::{assert, assert_eq, unreachable}; |
| 8 | use embassy_executor::Spawner; | 8 | use embassy_executor::Spawner; |
| 9 | use embassy_stm32::dma::NoDma; | ||
| 10 | use embassy_stm32::usart::{Config, ConfigError, Error, Uart}; | 9 | use embassy_stm32::usart::{Config, ConfigError, Error, Uart}; |
| 11 | use embassy_time::{block_for, Duration, Instant}; | 10 | use embassy_time::{block_for, Duration, Instant}; |
| 12 | 11 | ||
| @@ -20,11 +19,10 @@ async fn main(_spawner: Spawner) { | |||
| 20 | let mut usart = peri!(p, UART); | 19 | let mut usart = peri!(p, UART); |
| 21 | let mut rx = peri!(p, UART_RX); | 20 | let mut rx = peri!(p, UART_RX); |
| 22 | let mut tx = peri!(p, UART_TX); | 21 | let mut tx = peri!(p, UART_TX); |
| 23 | let irq = irqs!(UART); | ||
| 24 | 22 | ||
| 25 | { | 23 | { |
| 26 | let config = Config::default(); | 24 | let config = Config::default(); |
| 27 | let mut usart = Uart::new(&mut usart, &mut rx, &mut tx, irq, NoDma, NoDma, config).unwrap(); | 25 | let mut usart = Uart::new_blocking(&mut usart, &mut rx, &mut tx, config).unwrap(); |
| 28 | 26 | ||
| 29 | // We can't send too many bytes, they have to fit in the FIFO. | 27 | // We can't send too many bytes, they have to fit in the FIFO. |
| 30 | // This is because we aren't sending+receiving at the same time. | 28 | // This is because we aren't sending+receiving at the same time. |
| @@ -40,7 +38,7 @@ async fn main(_spawner: Spawner) { | |||
| 40 | // Test error handling with with an overflow error | 38 | // Test error handling with with an overflow error |
| 41 | { | 39 | { |
| 42 | let config = Config::default(); | 40 | let config = Config::default(); |
| 43 | let mut usart = Uart::new(&mut usart, &mut rx, &mut tx, irq, NoDma, NoDma, config).unwrap(); | 41 | let mut usart = Uart::new_blocking(&mut usart, &mut rx, &mut tx, config).unwrap(); |
| 44 | 42 | ||
| 45 | // Send enough bytes to fill the RX FIFOs off all USART versions. | 43 | // Send enough bytes to fill the RX FIFOs off all USART versions. |
| 46 | let data = [0; 64]; | 44 | let data = [0; 64]; |
| @@ -70,7 +68,7 @@ async fn main(_spawner: Spawner) { | |||
| 70 | 68 | ||
| 71 | let mut config = Config::default(); | 69 | let mut config = Config::default(); |
| 72 | config.baudrate = baudrate; | 70 | config.baudrate = baudrate; |
| 73 | let mut usart = match Uart::new(&mut usart, &mut rx, &mut tx, irq, NoDma, NoDma, config) { | 71 | let mut usart = match Uart::new_blocking(&mut usart, &mut rx, &mut tx, config) { |
| 74 | Ok(x) => x, | 72 | Ok(x) => x, |
| 75 | Err(ConfigError::BaudrateTooHigh) => { | 73 | Err(ConfigError::BaudrateTooHigh) => { |
| 76 | info!("baudrate too high"); | 74 | info!("baudrate too high"); |
diff --git a/tests/stm32/src/bin/usart_rx_ringbuffered.rs b/tests/stm32/src/bin/usart_rx_ringbuffered.rs index 0c110421d..908452eaf 100644 --- a/tests/stm32/src/bin/usart_rx_ringbuffered.rs +++ b/tests/stm32/src/bin/usart_rx_ringbuffered.rs | |||
| @@ -8,6 +8,7 @@ mod common; | |||
| 8 | use common::*; | 8 | use common::*; |
| 9 | use defmt::{assert_eq, panic}; | 9 | use defmt::{assert_eq, panic}; |
| 10 | use embassy_executor::Spawner; | 10 | use embassy_executor::Spawner; |
| 11 | use embassy_stm32::mode::Async; | ||
| 11 | use embassy_stm32::usart::{Config, DataBits, Parity, RingBufferedUartRx, StopBits, Uart, UartTx}; | 12 | use embassy_stm32::usart::{Config, DataBits, Parity, RingBufferedUartRx, StopBits, Uart, UartTx}; |
| 12 | use embassy_time::Timer; | 13 | use embassy_time::Timer; |
| 13 | use rand_chacha::ChaCha8Rng; | 14 | use rand_chacha::ChaCha8Rng; |
| @@ -51,7 +52,7 @@ async fn main(spawner: Spawner) { | |||
| 51 | } | 52 | } |
| 52 | 53 | ||
| 53 | #[embassy_executor::task] | 54 | #[embassy_executor::task] |
| 54 | async fn transmit_task(mut tx: UartTx<'static, peris::UART, peris::UART_TX_DMA>) { | 55 | async fn transmit_task(mut tx: UartTx<'static, peris::UART, Async>) { |
| 55 | // workaround https://github.com/embassy-rs/embassy/issues/1426 | 56 | // workaround https://github.com/embassy-rs/embassy/issues/1426 |
| 56 | Timer::after_millis(100).await; | 57 | Timer::after_millis(100).await; |
| 57 | 58 | ||
