diff options
| author | Dario Nieuwenhuis <[email protected]> | 2024-11-06 18:55:30 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-11-06 18:55:30 +0000 |
| commit | 7a2f8399d362b659e426878ba5342fb4a99486ec (patch) | |
| tree | 6e567afef4343c7a460713037bf4b5ceb6f90ae4 | |
| parent | dbba79179571251494ba1dab3640834dfbc93d5d (diff) | |
| parent | e69be0a23bc182a78f2647cc1a739910a1a8e985 (diff) | |
Merge pull request #3511 from elagil/chore_upgrade_stm32_metapac
Upgrade STM32 metapac
| -rw-r--r-- | embassy-stm32/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/u5.rs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 6ab6e162e..e2ba4fd60 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -72,7 +72,7 @@ rand_core = "0.6.3" | |||
| 72 | sdio-host = "0.5.0" | 72 | sdio-host = "0.5.0" |
| 73 | critical-section = "1.1" | 73 | critical-section = "1.1" |
| 74 | #stm32-metapac = { version = "15" } | 74 | #stm32-metapac = { version = "15" } |
| 75 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-9b7414490b10ffbd5beb1b0dcf14adb018cbe37f" } | 75 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-7bb5f235587c3a6886a7be1c8f58fdf22c5257f3" } |
| 76 | 76 | ||
| 77 | vcell = "0.1.3" | 77 | vcell = "0.1.3" |
| 78 | nb = "1.0.0" | 78 | nb = "1.0.0" |
| @@ -101,7 +101,7 @@ proc-macro2 = "1.0.36" | |||
| 101 | quote = "1.0.15" | 101 | quote = "1.0.15" |
| 102 | 102 | ||
| 103 | #stm32-metapac = { version = "15", default-features = false, features = ["metadata"]} | 103 | #stm32-metapac = { version = "15", default-features = false, features = ["metadata"]} |
| 104 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-9b7414490b10ffbd5beb1b0dcf14adb018cbe37f", default-features = false, features = ["metadata"] } | 104 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-7bb5f235587c3a6886a7be1c8f58fdf22c5257f3", default-features = false, features = ["metadata"] } |
| 105 | 105 | ||
| 106 | [features] | 106 | [features] |
| 107 | default = ["rt"] | 107 | default = ["rt"] |
diff --git a/embassy-stm32/src/rcc/u5.rs b/embassy-stm32/src/rcc/u5.rs index 28545ca51..1e2bfe62d 100644 --- a/embassy-stm32/src/rcc/u5.rs +++ b/embassy-stm32/src/rcc/u5.rs | |||
| @@ -279,8 +279,10 @@ pub(crate) unsafe fn init(config: Config) { | |||
| 279 | hsi48: hsi48, | 279 | hsi48: hsi48, |
| 280 | rtc: rtc, | 280 | rtc: rtc, |
| 281 | hse: hse, | 281 | hse: hse, |
| 282 | hse_div_2: hse.map(|clk| clk / 2u32), | ||
| 282 | hsi: hsi, | 283 | hsi: hsi, |
| 283 | pll1_p: pll1.p, | 284 | pll1_p: pll1.p, |
| 285 | pll1_p_div_2: pll1.p.map(|clk| clk / 2u32), | ||
| 284 | pll1_q: pll1.q, | 286 | pll1_q: pll1.q, |
| 285 | pll1_r: pll1.r, | 287 | pll1_r: pll1.r, |
| 286 | pll2_p: pll2.p, | 288 | pll2_p: pll2.p, |
