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

Merge pull request #2271 from embassy-rs/update-metapac4

Browse Source 
stm32: update stm32-metapac. Fixes USB on STM32WB.
This commit is contained in:
Dario Nieuwenhuis 2023-12-08 23:01:26 +00:00 committed by GitHub
commit e99649e37d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 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

@ -58,7 +58,7 @@ rand_core = "0.6.3"
sdio-host = "0.5.0" 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"
stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-019a5da1c47c092c199bc39a7f84fb444f2adcdf" } stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-8f5fcae8c289c1ad481cc3a2bb37db023a61599c" }
vcell = "0.1.3" vcell = "0.1.3"
bxcan = "0.7.0" bxcan = "0.7.0"
nb = "1.0.0" nb = "1.0.0"
@ -76,7 +76,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 = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-019a5da1c47c092c199bc39a7f84fb444f2adcdf", default-features = false, features = ["metadata"]} stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-8f5fcae8c289c1ad481cc3a2bb37db023a61599c", default-features = false, features = ["metadata"]}
[features] [features]

1
embassy-stm32/src/rcc/g4.rs
View File

@ -308,6 +308,7 @@ pub(crate) unsafe fn init(config: Config) {
sys: sys_clk, sys: sys_clk,
hclk1: ahb_freq, hclk1: ahb_freq,
hclk2: ahb_freq, hclk2: ahb_freq,
hclk3: ahb_freq,
pclk1: apb1_freq, pclk1: apb1_freq,
pclk1_tim: apb1_tim_freq, pclk1_tim: apb1_tim_freq,
pclk2: apb2_freq, pclk2: apb2_freq,

1
embassy-stm32/src/rcc/mod.rs
View File

@ -95,6 +95,7 @@ pub struct Clocks {
rcc_h7rm0433, rcc_h7rm0433,
rcc_h7ab, rcc_h7ab,
rcc_u5, rcc_u5,
rcc_g4,
rcc_wb, rcc_wb,
rcc_wl5, rcc_wl5,
rcc_wle rcc_wle