diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-01-04 23:58:13 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-01-05 00:00:44 +0100 |
| commit | 2eb0cc5df78b2abd38228ee1f07b7c446e17d362 (patch) | |
| tree | a9df2ed2c0acc481e19275473f981da098b541f1 /examples/stm32wl55/src/bin | |
| parent | c3fd9a0f44ae898c5cf1272dab6b8f46e119fab3 (diff) | |
stm32/rcc: remove Rcc struct, RccExt trait.
All the RCC configuration is executed in init().
Diffstat (limited to 'examples/stm32wl55/src/bin')
| -rw-r--r-- | examples/stm32wl55/src/bin/lorawan.rs | 13 | ||||
| -rw-r--r-- | examples/stm32wl55/src/bin/subghz.rs | 5 |
2 files changed, 3 insertions, 15 deletions
diff --git a/examples/stm32wl55/src/bin/lorawan.rs b/examples/stm32wl55/src/bin/lorawan.rs index 7048a5814..5d26dead2 100644 --- a/examples/stm32wl55/src/bin/lorawan.rs +++ b/examples/stm32wl55/src/bin/lorawan.rs | |||
| @@ -10,10 +10,9 @@ mod example_common; | |||
| 10 | 10 | ||
| 11 | use embassy_lora::{stm32wl::*, LoraTimer}; | 11 | use embassy_lora::{stm32wl::*, LoraTimer}; |
| 12 | use embassy_stm32::{ | 12 | use embassy_stm32::{ |
| 13 | dbgmcu::Dbgmcu, | ||
| 14 | dma::NoDma, | 13 | dma::NoDma, |
| 15 | gpio::{Level, Output, Pin, Speed}, | 14 | gpio::{Level, Output, Pin, Speed}, |
| 16 | interrupt, pac, rcc, | 15 | interrupt, pac, |
| 17 | rng::Rng, | 16 | rng::Rng, |
| 18 | subghz::*, | 17 | subghz::*, |
| 19 | Peripherals, | 18 | Peripherals, |
| @@ -24,19 +23,13 @@ use lorawan_encoding::default_crypto::DefaultFactory as Crypto; | |||
| 24 | fn config() -> embassy_stm32::Config { | 23 | fn config() -> embassy_stm32::Config { |
| 25 | let mut config = embassy_stm32::Config::default(); | 24 | let mut config = embassy_stm32::Config::default(); |
| 26 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSI16; | 25 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSI16; |
| 26 | config.rcc.enable_lsi = true; | ||
| 27 | config | 27 | config |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | #[embassy::main(config = "config()")] | 30 | #[embassy::main(config = "config()")] |
| 31 | async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) { | 31 | async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) { |
| 32 | unsafe { | 32 | unsafe { pac::RCC.ccipr().modify(|w| w.set_rngsel(0b01)) } |
| 33 | Dbgmcu::enable_all(); | ||
| 34 | let mut rcc = rcc::Rcc::new(p.RCC); | ||
| 35 | rcc.enable_lsi(); | ||
| 36 | pac::RCC.ccipr().modify(|w| { | ||
| 37 | w.set_rngsel(0b01); | ||
| 38 | }); | ||
| 39 | } | ||
| 40 | 33 | ||
| 41 | let ctrl1 = Output::new(p.PC3.degrade(), Level::High, Speed::High); | 34 | let ctrl1 = Output::new(p.PC3.degrade(), Level::High, Speed::High); |
| 42 | let ctrl2 = Output::new(p.PC4.degrade(), Level::High, Speed::High); | 35 | let ctrl2 = Output::new(p.PC4.degrade(), Level::High, Speed::High); |
diff --git a/examples/stm32wl55/src/bin/subghz.rs b/examples/stm32wl55/src/bin/subghz.rs index a73c361c2..52fe6e9fa 100644 --- a/examples/stm32wl55/src/bin/subghz.rs +++ b/examples/stm32wl55/src/bin/subghz.rs | |||
| @@ -11,7 +11,6 @@ mod example_common; | |||
| 11 | use embassy::channel::signal::Signal; | 11 | use embassy::channel::signal::Signal; |
| 12 | use embassy::interrupt::{Interrupt, InterruptExt}; | 12 | use embassy::interrupt::{Interrupt, InterruptExt}; |
| 13 | use embassy::traits::gpio::WaitForRisingEdge; | 13 | use embassy::traits::gpio::WaitForRisingEdge; |
| 14 | use embassy_stm32::dbgmcu::Dbgmcu; | ||
| 15 | use embassy_stm32::dma::NoDma; | 14 | use embassy_stm32::dma::NoDma; |
| 16 | use embassy_stm32::exti::ExtiInput; | 15 | use embassy_stm32::exti::ExtiInput; |
| 17 | use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; | 16 | use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; |
| @@ -72,10 +71,6 @@ fn config() -> embassy_stm32::Config { | |||
| 72 | 71 | ||
| 73 | #[embassy::main(config = "config()")] | 72 | #[embassy::main(config = "config()")] |
| 74 | async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) { | 73 | async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) { |
| 75 | unsafe { | ||
| 76 | Dbgmcu::enable_all(); | ||
| 77 | } | ||
| 78 | |||
| 79 | let mut led1 = Output::new(p.PB15, Level::High, Speed::Low); | 74 | let mut led1 = Output::new(p.PB15, Level::High, Speed::Low); |
| 80 | let mut led2 = Output::new(p.PB9, Level::Low, Speed::Low); | 75 | let mut led2 = Output::new(p.PB9, Level::Low, Speed::Low); |
| 81 | let mut led3 = Output::new(p.PB11, Level::Low, Speed::Low); | 76 | let mut led3 = Output::new(p.PB11, Level::Low, Speed::Low); |
