WIP e-h 1.0 and edition 2021

Cargo.toml

@@ -10,20 +10,19 @@ readme = "README.md"
 keywords = ["no_std", "embedded", "bitbang", "embedded-hal", "hal"]
 categories = ["embedded", "no-std"]
 
-[dependencies]
-nb = "1"
+[dependencies.embedded-hal-nb]
+version = "1"
 
 [dependencies.embedded-hal]
-version = "0.2.7"
-features = ["unproven"]
+version = "1"
 
 [dev-dependencies.stm32f1xx-hal]
-version = "0.9"
+version = "0.10.0"
 features = ["stm32f103", "rt", "medium"]
 
 [dev-dependencies]
 cortex-m = "0.7"
 cortex-m-rt = "0.7"
 panic-halt = "0.2.0"
-eeprom24x = "0.5.0"
-lm75 = "0.2"
+eeprom24x = "0.7.1"
+lm75 = "1"

examples/i2c-eeprom24x.rs

@@ -43,13 +43,13 @@ fn main() -> ! {
     for addr in addrs.iter() {
         eeprom.write_byte(*addr, byte).unwrap();
         // need to wait before next write
-        block!(delay.wait()).ok();
+        block!(delay.try_wait()).ok();
     }
 
     loop {
         for addr in addrs.iter() {
             let _ = eeprom.read_byte(*addr).unwrap();
-            block!(delay.wait()).ok();
+            block!(delay.try_wait()).ok();
         }
     }
 }

examples/serial.rs

