Initial WB55 support.

rubdos · rubdos · commit e970a679039d · 2019-09-27T18:01:27.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -237,6 +237,19 @@ stm32l4s9 = [
     "drone-stm32-map-periph-tim/stm32l4s9",
     "drone-stm32-map-periph-uart/stm32l4s9",
 ]
+stm32wbx5 = [
+    "drone-cortex-m/cortex_m4f_r0p1",
+    "drone-stm32-map-pieces/stm32wbx5",
+    "drone-stm32-map-periph-adc/stm32wbx5",
+    "drone-stm32-map-periph-dma/stm32wbx5",
+    "drone-stm32-map-periph-exti/stm32wbx5",
+    "drone-stm32-map-periph-gpio/stm32wbx5",
+    "drone-stm32-map-periph-i2c/stm32wbx5",
+    "drone-stm32-map-periph-rtc/stm32wbx5",
+    "drone-stm32-map-periph-spi/stm32wbx5",
+    "drone-stm32-map-periph-tim/stm32wbx5",
+    "drone-stm32-map-periph-uart/stm32wbx5",
+]
 
 [dependencies.drone-cortex-m]
 version = "0.10.0"
diff --git a/Justfile b/Justfile
@@ -38,6 +38,7 @@ check-all:
 	cargo check --package drone-stm32-map --features stm32l4s7 --target thumbv7em-none-eabihf
 	cargo check --package drone-stm32-map --features stm32l4r9 --target thumbv7em-none-eabihf
 	cargo check --package drone-stm32-map --features stm32l4s9 --target thumbv7em-none-eabihf
+	cargo check --package drone-stm32-map --features stm32wbx5 --target thumbv7em-none-eabihf
 
 # Generate the docs
 doc:
