fix PwmExt

Author: burrbull

examples/pwm-sinus.rs

@@ -20,7 +20,7 @@ fn main() -> ! {
         let gpioa = dp.GPIOA.split();
         let channels = (gpioa.pa8.into_alternate(), gpioa.pa9.into_alternate());
 
-        let mut pwm = dp.TIM1.pwm_us(&clocks, channels, 100.micros());
+        let mut pwm = dp.TIM1.pwm_us(channels, 100.micros(), &clocks);
         let mut counter = dp.TIM2.counter_us(&clocks);
         let max_duty = pwm.get_max_duty();
 

examples/pwm.rs

@@ -18,7 +18,7 @@ fn main() -> ! {
         let gpioa = dp.GPIOA.split();
         let channels = (gpioa.pa8.into_alternate(), gpioa.pa9.into_alternate());
 
-        let pwm = dp.TIM1.pwm_hz(&clocks, channels, 20.kHz()).split();
+        let pwm = dp.TIM1.pwm_hz(channels, 20.kHz(), &clocks).split();
         let (mut ch1, _ch2) = pwm;
         let max_duty = ch1.get_max_duty();
         ch1.set_duty(max_duty / 2);

src/timer.rs

@@ -726,7 +726,6 @@ impl<TIM: Instance + MasterTimer, const FREQ: u32> FTimer<TIM, FREQ> {
 pub(crate) const fn compute_arr_presc(freq: u32, clock: u32) -> (u16, u32) {
     let ticks = clock / freq;
     let psc = (ticks - 1) / (1 << 16);
-    assert!(psc <= u16::MAX as u32);
     let arr = ticks / (psc + 1) - 1;
     (psc as u16, arr)
 }

src/timer/pwm.rs

@@ -90,45 +90,56 @@ where
 {
 }
 
-pub trait PwmExt<P, PINS>
+pub trait PwmExt
 where
     Self: Sized + Instance + WithPwm,
-    PINS: Pins<Self, P>,
 {
-    fn pwm<const FREQ: u32>(
+    fn pwm<P, PINS, const FREQ: u32>(
         self,
-        clocks: &Clocks,
         pins: PINS,
         time: TimerDurationU32<FREQ>,
-    ) -> Pwm<Self, P, PINS, FREQ>;
+        clocks: &Clocks,
+    ) -> Pwm<Self, P, PINS, FREQ>
+    where
+        PINS: Pins<Self, P>;
 
-    fn pwm_hz(self, clocks: &Clocks, pins: PINS, freq: Hertz) -> PwmHz<Self, P, PINS>;
+    fn pwm_hz<P, PINS>(self, pins: PINS, freq: Hertz, clocks: &Clocks) -> PwmHz<Self, P, PINS>
+    where
+        PINS: Pins<Self, P>;
 
-    fn pwm_us(
+    fn pwm_us<P, PINS>(
         self,
-        clocks: &Clocks,
         pins: PINS,
         time: TimerDurationU32<1_000_000>,
-    ) -> Pwm<Self, P, PINS, 1_000_000> {
-        self.pwm::<1_000_000>(clocks, pins, time)
+        clocks: &Clocks,
+    ) -> Pwm<Self, P, PINS, 1_000_000>
+    where
+        PINS: Pins<Self, P>,
+    {
+        self.pwm::<_, _, 1_000_000>(pins, time, clocks)
     }
 }
 
-impl<TIM, P, PINS> PwmExt<P, PINS> for TIM
+impl<TIM> PwmExt for TIM
 where
     Self: Sized + Instance + WithPwm,
-    PINS: Pins<Self, P>,
 {
-    fn pwm<const FREQ: u32>(
+    fn pwm<P, PINS, const FREQ: u32>(
         self,
-        clocks: &Clocks,
         pins: PINS,
         time: TimerDurationU32<FREQ>,
-    ) -> Pwm<TIM, P, PINS, FREQ> {
+        clocks: &Clocks,
+    ) -> Pwm<TIM, P, PINS, FREQ>
+    where
+        PINS: Pins<Self, P>,
+    {
         FTimer::<Self, FREQ>::new(self, clocks).pwm(pins, time)
     }
 
-    fn pwm_hz(self, clocks: &Clocks, pins: PINS, time: Hertz) -> PwmHz<TIM, P, PINS> {
+    fn pwm_hz<P, PINS>(self, pins: PINS, time: Hertz, clocks: &Clocks) -> PwmHz<TIM, P, PINS>
+    where
+        PINS: Pins<Self, P>,
+    {
         Timer::new(self, clocks).pwm_hz(pins, time)
     }
 }