more IoPin cleanups

Author: burrbull

src/gpio/hal_02.rs

@@ -2,7 +2,7 @@ use core::convert::Infallible;
 
 use super::{
     dynamic::PinModeError, DynamicPin, ErasedPin, Input, OpenDrain, Output, PartiallyErasedPin,
-    Pin, PinState, PushPull,
+    Pin, PinMode, PinState,
 };
 
 use embedded_hal::digital::v2::{
@@ -88,7 +88,10 @@ impl<const P: char, const N: u8> IoPin<Self, Self> for Pin<P, N, Output<OpenDrai
     }
 }
 
-impl<const P: char, const N: u8> IoPin<Pin<P, N, Input>, Self> for Pin<P, N, Output<OpenDrain>> {
+impl<const P: char, const N: u8, Otype> IoPin<Pin<P, N, Input>, Self> for Pin<P, N, Output<Otype>>
+where
+    Output<Otype>: PinMode,
+{
     type Error = Infallible;
     fn into_input_pin(self) -> Result<Pin<P, N, Input>, Self::Error> {
         Ok(self.into_input())
@@ -99,34 +102,17 @@ impl<const P: char, const N: u8> IoPin<Pin<P, N, Input>, Self> for Pin<P, N, Out
     }
 }
 
-impl<const P: char, const N: u8> IoPin<Self, Pin<P, N, Output<OpenDrain>>> for Pin<P, N, Input> {
+impl<const P: char, const N: u8, Otype> IoPin<Self, Pin<P, N, Output<Otype>>> for Pin<P, N, Input>
+where
+    Output<Otype>: PinMode,
+{
     type Error = Infallible;
     fn into_input_pin(self) -> Result<Self, Self::Error> {
         Ok(self)
     }
-    fn into_output_pin(self, state: PinState) -> Result<Pin<P, N, Output<OpenDrain>>, Self::Error> {
-        Ok(self.into_open_drain_output_in_state(state))
-    }
-}
-
-impl<const P: char, const N: u8> IoPin<Pin<P, N, Input>, Self> for Pin<P, N, Output<PushPull>> {
-    type Error = Infallible;
-    fn into_input_pin(self) -> Result<Pin<P, N, Input>, Self::Error> {
-        Ok(self.into_input())
-    }
-    fn into_output_pin(mut self, state: PinState) -> Result<Self, Self::Error> {
-        self.set_state(state);
-        Ok(self)
-    }
-}
-
-impl<const P: char, const N: u8> IoPin<Self, Pin<P, N, Output<PushPull>>> for Pin<P, N, Input> {
-    type Error = Infallible;
-    fn into_input_pin(self) -> Result<Self, Self::Error> {
-        Ok(self)
-    }
-    fn into_output_pin(self, state: PinState) -> Result<Pin<P, N, Output<PushPull>>, Self::Error> {
-        Ok(self.into_push_pull_output_in_state(state))
+    fn into_output_pin(mut self, state: PinState) -> Result<Pin<P, N, Output<Otype>>, Self::Error> {
+        self._set_state(state);
+        Ok(self.into_mode())
     }
 }
 

src/gpio/hal_1.rs

@@ -1,6 +1,6 @@
 use core::convert::Infallible;
 
-use super::{ErasedPin, Input, OpenDrain, Output, PartiallyErasedPin, Pin, PushPull};
+use super::{ErasedPin, Input, OpenDrain, Output, PartiallyErasedPin, Pin, PinMode};
 
 pub use embedded_hal_one::digital::PinState;
 use embedded_hal_one::digital::{
@@ -89,7 +89,10 @@ impl<const P: char, const N: u8> IoPin<Self, Self> for Pin<P, N, Output<OpenDrai
     }
 }
 
-impl<const P: char, const N: u8> IoPin<Pin<P, N, Input>, Self> for Pin<P, N, Output<OpenDrain>> {
+impl<const P: char, const N: u8, Otype> IoPin<Pin<P, N, Input>, Self> for Pin<P, N, Output<Otype>>
+where
+    Output<Otype>: PinMode,
+{
     type Error = Infallible;
     fn into_input_pin(self) -> Result<Pin<P, N, Input>, Self::Error> {
         Ok(self.into_input())
@@ -100,34 +103,17 @@ impl<const P: char, const N: u8> IoPin<Pin<P, N, Input>, Self> for Pin<P, N, Out
     }
 }
 
-impl<const P: char, const N: u8> IoPin<Self, Pin<P, N, Output<OpenDrain>>> for Pin<P, N, Input> {
+impl<const P: char, const N: u8, Otype> IoPin<Self, Pin<P, N, Output<Otype>>> for Pin<P, N, Input>
+where
+    Output<Otype>: PinMode,
+{
     type Error = Infallible;
     fn into_input_pin(self) -> Result<Self, Self::Error> {
         Ok(self)
     }
-    fn into_output_pin(self, state: PinState) -> Result<Pin<P, N, Output<OpenDrain>>, Self::Error> {
-        Ok(self.into_open_drain_output_in_state(into_state(state)))
-    }
-}
-
-impl<const P: char, const N: u8> IoPin<Pin<P, N, Input>, Self> for Pin<P, N, Output<PushPull>> {
-    type Error = Infallible;
-    fn into_input_pin(self) -> Result<Pin<P, N, Input>, Self::Error> {
-        Ok(self.into_input())
-    }
-    fn into_output_pin(mut self, state: PinState) -> Result<Self, Self::Error> {
-        self.set_state(into_state(state));
-        Ok(self)
-    }
-}
-
-impl<const P: char, const N: u8> IoPin<Self, Pin<P, N, Output<PushPull>>> for Pin<P, N, Input> {
-    type Error = Infallible;
-    fn into_input_pin(self) -> Result<Self, Self::Error> {
-        Ok(self)
-    }
-    fn into_output_pin(self, state: PinState) -> Result<Pin<P, N, Output<PushPull>>, Self::Error> {
-        Ok(self.into_push_pull_output_in_state(into_state(state)))
+    fn into_output_pin(mut self, state: PinState) -> Result<Pin<P, N, Output<Otype>>, Self::Error> {
+        self._set_state(into_state(state));
+        Ok(self.into_mode())
     }
 }