aboutsummaryrefslogtreecommitdiff
path: root/embassy-time
diff options
context:
space:
mode:
Diffstat (limited to 'embassy-time')
-rw-r--r--embassy-time/Cargo.toml4
-rw-r--r--embassy-time/src/delay.rs20
2 files changed, 10 insertions, 14 deletions
diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml
index 5b14814a1..38d31f1c4 100644
--- a/embassy-time/Cargo.toml
+++ b/embassy-time/Cargo.toml
@@ -152,8 +152,8 @@ defmt = { version = "0.3", optional = true }
152log = { version = "0.4.14", optional = true } 152log = { version = "0.4.14", optional = true }
153 153
154embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" } 154embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" }
155embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.9", optional = true} 155embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.10", optional = true}
156embedded-hal-async = { version = "=0.2.0-alpha.0", optional = true} 156embedded-hal-async = { version = "=0.2.0-alpha.1", optional = true}
157 157
158futures-util = { version = "0.3.17", default-features = false } 158futures-util = { version = "0.3.17", default-features = false }
159embassy-sync = { version = "0.1", path = "../embassy-sync" } 159embassy-sync = { version = "0.1", path = "../embassy-sync" }
diff --git a/embassy-time/src/delay.rs b/embassy-time/src/delay.rs
index 0ca176abd..cf1918724 100644
--- a/embassy-time/src/delay.rs
+++ b/embassy-time/src/delay.rs
@@ -19,14 +19,12 @@ mod eh1 {
19 use super::*; 19 use super::*;
20 20
21 impl embedded_hal_1::delay::DelayUs for Delay { 21 impl embedded_hal_1::delay::DelayUs for Delay {
22 type Error = core::convert::Infallible; 22 fn delay_us(&mut self, us: u32) {
23 23 block_for(Duration::from_micros(us as u64))
24 fn delay_us(&mut self, us: u32) -> Result<(), Self::Error> {
25 Ok(block_for(Duration::from_micros(us as u64)))
26 } 24 }
27 25
28 fn delay_ms(&mut self, ms: u32) -> Result<(), Self::Error> { 26 fn delay_ms(&mut self, ms: u32) {
29 Ok(block_for(Duration::from_millis(ms as u64))) 27 block_for(Duration::from_millis(ms as u64))
30 } 28 }
31 } 29 }
32} 30}
@@ -37,14 +35,12 @@ mod eha {
37 use crate::Timer; 35 use crate::Timer;
38 36
39 impl embedded_hal_async::delay::DelayUs for Delay { 37 impl embedded_hal_async::delay::DelayUs for Delay {
40 type Error = core::convert::Infallible; 38 async fn delay_us(&mut self, micros: u32) {
41 39 Timer::after(Duration::from_micros(micros as _)).await
42 async fn delay_us(&mut self, micros: u32) -> Result<(), Self::Error> {
43 Ok(Timer::after(Duration::from_micros(micros as _)).await)
44 } 40 }
45 41
46 async fn delay_ms(&mut self, millis: u32) -> Result<(), Self::Error> { 42 async fn delay_ms(&mut self, millis: u32) {
47 Ok(Timer::after(Duration::from_millis(millis as _)).await) 43 Timer::after(Duration::from_millis(millis as _)).await
48 } 44 }
49 } 45 }
50} 46}