impl Pins

Author: burrbull

src/timer/pins.rs

@@ -21,53 +21,47 @@ impl<CH1, CH2> From<(CH1, CH2)> for InPins<CH1, CH2> {
     }
 }
 
-pub struct Pins4<CH1, CH2, CH3, CH4> {
-    pub c1: CH1,
-    pub c2: CH2,
-    pub c3: CH3,
-    pub c4: CH4,
-}
-
-impl<CH1, CH2, CH3, CH4> From<(CH1, CH2, CH3, CH4)> for Pins4<CH1, CH2, CH3, CH4> {
-    fn from(value: (CH1, CH2, CH3, CH4)) -> Self {
-        Self {
-            c1: value.0,
-            c2: value.1,
-            c3: value.2,
-            c4: value.3,
+pinsx!(Pins2: (CH1, c1, C1), (CH2, c2, C2));
+pinsx!(Pins3: (CH1, c1, C1), (CH2, c2, C2), (CH3, c3, C3));
+pinsx!(Pins4: (CH1, c1, C1), (CH2, c2, C2), (CH3, c3, C3), (CH4, c4, C4));
+
+macro_rules! pinsx {
+    ($name:ident: $(($CH:ident, $c:ident, $C:ident)),+) => {
+        pub struct $name<$($CH),+> {
+            $(
+                pub $c: $CH,
+            )+
         }
-    }
-}
 
-pub struct Pins3<CH1, CH2, CH3> {
-    pub c1: CH1,
-    pub c2: CH2,
-    pub c3: CH3,
-}
-
-impl<CH1, CH2, CH3> From<(CH1, CH2, CH3)> for Pins3<CH1, CH2, CH3> {
-    fn from(value: (CH1, CH2, CH3)) -> Self {
-        Self {
-            c1: value.0,
-            c2: value.1,
-            c3: value.2,
+        impl<$($CH),+> From<($($CH),+)> for $name<$($CH),+> {
+            fn from(value: ($($CH),+)) -> Self {
+                let ($($c),+) = value;
+                Self {
+                    $(
+                        $c,
+                    )+
+                }
+            }
         }
-    }
-}
 
-pub struct Pins2<CH1, CH2> {
-    pub c1: CH1,
-    pub c2: CH2,
-}
-
-impl<CH1, CH2> From<(CH1, CH2)> for Pins2<CH1, CH2> {
-    fn from(value: (CH1, CH2)) -> Self {
-        Self {
-            c1: value.0,
-            c2: value.1,
+        impl<TIM, $($CH),+> Pins<TIM> for $name<$($CH),+>
+        where
+            $(
+                $CH: Pins<TIM>,
+            )+
+        {
+            const C1: bool = false $(|| $CH::C1)+;
+            const C2: bool = false $(|| $CH::C2)+;
+            const C3: bool = false $(|| $CH::C3)+;
+            const C4: bool = false $(|| $CH::C4)+;
+            type Channels = ($($CH::Channels),+);
+            fn split() -> Self::Channels {
+                ($($CH::split()),+)
+            }
         }
-    }
+    };
 }
+use pinsx;
 
 #[cfg(any(feature = "stm32f100", feature = "stm32f103", feature = "connectivity"))]
 pub mod tim1 {
@@ -375,17 +369,6 @@ macro_rules! remap_combo {
     ($TIM:ty; $C1:ident, $C2:ident, $C3:ident, $C4:ident: [
         $($P0:ident, $P1:ident, $P2:ident, $P3:ident $( => $MAPR:ident { $remapex:expr })?;)+
     ]) => {
-        impl Pins<$TIM> for Pins4<Ch1, Ch2, Ch3, Ch4> {
-            const $C1: bool = true;
-            const $C2: bool = true;
-            const $C3: bool = true;
-            const $C4: bool = true;
-            type Channels = (PwmChannel<$TIM, $C1>, PwmChannel<$TIM, $C2>, PwmChannel<$TIM, $C3>, PwmChannel<$TIM, $C4>);
-            fn split() -> Self::Channels {
-                (PwmChannel::new(), PwmChannel::new(), PwmChannel::new(), PwmChannel::new())
-            }
-        }
-
         $(
             impl From<(gpio::$P0<Alternate>, gpio::$P1<Alternate>, gpio::$P2<Alternate>, gpio::$P3<Alternate> $(, &mut $MAPR)?)> for Pins4<Ch1, Ch2, Ch3, Ch4> {
                 fn from(p: (gpio::$P0<Alternate>, gpio::$P1<Alternate>, gpio::$P2<Alternate>, gpio::$P3<Alternate> $(, &mut $MAPR)?)) -> Self {
@@ -410,16 +393,6 @@ macro_rules! remap_combo {
     ($TIM:ty; ($C1:ident, $Ch1:ident), ($C2:ident, $Ch2:ident), ($C3:ident, $Ch3:ident): [
         $($P0:ident, $P1:ident, $P2:ident $( => $MAPR:ident { $remapex:expr })?;)+
     ]) => {
-        impl Pins<$TIM> for Pins3<$Ch1, $Ch2, $Ch3> {
-            const $C1: bool = true;
-            const $C2: bool = true;
-            const $C3: bool = true;
-            type Channels = (PwmChannel<$TIM, $C1>, PwmChannel<$TIM, $C2>, PwmChannel<$TIM, $C3>);
-            fn split() -> Self::Channels {
-                (PwmChannel::new(), PwmChannel::new(), PwmChannel::new())
-            }
-        }
-
         $(
             impl From<(gpio::$P0<Alternate>, gpio::$P1<Alternate>, gpio::$P2<Alternate> $(, &mut $MAPR)?)> for Pins3<$Ch1, $Ch2, $Ch3> {
                 fn from(p: (gpio::$P0<Alternate>, gpio::$P1<Alternate>, gpio::$P2<Alternate> $(, &mut $MAPR)?)) -> Self {
@@ -443,15 +416,6 @@ macro_rules! remap_combo {
     ($TIM:ty; ($C1:ident, $Ch1:ident), ($C2:ident, $Ch2:ident): [
         $($P0:ident, $P1:ident $( => $MAPR:ident { $remapex:expr })?;)+
     ]) => {
-        impl Pins<$TIM> for Pins2<$Ch1, $Ch2> {
-            const $C1: bool = true;
-            const $C2: bool = true;
-            type Channels = (PwmChannel<$TIM, $C1>, PwmChannel<$TIM, $C2>);
-            fn split() -> Self::Channels {
-                (PwmChannel::new(), PwmChannel::new())
-            }
-        }
-
         $(
             impl From<(gpio::$P0<Alternate>, gpio::$P1<Alternate> $(, &mut $MAPR)?)> for Pins2<$Ch1, $Ch2> {
                 fn from(p: (gpio::$P0<Alternate>, gpio::$P1<Alternate> $(, &mut $MAPR)?)) -> Self {