const generics before mode

Author: burrbull

examples/i2s-audio-out-dma.rs

@@ -214,10 +214,10 @@ type I2sDmaTransfer = Transfer<
         I2s<
             SPI3,
             (
-                PA4<Alternate<PushPull, 6>>,
-                PC10<Alternate<PushPull, 6>>,
-                PC7<Alternate<PushPull, 6>>,
-                PC12<Alternate<PushPull, 6>>,
+                PA4<Alternate<6, PushPull>>,
+                PC10<Alternate<6, PushPull>>,
+                PC7<Alternate<6, PushPull>>,
+                PC12<Alternate<6, PushPull>>,
             ),
         >,
         TransmitMode<Data16Frame16>,

src/can.rs

@@ -27,8 +27,8 @@ pub trait Pins<CAN> {
 
 impl<CAN, TX, RX, const TXA: u8, const RXA: u8> Pins<CAN> for (TX, RX)
 where
-    TX: PinA<Tx, CAN, A = Const<TXA>> + SetAlternate<PushPull, TXA>,
-    RX: PinA<Rx, CAN, A = Const<RXA>> + SetAlternate<PushPull, RXA>,
+    TX: PinA<Tx, CAN, A = Const<TXA>> + SetAlternate<TXA, PushPull>,
+    RX: PinA<Rx, CAN, A = Const<RXA>> + SetAlternate<RXA, PushPull>,
 {
     fn set_alt_mode(&mut self) {
         self.0.set_alt_mode();

src/fsmc_lcd/pins.rs

@@ -604,7 +604,7 @@ mod common_pins {
     };
 
     // All FSMC/FMC pins use AF12
-    type FmcAlternate = Alternate<PushPull, 12>;
+    type FmcAlternate = Alternate<12, PushPull>;
 
     impl PinD2 for PD0<FmcAlternate> {}
     impl PinD3 for PD1<FmcAlternate> {}
@@ -723,36 +723,36 @@ mod extra_pins {
     };
 
     // Most FSMC/FMC pins use AF12, but a few use AF10
-    type FmcAlternate = Alternate<PushPull, 12>;
+    type FmcAlternate = Alternate<12, PushPull>;
 
     impl PinD4 for PA2<FmcAlternate> {}
     impl PinD5 for PA3<FmcAlternate> {}
     impl PinD6 for PA4<FmcAlternate> {}
     impl PinD7 for PA5<FmcAlternate> {}
     impl PinD13 for PB12<FmcAlternate> {}
-    impl PinD0 for PB14<Alternate<PushPull, 10>> {}
+    impl PinD0 for PB14<Alternate<10, PushPull>> {}
     impl PinWriteEnable for PC2<FmcAlternate> {}
     impl PinAddress for PC3<FmcAlternate> {}
     impl Sealed for PC3<FmcAlternate> {}
     impl PinChipSelect4 for PC4<FmcAlternate> {}
     impl Sealed for PC4<FmcAlternate> {}
     impl PinReadEnable for PC5<FmcAlternate> {}
-    impl PinD1 for PC6<Alternate<PushPull, 10>> {}
-    impl PinD2 for PC11<Alternate<PushPull, 10>> {}
-    impl PinD3 for PC12<Alternate<PushPull, 10>> {}
-    impl PinWriteEnable for PD2<Alternate<PushPull, 10>> {}
+    impl PinD1 for PC6<Alternate<10, PushPull>> {}
+    impl PinD2 for PC11<Alternate<10, PushPull>> {}
+    impl PinD3 for PC12<Alternate<10, PushPull>> {}
+    impl PinWriteEnable for PD2<Alternate<10, PushPull>> {}
 
     // Sealed trait boilerplate
     impl Sealed for PA2<FmcAlternate> {}
     impl Sealed for PA3<FmcAlternate> {}
     impl Sealed for PA4<FmcAlternate> {}
     impl Sealed for PA5<FmcAlternate> {}
     impl Sealed for PB12<FmcAlternate> {}
-    impl Sealed for PB14<Alternate<PushPull, 10>> {}
+    impl Sealed for PB14<Alternate<10, PushPull>> {}
     impl Sealed for PC2<FmcAlternate> {}
     impl Sealed for PC5<FmcAlternate> {}
-    impl Sealed for PC6<Alternate<PushPull, 10>> {}
-    impl Sealed for PC11<Alternate<PushPull, 10>> {}
-    impl Sealed for PC12<Alternate<PushPull, 10>> {}
-    impl Sealed for PD2<Alternate<PushPull, 10>> {}
+    impl Sealed for PC6<Alternate<10, PushPull>> {}
+    impl Sealed for PC11<Alternate<10, PushPull>> {}
+    impl Sealed for PC12<Alternate<10, PushPull>> {}
+    impl Sealed for PD2<Alternate<10, PushPull>> {}
 }

src/gpio.rs

@@ -99,7 +99,7 @@ pub trait PinExt {
 }
 
 /// Some alternate mode (type state)
-pub struct Alternate<Otype, const A: u8>(PhantomData<Otype>);
+pub struct Alternate<const A: u8, Otype>(PhantomData<Otype>);
 
 /// Input mode (type state)
 pub struct Input<MODE> {
@@ -129,7 +129,7 @@ pub struct PushPull;
 /// Analog mode (type state)
 pub struct Analog;
 
-pub type Debugger = Alternate<PushPull, 0>;
+pub type Debugger = Alternate<0, PushPull>;
 
 /// GPIO Pin speed selection
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
@@ -262,16 +262,16 @@ where
 /// - `MODE` is one of the pin modes (see [Modes](crate::gpio#modes) section).
 /// - `P` is port name: `A` for GPIOA, `B` for GPIOB, etc.
 /// - `N` is pin number: from `0` to `15`.
-pub struct Pin<MODE, const P: char, const N: u8> {
+pub struct Pin<const P: char, const N: u8, MODE> {
     _mode: PhantomData<MODE>,
 }
-impl<MODE, const P: char, const N: u8> Pin<MODE, P, N> {
+impl<const P: char, const N: u8, MODE> Pin<P, N, MODE> {
     const fn new() -> Self {
         Self { _mode: PhantomData }
     }
 }
 
-impl<MODE, const P: char, const N: u8> fmt::Debug for Pin<MODE, P, N> {
+impl<const P: char, const N: u8, MODE> fmt::Debug for Pin<P, N, MODE> {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         formatter.write_fmt(format_args!(
             "P{}{}<{}>",
@@ -283,13 +283,13 @@ impl<MODE, const P: char, const N: u8> fmt::Debug for Pin<MODE, P, N> {
 }
 
 #[cfg(feature = "defmt")]
-impl<MODE, const P: char, const N: u8> defmt::Format for Pin<MODE, P, N> {
+impl<const P: char, const N: u8, MODE> defmt::Format for Pin<P, N, MODE> {
     fn format(&self, f: defmt::Formatter) {
         defmt::write!(f, "P{}{}<{}>", P, N, crate::stripped_type_name::<MODE>());
     }
 }
 
-impl<MODE, const P: char, const N: u8> PinExt for Pin<MODE, P, N> {
+impl<const P: char, const N: u8, MODE> PinExt for Pin<P, N, MODE> {
     type Mode = MODE;
 
     #[inline(always)]
@@ -302,7 +302,7 @@ impl<MODE, const P: char, const N: u8> PinExt for Pin<MODE, P, N> {
     }
 }
 
-impl<MODE, const P: char, const N: u8> Pin<Output<MODE>, P, N> {
+impl<const P: char, const N: u8, MODE> Pin<P, N, Output<MODE>> {
     /// Set pin speed
     pub fn set_speed(self, speed: Speed) -> Self {
         let offset = 2 * { N };
@@ -317,7 +317,7 @@ impl<MODE, const P: char, const N: u8> Pin<Output<MODE>, P, N> {
     }
 }
 
-impl<const P: char, const N: u8> Pin<Output<OpenDrain>, P, N> {
+impl<const P: char, const N: u8> Pin<P, N, Output<OpenDrain>> {
     /// Enables / disables the internal pull up
     pub fn internal_pull_up(self, on: bool) -> Self {
         let offset = 2 * { N };
@@ -345,7 +345,7 @@ impl<const P: char, const N: u8> Pin<Output<OpenDrain>, P, N> {
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> Pin<Alternate<PushPull, A>, P, N> {
+impl<const P: char, const N: u8, const A: u8> Pin<P, N, Alternate<A, PushPull>> {
     /// Set pin speed
     pub fn set_speed(self, speed: Speed) -> Self {
         let offset = 2 * { N };
@@ -386,9 +386,9 @@ impl<const P: char, const N: u8, const A: u8> Pin<Alternate<PushPull, A>, P, N>
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> Pin<Alternate<PushPull, A>, P, N> {
+impl<const P: char, const N: u8, const A: u8> Pin<P, N, Alternate<A, PushPull>> {
     /// Turns pin alternate configuration pin into open drain
-    pub fn set_open_drain(self) -> Pin<Alternate<OpenDrain, A>, P, N> {
+    pub fn set_open_drain(self) -> Pin<P, N, Alternate<A, OpenDrain>> {
         let offset = { N };
         unsafe {
             (*Gpio::<P>::ptr())
@@ -400,12 +400,12 @@ impl<const P: char, const N: u8, const A: u8> Pin<Alternate<PushPull, A>, P, N>
     }
 }
 
-impl<MODE, const P: char, const N: u8> Pin<MODE, P, N> {
+impl<const P: char, const N: u8, MODE> Pin<P, N, MODE> {
     /// Erases the pin number from the type
     ///
     /// This is useful when you want to collect the pins into an array where you
     /// need all the elements to have the same type
-    pub fn erase_number(self) -> PEPin<MODE, P> {
+    pub fn erase_number(self) -> PEPin<P, MODE> {
         PEPin::new(N)
     }
 
@@ -418,7 +418,7 @@ impl<MODE, const P: char, const N: u8> Pin<MODE, P, N> {
     }
 }
 
-impl<MODE, const P: char, const N: u8> Pin<MODE, P, N> {
+impl<const P: char, const N: u8, MODE> Pin<P, N, MODE> {
     /// Set the output of the pin regardless of its mode.
     /// Primarily used to set the output value of the pin
     /// before changing its mode to an output to avoid
@@ -452,7 +452,7 @@ impl<MODE, const P: char, const N: u8> Pin<MODE, P, N> {
     }
 }
 
-impl<MODE, const P: char, const N: u8> Pin<Output<MODE>, P, N> {
+impl<const P: char, const N: u8, MODE> Pin<P, N, Output<MODE>> {
     #[inline(always)]
     pub fn set_high(&mut self) {
         self._set_high()
@@ -500,7 +500,7 @@ impl<MODE, const P: char, const N: u8> Pin<Output<MODE>, P, N> {
     }
 }
 
-impl<const P: char, const N: u8> Pin<Output<OpenDrain>, P, N> {
+impl<const P: char, const N: u8> Pin<P, N, Output<OpenDrain>> {
     #[inline(always)]
     pub fn is_high(&self) -> bool {
         !self.is_low()
@@ -512,7 +512,7 @@ impl<const P: char, const N: u8> Pin<Output<OpenDrain>, P, N> {
     }
 }
 
-impl<MODE, const P: char, const N: u8> Pin<Input<MODE>, P, N> {
+impl<const P: char, const N: u8, MODE> Pin<P, N, Input<MODE>> {
     #[inline(always)]
     pub fn is_high(&self) -> bool {
         !self.is_low()
@@ -564,10 +564,10 @@ macro_rules! gpio {
                 }
             }
 
-            pub type $PXn<MODE> = super::PEPin<MODE, $port_id>;
+            pub type $PXn<MODE> = super::PEPin<$port_id, MODE>;
 
             $(
-                pub type $PXi<MODE> = super::Pin<MODE, $port_id, $i>;
+                pub type $PXi<MODE> = super::Pin<$port_id, $i, MODE>;
             )+
 
         }

src/gpio/alt.rs

@@ -3,16 +3,16 @@ use crate::{gpio, i2c, i2s, pac, serial, spi};
 
 pub struct Const<const A: u8>;
 
-pub trait SetAlternate<Otype, const A: u8> {
+pub trait SetAlternate<const A: u8, Otype> {
     fn set_alt_mode(&mut self);
     fn restore_mode(&mut self);
 }
-impl<Otype> SetAlternate<Otype, 0> for NoPin {
+impl<Otype> SetAlternate<0, Otype> for NoPin {
     fn set_alt_mode(&mut self) {}
     fn restore_mode(&mut self) {}
 }
-impl<MODE: PinMode, const P: char, const N: u8, const A: u8> SetAlternate<PushPull, A>
-    for Pin<MODE, P, N>
+impl<const P: char, const N: u8, MODE: PinMode, const A: u8> SetAlternate<A, PushPull>
+    for Pin<P, N, MODE>
 {
     fn set_alt_mode(&mut self) {
         self.set_alternate::<A>();
@@ -23,8 +23,8 @@ impl<MODE: PinMode, const P: char, const N: u8, const A: u8> SetAlternate<PushPu
     }
 }
 
-impl<MODE: PinMode, const P: char, const N: u8, const A: u8> SetAlternate<OpenDrain, A>
-    for Pin<MODE, P, N>
+impl<const P: char, const N: u8, MODE: PinMode, const A: u8> SetAlternate<A, OpenDrain>
+    for Pin<P, N, MODE>
 {
     fn set_alt_mode(&mut self) {
         self.set_alternate::<A>();
@@ -40,15 +40,15 @@ impl<MODE: PinMode, const P: char, const N: u8, const A: u8> SetAlternate<OpenDr
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> SetAlternate<PushPull, A>
-    for Pin<Alternate<PushPull, A>, P, N>
+impl<const P: char, const N: u8, const A: u8> SetAlternate<A, PushPull>
+    for Pin<P, N, Alternate<A, PushPull>>
 {
     fn set_alt_mode(&mut self) {}
     fn restore_mode(&mut self) {}
 }
 
-impl<const P: char, const N: u8, const A: u8> SetAlternate<OpenDrain, A>
-    for Pin<Alternate<OpenDrain, A>, P, N>
+impl<const P: char, const N: u8, const A: u8> SetAlternate<A, OpenDrain>
+    for Pin<P, N, Alternate<A, OpenDrain>>
 {
     fn set_alt_mode(&mut self) {}
     fn restore_mode(&mut self) {}