diff options
| -rw-r--r-- | embassy-stm32/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/l0.rs | 4 | ||||
| -rw-r--r-- | examples/stm32g4/src/bin/usb_serial.rs | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 3d9ee8261..f15c6d0b7 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -57,7 +57,7 @@ sdio-host = "0.5.0" | |||
| 57 | embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } | 57 | embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } |
| 58 | critical-section = "1.1" | 58 | critical-section = "1.1" |
| 59 | atomic-polyfill = "1.0.1" | 59 | atomic-polyfill = "1.0.1" |
| 60 | stm32-metapac = "10" | 60 | stm32-metapac = "11" |
| 61 | vcell = "0.1.3" | 61 | vcell = "0.1.3" |
| 62 | bxcan = "0.7.0" | 62 | bxcan = "0.7.0" |
| 63 | nb = "1.0.0" | 63 | nb = "1.0.0" |
| @@ -74,7 +74,7 @@ critical-section = { version = "1.1", features = ["std"] } | |||
| 74 | [build-dependencies] | 74 | [build-dependencies] |
| 75 | proc-macro2 = "1.0.36" | 75 | proc-macro2 = "1.0.36" |
| 76 | quote = "1.0.15" | 76 | quote = "1.0.15" |
| 77 | stm32-metapac = { version = "10", default-features = false, features = ["metadata"]} | 77 | stm32-metapac = { version = "11", default-features = false, features = ["metadata"]} |
| 78 | 78 | ||
| 79 | [features] | 79 | [features] |
| 80 | default = ["rt"] | 80 | default = ["rt"] |
diff --git a/embassy-stm32/src/rcc/l0.rs b/embassy-stm32/src/rcc/l0.rs index 42a481a74..d53b61069 100644 --- a/embassy-stm32/src/rcc/l0.rs +++ b/embassy-stm32/src/rcc/l0.rs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | use crate::pac::rcc::vals::{Hpre, Msirange, Plldiv, Pllmul, Pllsrc, Ppre, Sw}; | 1 | use crate::pac::rcc::vals::{Hpre, Msirange, Plldiv, Pllmul, Pllsrc, Ppre, Sw}; |
| 2 | use crate::pac::RCC; | 2 | use crate::pac::RCC; |
| 3 | #[cfg(crs)] | 3 | #[cfg(crs)] |
| 4 | use crate::pac::{CRS, SYSCFG}; | 4 | use crate::pac::{crs, CRS, SYSCFG}; |
| 5 | use crate::rcc::{set_freqs, Clocks}; | 5 | use crate::rcc::{set_freqs, Clocks}; |
| 6 | use crate::time::Hertz; | 6 | use crate::time::Hertz; |
| 7 | 7 | ||
| @@ -338,7 +338,7 @@ pub(crate) unsafe fn init(config: Config) { | |||
| 338 | CRS.cfgr().write(|w| | 338 | CRS.cfgr().write(|w| |
| 339 | 339 | ||
| 340 | // Select LSE as synchronization source | 340 | // Select LSE as synchronization source |
| 341 | w.set_syncsrc(0b01)); | 341 | w.set_syncsrc(crs::vals::Syncsrc::LSE)); |
| 342 | CRS.cr().modify(|w| { | 342 | CRS.cr().modify(|w| { |
| 343 | w.set_autotrimen(true); | 343 | w.set_autotrimen(true); |
| 344 | w.set_cen(true); | 344 | w.set_cen(true); |
diff --git a/examples/stm32g4/src/bin/usb_serial.rs b/examples/stm32g4/src/bin/usb_serial.rs index c111a9787..289d0ed86 100644 --- a/examples/stm32g4/src/bin/usb_serial.rs +++ b/examples/stm32g4/src/bin/usb_serial.rs | |||
| @@ -38,7 +38,9 @@ async fn main(_spawner: Spawner) { | |||
| 38 | let p = embassy_stm32::init(config); | 38 | let p = embassy_stm32::init(config); |
| 39 | info!("Hello World!"); | 39 | info!("Hello World!"); |
| 40 | 40 | ||
| 41 | pac::RCC.ccipr().write(|w| w.set_clk48sel(0b10)); | 41 | pac::RCC.ccipr().write(|w| { |
| 42 | w.set_clk48sel(pac::rcc::vals::Clk48sel::PLLQCLK); | ||
| 43 | }); | ||
| 42 | 44 | ||
| 43 | let driver = Driver::new(p.USB, Irqs, p.PA12, p.PA11); | 45 | let driver = Driver::new(p.USB, Irqs, p.PA12, p.PA11); |
| 44 | 46 | ||
