aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32f7/src
diff options
context:
space:
mode:
authorGrant Miller <[email protected]>2022-07-10 17:36:10 -0500
committerGrant Miller <[email protected]>2022-07-10 21:46:45 -0500
commit5ecbe5c9181d2392540a3273f21d53c01474d341 (patch)
treea3d6b547795b38c3b4fd3fcff29f225ccb230ef8 /examples/stm32f7/src
parent9753f767946d79c5987c166e513150aca98ec042 (diff)
embassy-stm32: Simplify time
- 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
Diffstat (limited to 'examples/stm32f7/src')
-rw-r--r--examples/stm32f7/src/bin/eth.rs4
-rw-r--r--examples/stm32f7/src/bin/sdmmc.rs6
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/stm32f7/src/bin/eth.rs b/examples/stm32f7/src/bin/eth.rs
index dc0b3c605..177683c3a 100644
--- a/examples/stm32f7/src/bin/eth.rs
+++ b/examples/stm32f7/src/bin/eth.rs
@@ -12,7 +12,7 @@ use embassy_stm32::eth::generic_smi::GenericSMI;
12use embassy_stm32::eth::{Ethernet, State}; 12use embassy_stm32::eth::{Ethernet, State};
13use embassy_stm32::peripherals::ETH; 13use embassy_stm32::peripherals::ETH;
14use embassy_stm32::rng::Rng; 14use embassy_stm32::rng::Rng;
15use embassy_stm32::time::U32Ext; 15use embassy_stm32::time::mhz;
16use embassy_stm32::{interrupt, Config, Peripherals}; 16use embassy_stm32::{interrupt, Config, Peripherals};
17use embedded_io::asynch::Write; 17use embedded_io::asynch::Write;
18use rand_core::RngCore; 18use rand_core::RngCore;
@@ -35,7 +35,7 @@ async fn net_task(stack: &'static Stack<Device>) -> ! {
35 35
36fn config() -> Config { 36fn config() -> Config {
37 let mut config = Config::default(); 37 let mut config = Config::default();
38 config.rcc.sys_ck = Some(200.mhz().into()); 38 config.rcc.sys_ck = Some(mhz(200));
39 config 39 config
40} 40}
41 41
diff --git a/examples/stm32f7/src/bin/sdmmc.rs b/examples/stm32f7/src/bin/sdmmc.rs
index 1af1061ba..011e1fd95 100644
--- a/examples/stm32f7/src/bin/sdmmc.rs
+++ b/examples/stm32f7/src/bin/sdmmc.rs
@@ -5,13 +5,13 @@
5use defmt::*; 5use defmt::*;
6use embassy::executor::Spawner; 6use embassy::executor::Spawner;
7use embassy_stm32::sdmmc::Sdmmc; 7use embassy_stm32::sdmmc::Sdmmc;
8use embassy_stm32::time::U32Ext; 8use embassy_stm32::time::mhz;
9use embassy_stm32::{interrupt, Config, Peripherals}; 9use embassy_stm32::{interrupt, Config, Peripherals};
10use {defmt_rtt as _, panic_probe as _}; 10use {defmt_rtt as _, panic_probe as _};
11 11
12fn config() -> Config { 12fn config() -> Config {
13 let mut config = Config::default(); 13 let mut config = Config::default();
14 config.rcc.sys_ck = Some(200.mhz().into()); 14 config.rcc.sys_ck = Some(mhz(200));
15 config 15 config
16} 16}
17 17
@@ -32,7 +32,7 @@ async fn main(_spawner: Spawner, p: Peripherals) -> ! {
32 // Should print 400kHz for initialization 32 // Should print 400kHz for initialization
33 info!("Configured clock: {}", sdmmc.clock().0); 33 info!("Configured clock: {}", sdmmc.clock().0);
34 34
35 unwrap!(sdmmc.init_card(25.mhz()).await); 35 unwrap!(sdmmc.init_card(mhz(25)).await);
36 36
37 let card = unwrap!(sdmmc.card()); 37 let card = unwrap!(sdmmc.card());
38 38