QDEC refactor and addition of Pins

Author: korken89

examples/qdec-demo/src/main.rs

@@ -25,10 +25,13 @@ const APP: () = {
         rtt_init_print!();
 
         let p0 = hal::gpio::p0::Parts::new(ctx.device.P0);
-        let pin_a = p0.p0_31.into_pullup_input().degrade();
-        let pin_b = p0.p0_30.into_pullup_input().degrade();
+        let pins = Pins {
+            a: p0.p0_31.into_pullup_input().degrade(),
+            b: p0.p0_30.into_pullup_input().degrade(),
+            led: None,
+        };
 
-        let qdec = Qdec::new(ctx.device.QDEC, pin_a, pin_b, None, SamplePeriod::_128us);
+        let qdec = Qdec::new(ctx.device.QDEC, pins, SamplePeriod::_128us);
         qdec.debounce(true)
             .enable_interrupt(NumSamples::_1smpl)
             .enable();

nrf-hal-common/src/qdec.rs

@@ -15,23 +15,17 @@ pub struct Qdec {
 
 impl Qdec {
     /// Takes ownership of the `QDEC` peripheral and associated pins, returning a safe wrapper.
-    pub fn new(
-        qdec: QDEC,
-        pin_a: Pin<Input<PullUp>>,
-        pin_b: Pin<Input<PullUp>>,
-        pin_led: Option<Pin<Input<PullUp>>>,
-        sample_period: SamplePeriod,
-    ) -> Self {
+    pub fn new(qdec: QDEC, pins: Pins, sample_period: SamplePeriod) -> Self {
         qdec.psel.a.write(|w| {
-            unsafe { w.bits(pin_a.psel_bits()) };
+            unsafe { w.bits(pins.a.psel_bits()) };
             w.connect().connected()
         });
         qdec.psel.b.write(|w| {
-            unsafe { w.bits(pin_b.psel_bits()) };
+            unsafe { w.bits(pins.b.psel_bits()) };
             w.connect().connected()
         });
 
-        if let Some(p) = &pin_led {
+        if let Some(p) = &pins.led {
             qdec.psel.led.write(|w| {
                 unsafe { w.bits(p.psel_bits()) };
                 w.connect().connected()
@@ -139,17 +133,10 @@ impl Qdec {
 
     /// Consumes `self` and returns back the raw `QDEC` peripheral.
     #[inline]
-    pub fn free(
-        self,
-    ) -> (
-        QDEC,
-        Pin<Input<PullUp>>,
-        Pin<Input<PullUp>>,
-        Option<Pin<Input<PullUp>>>,
-    ) {
-        let pin_a = unsafe { Pin::from_psel_bits(self.qdec.psel.a.read().bits()) };
-        let pin_b = unsafe { Pin::from_psel_bits(self.qdec.psel.b.read().bits()) };
-        let pin_led = {
+    pub fn free(self) -> (QDEC, Pins) {
+        let a = unsafe { Pin::from_psel_bits(self.qdec.psel.a.read().bits()) };
+        let b = unsafe { Pin::from_psel_bits(self.qdec.psel.b.read().bits()) };
+        let led = {
             let led = self.qdec.psel.led.read();
             if led.connect().bit_is_set() {
                 Some(unsafe { Pin::from_psel_bits(led.bits()) })
@@ -161,10 +148,17 @@ impl Qdec {
         self.qdec.psel.b.reset();
         self.qdec.psel.led.reset();
 
-        (self.qdec, pin_a, pin_b, pin_led)
+        (self.qdec, Pins { a, b, led })
     }
 }
 
+/// Pins for the QDEC
+pub struct Pins {
+    pub a: Pin<Input<PullUp>>,
+    pub b: Pin<Input<PullUp>>,
+    pub led: Option<Pin<Input<PullUp>>>,
+}
+
 #[derive(Debug, Eq, PartialEq, Clone, Copy)]
 pub enum SamplePeriod {
     _128us,