Examples for all devices compiles

Author: usbalbin

examples/stm32f3/hrtim.rs

@@ -7,13 +7,13 @@ use stm32_hrtim::{
     compare_register::HrCompareRegister, control::HrControltExt, output::HrOutput, timer::HrTimer,
     HrParts, HrPwmAdvExt, Pscl4,
 };
-use stm32g4xx_hal::{
-    delay::{DelayExt, SYSTDelayExt},
+use stm32f3xx_hal::{
+    delay::Delay,
+    flash::FlashExt as _,
     gpio::GpioExt,
-    pwr::PwrExt,
-    rcc::{self, RccExt},
-    stm32::{CorePeripherals, Peripherals},
-    time::ExtU32,
+    pac::{CorePeripherals, Peripherals},
+    prelude::{_embedded_hal_blocking_delay_DelayMs, _stm32f3xx_hal_time_rate_Extensions},
+    rcc::RccExt,
 };
 
 #[entry]
@@ -22,18 +22,28 @@ fn main() -> ! {
 
     let dp = Peripherals::take().expect("cannot take peripherals");
     let cp = CorePeripherals::take().expect("cannot take core");
-    // Set system frequency to 16MHz * 15/1/2 = 120MHz
-    // This would lead to HrTim running at 120MHz * 32 = 3.84...
-    let pwr = dp.PWR.constrain().freeze();
-    let mut rcc = Input to hrtim needs to be 128MHz when using HSI, 128-144 with HSE
 
-    let mut delay = cp.SYST.delay(&rcc.clocks);
+    let mut flash = dp.FLASH.constrain();
+    let mut rcc = dp.RCC.constrain();
+    let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
+
+    //let mut rcc = Input to hrtim needs to be 128MHz when using HSI, 128-144 with HSE
+
+    // Set system frequency to 64MHz using PLL, PLLCLKx2 will thus be 128MHz which
+    // feeds into the HRTIM. This and the HRTIM's DLL would lead to an effective
+    // HRTIM frequency of 128MHz * 32 = 4.096GHz...
+    let clocks = rcc
+        .cfgr
+        .sysclk(64_u32.MHz())
+        .use_pll()
+        .freeze(&mut flash.acr);
+
+    let mut delay = Delay::new(cp.SYST, clocks);
 
     // ...with a prescaler of 4 this gives us a HrTimer with a tick rate of 960MHz
     // With max the max period set, this would be 960MHz/2^16 ~= 15kHz...
     let prescaler = Pscl4;
 
-    let gpioa = dp.GPIOA.split(&mut rcc);
     let pin_a = gpioa.pa8;
     let pin_b = gpioa.pa9;
 
@@ -49,7 +59,10 @@ fn main() -> ! {
     // ------------------------    ----------------------------    ----
     //        .               .               .               .
     //        .               .               .               .
-    let (hr_control, ..) = dp.HRTIM_COMMON.hr_control(&mut rcc).wait_for_calibration();
+    let (hr_control, ..) = dp
+        .HRTIM_COMMON
+        .hr_control(&clocks, &mut rcc.apb2)
+        .wait_for_calibration();
     let mut hr_control = hr_control.constrain();
 
     let HrParts {
@@ -59,14 +72,19 @@ fn main() -> ! {
         ..
     } = dp
         .HRTIM_TIMA
-        .pwm_advanced((pin_a, pin_b), &mut rcc)
+        .pwm_advanced((pin_a, pin_b))
         .prescaler(prescaler)
         .period(0xFFFF)
         .push_pull_mode(true) // Set push pull mode, out1 and out2 are
         // alternated every period with one being
         // inactive and the other getting to output its wave form
         // as normal
-        .finalize(&mut hr_control);
+        .finalize(
+            &mut hr_control,
+            &mut gpioa.moder,
+            &mut gpioa.otyper,
+            &mut gpioa.afrh,
+        );
 
     out1.enable_rst_event(&cr1); // Set low on compare match with cr1
     out2.enable_rst_event(&cr1);
@@ -85,7 +103,7 @@ fn main() -> ! {
             cr1.set_duty(new_period / 3);
             timer.set_period(new_period);
 
-            delay.delay(500_u32.millis());
+            delay.delay_ms(500_u16);
         }
     }
 }

src/control.rs

@@ -17,19 +17,30 @@ use stm32::HRTIM_COMMON;
 use super::{external_event::EevInputs, fault::FaultInputs};
 
 pub trait HrControltExt {
-    #[cfg(feature = "stm32h7")]
-    fn hr_control(self, _rcc: hal::rcc::rec::Hrtim) -> HrTimOngoingCalibration;
+    fn hr_control(
+        self,
+        #[cfg(feature = "stm32f3")] _clocks: &hal::rcc::Clocks,
+        #[cfg(feature = "stm32f3")] apb2: &mut hal::rcc::APB2,
 
-    #[cfg(not(feature = "stm32h7"))]
-    fn hr_control(self, _rcc: &mut hal::rcc::Rcc) -> HrTimOngoingCalibration;
+        #[allow(unused_variables)]
+        #[cfg(feature = "stm32g4")]
+        rcc: &mut hal::rcc::Rcc,
+
+        #[cfg(feature = "stm32h7")] rcc: hal::rcc::rec::Hrtim,
+    ) -> HrTimOngoingCalibration;
 }
 
 impl HrControltExt for HRTIM_COMMON {
-    fn hr_control(self, 
-        #[cfg(feature = "stm32h7")] rcc: hal::rcc::rec::Hrtim,
+    fn hr_control(
+        self,
+        #[cfg(feature = "stm32f3")] _clocks: &hal::rcc::Clocks,
+        #[cfg(feature = "stm32f3")] apb2: &mut hal::rcc::APB2,
 
         #[allow(unused_variables)]
-        #[cfg(not(feature = "stm32h7"))] rcc: &mut hal::rcc::Rcc,
+        #[cfg(feature = "stm32g4")]
+        rcc: &mut hal::rcc::Rcc,
+
+        #[cfg(feature = "stm32h7")] rcc: hal::rcc::rec::Hrtim,
     ) -> HrTimOngoingCalibration {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
 
@@ -41,7 +52,7 @@ impl HrControltExt for HRTIM_COMMON {
 
             #[cfg(feature = "stm32f3")]
             {
-                &mut rcc.apb2
+                apb2
             }
 
             #[cfg(feature = "stm32h7")]