diff options
| author | Dario Nieuwenhuis <[email protected]> | 2025-06-26 11:58:50 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-06-26 11:58:50 +0000 |
| commit | 06b160ac83b70b292ea92446a1eb69096b1c86ea (patch) | |
| tree | 005a2d33c53fe08db75c002ae4578604b6fa0d9b | |
| parent | dea59b1e6f63d943ab0bd3ddcf4dc18e72340770 (diff) | |
| parent | 51675e9bc767080b0e9c47f106ad3ef4251f9d8b (diff) | |
Merge pull request #4343 from leftger/feat/support-wba6xxx
Added STM32WBA6XXX devices as features
| -rwxr-xr-x | ci.sh | 2 | ||||
| -rw-r--r-- | embassy-stm32/Cargo.toml | 22 | ||||
| -rw-r--r-- | embassy-stm32/src/rtc/mod.rs | 2 |
3 files changed, 23 insertions, 3 deletions
| @@ -169,6 +169,8 @@ cargo batch \ | |||
| 169 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32h562ag,defmt,exti,time-driver-any,time \ | 169 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32h562ag,defmt,exti,time-driver-any,time \ |
| 170 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32wba50ke,defmt,exti,time-driver-any,time \ | 170 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32wba50ke,defmt,exti,time-driver-any,time \ |
| 171 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32wba55ug,defmt,exti,time-driver-any,time \ | 171 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32wba55ug,defmt,exti,time-driver-any,time \ |
| 172 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32wba62cg,defmt,exti,time-driver-any,time \ | ||
| 173 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32wba65ri,defmt,exti,time-driver-any,time \ | ||
| 172 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32u5f9zj,defmt,exti,time-driver-any,time \ | 174 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32u5f9zj,defmt,exti,time-driver-any,time \ |
| 173 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32u5g9nj,defmt,exti,time-driver-any,time \ | 175 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32u5g9nj,defmt,exti,time-driver-any,time \ |
| 174 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32wb35ce,defmt,exti,time-driver-any,time \ | 176 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32wb35ce,defmt,exti,time-driver-any,time \ |
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 4ee43e600..552113a79 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -81,7 +81,7 @@ futures-util = { version = "0.3.30", default-features = false } | |||
| 81 | sdio-host = "0.9.0" | 81 | sdio-host = "0.9.0" |
| 82 | critical-section = "1.1" | 82 | critical-section = "1.1" |
| 83 | #stm32-metapac = { version = "16" } | 83 | #stm32-metapac = { version = "16" } |
| 84 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-8a502cec14512a6b833beb8f6e15f4a7b5ee7c06" } | 84 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-0069be7389d0378d826003304d72a13008f3ebce" } |
| 85 | 85 | ||
| 86 | vcell = "0.1.3" | 86 | vcell = "0.1.3" |
| 87 | nb = "1.0.0" | 87 | nb = "1.0.0" |
| @@ -110,7 +110,7 @@ proc-macro2 = "1.0.36" | |||
| 110 | quote = "1.0.15" | 110 | quote = "1.0.15" |
| 111 | 111 | ||
| 112 | #stm32-metapac = { version = "16", default-features = false, features = ["metadata"]} | 112 | #stm32-metapac = { version = "16", default-features = false, features = ["metadata"]} |
| 113 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-8a502cec14512a6b833beb8f6e15f4a7b5ee7c06", default-features = false, features = ["metadata"] } | 113 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-0069be7389d0378d826003304d72a13008f3ebce", default-features = false, features = ["metadata"] } |
| 114 | 114 | ||
| 115 | [features] | 115 | [features] |
| 116 | default = ["rt"] | 116 | default = ["rt"] |
| @@ -1634,6 +1634,24 @@ stm32wba55he = [ "stm32-metapac/stm32wba55he" ] | |||
| 1634 | stm32wba55hg = [ "stm32-metapac/stm32wba55hg" ] | 1634 | stm32wba55hg = [ "stm32-metapac/stm32wba55hg" ] |
| 1635 | stm32wba55ue = [ "stm32-metapac/stm32wba55ue" ] | 1635 | stm32wba55ue = [ "stm32-metapac/stm32wba55ue" ] |
| 1636 | stm32wba55ug = [ "stm32-metapac/stm32wba55ug" ] | 1636 | stm32wba55ug = [ "stm32-metapac/stm32wba55ug" ] |
| 1637 | stm32wba62cg = [ "stm32-metapac/stm32wba62cg" ] | ||
| 1638 | stm32wba62ci = [ "stm32-metapac/stm32wba62ci" ] | ||
| 1639 | stm32wba62mg = [ "stm32-metapac/stm32wba62mg" ] | ||
| 1640 | stm32wba62mi = [ "stm32-metapac/stm32wba62mi" ] | ||
| 1641 | stm32wba62pg = [ "stm32-metapac/stm32wba62pg" ] | ||
| 1642 | stm32wba62pi = [ "stm32-metapac/stm32wba62pi" ] | ||
| 1643 | stm32wba63cg = [ "stm32-metapac/stm32wba63cg" ] | ||
| 1644 | stm32wba63ci = [ "stm32-metapac/stm32wba63ci" ] | ||
| 1645 | stm32wba64cg = [ "stm32-metapac/stm32wba64cg" ] | ||
| 1646 | stm32wba64ci = [ "stm32-metapac/stm32wba64ci" ] | ||
| 1647 | stm32wba65cg = [ "stm32-metapac/stm32wba65cg" ] | ||
| 1648 | stm32wba65ci = [ "stm32-metapac/stm32wba65ci" ] | ||
| 1649 | stm32wba65mg = [ "stm32-metapac/stm32wba65mg" ] | ||
| 1650 | stm32wba65mi = [ "stm32-metapac/stm32wba65mi" ] | ||
| 1651 | stm32wba65pg = [ "stm32-metapac/stm32wba65pg" ] | ||
| 1652 | stm32wba65pi = [ "stm32-metapac/stm32wba65pi" ] | ||
| 1653 | stm32wba65rg = [ "stm32-metapac/stm32wba65rg" ] | ||
| 1654 | stm32wba65ri = [ "stm32-metapac/stm32wba65ri" ] | ||
| 1637 | stm32wl54cc-cm4 = [ "stm32-metapac/stm32wl54cc-cm4", "_dual-core", "_core-cm4" ] | 1655 | stm32wl54cc-cm4 = [ "stm32-metapac/stm32wl54cc-cm4", "_dual-core", "_core-cm4" ] |
| 1638 | stm32wl54cc-cm0p = [ "stm32-metapac/stm32wl54cc-cm0p", "_dual-core", "_core-cm0p" ] | 1656 | stm32wl54cc-cm0p = [ "stm32-metapac/stm32wl54cc-cm0p", "_dual-core", "_core-cm0p" ] |
| 1639 | stm32wl54jc-cm4 = [ "stm32-metapac/stm32wl54jc-cm4", "_dual-core", "_core-cm4" ] | 1657 | stm32wl54jc-cm4 = [ "stm32-metapac/stm32wl54jc-cm4", "_dual-core", "_core-cm4" ] |
diff --git a/embassy-stm32/src/rtc/mod.rs b/embassy-stm32/src/rtc/mod.rs index 49f423f37..2c5aaca35 100644 --- a/embassy-stm32/src/rtc/mod.rs +++ b/embassy-stm32/src/rtc/mod.rs | |||
| @@ -25,7 +25,7 @@ use crate::time::Hertz; | |||
| 25 | ), | 25 | ), |
| 26 | path = "v2.rs" | 26 | path = "v2.rs" |
| 27 | )] | 27 | )] |
| 28 | #[cfg_attr(any(rtc_v3, rtc_v3u5, rtc_v3l5, rtc_v3h7rs), path = "v3.rs")] | 28 | #[cfg_attr(any(rtc_v3, rtc_v3u5, rtc_v3l5, rtc_v3h7rs, rtc_v3c0), path = "v3.rs")] |
| 29 | mod _version; | 29 | mod _version; |
| 30 | #[allow(unused_imports)] | 30 | #[allow(unused_imports)] |
| 31 | pub use _version::*; | 31 | pub use _version::*; |
