aboutsummaryrefslogtreecommitdiff
path: root/tests/nrf
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2024-01-22 21:19:18 +0100
committerDario Nieuwenhuis <[email protected]>2024-01-22 21:32:10 +0100
commit2bc5e9523d4373002487614ecfef1e3f0858fd66 (patch)
tree9dc0bc88d640ea0636df680a52b159188c701999 /tests/nrf
parent3387ee7238f1c9c4eeccb732ba543cbe38ab7ccd (diff)
nrf/gpio: remove generics.
Diffstat (limited to 'tests/nrf')
-rw-r--r--tests/nrf/src/bin/ethernet_enc28j60_perf.rs5
-rw-r--r--tests/nrf/src/bin/wifi_esp_hosted_perf.rs12
2 files changed, 7 insertions, 10 deletions
diff --git a/tests/nrf/src/bin/ethernet_enc28j60_perf.rs b/tests/nrf/src/bin/ethernet_enc28j60_perf.rs
index 7dc1941d7..33c2f4235 100644
--- a/tests/nrf/src/bin/ethernet_enc28j60_perf.rs
+++ b/tests/nrf/src/bin/ethernet_enc28j60_perf.rs
@@ -21,10 +21,7 @@ bind_interrupts!(struct Irqs {
21 RNG => embassy_nrf::rng::InterruptHandler<peripherals::RNG>; 21 RNG => embassy_nrf::rng::InterruptHandler<peripherals::RNG>;
22}); 22});
23 23
24type MyDriver = Enc28j60< 24type MyDriver = Enc28j60<ExclusiveDevice<Spim<'static, peripherals::SPI3>, Output<'static>, Delay>, Output<'static>>;
25 ExclusiveDevice<Spim<'static, peripherals::SPI3>, Output<'static, peripherals::P0_15>, Delay>,
26 Output<'static, peripherals::P0_13>,
27>;
28 25
29#[embassy_executor::task] 26#[embassy_executor::task]
30async fn net_task(stack: &'static Stack<MyDriver>) -> ! { 27async fn net_task(stack: &'static Stack<MyDriver>) -> ! {
diff --git a/tests/nrf/src/bin/wifi_esp_hosted_perf.rs b/tests/nrf/src/bin/wifi_esp_hosted_perf.rs
index c96064f84..b83edddc4 100644
--- a/tests/nrf/src/bin/wifi_esp_hosted_perf.rs
+++ b/tests/nrf/src/bin/wifi_esp_hosted_perf.rs
@@ -6,7 +6,7 @@ teleprobe_meta::timeout!(120);
6use defmt::{info, unwrap}; 6use defmt::{info, unwrap};
7use embassy_executor::Spawner; 7use embassy_executor::Spawner;
8use embassy_net::{Config, Stack, StackResources}; 8use embassy_net::{Config, Stack, StackResources};
9use embassy_nrf::gpio::{AnyPin, Input, Level, Output, OutputDrive, Pin, Pull}; 9use embassy_nrf::gpio::{Input, Level, Output, OutputDrive, Pull};
10use embassy_nrf::rng::Rng; 10use embassy_nrf::rng::Rng;
11use embassy_nrf::spim::{self, Spim}; 11use embassy_nrf::spim::{self, Spim};
12use embassy_nrf::{bind_interrupts, peripherals}; 12use embassy_nrf::{bind_interrupts, peripherals};
@@ -28,9 +28,9 @@ const WIFI_PASSWORD: &str = "V8YxhKt5CdIAJFud";
28async fn wifi_task( 28async fn wifi_task(
29 runner: hosted::Runner< 29 runner: hosted::Runner<
30 'static, 30 'static,
31 ExclusiveDevice<Spim<'static, peripherals::SPI3>, Output<'static, peripherals::P0_31>, Delay>, 31 ExclusiveDevice<Spim<'static, peripherals::SPI3>, Output<'static>, Delay>,
32 Input<'static, AnyPin>, 32 Input<'static>,
33 Output<'static, peripherals::P1_05>, 33 Output<'static>,
34 >, 34 >,
35) -> ! { 35) -> ! {
36 runner.run().await 36 runner.run().await
@@ -53,8 +53,8 @@ async fn main(spawner: Spawner) {
53 let sck = p.P0_29; 53 let sck = p.P0_29;
54 let mosi = p.P0_30; 54 let mosi = p.P0_30;
55 let cs = Output::new(p.P0_31, Level::High, OutputDrive::HighDrive); 55 let cs = Output::new(p.P0_31, Level::High, OutputDrive::HighDrive);
56 let handshake = Input::new(p.P1_01.degrade(), Pull::Up); 56 let handshake = Input::new(p.P1_01, Pull::Up);
57 let ready = Input::new(p.P1_04.degrade(), Pull::None); 57 let ready = Input::new(p.P1_04, Pull::None);
58 let reset = Output::new(p.P1_05, Level::Low, OutputDrive::Standard); 58 let reset = Output::new(p.P1_05, Level::Low, OutputDrive::Standard);
59 59
60 let mut config = spim::Config::default(); 60 let mut config = spim::Config::default();