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/stm32l0/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/stm32l0/src')
| -rw-r--r-- | examples/stm32l0/src/bin/button_exti.rs | 12 | ||||
| -rw-r--r-- | examples/stm32l0/src/bin/lorawan.rs | 9 |
2 files changed, 8 insertions, 13 deletions
diff --git a/examples/stm32l0/src/bin/button_exti.rs b/examples/stm32l0/src/bin/button_exti.rs index ab23fd5bc..bdd2fa3c1 100644 --- a/examples/stm32l0/src/bin/button_exti.rs +++ b/examples/stm32l0/src/bin/button_exti.rs | |||
| @@ -6,17 +6,15 @@ use defmt::*; | |||
| 6 | use embassy_executor::executor::Spawner; | 6 | use embassy_executor::executor::Spawner; |
| 7 | use embassy_stm32::exti::ExtiInput; | 7 | use embassy_stm32::exti::ExtiInput; |
| 8 | use embassy_stm32::gpio::{Input, Pull}; | 8 | use embassy_stm32::gpio::{Input, Pull}; |
| 9 | use embassy_stm32::Config; | ||
| 9 | use {defmt_rtt as _, panic_probe as _}; | 10 | use {defmt_rtt as _, panic_probe as _}; |
| 10 | 11 | ||
| 11 | fn config() -> embassy_stm32::Config { | ||
| 12 | let mut config = embassy_stm32::Config::default(); | ||
| 13 | config.rcc.enable_hsi48 = true; | ||
| 14 | config | ||
| 15 | } | ||
| 16 | |||
| 17 | #[embassy_executor::main] | 12 | #[embassy_executor::main] |
| 18 | async fn main(_spawner: Spawner) { | 13 | async fn main(_spawner: Spawner) { |
| 19 | let p = embassy_stm32::init(config()); | 14 | let mut config = Config::default(); |
| 15 | config.rcc.enable_hsi48 = true; | ||
| 16 | let p = embassy_stm32::init(config); | ||
| 17 | |||
| 20 | let button = Input::new(p.PB2, Pull::Up); | 18 | let button = Input::new(p.PB2, Pull::Up); |
| 21 | let mut button = ExtiInput::new(button, p.EXTI2); | 19 | let mut button = ExtiInput::new(button, p.EXTI2); |
| 22 | 20 | ||
diff --git a/examples/stm32l0/src/bin/lorawan.rs b/examples/stm32l0/src/bin/lorawan.rs index 4e5b69362..9497cad72 100644 --- a/examples/stm32l0/src/bin/lorawan.rs +++ b/examples/stm32l0/src/bin/lorawan.rs | |||
| @@ -18,16 +18,13 @@ use lorawan::default_crypto::DefaultFactory as Crypto; | |||
| 18 | use lorawan_device::async_device::{region, Device, JoinMode}; | 18 | use lorawan_device::async_device::{region, Device, JoinMode}; |
| 19 | use {defmt_rtt as _, panic_probe as _}; | 19 | use {defmt_rtt as _, panic_probe as _}; |
| 20 | 20 | ||
| 21 | fn config() -> embassy_stm32::Config { | 21 | #[embassy_executor::main] |
| 22 | async fn main(_spawner: Spawner) { | ||
| 22 | let mut config = embassy_stm32::Config::default(); | 23 | let mut config = embassy_stm32::Config::default(); |
| 23 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSI16; | 24 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSI16; |
| 24 | config.rcc.enable_hsi48 = true; | 25 | config.rcc.enable_hsi48 = true; |
| 25 | config | 26 | let p = embassy_stm32::init(config); |
| 26 | } | ||
| 27 | 27 | ||
| 28 | #[embassy_executor::main] | ||
| 29 | async fn main(_spawner: Spawner) { | ||
| 30 | let p = embassy_stm32::init(config()); | ||
| 31 | // SPI for sx127x | 28 | // SPI for sx127x |
| 32 | let spi = spi::Spi::new( | 29 | let spi = spi::Spi::new( |
| 33 | p.SPI1, | 30 | p.SPI1, |
