Merge #604

604: generic alt enums + pwm channel builders r=therealprof a=burrbull

cc `@therealprof` 

cc `@janschiefer`
I planning to change API for passing pins in PWM constructors. Now you need to specify channel number manually. See examples:
https://github.com/stm32-rs/stm32f4xx-hal/blob/alt-pwm-simple/examples/pwm-dead-time.rs
https://github.com/stm32-rs/stm32f4xx-hal/blob/alt-pwm-simple/examples/pwm.rs
Could you test, please?

Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Author: bors[bot]

CHANGELOG.md

@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  - Split SPI master and slave implementations [#609]
  - Split USART and UART implementations [#608]
  - Add `lapce` editor settings [#601]
- - Use `enum`s for alternate peripheral pins [#594] [#610]
+ - Use `enum`s for alternate peripheral pins (generic over otype) [#594] [#596] [#600] [#610]
  - Added missing U(S)ART DMA traits for HAL serial types [#593]
  - Improve SPI::new* docs [#587]
  - Add advanced timer dead time insertion example [#585]
@@ -65,6 +65,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#577]: https://github.com/stm32-rs/stm32f4xx-hal/pull/577
 [#578]: https://github.com/stm32-rs/stm32f4xx-hal/pull/578
 [#581]: https://github.com/stm32-rs/stm32f4xx-hal/pull/581
+[#594]: https://github.com/stm32-rs/stm32f4xx-hal/pull/594
+[#595]: https://github.com/stm32-rs/stm32f4xx-hal/pull/595
+[#596]: https://github.com/stm32-rs/stm32f4xx-hal/pull/596
+[#599]: https://github.com/stm32-rs/stm32f4xx-hal/pull/599
+[#601]: https://github.com/stm32-rs/stm32f4xx-hal/pull/601
+[#603]: https://github.com/stm32-rs/stm32f4xx-hal/pull/603
+[#600]: https://github.com/stm32-rs/stm32f4xx-hal/pull/600
 
 
 ## [v0.14.0] - 2022-12-12

examples/i2s-audio-out.rs

@@ -104,7 +104,7 @@ fn main() -> ! {
         .i2s_clk(61440.kHz())
         .freeze();
 
-    let i2s_pins = (gpioa.pa4, gpioc.pc10, NoPin, gpioc.pc12);
+    let i2s_pins = (gpioa.pa4, gpioc.pc10, NoPin::new(), gpioc.pc12);
     let i2s = I2s::new(dp.SPI3, i2s_pins, &clocks);
     let i2s_config = I2sTransferConfig::new_master()
         .transmit()

examples/ist7920-bidi-normal-spi.rs

@@ -29,7 +29,7 @@ fn main() -> ! {
     led.set_low();
 
     let sck = gpiob.pb3.into_alternate();
-    let miso = NoMiso {};
+    let miso = NoMiso::new();
     let mosi = gpiob.pb5.into_alternate();
 
     let dc = gpiob.pb4.into_push_pull_output();

examples/pwm-dead-time.rs

@@ -9,7 +9,12 @@ use panic_halt as _; // panic handler
 use cortex_m_rt::entry;
 use stm32f4xx_hal as hal;
 
-use crate::hal::{pac, prelude::*, timer::Channel, timer::Polarity};
+use hal::{
+    pac,
+    prelude::*,
+    timer::Channel,
+    timer::{Channel1, Polarity},
+};
 
 #[entry]
 fn main() -> ! {
@@ -20,7 +25,7 @@ fn main() -> ! {
 
         let gpioa = dp.GPIOA.split();
 
-        let channels = (gpioa.pa8.into_alternate(), gpioa.pa7.into_alternate());
+        let channels = Channel1::new(gpioa.pa8).with_complementary(gpioa.pa7);
 
         let mut pwm = dp.TIM1.pwm_hz(channels, 20.kHz(), &clocks);
 

examples/pwm-input.rs

@@ -6,7 +6,11 @@
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-use stm32f4xx_hal::{pac, prelude::*, timer::Timer};
+use stm32f4xx_hal::{
+    pac,
+    prelude::*,
+    timer::{Channel1, Channel2, Timer},
+};
 
 #[entry]
 fn main() -> ! {
@@ -18,7 +22,7 @@ fn main() -> ! {
         let gpioa = dp.GPIOA.split();
         let gpioc = dp.GPIOC.split();
 
-        let channels = (gpioa.pa8.into_alternate(), gpioa.pa9.into_alternate());
+        let channels = (Channel1::new(gpioa.pa8), Channel2::new(gpioa.pa9));
         // configure tim1 as a PWM output of known frequency.
         let pwm = Timer::new(dp.TIM1, &clocks).pwm_hz(channels, 501.Hz());
         let (mut ch1, _ch2) = pwm.split();

examples/pwm-sinus.rs

@@ -8,7 +8,11 @@ use panic_halt as _;
 use core::f32::consts::FRAC_PI_2;
 use cortex_m_rt::entry;
 use micromath::F32Ext;
-use stm32f4xx_hal::{pac, prelude::*, timer::Channel};
+use stm32f4xx_hal::{
+    pac,
+    prelude::*,
+    timer::{Channel, Channel1, Channel2},
+};
 
 #[entry]
 fn main() -> ! {
@@ -18,7 +22,7 @@ fn main() -> ! {
         let clocks = rcc.cfgr.use_hse(25.MHz()).freeze();
 
         let gpioa = dp.GPIOA.split();
-        let channels = (gpioa.pa8.into_alternate(), gpioa.pa9.into_alternate());
+        let channels = (Channel1::new(gpioa.pa8), Channel2::new(gpioa.pa9));
 
         let mut pwm = dp.TIM1.pwm_us(channels, 100.micros(), &clocks);
         let mut counter = dp.TIM2.counter_us(&clocks);

examples/pwm.rs

@@ -6,7 +6,11 @@
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-use stm32f4xx_hal::{pac, prelude::*};
+use stm32f4xx_hal::{
+    pac,
+    prelude::*,
+    timer::{Channel1, Channel2},
+};
 
 #[entry]
 fn main() -> ! {
@@ -16,7 +20,7 @@ fn main() -> ! {
         let clocks = rcc.cfgr.freeze();
 
         let gpioa = dp.GPIOA.split();
-        let channels = (gpioa.pa8.into_alternate(), gpioa.pa9.into_alternate());
+        let channels = (Channel1::new(gpioa.pa8), Channel2::new(gpioa.pa9));
 
         let pwm = dp.TIM1.pwm_hz(channels, 20.kHz(), &clocks).split();
         let (mut ch1, _ch2) = pwm;

examples/rtic-i2s-audio-in-out.rs

@@ -188,7 +188,7 @@ mod app {
         i2s2_driver.set_error_interrupt(true);
 
         // I2S3 pins: (WS, CK, NoPin, SD) for I2S3
-        let i2s3_pins = (gpioa.pa4, gpioc.pc10, NoPin, gpioc.pc12);
+        let i2s3_pins = (gpioa.pa4, gpioc.pc10, NoPin::new(), gpioc.pc12);
         let i2s3 = I2s::new(device.SPI3, i2s3_pins, &clocks);
         let i2s3_config = i2s2_config.to_slave().transmit();
         let mut i2s3_driver = I2sDriver::new(i2s3, i2s3_config);

examples/rtic-tick.rs

@@ -36,11 +36,6 @@ mod app {
         (Shared {}, Local { led }, init::Monotonics(mono))
     }
 
-    #[idle]
-    fn idle(_: idle::Context) -> ! {
-        loop {}
-    }
-
     #[task(local = [led])]
     fn tick(ctx: tick::Context) {
         tick::spawn_after(1.secs()).ok();

examples/spi-dma.rs

@@ -55,7 +55,7 @@ fn main() -> ! {
             phase: Phase::CaptureOnFirstTransition,
         };
 
-        let spi2 = Spi::new(dp.SPI2, (pb13, NoMiso {}, pb15), mode, 3.MHz(), &clocks);
+        let spi2 = Spi::new(dp.SPI2, (pb13, NoMiso::new(), pb15), mode, 3.MHz(), &clocks);
 
         let buffer = cortex_m::singleton!(: [u8; ARRAY_SIZE] = [1; ARRAY_SIZE]).unwrap();