Update embedded hal

Author: Simon Struck

Cargo.toml

@@ -13,13 +13,13 @@ version = "0.6.0"
 [dependencies]
 byteorder = {version = "1", default-features = false}
 defmt = {version = "0.3", optional = true}
-embedded-hal = "0.2.3"
+embedded-hal = "1.0.0-rc.1"
 heapless = "0.7"
 log = {version = "0.4", default-features = false, optional = true}
 
 [dev-dependencies]
-env_logger = "0.9"
-hex-literal = "0.3"
+env_logger = "0.10.0"
+hex-literal = "0.4.1"
 flate2 = "1.0"
 sha2 = "0.10"
 chrono = "0.4"

examples/readme_test.rs

@@ -5,14 +5,14 @@
 
 struct FakeSpi();
 
-impl embedded_hal::blocking::spi::Transfer<u8> for FakeSpi {
+impl embedded_hal::spi::SpiDevice<u8> for FakeSpi {
     type Error = core::convert::Infallible;
     fn transfer<'w>(&mut self, words: &'w mut [u8]) -> Result<&'w [u8], Self::Error> {
         Ok(words)
     }
 }
 
-impl embedded_hal::blocking::spi::Write<u8> for FakeSpi {
+impl embedded_hal::spi::SpiDevice<u8> for FakeSpi {
     type Error = core::convert::Infallible;
     fn write(&mut self, _words: &[u8]) -> Result<(), Self::Error> {
         Ok(())
@@ -21,7 +21,7 @@ impl embedded_hal::blocking::spi::Write<u8> for FakeSpi {
 
 struct FakeCs();
 
-impl embedded_hal::digital::v2::OutputPin for FakeCs {
+impl embedded_hal::digital::OutputPin for FakeCs {
     type Error = core::convert::Infallible;
     fn set_low(&mut self) -> Result<(), Self::Error> {
         Ok(())
@@ -34,7 +34,7 @@ impl embedded_hal::digital::v2::OutputPin for FakeCs {
 
 struct FakeDelayer();
 
-impl embedded_hal::blocking::delay::DelayUs<u8> for FakeDelayer {
+impl embedded_hal::delay::DelayUs for FakeDelayer {
     fn delay_us(&mut self, us: u8) {
         std::thread::sleep(std::time::Duration::from_micros(u64::from(us)));
     }

src/lib.rs

@@ -22,23 +22,23 @@
 //! # struct DummyUart;
 //! # struct DummyTimeSource;
 //! # struct DummyDelayer;
-//! # impl embedded_hal::blocking::spi::Transfer<u8> for  DummySpi {
+//! # impl embedded_hal::spi::SpiDevice<u8> for  DummySpi {
 //! #   type Error = ();
 //! #   fn transfer<'w>(&mut self, data: &'w mut [u8]) -> Result<&'w [u8], Self::Error> { Ok(&[0]) }
 //! # }
-//! # impl embedded_hal::blocking::spi::Write<u8> for  DummySpi {
+//! # impl embedded_hal::spi::SpiDevice<u8> for  DummySpi {
 //! #   type Error = ();
 //! #   fn write(&mut self, data: &[u8]) -> Result<(), Self::Error> { Ok(()) }
 //! # }
-//! # impl embedded_hal::digital::v2::OutputPin for DummyCsPin {
+//! # impl embedded_hal::digital::OutputPin for DummyCsPin {
 //! #   type Error = ();
 //! #   fn set_low(&mut self) -> Result<(), ()> { Ok(()) }
 //! #   fn set_high(&mut self) -> Result<(), ()> { Ok(()) }
 //! # }
 //! # impl embedded_sdmmc::TimeSource for DummyTimeSource {
 //! #   fn get_timestamp(&self) -> embedded_sdmmc::Timestamp { embedded_sdmmc::Timestamp::from_fat(0, 0) }
 //! # }
-//! # impl embedded_hal::blocking::delay::DelayUs<u8> for DummyDelayer {
+//! # impl embedded_hal::delay::DelayUs for DummyDelayer {
 //! #   fn delay_us(&mut self, us: u8) {}
 //! # }
 //! # impl std::fmt::Write for DummyUart { fn write_str(&mut self, s: &str) -> std::fmt::Result { Ok(()) } }

src/sdcard/mod.rs

@@ -30,22 +30,18 @@ use crate::{debug, warn};
 /// All the APIs take `&self` - mutability is handled using an inner `RefCell`.
 pub struct SdCard<SPI, CS, DELAYER>
 where
-    SPI: embedded_hal::blocking::spi::Transfer<u8> + embedded_hal::blocking::spi::Write<u8>,
-    CS: embedded_hal::digital::v2::OutputPin,
-    <SPI as embedded_hal::blocking::spi::Transfer<u8>>::Error: core::fmt::Debug,
-    <SPI as embedded_hal::blocking::spi::Write<u8>>::Error: core::fmt::Debug,
-    DELAYER: embedded_hal::blocking::delay::DelayUs<u8>,
+    SPI: embedded_hal::spi::SpiDevice<u8>,
+    CS: embedded_hal::digital::OutputPin,
+    DELAYER: embedded_hal::delay::DelayUs,
 {
     inner: RefCell<SdCardInner<SPI, CS, DELAYER>>,
 }
 
 impl<SPI, CS, DELAYER> SdCard<SPI, CS, DELAYER>
 where
-    SPI: embedded_hal::blocking::spi::Transfer<u8> + embedded_hal::blocking::spi::Write<u8>,
-    CS: embedded_hal::digital::v2::OutputPin,
-    <SPI as embedded_hal::blocking::spi::Transfer<u8>>::Error: core::fmt::Debug,
-    <SPI as embedded_hal::blocking::spi::Write<u8>>::Error: core::fmt::Debug,
-    DELAYER: embedded_hal::blocking::delay::DelayUs<u8>,
+    SPI: embedded_hal::spi::SpiDevice<u8> + embedded_hal::spi::SpiDevice<u8>,
+    CS: embedded_hal::digital::OutputPin,
+    DELAYER: embedded_hal::delay::DelayUs,
 {
     /// Create a new SD/MMC Card driver using a raw SPI interface.
     ///
@@ -152,11 +148,9 @@ where
 
 impl<SPI, CS, DELAYER> BlockDevice for SdCard<SPI, CS, DELAYER>
 where
-    SPI: embedded_hal::blocking::spi::Transfer<u8> + embedded_hal::blocking::spi::Write<u8>,
-    CS: embedded_hal::digital::v2::OutputPin,
-    <SPI as embedded_hal::blocking::spi::Transfer<u8>>::Error: core::fmt::Debug,
-    <SPI as embedded_hal::blocking::spi::Write<u8>>::Error: core::fmt::Debug,
-    DELAYER: embedded_hal::blocking::delay::DelayUs<u8>,
+    SPI: embedded_hal::spi::SpiDevice<u8> + embedded_hal::spi::SpiDevice<u8>,
+    CS: embedded_hal::digital::OutputPin,
+    DELAYER: embedded_hal::delay::DelayUs,
 {
     type Error = Error;
 
@@ -205,11 +199,9 @@ where
 /// All the APIs required `&mut self`.
 struct SdCardInner<SPI, CS, DELAYER>
 where
-    SPI: embedded_hal::blocking::spi::Transfer<u8> + embedded_hal::blocking::spi::Write<u8>,
-    CS: embedded_hal::digital::v2::OutputPin,
-    <SPI as embedded_hal::blocking::spi::Transfer<u8>>::Error: core::fmt::Debug,
-    <SPI as embedded_hal::blocking::spi::Write<u8>>::Error: core::fmt::Debug,
-    DELAYER: embedded_hal::blocking::delay::DelayUs<u8>,
+    SPI: embedded_hal::spi::SpiDevice<u8> + embedded_hal::spi::SpiDevice<u8>,
+    CS: embedded_hal::digital::OutputPin,
+    DELAYER: embedded_hal::delay::DelayUs,
 {
     spi: SPI,
     cs: CS,
@@ -220,11 +212,9 @@ where
 
 impl<SPI, CS, DELAYER> SdCardInner<SPI, CS, DELAYER>
 where
-    SPI: embedded_hal::blocking::spi::Transfer<u8> + embedded_hal::blocking::spi::Write<u8>,
-    CS: embedded_hal::digital::v2::OutputPin,
-    <SPI as embedded_hal::blocking::spi::Transfer<u8>>::Error: core::fmt::Debug,
-    <SPI as embedded_hal::blocking::spi::Write<u8>>::Error: core::fmt::Debug,
-    DELAYER: embedded_hal::blocking::delay::DelayUs<u8>,
+    SPI: embedded_hal::spi::SpiDevice<u8> + embedded_hal::spi::SpiDevice<u8>,
+    CS: embedded_hal::digital::OutputPin,
+    DELAYER: embedded_hal::delay::DelayUs,
 {
     /// Read one or more blocks, starting at the given block index.
     fn read(&mut self, blocks: &mut [Block], start_block_idx: BlockIdx) -> Result<(), Error> {
@@ -583,21 +573,22 @@ where
 
     /// Send one byte and receive one byte over the SPI bus.
     fn transfer_byte(&mut self, out: u8) -> Result<u8, Error> {
+        let mut read_buf = [0u8;1];
         self.spi
-            .transfer(&mut [out])
-            .map(|b| b[0])
-            .map_err(|_e| Error::Transport)
+            .transfer(&mut read_buf,&[out])
+            .map_err(|_| Error::Transport)?;
+        Ok(read_buf[0])
     }
 
-    /// Send mutiple bytes and ignore what comes back over the SPI bus.
+    /// Send multiple bytes and ignore what comes back over the SPI bus.
     fn write_bytes(&mut self, out: &[u8]) -> Result<(), Error> {
         self.spi.write(out).map_err(|_e| Error::Transport)?;
         Ok(())
     }
 
     /// Send multiple bytes and replace them with what comes back over the SPI bus.
     fn transfer_bytes(&mut self, in_out: &mut [u8]) -> Result<(), Error> {
-        self.spi.transfer(in_out).map_err(|_e| Error::Transport)?;
+        self.spi.transfer_in_place(in_out).map_err(|_e| Error::Transport)?;
         Ok(())
     }
 
@@ -753,7 +744,7 @@ impl Delay {
     /// `Ok(())`.
     fn delay<T>(&mut self, delayer: &mut T, err: Error) -> Result<(), Error>
     where
-        T: embedded_hal::blocking::delay::DelayUs<u8>,
+        T: embedded_hal::delay::DelayUs,
     {
         if self.retries_left == 0 {
             Err(err)