Fixed compile issues

Author: Henrik Snöman

.cargo/config.toml

@@ -1,5 +1,5 @@
 [target.thumbv8m.main-none-eabihf]
-runner = 'probe-rs run --connect-under-reset'
+runner = 'probe-rs run --chip STM32H523RETx'
 rustflags = [
   # LLD (shipped with the Rust toolchain) is used as the default linker
   "-C", "link-arg=-Tlink.x",

src/pwm/mod.rs

@@ -1019,22 +1019,23 @@ tim_hal! {
     pac::TIM1: (tim1, Tim1, u16, 16, DIR: cms, BDTR: bdtr, enabled, af1, clear_bit, clear_bit),
     pac::TIM2: (tim2, Tim2, u32, 32, DIR: cms),
     pac::TIM3: (tim3, Tim3, u16, 16, DIR: cms),
+    pac::TIM6: (tim6, Tim6, u16, 16),
+    pac::TIM7: (tim7, Tim7, u16, 16),
+}
+
+#[cfg(feature="rm0481")]
+tim_hal! {
     pac::TIM4: (tim4, Tim4, u16, 16, DIR: cms),
     pac::TIM5: (tim5, Tim5, u32, 32, DIR: cms),
     pac::TIM8: (tim8, Tim8, u16, 16, DIR: cms, BDTR: bdtr, enabled, af1, clear_bit, clear_bit),
-}
-#[cfg(feature = "rm0468")]
-tim_hal! {
-    pac::TIM23: (tim23, Tim23, u32, 32, DIR: cms),
-    pac::TIM24: (tim24, Tim24, u32, 32, DIR: cms),
-}
+    //pac::TIM12: (tim12, Tim12, u16, 16),
+    pac::TIM15: (tim15, Tim15, u16, 16, BDTR: bdtr, set_bit, af1, set_bit),    
+} // TODO: TIM12 seems to be missing for 523's pac, re add once fixed
+
+#[cfg(feature="h56x_h573")]
 tim_hal! {
-    pac::TIM12: (tim12, Tim12, u16, 16),
     pac::TIM13: (tim13, Tim13, u16, 16),
     pac::TIM14: (tim14, Tim14, u16, 16),
-}
-tim_hal! {
-    pac::TIM15: (tim15, Tim15, u16, 16, BDTR: bdtr, set_bit, af1, set_bit),
     pac::TIM16: (tim16, Tim16, u16, 16, BDTR: bdtr, set_bit, af1, set_bit),
     pac::TIM17: (tim17, Tim17, u16, 16, BDTR: bdtr, set_bit, af1, set_bit),
 }
@@ -1220,36 +1221,44 @@ macro_rules! tim_pin_hal {
     };
 }
 
-fn foo(tim: pac::TIM12) {
+fn foo(tim: pac::TIM1) {
     const C: u8 = 0;
     let value = 3;
     tim.psc().modify(|_, w| w.psc().set(value));
 
     tim.ccer().modify(|_, w| w.ccp(C).falling_edge());
+    tim.cr1().modify(|_, w| w.dir().down());
+    tim.cr1().modify(|_, w| w.cms().center_aligned3());
 }
 
 // Dual channel timers
+/*#[cfg(feature="rm0481")]
 tim_pin_hal! {
     pac::TIM12, u16:
         (C1, ccmr1_output, oc1pe, oc1m),
         (C2, ccmr1_output, oc2pe, oc2m),
-}
+}*/ // TODO: TIM12 seems to be missing for 523's pac, re add once fixed
+#[cfg(feature="rm0481")]
 tim_pin_hal! {
     pac::TIM15, u16, ccne:
         (C1, ccmr1_output, oc1pe, oc1m),
         (C2, ccmr1_output, oc2pe, oc2m),
 }
 
 // Single channel timers
+#[cfg(feature="h56x_h573")]
 tim_pin_hal! {
     pac::TIM13, u16: (C1, ccmr1_output, oc1pe, oc1m),
 }
+#[cfg(feature="h56x_h573")]
 tim_pin_hal! {
     pac::TIM14, u16: (C1, ccmr1_output, oc1pe, oc1m),
 }
+#[cfg(feature="h56x_h573")]
 tim_pin_hal! {
     pac::TIM16, u16: (C1, ccmr1_output, oc1pe, oc1m),
 }
+#[cfg(feature="h56x_h573")]
 tim_pin_hal! {
     pac::TIM17, u16: (C1, ccmr1_output, oc1pe, oc1m),
 }
@@ -1276,20 +1285,23 @@ tim_pin_hal! {
         (C3, ccmr2_output, oc3pe, oc3m),
         (C4, ccmr2_output, oc4pe, oc4m),
 }
+#[cfg(feature="rm0481")]
 tim_pin_hal! {
     pac::TIM4, u16:
         (C1, ccmr1_output, oc1pe, oc1m),
         (C2, ccmr1_output, oc2pe, oc2m),
         (C3, ccmr2_output, oc3pe, oc3m),
         (C4, ccmr2_output, oc4pe, oc4m),
 }
+#[cfg(feature="rm0481")]
 tim_pin_hal! {
     pac::TIM5, u32:
         (C1, ccmr1_output, oc1pe, oc1m),
         (C2, ccmr1_output, oc2pe, oc2m),
         (C3, ccmr2_output, oc3pe, oc3m),
         (C4, ccmr2_output, oc4pe, oc4m),
 }
+#[cfg(feature="rm0481")]
 tim_pin_hal! {
     pac::TIM8, u16, ccne:
         (C1, ccmr1_output, oc1pe, oc1m),

src/timer.rs

@@ -13,9 +13,12 @@ use core::marker::PhantomData;
 use crate::stm32::{TIM1, TIM2, TIM3, TIM6, TIM7};
 #[cfg(feature = "rm0481")]
 use crate::stm32::{
-    TIM12, TIM13, TIM14, TIM15, TIM16, TIM17, TIM4, TIM5, TIM8,
+     TIM4, TIM5, TIM8, /*TIM12,*/  TIM15, 
 }; // TODO: TIM12 seems to be missing for 523's pac, re add once fixed
-
+#[cfg(feature = "h56x_h573")]
+use crate::stm32::{
+    TIM13, TIM14, TIM16, TIM17,
+};
 use cast::{u16, u32};
 use void::Void;
 
@@ -48,8 +51,13 @@ impl_tim_ker_ck! {
 
 #[cfg(feature = "rm0481")]
 impl_tim_ker_ck! {
-    timx_ker_ck: TIM4, TIM5, TIM12, TIM13, TIM14 // TODO: TIM12 seems to be missing for 523's pac, re add once fixed
-    timy_ker_ck: TIM8, TIM15, TIM16, TIM17
+    timx_ker_ck: TIM4, TIM5 /*TIM12,*/ // TODO: TIM12 seems to be missing for 523's pac, re add once fixed
+    timy_ker_ck: TIM8, TIM15
+}
+
+#[cfg(feature = "h56x_h573")]
+impl_tim_ker_ck! {
+    timx_ker_ck: TIM13, TIM14
 }
 
 /// External trait for hardware timers