nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-21 22:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3511 from elagil/chore_upgrade_stm32_metapac

Browse Source 
Upgrade STM32 metapac
This commit is contained in:
Dario Nieuwenhuis 2024-11-06 18:55:30 +00:00 committed by GitHub
commit 7a2f8399d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-stm32/Cargo.toml
View File

@ -72,7 +72,7 @@ rand_core = "0.6.3"
sdio-host = "0.5.0" sdio-host = "0.5.0"
critical-section = "1.1" critical-section = "1.1"
#stm32-metapac = { version = "15" } #stm32-metapac = { version = "15" }
stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-9b7414490b10ffbd5beb1b0dcf14adb018cbe37f" } stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-7bb5f235587c3a6886a7be1c8f58fdf22c5257f3" }
vcell = "0.1.3" vcell = "0.1.3"
nb = "1.0.0" nb = "1.0.0"
@ -101,7 +101,7 @@ proc-macro2 = "1.0.36"
quote = "1.0.15" quote = "1.0.15"
#stm32-metapac = { version = "15", default-features = false, features = ["metadata"]} #stm32-metapac = { version = "15", default-features = false, features = ["metadata"]}
stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-9b7414490b10ffbd5beb1b0dcf14adb018cbe37f", default-features = false, features = ["metadata"] } stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-7bb5f235587c3a6886a7be1c8f58fdf22c5257f3", default-features = false, features = ["metadata"] }
[features] [features]
default = ["rt"] default = ["rt"]

2
embassy-stm32/src/rcc/u5.rs
View File

@ -279,8 +279,10 @@ pub(crate) unsafe fn init(config: Config) {
hsi48: hsi48, hsi48: hsi48,
rtc: rtc, rtc: rtc,
hse: hse, hse: hse,
hse_div_2: hse.map(|clk| clk / 2u32),
hsi: hsi, hsi: hsi,
pll1_p: pll1.p, pll1_p: pll1.p,
pll1_p_div_2: pll1.p.map(|clk| clk / 2u32),
pll1_q: pll1.q, pll1_q: pll1.q,
pll1_r: pll1.r, pll1_r: pll1.r,
pll2_p: pll2.p, pll2_p: pll2.p,