stm32/rcc: merge wb into l4/l5.
This commit is contained in:
		@@ -39,6 +39,7 @@ async fn main(_spawner: Spawner) {
 | 
			
		||||
        config.rcc.hse = Some(Hse {
 | 
			
		||||
            freq: Hertz(32_000_000),
 | 
			
		||||
            mode: HseMode::Bypass,
 | 
			
		||||
            prescaler: HsePrescaler::DIV1,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.mux = ClockSrc::PLL1_R;
 | 
			
		||||
        config.rcc.pll = Some(Pll {
 | 
			
		||||
 
 | 
			
		||||
@@ -11,6 +11,7 @@ use embassy_lora::iv::{InterruptHandler, Stm32wlInterfaceVariant};
 | 
			
		||||
use embassy_stm32::bind_interrupts;
 | 
			
		||||
use embassy_stm32::gpio::{Level, Output, Pin, Speed};
 | 
			
		||||
use embassy_stm32::spi::Spi;
 | 
			
		||||
use embassy_stm32::time::Hertz;
 | 
			
		||||
use embassy_time::{Delay, Timer};
 | 
			
		||||
use lora_phy::mod_params::*;
 | 
			
		||||
use lora_phy::sx1261_2::SX1261_2;
 | 
			
		||||
@@ -26,7 +27,23 @@ bind_interrupts!(struct Irqs{
 | 
			
		||||
#[embassy_executor::main]
 | 
			
		||||
async fn main(_spawner: Spawner) {
 | 
			
		||||
    let mut config = embassy_stm32::Config::default();
 | 
			
		||||
    config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE;
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hse = Some(Hse {
 | 
			
		||||
            freq: Hertz(32_000_000),
 | 
			
		||||
            mode: HseMode::Bypass,
 | 
			
		||||
            prescaler: HsePrescaler::DIV1,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.mux = ClockSrc::PLL1_R;
 | 
			
		||||
        config.rcc.pll = Some(Pll {
 | 
			
		||||
            source: PLLSource::HSE,
 | 
			
		||||
            prediv: PllPreDiv::DIV2,
 | 
			
		||||
            mul: PllMul::MUL6,
 | 
			
		||||
            divp: None,
 | 
			
		||||
            divq: Some(PllQDiv::DIV2), // PLL1_Q clock (32 / 2 * 6 / 2), used for RNG
 | 
			
		||||
            divr: Some(PllRDiv::DIV2), // sysclk 48Mhz clock (32 / 2 * 6 / 2)
 | 
			
		||||
        });
 | 
			
		||||
    }
 | 
			
		||||
    let p = embassy_stm32::init(config);
 | 
			
		||||
 | 
			
		||||
    let spi = Spi::new_subghz(p.SUBGHZSPI, p.DMA1_CH1, p.DMA1_CH2);
 | 
			
		||||
 
 | 
			
		||||
@@ -11,6 +11,7 @@ use embassy_lora::iv::{InterruptHandler, Stm32wlInterfaceVariant};
 | 
			
		||||
use embassy_stm32::bind_interrupts;
 | 
			
		||||
use embassy_stm32::gpio::{Level, Output, Pin, Speed};
 | 
			
		||||
use embassy_stm32::spi::Spi;
 | 
			
		||||
use embassy_stm32::time::Hertz;
 | 
			
		||||
use embassy_time::Delay;
 | 
			
		||||
use lora_phy::mod_params::*;
 | 
			
		||||
use lora_phy::sx1261_2::SX1261_2;
 | 
			
		||||
@@ -26,7 +27,23 @@ bind_interrupts!(struct Irqs{
 | 
			
		||||
#[embassy_executor::main]
 | 
			
		||||
async fn main(_spawner: Spawner) {
 | 
			
		||||
    let mut config = embassy_stm32::Config::default();
 | 
			
		||||
    config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE;
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hse = Some(Hse {
 | 
			
		||||
            freq: Hertz(32_000_000),
 | 
			
		||||
            mode: HseMode::Bypass,
 | 
			
		||||
            prescaler: HsePrescaler::DIV1,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.mux = ClockSrc::PLL1_R;
 | 
			
		||||
        config.rcc.pll = Some(Pll {
 | 
			
		||||
            source: PLLSource::HSE,
 | 
			
		||||
            prediv: PllPreDiv::DIV2,
 | 
			
		||||
            mul: PllMul::MUL6,
 | 
			
		||||
            divp: None,
 | 
			
		||||
            divq: Some(PllQDiv::DIV2), // PLL1_Q clock (32 / 2 * 6 / 2), used for RNG
 | 
			
		||||
            divr: Some(PllRDiv::DIV2), // sysclk 48Mhz clock (32 / 2 * 6 / 2)
 | 
			
		||||
        });
 | 
			
		||||
    }
 | 
			
		||||
    let p = embassy_stm32::init(config);
 | 
			
		||||
 | 
			
		||||
    let spi = Spi::new_subghz(p.SUBGHZSPI, p.DMA1_CH1, p.DMA1_CH2);
 | 
			
		||||
 
 | 
			
		||||
@@ -21,6 +21,7 @@ async fn main(_spawner: Spawner) {
 | 
			
		||||
        config.rcc.hse = Some(Hse {
 | 
			
		||||
            freq: Hertz(32_000_000),
 | 
			
		||||
            mode: HseMode::Bypass,
 | 
			
		||||
            prescaler: HsePrescaler::DIV1,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.mux = ClockSrc::PLL1_R;
 | 
			
		||||
        config.rcc.pll = Some(Pll {
 | 
			
		||||
 
 | 
			
		||||
@@ -5,20 +5,34 @@
 | 
			
		||||
use chrono::{NaiveDate, NaiveDateTime};
 | 
			
		||||
use defmt::*;
 | 
			
		||||
use embassy_executor::Spawner;
 | 
			
		||||
use embassy_stm32::rcc::{ClockSrc, LsConfig};
 | 
			
		||||
use embassy_stm32::rtc::{Rtc, RtcConfig};
 | 
			
		||||
use embassy_stm32::time::Hertz;
 | 
			
		||||
use embassy_stm32::Config;
 | 
			
		||||
use embassy_time::Timer;
 | 
			
		||||
use {defmt_rtt as _, panic_probe as _};
 | 
			
		||||
 | 
			
		||||
#[embassy_executor::main]
 | 
			
		||||
async fn main(_spawner: Spawner) {
 | 
			
		||||
    let p = {
 | 
			
		||||
        let mut config = Config::default();
 | 
			
		||||
        config.rcc.mux = ClockSrc::HSE;
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.ls = LsConfig::default_lse();
 | 
			
		||||
        embassy_stm32::init(config)
 | 
			
		||||
    };
 | 
			
		||||
        config.rcc.hse = Some(Hse {
 | 
			
		||||
            freq: Hertz(32_000_000),
 | 
			
		||||
            mode: HseMode::Bypass,
 | 
			
		||||
            prescaler: HsePrescaler::DIV1,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.mux = ClockSrc::PLL1_R;
 | 
			
		||||
        config.rcc.pll = Some(Pll {
 | 
			
		||||
            source: PLLSource::HSE,
 | 
			
		||||
            prediv: PllPreDiv::DIV2,
 | 
			
		||||
            mul: PllMul::MUL6,
 | 
			
		||||
            divp: None,
 | 
			
		||||
            divq: Some(PllQDiv::DIV2), // PLL1_Q clock (32 / 2 * 6 / 2), used for RNG
 | 
			
		||||
            divr: Some(PllRDiv::DIV2), // sysclk 48Mhz clock (32 / 2 * 6 / 2)
 | 
			
		||||
        });
 | 
			
		||||
    }
 | 
			
		||||
    let p = embassy_stm32::init(config);
 | 
			
		||||
    info!("Hello World!");
 | 
			
		||||
 | 
			
		||||
    let now = NaiveDate::from_ymd_opt(2020, 5, 15)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user