diff options
| -rw-r--r-- | embassy-stm32/src/rcc/wba.rs | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/wl.rs | 12 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/lora_lorawan.rs | 2 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/lora_p2p_receive.rs | 2 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/lora_p2p_send.rs | 2 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/random.rs | 2 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/rtc.rs | 2 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/uart_async.rs | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/embassy-stm32/src/rcc/wba.rs b/embassy-stm32/src/rcc/wba.rs index 9ade369f5..d79b3063e 100644 --- a/embassy-stm32/src/rcc/wba.rs +++ b/embassy-stm32/src/rcc/wba.rs | |||
| @@ -28,7 +28,7 @@ pub enum PllSrc { | |||
| 28 | impl Into<Pllsrc> for PllSrc { | 28 | impl Into<Pllsrc> for PllSrc { |
| 29 | fn into(self) -> Pllsrc { | 29 | fn into(self) -> Pllsrc { |
| 30 | match self { | 30 | match self { |
| 31 | PllSrc::HSE(..) => Pllsrc::HSE32, | 31 | PllSrc::HSE(..) => Pllsrc::HSE, |
| 32 | PllSrc::HSI16 => Pllsrc::HSI16, | 32 | PllSrc::HSI16 => Pllsrc::HSI16, |
| 33 | } | 33 | } |
| 34 | } | 34 | } |
| @@ -37,7 +37,7 @@ impl Into<Pllsrc> for PllSrc { | |||
| 37 | impl Into<Sw> for ClockSrc { | 37 | impl Into<Sw> for ClockSrc { |
| 38 | fn into(self) -> Sw { | 38 | fn into(self) -> Sw { |
| 39 | match self { | 39 | match self { |
| 40 | ClockSrc::HSE(..) => Sw::HSE32, | 40 | ClockSrc::HSE(..) => Sw::HSE, |
| 41 | ClockSrc::HSI16 => Sw::HSI16, | 41 | ClockSrc::HSI16 => Sw::HSI16, |
| 42 | } | 42 | } |
| 43 | } | 43 | } |
diff --git a/embassy-stm32/src/rcc/wl.rs b/embassy-stm32/src/rcc/wl.rs index f12588a59..4c3fe5051 100644 --- a/embassy-stm32/src/rcc/wl.rs +++ b/embassy-stm32/src/rcc/wl.rs | |||
| @@ -15,14 +15,14 @@ pub const HSI_FREQ: Hertz = Hertz(16_000_000); | |||
| 15 | /// LSI speed | 15 | /// LSI speed |
| 16 | pub const LSI_FREQ: Hertz = Hertz(32_000); | 16 | pub const LSI_FREQ: Hertz = Hertz(32_000); |
| 17 | 17 | ||
| 18 | /// HSE32 speed | 18 | /// HSE speed |
| 19 | pub const HSE32_FREQ: Hertz = Hertz(32_000_000); | 19 | pub const HSE_FREQ: Hertz = Hertz(32_000_000); |
| 20 | 20 | ||
| 21 | /// System clock mux source | 21 | /// System clock mux source |
| 22 | #[derive(Clone, Copy)] | 22 | #[derive(Clone, Copy)] |
| 23 | pub enum ClockSrc { | 23 | pub enum ClockSrc { |
| 24 | MSI(MSIRange), | 24 | MSI(MSIRange), |
| 25 | HSE32, | 25 | HSE, |
| 26 | HSI16, | 26 | HSI16, |
| 27 | } | 27 | } |
| 28 | 28 | ||
| @@ -59,7 +59,7 @@ impl Default for Config { | |||
| 59 | pub(crate) unsafe fn init(config: Config) { | 59 | pub(crate) unsafe fn init(config: Config) { |
| 60 | let (sys_clk, sw, vos) = match config.mux { | 60 | let (sys_clk, sw, vos) = match config.mux { |
| 61 | ClockSrc::HSI16 => (HSI_FREQ, Sw::HSI16, VoltageScale::RANGE2), | 61 | ClockSrc::HSI16 => (HSI_FREQ, Sw::HSI16, VoltageScale::RANGE2), |
| 62 | ClockSrc::HSE32 => (HSE32_FREQ, Sw::HSE32, VoltageScale::RANGE1), | 62 | ClockSrc::HSE => (HSE_FREQ, Sw::HSE, VoltageScale::RANGE1), |
| 63 | ClockSrc::MSI(range) => (msirange_to_hertz(range), Sw::MSI, msirange_to_vos(range)), | 63 | ClockSrc::MSI(range) => (msirange_to_hertz(range), Sw::MSI, msirange_to_vos(range)), |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| @@ -113,8 +113,8 @@ pub(crate) unsafe fn init(config: Config) { | |||
| 113 | RCC.cr().write(|w| w.set_hsion(true)); | 113 | RCC.cr().write(|w| w.set_hsion(true)); |
| 114 | while !RCC.cr().read().hsirdy() {} | 114 | while !RCC.cr().read().hsirdy() {} |
| 115 | } | 115 | } |
| 116 | ClockSrc::HSE32 => { | 116 | ClockSrc::HSE => { |
| 117 | // Enable HSE32 | 117 | // Enable HSE |
| 118 | RCC.cr().write(|w| { | 118 | RCC.cr().write(|w| { |
| 119 | w.set_hsebyppwr(true); | 119 | w.set_hsebyppwr(true); |
| 120 | w.set_hseon(true); | 120 | w.set_hseon(true); |
diff --git a/examples/stm32wl/src/bin/lora_lorawan.rs b/examples/stm32wl/src/bin/lora_lorawan.rs index fb2495326..6546a4bfa 100644 --- a/examples/stm32wl/src/bin/lora_lorawan.rs +++ b/examples/stm32wl/src/bin/lora_lorawan.rs | |||
| @@ -33,7 +33,7 @@ bind_interrupts!(struct Irqs{ | |||
| 33 | #[embassy_executor::main] | 33 | #[embassy_executor::main] |
| 34 | async fn main(_spawner: Spawner) { | 34 | async fn main(_spawner: Spawner) { |
| 35 | let mut config = embassy_stm32::Config::default(); | 35 | let mut config = embassy_stm32::Config::default(); |
| 36 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE32; | 36 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE; |
| 37 | config.rcc.rtc_mux = embassy_stm32::rcc::RtcClockSource::LSI; | 37 | config.rcc.rtc_mux = embassy_stm32::rcc::RtcClockSource::LSI; |
| 38 | let p = embassy_stm32::init(config); | 38 | let p = embassy_stm32::init(config); |
| 39 | 39 | ||
diff --git a/examples/stm32wl/src/bin/lora_p2p_receive.rs b/examples/stm32wl/src/bin/lora_p2p_receive.rs index 3d8c31ff3..19b0d8531 100644 --- a/examples/stm32wl/src/bin/lora_p2p_receive.rs +++ b/examples/stm32wl/src/bin/lora_p2p_receive.rs | |||
| @@ -26,7 +26,7 @@ bind_interrupts!(struct Irqs{ | |||
| 26 | #[embassy_executor::main] | 26 | #[embassy_executor::main] |
| 27 | async fn main(_spawner: Spawner) { | 27 | async fn main(_spawner: Spawner) { |
| 28 | let mut config = embassy_stm32::Config::default(); | 28 | let mut config = embassy_stm32::Config::default(); |
| 29 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE32; | 29 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE; |
| 30 | let p = embassy_stm32::init(config); | 30 | let p = embassy_stm32::init(config); |
| 31 | 31 | ||
| 32 | let spi = Spi::new_subghz(p.SUBGHZSPI, p.DMA1_CH1, p.DMA1_CH2); | 32 | let spi = Spi::new_subghz(p.SUBGHZSPI, p.DMA1_CH1, p.DMA1_CH2); |
diff --git a/examples/stm32wl/src/bin/lora_p2p_send.rs b/examples/stm32wl/src/bin/lora_p2p_send.rs index fbd0b0320..85f6a84b7 100644 --- a/examples/stm32wl/src/bin/lora_p2p_send.rs +++ b/examples/stm32wl/src/bin/lora_p2p_send.rs | |||
| @@ -26,7 +26,7 @@ bind_interrupts!(struct Irqs{ | |||
| 26 | #[embassy_executor::main] | 26 | #[embassy_executor::main] |
| 27 | async fn main(_spawner: Spawner) { | 27 | async fn main(_spawner: Spawner) { |
| 28 | let mut config = embassy_stm32::Config::default(); | 28 | let mut config = embassy_stm32::Config::default(); |
| 29 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE32; | 29 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE; |
| 30 | let p = embassy_stm32::init(config); | 30 | let p = embassy_stm32::init(config); |
| 31 | 31 | ||
| 32 | let spi = Spi::new_subghz(p.SUBGHZSPI, p.DMA1_CH1, p.DMA1_CH2); | 32 | let spi = Spi::new_subghz(p.SUBGHZSPI, p.DMA1_CH1, p.DMA1_CH2); |
diff --git a/examples/stm32wl/src/bin/random.rs b/examples/stm32wl/src/bin/random.rs index 18eeac4fa..d5b819700 100644 --- a/examples/stm32wl/src/bin/random.rs +++ b/examples/stm32wl/src/bin/random.rs | |||
| @@ -15,7 +15,7 @@ bind_interrupts!(struct Irqs{ | |||
| 15 | #[embassy_executor::main] | 15 | #[embassy_executor::main] |
| 16 | async fn main(_spawner: Spawner) { | 16 | async fn main(_spawner: Spawner) { |
| 17 | let mut config = embassy_stm32::Config::default(); | 17 | let mut config = embassy_stm32::Config::default(); |
| 18 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE32; | 18 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE; |
| 19 | config.rcc.rtc_mux = embassy_stm32::rcc::RtcClockSource::LSI; | 19 | config.rcc.rtc_mux = embassy_stm32::rcc::RtcClockSource::LSI; |
| 20 | 20 | ||
| 21 | let p = embassy_stm32::init(config); | 21 | let p = embassy_stm32::init(config); |
diff --git a/examples/stm32wl/src/bin/rtc.rs b/examples/stm32wl/src/bin/rtc.rs index 11734e4b6..b26ddc2f5 100644 --- a/examples/stm32wl/src/bin/rtc.rs +++ b/examples/stm32wl/src/bin/rtc.rs | |||
| @@ -16,7 +16,7 @@ use {defmt_rtt as _, panic_probe as _}; | |||
| 16 | async fn main(_spawner: Spawner) { | 16 | async fn main(_spawner: Spawner) { |
| 17 | let p = { | 17 | let p = { |
| 18 | let mut config = Config::default(); | 18 | let mut config = Config::default(); |
| 19 | config.rcc.mux = ClockSrc::HSE32; | 19 | config.rcc.mux = ClockSrc::HSE; |
| 20 | config.rcc.lse = Some(Hertz(32_768)); | 20 | config.rcc.lse = Some(Hertz(32_768)); |
| 21 | config.rcc.rtc_mux = RtcClockSource::LSE; | 21 | config.rcc.rtc_mux = RtcClockSource::LSE; |
| 22 | embassy_stm32::init(config) | 22 | embassy_stm32::init(config) |
diff --git a/examples/stm32wl/src/bin/uart_async.rs b/examples/stm32wl/src/bin/uart_async.rs index 2c9b7c691..44e8f83a2 100644 --- a/examples/stm32wl/src/bin/uart_async.rs +++ b/examples/stm32wl/src/bin/uart_async.rs | |||
| @@ -21,7 +21,7 @@ but can be surely changed for your needs. | |||
| 21 | #[embassy_executor::main] | 21 | #[embassy_executor::main] |
| 22 | async fn main(_spawner: Spawner) { | 22 | async fn main(_spawner: Spawner) { |
| 23 | let mut config = embassy_stm32::Config::default(); | 23 | let mut config = embassy_stm32::Config::default(); |
| 24 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE32; | 24 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE; |
| 25 | let p = embassy_stm32::init(config); | 25 | let p = embassy_stm32::init(config); |
| 26 | 26 | ||
| 27 | defmt::info!("Starting system"); | 27 | defmt::info!("Starting system"); |
