diff options
| author | Finomnis <Finomnis@users.noreply.github.com> | 2023-12-01 08:59:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-01 07:59:22 +0000 |
| commit | 612a47ef4d09da3553145d77bf1750314bbb7b16 (patch) | |
| tree | 7f6f6beca7e0c81397994b4f835c6a7f0bbee331 /rtic-monotonics/src/stm32.rs | |
| parent | 9f5820da1d36a8c84455b1bc0458d34eb7dd9a70 (diff) | |
Fix mono delay (#843)
* rtic-time: Compenstate for timer uncertainty
* Update changelog and incorrect cargo.lock in an example
* Fix Monotonic impls
* Fix tests
* Fix other monotonics, again
* Update changelog
* Fix example
* Fix DelayUs and DelayMs impls
* Minor coding style fix in u64 conversions
* Fix all changelogs
* Fix changelog
* Fix blocking DelayUs
* Minor monotonic rework
* Add delay precision test
* Add more tests
* Add rust-version tags to Cargo.toml
* Fix imxrt, rp2040 and systick timer
* Fix more monotonics
* Fix systick monotonic
* Some reverts
* Fix imxrt
* Fix nrf
* Fix rp2040
* Fix stm32
* Fix systick
* Fix rtic-time tests
* Bump to e-h.rc2
* Apply e-h.rc2 fixes to rtic-time
* Apply fixes from arbiter
* Fix clippy warning
* Minor beautification
* Revert previous changes
* Fix variable name
* Add blocking tests, but disable them by default
Diffstat (limited to 'rtic-monotonics/src/stm32.rs')
| -rw-r--r-- | rtic-monotonics/src/stm32.rs | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/rtic-monotonics/src/stm32.rs b/rtic-monotonics/src/stm32.rs index 2676a34..254f130 100644 --- a/rtic-monotonics/src/stm32.rs +++ b/rtic-monotonics/src/stm32.rs @@ -36,7 +36,7 @@ use crate::{Monotonic, TimeoutError, TimerQueue}; use atomic_polyfill::{compiler_fence, AtomicU64, Ordering}; -pub use fugit::{self, ExtU64}; +pub use fugit::{self, ExtU64, ExtU64Ceil}; use stm32_metapac as pac; mod _generated { @@ -218,31 +218,17 @@ macro_rules! make_timer { } } - #[cfg(feature = "embedded-hal-async")] - impl embedded_hal_async::delay::DelayUs for $mono_name { - #[inline] - async fn delay_us(&mut self, us: u32) { - Self::delay((us as u64).micros()).await; - } - - #[inline] - async fn delay_ms(&mut self, ms: u32) { - Self::delay((ms as u64).millis()).await; - } - } + rtic_time::embedded_hal_delay_impl_fugit64!($mono_name); - impl embedded_hal::delay::DelayUs for $mono_name { - fn delay_us(&mut self, us: u32) { - let done = Self::now() + (us as u64).micros(); - while Self::now() < done {} - } - } + #[cfg(feature = "embedded-hal-async")] + rtic_time::embedded_hal_async_delay_impl_fugit64!($mono_name); impl Monotonic for $mono_name { type Instant = fugit::TimerInstantU64<TIMER_HZ>; type Duration = fugit::TimerDurationU64<TIMER_HZ>; const ZERO: Self::Instant = Self::Instant::from_ticks(0); + const TICK_PERIOD: Self::Duration = Self::Duration::from_ticks(1); fn now() -> Self::Instant { // Credits to the `time-driver` of `embassy-stm32`. |
