v0.6.0

Author: adamgreig

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [v0.6.0] - 2021-10-03
+
+* Update stm32-rs to 0.14.0
+
 ## [v0.5.0] - 2021-01-08
 
 * Update stm32-rs to 0.12.1
@@ -33,7 +37,9 @@
 
 * Initial release
 
-[Unreleased]: https://github.com/adamgreig/stm32ral/compare/v0.4.1...HEAD
+[Unreleased]: https://github.com/adamgreig/stm32ral/compare/v0.6.0...HEAD
+[v0.6.0]: https://github.com/adamgreig/stm32ral/compare/v0.5.0...v0.6.0
+[v0.5.0]: https://github.com/adamgreig/stm32ral/compare/v0.4.1...v0.5.0
 [v0.4.1]: https://github.com/adamgreig/stm32ral/compare/v0.4.0...v0.4.1
 [v0.4.0]: https://github.com/adamgreig/stm32ral/compare/v0.3.1...v0.4.0
 [v0.3.0]: https://github.com/adamgreig/stm32ral/compare/v0.3.0...v0.3.1

Cargo.toml

@@ -14,7 +14,7 @@ edition = "2018"
 exclude = ["/stm32-rs"]
 
 # Change version in stm32ral.py, not in Cargo.toml!
-version = "0.5.0"
+version = "0.6.0"
 
 [package.metadata.docs.rs]
 features = ["doc"]
@@ -79,37 +79,52 @@ stm32f7x9 = ["armv7em"]
 stm32g030 = ["armv6m"]
 stm32g031 = ["armv6m"]
 stm32g041 = ["armv6m"]
+stm32g050 = ["armv6m"]
+stm32g051 = ["armv6m"]
+stm32g061 = ["armv6m"]
 stm32g070 = ["armv6m"]
 stm32g071 = ["armv6m"]
 stm32g07x = ["armv6m"]
 stm32g081 = ["armv6m"]
+stm32g0b0 = ["armv6m"]
+stm32g0b1 = ["armv6m"]
+stm32g0c1 = ["armv6m"]
 stm32g431 = ["armv7em"]
 stm32g441 = ["armv7em"]
 stm32g471 = ["armv7em"]
 stm32g473 = ["armv7em"]
 stm32g474 = ["armv7em"]
 stm32g483 = ["armv7em"]
 stm32g484 = ["armv7em"]
+stm32g491 = ["armv7em"]
+stm32g4a1 = ["armv7em"]
+stm32h735 = ["armv7em"]
 stm32h743 = ["armv7em"]
 stm32h743v = ["armv7em"]
 stm32h747cm4 = ["armv7em"]
 stm32h747cm7 = ["armv7em"]
 stm32h753 = ["armv7em"]
 stm32h753v = ["armv7em"]
 stm32h7b3 = ["armv7em"]
+stm32l0x0 = ["armv6m"]
 stm32l0x1 = ["armv6m"]
 stm32l0x2 = ["armv6m"]
 stm32l0x3 = ["armv6m"]
 stm32l100 = ["armv7m"]
 stm32l151 = ["armv7m"]
 stm32l162 = ["armv7m"]
+stm32l412 = ["armv7em"]
+stm32l4r9 = ["armv7em"]
 stm32l4x1 = ["armv7em"]
 stm32l4x2 = ["armv7em"]
 stm32l4x3 = ["armv7em"]
 stm32l4x5 = ["armv7em"]
 stm32l4x6 = ["armv7em"]
 stm32l552 = ["armv8m"]
 stm32l562 = ["armv8m"]
+stm32mp153 = ["armv7em"]
 stm32mp157 = ["armv7em"]
 stm32wb55 = ["armv7em"]
+stm32wl5x_cm0p = ["armv6m"]
+stm32wl5x_cm4 = ["armv7em"]
 stm32wle5 = ["armv7em"]

README.md

@@ -566,9 +566,6 @@ First set up the stm32-rs submodule:
 
 ```
 $ git submodule update --init
-$ cd stm32-rs/svd
-$ ./extract.sh
-$ cd ../..
 ```
 
 Now you should simply be able to run make, which will automatically run

build.rs

