support both e-hal 0.2 & 1.0

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Replace UB code by a legitimate pointer access
 - Reexport `Direction` from `qei`
 - Add dac
+- support `embedded-hal-1.0`
 
 ## [v0.10.0] - 2022-12-12
 

Cargo.toml

@@ -20,16 +20,30 @@ default-target = "x86_64-unknown-linux-gnu"
 [dependencies]
 cortex-m = "0.7.6"
 cortex-m-rt = "0.7.1"
-nb = "1"
+nb = "1.1"
 stm32f1 = "0.15.1"
 embedded-dma = "0.2.0"
 bxcan = "0.7"
 void = { default-features = false, version = "1.0.2" }
-embedded-hal = { features = ["unproven"], version = "0.2.7" }
-fugit = "0.3.6"
+fugit = "0.3.7"
 fugit-timer = "0.1.3"
 rtic-monotonic = { version = "1.0", optional = true }
 bitflags = "1.3.2"
+vcell = "0.1.3"
+
+[dependencies.embedded-hal-02]
+package = "embedded-hal"
+version = "0.2.7"
+features = ["unproven"]
+
+[dependencies.embedded-hal]
+version = "1.0"
+
+[dependencies.embedded-hal-nb]
+version = "1.0"
+
+[dependencies.embedded-io]
+version = "0.6.1"
 
 [dependencies.stm32-usbd]
 version = "0.6.0"
@@ -45,7 +59,6 @@ heapless = "0.7.16"
 mfrc522 = "0.3.0"
 usb-device = "0.2.8"
 usbd-serial = "0.1.1"
-unwrap-infallible = "0.1.5"
 
 [features]
 device-selected = []

examples/delay-timer-blinky.rs

