Merge #497

497: SysMonoTimerExt r=therealprof a=burrbull

r? `@therealprof` 

should I enable `rtic` feature by-default / remove it ?

Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -7,29 +7,33 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+
+ - update `stm32f4` to 0.15.1 [#481]
+ - use `stm32_i2s_v12x` version 0.3, reexport it, and implements requirement for it [#490]
+ - i2s module don't reuse marker from spi module and define its own [#490]
+ - `i2s-audio-out` example updated and now use pcm5102 dac module instead one from discovery board [#490]
+ - extend visibility of gpio/marker to crate since i2s module require it [#490]
+ - Bump `synopsys-usb-otg` to `0.3.0` [#508]
+ - Bump `embedded-hal` to `1.0.0-alpha.8` [#510]
+
+### Removed
+ - `i2s-audio-out-dma.rs` example, too difficult to fix.
+
 ### Added
 
 - Implementation of From trait for Pin-to-PartiallyErasedPin [#507]
 - Implementation of From trait for Pin-to-ErasedPin [#507]
 - Implementation of From trait for PartiallyErasedPin-to-ErasedPin [#507]
+- `SysMonoTimerExt` helper trait, `Pwm::(get/set)_duty_time` [#497]
+- example of using i2s in out with rtic and interrupt.
 
+[#489]: https://github.com/stm32-rs/stm32f4xx-hal/pull/489
+[#490]: https://github.com/stm32-rs/stm32f4xx-hal/pull/490
+[#497]: https://github.com/stm32-rs/stm32f4xx-hal/pull/497
 [#507]: https://github.com/stm32-rs/stm32f4xx-hal/pull/507
-
-### Changed
-
- - update `stm32f4` to 0.15.1
- - use `stm32_i2s_v12x` version 0.3, reexport it, and implements requirement for it
- - i2s module don't reuse marker from spi module and define its own.
- - `i2s-audio-out` example updated and now use pcm5102 dac module instead one from discovery board.
- - extend visibility of gpio/marker to crate since i2s module require it.
- - Bump `synopsys-usb-otg` to `0.3.0`
- - Bump `embedded-hal` to `1.0.0-alpha.8`
-
-### Added
- - example of using i2s in out with rtic and interrupt.
-
-### Removed
- - `i2s-audio-out-dma.rs` example, too difficult to fix.
+[#508]: https://github.com/stm32-rs/stm32f4xx-hal/pull/508
+[#510]: https://github.com/stm32-rs/stm32f4xx-hal/pull/510
 
 ## [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,

src/timer/pwm.rs

@@ -421,10 +421,18 @@ where
         TIM::read_cc_value(PINS::check_used(channel) as u8) as u16
     }
 
+    pub fn get_duty_time(&self, channel: Channel) -> TimerDurationU32<FREQ> {
+        TimerDurationU32::from_ticks(TIM::read_cc_value(PINS::check_used(channel) as u8))
+    }
+
     pub fn set_duty(&mut self, channel: Channel, duty: u16) {
         TIM::set_cc_value(PINS::check_used(channel) as u8, duty.into())
     }
 
+    pub fn set_duty_time(&mut self, channel: Channel, duty: TimerDurationU32<FREQ>) {
+        TIM::set_cc_value(PINS::check_used(channel) as u8, duty.ticks())
+    }
+
     /// If `0` returned means max_duty is 2^16
     pub fn get_max_duty(&self) -> u16 {
         (TIM::read_auto_reload() as u16).wrapping_add(1)