max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

embassy-stm32: Simplify time

Browse Source 
- Remove unused `MilliSeconds`, `MicroSeconds`, and `NanoSeconds` types
- Remove `Bps`, `KiloHertz`, and `MegaHertz` types that were only used
for converting to `Hertz`
- Replace all instances of `impl Into<Hertz>` with `Hertz`
- Add `hz`, `khz`, and `mhz` methods to `Hertz`, as well as
free function shortcuts
- Remove `U32Ext` extension trait
This commit is contained in:
Grant Miller
2022-07-10 17:36:10 -05:00
parent 9753f76794
commit 5ecbe5c918
34 changed files with 211 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
embassy-stm32/src/timer/mod.rs
View File

@ -23,7 +23,7 @@ pub(crate) mod sealed {
fn reset(&mut self);
fn set_frequency<F: Into<Hertz>>(&mut self, frequency: F);
fn set_frequency(&mut self, frequency: Hertz);
fn clear_update_interrupt(&mut self) -> bool;
@ -37,7 +37,7 @@ pub(crate) mod sealed {
pub trait GeneralPurpose32bitInstance: GeneralPurpose16bitInstance {
fn regs_gp32() -> crate::pac::timer::TimGp32;
fn set_frequency<F: Into<Hertz>>(&mut self, frequency: F);
fn set_frequency(&mut self, frequency: Hertz);
}
pub trait AdvancedControlInstance: Basic16bitInstance {
@ -81,9 +81,9 @@ macro_rules! impl_basic_16bit_timer {
}
}
fn set_frequency<F: Into<Hertz>>(&mut self, frequency: F) {
fn set_frequency(&mut self, frequency: Hertz) {
use core::convert::TryInto;
let f = frequency.into().0;
let f = frequency.0;
let timer_f = Self::frequency().0;
let pclk_ticks_per_timer_period = timer_f / f;
let psc: u16 = unwrap!(((pclk_ticks_per_timer_period - 1) / (1 << 16)).try_into());
@ -132,9 +132,9 @@ macro_rules! impl_32bit_timer {
crate::pac::$inst
}
fn set_frequency<F: Into<Hertz>>(&mut self, frequency: F) {
fn set_frequency(&mut self, frequency: Hertz) {
use core::convert::TryInto;
let f = frequency.into().0;
let f = frequency.0;
let timer_f = Self::frequency().0;
let pclk_ticks_per_timer_period = (timer_f / f) as u64;
let psc: u16 = unwrap!(((pclk_ticks_per_timer_period - 1) / (1 << 32)).try_into());