fix monotonics

stm32-rs · Oct 25, 2024 · a7b2970 · a7b2970
1 parent ff78db4
commit a7b2970
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
  - Fix pac `defmt` feature
+ - Fix timer interrupt status clear
 
 ## [v0.22.0] - 2024-10-04
 

diff --git a/src/timer/monotonics.rs b/src/timer/monotonics.rs
@@ -178,7 +178,10 @@ macro_rules! make_timer {
 
                 // The above line raises an update event which will indicate that the timer is already finished.
                 // Since this is not the case, it should be cleared.
-                self.tim.sr().modify(|_, w| w.uif().clear_bit());
+                self.tim.sr().write(|w| {
+                    unsafe { w.bits(!0) };
+                    w.uif().clear_bit()
+                });
 
                 $tq.initialize(MonoTimerBackend::<pac::$timer> { _tim: PhantomData });
                 $overflow.store(0, Ordering::SeqCst);
@@ -231,7 +234,10 @@ macro_rules! make_timer {
             }
 
             fn clear_compare_flag() {
-                Self::tim().sr().modify(|_, w| w.cc2if().clear_bit());
+                Self::tim().sr().write(|w| {
+                    unsafe { w.bits(!0) };
+                    w.cc2if().clear_bit()
+                });
             }
 
             fn pend_interrupt() {
@@ -249,13 +255,19 @@ macro_rules! make_timer {
             fn on_interrupt() {
                 // Full period
                 if Self::tim().sr().read().uif().bit_is_set() {
-                    Self::tim().sr().modify(|_, w| w.uif().clear_bit());
+                    Self::tim().sr().write(|w| {
+                        unsafe { w.bits(!0) };
+                        w.uif().clear_bit()
+                    });
                     let prev = $overflow.fetch_add(1, Ordering::Relaxed);
                     assert!(prev % 2 == 1, "Monotonic must have missed an interrupt!");
                 }
                 // Half period
                 if Self::tim().sr().read().cc1if().bit_is_set() {
-                    Self::tim().sr().modify(|_, w| w.cc1if().clear_bit());
+                    Self::tim().sr().write(|w| {
+                        unsafe { w.bits(!0) };
+                        w.cc1if().clear_bit()
+                    });
                     let prev = $overflow.fetch_add(1, Ordering::Relaxed);
                     assert!(prev % 2 == 0, "Monotonic must have missed an interrupt!");
                 }