aboutsummaryrefslogtreecommitdiff
path: root/embassy-time/src/delay.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2023-04-06 21:06:54 +0000
committerGitHub <[email protected]>2023-04-06 21:06:54 +0000
commit60809edf2ce8f3cb91d31398dc347e4193e2e5f2 (patch)
tree235cf525211002fe703b08abc011fe02cb90ed2c /embassy-time/src/delay.rs
parentc9b7dbc541cdd5bb8a898e81ed7173490866cba8 (diff)
parentbe37eee13dbd7833e0d74ea57d31d3e5c58cd47f (diff)
Merge #1306
1306: Update embedded-hal r=Dirbaio a=Dirbaio - [x] Wait for merge https://github.com/rust-embedded/embedded-hal/pull/443 - [x] Wait for release - [x] embassy-embedded-hal - [x] embassy-nrf - [x] embassy-stm32 - [x] embassy-rp Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'embassy-time/src/delay.rs')
-rw-r--r--embassy-time/src/delay.rs20
1 files changed, 8 insertions, 12 deletions
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}