@@ -34,7 +34,7 @@ fn main() -> ! {
 
     loop {
         for byte in b"Hello, World!\r\n" {
-            block!(serial.write(*byte)).unwrap();
+            block!(serial.try_write(*byte)).unwrap();
         }
 
         delay.delay_ms(1000u16);

src/i2c.rs

@@ -50,10 +50,9 @@
   ```
 */
 
-use embedded_hal::blocking::i2c::{Read, Write, WriteRead};
-use embedded_hal::digital::v2::{InputPin, OutputPin};
-use embedded_hal::timer::{CountDown, Periodic};
-use nb::block;
+use embedded_hal::delay::DelayNs;
+use embedded_hal::digital::{InputPin, OutputPin};
+use embedded_hal_nb::nb::block;
 
 /// I2C error
 #[derive(Debug, Eq, PartialEq)]
@@ -71,7 +70,7 @@
 where
     SCL: OutputPin,
     SDA: OutputPin + InputPin,
-    CLK: CountDown + Periodic,
+    CLK: DelayNs,
 {
     scl: SCL,
     sda: SDA,
@@ -82,7 +81,7 @@
 where
     SCL: OutputPin<Error = E>,
     SDA: OutputPin<Error = E> + InputPin<Error = E>,
-    CLK: CountDown + Periodic,
+    CLK: DelayNs,
 {
     /// Create instance
     pub fn new(scl: SCL, sda: SDA, clk: CLK) -> Self {
@@ -254,11 +253,11 @@
     }
 }
 
 impl<SCL, SDA, CLK, E> Write for I2cBB<SCL, SDA, CLK>
 where
     SCL: OutputPin<Error = E>,
     SDA: OutputPin<Error = E> + InputPin<Error = E>,
-    CLK: CountDown + Periodic,
+    CLK: DelayNs,
 {
     type Error = crate::i2c::Error<E>;
 
@@ -277,11 +276,11 @@
     }
 }
 
 impl<SCL, SDA, CLK, E> Read for I2cBB<SCL, SDA, CLK>
 where
     SCL: OutputPin<Error = E>,
     SDA: OutputPin<Error = E> + InputPin<Error = E>,
-    CLK: CountDown + Periodic,
+    CLK: DelayNs,
 {
     type Error = crate::i2c::Error<E>;
 
@@ -304,11 +303,11 @@
     }
 }
 
 impl<SCL, SDA, CLK, E> WriteRead for I2cBB<SCL, SDA, CLK>
 where
     SCL: OutputPin<Error = E>,
     SDA: OutputPin<Error = E> + InputPin<Error = E>,
-    CLK: CountDown + Periodic,
+    CLK: DelayNs,
 {
     type Error = crate::i2c::Error<E>;
 

src/serial.rs

@@ -8,10 +8,11 @@
 //! The timer must be configured to twice the desired communication frequency.
 //!
 
-use embedded_hal::digital::v2::{InputPin, OutputPin};
-use embedded_hal::serial;
-use embedded_hal::timer::{CountDown, Periodic};
-use nb::block;
+use embedded_hal::{
+    delay::DelayNs,
+    digital::{InputPin, OutputPin},
+};
+use embedded_hal_nb::nb::block;
 
 /// Serial communication error type
 #[derive(Debug)]
@@ -25,7 +26,7 @@
 where
     TX: OutputPin,
     RX: InputPin,
-    Timer: CountDown + Periodic,
+    Timer: DelayNs,
 {
     tx: TX,
     rx: RX,
@@ -36,7 +37,7 @@
 where
     TX: OutputPin<Error = E>,
     RX: InputPin<Error = E>,
-    Timer: CountDown + Periodic,
+    Timer: DelayNs,
 {
     /// Create instance
     pub fn new(tx: TX, rx: RX, timer: Timer) -> Self {
@@ -49,15 +50,15 @@
     }
 }
 
 impl<TX, RX, Timer, E> serial::Write<u8> for Serial<TX, RX, Timer>
 where
     TX: OutputPin<Error = E>,
     RX: InputPin<Error = E>,
-    Timer: CountDown + Periodic,
+    Timer: DelayNs,
 {
     type Error = crate::serial::Error<E>;
 
     fn write(&mut self, byte: u8) -> nb::Result<(), Self::Error> {
         let mut data_out = byte;
         self.tx.set_low().map_err(Error::Bus)?; // start bit
         self.wait_for_timer();
@@ -75,7 +76,7 @@
         Ok(())
     }
 
     fn flush(&mut self) -> nb::Result<(), Self::Error> {
         Ok(())
     }
 }
@@ -84,7 +85,7 @@
 where
     TX: OutputPin<Error = E>,
     RX: InputPin<Error = E>,
-    Timer: CountDown + Periodic,
+    Timer: DelayNs,
 {
     type Error = crate::serial::Error<E>;
 

src/spi.rs

@@ -13,12 +13,11 @@
 //! MSB-first and LSB-first bit orders are supported.
 //!
 
+use embedded_hal::delay::DelayNs;
 pub use embedded_hal::spi::{MODE_0, MODE_1, MODE_2, MODE_3};
 
-use embedded_hal::digital::v2::{InputPin, OutputPin};
+use embedded_hal::digital::{InputPin, OutputPin};
 use embedded_hal::spi::{FullDuplex, Mode, Polarity};
-use embedded_hal::timer::{CountDown, Periodic};
-use nb::block;
 
 /// Error type
 #[derive(Debug)]
@@ -52,7 +51,7 @@
     Miso: InputPin,
     Mosi: OutputPin,
     Sck: OutputPin,
-    Timer: CountDown + Periodic,
+    Timer: DelayNs,
 {
     mode: Mode,
     miso: Miso,
@@ -68,7 +67,7 @@
     Miso: InputPin<Error = E>,
     Mosi: OutputPin<Error = E>,
     Sck: OutputPin<Error = E>,
-    Timer: CountDown + Periodic,
+    Timer: DelayNs,
 {
     /// Create instance
     pub fn new(mode: Mode, miso: Miso, mosi: Mosi, sck: Sck, timer: Timer) -> Self {
@@ -147,7 +146,7 @@
 
     #[inline]
     fn wait_for_timer(&mut self) {
         block!(self.timer.wait()).ok();
     }
 }
 
@@ -156,7 +155,7 @@
     Miso: InputPin<Error = E>,
     Mosi: OutputPin<Error = E>,
     Sck: OutputPin<Error = E>,
-    Timer: CountDown + Periodic,
+    Timer: DelayNs,
 {
     type Error = crate::spi::Error<E>;
 
@@ -217,22 +216,22 @@
     }
 }
 
-impl<Miso, Mosi, Sck, Timer, E> embedded_hal::blocking::spi::transfer::Default<u8>
+impl<Miso, Mosi, Sck, Timer, E> embedded_hal::spi::transfer::Default<u8>
     for SPI<Miso, Mosi, Sck, Timer>
 where
     Miso: InputPin<Error = E>,
     Mosi: OutputPin<Error = E>,
     Sck: OutputPin<Error = E>,
-    Timer: CountDown + Periodic,
+    Timer: DelayNs,
 {
 }
 
-impl<Miso, Mosi, Sck, Timer, E> embedded_hal::blocking::spi::write::Default<u8>
+impl<Miso, Mosi, Sck, Timer, E> embedded_hal::spi::write::Default<u8>
     for SPI<Miso, Mosi, Sck, Timer>
 where
     Miso: InputPin<Error = E>,
     Mosi: OutputPin<Error = E>,
     Sck: OutputPin<Error = E>,
-    Timer: CountDown + Periodic,
+    Timer: DelayNs,
 {
 }