alt-pwm

Author: burrbull

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-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();