@@ -41,7 +41,7 @@ fn main() -> ! {
         loop {
             // On for 1s, off for 3s.
             led.set_high();
-            // Use `embedded_hal::DelayMs` trait
+            // Use `embedded_hal_02::DelayMs` trait
             delay.delay_ms(1000_u32);
             led.set_low();
             // or use `fugit` duration units

examples/delay.rs

@@ -36,7 +36,7 @@ fn main() -> ! {
 
     loop {
         led.set_high();
-        // Use `embedded_hal::DelayMs` trait
+        // Use `embedded_hal_02::DelayMs` trait
         delay.delay_ms(1_000_u16);
         led.set_low();
         // or use `fugit` duration units

examples/dynamic_gpio.rs

@@ -8,7 +8,7 @@ use nb::block;
 
 use cortex_m_rt::entry;
 use cortex_m_semihosting::hprintln;
-use embedded_hal::digital::v2::{InputPin, OutputPin};
+use embedded_hal_02::digital::v2::{InputPin, OutputPin};
 use stm32f1xx_hal::{pac, prelude::*};
 
 #[entry]

examples/mfrc522.rs

@@ -7,8 +7,8 @@ use panic_itm as _;
 use cortex_m::iprintln;
 
 use cortex_m_rt::entry;
-use embedded_hal::digital::v1_compat::OldOutputPin;
-use embedded_hal::spi::{Mode, Phase, Polarity};
+use embedded_hal_02::digital::v1_compat::OldOutputPin;
+use embedded_hal_02::spi::{Mode, Phase, Polarity};
 use mfrc522::Mfrc522;
 use stm32f1xx_hal::{pac, prelude::*, spi::Spi};
 pub const MODE: Mode = Mode {

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();
@@ -69,7 +69,7 @@ static mut WIDX: usize = 0;
 unsafe fn write(buf: &[u8]) {
     if let Some(tx) = TX.as_mut() {
         buf.iter()
-            .for_each(|w| if let Err(_err) = nb::block!(tx.write(*w)) {})
+            .for_each(|w| if let Err(_err) = nb::block!(tx.write_u8(*w)) {})
     }
 }
 #[interrupt]

examples/serial.rs

@@ -19,7 +19,6 @@ use stm32f1xx_hal::{
     prelude::*,
     serial::{Config, Serial},
 };
-use unwrap_infallible::UnwrapInfallible;
 
 #[entry]
 fn main() -> ! {
@@ -71,7 +70,7 @@ fn main() -> ! {
 
     // Loopback test. Write `X` and wait until the write is successful.
     let sent = b'X';
-    block!(serial.tx.write(sent)).unwrap_infallible();
+    block!(serial.tx.write_u8(sent)).unwrap();
 
     // Read the byte that was just sent. Blocks until the read is complete
     let received = block!(serial.rx.read()).unwrap();
@@ -85,7 +84,7 @@ fn main() -> ! {
     // You can also split the serial struct into a receiving and a transmitting part
     let (mut tx, mut rx) = serial.split();
     let sent = b'Y';
-    block!(tx.write(sent)).unwrap_infallible();
+    block!(tx.write_u8(sent)).unwrap();
     let received = block!(rx.read()).unwrap();
     assert_eq!(received, sent);
     asm::bkpt();

examples/serial_9bits.rs

@@ -9,16 +9,14 @@
 #![no_main]
 #![no_std]
 
-use core::convert::Infallible;
 use cortex_m_rt::entry;
 use nb::block;
 use panic_halt as _;
 use stm32f1xx_hal::{
     pac,
     prelude::*,
-    serial::{self, Config, Serial},
+    serial::{self, Config, Error, Serial},
 };
-use unwrap_infallible::UnwrapInfallible;
 
 // The address of the slave device.
 const SLAVE_ADDR: u8 = 123;
@@ -29,7 +27,7 @@ const MSG_MAX_LEN: usize = u8::MAX as usize;
 // Receives a message addressed to the slave device. Returns the size of the received message.
 fn receive_msg<RX>(serial_rx: &mut RX, buf: &mut [u8; MSG_MAX_LEN]) -> usize
 where
-    RX: embedded_hal::serial::Read<u16, Error = serial::Error>,
+    RX: embedded_hal_02::serial::Read<u16, Error = serial::Error>,
 {
     enum RxPhase {
         Start,
@@ -79,19 +77,19 @@ where
 // Send message.
 fn send_msg<TX>(serial_tx: &mut TX, msg: &[u8])
 where
-    TX: embedded_hal::serial::Write<u8, Error = Infallible>
-        + embedded_hal::serial::Write<u16, Error = Infallible>,
+    TX: embedded_hal_02::serial::Write<u8, Error = Error>
+        + embedded_hal_02::serial::Write<u16, Error = Error>,
 {
     // Send address.
-    block!(serial_tx.write(SLAVE_ADDR as u16 | 0x100)).unwrap_infallible();
+    block!(serial_tx.write(SLAVE_ADDR as u16 | 0x100)).unwrap();
 
     // Send message len.
     assert!(msg.len() <= MSG_MAX_LEN);
-    block!(serial_tx.write(msg.len() as u8)).unwrap_infallible();
+    block!(serial_tx.write(msg.len() as u8)).unwrap();
 
     // Send message.
     for &b in msg {
-        block!(serial_tx.write(b)).unwrap_infallible();
+        block!(serial_tx.write(b)).unwrap();
     }
 }
 

examples/serial_config.rs

@@ -17,7 +17,6 @@ use stm32f1xx_hal::{
     prelude::*,
     serial::{self, Serial},
 };
-use unwrap_infallible::UnwrapInfallible;
 
 #[entry]
 fn main() -> ! {
@@ -75,8 +74,8 @@ fn main() -> ! {
     let (mut tx, _rx) = serial.split();
 
     let sent = b'U';
-    block!(tx.write(sent)).unwrap_infallible();
-    block!(tx.write(sent)).unwrap_infallible();
+    block!(tx.write_u8(sent)).unwrap();
+    block!(tx.write_u8(sent)).unwrap();
 
     loop {}
 }

examples/serial_reconfigure.rs

@@ -19,7 +19,6 @@ use stm32f1xx_hal::{
     prelude::*,
     serial::{self, Config, Serial},
 };
-use unwrap_infallible::UnwrapInfallible;
 
 #[entry]
 fn main() -> ! {
@@ -71,7 +70,7 @@ fn main() -> ! {
 
     // Loopback test. Write `X` and wait until the write is successful.
     let sent = b'X';
-    block!(serial.tx.write(sent)).unwrap_infallible();
+    block!(serial.tx.write_u8(sent)).unwrap();
 
     // Read the byte that was just sent. Blocks until the read is complete
     let received = block!(serial.rx.read()).unwrap();
@@ -88,7 +87,7 @@ fn main() -> ! {
 
     // Let's see if it works.'
     let sent = b'Y';
-    block!(serial.tx.write(sent)).unwrap_infallible();
+    block!(serial.tx.write_u8(sent)).unwrap();
     let received = block!(serial.rx.read()).unwrap();
     assert_eq!(received, sent);
     asm::bkpt();

examples/spi-slave.rs

@@ -13,7 +13,7 @@ use cortex_m_rt::entry;
 use panic_halt as _;
 
 use cortex_m::{asm, singleton};
-use embedded_hal::spi::{Mode, Phase, Polarity};
+use stm32f1xx_hal::spi::{Mode, Phase, Polarity};
 pub const MODE: Mode = Mode {
     phase: Phase::CaptureOnSecondTransition,
     polarity: Polarity::IdleHigh,

examples/spi.rs

@@ -6,7 +6,7 @@
 use cortex_m_rt::entry;
 use panic_halt as _;
 
-use embedded_hal::spi::{Mode, Phase, Polarity};
+use embedded_hal_02::spi::{Mode, Phase, Polarity};
 pub const MODE: Mode = Mode {
     phase: Phase::CaptureOnSecondTransition,
     polarity: Polarity::IdleHigh,

src/adc.rs

@@ -1,7 +1,7 @@
 //! # API for the Analog to Digital converter
 
 use core::marker::PhantomData;
-use embedded_hal::adc::{Channel, OneShot};
+use embedded_hal_02::adc::{Channel, OneShot};
 
 #[cfg(all(feature = "stm32f103", any(feature = "high", feature = "xl",),))]
 use crate::dma::dma2;
@@ -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