Merge pull request #35 from rust-iot/update-embedded-hal

update delay_us

src/blocking.rs

@@ -1,6 +1,6 @@
 //! Blocking APIs on top of the base radio traits
 //!
-//! These implementations use the radio's DelayNs implementation to
+//! These implementations use the radio's DelayUs implementation to
 //! poll on completion of operations.
 //!
 //! ## <https://github.com/rust-iot/radio-hal>
@@ -63,7 +63,7 @@ impl<E> From<E> for BlockingError<E> {
 }
 
 /// Blocking transmit function implemented over `radio::Transmit` and `radio::Power` using the provided
-/// `BlockingOptions` and radio-internal `DelayNs` impl to poll for completion
+/// `BlockingOptions` and radio-internal `DelayUs` impl to poll for completion
 #[cfg_attr(
     feature = "mock",
     doc = r##"
@@ -75,7 +75,7 @@ use radio::{BlockingTransmit, BlockingOptions};
 # let mut radio = MockRadio::new(&[
 #    Transaction::start_transmit(vec![0xaa, 0xbb], None),
 #    Transaction::check_transmit(Ok(false)),
-#    Transaction::delay_ns(100000),
+#    Transaction::delay_us(100),
 #    Transaction::check_transmit(Ok(true)),
 # ]);
 # 
@@ -137,7 +137,7 @@ where
 }
 
 /// Blocking receive function implemented over `radio::Receive` using the provided `BlockingOptions`
-/// and radio-internal `DelayNs` impl to poll for completion
+/// and radio-internal `DelayUs` impl to poll for completion
 #[cfg_attr(
     feature = "mock",
     doc = r##"
@@ -152,7 +152,7 @@ let info = BasicInfo::new(-81, 0);
 # let mut radio = MockRadio::new(&[
 #    Transaction::start_receive(None),
 #    Transaction::check_receive(true, Ok(false)),
-#    Transaction::delay_ns(100000),
+#    Transaction::delay_us(100),
 #    Transaction::check_receive(true, Ok(true)),
 #    Transaction::get_received(Ok((data.to_vec(), info.clone()))),
 # ]);

src/mock.rs

@@ -13,7 +13,7 @@ use std::vec::Vec;
 
 use log::debug;
 
-use embedded_hal::delay::DelayNs;
+use embedded_hal::delay::DelayUs;
 
 use embedded_hal_mock::common::Generic;
 
@@ -217,9 +217,9 @@ impl<St, Reg, Ch, Inf, Irq, E> Transaction<St, Reg, Ch, Inf, Irq, E> {
     }
 
     /// Delay for a certain time
-    pub fn delay_ns(ns: u32) -> Self {
+    pub fn delay_us(us: u32) -> Self {
         Self {
-            request: Request::DelayNs(ns),
+            request: Request::DelayUs(us),
             response: Response::Ok,
         }
     }
@@ -247,7 +247,7 @@ enum Request<St, Reg, Ch> {
     CheckReceive(bool),
     GetReceived,
 
-    DelayNs(u32),
+    DelayUs(u32),
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -271,7 +271,7 @@ impl<St, Inf, Irq, E> From<Option<E>> for Response<St, Inf, Irq, E> {
     }
 }
 
-impl<St, Reg, Ch, Inf, Irq, E> DelayNs for Radio<St, Reg, Ch, Inf, Irq, E>
+impl<St, Reg, Ch, Inf, Irq, E> DelayUs for Radio<St, Reg, Ch, Inf, Irq, E>
 where
     St: PartialEq + Debug + Clone,
     Reg: PartialEq + Debug + Clone,
@@ -280,10 +280,10 @@ where
     Irq: PartialEq + Debug + Clone,
     E: PartialEq + Debug + Clone,
 {
-    fn delay_ns(&mut self, ns: u32) {
-        let n = self.next().expect("no expectation for delay_ns call");
+    fn delay_us(&mut self, us: u32) {
+        let n = self.next().expect("no expectation for delay_us call");
 
-        assert_eq!(&n.request, &Request::DelayNs(ns));
+        assert_eq!(&n.request, &Request::DelayUs(us));
     }
 }