Merge pull request #2 from jakezhu9/update-embedded-hal

lib: update dependency embedded-hal to 1.0.0

Author: AnyTimeTraveler

Cargo.toml

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

examples/readme_test.rs

@@ -54,9 +54,9 @@ impl embedded_hal::digital::OutputPin for FakeCs {
 #[derive(Clone, Copy)]
 struct FakeDelayer();
 
-impl embedded_hal::delay::DelayUs for FakeDelayer {
-    fn delay_us(&mut self, us: u32) {
-        std::thread::sleep(std::time::Duration::from_micros(u64::from(us)));
+impl embedded_hal::delay::DelayNs for FakeDelayer {
+    fn delay_ns(&mut self, ns: u32) {
+        std::thread::sleep(std::time::Duration::from_nanos(u64::from(ns)));
     }
 }
 

src/lib.rs

@@ -27,32 +27,17 @@
 //! # use core::convert::Infallible;
 //! # use core::fmt;
 //! # impl ErrorType for DummySpi {
-//! #     type Error = Infallible;
+//! #   type Error = Infallible;
 //! # }
 //! # impl embedded_hal::spi::SpiDevice<u8> for DummySpi {
-//! #
-//! # fn transaction(&mut self, operations: &mut [Operation<'_, u8>]) -> Result<(), Self::Error> {
-//! #         Ok(())
-//! #     }
-//! #
-//! # fn read(&mut self, buf: &mut [u8]) -> Result<(), Self::Error> {
-//! #         Ok(())
-//! #     }
-//! #
-//! # fn write(&mut self, buf: &[u8]) -> Result<(), Self::Error> {
-//! #         Ok(())
-//! #     }
-//! #
-//! # fn transfer(&mut self, read: &mut [u8], write: &[u8]) -> Result<(), Self::Error> {
-//! #         Ok(())
-//! #     }
-//! #
-//! # fn transfer_in_place(&mut self, buf: &mut [u8]) -> Result<(), Self::Error> {
-//! #         Ok(())
-//! #     }
+//! #   fn transaction(&mut self, operations: &mut [Operation<'_, u8>]) -> Result<(), Self::Error> { Ok(()) }
+//! #   fn read(&mut self, buf: &mut [u8]) -> Result<(), Self::Error> { Ok(()) }
+//! #   fn write(&mut self, buf: &[u8]) -> Result<(), Self::Error> { Ok(()) }
+//! #   fn transfer(&mut self, read: &mut [u8], write: &[u8]) -> Result<(), Self::Error> { Ok(()) }
+//! #   fn transfer_in_place(&mut self, buf: &mut [u8]) -> Result<(), Self::Error> { Ok(()) }
 //! # }
 //! # impl embedded_hal::digital::ErrorType for DummyCsPin {
-//! #     type Error = Infallible;
+//! #   type Error = Infallible;
 //! # }
 //! # impl embedded_hal::digital::OutputPin for DummyCsPin {
 //! #   fn set_low(&mut self) -> Result<(), Self::Error> { Ok(()) }
@@ -61,8 +46,8 @@
 //! # impl embedded_sdmmc::TimeSource for DummyTimeSource {
 //! #   fn get_timestamp(&self) -> embedded_sdmmc::Timestamp { embedded_sdmmc::Timestamp::from_fat(0, 0) }
 //! # }
-//! # impl embedded_hal::delay::DelayUs for DummyDelayer {
-//! #   fn delay_us(&mut self, us: u32) {}
+//! # impl embedded_hal::delay::DelayNs for DummyDelayer {
+//! #   fn delay_ns(&mut self, ns: u32) {}
 //! # }
 //! # impl fmt::Write for DummyUart {
 //! #     fn write_str(&mut self, s: &str) -> fmt::Result { Ok(()) }

src/sdcard/mod.rs

@@ -32,11 +32,11 @@ use crate::{debug, warn};
 ///
 /// If you're not sure how to get a [`SpiDevice`], you may use one of the implementations
 /// in the [`embedded-hal-bus`] crate, providing a wrapped version of your platform's HAL-provided
-/// [`SpiBus`] and [`DelayUs`] as well as our [`DummyCsPin`] in the constructor.
+/// [`SpiBus`] and [`DelayNs`] as well as our [`DummyCsPin`] in the constructor.
 ///
 /// [`SpiDevice`]: embedded_hal::spi::SpiDevice
 /// [`SpiBus`]: embedded_hal::spi::SpiBus
-/// [`DelayUs`]: embedded_hal::delay::DelayUs
+/// [`DelayNs`]: embedded_hal::delay::DelayNs
 /// [`embedded-hal-bus`]: https://docs.rs/embedded-hal-bus
 pub struct DummyCsPin;
 
@@ -71,7 +71,7 @@ pub struct SdCard<SPI, CS, DELAYER>
 where
     SPI: embedded_hal::spi::SpiDevice<u8>,
     CS: embedded_hal::digital::OutputPin,
-    DELAYER: embedded_hal::delay::DelayUs,
+    DELAYER: embedded_hal::delay::DelayNs,
 {
     inner: RefCell<SdCardInner<SPI, CS, DELAYER>>,
 }
@@ -80,7 +80,7 @@ impl<SPI, CS, DELAYER> SdCard<SPI, CS, DELAYER>
 where
     SPI: embedded_hal::spi::SpiDevice<u8>,
     CS: embedded_hal::digital::OutputPin,
-    DELAYER: embedded_hal::delay::DelayUs,
+    DELAYER: embedded_hal::delay::DelayNs,
 {
     /// Create a new SD/MMC Card driver using a raw SPI interface.
     ///
@@ -195,7 +195,7 @@ impl<SPI, CS, DELAYER> BlockDevice for SdCard<SPI, CS, DELAYER>
 where
     SPI: embedded_hal::spi::SpiDevice<u8>,
     CS: embedded_hal::digital::OutputPin,
-    DELAYER: embedded_hal::delay::DelayUs,
+    DELAYER: embedded_hal::delay::DelayNs,
 {
     type Error = Error;
 
@@ -246,7 +246,7 @@ struct SdCardInner<SPI, CS, DELAYER>
 where
     SPI: embedded_hal::spi::SpiDevice<u8>,
     CS: embedded_hal::digital::OutputPin,
-    DELAYER: embedded_hal::delay::DelayUs,
+    DELAYER: embedded_hal::delay::DelayNs,
 {
     spi: SPI,
     cs: CS,
@@ -259,7 +259,7 @@ impl<SPI, CS, DELAYER> SdCardInner<SPI, CS, DELAYER>
 where
     SPI: embedded_hal::spi::SpiDevice<u8>,
     CS: embedded_hal::digital::OutputPin,
-    DELAYER: embedded_hal::delay::DelayUs,
+    DELAYER: embedded_hal::delay::DelayNs,
 {
     /// Read one or more blocks, starting at the given block index.
     fn read(&mut self, blocks: &mut [Block], start_block_idx: BlockIdx) -> Result<(), Error> {
@@ -620,7 +620,7 @@ where
     fn transfer_byte(&mut self, out: u8) -> Result<u8, Error> {
         let mut read_buf = [0u8; 1];
         self.spi
-            .transfer(&mut read_buf,&[out])
+            .transfer(&mut read_buf, &[out])
             .map_err(|_| Error::Transport)?;
         Ok(read_buf[0])
     }
@@ -791,7 +791,7 @@ impl Delay {
     /// `Ok(())`.
     fn delay<T>(&mut self, delayer: &mut T, err: Error) -> Result<(), Error>
     where
-        T: embedded_hal::delay::DelayUs,
+        T: embedded_hal::delay::DelayNs,
     {
         if self.retries_left == 0 {
             Err(err)