diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-03-05 20:17:52 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-03-06 00:17:51 +0100 |
| commit | 9cf000ef4edd8f230b348ede8d7ce015045a0035 (patch) | |
| tree | ed3db0facdb024479843691292121daa04f0975f /tests/nrf/src/bin/buffered_uart_spam.rs | |
| parent | 42c13c8c3d9514866c2842009f76e88e8cb01b22 (diff) | |
nrf/uart: switch to new interrupt binding.
Diffstat (limited to 'tests/nrf/src/bin/buffered_uart_spam.rs')
| -rw-r--r-- | tests/nrf/src/bin/buffered_uart_spam.rs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/nrf/src/bin/buffered_uart_spam.rs b/tests/nrf/src/bin/buffered_uart_spam.rs index 57aaeca45..74eda6d01 100644 --- a/tests/nrf/src/bin/buffered_uart_spam.rs +++ b/tests/nrf/src/bin/buffered_uart_spam.rs | |||
| @@ -7,14 +7,19 @@ use core::ptr::NonNull; | |||
| 7 | 7 | ||
| 8 | use defmt::{assert_eq, *}; | 8 | use defmt::{assert_eq, *}; |
| 9 | use embassy_executor::Spawner; | 9 | use embassy_executor::Spawner; |
| 10 | use embassy_nrf::buffered_uarte::BufferedUarte; | 10 | use embassy_nrf::buffered_uarte::{self, BufferedUarte}; |
| 11 | use embassy_nrf::gpio::{Level, Output, OutputDrive}; | 11 | use embassy_nrf::gpio::{Level, Output, OutputDrive}; |
| 12 | use embassy_nrf::ppi::{Event, Ppi, Task}; | 12 | use embassy_nrf::ppi::{Event, Ppi, Task}; |
| 13 | use embassy_nrf::uarte::Uarte; | 13 | use embassy_nrf::uarte::Uarte; |
| 14 | use embassy_nrf::{interrupt, pac, uarte}; | 14 | use embassy_nrf::{bind_interrupts, pac, peripherals, uarte}; |
| 15 | use embassy_time::{Duration, Timer}; | 15 | use embassy_time::{Duration, Timer}; |
| 16 | use {defmt_rtt as _, panic_probe as _}; | 16 | use {defmt_rtt as _, panic_probe as _}; |
| 17 | 17 | ||
| 18 | bind_interrupts!(struct Irqs { | ||
| 19 | UARTE0_UART0 => buffered_uarte::InterruptHandler<peripherals::UARTE0>; | ||
| 20 | UARTE1 => uarte::InterruptHandler<peripherals::UARTE1>; | ||
| 21 | }); | ||
| 22 | |||
| 18 | #[embassy_executor::main] | 23 | #[embassy_executor::main] |
| 19 | async fn main(_spawner: Spawner) { | 24 | async fn main(_spawner: Spawner) { |
| 20 | let mut p = embassy_nrf::init(Default::default()); | 25 | let mut p = embassy_nrf::init(Default::default()); |
| @@ -33,7 +38,7 @@ async fn main(_spawner: Spawner) { | |||
| 33 | p.PPI_CH0, | 38 | p.PPI_CH0, |
| 34 | p.PPI_CH1, | 39 | p.PPI_CH1, |
| 35 | p.PPI_GROUP0, | 40 | p.PPI_GROUP0, |
| 36 | interrupt::take!(UARTE0_UART0), | 41 | Irqs, |
| 37 | p.P1_03, | 42 | p.P1_03, |
| 38 | p.P1_04, | 43 | p.P1_04, |
| 39 | config.clone(), | 44 | config.clone(), |
| @@ -49,7 +54,7 @@ async fn main(_spawner: Spawner) { | |||
| 49 | // Tx spam in a loop. | 54 | // Tx spam in a loop. |
| 50 | const NSPAM: usize = 17; | 55 | const NSPAM: usize = 17; |
| 51 | static mut TX_BUF: [u8; NSPAM] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]; | 56 | static mut TX_BUF: [u8; NSPAM] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]; |
| 52 | let _spam = Uarte::new(p.UARTE1, interrupt::take!(UARTE1), p.P1_01, p.P1_02, config.clone()); | 57 | let _spam = Uarte::new(p.UARTE1, Irqs, p.P1_01, p.P1_02, config.clone()); |
| 53 | let spam_peri: pac::UARTE1 = unsafe { mem::transmute(()) }; | 58 | let spam_peri: pac::UARTE1 = unsafe { mem::transmute(()) }; |
| 54 | let event = unsafe { Event::new_unchecked(NonNull::new_unchecked(&spam_peri.events_endtx as *const _ as _)) }; | 59 | let event = unsafe { Event::new_unchecked(NonNull::new_unchecked(&spam_peri.events_endtx as *const _ as _)) }; |
| 55 | let task = unsafe { Task::new_unchecked(NonNull::new_unchecked(&spam_peri.tasks_starttx as *const _ as _)) }; | 60 | let task = unsafe { Task::new_unchecked(NonNull::new_unchecked(&spam_peri.tasks_starttx as *const _ as _)) }; |