@@ -85,6 +85,12 @@ fn main() {
             "src/stm32g0/stm32g031/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32G041").is_some() {
             "src/stm32g0/stm32g041/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32G050").is_some() {
+            "src/stm32g0/stm32g050/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32G051").is_some() {
+            "src/stm32g0/stm32g051/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32G061").is_some() {
+            "src/stm32g0/stm32g061/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32G070").is_some() {
             "src/stm32g0/stm32g070/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32G071").is_some() {
@@ -93,6 +99,12 @@ fn main() {
             "src/stm32g0/stm32g07x/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32G081").is_some() {
             "src/stm32g0/stm32g081/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32G0B0").is_some() {
+            "src/stm32g0/stm32g0b0/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32G0B1").is_some() {
+            "src/stm32g0/stm32g0b1/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32G0C1").is_some() {
+            "src/stm32g0/stm32g0c1/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32G431").is_some() {
             "src/stm32g4/stm32g431/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32G441").is_some() {
@@ -107,6 +119,12 @@ fn main() {
             "src/stm32g4/stm32g483/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32G484").is_some() {
             "src/stm32g4/stm32g484/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32G491").is_some() {
+            "src/stm32g4/stm32g491/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32G4A1").is_some() {
+            "src/stm32g4/stm32g4a1/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32H735").is_some() {
+            "src/stm32h7/stm32h735/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32H743").is_some() {
             "src/stm32h7/stm32h743/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32H743V").is_some() {
@@ -121,6 +139,8 @@ fn main() {
             "src/stm32h7/stm32h753v/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32H7B3").is_some() {
             "src/stm32h7/stm32h7b3/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32L0X0").is_some() {
+            "src/stm32l0/stm32l0x0/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32L0X1").is_some() {
             "src/stm32l0/stm32l0x1/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32L0X2").is_some() {
@@ -133,6 +153,10 @@ fn main() {
             "src/stm32l1/stm32l151/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32L162").is_some() {
             "src/stm32l1/stm32l162/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32L412").is_some() {
+            "src/stm32l4/stm32l412/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32L4R9").is_some() {
+            "src/stm32l4/stm32l4r9/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32L4X1").is_some() {
             "src/stm32l4/stm32l4x1/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32L4X2").is_some() {
@@ -147,10 +171,16 @@ fn main() {
             "src/stm32l5/stm32l552/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32L562").is_some() {
             "src/stm32l5/stm32l562/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32MP153").is_some() {
+            "src/stm32mp/stm32mp153/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32MP157").is_some() {
             "src/stm32mp/stm32mp157/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32WB55").is_some() {
             "src/stm32wb/stm32wb55/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32WL5X_CM0P").is_some() {
+            "src/stm32wl/stm32wl5x_cm0p/device.x"
+        } else if env::var_os("CARGO_FEATURE_STM32WL5X_CM4").is_some() {
+            "src/stm32wl/stm32wl5x_cm4/device.x"
         } else if env::var_os("CARGO_FEATURE_STM32WLE5").is_some() {
             "src/stm32wl/stm32wle5/device.x"
         } else {

src/lib.rs

@@ -174,7 +174,7 @@ pub use stm32f7::stm32f7x7::*;
 #[cfg(feature="stm32f7x9")]
 pub use stm32f7::stm32f7x9::*;
 
-#[cfg(any(feature="doc", feature="stm32g030", feature="stm32g031", feature="stm32g041", feature="stm32g070", feature="stm32g071", feature="stm32g07x", feature="stm32g081"))]
+#[cfg(any(feature="doc", feature="stm32g030", feature="stm32g031", feature="stm32g041", feature="stm32g050", feature="stm32g051", feature="stm32g061", feature="stm32g070", feature="stm32g071", feature="stm32g07x", feature="stm32g081", feature="stm32g0b0", feature="stm32g0b1", feature="stm32g0c1"))]
 pub mod stm32g0;
 
 #[cfg(feature="stm32g030")]
@@ -186,6 +186,15 @@ pub use stm32g0::stm32g031::*;
 #[cfg(feature="stm32g041")]
 pub use stm32g0::stm32g041::*;
 
+#[cfg(feature="stm32g050")]
+pub use stm32g0::stm32g050::*;
+
+#[cfg(feature="stm32g051")]
+pub use stm32g0::stm32g051::*;
+
+#[cfg(feature="stm32g061")]
+pub use stm32g0::stm32g061::*;
+
 #[cfg(feature="stm32g070")]
 pub use stm32g0::stm32g070::*;
 
@@ -198,7 +207,16 @@ pub use stm32g0::stm32g07x::*;
 #[cfg(feature="stm32g081")]
 pub use stm32g0::stm32g081::*;
 
-#[cfg(any(feature="doc", feature="stm32g431", feature="stm32g441", feature="stm32g471", feature="stm32g473", feature="stm32g474", feature="stm32g483", feature="stm32g484"))]
+#[cfg(feature="stm32g0b0")]
+pub use stm32g0::stm32g0b0::*;
+
+#[cfg(feature="stm32g0b1")]
+pub use stm32g0::stm32g0b1::*;
+
+#[cfg(feature="stm32g0c1")]
+pub use stm32g0::stm32g0c1::*;
+
+#[cfg(any(feature="doc", feature="stm32g431", feature="stm32g441", feature="stm32g471", feature="stm32g473", feature="stm32g474", feature="stm32g483", feature="stm32g484", feature="stm32g491", feature="stm32g4a1"))]
 pub mod stm32g4;
 
 #[cfg(feature="stm32g431")]
@@ -222,9 +240,18 @@ pub use stm32g4::stm32g483::*;
 #[cfg(feature="stm32g484")]
 pub use stm32g4::stm32g484::*;
 
-#[cfg(any(feature="doc", feature="stm32h743", feature="stm32h743v", feature="stm32h747cm4", feature="stm32h747cm7", feature="stm32h753", feature="stm32h753v", feature="stm32h7b3"))]
+#[cfg(feature="stm32g491")]
+pub use stm32g4::stm32g491::*;
+
+#[cfg(feature="stm32g4a1")]
+pub use stm32g4::stm32g4a1::*;
+
+#[cfg(any(feature="doc", feature="stm32h735", feature="stm32h743", feature="stm32h743v", feature="stm32h747cm4", feature="stm32h747cm7", feature="stm32h753", feature="stm32h753v", feature="stm32h7b3"))]
 pub mod stm32h7;
 
+#[cfg(feature="stm32h735")]
+pub use stm32h7::stm32h735::*;
+
 #[cfg(feature="stm32h743")]
 pub use stm32h7::stm32h743::*;
 
@@ -246,9 +273,12 @@ pub use stm32h7::stm32h753v::*;
 #[cfg(feature="stm32h7b3")]
 pub use stm32h7::stm32h7b3::*;
 
-#[cfg(any(feature="doc", feature="stm32l0x1", feature="stm32l0x2", feature="stm32l0x3"))]
+#[cfg(any(feature="doc", feature="stm32l0x0", feature="stm32l0x1", feature="stm32l0x2", feature="stm32l0x3"))]
 pub mod stm32l0;
 
+#[cfg(feature="stm32l0x0")]
+pub use stm32l0::stm32l0x0::*;
+
 #[cfg(feature="stm32l0x1")]
 pub use stm32l0::stm32l0x1::*;
 
@@ -270,9 +300,15 @@ pub use stm32l1::stm32l151::*;
 #[cfg(feature="stm32l162")]
 pub use stm32l1::stm32l162::*;
 
-#[cfg(any(feature="doc", feature="stm32l4x1", feature="stm32l4x2", feature="stm32l4x3", feature="stm32l4x5", feature="stm32l4x6"))]
+#[cfg(any(feature="doc", feature="stm32l412", feature="stm32l4r9", feature="stm32l4x1", feature="stm32l4x2", feature="stm32l4x3", feature="stm32l4x5", feature="stm32l4x6"))]
 pub mod stm32l4;
 
+#[cfg(feature="stm32l412")]
+pub use stm32l4::stm32l412::*;
+
+#[cfg(feature="stm32l4r9")]
+pub use stm32l4::stm32l4r9::*;
+
 #[cfg(feature="stm32l4x1")]
 pub use stm32l4::stm32l4x1::*;
 
@@ -297,9 +333,12 @@ pub use stm32l5::stm32l552::*;
 #[cfg(feature="stm32l562")]
 pub use stm32l5::stm32l562::*;
 
-#[cfg(any(feature="doc", feature="stm32mp157"))]
+#[cfg(any(feature="doc", feature="stm32mp153", feature="stm32mp157"))]
 pub mod stm32mp;
 
+#[cfg(feature="stm32mp153")]
+pub use stm32mp::stm32mp153::*;
+
 #[cfg(feature="stm32mp157")]
 pub use stm32mp::stm32mp157::*;
 
@@ -309,9 +348,15 @@ pub mod stm32wb;
 #[cfg(feature="stm32wb55")]
 pub use stm32wb::stm32wb55::*;
 
-#[cfg(any(feature="doc", feature="stm32wle5"))]
+#[cfg(any(feature="doc", feature="stm32wl5x_cm0p", feature="stm32wl5x_cm4", feature="stm32wle5"))]
 pub mod stm32wl;
 
+#[cfg(feature="stm32wl5x_cm0p")]
+pub use stm32wl::stm32wl5x_cm0p::*;
+
+#[cfg(feature="stm32wl5x_cm4")]
+pub use stm32wl::stm32wl5x_cm4::*;
+
 #[cfg(feature="stm32wle5")]
 pub use stm32wl::stm32wle5::*;
 

src/stm32f0/peripherals/adc.rs

@@ -522,8 +522,8 @@ pub mod CFGR1 {
         }
     }
 
-    /// Auto-delayed conversion mode
-    pub mod AUTDLY {
+    /// Wait conversion mode
+    pub mod WAIT {
         /// Offset (14 bits)
         pub const offset: u32 = 14;
         /// Mask (1 bit: 1 << 14)
@@ -532,8 +532,15 @@ pub mod CFGR1 {
         pub mod R {}
         /// Write-only values (empty)
         pub mod W {}
-        /// Read-write values (empty)
-        pub mod RW {}
+        /// Read-write values
+        pub mod RW {
+
+            /// 0b0: Wait conversion mode off
+            pub const Disabled: u32 = 0b0;
+
+            /// 0b1: Wait conversion mode on
+            pub const Enabled: u32 = 0b1;
+        }
     }
 
     /// Single / continuous conversion mode
@@ -745,27 +752,6 @@ pub mod CFGR1 {
             pub const Enabled: u32 = 0b1;
         }
     }
-
-    /// Wait conversion mode
-    pub mod WAIT {
-        /// Offset (14 bits)
-        pub const offset: u32 = 14;
-        /// Mask (1 bit: 1 << 14)
-        pub const mask: u32 = 1 << offset;
-        /// Read-only values (empty)
-        pub mod R {}
-        /// Write-only values (empty)
-        pub mod W {}
-        /// Read-write values
-        pub mod RW {
-
-            /// 0b0: Wait conversion mode off
-            pub const Disabled: u32 = 0b0;
-
-            /// 0b1: Wait conversion mode on
-            pub const Enabled: u32 = 0b1;
-        }
-    }
 }
 
 /// configuration register 2

src/stm32f0/peripherals/can.rs

@@ -594,7 +594,7 @@ pub mod TSR {
     }
 }
 
-/// CAN_RF0R
+/// CAN_RF%sR
 pub mod RF0R {
 
     /// RFOM0
@@ -675,7 +675,7 @@ pub mod RF0R {
     }
 }
 
-/// CAN_RF0R
+/// CAN_RF%sR
 pub mod RF1R {
     pub use super::RF0R::FMP;
     pub use super::RF0R::FOVR;
@@ -5835,10 +5835,10 @@ pub struct RegisterBlock {
     /// CAN_TSR
     pub TSR: RWRegister<u32>,
 
-    /// CAN_RF0R
+    /// CAN_RF%sR
     pub RF0R: RWRegister<u32>,
 
-    /// CAN_RF0R
+    /// CAN_RF%sR
     pub RF1R: RWRegister<u32>,
 
     /// CAN_IER