diff options
| author | Finomnis <Finomnis@users.noreply.github.com> | 2023-12-06 19:36:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-06 18:36:06 +0000 |
| commit | f377471e440d8be0b2f9e9c8877ed015f62dc19e (patch) | |
| tree | 2f63c1c079bf95cd8468ba2de91cb01032966aab /rtic-time | |
| parent | 89160b7cb9b3623e0a50f6745296d470fa7ea79d (diff) | |
Fix `nrf::rtc` errata workaround (#858)
* Deprecate `should_dequeue_check`
* Fix errata by delaying the wakeup point
* Add changelog
* Fix changelog typos
Diffstat (limited to 'rtic-time')
| -rw-r--r-- | rtic-time/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | rtic-time/Cargo.toml | 2 | ||||
| -rw-r--r-- | rtic-time/src/lib.rs | 4 | ||||
| -rw-r--r-- | rtic-time/src/monotonic.rs | 14 |
4 files changed, 13 insertions, 8 deletions
diff --git a/rtic-time/CHANGELOG.md b/rtic-time/CHANGELOG.md index 2e02a9d..8a99633 100644 --- a/rtic-time/CHANGELOG.md +++ b/rtic-time/CHANGELOG.md @@ -12,6 +12,7 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top! ### Changed - Docs: Add sanity check to `half_period_counter` code example +- Deprecate `Monotonic::should_dequeue_check` as it was erroneous ### Fixed diff --git a/rtic-time/Cargo.toml b/rtic-time/Cargo.toml index 8d2851a..de23c0f 100644 --- a/rtic-time/Cargo.toml +++ b/rtic-time/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rtic-time" -version = "1.1.0" +version = "1.2.0" edition = "2021" authors = [ diff --git a/rtic-time/src/lib.rs b/rtic-time/src/lib.rs index 6254bca..9cd20d5 100644 --- a/rtic-time/src/lib.rs +++ b/rtic-time/src/lib.rs @@ -133,7 +133,7 @@ impl<Mono: Monotonic> TimerQueue<Mono> { let head = self.queue.pop_if(|head| { release_at = Some(head.release_at); - let should_pop = Mono::should_dequeue_check(head.release_at); + let should_pop = Mono::now() >= head.release_at; head.was_popped.store(should_pop, Ordering::Relaxed); should_pop @@ -147,7 +147,7 @@ impl<Mono: Monotonic> TimerQueue<Mono> { Mono::enable_timer(); Mono::set_compare(instant); - if Mono::should_dequeue_check(instant) { + if Mono::now() >= instant { // The time for the next instant passed while handling it, // continue dequeueing continue; diff --git a/rtic-time/src/monotonic.rs b/rtic-time/src/monotonic.rs index 0c0d6f3..0e8d2b8 100644 --- a/rtic-time/src/monotonic.rs +++ b/rtic-time/src/monotonic.rs @@ -36,11 +36,15 @@ pub trait Monotonic { /// queue in RTIC checks this. fn set_compare(instant: Self::Instant); - /// Override for the dequeue check, override with timers that have bugs. - /// - /// E.g. nRF52 RTCs needs to be dequeued if the time is within 4 ticks. - fn should_dequeue_check(release_at: Self::Instant) -> bool { - <Self as Monotonic>::now() >= release_at + /// This method used to be required by an errata workaround + /// for the nrf52 family, but it has been disabled as the + /// workaround was erroneous. + #[deprecated( + since = "1.2.0", + note = "this method is erroneous and has been disabled" + )] + fn should_dequeue_check(_: Self::Instant) -> bool { + panic!("This method should not be used as it is erroneous.") } /// Clear the compare interrupt flag. |