diff --git a/README.md b/README.md
@@ -37,6 +37,7 @@ a drop-in replacement for it.
 | `stm32l4s7` | ARM® Cortex®-M4F r0p1 | [RM0432](https://www.st.com/resource/en/reference_manual/dm00310109.pdf) |
 | `stm32l4r9` | ARM® Cortex®-M4F r0p1 | [RM0432](https://www.st.com/resource/en/reference_manual/dm00310109.pdf) |
 | `stm32l4s9` | ARM® Cortex®-M4F r0p1 | [RM0432](https://www.st.com/resource/en/reference_manual/dm00310109.pdf) |
+| `stm32wbx5` | ARM® Cortex®-M4F r0p1 | [RM0434](https://www.st.com/resource/en/reference_manual/dm00318631.pdf) |
 
 **NOTE** Exactly one cargo feature should be selected based on the device
 model.
diff --git a/src/periph/adc/Cargo.toml b/src/periph/adc/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4r9
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s5"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s7"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s9"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32wbx5"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/periph/dma/Cargo.toml b/src/periph/dma/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4r9
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s5"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s7"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s9"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32wbx5"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/periph/exti/Cargo.toml b/src/periph/exti/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4r9
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s5"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s7"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s9"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32wbx5"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/periph/gpio/Cargo.toml b/src/periph/gpio/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4r9
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s5"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s7"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s9"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32wbx5"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/periph/gpio/lib.rs b/src/periph/gpio/lib.rs
@@ -40,7 +40,8 @@ periph! {
             feature = "stm32l4r9",
             feature = "stm32l4s5",
             feature = "stm32l4s7",
-            feature = "stm32l4s9"
+            feature = "stm32l4s9",
+            feature = "stm32wbx5",
         ))]
         BUSSMENR {
             0x20 RwRegBitBand Shared;
@@ -60,7 +61,8 @@ periph! {
             feature = "stm32l4r9",
             feature = "stm32l4s5",
             feature = "stm32l4s7",
-            feature = "stm32l4s9"
+            feature = "stm32l4s9",
+            feature = "stm32wbx5",
         ))]
         AFRL {
             0x20 RwReg;
@@ -84,7 +86,8 @@ periph! {
             feature = "stm32l4r9",
             feature = "stm32l4s5",
             feature = "stm32l4s7",
-            feature = "stm32l4s9"
+            feature = "stm32l4s9",
+            feature = "stm32wbx5",
         ))]
         AFRH {
             0x20 RwReg;
@@ -104,7 +107,8 @@ periph! {
             feature = "stm32l4r9",
             feature = "stm32l4s5",
             feature = "stm32l4s7",
-            feature = "stm32l4s9"
+            feature = "stm32l4s9",
+            feature = "stm32wbx5",
         ))]
         ASCR {
             0x20 RwReg Option;
diff --git a/src/periph/i2c/Cargo.toml b/src/periph/i2c/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4r9
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s5"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s7"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s9"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32wbx5"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/periph/rtc/Cargo.toml b/src/periph/rtc/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4r9
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s5"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s7"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s9"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32wbx5"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/periph/spi/Cargo.toml b/src/periph/spi/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4r9
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s5"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s7"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s9"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32wbx5"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/periph/tim/Cargo.toml b/src/periph/tim/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4r9
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s5"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s7"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s9"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32wbx5"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/periph/uart/Cargo.toml b/src/periph/uart/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4r9
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s5"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s7"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32l4s9"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1", "drone-stm32-map-pieces/stm32wbx5"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/1/Cargo.toml b/src/pieces/1/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/10/Cargo.toml b/src/pieces/10/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/11/Cargo.toml b/src/pieces/11/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/12/Cargo.toml b/src/pieces/12/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/2/Cargo.toml b/src/pieces/2/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/3/Cargo.toml b/src/pieces/3/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/4/Cargo.toml b/src/pieces/4/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/5/Cargo.toml b/src/pieces/5/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/6/Cargo.toml b/src/pieces/6/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/7/Cargo.toml b/src/pieces/7/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/8/Cargo.toml b/src/pieces/8/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/9/Cargo.toml b/src/pieces/9/Cargo.toml
@@ -31,6 +31,7 @@ stm32l4r9 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s7 = ["drone-cortex-m/cortex_m4f_r0p1"]
 stm32l4s9 = ["drone-cortex-m/cortex_m4f_r0p1"]
+stm32wbx5 = ["drone-cortex-m/cortex_m4f_r0p1"]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/src/pieces/Cargo.toml b/src/pieces/Cargo.toml
@@ -255,6 +255,21 @@ stm32l4s9 = [
     "drone-stm32-map-pieces-11/stm32l4s9",
     "drone-stm32-map-pieces-12/stm32l4s9",
 ]
+stm32wbx5 = [
+    "drone-cortex-m/cortex_m4f_r0p1",
+    "drone-stm32-map-pieces-1/stm32wbx5",
+    "drone-stm32-map-pieces-2/stm32wbx5",
+    "drone-stm32-map-pieces-3/stm32wbx5",
+    "drone-stm32-map-pieces-4/stm32wbx5",
+    "drone-stm32-map-pieces-5/stm32wbx5",
+    "drone-stm32-map-pieces-6/stm32wbx5",
+    "drone-stm32-map-pieces-7/stm32wbx5",
+    "drone-stm32-map-pieces-8/stm32wbx5",
+    "drone-stm32-map-pieces-9/stm32wbx5",
+    "drone-stm32-map-pieces-10/stm32wbx5",
+    "drone-stm32-map-pieces-11/stm32wbx5",
+    "drone-stm32-map-pieces-12/stm32wbx5",
+]
 
 [dependencies.drone-core]
 version = "0.10.0"
diff --git a/svd/src/lib.rs b/svd/src/lib.rs
@@ -65,6 +65,8 @@ macro_rules! svd_feature {
             "stm32l4s7"
         } else if cfg!(feature = "stm32l4s9") {
             "stm32l4s9"
+        } else if cfg!(feature = "stm32wbx5") {
+            "stm32wbx5"
         } else {
             ""
         }
@@ -122,10 +124,16 @@ fn svd_deserialize(feature: &str) -> Result<Device, Error> {
         "stm32l4s5" => patch_stm32l4plus(parse_svd("STM32L4S5.svd")?),
         "stm32l4s7" => patch_stm32l4plus(parse_svd("STM32L4S7.svd")?),
         "stm32l4s9" => patch_stm32l4plus(parse_svd("STM32L4S9.svd")?),
+        "stm32wbx5" => patch_stm32wbx5(parse_svd("STM32WBxx_CM4.svd")?),
         _ => Ok(Device::new("Generic STM32".to_string())),
     }
 }
 
+fn patch_stm32wbx5(mut dev: Device) -> Result<Device, Error> {
+    fix_802154(&mut dev)?;
+    Ok(dev)
+}
+
 fn patch_stm32f102(mut dev: Device) -> Result<Device, Error> {
     fix_spi2_1(&mut dev)?;
     Ok(dev)
@@ -232,6 +240,12 @@ fn patch_stm32l4plus(mut dev: Device) -> Result<Device, Error> {
     Ok(dev)
 }
 
+fn fix_802154(dev: &mut Device) -> Result<(), Error> {
+    dev.field_mut("PWR", "SR1", "802WUF").name = "IEEE802WUF".to_string();
+    dev.field_mut("PWR", "C2CR1", "802EWKUP").name = "IEEE802EWKUP".to_string();
+    Ok(())
+}
+
 fn add_dmamux(dev: &mut Device) -> Result<(), Error> {
     dev.add_peripheral(serde_xml_rs::deserialize(
         read_svd("patch/add_dmamux.xml")?.as_bytes(),
diff --git a/svd_files/STM32WBxx_CM4.svd b/svd_files/STM32WBxx_CM4.svd
