diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-09-29 00:38:45 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-09-29 00:38:45 +0000 |
| commit | 22e820b7433ababf0af4280cdb0a4163ac0cbd26 (patch) | |
| tree | 72be180139a9062a55aeac6256a1137b18a7a0d7 | |
| parent | aa14f18d3f19b47904454143d232bf4cd6c55ddf (diff) | |
| parent | e70143ef8f5303b5916a160f9d43d04d7ab55cd7 (diff) | |
Merge pull request #1969 from dberlin/main
Forgot set_count_direction and set_clock_division in 32 bit instance
| -rw-r--r-- | embassy-stm32/src/timer/mod.rs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/embassy-stm32/src/timer/mod.rs b/embassy-stm32/src/timer/mod.rs index 1d642ed37..9b79f9b4e 100644 --- a/embassy-stm32/src/timer/mod.rs +++ b/embassy-stm32/src/timer/mod.rs | |||
| @@ -49,6 +49,10 @@ pub(crate) mod sealed { | |||
| 49 | fn regs_gp32() -> crate::pac::timer::TimGp32; | 49 | fn regs_gp32() -> crate::pac::timer::TimGp32; |
| 50 | 50 | ||
| 51 | fn set_frequency(&mut self, frequency: Hertz); | 51 | fn set_frequency(&mut self, frequency: Hertz); |
| 52 | |||
| 53 | fn set_count_direction(&mut self, direction: vals::Dir); | ||
| 54 | |||
| 55 | fn set_clock_division(&mut self, ckd: vals::Ckd); | ||
| 52 | } | 56 | } |
| 53 | 57 | ||
| 54 | pub trait AdvancedControlInstance: GeneralPurpose16bitInstance { | 58 | pub trait AdvancedControlInstance: GeneralPurpose16bitInstance { |
| @@ -317,6 +321,14 @@ macro_rules! impl_32bit_timer { | |||
| 317 | crate::pac::$inst | 321 | crate::pac::$inst |
| 318 | } | 322 | } |
| 319 | 323 | ||
| 324 | fn set_count_direction(&mut self, direction: vals::Dir) { | ||
| 325 | Self::regs_gp32().cr1().modify(|r| r.set_dir(direction)); | ||
| 326 | } | ||
| 327 | |||
| 328 | fn set_clock_division(&mut self, ckd: vals::Ckd) { | ||
| 329 | Self::regs_gp32().cr1().modify(|r| r.set_ckd(ckd)); | ||
| 330 | } | ||
| 331 | |||
| 320 | fn set_frequency(&mut self, frequency: Hertz) { | 332 | fn set_frequency(&mut self, frequency: Hertz) { |
| 321 | use core::convert::TryInto; | 333 | use core::convert::TryInto; |
| 322 | let f = frequency.0; | 334 | let f = frequency.0; |
