Merge #418

418: const generics before mode r=therealprof a=burrbull

Requires Rust 1.59

Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -7,10 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+
+- Move pin mode at the end of generics, add defaults for modes,
+  bump MSRV to 1.59 [#418]
+
 ### Added
 
 - Support eMMC peripherals using SDIO module [#458]
 
+[#418]: https://github.com/stm32-rs/stm32f4xx-hal/pull/418
+[#458]: https://github.com/stm32-rs/stm32f4xx-hal/pull/458
+
 ## [v0.12.0] - 2022-02-23
 
 ### Changed

Cargo.toml

@@ -1,5 +1,6 @@
 [package]
-edition = "2018"
+edition = "2021"
+rust-version = "1.59"
 
 authors = ["Daniel Egger <[email protected]>"]
 categories = [

examples/i2s-audio-out-dma.rs

@@ -51,7 +51,7 @@ use stm32_i2s_v12x::{MasterClock, MasterConfig, Polarity, TransmitMode};
 use stm32f4xx_hal::dma::config::DmaConfig;
 use stm32f4xx_hal::dma::MemoryToPeripheral;
 use stm32f4xx_hal::dma::{Stream5, StreamsTuple, Transfer};
-use stm32f4xx_hal::gpio::{Alternate, PushPull, PA4, PC10, PC12, PC7};
+use stm32f4xx_hal::gpio::{Alternate, PA4, PC10, PC12, PC7};
 use stm32f4xx_hal::i2c::I2c;
 use stm32f4xx_hal::i2s::I2s;
 use stm32f4xx_hal::pac::{interrupt, Interrupt};
@@ -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>>,
+                PC10<Alternate<6>>,
+                PC7<Alternate<6>>,
+                PC12<Alternate<6>>,
             ),
         >,
         TransmitMode<Data16Frame16>,

examples/rtic-tick.rs

@@ -6,7 +6,7 @@ use panic_halt as _;
 #[rtic::app(device = stm32f4xx_hal::pac, dispatchers = [USART1])]
 mod app {
     use stm32f4xx_hal::{
-        gpio::{Output, PushPull, PC13},
+        gpio::{Output, PC13},
         pac,
         prelude::*,
         timer::MonoTimerUs,
@@ -17,7 +17,7 @@ mod app {
 
     #[local]
     struct Local {
-        led: PC13<Output<PushPull>>,
+        led: PC13<Output>,
     }
 
     #[monotonic(binds = TIM2, default = true)]

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>> {}
 }