Merge branch 'main' of https://github.com/David-OConnor/stm32-hal

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stm32-hal2"
-version = "1.8.3"
+version = "1.8.4"
 edition = "2021"
 authors = ["David O'Connor <the_alchemist@fastmail.com>"]
 description = "Hardware abstraction layer for the STM32 MCUs"

src/clocks/mod.rs

@@ -36,7 +36,7 @@ cfg_if::cfg_if! {
 // todo: Continue working through DRY between the clock modules.
 
 /// Speed out of limits.
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, defmt::Format)]
 pub enum RccError {
     Speed,
     Hardware,

src/crc.rs

@@ -313,7 +313,7 @@ impl Default for Polynomial {
 }
 
 /// Errors generated when trying to create invalid polynomials.
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq, defmt::Format)]
 pub enum PolynomialError {
     /// Tried to create an even polynomial.
     /// The hardware CRC unit only supports odd polynomials.

src/flash/non_trustzone.rs

@@ -32,7 +32,7 @@ pub enum Bank {
     B2 = 1,
 }
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, defmt::Format)]
 /// Possible error states for flash operations.
 pub enum Error {
     /// Flash controller is not done yet

src/flash/trustzone.rs

@@ -32,7 +32,7 @@ pub enum Bank {
     B2 = 1,
 }
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, defmt::Format)]
 /// Possible error states for flash operations.
 pub enum Error {
     /// Flash controller is not done yet

src/i2c_f4.rs

@@ -25,7 +25,7 @@ pub enum I2cDevice {
     Three,
 }
 
-#[derive(Debug)]
+#[derive(Debug, defmt::Format)]
 pub enum Error {
     OVERRUN,
     NACK,

src/qspi.rs

@@ -89,7 +89,7 @@ pub enum SamplingEdge {
 }
 
 /// Indicates an error with the QSPI peripheral.
-#[derive(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq, defmt::Format)]
 pub enum QspiError {
     Busy,
     Underflow,

src/rtc.rs

@@ -26,7 +26,7 @@ pub enum RtcClockSource {
 }
 
 /// RTC error type
-#[derive(Debug)]
+#[derive(Debug, defmt::Format)]
 pub enum Error {
     /// Invalid input error
     InvalidInputData,

src/spi/mod.rs

@@ -53,7 +53,7 @@ macro_rules! check_errors {
 
 /// SPI error
 #[non_exhaustive]
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, defmt::Format)]
 pub enum SpiError {
     /// Overrun occurred
     Overrun,

src/timer.rs

@@ -53,7 +53,7 @@ pub static TICK_OVERFLOW_COUNT: AtomicU32 = AtomicU32::new(0);
 
 // todo: Low power timer enabling etc. eg on L4, RCC_APB1ENR1.LPTIM1EN
 
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, defmt::Format)]
 /// Used for when attempting to set a timer period that is out of range.
 pub struct ValueError {}
 
@@ -2033,9 +2033,25 @@ pub fn clear_update_interrupt(tim_num: u8) {
         let bits = 0xffff_ffff;
 
         match tim_num {
+            #[cfg(not(any(feature = "f373")))]
             1 => periphs.TIM1.sr.write(|w| w.bits(bits).uif().clear_bit()),
+            #[cfg(not(any(
+                 feature = "f410",
+                 feature = "g070",
+                 feature = "l5", // todo PAC bug?
+                 feature = "wb55", // todo PAC bug?
+            )))]
             2 => periphs.TIM2.sr.write(|w| w.bits(bits).uif().clear_bit()),
-            #[cfg(not(any(feature = "wl")))]
+            #[cfg(not(any(
+                feature = "f301",
+                feature = "l4x1",
+                // feature = "l412",
+                feature = "l5", // todo PAC bug?
+                feature = "l4x3",
+                feature = "f410",
+                feature = "wb",
+                feature = "wl"
+            )))]
             3 => periphs.TIM3.sr.write(|w| w.bits(bits).uif().clear_bit()),
             #[cfg(not(any(
                 feature = "f301",

src/usart.rs

@@ -93,7 +93,7 @@ pub enum IrdaMode {
 
 /// Serial error
 #[non_exhaustive]
-#[derive(Debug)]
+#[derive(Debug, defmt::Format)]
 pub enum UartError {
     /// Framing error
     Framing,

src/util.rs

@@ -416,6 +416,13 @@ impl RccPeriph for pac::I2C3 {
     }
 }
 
+#[cfg(feature = "h7")]
+impl RccPeriph for pac::I2C4 {
+    fn en_reset(rcc: &RegisterBlock) {
+        rcc_en_reset!(apb4, i2c4, rcc);
+    }
+}
+
 #[cfg(not(feature = "f301"))] // todo: Not sure what's going on  here.
 impl RccPeriph for pac::SPI1 {
     fn en_reset(rcc: &RegisterBlock) {