prepare for edding embedded_hal 1.0

Author: burrbull

CHANGELOG.md

@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
            fix errata.
 - `PwmHz::get_period`: fix computation of return value, prevent division by zero
 - return `i2c::Error::Timeout` instead of `nb::WouldBlock` when time is out
+- support `embedded-hal-1.0-alpha`
 
 ### Breaking changes
 

Cargo.toml

@@ -30,6 +30,11 @@ fugit = "0.3.6"
 fugit-timer = "0.1.3"
 rtic-monotonic = { version = "1.0", optional = true }
 bitflags = "1.3.2"
+vcell = "0.1.3"
+
+[dependencies.embedded-hal-one]
+version = "=1.0.0-alpha.8"
+package = "embedded-hal"
 
 [dependencies.stm32-usbd]
 version = "0.6.0"

examples/serial-interrupt-idle.rs

@@ -45,7 +45,7 @@ fn main() -> ! {
     // Set up the usart device. Takes ownership over the USART register and tx/rx pins. The rest of
     // the registers are used to enable and configure the device.
     let (mut tx, mut rx) =
-        Serial::new(p.USART1, (tx, rx), &mut afio.mapr, 115200.bps(), &clocks).split();
+        Serial::new(p.USART1, (tx, rx), &mut afio.mapr, 115_200.bps(), &clocks).split();
     tx.listen();
     rx.listen();
     rx.listen_idle();

src/adc.rs

@@ -101,7 +101,7 @@ impl From<Align> for bool {
 }
 
 macro_rules! adc_pins {
-    ($ADC:ty, $($pin:ty => $chan:expr),+ $(,)*) => {
+    ($ADC:ty, $($pin:ty => $chan:literal),+ $(,)*) => {
         $(
             impl Channel<$ADC> for $pin {
                 type ID = u8;
@@ -113,59 +113,59 @@ macro_rules! adc_pins {
 }
 
 adc_pins!(pac::ADC1,
-    gpio::PA0<Analog> => 0_u8,
-    gpio::PA1<Analog> => 1_u8,
-    gpio::PA2<Analog> => 2_u8,
-    gpio::PA3<Analog> => 3_u8,
-    gpio::PA4<Analog> => 4_u8,
-    gpio::PA5<Analog> => 5_u8,
-    gpio::PA6<Analog> => 6_u8,
-    gpio::PA7<Analog> => 7_u8,
-    gpio::PB0<Analog> => 8_u8,
-    gpio::PB1<Analog> => 9_u8,
-    gpio::PC0<Analog> => 10_u8,
-    gpio::PC1<Analog> => 11_u8,
-    gpio::PC2<Analog> => 12_u8,
-    gpio::PC3<Analog> => 13_u8,
-    gpio::PC4<Analog> => 14_u8,
-    gpio::PC5<Analog> => 15_u8,
+    gpio::PA0<Analog> => 0,
+    gpio::PA1<Analog> => 1,
+    gpio::PA2<Analog> => 2,
+    gpio::PA3<Analog> => 3,
+    gpio::PA4<Analog> => 4,
+    gpio::PA5<Analog> => 5,
+    gpio::PA6<Analog> => 6,
+    gpio::PA7<Analog> => 7,
+    gpio::PB0<Analog> => 8,
+    gpio::PB1<Analog> => 9,
+    gpio::PC0<Analog> => 10,
+    gpio::PC1<Analog> => 11,
+    gpio::PC2<Analog> => 12,
+    gpio::PC3<Analog> => 13,
+    gpio::PC4<Analog> => 14,
+    gpio::PC5<Analog> => 15,
 );
 
 #[cfg(any(feature = "stm32f103", feature = "connectivity"))]
 adc_pins!(pac::ADC2,
-    gpio::PA0<Analog> => 0_u8,
-    gpio::PA1<Analog> => 1_u8,
-    gpio::PA2<Analog> => 2_u8,
-    gpio::PA3<Analog> => 3_u8,
-    gpio::PA4<Analog> => 4_u8,
-    gpio::PA5<Analog> => 5_u8,
-    gpio::PA6<Analog> => 6_u8,
-    gpio::PA7<Analog> => 7_u8,
-    gpio::PB0<Analog> => 8_u8,
-    gpio::PB1<Analog> => 9_u8,
-    gpio::PC0<Analog> => 10_u8,
-    gpio::PC1<Analog> => 11_u8,
-    gpio::PC2<Analog> => 12_u8,
-    gpio::PC3<Analog> => 13_u8,
-    gpio::PC4<Analog> => 14_u8,
-    gpio::PC5<Analog> => 15_u8,
+    gpio::PA0<Analog> => 0,
+    gpio::PA1<Analog> => 1,
+    gpio::PA2<Analog> => 2,
+    gpio::PA3<Analog> => 3,
+    gpio::PA4<Analog> => 4,
+    gpio::PA5<Analog> => 5,
+    gpio::PA6<Analog> => 6,
+    gpio::PA7<Analog> => 7,
+    gpio::PB0<Analog> => 8,
+    gpio::PB1<Analog> => 9,
+    gpio::PC0<Analog> => 10,
+    gpio::PC1<Analog> => 11,
+    gpio::PC2<Analog> => 12,
+    gpio::PC3<Analog> => 13,
+    gpio::PC4<Analog> => 14,
+    gpio::PC5<Analog> => 15,
 );
 
 #[cfg(all(feature = "stm32f103", any(feature = "high", feature = "xl",),))]
 adc_pins!(pac::ADC3,
-    gpio::PA0<Analog> => 0_u8,
-    gpio::PA1<Analog> => 1_u8,
-    gpio::PA2<Analog> => 2_u8,
-    gpio::PA3<Analog> => 3_u8,
-    gpio::PF6<Analog> => 4_u8,
-    gpio::PF7<Analog> => 5_u8,
-    gpio::PF8<Analog> => 6_u8,
-    gpio::PF9<Analog> => 7_u8,
-    gpio::PF10<Analog> => 8_u8,
-    gpio::PC0<Analog> => 10_u8,
-    gpio::PC1<Analog> => 11_u8,
-    gpio::PC2<Analog> => 12_u8,
-    gpio::PC3<Analog> => 13_u8,
+    gpio::PA0<Analog> => 0,
+    gpio::PA1<Analog> => 1,
+    gpio::PA2<Analog> => 2,
+    gpio::PA3<Analog> => 3,
+    gpio::PF6<Analog> => 4,
+    gpio::PF7<Analog> => 5,
+    gpio::PF8<Analog> => 6,
+    gpio::PF9<Analog> => 7,
+    gpio::PF10<Analog> => 8,
+    gpio::PC0<Analog> => 10,
+    gpio::PC1<Analog> => 11,
+    gpio::PC2<Analog> => 12,
+    gpio::PC3<Analog> => 13,
 );
 
 /// Stored ADC config can be restored using the `Adc::restore_cfg` method

src/gpio.rs

@@ -77,14 +77,16 @@ use core::convert::Infallible;
 use core::marker::PhantomData;
 
 use crate::afio;
-use crate::hal::digital::v2::{InputPin, OutputPin, StatefulOutputPin, ToggleableOutputPin};
 use crate::pac::EXTI;
 
 mod partially_erased;
 pub use partially_erased::{PEPin, PartiallyErasedPin};
 mod erased;
 pub use erased::{EPin, ErasedPin};
 
+mod hal_02;
+mod hal_1;
+
 /// Slew rates available for Output and relevant AlternateMode Pins
 ///
 /// See Table 21 "Output MODE bits" in the reference
@@ -189,11 +191,7 @@ pub struct Alternate<MODE = PushPull> {
 impl<MODE> Active for Alternate<MODE> {}
 
 /// Digital output pin state
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum PinState {
-    High,
-    Low,
-}
+pub use embedded_hal::digital::v2::PinState;
 
 // Using SCREAMING_SNAKE_CASE to be consistent with other HALs
 // see 59b2740 and #125 for motivation
@@ -502,44 +500,6 @@ impl<const P: char, const N: u8> Pin<P, N, Debugger> {
     }
 }
 
-impl<const P: char, const N: u8> OutputPin for Pin<P, N, Dynamic> {
-    type Error = PinModeError;
-
-    fn set_high(&mut self) -> Result<(), Self::Error> {
-        if self.mode.is_output() {
-            self._set_high();
-            Ok(())
-        } else {
-            Err(PinModeError::IncorrectMode)
-        }
-    }
-
-    fn set_low(&mut self) -> Result<(), Self::Error> {
-        if self.mode.is_output() {
-            self._set_low();
-            Ok(())
-        } else {
-            Err(PinModeError::IncorrectMode)
-        }
-    }
-}
-
-impl<const P: char, const N: u8> InputPin for Pin<P, N, Dynamic> {
-    type Error = PinModeError;
-
-    fn is_high(&self) -> Result<bool, Self::Error> {
-        self.is_low().map(|b| !b)
-    }
-
-    fn is_low(&self) -> Result<bool, Self::Error> {
-        if self.mode.is_input() {
-            Ok(self._is_low())
-        } else {
-            Err(PinModeError::IncorrectMode)
-        }
-    }
-}
-
 // Internal helper functions
 
 // NOTE: The functions in this impl block are "safe", but they
@@ -642,44 +602,6 @@ impl<const P: char, const N: u8, MODE> Pin<P, N, Output<MODE>> {
     }
 }
 
-impl<const P: char, const N: u8, MODE> OutputPin for Pin<P, N, Output<MODE>> {
-    type Error = Infallible;
-
-    #[inline]
-    fn set_high(&mut self) -> Result<(), Self::Error> {
-        self.set_high();
-        Ok(())
-    }
-
-    #[inline]
-    fn set_low(&mut self) -> Result<(), Self::Error> {
-        self.set_low();
-        Ok(())
-    }
-}
-
-impl<const P: char, const N: u8, MODE> StatefulOutputPin for Pin<P, N, Output<MODE>> {
-    #[inline]
-    fn is_set_high(&self) -> Result<bool, Self::Error> {
-        Ok(self.is_set_high())
-    }
-
-    #[inline]
-    fn is_set_low(&self) -> Result<bool, Self::Error> {
-        Ok(self.is_set_low())
-    }
-}
-
-impl<const P: char, const N: u8, MODE> ToggleableOutputPin for Pin<P, N, Output<MODE>> {
-    type Error = Infallible;
-
-    #[inline(always)]
-    fn toggle(&mut self) -> Result<(), Self::Error> {
-        self.toggle();
-        Ok(())
-    }
-}
-
 impl<const P: char, const N: u8, MODE> Pin<P, N, Input<MODE>> {
     #[inline]
     pub fn is_high(&self) -> bool {
@@ -692,20 +614,6 @@ impl<const P: char, const N: u8, MODE> Pin<P, N, Input<MODE>> {
     }
 }
 
-impl<const P: char, const N: u8, MODE> InputPin for Pin<P, N, Input<MODE>> {
-    type Error = Infallible;
-
-    #[inline]
-    fn is_high(&self) -> Result<bool, Self::Error> {
-        Ok(self.is_high())
-    }
-
-    #[inline]
-    fn is_low(&self) -> Result<bool, Self::Error> {
-        Ok(self.is_low())
-    }
-}
-
 impl<const P: char, const N: u8> Pin<P, N, Output<OpenDrain>> {
     #[inline]
     pub fn is_high(&self) -> bool {
@@ -718,20 +626,6 @@ impl<const P: char, const N: u8> Pin<P, N, Output<OpenDrain>> {
     }
 }
 
-impl<const P: char, const N: u8> InputPin for Pin<P, N, Output<OpenDrain>> {
-    type Error = Infallible;
-
-    #[inline]
-    fn is_high(&self) -> Result<bool, Self::Error> {
-        Ok(self.is_high())
-    }
-
-    #[inline]
-    fn is_low(&self) -> Result<bool, Self::Error> {
-        Ok(self.is_low())
-    }
-}
-
 /// Opaque CR register
 pub struct Cr<const P: char, const H: bool>(());
 

src/gpio/erased.rs

@@ -115,54 +115,6 @@ impl<MODE> ErasedPin<Output<MODE>> {
     }
 }
 
-impl<MODE> OutputPin for ErasedPin<Output<MODE>> {
-    type Error = Infallible;
-
-    fn set_high(&mut self) -> Result<(), Infallible> {
-        self.set_high();
-        Ok(())
-    }
-
-    fn set_low(&mut self) -> Result<(), Infallible> {
-        self.set_low();
-        Ok(())
-    }
-}
-
-impl<MODE> StatefulOutputPin for ErasedPin<Output<MODE>> {
-    fn is_set_high(&self) -> Result<bool, Self::Error> {
-        Ok(self.is_set_high())
-    }
-
-    fn is_set_low(&self) -> Result<bool, Self::Error> {
-        Ok(self.is_set_low())
-    }
-}
-
-impl<MODE> InputPin for ErasedPin<Input<MODE>> {
-    type Error = Infallible;
-
-    fn is_high(&self) -> Result<bool, Infallible> {
-        Ok(self.is_high())
-    }
-
-    fn is_low(&self) -> Result<bool, Infallible> {
-        Ok(self.is_low())
-    }
-}
-
-impl InputPin for ErasedPin<Output<OpenDrain>> {
-    type Error = Infallible;
-
-    fn is_high(&self) -> Result<bool, Infallible> {
-        Ok(self.is_high())
-    }
-
-    fn is_low(&self) -> Result<bool, Infallible> {
-        Ok(self.is_low())
-    }
-}
-
 #[cfg(not(any(feature = "xl", feature = "high")))]
 impl_pxx! {
     ('A'::PAx),