diff options
| author | ceekdee <[email protected]> | 2022-10-08 14:32:22 -0500 |
|---|---|---|
| committer | ceekdee <[email protected]> | 2022-10-08 14:32:22 -0500 |
| commit | f554962f54b9f9e8f85a0dd099635619bd1acd1d (patch) | |
| tree | 6a5eb23c04618dd6a333061bdf265ead9e527928 /examples | |
| parent | bb84d7a0aeee967a2facdfb0590b03493b703e9f (diff) | |
Improve generics and consolidate antenna handling
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/nrf/src/bin/lora_p2p_report.rs | 8 | ||||
| -rw-r--r-- | examples/nrf/src/bin/lora_p2p_sense.rs | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/nrf/src/bin/lora_p2p_report.rs b/examples/nrf/src/bin/lora_p2p_report.rs index 46cb848b1..4ba3d30ce 100644 --- a/examples/nrf/src/bin/lora_p2p_report.rs +++ b/examples/nrf/src/bin/lora_p2p_report.rs | |||
| @@ -24,12 +24,12 @@ async fn main(_spawner: Spawner) { | |||
| 24 | let irq = interrupt::take!(SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1); | 24 | let irq = interrupt::take!(SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1); |
| 25 | let spim = spim::Spim::new(p.TWISPI1, irq, p.P1_11, p.P1_13, p.P1_12, spi_config); | 25 | let spim = spim::Spim::new(p.TWISPI1, irq, p.P1_11, p.P1_13, p.P1_12, spi_config); |
| 26 | 26 | ||
| 27 | let cs = Output::new(p.P1_10, Level::High, OutputDrive::Standard); | 27 | let cs = Output::new(p.P1_10.degrade(), Level::High, OutputDrive::Standard); |
| 28 | let reset = Output::new(p.P1_06, Level::High, OutputDrive::Standard); | 28 | let reset = Output::new(p.P1_06.degrade(), Level::High, OutputDrive::Standard); |
| 29 | let dio1 = Input::new(p.P1_15.degrade(), Pull::Down); | 29 | let dio1 = Input::new(p.P1_15.degrade(), Pull::Down); |
| 30 | let busy = Input::new(p.P1_14.degrade(), Pull::Down); | 30 | let busy = Input::new(p.P1_14.degrade(), Pull::Down); |
| 31 | let antenna_rx = Output::new(p.P1_05, Level::Low, OutputDrive::Standard); | 31 | let antenna_rx = Output::new(p.P1_05.degrade(), Level::Low, OutputDrive::Standard); |
| 32 | let antenna_tx = Output::new(p.P1_07, Level::Low, OutputDrive::Standard); | 32 | let antenna_tx = Output::new(p.P1_07.degrade(), Level::Low, OutputDrive::Standard); |
| 33 | 33 | ||
| 34 | match Sx126xRadio::new(spim, cs, reset, antenna_rx, antenna_tx, dio1, busy, false).await { | 34 | match Sx126xRadio::new(spim, cs, reset, antenna_rx, antenna_tx, dio1, busy, false).await { |
| 35 | Ok(r) => r, | 35 | Ok(r) => r, |
diff --git a/examples/nrf/src/bin/lora_p2p_sense.rs b/examples/nrf/src/bin/lora_p2p_sense.rs index 3c6bb8767..405a8403f 100644 --- a/examples/nrf/src/bin/lora_p2p_sense.rs +++ b/examples/nrf/src/bin/lora_p2p_sense.rs | |||
| @@ -97,12 +97,12 @@ async fn main(spawner: Spawner) { | |||
| 97 | let irq = interrupt::take!(SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1); | 97 | let irq = interrupt::take!(SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1); |
| 98 | let spim = spim::Spim::new(p.TWISPI1, irq, p.P1_11, p.P1_13, p.P1_12, spi_config); | 98 | let spim = spim::Spim::new(p.TWISPI1, irq, p.P1_11, p.P1_13, p.P1_12, spi_config); |
| 99 | 99 | ||
| 100 | let cs = Output::new(p.P1_10, Level::High, OutputDrive::Standard); | 100 | let cs = Output::new(p.P1_10.degrade(), Level::High, OutputDrive::Standard); |
| 101 | let reset = Output::new(p.P1_06, Level::High, OutputDrive::Standard); | 101 | let reset = Output::new(p.P1_06.degrade(), Level::High, OutputDrive::Standard); |
| 102 | let dio1 = Input::new(p.P1_15.degrade(), Pull::Down); | 102 | let dio1 = Input::new(p.P1_15.degrade(), Pull::Down); |
| 103 | let busy = Input::new(p.P1_14.degrade(), Pull::Down); | 103 | let busy = Input::new(p.P1_14.degrade(), Pull::Down); |
| 104 | let antenna_rx = Output::new(p.P1_05, Level::Low, OutputDrive::Standard); | 104 | let antenna_rx = Output::new(p.P1_05.degrade(), Level::Low, OutputDrive::Standard); |
| 105 | let antenna_tx = Output::new(p.P1_07, Level::Low, OutputDrive::Standard); | 105 | let antenna_tx = Output::new(p.P1_07.degrade(), Level::Low, OutputDrive::Standard); |
| 106 | 106 | ||
| 107 | match Sx126xRadio::new(spim, cs, reset, antenna_rx, antenna_tx, dio1, busy, false).await { | 107 | match Sx126xRadio::new(spim, cs, reset, antenna_rx, antenna_tx, dio1, busy, false).await { |
| 108 | Ok(r) => r, | 108 | Ok(r) => r, |