aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32f4
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-08-17 22:25:58 +0200
committerDario Nieuwenhuis <[email protected]>2022-08-17 22:25:58 +0200
commit2e85eaf7d5f4dcf6d84f426542b8ec87aa51c429 (patch)
tree1d22c32eae26435677df89083d71f50fc298a09f /examples/stm32f4
parentfc6e1e06b305d302d1b7ad17e8ef3a9be986c358 (diff)
examples Remove the `fn config()` idiom.
It was only useful for doing #[embassy_executor::main(config = "config()")]`. Now that it's gone, it makes more sense to build the config in main directly.
Diffstat (limited to 'examples/stm32f4')
-rw-r--r--examples/stm32f4/src/bin/hello.rs9
-rw-r--r--examples/stm32f4/src/bin/sdmmc.rs10
2 files changed, 6 insertions, 13 deletions
diff --git a/examples/stm32f4/src/bin/hello.rs b/examples/stm32f4/src/bin/hello.rs
index 6facb9bb7..26d3555a2 100644
--- a/examples/stm32f4/src/bin/hello.rs
+++ b/examples/stm32f4/src/bin/hello.rs
@@ -9,15 +9,12 @@ use embassy_stm32::time::Hertz;
9use embassy_stm32::Config; 9use embassy_stm32::Config;
10use {defmt_rtt as _, panic_probe as _}; 10use {defmt_rtt as _, panic_probe as _};
11 11
12fn config() -> Config { 12#[embassy_executor::main]
13async fn main(_spawner: Spawner) -> ! {
13 let mut config = Config::default(); 14 let mut config = Config::default();
14 config.rcc.sys_ck = Some(Hertz(84_000_000)); 15 config.rcc.sys_ck = Some(Hertz(84_000_000));
15 config 16 let _p = embassy_stm32::init(config);
16}
17 17
18#[embassy_executor::main]
19async fn main(_spawner: Spawner) -> ! {
20 let _p = embassy_stm32::init(config());
21 loop { 18 loop {
22 info!("Hello World!"); 19 info!("Hello World!");
23 Timer::after(Duration::from_secs(1)).await; 20 Timer::after(Duration::from_secs(1)).await;
diff --git a/examples/stm32f4/src/bin/sdmmc.rs b/examples/stm32f4/src/bin/sdmmc.rs
index 996694f2c..b8e56d2e1 100644
--- a/examples/stm32f4/src/bin/sdmmc.rs
+++ b/examples/stm32f4/src/bin/sdmmc.rs
@@ -9,15 +9,11 @@ use embassy_stm32::time::mhz;
9use embassy_stm32::{interrupt, Config}; 9use embassy_stm32::{interrupt, Config};
10use {defmt_rtt as _, panic_probe as _}; 10use {defmt_rtt as _, panic_probe as _};
11 11
12fn config() -> Config {
13 let mut config = Config::default();
14 config.rcc.sys_ck = Some(mhz(48));
15 config
16}
17
18#[embassy_executor::main] 12#[embassy_executor::main]
19async fn main(_spawner: Spawner) -> ! { 13async fn main(_spawner: Spawner) -> ! {
20 let p = embassy_stm32::init(config()); 14 let mut config = Config::default();
15 config.rcc.sys_ck = Some(mhz(48));
16 let p = embassy_stm32::init(config);
21 info!("Hello World!"); 17 info!("Hello World!");
22 18
23 let irq = interrupt::take!(SDIO); 19 let irq = interrupt::take!(SDIO);