nrf/gpiote: new api: switch to owned structs, implement WaitForHigh/WaitForLow.

2 files changed, 38 insertions, 33 deletions

diff --git a/embassy-nrf-examples/src/bin/gpiote.rs b/embassy-nrf-examples/src/bin/gpiote_channel.rs
index f5315d6a6..5470c47cd 100644
--- a/embassy-nrf-examples/src/bin/gpiote.rs
+++ b/embassy-nrf-examples/src/bin/gpiote_channel.rs
@@ -12,7 +12,7 @@ use nrf52840_hal::gpio;
 
 use embassy::executor::{task, Executor};
 use embassy::util::Forever;
-use embassy_nrf::gpiote;
+use embassy_nrf::gpiote::{Channels, Gpiote, InputChannel, InputChannelPolarity};
 use embassy_nrf::interrupt;
 
 #[task]
@@ -20,46 +20,44 @@ async fn run() {
     let p = unwrap!(embassy_nrf::pac::Peripherals::take());
     let port0 = gpio::p0::Parts::new(p.P0);
 
-    let g = gpiote::Gpiote::new(p.GPIOTE, interrupt::take!(GPIOTE));
+    let (g, chs) = Gpiote::new(p.GPIOTE, interrupt::take!(GPIOTE));
 
     info!("Starting!");
 
     let pin1 = port0.p0_11.into_pullup_input().degrade();
-    let button1 = async {
-        let ch = unwrap!(g.new_input_channel(pin1, gpiote::InputChannelPolarity::HiToLo));
+    let pin2 = port0.p0_12.into_pullup_input().degrade();
+    let pin3 = port0.p0_24.into_pullup_input().degrade();
+    let pin4 = port0.p0_25.into_pullup_input().degrade();
+
+    let ch1 = InputChannel::new(g, chs.ch0, pin1, InputChannelPolarity::HiToLo);
+    let ch2 = InputChannel::new(g, chs.ch1, pin2, InputChannelPolarity::LoToHi);
+    let ch3 = InputChannel::new(g, chs.ch2, pin3, InputChannelPolarity::Toggle);
+    let ch4 = InputChannel::new(g, chs.ch3, pin4, InputChannelPolarity::Toggle);
 
+    let button1 = async {
         loop {
-            ch.wait().await;
+            ch1.wait().await;
             info!("Button 1 pressed")
         }
     };
 
-    let pin2 = port0.p0_12.into_pullup_input().degrade();
     let button2 = async {
-        let ch = unwrap!(g.new_input_channel(pin2, gpiote::InputChannelPolarity::LoToHi));
-
         loop {
-            ch.wait().await;
+            ch2.wait().await;
             info!("Button 2 released")
         }
     };
 
-    let pin3 = port0.p0_24.into_pullup_input().degrade();
     let button3 = async {
-        let ch = unwrap!(g.new_input_channel(pin3, gpiote::InputChannelPolarity::Toggle));
-
         loop {
-            ch.wait().await;
+            ch3.wait().await;
             info!("Button 3 toggled")
         }
     };
 
-    let pin4 = port0.p0_25.into_pullup_input().degrade();
     let button4 = async {
-        let ch = unwrap!(g.new_input_channel(pin4, gpiote::InputChannelPolarity::Toggle));
-
         loop {
-            ch.wait().await;
+            ch4.wait().await;
             info!("Button 4 toggled")
         }
     };
diff --git a/embassy-nrf-examples/src/bin/gpiote_port.rs b/embassy-nrf-examples/src/bin/gpiote_port.rs
index 833096f3a..9d999f951 100644
--- a/embassy-nrf-examples/src/bin/gpiote_port.rs
+++ b/embassy-nrf-examples/src/bin/gpiote_port.rs
@@ -7,20 +7,22 @@ mod example_common;
 use example_common::*;
 
 use core::mem;
+use core::pin::Pin;
 use cortex_m_rt::entry;
 use defmt::panic;
 use nrf52840_hal::gpio;
 
 use embassy::executor::{task, Executor};
+use embassy::gpio::{WaitForHigh, WaitForLow};
 use embassy::util::Forever;
-use embassy_nrf::gpiote::{Gpiote, PortInputPolarity};
+use embassy_nrf::gpiote::{Gpiote, GpiotePin};
 use embassy_nrf::interrupt;
 
-async fn button(g: &Gpiote, n: usize, pin: gpio::Pin<gpio::Input<gpio::PullUp>>) {
+async fn button(n: usize, mut pin: GpiotePin<gpio::PullUp>) {
     loop {
-        g.wait_port_input(&pin, PortInputPolarity::Low).await;
+        Pin::new(&mut pin).wait_for_low().await;
         info!("Button {:?} pressed!", n);
-        g.wait_port_input(&pin, PortInputPolarity::High).await;
+        Pin::new(&mut pin).wait_for_high().await;
         info!("Button {:?} released!", n);
     }
 }
@@ -30,19 +32,24 @@ async fn run() {
     let p = unwrap!(embassy_nrf::pac::Peripherals::take());
     let port0 = gpio::p0::Parts::new(p.P0);
 
-    let g = Gpiote::new(p.GPIOTE, interrupt::take!(GPIOTE));
-    info!(
-        "sizeof Signal<()> = {:usize}",
-        mem::size_of::<embassy::util::Signal<()>>()
-    );
-    info!("sizeof gpiote = {:usize}", mem::size_of::<Gpiote>());
-
-    info!("Starting!");
+    let (g, _) = Gpiote::new(p.GPIOTE, interrupt::take!(GPIOTE));
 
-    let button1 = button(&g, 1, port0.p0_11.into_pullup_input().degrade());
-    let button2 = button(&g, 2, port0.p0_12.into_pullup_input().degrade());
-    let button3 = button(&g, 3, port0.p0_24.into_pullup_input().degrade());
-    let button4 = button(&g, 4, port0.p0_25.into_pullup_input().degrade());
+    let button1 = button(
+        1,
+        GpiotePin::new(g, port0.p0_11.into_pullup_input().degrade()),
+    );
+    let button2 = button(
+        2,
+        GpiotePin::new(g, port0.p0_12.into_pullup_input().degrade()),
+    );
+    let button3 = button(
+        3,
+        GpiotePin::new(g, port0.p0_24.into_pullup_input().degrade()),
+    );
+    let button4 = button(
+        4,
+        GpiotePin::new(g, port0.p0_25.into_pullup_input().degrade()),
+    );
     futures::join!(button1, button2, button3, button4);
 }