diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-08-17 22:25:58 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-08-17 22:25:58 +0200 |
| commit | 2e85eaf7d5f4dcf6d84f426542b8ec87aa51c429 (patch) | |
| tree | 1d22c32eae26435677df89083d71f50fc298a09f /examples/stm32f1/src | |
| parent | fc6e1e06b305d302d1b7ad17e8ef3a9be986c358 (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/stm32f1/src')
| -rw-r--r-- | examples/stm32f1/src/bin/hello.rs | 9 | ||||
| -rw-r--r-- | examples/stm32f1/src/bin/usb_serial.rs | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/examples/stm32f1/src/bin/hello.rs b/examples/stm32f1/src/bin/hello.rs index 721b21c36..57892d3cc 100644 --- a/examples/stm32f1/src/bin/hello.rs +++ b/examples/stm32f1/src/bin/hello.rs | |||
| @@ -9,15 +9,12 @@ use embassy_stm32::time::Hertz; | |||
| 9 | use embassy_stm32::Config; | 9 | use embassy_stm32::Config; |
| 10 | use {defmt_rtt as _, panic_probe as _}; | 10 | use {defmt_rtt as _, panic_probe as _}; |
| 11 | 11 | ||
| 12 | fn config() -> Config { | 12 | #[embassy_executor::main] |
| 13 | async fn main(_spawner: Spawner) -> ! { | ||
| 13 | let mut config = Config::default(); | 14 | let mut config = Config::default(); |
| 14 | config.rcc.sys_ck = Some(Hertz(36_000_000)); | 15 | config.rcc.sys_ck = Some(Hertz(36_000_000)); |
| 15 | config | 16 | let _p = embassy_stm32::init(config); |
| 16 | } | ||
| 17 | 17 | ||
| 18 | #[embassy_executor::main] | ||
| 19 | async 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/stm32f1/src/bin/usb_serial.rs b/examples/stm32f1/src/bin/usb_serial.rs index 7f27e6251..2301c51b6 100644 --- a/examples/stm32f1/src/bin/usb_serial.rs +++ b/examples/stm32f1/src/bin/usb_serial.rs | |||
| @@ -15,17 +15,14 @@ use embassy_usb_serial::{CdcAcmClass, State}; | |||
| 15 | use futures::future::join; | 15 | use futures::future::join; |
| 16 | use {defmt_rtt as _, panic_probe as _}; | 16 | use {defmt_rtt as _, panic_probe as _}; |
| 17 | 17 | ||
| 18 | fn config() -> Config { | 18 | #[embassy_executor::main] |
| 19 | async fn main(_spawner: Spawner) { | ||
| 19 | let mut config = Config::default(); | 20 | let mut config = Config::default(); |
| 20 | config.rcc.hse = Some(Hertz(8_000_000)); | 21 | config.rcc.hse = Some(Hertz(8_000_000)); |
| 21 | config.rcc.sys_ck = Some(Hertz(48_000_000)); | 22 | config.rcc.sys_ck = Some(Hertz(48_000_000)); |
| 22 | config.rcc.pclk1 = Some(Hertz(24_000_000)); | 23 | config.rcc.pclk1 = Some(Hertz(24_000_000)); |
| 23 | config | 24 | let mut p = embassy_stm32::init(config); |
| 24 | } | ||
| 25 | 25 | ||
| 26 | #[embassy_executor::main] | ||
| 27 | async fn main(_spawner: Spawner) { | ||
| 28 | let mut p = embassy_stm32::init(config()); | ||
| 29 | info!("Hello World!"); | 26 | info!("Hello World!"); |
| 30 | 27 | ||
| 31 | { | 28 | { |
