init channels after Pwm

Author: burrbull

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Breaking changes
+
+- move pin connecting to timer channels after `Pwm` initialization [#517]
+
+[#517]: https://github.com/stm32-rs/stm32f1xx-hal/pull/517
+
 ## [v0.11.0] - 2025-09-09
 
 ### Breaking changes

examples/pwm.rs

@@ -9,103 +9,78 @@ use panic_halt as _;
 
 use cortex_m::asm;
 use cortex_m_rt::entry;
-use stm32f1xx_hal::{
-    pac,
-    prelude::*,
-    time::ms,
-    timer::{Channel, Tim2NoRemap},
-};
+use stm32f1xx_hal::{pac, prelude::*, time::ms};
 
 #[entry]
 fn main() -> ! {
     let p = pac::Peripherals::take().unwrap();
 
     let mut rcc = p.RCC.constrain();
 
-    let mut afio = p.AFIO.constrain(&mut rcc);
-
-    let mut gpioa = p.GPIOA.split(&mut rcc);
+    let gpioa = p.GPIOA.split(&mut rcc);
     // let mut gpiob = p.GPIOB.split(&mut rcc);
 
     // TIM2
-    let c1 = gpioa.pa0.into_alternate_push_pull(&mut gpioa.crl);
-    let c2 = gpioa.pa1.into_alternate_push_pull(&mut gpioa.crl);
-    let c3 = gpioa.pa2.into_alternate_push_pull(&mut gpioa.crl);
+    let c1 = gpioa.pa0;
+    let c2 = gpioa.pa1;
+    let c3 = gpioa.pa2;
     // If you don't want to use all channels, just leave some out
-    // let c4 = gpioa.pa3.into_alternate_push_pull(&mut gpioa.crl);
-    let pins = (c1, c2, c3);
+    // let c4 = gpioa.pa3;
 
     // TIM3
-    // let c1 = gpioa.pa6.into_alternate_push_pull(&mut gpioa.crl);
-    // let c2 = gpioa.pa7.into_alternate_push_pull(&mut gpioa.crl);
-    // let c3 = gpiob.pb0.into_alternate_push_pull(&mut gpiob.crl);
-    // let c4 = gpiob.pb1.into_alternate_push_pull(&mut gpiob.crl);
+    // let c1 = gpioa.pa6;
+    // let c2 = gpioa.pa7;
+    // let c3 = gpiob.pb0;
+    // let c4 = gpiob.pb1;
 
     // TIM4 (Only available with the "medium" density feature)
-    // let c1 = gpiob.pb6.into_alternate_push_pull(&mut gpiob.crl);
-    // let c2 = gpiob.pb7.into_alternate_push_pull(&mut gpiob.crl);
-    // let c3 = gpiob.pb8.into_alternate_push_pull(&mut gpiob.crh);
-    // let c4 = gpiob.pb9.into_alternate_push_pull(&mut gpiob.crh);
+    // let c1 = gpiob.pb6;
+    // let c2 = gpiob.pb7;
+    // let c3 = gpiob.pb8;
+    // let c4 = gpiob.pb9;
 
     //let mut pwm =
-    //    Timer::new(p.TIM2, &mut rcc).pwm_hz::<Tim2NoRemap, _, _>(pins, &mut afio.mapr, 1.kHz());
+    //    Timer::new(p.TIM2, &mut rcc).pwm_hz(pins, 1.kHz());
     // or
-    let mut pwm = p
-        .TIM2
-        .pwm_hz::<Tim2NoRemap, _, _>(pins, &mut afio.mapr, 1.kHz(), &mut rcc);
+    let (mut pwm_mgr, (pwm_c1, pwm_c2, pwm_c3, ..)) = p.TIM2.pwm_hz(1.kHz(), &mut rcc);
 
     // Enable clock on each of the channels
-    pwm.enable(Channel::C1);
-    pwm.enable(Channel::C2);
-    pwm.enable(Channel::C3);
+    let mut c1 = pwm_c1.with(c1);
+    c1.enable();
+    let mut c2 = pwm_c2.with(c2);
+    c2.enable();
+    let mut c3 = pwm_c3.with(c3);
+    c3.enable();
 
     //// Operations affecting all defined channels on the Timer
 
     // Adjust period to 0.5 seconds
-    pwm.set_period(ms(500).into_rate());
+    pwm_mgr.set_period(ms(500).into_rate());
 
     asm::bkpt();
 
     // Return to the original frequency
-    pwm.set_period(1.kHz());
+    pwm_mgr.set_period(1.kHz());
 
     asm::bkpt();
 
-    let max = pwm.get_max_duty();
+    let max = pwm_mgr.get_max_duty();
 
     //// Operations affecting single channels can be accessed through
     //// the Pwm object or via dereferencing to the pin.
 
     // Use the Pwm object to set C3 to full strength
-    pwm.set_duty(Channel::C3, max);
+    c3.set_duty(max);
 
     asm::bkpt();
 
     // Use the Pwm object to set C3 to be dim
-    pwm.set_duty(Channel::C3, max / 4);
+    c3.set_duty(max / 4);
 
     asm::bkpt();
 
     // Use the Pwm object to set C3 to be zero
-    pwm.set_duty(Channel::C3, 0);
-
-    asm::bkpt();
-
-    // Extract the PwmChannel for C3
-    let mut pwm_channel = pwm.split().2;
-
-    // Use the PwmChannel object to set C3 to be full strength
-    pwm_channel.set_duty(max);
-
-    asm::bkpt();
-
-    // Use the PwmChannel object to set C3 to be dim
-    pwm_channel.set_duty(max / 4);
-
-    asm::bkpt();
-
-    // Use the PwmChannel object to set C3 to be zero
-    pwm_channel.set_duty(0);
+    c3.set_duty(0);
 
     asm::bkpt();
 

examples/pwm_custom.rs

@@ -8,7 +8,7 @@
 use panic_halt as _;
 
 use cortex_m::asm;
-use stm32f1xx_hal::{pac, prelude::*, timer::Timer};
+use stm32f1xx_hal::{pac, prelude::*};
 
 use cortex_m_rt::entry;
 
@@ -27,30 +27,31 @@ fn main() -> ! {
     let p0 = pb4.into_alternate_push_pull(&mut gpiob.crl);
     let p1 = gpiob.pb5.into_alternate_push_pull(&mut gpiob.crl);
 
-    let pwm = Timer::new(p.TIM3, &mut rcc).pwm_hz((p0, p1), &mut afio.mapr, 1.kHz());
+    let (pwm, pwm_channels) = p.TIM3.remap(&mut afio.mapr).pwm_hz(1.kHz(), &mut rcc);
 
     let max = pwm.get_max_duty();
 
-    let mut pwm_channels = pwm.split();
+    let mut c1 = pwm_channels.0.with(p0);
+    let mut c2 = pwm_channels.1.with(p1);
 
     // Enable the individual channels
-    pwm_channels.0.enable();
-    pwm_channels.1.enable();
+    c1.enable();
+    c2.enable();
 
     // full
-    pwm_channels.0.set_duty(max);
-    pwm_channels.1.set_duty(max);
+    c1.set_duty(max);
+    c2.set_duty(max);
 
     asm::bkpt();
 
     // dim
-    pwm_channels.1.set_duty(max / 4);
+    c2.set_duty(max / 4);
 
     asm::bkpt();
 
     // zero
-    pwm_channels.0.set_duty(0);
-    pwm_channels.1.set_duty(0);
+    c1.set_duty(0);
+    c2.set_duty(0);
 
     asm::bkpt();
 

src/rcc.rs

@@ -207,6 +207,7 @@ impl Rcc {
     /// let clocks = rcc.freeze(rcc::Config::default(), &mut flash.acr);
     /// ```
     #[inline(always)]
+    #[allow(unused)]
     pub fn freeze(self, cfg: impl Into<RawConfig>, acr: &mut ACR) -> Self {
         let cfg = cfg.into();
         let clocks = cfg.get_clocks();

src/timer.rs

@@ -48,6 +48,7 @@
 */
 #![allow(non_upper_case_globals)]
 
+use crate::afio::Rmp;
 use crate::bb;
 use crate::pac::{self, DBGMCU as DBG};
 
@@ -62,10 +63,8 @@ use crate::time::Hertz;
 pub mod monotonic;
 #[cfg(feature = "rtic")]
 pub use monotonic::*;
-pub(crate) mod pins;
-pub mod pwm_input;
-pub use pins::*;
 pub mod delay;
+pub mod pwm_input;
 pub use delay::*;
 pub mod counter;
 pub use counter::*;
@@ -90,6 +89,15 @@ pub enum Channel {
     C4 = 3,
 }
 
+pub use crate::afio::{TimC, TimNC};
+
+/// Channel wrapper
+pub struct Ch<const C: u8, const COMP: bool>;
+pub const C1: u8 = 0;
+pub const C2: u8 = 1;
+pub const C3: u8 = 2;
+pub const C4: u8 = 3;
+
 /// Enum for IO polarity
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Polarity {
@@ -329,6 +337,11 @@ mod sealed {
         type Mms;
         fn master_mode(&mut self, mode: Self::Mms);
     }
+
+    pub trait Split {
+        type Channels;
+        fn split() -> Self::Channels;
+    }
 }
 pub(crate) use sealed::{Advanced, General, MasterTimer, WithPwm, WithPwmCommon};
 
@@ -337,6 +350,33 @@ pub trait Instance:
 {
 }
 
+use sealed::Split;
+macro_rules! split {
+    ($TIM:ty: 1) => {
+        split!($TIM, C1);
+    };
+    ($TIM:ty: 2) => {
+        split!($TIM, C1, C2);
+    };
+    ($TIM:ty: 4) => {
+        split!($TIM, C1, C2, C3, C4);
+    };
+    ($TIM:ty, $($C:ident),+) => {
+        impl Split for $TIM {
+            type Channels = ($(PwmChannelDisabled<$TIM, $C, 0>,)+);
+            fn split() -> Self::Channels {
+                ($(PwmChannelDisabled::<_, $C, 0>::new(),)+)
+            }
+        }
+        impl<const R: u8> Split for Rmp<$TIM, R> {
+            type Channels = ($(PwmChannelDisabled<$TIM, $C, R>,)+);
+            fn split() -> Self::Channels {
+                ($(PwmChannelDisabled::<_, $C, R>::new(),)+)
+            }
+        }
+    };
+}
+
 macro_rules! hal {
     ($TIM:ty: [
         $Timer:ident,
@@ -531,6 +571,7 @@ macro_rules! hal {
             )?
 
             with_pwm!($TIM: $cnum $(, $aoe)?);
+            split!($TIM: $cnum);
         )?
 
         $(impl MasterTimer for $TIM {