diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-09-26 00:14:52 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-09-26 00:19:27 +0200 |
| commit | 5d8817d1095589e1916a92adc9db3feb1a3b91b5 (patch) | |
| tree | 8a797018cd769884a165d7d80fea8582d682fa3f /tests | |
| parent | c79a84a98a92bb3f1280b4a7657936fcd827a0e0 (diff) | |
stm32/usart: return error instead of panicking on bad baudrate.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/stm32/src/bin/usart.rs | 6 | ||||
| -rw-r--r-- | tests/stm32/src/bin/usart_dma.rs | 2 | ||||
| -rw-r--r-- | tests/stm32/src/bin/usart_rx_ringbuffered.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/stm32/src/bin/usart.rs b/tests/stm32/src/bin/usart.rs index e789e543d..fece2fb3e 100644 --- a/tests/stm32/src/bin/usart.rs +++ b/tests/stm32/src/bin/usart.rs | |||
| @@ -25,7 +25,7 @@ async fn main(_spawner: Spawner) { | |||
| 25 | 25 | ||
| 26 | { | 26 | { |
| 27 | let config = Config::default(); | 27 | let config = Config::default(); |
| 28 | let mut usart = Uart::new(&mut usart, &mut rx, &mut tx, irq, NoDma, NoDma, config); | 28 | let mut usart = Uart::new(&mut usart, &mut rx, &mut tx, irq, NoDma, NoDma, config).unwrap(); |
| 29 | 29 | ||
| 30 | // We can't send too many bytes, they have to fit in the FIFO. | 30 | // We can't send too many bytes, they have to fit in the FIFO. |
| 31 | // This is because we aren't sending+receiving at the same time. | 31 | // This is because we aren't sending+receiving at the same time. |
| @@ -41,7 +41,7 @@ async fn main(_spawner: Spawner) { | |||
| 41 | // Test error handling with with an overflow error | 41 | // Test error handling with with an overflow error |
| 42 | { | 42 | { |
| 43 | let config = Config::default(); | 43 | let config = Config::default(); |
| 44 | let mut usart = Uart::new(&mut usart, &mut rx, &mut tx, irq, NoDma, NoDma, config); | 44 | let mut usart = Uart::new(&mut usart, &mut rx, &mut tx, irq, NoDma, NoDma, config).unwrap(); |
| 45 | 45 | ||
| 46 | // Send enough bytes to fill the RX FIFOs off all USART versions. | 46 | // Send enough bytes to fill the RX FIFOs off all USART versions. |
| 47 | let data = [0xC0, 0xDE, 0x12, 0x23, 0x34]; | 47 | let data = [0xC0, 0xDE, 0x12, 0x23, 0x34]; |
| @@ -75,7 +75,7 @@ async fn main(_spawner: Spawner) { | |||
| 75 | 75 | ||
| 76 | let mut config = Config::default(); | 76 | let mut config = Config::default(); |
| 77 | config.baudrate = baudrate; | 77 | config.baudrate = baudrate; |
| 78 | let mut usart = Uart::new(&mut usart, &mut rx, &mut tx, irq, NoDma, NoDma, config); | 78 | let mut usart = Uart::new(&mut usart, &mut rx, &mut tx, irq, NoDma, NoDma, config).unwrap(); |
| 79 | 79 | ||
| 80 | let n = (baudrate as usize / 100).max(64); | 80 | let n = (baudrate as usize / 100).max(64); |
| 81 | 81 | ||
diff --git a/tests/stm32/src/bin/usart_dma.rs b/tests/stm32/src/bin/usart_dma.rs index f203ebb56..1421f6605 100644 --- a/tests/stm32/src/bin/usart_dma.rs +++ b/tests/stm32/src/bin/usart_dma.rs | |||
| @@ -25,7 +25,7 @@ async fn main(_spawner: Spawner) { | |||
| 25 | let irq = irqs!(UART); | 25 | let irq = irqs!(UART); |
| 26 | 26 | ||
| 27 | let config = Config::default(); | 27 | let config = Config::default(); |
| 28 | let usart = Uart::new(usart, rx, tx, irq, tx_dma, rx_dma, config); | 28 | let usart = Uart::new(usart, rx, tx, irq, tx_dma, rx_dma, config).unwrap(); |
| 29 | 29 | ||
| 30 | const LEN: usize = 128; | 30 | const LEN: usize = 128; |
| 31 | let mut tx_buf = [0; LEN]; | 31 | let mut tx_buf = [0; LEN]; |
diff --git a/tests/stm32/src/bin/usart_rx_ringbuffered.rs b/tests/stm32/src/bin/usart_rx_ringbuffered.rs index fdbeb9f6a..1ee7e596d 100644 --- a/tests/stm32/src/bin/usart_rx_ringbuffered.rs +++ b/tests/stm32/src/bin/usart_rx_ringbuffered.rs | |||
| @@ -40,7 +40,7 @@ async fn main(spawner: Spawner) { | |||
| 40 | config.stop_bits = StopBits::STOP1; | 40 | config.stop_bits = StopBits::STOP1; |
| 41 | config.parity = Parity::ParityNone; | 41 | config.parity = Parity::ParityNone; |
| 42 | 42 | ||
| 43 | let usart = Uart::new(usart, rx, tx, irq, tx_dma, rx_dma, config); | 43 | let usart = Uart::new(usart, rx, tx, irq, tx_dma, rx_dma, config).unwrap(); |
| 44 | let (tx, rx) = usart.split(); | 44 | let (tx, rx) = usart.split(); |
| 45 | static mut DMA_BUF: [u8; DMA_BUF_SIZE] = [0; DMA_BUF_SIZE]; | 45 | static mut DMA_BUF: [u8; DMA_BUF_SIZE] = [0; DMA_BUF_SIZE]; |
| 46 | let dma_buf = unsafe { DMA_BUF.as_mut() }; | 46 | let dma_buf = unsafe { DMA_BUF.as_mut() }; |
