aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxoviat <[email protected]>2023-09-29 17:32:37 +0000
committerGitHub <[email protected]>2023-09-29 17:32:37 +0000
commit6627824c02f5efc092c1a1fd77914fdde9d15813 (patch)
tree7b2722b4ee774d7f85632bf30087f91cac8388f6
parentd62533879c87d543d41b37f7e719927360a6b228 (diff)
parentdffdb9268bfb32580efe32067bab50fe62900c5f (diff)
Merge pull request #1970 from dberlin/revert-1969-main
Revert "Forgot set_count_direction and set_clock_division in 32 bit instance"
-rw-r--r--embassy-stm32/src/timer/mod.rs12
1 files changed, 0 insertions, 12 deletions
diff --git a/embassy-stm32/src/timer/mod.rs b/embassy-stm32/src/timer/mod.rs
index 9b79f9b4e..1d642ed37 100644
--- a/embassy-stm32/src/timer/mod.rs
+++ b/embassy-stm32/src/timer/mod.rs
@@ -49,10 +49,6 @@ 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);
56 } 52 }
57 53
58 pub trait AdvancedControlInstance: GeneralPurpose16bitInstance { 54 pub trait AdvancedControlInstance: GeneralPurpose16bitInstance {
@@ -321,14 +317,6 @@ macro_rules! impl_32bit_timer {
321 crate::pac::$inst 317 crate::pac::$inst
322 } 318 }
323 319
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
332 fn set_frequency(&mut self, frequency: Hertz) { 320 fn set_frequency(&mut self, frequency: Hertz) {
333 use core::convert::TryInto; 321 use core::convert::TryInto;
334 let f = frequency.0; 322 let f = frequency.0;