@@ -638,7 +638,7 @@ pub trait PinC3<TIM> {}
638
638
pub trait PinC4 < TIM > { }
639
639
640
640
macro_rules! channel_impl {
641
- ( $( $TIM: ident, $PINC: ident, $PINX: ident, $MODE : ident<$ AF: ident> ; ) + ) => {
641
+ ( $( $TIM: ident, $PINC: ident, $PINX: ident, $AF: ident; ) + ) => {
642
642
$(
643
643
impl $PINC<$TIM> for $PINX<Alternate <$AF>> { }
644
644
impl $PINC<$TIM> for $PINX<AlternateOD <$AF>> { }
@@ -666,15 +666,15 @@ macro_rules! channel_impl {
666
666
feature = "stm32f479"
667
667
) ) ]
668
668
channel_impl ! (
669
- TIM1 , PinC1 , PA8 , Alternate < AF1 > ;
670
- TIM1 , PinC2 , PA9 , Alternate < AF1 > ;
671
- TIM1 , PinC3 , PA10 , Alternate < AF1 > ;
672
- TIM1 , PinC4 , PA11 , Alternate < AF1 > ;
673
-
674
- TIM5 , PinC1 , PA0 , Alternate < AF2 > ;
675
- TIM5 , PinC2 , PA1 , Alternate < AF2 > ;
676
- TIM5 , PinC3 , PA2 , Alternate < AF2 > ;
677
- TIM5 , PinC4 , PA3 , Alternate < AF2 > ;
669
+ TIM1 , PinC1 , PA8 , AF1 ;
670
+ TIM1 , PinC2 , PA9 , AF1 ;
671
+ TIM1 , PinC3 , PA10 , AF1 ;
672
+ TIM1 , PinC4 , PA11 , AF1 ;
673
+
674
+ TIM5 , PinC1 , PA0 , AF2 ;
675
+ TIM5 , PinC2 , PA1 , AF2 ;
676
+ TIM5 , PinC3 , PA2 , AF2 ;
677
+ TIM5 , PinC4 , PA3 , AF2 ;
678
678
) ;
679
679
680
680
#[ cfg( any(
@@ -696,45 +696,45 @@ channel_impl!(
696
696
feature = "stm32f479"
697
697
) ) ]
698
698
channel_impl ! (
699
- TIM1 , PinC1 , PE9 , Alternate < AF1 > ;
700
- TIM1 , PinC2 , PE11 , Alternate < AF1 > ;
701
- TIM1 , PinC3 , PE13 , Alternate < AF1 > ;
702
- TIM1 , PinC4 , PE14 , Alternate < AF1 > ;
703
-
704
- TIM2 , PinC1 , PA0 , Alternate < AF1 > ;
705
- TIM2 , PinC2 , PA1 , Alternate < AF1 > ;
706
- TIM2 , PinC3 , PA2 , Alternate < AF1 > ;
707
- TIM2 , PinC4 , PA3 , Alternate < AF1 > ;
708
-
709
- TIM2 , PinC2 , PB3 , Alternate < AF1 > ;
710
- TIM2 , PinC3 , PB10 , Alternate < AF1 > ;
711
- TIM2 , PinC4 , PB11 , Alternate < AF1 > ;
712
-
713
- TIM2 , PinC1 , PA5 , Alternate < AF1 > ;
714
- TIM2 , PinC1 , PA15 , Alternate < AF1 > ;
715
-
716
- TIM3 , PinC1 , PA6 , Alternate < AF2 > ;
717
- TIM3 , PinC2 , PA7 , Alternate < AF2 > ;
718
- TIM3 , PinC3 , PB0 , Alternate < AF2 > ;
719
- TIM3 , PinC4 , PB1 , Alternate < AF2 > ;
720
-
721
- TIM3 , PinC1 , PB4 , Alternate < AF2 > ;
722
- TIM3 , PinC2 , PB5 , Alternate < AF2 > ;
723
-
724
- TIM3 , PinC1 , PC6 , Alternate < AF2 > ;
725
- TIM3 , PinC2 , PC7 , Alternate < AF2 > ;
726
- TIM3 , PinC3 , PC8 , Alternate < AF2 > ;
727
- TIM3 , PinC4 , PC9 , Alternate < AF2 > ;
728
-
729
- TIM4 , PinC1 , PB6 , Alternate < AF2 > ;
730
- TIM4 , PinC2 , PB7 , Alternate < AF2 > ;
731
- TIM4 , PinC3 , PB8 , Alternate < AF2 > ;
732
- TIM4 , PinC4 , PB9 , Alternate < AF2 > ;
733
-
734
- TIM4 , PinC1 , PD12 , Alternate < AF2 > ;
735
- TIM4 , PinC2 , PD13 , Alternate < AF2 > ;
736
- TIM4 , PinC3 , PD14 , Alternate < AF2 > ;
737
- TIM4 , PinC4 , PD15 , Alternate < AF2 > ;
699
+ TIM1 , PinC1 , PE9 , AF1 ;
700
+ TIM1 , PinC2 , PE11 , AF1 ;
701
+ TIM1 , PinC3 , PE13 , AF1 ;
702
+ TIM1 , PinC4 , PE14 , AF1 ;
703
+
704
+ TIM2 , PinC1 , PA0 , AF1 ;
705
+ TIM2 , PinC2 , PA1 , AF1 ;
706
+ TIM2 , PinC3 , PA2 , AF1 ;
707
+ TIM2 , PinC4 , PA3 , AF1 ;
708
+
709
+ TIM2 , PinC2 , PB3 , AF1 ;
710
+ TIM2 , PinC3 , PB10 , AF1 ;
711
+ TIM2 , PinC4 , PB11 , AF1 ;
712
+
713
+ TIM2 , PinC1 , PA5 , AF1 ;
714
+ TIM2 , PinC1 , PA15 , AF1 ;
715
+
716
+ TIM3 , PinC1 , PA6 , AF2 ;
717
+ TIM3 , PinC2 , PA7 , AF2 ;
718
+ TIM3 , PinC3 , PB0 , AF2 ;
719
+ TIM3 , PinC4 , PB1 , AF2 ;
720
+
721
+ TIM3 , PinC1 , PB4 , AF2 ;
722
+ TIM3 , PinC2 , PB5 , AF2 ;
723
+
724
+ TIM3 , PinC1 , PC6 , AF2 ;
725
+ TIM3 , PinC2 , PC7 , AF2 ;
726
+ TIM3 , PinC3 , PC8 , AF2 ;
727
+ TIM3 , PinC4 , PC9 , AF2 ;
728
+
729
+ TIM4 , PinC1 , PB6 , AF2 ;
730
+ TIM4 , PinC2 , PB7 , AF2 ;
731
+ TIM4 , PinC3 , PB8 , AF2 ;
732
+ TIM4 , PinC4 , PB9 , AF2 ;
733
+
734
+ TIM4 , PinC1 , PD12 , AF2 ;
735
+ TIM4 , PinC2 , PD13 , AF2 ;
736
+ TIM4 , PinC3 , PD14 , AF2 ;
737
+ TIM4 , PinC4 , PD15 , AF2 ;
738
738
) ;
739
739
740
740
#[ cfg( any(
@@ -754,10 +754,10 @@ channel_impl!(
754
754
feature = "stm32f479"
755
755
) ) ]
756
756
channel_impl ! (
757
- TIM8 , PinC1 , PC6 , Alternate < AF3 > ;
758
- TIM8 , PinC2 , PC7 , Alternate < AF3 > ;
759
- TIM8 , PinC3 , PC8 , Alternate < AF3 > ;
760
- TIM8 , PinC4 , PC9 , Alternate < AF3 > ;
757
+ TIM8 , PinC1 , PC6 , AF3 ;
758
+ TIM8 , PinC2 , PC7 , AF3 ;
759
+ TIM8 , PinC3 , PC8 , AF3 ;
760
+ TIM8 , PinC4 , PC9 , AF3 ;
761
761
) ;
762
762
763
763
#[ cfg( any(
@@ -773,37 +773,37 @@ channel_impl!(
773
773
feature = "stm32f479"
774
774
) ) ]
775
775
channel_impl ! (
776
- TIM5 , PinC1 , PH10 , Alternate < AF2 > ;
777
- TIM5 , PinC2 , PH11 , Alternate < AF2 > ;
778
- TIM5 , PinC3 , PH12 , Alternate < AF2 > ;
779
- TIM5 , PinC4 , PI0 , Alternate < AF2 > ;
780
-
781
- TIM8 , PinC1 , PI5 , Alternate < AF3 > ;
782
- TIM8 , PinC2 , PI6 , Alternate < AF3 > ;
783
- TIM8 , PinC3 , PI7 , Alternate < AF3 > ;
784
- TIM8 , PinC4 , PI2 , Alternate < AF3 > ;
776
+ TIM5 , PinC1 , PH10 , AF2 ;
777
+ TIM5 , PinC2 , PH11 , AF2 ;
778
+ TIM5 , PinC3 , PH12 , AF2 ;
779
+ TIM5 , PinC4 , PI0 , AF2 ;
780
+
781
+ TIM8 , PinC1 , PI5 , AF3 ;
782
+ TIM8 , PinC2 , PI6 , AF3 ;
783
+ TIM8 , PinC3 , PI7 , AF3 ;
784
+ TIM8 , PinC4 , PI2 , AF3 ;
785
785
) ;
786
786
787
787
#[ cfg( any( feature = "stm32f412" , feature = "stm32f413" , feature = "stm32f423" ) ) ]
788
788
channel_impl ! (
789
- TIM5 , PinC1 , PF3 , Alternate < AF2 > ;
790
- TIM5 , PinC2 , PF4 , Alternate < AF2 > ;
791
- TIM5 , PinC3 , PF5 , Alternate < AF2 > ;
792
- TIM5 , PinC4 , PF10 , Alternate < AF2 > ;
789
+ TIM5 , PinC1 , PF3 , AF2 ;
790
+ TIM5 , PinC2 , PF4 , AF2 ;
791
+ TIM5 , PinC3 , PF5 , AF2 ;
792
+ TIM5 , PinC4 , PF10 , AF2 ;
793
793
) ;
794
794
795
795
#[ cfg( feature = "stm32f410" ) ]
796
796
channel_impl ! (
797
- TIM5 , PinC1 , PB12 , Alternate < AF2 > ;
798
- //TIM5, PinC2, PC10, Alternate< AF2> ;
799
- //TIM5, PinC3, PC11, Alternate< AF2> ;
800
- TIM5 , PinC4 , PB11 , Alternate < AF2 > ;
797
+ TIM5 , PinC1 , PB12 , AF2 ;
798
+ //TIM5, PinC2, PC10, AF2;
799
+ //TIM5, PinC3, PC11, AF2;
800
+ TIM5 , PinC4 , PB11 , AF2 ;
801
801
) ;
802
802
803
803
#[ cfg( feature = "stm32f446" ) ]
804
804
channel_impl ! (
805
- TIM2 , PinC1 , PB8 , Alternate < AF1 > ;
806
- TIM2 , PinC2 , PB9 , Alternate < AF1 > ;
805
+ TIM2 , PinC1 , PB8 , AF1 ;
806
+ TIM2 , PinC2 , PB9 , AF1 ;
807
807
808
- TIM2 , PinC4 , PB2 , Alternate < AF1 > ;
808
+ TIM2 , PinC4 , PB2 , AF1 ;
809
809
) ;
0 commit comments