diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-10-31 23:36:56 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-10-31 23:36:56 +0000 |
| commit | 35bb20abe7115c42665faea288ca7f268b32bf96 (patch) | |
| tree | c87dfd8437857287a7c26920bd825cb8f7f6ae71 /embassy-time | |
| parent | dd6a29adb2b503520f7db28e50563f41cf1f4730 (diff) | |
| parent | 5f9602d28bdac06f5f2fbfa2c49cd98d689f4c37 (diff) | |
Merge pull request #2130 from andresovela/time-mock-driver-fix
time: fix MockDriver::now()
Diffstat (limited to 'embassy-time')
| -rw-r--r-- | embassy-time/src/driver_mock.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/embassy-time/src/driver_mock.rs b/embassy-time/src/driver_mock.rs index becb6bfdd..c255615c7 100644 --- a/embassy-time/src/driver_mock.rs +++ b/embassy-time/src/driver_mock.rs | |||
| @@ -51,7 +51,7 @@ impl MockDriver { | |||
| 51 | 51 | ||
| 52 | impl Driver for MockDriver { | 52 | impl Driver for MockDriver { |
| 53 | fn now(&self) -> u64 { | 53 | fn now(&self) -> u64 { |
| 54 | critical_section::with(|cs| self.now.borrow(cs).get().as_micros() as u64) | 54 | critical_section::with(|cs| self.now.borrow(cs).get().as_ticks() as u64) |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | unsafe fn allocate_alarm(&self) -> Option<AlarmHandle> { | 57 | unsafe fn allocate_alarm(&self) -> Option<AlarmHandle> { |