diff options
| author | Mathias <[email protected]> | 2022-09-29 12:58:38 +0200 |
|---|---|---|
| committer | Mathias <[email protected]> | 2022-09-29 12:58:38 +0200 |
| commit | 38faae26e5fc2d2ec10ac4d513628bded4c628ef (patch) | |
| tree | c2646562a1949f775d5701e361751f950e76fc91 /embassy-time/src | |
| parent | f9c62d4f1da1c4a38219056be3f658c34d0031af (diff) | |
| parent | 8b9f4ad259ebb2c4fd2258f1c12ac33a5a8f8976 (diff) | |
Merge branch 'master' of https://github.com/embassy-rs/embassy into embassy-stm32/uart-flowcontrol
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> { |