diff options
| author | Dario Nieuwenhuis <[email protected]> | 2024-01-22 21:30:29 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2024-01-22 21:32:10 +0100 |
| commit | ee0ebe3121e5d51240e671d8c5cc19ad878b9db9 (patch) | |
| tree | caabf0c20ce7d2d07e292690b1afb9baa606610f /tests/rp/src | |
| parent | 2bc5e9523d4373002487614ecfef1e3f0858fd66 (diff) | |
rp/gpio: remove generics.
Diffstat (limited to 'tests/rp/src')
| -rw-r--r-- | tests/rp/src/bin/cyw43-perf.rs | 6 | ||||
| -rw-r--r-- | tests/rp/src/bin/ethernet_w5100s_perf.rs | 8 | ||||
| -rw-r--r-- | tests/rp/src/bin/uart.rs | 6 | ||||
| -rw-r--r-- | tests/rp/src/bin/uart_buffered.rs | 6 | ||||
| -rw-r--r-- | tests/rp/src/bin/uart_dma.rs | 6 |
5 files changed, 15 insertions, 17 deletions
diff --git a/tests/rp/src/bin/cyw43-perf.rs b/tests/rp/src/bin/cyw43-perf.rs index a1b2946e6..b46ae670a 100644 --- a/tests/rp/src/bin/cyw43-perf.rs +++ b/tests/rp/src/bin/cyw43-perf.rs | |||
| @@ -7,7 +7,7 @@ use defmt::{panic, *}; | |||
| 7 | use embassy_executor::Spawner; | 7 | use embassy_executor::Spawner; |
| 8 | use embassy_net::{Config, Stack, StackResources}; | 8 | use embassy_net::{Config, Stack, StackResources}; |
| 9 | use embassy_rp::gpio::{Level, Output}; | 9 | use embassy_rp::gpio::{Level, Output}; |
| 10 | use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0}; | 10 | use embassy_rp::peripherals::{DMA_CH0, PIO0}; |
| 11 | use embassy_rp::pio::{InterruptHandler, Pio}; | 11 | use embassy_rp::pio::{InterruptHandler, Pio}; |
| 12 | use embassy_rp::{bind_interrupts, rom_data}; | 12 | use embassy_rp::{bind_interrupts, rom_data}; |
| 13 | use static_cell::StaticCell; | 13 | use static_cell::StaticCell; |
| @@ -24,9 +24,7 @@ const WIFI_NETWORK: &str = "EmbassyTest"; | |||
| 24 | const WIFI_PASSWORD: &str = "V8YxhKt5CdIAJFud"; | 24 | const WIFI_PASSWORD: &str = "V8YxhKt5CdIAJFud"; |
| 25 | 25 | ||
| 26 | #[embassy_executor::task] | 26 | #[embassy_executor::task] |
| 27 | async fn wifi_task( | 27 | async fn wifi_task(runner: cyw43::Runner<'static, Output<'static>, PioSpi<'static, PIO0, 0, DMA_CH0>>) -> ! { |
| 28 | runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>, | ||
| 29 | ) -> ! { | ||
| 30 | runner.run().await | 28 | runner.run().await |
| 31 | } | 29 | } |
| 32 | 30 | ||
diff --git a/tests/rp/src/bin/ethernet_w5100s_perf.rs b/tests/rp/src/bin/ethernet_w5100s_perf.rs index 8c9089d0e..5d5547773 100644 --- a/tests/rp/src/bin/ethernet_w5100s_perf.rs +++ b/tests/rp/src/bin/ethernet_w5100s_perf.rs | |||
| @@ -10,7 +10,7 @@ use embassy_net_wiznet::chip::W5100S; | |||
| 10 | use embassy_net_wiznet::*; | 10 | use embassy_net_wiznet::*; |
| 11 | use embassy_rp::clocks::RoscRng; | 11 | use embassy_rp::clocks::RoscRng; |
| 12 | use embassy_rp::gpio::{Input, Level, Output, Pull}; | 12 | use embassy_rp::gpio::{Input, Level, Output, Pull}; |
| 13 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | 13 | use embassy_rp::peripherals::SPI0; |
| 14 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | 14 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; |
| 15 | use embassy_time::Delay; | 15 | use embassy_time::Delay; |
| 16 | use embedded_hal_bus::spi::ExclusiveDevice; | 16 | use embedded_hal_bus::spi::ExclusiveDevice; |
| @@ -23,9 +23,9 @@ async fn ethernet_task( | |||
| 23 | runner: Runner< | 23 | runner: Runner< |
| 24 | 'static, | 24 | 'static, |
| 25 | W5100S, | 25 | W5100S, |
| 26 | ExclusiveDevice<Spi<'static, SPI0, Async>, Output<'static, PIN_17>, Delay>, | 26 | ExclusiveDevice<Spi<'static, SPI0, Async>, Output<'static>, Delay>, |
| 27 | Input<'static, PIN_21>, | 27 | Input<'static>, |
| 28 | Output<'static, PIN_20>, | 28 | Output<'static>, |
| 29 | >, | 29 | >, |
| 30 | ) -> ! { | 30 | ) -> ! { |
| 31 | runner.run().await | 31 | runner.run().await |
diff --git a/tests/rp/src/bin/uart.rs b/tests/rp/src/bin/uart.rs index f4d641175..6e6e5517b 100644 --- a/tests/rp/src/bin/uart.rs +++ b/tests/rp/src/bin/uart.rs | |||
| @@ -21,7 +21,7 @@ fn read1<const N: usize>(uart: &mut UartRx<'_, impl Instance, Blocking>) -> Resu | |||
| 21 | Ok(buf) | 21 | Ok(buf) |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | async fn send(pin: &mut Output<'_, impl embassy_rp::gpio::Pin>, v: u8, parity: Option<bool>) { | 24 | async fn send(pin: &mut Output<'_>, v: u8, parity: Option<bool>) { |
| 25 | pin.set_low(); | 25 | pin.set_low(); |
| 26 | Timer::after_millis(1).await; | 26 | Timer::after_millis(1).await; |
| 27 | for i in 0..8 { | 27 | for i in 0..8 { |
| @@ -116,7 +116,7 @@ async fn main(_spawner: Spawner) { | |||
| 116 | config.parity = Parity::ParityEven; | 116 | config.parity = Parity::ParityEven; |
| 117 | let mut uart = UartRx::new_blocking(&mut uart, &mut rx, config); | 117 | let mut uart = UartRx::new_blocking(&mut uart, &mut rx, config); |
| 118 | 118 | ||
| 119 | async fn chr(pin: &mut Output<'_, impl embassy_rp::gpio::Pin>, v: u8, parity: u8) { | 119 | async fn chr(pin: &mut Output<'_>, v: u8, parity: u8) { |
| 120 | send(pin, v, Some(parity != 0)).await; | 120 | send(pin, v, Some(parity != 0)).await; |
| 121 | } | 121 | } |
| 122 | 122 | ||
| @@ -142,7 +142,7 @@ async fn main(_spawner: Spawner) { | |||
| 142 | config.baudrate = 1000; | 142 | config.baudrate = 1000; |
| 143 | let mut uart = UartRx::new_blocking(&mut uart, &mut rx, config); | 143 | let mut uart = UartRx::new_blocking(&mut uart, &mut rx, config); |
| 144 | 144 | ||
| 145 | async fn chr(pin: &mut Output<'_, impl embassy_rp::gpio::Pin>, v: u8, good: bool) { | 145 | async fn chr(pin: &mut Output<'_>, v: u8, good: bool) { |
| 146 | if good { | 146 | if good { |
| 147 | send(pin, v, None).await; | 147 | send(pin, v, None).await; |
| 148 | } else { | 148 | } else { |
diff --git a/tests/rp/src/bin/uart_buffered.rs b/tests/rp/src/bin/uart_buffered.rs index 14647e44a..d68c23cbd 100644 --- a/tests/rp/src/bin/uart_buffered.rs +++ b/tests/rp/src/bin/uart_buffered.rs | |||
| @@ -36,7 +36,7 @@ async fn read1<const N: usize>(uart: &mut BufferedUartRx<'_, impl Instance>) -> | |||
| 36 | } | 36 | } |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | async fn send(pin: &mut Output<'_, impl embassy_rp::gpio::Pin>, v: u8, parity: Option<bool>) { | 39 | async fn send(pin: &mut Output<'_>, v: u8, parity: Option<bool>) { |
| 40 | pin.set_low(); | 40 | pin.set_low(); |
| 41 | Timer::after_millis(1).await; | 41 | Timer::after_millis(1).await; |
| 42 | for i in 0..8 { | 42 | for i in 0..8 { |
| @@ -161,7 +161,7 @@ async fn main(_spawner: Spawner) { | |||
| 161 | let rx_buf = &mut [0u8; 16]; | 161 | let rx_buf = &mut [0u8; 16]; |
| 162 | let mut uart = BufferedUartRx::new(&mut uart, Irqs, &mut rx, rx_buf, config); | 162 | let mut uart = BufferedUartRx::new(&mut uart, Irqs, &mut rx, rx_buf, config); |
| 163 | 163 | ||
| 164 | async fn chr(pin: &mut Output<'_, impl embassy_rp::gpio::Pin>, v: u8, parity: u32) { | 164 | async fn chr(pin: &mut Output<'_>, v: u8, parity: u32) { |
| 165 | send(pin, v, Some(parity != 0)).await; | 165 | send(pin, v, Some(parity != 0)).await; |
| 166 | } | 166 | } |
| 167 | 167 | ||
| @@ -208,7 +208,7 @@ async fn main(_spawner: Spawner) { | |||
| 208 | let rx_buf = &mut [0u8; 16]; | 208 | let rx_buf = &mut [0u8; 16]; |
| 209 | let mut uart = BufferedUartRx::new(&mut uart, Irqs, &mut rx, rx_buf, config); | 209 | let mut uart = BufferedUartRx::new(&mut uart, Irqs, &mut rx, rx_buf, config); |
| 210 | 210 | ||
| 211 | async fn chr(pin: &mut Output<'_, impl embassy_rp::gpio::Pin>, v: u8, good: bool) { | 211 | async fn chr(pin: &mut Output<'_>, v: u8, good: bool) { |
| 212 | if good { | 212 | if good { |
| 213 | send(pin, v, None).await; | 213 | send(pin, v, None).await; |
| 214 | } else { | 214 | } else { |
diff --git a/tests/rp/src/bin/uart_dma.rs b/tests/rp/src/bin/uart_dma.rs index 130d8599e..edc87175a 100644 --- a/tests/rp/src/bin/uart_dma.rs +++ b/tests/rp/src/bin/uart_dma.rs | |||
| @@ -27,7 +27,7 @@ async fn read1<const N: usize>(uart: &mut UartRx<'_, impl Instance, Async>) -> R | |||
| 27 | Ok(buf) | 27 | Ok(buf) |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | async fn send(pin: &mut Output<'_, impl embassy_rp::gpio::Pin>, v: u8, parity: Option<bool>) { | 30 | async fn send(pin: &mut Output<'_>, v: u8, parity: Option<bool>) { |
| 31 | pin.set_low(); | 31 | pin.set_low(); |
| 32 | Timer::after_millis(1).await; | 32 | Timer::after_millis(1).await; |
| 33 | for i in 0..8 { | 33 | for i in 0..8 { |
| @@ -160,7 +160,7 @@ async fn main(_spawner: Spawner) { | |||
| 160 | config.parity = Parity::ParityEven; | 160 | config.parity = Parity::ParityEven; |
| 161 | let mut uart = UartRx::new(&mut uart, &mut rx, Irqs, &mut p.DMA_CH0, config); | 161 | let mut uart = UartRx::new(&mut uart, &mut rx, Irqs, &mut p.DMA_CH0, config); |
| 162 | 162 | ||
| 163 | async fn chr(pin: &mut Output<'_, impl embassy_rp::gpio::Pin>, v: u8, parity: u32) { | 163 | async fn chr(pin: &mut Output<'_>, v: u8, parity: u32) { |
| 164 | send(pin, v, Some(parity != 0)).await; | 164 | send(pin, v, Some(parity != 0)).await; |
| 165 | } | 165 | } |
| 166 | 166 | ||
| @@ -205,7 +205,7 @@ async fn main(_spawner: Spawner) { | |||
| 205 | config.baudrate = 1000; | 205 | config.baudrate = 1000; |
| 206 | let mut uart = UartRx::new(&mut uart, &mut rx, Irqs, &mut p.DMA_CH0, config); | 206 | let mut uart = UartRx::new(&mut uart, &mut rx, Irqs, &mut p.DMA_CH0, config); |
| 207 | 207 | ||
| 208 | async fn chr(pin: &mut Output<'_, impl embassy_rp::gpio::Pin>, v: u8, good: bool) { | 208 | async fn chr(pin: &mut Output<'_>, v: u8, good: bool) { |
| 209 | if good { | 209 | if good { |
| 210 | send(pin, v, None).await; | 210 | send(pin, v, None).await; |
| 211 | } else { | 211 | } else { |
