diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-12-08 23:01:26 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-08 23:01:26 +0000 |
| commit | e99649e37d668cba0e58134ab76e81e5440db6c1 (patch) | |
| tree | 67dafe6193970de4723173738c6771821e36732e | |
| parent | e0e5f66c4b9055c7fe400fd77c0b71fe06d9d98a (diff) | |
| parent | 4051aead0f50952d8b10242c00531e21f5b901f8 (diff) | |
Merge pull request #2271 from embassy-rs/update-metapac4
stm32: update stm32-metapac. Fixes USB on STM32WB.
| -rw-r--r-- | embassy-stm32/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/g4.rs | 1 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/mod.rs | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 979d15c0c..f8c4313e5 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -58,7 +58,7 @@ rand_core = "0.6.3" | |||
| 58 | sdio-host = "0.5.0" | 58 | sdio-host = "0.5.0" |
| 59 | embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } | 59 | embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } |
| 60 | critical-section = "1.1" | 60 | critical-section = "1.1" |
| 61 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-019a5da1c47c092c199bc39a7f84fb444f2adcdf" } | 61 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-8f5fcae8c289c1ad481cc3a2bb37db023a61599c" } |
| 62 | vcell = "0.1.3" | 62 | vcell = "0.1.3" |
| 63 | bxcan = "0.7.0" | 63 | bxcan = "0.7.0" |
| 64 | nb = "1.0.0" | 64 | nb = "1.0.0" |
| @@ -76,7 +76,7 @@ critical-section = { version = "1.1", features = ["std"] } | |||
| 76 | [build-dependencies] | 76 | [build-dependencies] |
| 77 | proc-macro2 = "1.0.36" | 77 | proc-macro2 = "1.0.36" |
| 78 | quote = "1.0.15" | 78 | quote = "1.0.15" |
| 79 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-019a5da1c47c092c199bc39a7f84fb444f2adcdf", default-features = false, features = ["metadata"]} | 79 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-8f5fcae8c289c1ad481cc3a2bb37db023a61599c", default-features = false, features = ["metadata"]} |
| 80 | 80 | ||
| 81 | 81 | ||
| 82 | [features] | 82 | [features] |
diff --git a/embassy-stm32/src/rcc/g4.rs b/embassy-stm32/src/rcc/g4.rs index 7af05b485..fca364c21 100644 --- a/embassy-stm32/src/rcc/g4.rs +++ b/embassy-stm32/src/rcc/g4.rs | |||
| @@ -308,6 +308,7 @@ pub(crate) unsafe fn init(config: Config) { | |||
| 308 | sys: sys_clk, | 308 | sys: sys_clk, |
| 309 | hclk1: ahb_freq, | 309 | hclk1: ahb_freq, |
| 310 | hclk2: ahb_freq, | 310 | hclk2: ahb_freq, |
| 311 | hclk3: ahb_freq, | ||
| 311 | pclk1: apb1_freq, | 312 | pclk1: apb1_freq, |
| 312 | pclk1_tim: apb1_tim_freq, | 313 | pclk1_tim: apb1_tim_freq, |
| 313 | pclk2: apb2_freq, | 314 | pclk2: apb2_freq, |
diff --git a/embassy-stm32/src/rcc/mod.rs b/embassy-stm32/src/rcc/mod.rs index 40a5a619d..dc829a9ad 100644 --- a/embassy-stm32/src/rcc/mod.rs +++ b/embassy-stm32/src/rcc/mod.rs | |||
| @@ -95,6 +95,7 @@ pub struct Clocks { | |||
| 95 | rcc_h7rm0433, | 95 | rcc_h7rm0433, |
| 96 | rcc_h7ab, | 96 | rcc_h7ab, |
| 97 | rcc_u5, | 97 | rcc_u5, |
| 98 | rcc_g4, | ||
| 98 | rcc_wb, | 99 | rcc_wb, |
| 99 | rcc_wl5, | 100 | rcc_wl5, |
| 100 | rcc_wle | 101 | rcc_wle |
