diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-04-06 22:25:24 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-04-06 22:41:50 +0200 |
| commit | be37eee13dbd7833e0d74ea57d31d3e5c58cd47f (patch) | |
| tree | 3e1d5a59409ea06fe34d97fdaf45642683332638 /embassy-time/src | |
| parent | f3ec6080bf9a39d9819195861e7b41e8a2081600 (diff) | |
Update embedded-hal crates.
Diffstat (limited to 'embassy-time/src')
| -rw-r--r-- | embassy-time/src/delay.rs | 20 |
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 | } |
