Merge pull request #55 from stm32-rs/feature/pwm

Complimentary PWM

Author: dotcypress

src/timer/pins.rs

@@ -39,6 +39,7 @@ timer_pins!(TIM1, [
     (Channel4, PA11<DefaultMode>, AltFunction::AF2),
     (Channel4, PC11<DefaultMode>, AltFunction::AF2),
 ]);
+
 // Inverted pins
 timer_pins!(TIM1, [
     (Channel1, PA7<DefaultMode>, AltFunction::AF2),
@@ -99,6 +100,7 @@ timer_pins!(TIM15, [
     (Channel2, PB15<DefaultMode>, AltFunction::AF5),
     (Channel2, PC2<DefaultMode>, AltFunction::AF2),
 ]);
+
 // Inverted pins
 #[cfg(any(feature = "stm32g070", feature = "stm32g071", feature = "stm32g081"))]
 timer_pins!(TIM15, [
@@ -112,6 +114,7 @@ timer_pins!(TIM16, [
     (Channel1, PB8<DefaultMode>, AltFunction::AF2),
     (Channel1, PD0<DefaultMode>, AltFunction::AF2),
 ]);
+
 // Inverted pins
 timer_pins!(TIM16, [
     (Channel1, PB6<DefaultMode>, AltFunction::AF2),
@@ -122,6 +125,7 @@ timer_pins!(TIM17, [
     (Channel1, PB9<DefaultMode>, AltFunction::AF2),
     (Channel1, PD1<DefaultMode>, AltFunction::AF2),
 ]);
+
 //  Inverted pins
 timer_pins!(TIM17, [
     (Channel1, PB7<DefaultMode>, AltFunction::AF2),

src/timer/pwm.rs

@@ -107,9 +107,18 @@ macro_rules! pwm_hal {
             }
         )+
     };
+}
 
-    ($($TIMX:ident:
-        ($CH:ty, $ccxe:ident, $ccmrx_output:ident, $ocxpe:ident, $ocxm:ident, $ccrx:ident $(,$moe:ident)*),)+
+macro_rules! pwm_advanced_hal {
+    ($($TIMX:ident: (
+        $CH:ty,
+        $ccxe:ident $(: $ccxne:ident)*,
+        $ccmrx_output:ident,
+        $ocxpe:ident,
+        $ocxm:ident,
+        $ccrx:ident
+        $(, $moe:ident)*
+    ) ,)+
     ) => {
         $(
             impl hal::PwmPin for PwmPin<$TIMX, $CH> {
@@ -126,6 +135,9 @@ macro_rules! pwm_hal {
                         let tim = &*$TIMX::ptr();
                         tim.$ccmrx_output().modify(|_, w| w.$ocxpe().set_bit().$ocxm().bits(6));
                         tim.ccer.modify(|_, w| w.$ccxe().set_bit());
+                        $(
+                            tim.ccer.modify(|_, w| w.$ccxne().bit(true));
+                        )*
                         $(
                             tim.bdtr.modify(|_, w| w.$moe().set_bit());
                         )*
@@ -148,14 +160,19 @@ macro_rules! pwm_hal {
     };
 }
 
-pwm_hal! {
-    TIM1:  (Channel1, cc1e, ccmr1_output, oc1pe, oc1m, ccr1, moe),
-    TIM1:  (Channel2, cc2e, ccmr1_output, oc2pe, oc2m, ccr2, moe),
-    TIM1:  (Channel3, cc3e, ccmr2_output, oc3pe, oc3m, ccr3, moe),
+pwm_advanced_hal! {
+    TIM1:  (Channel1, cc1e: cc1ne, ccmr1_output, oc1pe, oc1m, ccr1, moe),
+    TIM1:  (Channel2, cc2e: cc2ne, ccmr1_output, oc2pe, oc2m, ccr2, moe),
+    TIM1:  (Channel3, cc3e: cc3ne, ccmr2_output, oc3pe, oc3m, ccr3, moe),
     TIM1:  (Channel4, cc4e, ccmr2_output, oc4pe, oc4m, ccr4, moe),
     TIM14: (Channel1, cc1e, ccmr1_output, oc1pe, oc1m, ccr1),
-    TIM16: (Channel1, cc1e, ccmr1_output, oc1pe, oc1m, ccr1, moe),
-    TIM17: (Channel1, cc1e, ccmr1_output, oc1pe, oc1m, ccr1, moe),
+    TIM16: (Channel1, cc1e: cc1ne, ccmr1_output, oc1pe, oc1m, ccr1, moe),
+    TIM17: (Channel1, cc1e: cc1ne, ccmr1_output, oc1pe, oc1m, ccr1, moe),
+}
+
+#[cfg(any(feature = "stm32g070", feature = "stm32g071", feature = "stm32g081"))]
+pwm_advanced_hal! {
+    TIM15: (Channel1, cc1e: cc1ne, ccmr1_output, oc1pe, oc1m, ccr1, moe),
 }
 
 #[cfg(feature = "stm32g0x1")]
@@ -164,20 +181,12 @@ pwm_hal! {
     TIM2: (Channel2, cc2e, ccmr1_output, oc2pe, oc2m, ccr2, ccr2_l, ccr2_h),
     TIM2: (Channel3, cc3e, ccmr2_output, oc3pe, oc3m, ccr3, ccr3_l, ccr3_h),
     TIM2: (Channel4, cc4e, ccmr2_output, oc4pe, oc4m, ccr4, ccr4_l, ccr4_h),
-}
-
-pwm_hal! {
     TIM3: (Channel1, cc1e, ccmr1_output, oc1pe, oc1m, ccr1, ccr1_l, ccr1_h),
     TIM3: (Channel2, cc2e, ccmr1_output, oc2pe, oc2m, ccr2, ccr2_l, ccr2_h),
     TIM3: (Channel3, cc3e, ccmr2_output, oc3pe, oc3m, ccr3, ccr3_l, ccr3_h),
     TIM3: (Channel4, cc4e, ccmr2_output, oc4pe, oc4m, ccr4, ccr4_l, ccr4_h),
 }
 
-#[cfg(any(feature = "stm32g070", feature = "stm32g071", feature = "stm32g081"))]
-pwm_hal! {
-    TIM15: (Channel1, cc1e, ccmr1_output, oc1pe, oc1m, ccr1, moe),
-}
-
 pwm! {
     TIM1: (apbenr2, apbrstr2, tim1, tim1en, tim1rst, arr),
     TIM3: (apbenr1, apbrstr1, tim3, tim3en, tim3rst, arr_l, arr_h),