diff options
| author | Mathias <[email protected]> | 2022-10-24 12:14:26 +0200 |
|---|---|---|
| committer | Mathias <[email protected]> | 2022-10-24 12:14:26 +0200 |
| commit | 8d809c96ecf2fabf77f0fb72f2a59acd18306bf2 (patch) | |
| tree | da3e28e491bbaadbc448b9a021291e2164b7531e /embassy-time/src | |
| parent | 7152031229da19005e5b0d52c8c72d359d3e0daa (diff) | |
| parent | ce1cba761c2942b7faa27f4098487c6468784729 (diff) | |
Merge branch 'master' of https://github.com/embassy-rs/embassy into embassy-rp/flash
Diffstat (limited to 'embassy-time/src')
| -rw-r--r-- | embassy-time/src/delay.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/embassy-time/src/delay.rs b/embassy-time/src/delay.rs index 0a7982963..ff6b6869a 100644 --- a/embassy-time/src/delay.rs +++ b/embassy-time/src/delay.rs | |||
| @@ -18,7 +18,7 @@ pub struct Delay; | |||
| 18 | mod eh1 { | 18 | mod eh1 { |
| 19 | use super::*; | 19 | use super::*; |
| 20 | 20 | ||
| 21 | impl embedded_hal_1::delay::blocking::DelayUs for Delay { | 21 | impl embedded_hal_1::delay::DelayUs for Delay { |
| 22 | type Error = core::convert::Infallible; | 22 | type Error = core::convert::Infallible; |
| 23 | 23 | ||
| 24 | fn delay_us(&mut self, us: u32) -> Result<(), Self::Error> { | 24 | fn delay_us(&mut self, us: u32) -> Result<(), Self::Error> { |