max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32: update metapac, includes fix for OTG with 9 endpoints (H7)

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2023-06-27 23:49:30 +02:00
parent f5ca687e9b
commit ed493be869
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-stm32/Cargo.toml
View File

@ -57,7 +57,7 @@ sdio-host = "0.5.0"
embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true }
critical-section = "1.1" critical-section = "1.1"
atomic-polyfill = "1.0.1" atomic-polyfill = "1.0.1"
stm32-metapac = "10" stm32-metapac = "11"
vcell = "0.1.3" vcell = "0.1.3"
bxcan = "0.7.0" bxcan = "0.7.0"
nb = "1.0.0" nb = "1.0.0"
@ -74,7 +74,7 @@ critical-section = { version = "1.1", features = ["std"] }
[build-dependencies] [build-dependencies]
proc-macro2 = "1.0.36" proc-macro2 = "1.0.36"
quote = "1.0.15" quote = "1.0.15"
stm32-metapac = { version = "10", default-features = false, features = ["metadata"]} stm32-metapac = { version = "11", default-features = false, features = ["metadata"]}
[features] [features]
default = ["rt"] default = ["rt"]

4
embassy-stm32/src/rcc/l0.rs
View File

@ -1,7 +1,7 @@
use crate::pac::rcc::vals::{Hpre, Msirange, Plldiv, Pllmul, Pllsrc, Ppre, Sw}; use crate::pac::rcc::vals::{Hpre, Msirange, Plldiv, Pllmul, Pllsrc, Ppre, Sw};
use crate::pac::RCC; use crate::pac::RCC;
#[cfg(crs)] #[cfg(crs)]
use crate::pac::{CRS, SYSCFG}; use crate::pac::{crs, CRS, SYSCFG};
use crate::rcc::{set_freqs, Clocks}; use crate::rcc::{set_freqs, Clocks};
use crate::time::Hertz; use crate::time::Hertz;
@ -338,7 +338,7 @@ pub(crate) unsafe fn init(config: Config) {
CRS.cfgr().write(|w| CRS.cfgr().write(|w|
// Select LSE as synchronization source // Select LSE as synchronization source
w.set_syncsrc(0b01)); w.set_syncsrc(crs::vals::Syncsrc::LSE));
CRS.cr().modify(|w| { CRS.cr().modify(|w| {
w.set_autotrimen(true); w.set_autotrimen(true);
w.set_cen(true); w.set_cen(true);

4
examples/stm32g4/src/bin/usb_serial.rs
View File

@ -38,7 +38,9 @@ async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(config); let p = embassy_stm32::init(config);
info!("Hello World!"); info!("Hello World!");
pac::RCC.ccipr().write(|w| w.set_clk48sel(0b10)); pac::RCC.ccipr().write(|w| {
w.set_clk48sel(pac::rcc::vals::Clk48sel::PLLQCLK);
});
let driver = Driver::new(p.USB, Irqs, p.PA12, p.PA11); let driver = Driver::new(p.USB, Irqs, p.PA12, p.PA11);