let helpers conjure gpioa

Author: usbalbin

tests/common/mod.rs

@@ -20,7 +20,8 @@ impl<const CYCLES_PER_US: u32> Timer<CYCLES_PER_US> {
 }
 
 #[allow(dead_code)]
-pub fn is_pax_low(gpioa: &stm32::gpioa::RegisterBlock, pin: u8) -> bool {
+pub fn is_pax_low(pin: u8) -> bool {
+    let gpioa = unsafe { &*GPIOA::PTR };
     gpioa.idr().read().idr(pin).is_low()
 }
 
@@ -31,21 +32,19 @@ pub struct ErrorTimedOut;
 #[allow(dead_code)]
 pub fn await_lo<const CYCLES_PER_US: u32>(
     timer: &Timer<CYCLES_PER_US>,
-    gpioa: &stm32::gpioa::RegisterBlock,
     pin: u8,
     timeout: MicrosDurationU32,
 ) -> Result<MicrosDurationU32, ErrorTimedOut> {
-    await_p(timer, || is_pax_low(gpioa, pin), timeout)
+    await_p(timer, || is_pax_low(pin), timeout)
 }
 
 #[allow(dead_code)]
 pub fn await_hi<const CYCLES_PER_US: u32>(
     timer: &Timer<CYCLES_PER_US>,
-    gpioa: &stm32::gpioa::RegisterBlock,
     pin: u8,
     timeout: MicrosDurationU32,
 ) -> Result<MicrosDurationU32, ErrorTimedOut> {
-    await_p(timer, || !is_pax_low(gpioa, pin), timeout)
+    await_p(timer, || !is_pax_low(pin), timeout)
 }
 
 #[allow(dead_code)]

tests/nucleo-g474.rs

@@ -59,17 +59,11 @@ mod tests {
 
         pin.set_high();
         delay.delay(1.millis()); // Give the pin plenty of time to go high
-        {
-            let gpioa = unsafe { &*GPIOA::PTR };
-            assert!(!is_pax_low(gpioa, pin_num));
-        }
+        assert!(!is_pax_low(pin_num));
 
         pin.set_low();
         delay.delay(1.millis()); // Give the pin plenty of time to go low
-        {
-            let gpioa = unsafe { &*GPIOA::PTR };
-            assert!(is_pax_low(gpioa, pin_num));
-        }
+        assert!(is_pax_low(pin_num));
     }
 
     #[test]
@@ -96,18 +90,12 @@ mod tests {
         pin.set_high();
         delay.delay(1.millis()); // Give the pin plenty of time to go high
         assert!(pin.is_high());
-        {
-            let gpioa = unsafe { &*GPIOA::PTR };
-            assert!(!is_pax_low(gpioa, pin_num));
-        }
+        assert!(!is_pax_low(pin_num));
 
         pin.set_low();
         delay.delay(1.millis()); // Give the pin plenty of time to go low
         assert!(pin.is_low());
-        {
-            let gpioa = unsafe { &*GPIOA::PTR };
-            assert!(is_pax_low(gpioa, pin_num));
-        }
+        assert!(is_pax_low(pin_num));
     }
 
     #[test]
@@ -132,21 +120,19 @@ mod tests {
         pwm.set_duty_cycle_percent(50).unwrap();
         pwm.enable();
 
-        let gpioa = unsafe { &*GPIOA::PTR };
-
         let min: MicrosDurationU32 = 495u32.micros();
         let max: MicrosDurationU32 = 505u32.micros();
 
         debug!("Awaiting first rising edge...");
-        let duration_until_lo = await_lo(&timer, gpioa, pin_num, max).unwrap();
-        let first_lo_duration = await_hi(&timer, gpioa, pin_num, max).unwrap();
+        let duration_until_lo = await_lo(&timer, pin_num, max).unwrap();
+        let first_lo_duration = await_hi(&timer, pin_num, max).unwrap();
 
         let mut hi_duration = 0.micros();
         let mut lo_duration = 0.micros();
 
         for _ in 0..10 {
             // Make sure the timer half periods are within 495-505us
-            hi_duration = await_lo(&timer, gpioa, pin_num, max).unwrap();
+            hi_duration = await_lo(&timer, pin_num, max).unwrap();
             assert!(
                 hi_duration > min && hi_duration < max,
                 "hi: {} < {} < {}",
@@ -155,7 +141,7 @@ mod tests {
                 max
             );
 
-            lo_duration = await_hi(&timer, gpioa, pin_num, max).unwrap();
+            lo_duration = await_hi(&timer, pin_num, max).unwrap();
             assert!(
                 lo_duration > min && lo_duration < max,
                 "lo: {} < {} < {}",