diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-04-08 03:32:29 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-04-08 03:32:29 +0200 |
| commit | b40c8342ecff2b7f5881cb1f54607d70b5331ae3 (patch) | |
| tree | 68de96e3c66e3fd077aae60aa002f2b2941ee4af | |
| parent | 05fecb3defaee1454757dc6f9d2ebed72df146a4 (diff) | |
| parent | 0c07d0375406c6079e4b143cd7ac380d0a2bfd5f (diff) | |
Merge pull request #704 from embassy-rs/stm32wlwb-more
Add missing stm32wl/stm32wb chips except stm32wle
| -rwxr-xr-x | ci.sh | 6 | ||||
| -rw-r--r-- | embassy-stm32/Cargo.toml | 11 | ||||
| -rw-r--r-- | examples/stm32wb/.cargo/config.toml (renamed from examples/stm32wb55/.cargo/config.toml) | 0 | ||||
| -rw-r--r-- | examples/stm32wb/Cargo.toml (renamed from examples/stm32wb55/Cargo.toml) | 2 | ||||
| -rw-r--r-- | examples/stm32wb/build.rs (renamed from examples/stm32wb55/build.rs) | 0 | ||||
| -rw-r--r-- | examples/stm32wb/memory.x (renamed from examples/stm32wb55/memory.x) | 0 | ||||
| -rw-r--r-- | examples/stm32wb/src/bin/blinky.rs (renamed from examples/stm32wb55/src/bin/blinky.rs) | 0 | ||||
| -rw-r--r-- | examples/stm32wb/src/bin/button_exti.rs (renamed from examples/stm32wb55/src/bin/button_exti.rs) | 0 | ||||
| -rw-r--r-- | examples/stm32wl/.cargo/config.toml (renamed from examples/stm32wl55/.cargo/config.toml) | 0 | ||||
| -rw-r--r-- | examples/stm32wl/Cargo.toml (renamed from examples/stm32wl55/Cargo.toml) | 2 | ||||
| -rw-r--r-- | examples/stm32wl/build.rs (renamed from examples/stm32wl55/build.rs) | 0 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/blinky.rs (renamed from examples/stm32wl55/src/bin/blinky.rs) | 0 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/button.rs (renamed from examples/stm32wl55/src/bin/button.rs) | 0 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/button_exti.rs (renamed from examples/stm32wl55/src/bin/button_exti.rs) | 0 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/lorawan.rs (renamed from examples/stm32wl55/src/bin/lorawan.rs) | 0 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/subghz.rs (renamed from examples/stm32wl55/src/bin/subghz.rs) | 0 | ||||
| -rw-r--r-- | stm32-gen-features/src/lib.rs | 18 |
17 files changed, 19 insertions, 20 deletions
| @@ -48,6 +48,7 @@ cargo batch \ | |||
| 48 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h755zi-cm7,defmt,exti,time-driver-any,unstable-traits \ | 48 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h755zi-cm7,defmt,exti,time-driver-any,unstable-traits \ |
| 49 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h7b3ai,defmt,exti,time-driver-any,unstable-traits \ | 49 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h7b3ai,defmt,exti,time-driver-any,unstable-traits \ |
| 50 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l476vg,defmt,exti,time-driver-any,unstable-traits \ | 50 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l476vg,defmt,exti,time-driver-any,unstable-traits \ |
| 51 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32wb15cc,defmt,exti,time-driver-any,unstable-traits \ | ||
| 51 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l072cz,defmt,exti,time-driver-any,unstable-traits \ | 52 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l072cz,defmt,exti,time-driver-any,unstable-traits \ |
| 52 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l041f6,defmt,exti,time-driver-any,unstable-traits \ | 53 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l041f6,defmt,exti,time-driver-any,unstable-traits \ |
| 53 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features nightly,stm32l151cb-a,defmt,exti,time-driver-any,unstable-traits \ | 54 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features nightly,stm32l151cb-a,defmt,exti,time-driver-any,unstable-traits \ |
| @@ -55,6 +56,7 @@ cargo batch \ | |||
| 55 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32g0c1ve,defmt,exti,time-driver-any,unstable-traits \ | 56 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32g0c1ve,defmt,exti,time-driver-any,unstable-traits \ |
| 56 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features nightly,stm32f217zg,defmt,exti,time-driver-any,unstable-traits \ | 57 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features nightly,stm32f217zg,defmt,exti,time-driver-any,unstable-traits \ |
| 57 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features nightly,stm32l552ze,defmt,exti,time-driver-any,unstable-traits \ | 58 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features nightly,stm32l552ze,defmt,exti,time-driver-any,unstable-traits \ |
| 59 | --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32wl54jc-cm0p,defmt,exti,time-driver-any,unstable-traits \ | ||
| 58 | --- build --release --manifest-path docs/modules/ROOT/examples/basic/Cargo.toml --target thumbv7em-none-eabi \ | 60 | --- build --release --manifest-path docs/modules/ROOT/examples/basic/Cargo.toml --target thumbv7em-none-eabi \ |
| 59 | --- build --release --manifest-path docs/modules/ROOT/examples/layer-by-layer/blinky-pac/Cargo.toml --target thumbv7em-none-eabi \ | 61 | --- build --release --manifest-path docs/modules/ROOT/examples/layer-by-layer/blinky-pac/Cargo.toml --target thumbv7em-none-eabi \ |
| 60 | --- build --release --manifest-path docs/modules/ROOT/examples/layer-by-layer/blinky-hal/Cargo.toml --target thumbv7em-none-eabi \ | 62 | --- build --release --manifest-path docs/modules/ROOT/examples/layer-by-layer/blinky-hal/Cargo.toml --target thumbv7em-none-eabi \ |
| @@ -76,8 +78,8 @@ cargo batch \ | |||
| 76 | --- build --release --manifest-path examples/stm32l1/Cargo.toml --target thumbv7m-none-eabi --out-dir out/examples/stm32l1 \ | 78 | --- build --release --manifest-path examples/stm32l1/Cargo.toml --target thumbv7m-none-eabi --out-dir out/examples/stm32l1 \ |
| 77 | --- build --release --manifest-path examples/stm32l4/Cargo.toml --target thumbv7em-none-eabi --out-dir out/examples/stm32l4 \ | 79 | --- build --release --manifest-path examples/stm32l4/Cargo.toml --target thumbv7em-none-eabi --out-dir out/examples/stm32l4 \ |
| 78 | --- build --release --manifest-path examples/stm32u5/Cargo.toml --target thumbv8m.main-none-eabihf --out-dir out/examples/stm32u5 \ | 80 | --- build --release --manifest-path examples/stm32u5/Cargo.toml --target thumbv8m.main-none-eabihf --out-dir out/examples/stm32u5 \ |
| 79 | --- build --release --manifest-path examples/stm32wb55/Cargo.toml --target thumbv7em-none-eabihf --out-dir out/examples/stm32wb55 \ | 81 | --- build --release --manifest-path examples/stm32wb/Cargo.toml --target thumbv7em-none-eabihf --out-dir out/examples/stm32wb \ |
| 80 | --- build --release --manifest-path examples/stm32wl55/Cargo.toml --target thumbv7em-none-eabihf --out-dir out/examples/stm32wl55 \ | 82 | --- build --release --manifest-path examples/stm32wl/Cargo.toml --target thumbv7em-none-eabihf --out-dir out/examples/stm32wl \ |
| 81 | --- build --release --manifest-path examples/wasm/Cargo.toml --target wasm32-unknown-unknown --out-dir out/examples/wasm \ | 83 | --- build --release --manifest-path examples/wasm/Cargo.toml --target wasm32-unknown-unknown --out-dir out/examples/wasm \ |
| 82 | --- build --release --manifest-path tests/stm32/Cargo.toml --target thumbv7m-none-eabi --features stm32f103c8 --out-dir out/tests/bluepill-stm32f103c8 \ | 84 | --- build --release --manifest-path tests/stm32/Cargo.toml --target thumbv7m-none-eabi --features stm32f103c8 --out-dir out/tests/bluepill-stm32f103c8 \ |
| 83 | --- build --release --manifest-path tests/stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32f429zi --out-dir out/tests/nucleo-stm32f429zi \ | 85 | --- build --release --manifest-path tests/stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32f429zi --out-dir out/tests/nucleo-stm32f429zi \ |
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 5579631af..030782466 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -1316,6 +1316,12 @@ stm32u585ri = [ "stm32-metapac/stm32u585ri" ] | |||
| 1316 | stm32u585vi = [ "stm32-metapac/stm32u585vi" ] | 1316 | stm32u585vi = [ "stm32-metapac/stm32u585vi" ] |
| 1317 | stm32u585ze = [ "stm32-metapac/stm32u585ze" ] | 1317 | stm32u585ze = [ "stm32-metapac/stm32u585ze" ] |
| 1318 | stm32u585zi = [ "stm32-metapac/stm32u585zi" ] | 1318 | stm32u585zi = [ "stm32-metapac/stm32u585zi" ] |
| 1319 | stm32wb10cc = [ "stm32-metapac/stm32wb10cc" ] | ||
| 1320 | stm32wb15cc = [ "stm32-metapac/stm32wb15cc" ] | ||
| 1321 | stm32wb30ce = [ "stm32-metapac/stm32wb30ce" ] | ||
| 1322 | stm32wb35cc = [ "stm32-metapac/stm32wb35cc" ] | ||
| 1323 | stm32wb35ce = [ "stm32-metapac/stm32wb35ce" ] | ||
| 1324 | stm32wb50cg = [ "stm32-metapac/stm32wb50cg" ] | ||
| 1319 | stm32wb55cc = [ "stm32-metapac/stm32wb55cc" ] | 1325 | stm32wb55cc = [ "stm32-metapac/stm32wb55cc" ] |
| 1320 | stm32wb55ce = [ "stm32-metapac/stm32wb55ce" ] | 1326 | stm32wb55ce = [ "stm32-metapac/stm32wb55ce" ] |
| 1321 | stm32wb55cg = [ "stm32-metapac/stm32wb55cg" ] | 1327 | stm32wb55cg = [ "stm32-metapac/stm32wb55cg" ] |
| @@ -1326,6 +1332,11 @@ stm32wb55vc = [ "stm32-metapac/stm32wb55vc" ] | |||
| 1326 | stm32wb55ve = [ "stm32-metapac/stm32wb55ve" ] | 1332 | stm32wb55ve = [ "stm32-metapac/stm32wb55ve" ] |
| 1327 | stm32wb55vg = [ "stm32-metapac/stm32wb55vg" ] | 1333 | stm32wb55vg = [ "stm32-metapac/stm32wb55vg" ] |
| 1328 | stm32wb55vy = [ "stm32-metapac/stm32wb55vy" ] | 1334 | stm32wb55vy = [ "stm32-metapac/stm32wb55vy" ] |
| 1335 | stm32wb5mmg = [ "stm32-metapac/stm32wb5mmg" ] | ||
| 1336 | stm32wl54cc-cm4 = [ "stm32-metapac/stm32wl54cc-cm4" ] | ||
| 1337 | stm32wl54cc-cm0p = [ "stm32-metapac/stm32wl54cc-cm0p" ] | ||
| 1338 | stm32wl54jc-cm4 = [ "stm32-metapac/stm32wl54jc-cm4" ] | ||
| 1339 | stm32wl54jc-cm0p = [ "stm32-metapac/stm32wl54jc-cm0p" ] | ||
| 1329 | stm32wl55cc-cm4 = [ "stm32-metapac/stm32wl55cc-cm4" ] | 1340 | stm32wl55cc-cm4 = [ "stm32-metapac/stm32wl55cc-cm4" ] |
| 1330 | stm32wl55cc-cm0p = [ "stm32-metapac/stm32wl55cc-cm0p" ] | 1341 | stm32wl55cc-cm0p = [ "stm32-metapac/stm32wl55cc-cm0p" ] |
| 1331 | stm32wl55jc-cm4 = [ "stm32-metapac/stm32wl55jc-cm4" ] | 1342 | stm32wl55jc-cm4 = [ "stm32-metapac/stm32wl55jc-cm4" ] |
diff --git a/examples/stm32wb55/.cargo/config.toml b/examples/stm32wb/.cargo/config.toml index 509517a2d..509517a2d 100644 --- a/examples/stm32wb55/.cargo/config.toml +++ b/examples/stm32wb/.cargo/config.toml | |||
diff --git a/examples/stm32wb55/Cargo.toml b/examples/stm32wb/Cargo.toml index 8997d411d..d797b9c78 100644 --- a/examples/stm32wb55/Cargo.toml +++ b/examples/stm32wb/Cargo.toml | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | [package] | 1 | [package] |
| 2 | authors = ["Dario Nieuwenhuis <[email protected]>"] | 2 | authors = ["Dario Nieuwenhuis <[email protected]>"] |
| 3 | edition = "2018" | 3 | edition = "2018" |
| 4 | name = "embassy-stm32wb55-examples" | 4 | name = "embassy-stm32wb-examples" |
| 5 | version = "0.1.0" | 5 | version = "0.1.0" |
| 6 | resolver = "2" | 6 | resolver = "2" |
| 7 | 7 | ||
diff --git a/examples/stm32wb55/build.rs b/examples/stm32wb/build.rs index 30691aa97..30691aa97 100644 --- a/examples/stm32wb55/build.rs +++ b/examples/stm32wb/build.rs | |||
diff --git a/examples/stm32wb55/memory.x b/examples/stm32wb/memory.x index 2b4dcce34..2b4dcce34 100644 --- a/examples/stm32wb55/memory.x +++ b/examples/stm32wb/memory.x | |||
diff --git a/examples/stm32wb55/src/bin/blinky.rs b/examples/stm32wb/src/bin/blinky.rs index 59324161a..59324161a 100644 --- a/examples/stm32wb55/src/bin/blinky.rs +++ b/examples/stm32wb/src/bin/blinky.rs | |||
diff --git a/examples/stm32wb55/src/bin/button_exti.rs b/examples/stm32wb/src/bin/button_exti.rs index a30a4a216..a30a4a216 100644 --- a/examples/stm32wb55/src/bin/button_exti.rs +++ b/examples/stm32wb/src/bin/button_exti.rs | |||
diff --git a/examples/stm32wl55/.cargo/config.toml b/examples/stm32wl/.cargo/config.toml index 60076e06b..60076e06b 100644 --- a/examples/stm32wl55/.cargo/config.toml +++ b/examples/stm32wl/.cargo/config.toml | |||
diff --git a/examples/stm32wl55/Cargo.toml b/examples/stm32wl/Cargo.toml index 97b38aeab..e95a009ce 100644 --- a/examples/stm32wl55/Cargo.toml +++ b/examples/stm32wl/Cargo.toml | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | [package] | 1 | [package] |
| 2 | authors = ["Dario Nieuwenhuis <[email protected]>", "Ulf Lilleengen <[email protected]>"] | 2 | authors = ["Dario Nieuwenhuis <[email protected]>", "Ulf Lilleengen <[email protected]>"] |
| 3 | edition = "2018" | 3 | edition = "2018" |
| 4 | name = "embassy-stm32wl55-examples" | 4 | name = "embassy-stm32wl-examples" |
| 5 | version = "0.1.0" | 5 | version = "0.1.0" |
| 6 | resolver = "2" | 6 | resolver = "2" |
| 7 | 7 | ||
diff --git a/examples/stm32wl55/build.rs b/examples/stm32wl/build.rs index 8cd32d7ed..8cd32d7ed 100644 --- a/examples/stm32wl55/build.rs +++ b/examples/stm32wl/build.rs | |||
diff --git a/examples/stm32wl55/src/bin/blinky.rs b/examples/stm32wl/src/bin/blinky.rs index 78079bfd3..78079bfd3 100644 --- a/examples/stm32wl55/src/bin/blinky.rs +++ b/examples/stm32wl/src/bin/blinky.rs | |||
diff --git a/examples/stm32wl55/src/bin/button.rs b/examples/stm32wl/src/bin/button.rs index f80b9ab4f..f80b9ab4f 100644 --- a/examples/stm32wl55/src/bin/button.rs +++ b/examples/stm32wl/src/bin/button.rs | |||
diff --git a/examples/stm32wl55/src/bin/button_exti.rs b/examples/stm32wl/src/bin/button_exti.rs index 9a427c2d3..9a427c2d3 100644 --- a/examples/stm32wl55/src/bin/button_exti.rs +++ b/examples/stm32wl/src/bin/button_exti.rs | |||
diff --git a/examples/stm32wl55/src/bin/lorawan.rs b/examples/stm32wl/src/bin/lorawan.rs index db4725630..db4725630 100644 --- a/examples/stm32wl55/src/bin/lorawan.rs +++ b/examples/stm32wl/src/bin/lorawan.rs | |||
diff --git a/examples/stm32wl55/src/bin/subghz.rs b/examples/stm32wl/src/bin/subghz.rs index 562e25ac0..562e25ac0 100644 --- a/examples/stm32wl55/src/bin/subghz.rs +++ b/examples/stm32wl/src/bin/subghz.rs | |||
diff --git a/stm32-gen-features/src/lib.rs b/stm32-gen-features/src/lib.rs index c9768cdbb..bef11c2ad 100644 --- a/stm32-gen-features/src/lib.rs +++ b/stm32-gen-features/src/lib.rs | |||
| @@ -3,22 +3,8 @@ | |||
| 3 | use std::{iter::FilterMap, path::Path, slice::Iter}; | 3 | use std::{iter::FilterMap, path::Path, slice::Iter}; |
| 4 | 4 | ||
| 5 | const SUPPORTED_FAMILIES: &[&str] = &[ | 5 | const SUPPORTED_FAMILIES: &[&str] = &[ |
| 6 | "stm32f0", | 6 | "stm32f0", "stm32f1", "stm32f2", "stm32f3", "stm32f4", "stm32f7", "stm32g0", "stm32g4", |
| 7 | "stm32f1", | 7 | "stm32l0", "stm32l1", "stm32l4", "stm32l5", "stm32h7", "stm32u5", "stm32wb", "stm32wl5", |
| 8 | "stm32f2", | ||
| 9 | "stm32f3", | ||
| 10 | "stm32f4", | ||
| 11 | "stm32f7", | ||
| 12 | "stm32g0", | ||
| 13 | "stm32g4", | ||
| 14 | "stm32l0", | ||
| 15 | "stm32l1", | ||
| 16 | "stm32l4", | ||
| 17 | "stm32l5", | ||
| 18 | "stm32h7", | ||
| 19 | "stm32u5", | ||
| 20 | "stm32wb55", | ||
| 21 | "stm32wl55", | ||
| 22 | ]; | 8 | ]; |
| 23 | 9 | ||
| 24 | const SEPARATOR_START: &str = "# BEGIN GENERATED FEATURES\n"; | 10 | const SEPARATOR_START: &str = "# BEGIN GENERATED FEATURES\n"; |
