SysMonoTimerExt

Author: burrbull

CHANGELOG.md

@@ -30,6 +30,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Removed
  - `i2s-audio-out-dma.rs` example, too difficult to fix.
+- Add `SysMonoTimerExt` helper trait [#497]
+
+[#497]: https://github.com/stm32-rs/stm32f4xx-hal/pull/497
 
 ## [v0.13.2] - 2022-05-16
 

Cargo.toml

@@ -23,7 +23,7 @@ repository = "https://github.com/stm32-rs/stm32f4xx-hal"
 version = "0.13.2"
 
 [package.metadata.docs.rs]
-features = ["stm32f429", "usb_fs", "can", "i2s", "fsmc_lcd"]
+features = ["stm32f429", "usb_fs", "can", "i2s", "fsmc_lcd", "rtic"]
 targets = ["thumbv7em-none-eabihf"]
 
 [dependencies]
@@ -44,6 +44,7 @@ display-interface = { version = "0.4.1", optional = true }
 fugit = "0.3.5"
 fugit-timer = "0.1.3"
 rtic-monotonic = { version = "1.0", optional = true }
+systick-monotonic = { version = "1.0", optional = true }
 bitflags = "1.3.2"
 embedded-storage = "0.2"
 
@@ -355,7 +356,7 @@ uart8 = []
 uart9 = []
 uart10 = []
 
-rtic = ["rtic-monotonic"]
+rtic = ["rtic-monotonic", "systick-monotonic"]
 
 [profile.dev]
 debug = true

src/prelude.rs

@@ -75,5 +75,7 @@ pub use crate::time::U32Ext as _stm32f4xx_hal_time_U32Ext;
 #[cfg(feature = "rtic")]
 pub use crate::timer::MonoTimerExt as _stm32f4xx_hal_timer_MonoTimerExt;
 pub use crate::timer::PwmExt as _stm32f4xx_hal_timer_PwmExt;
+#[cfg(feature = "rtic")]
+pub use crate::timer::SysMonoTimerExt as _stm32f4xx_hal_timer_SysMonoTimerExt;
 pub use crate::timer::SysTimerExt as _stm32f4xx_hal_timer_SysCounterExt;
 pub use crate::timer::TimerExt as _stm32f4xx_hal_timer_TimerExt;

src/timer/monotonic.rs

@@ -4,6 +4,7 @@ use crate::rcc::Clocks;
 use core::ops::{Deref, DerefMut};
 pub use fugit::{self, ExtU32};
 use rtic_monotonic::Monotonic;
+use systick_monotonic::Systick;
 
 pub struct MonoTimer<TIM, const FREQ: u32>(FTimer<TIM, FREQ>);
 
@@ -48,6 +49,19 @@ where
     }
 }
 
+pub trait SysMonoTimerExt: Sized {
+    fn monotonic<const FREQ: u32>(self, clocks: &Clocks) -> Systick<FREQ>;
+    fn monotonic_us(self, clocks: &Clocks) -> Systick<1_000_000> {
+        self.monotonic::<1_000_000>(clocks)
+    }
+}
+
+impl SysMonoTimerExt for crate::pac::SYST {
+    fn monotonic<const FREQ: u32>(self, clocks: &Clocks) -> Systick<FREQ> {
+        Systick::new(self, clocks.hclk().raw())
+    }
+}
+
 impl<TIM, const FREQ: u32> FTimer<TIM, FREQ>
 where
     TIM: Instance + General<Width = u32> + WithPwm,