diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-07-11 02:51:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-11 02:51:06 +0000 |
commit | 2adee4af3878cb0e8027752c9d29a6ce236f4ab3 (patch) | |
tree | e6f2700ab17bcb62d0195debade2df44c54b03b4 /examples/stm32f4/src/bin | |
parent | 99f4fd33b493f11ec3202eb98fc3ae9e18b9d589 (diff) | |
parent | 5ecbe5c9181d2392540a3273f21d53c01474d341 (diff) | |
download | embassy-2adee4af3878cb0e8027752c9d29a6ce236f4ab3.zip |
Merge #858
858: embassy-stm32: Simplify time r=Dirbaio a=GrantM11235
- 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
Co-authored-by: Grant Miller <GrantM11235@gmail.com>
Diffstat (limited to 'examples/stm32f4/src/bin')
-rw-r--r-- | examples/stm32f4/src/bin/pwm.rs | 4 | ||||
-rw-r--r-- | examples/stm32f4/src/bin/sdmmc.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/stm32f4/src/bin/pwm.rs b/examples/stm32f4/src/bin/pwm.rs index cd20c68b..c99f3cc2 100644 --- a/examples/stm32f4/src/bin/pwm.rs +++ b/examples/stm32f4/src/bin/pwm.rs @@ -7,7 +7,7 @@ use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; use embassy_stm32::pwm::simple_pwm::SimplePwm; use embassy_stm32::pwm::Channel; -use embassy_stm32::time::U32Ext; +use embassy_stm32::time::khz; use embassy_stm32::Peripherals; use {defmt_rtt as _, panic_probe as _}; @@ -15,7 +15,7 @@ use {defmt_rtt as _, panic_probe as _}; async fn main(_spawner: Spawner, p: Peripherals) { info!("Hello World!"); - let mut pwm = SimplePwm::new_1ch(p.TIM1, p.PE9, 10000.hz()); + let mut pwm = SimplePwm::new_1ch(p.TIM1, p.PE9, khz(10)); let max = pwm.get_max_duty(); pwm.enable(Channel::Ch1); diff --git a/examples/stm32f4/src/bin/sdmmc.rs b/examples/stm32f4/src/bin/sdmmc.rs index b08d26f4..66567026 100644 --- a/examples/stm32f4/src/bin/sdmmc.rs +++ b/examples/stm32f4/src/bin/sdmmc.rs @@ -5,13 +5,13 @@ use defmt::*; use embassy::executor::Spawner; use embassy_stm32::sdmmc::Sdmmc; -use embassy_stm32::time::U32Ext; +use embassy_stm32::time::mhz; use embassy_stm32::{interrupt, Config, Peripherals}; use {defmt_rtt as _, panic_probe as _}; fn config() -> Config { let mut config = Config::default(); - config.rcc.sys_ck = Some(48.mhz().into()); + config.rcc.sys_ck = Some(mhz(48)); config } @@ -32,7 +32,7 @@ async fn main(_spawner: Spawner, p: Peripherals) -> ! { // Should print 400kHz for initialization info!("Configured clock: {}", sdmmc.clock().0); - unwrap!(sdmmc.init_card(25.mhz()).await); + unwrap!(sdmmc.init_card(mhz(25)).await); let card = unwrap!(sdmmc.card()); |