diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-09-04 22:13:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-04 22:13:34 +0000 |
| commit | 22c32b5d5ccaea49d6cf9a08a88433928c1609d3 (patch) | |
| tree | f70bf2b80e653c61833d5b8f566a90cb00659c0a /embassy-stm32 | |
| parent | 107bb0946af78ee07a274f498c777d3af92b4280 (diff) | |
| parent | 5327b9c289ee69bf07ed384253d03d29af291285 (diff) | |
| download | embassy-22c32b5d5ccaea49d6cf9a08a88433928c1609d3.zip | |
Merge #939
939: time: add more tick rates, use 1mhz as default. r=Dirbaio a=Dirbaio
Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Diffstat (limited to 'embassy-stm32')
| -rw-r--r-- | embassy-stm32/Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/time_driver.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 7a8e5c59..b4c19f32 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml @@ -10,7 +10,7 @@ src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-stm32 # TODO: sdmmc # TODO: net # TODO: subghz -features = ["nightly", "defmt", "unstable-pac", "unstable-traits", "exti", "time-driver-any", "embassy-time/tick-32768hz"] +features = ["nightly", "defmt", "unstable-pac", "unstable-traits", "exti", "time-driver-any"] flavors = [ { regex_feature = "stm32f0.*", target = "thumbv6m-none-eabi" }, { regex_feature = "stm32f1.*", target = "thumbv7m-none-eabi" }, diff --git a/embassy-stm32/src/time_driver.rs b/embassy-stm32/src/time_driver.rs index 6989a43d..ed3225c5 100644 --- a/embassy-stm32/src/time_driver.rs +++ b/embassy-stm32/src/time_driver.rs @@ -7,7 +7,7 @@ use atomic_polyfill::{AtomicU32, AtomicU8}; use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; use embassy_sync::blocking_mutex::Mutex; use embassy_time::driver::{AlarmHandle, Driver}; -use embassy_time::TICKS_PER_SECOND; +use embassy_time::TICK_HZ; use stm32_metapac::timer::regs; use crate::interrupt::{CriticalSection, InterruptExt}; @@ -153,7 +153,7 @@ impl RtcDriver { r.cr1().modify(|w| w.set_cen(false)); r.cnt().write(|w| w.set_cnt(0)); - let psc = timer_freq.0 / TICKS_PER_SECOND as u32 - 1; + let psc = timer_freq.0 / TICK_HZ as u32 - 1; let psc: u16 = match psc.try_into() { Err(_) => panic!("psc division overflow: {}", psc), Ok(n) => n, |