diff options
author | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2022-01-04 23:58:13 +0100 |
---|---|---|
committer | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2022-01-05 00:00:44 +0100 |
commit | 2eb0cc5df78b2abd38228ee1f07b7c446e17d362 (patch) | |
tree | a9df2ed2c0acc481e19275473f981da098b541f1 /examples/stm32l0 | |
parent | c3fd9a0f44ae898c5cf1272dab6b8f46e119fab3 (diff) | |
download | embassy-2eb0cc5df78b2abd38228ee1f07b7c446e17d362.zip |
stm32/rcc: remove Rcc struct, RccExt trait.
All the RCC configuration is executed in init().
Diffstat (limited to 'examples/stm32l0')
-rw-r--r-- | examples/stm32l0/src/bin/button_exti.rs | 14 | ||||
-rw-r--r-- | examples/stm32l0/src/bin/lorawan.rs | 12 |
2 files changed, 10 insertions, 16 deletions
diff --git a/examples/stm32l0/src/bin/button_exti.rs b/examples/stm32l0/src/bin/button_exti.rs index 20d6f555..88c75ce6 100644 --- a/examples/stm32l0/src/bin/button_exti.rs +++ b/examples/stm32l0/src/bin/button_exti.rs @@ -8,16 +8,18 @@ mod example_common; use embassy::executor::Spawner; use embassy_stm32::exti::ExtiInput; use embassy_stm32::gpio::{Input, Pull}; -use embassy_stm32::{rcc, Peripherals}; +use embassy_stm32::Peripherals; use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge}; use example_common::*; -#[embassy::main] -async fn main(_spawner: Spawner, mut p: Peripherals) { - let mut rcc = rcc::Rcc::new(p.RCC); - // Enables SYSCFG - let _ = rcc.enable_hsi48(&mut p.SYSCFG, p.CRS); +fn config() -> embassy_stm32::Config { + let mut config = embassy_stm32::Config::default(); + config.rcc.enable_hsi48 = true; + config +} +#[embassy::main(config = "config()")] +async fn main(_spawner: Spawner, p: Peripherals) { let button = Input::new(p.PB2, Pull::Up); let mut button = ExtiInput::new(button, p.EXTI2); diff --git a/examples/stm32l0/src/bin/lorawan.rs b/examples/stm32l0/src/bin/lorawan.rs index 7ce859a8..df08ba18 100644 --- a/examples/stm32l0/src/bin/lorawan.rs +++ b/examples/stm32l0/src/bin/lorawan.rs @@ -11,10 +11,8 @@ mod example_common; use embassy_lora::{sx127x::*, LoraTimer}; use embassy_stm32::{ - dbgmcu::Dbgmcu, exti::ExtiInput, gpio::{Input, Level, Output, Pull, Speed}, - rcc, rng::Rng, spi, time::U32Ext, @@ -26,18 +24,12 @@ use lorawan_encoding::default_crypto::DefaultFactory as Crypto; fn config() -> embassy_stm32::Config { let mut config = embassy_stm32::Config::default(); config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSI16; + config.rcc.enable_hsi48 = true; config } #[embassy::main(config = "config()")] -async fn main(_spawner: embassy::executor::Spawner, mut p: Peripherals) { - unsafe { - Dbgmcu::enable_all(); - } - - let mut rcc = rcc::Rcc::new(p.RCC); - let _ = rcc.enable_hsi48(&mut p.SYSCFG, p.CRS); - +async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) { // SPI for sx127x let spi = spi::Spi::new( p.SPI1, |