Fix eh0.2 set_high/set_low (esp-rs#2265)

Dominaezzz · Oct 2, 2024 · a3304c6 · a3304c6
1 parent f5b8e4b
commit a3304c6
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 2 deletions.
diff --git a/esp-hal/src/gpio/mod.rs b/esp-hal/src/gpio/mod.rs
@@ -2601,11 +2601,11 @@ mod embedded_hal_02_impls {
         type Error = core::convert::Infallible;
 
         fn set_high(&mut self) -> Result<(), Self::Error> {
-            self.pin.is_set_high();
+            self.pin.set_high();
             Ok(())
         }
         fn set_low(&mut self) -> Result<(), Self::Error> {
-            self.pin.is_set_low();
+            self.pin.set_low();
             Ok(())
         }
     }

diff --git a/hil-test/tests/gpio.rs b/hil-test/tests/gpio.rs
@@ -140,6 +140,100 @@ mod tests {
         assert_eq!(test_gpio2.is_set_high(), true);
     }
 
+    #[test]
+    fn test_gpio_output_embedded_hal_0_2(ctx: Context) {
+        let test_gpio1 = Input::new(ctx.test_gpio1, Pull::Down);
+        let mut test_gpio2 = Output::new(ctx.test_gpio2, Level::Low);
+
+        fn set<T>(pin: &mut T, state: bool)
+        where
+            T: embedded_hal_02::digital::v2::OutputPin,
+        {
+            if state {
+                pin.set_high().ok();
+            } else {
+                pin.set_low().ok();
+            }
+        }
+
+        fn toggle<T>(pin: &mut T)
+        where
+            T: embedded_hal_02::digital::v2::ToggleableOutputPin,
+        {
+            pin.toggle().ok();
+        }
+
+        // `StatefulOutputPin`:
+        assert_eq!(test_gpio2.is_set_low(), true);
+        assert_eq!(test_gpio2.is_set_high(), false);
+        assert_eq!(test_gpio1.is_low(), true);
+        assert_eq!(test_gpio1.is_high(), false);
+        set(&mut test_gpio2, true);
+        assert_eq!(test_gpio2.is_set_low(), false);
+        assert_eq!(test_gpio2.is_set_high(), true);
+        assert_eq!(test_gpio1.is_low(), false);
+        assert_eq!(test_gpio1.is_high(), true);
+
+        // `ToggleableOutputPin`:
+        toggle(&mut test_gpio2);
+        assert_eq!(test_gpio2.is_set_low(), true);
+        assert_eq!(test_gpio2.is_set_high(), false);
+        assert_eq!(test_gpio1.is_low(), true);
+        assert_eq!(test_gpio1.is_high(), false);
+        toggle(&mut test_gpio2);
+        assert_eq!(test_gpio2.is_set_low(), false);
+        assert_eq!(test_gpio2.is_set_high(), true);
+        assert_eq!(test_gpio1.is_low(), false);
+        assert_eq!(test_gpio1.is_high(), true);
+    }
+
+    #[test]
+    fn test_gpio_output_embedded_hal_1_0(ctx: Context) {
+        let test_gpio1 = Input::new(ctx.test_gpio1, Pull::Down);
+        let mut test_gpio2 = Output::new(ctx.test_gpio2, Level::Low);
+
+        fn set<T>(pin: &mut T, state: bool)
+        where
+            T: embedded_hal::digital::OutputPin,
+        {
+            if state {
+                pin.set_high().ok();
+            } else {
+                pin.set_low().ok();
+            }
+        }
+
+        fn toggle<T>(pin: &mut T)
+        where
+            T: embedded_hal::digital::StatefulOutputPin,
+        {
+            pin.toggle().ok();
+        }
+
+        // `StatefulOutputPin`:
+        assert_eq!(test_gpio2.is_set_low(), true);
+        assert_eq!(test_gpio2.is_set_high(), false);
+        assert_eq!(test_gpio1.is_low(), true);
+        assert_eq!(test_gpio1.is_high(), false);
+        set(&mut test_gpio2, true);
+        assert_eq!(test_gpio2.is_set_low(), false);
+        assert_eq!(test_gpio2.is_set_high(), true);
+        assert_eq!(test_gpio1.is_low(), false);
+        assert_eq!(test_gpio1.is_high(), true);
+
+        // `ToggleableOutputPin`:
+        toggle(&mut test_gpio2);
+        assert_eq!(test_gpio2.is_set_low(), true);
+        assert_eq!(test_gpio2.is_set_high(), false);
+        assert_eq!(test_gpio1.is_low(), true);
+        assert_eq!(test_gpio1.is_high(), false);
+        toggle(&mut test_gpio2);
+        assert_eq!(test_gpio2.is_set_low(), false);
+        assert_eq!(test_gpio2.is_set_high(), true);
+        assert_eq!(test_gpio1.is_low(), false);
+        assert_eq!(test_gpio1.is_high(), true);
+    }
+
     #[test]
     fn test_gpio_interrupt(ctx: Context) {
         let mut test_gpio1 = Input::new(ctx.test_gpio1, Pull::Down);