G4 and H7 examples are compiling

usbalbin · usbalbin · commit 5234ff2599d5 · 2024-12-12T22:27:10.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 
 stm32f3 = { git = "https://github.com/stm32-rs/stm32-rs-nightlies", optional = true }
-#stm32h7 = { git = "", optional = true }
+stm32h7 = { git = "https://github.com/stm32-rs/stm32-rs-nightlies", fatures = ["critical-section"], optional = true }
 #stm32g4 = { git = "", optional = true }
 
 #stm32f3xx-hal = { version = "0.10.0", optional = true }
@@ -35,7 +35,7 @@ hrtim_v1_1 = []
 hrtim_v2 = []
 
 stm32f3 = ["stm32f3/stm32f3x4"]
-stm32h7 = []
+stm32h7 = ["dep:stm32h7"]
 stm32g4 = []
 
 stm32f334x4 = ["stm32f3", "stm32f3xx-hal/stm32f334x4", "hrtim_v1"]
@@ -55,6 +55,16 @@ stm32g474 = ["stm32g4", "stm32g4xx-hal/stm32g474", "hrtim_v2"]
 stm32g484 = ["stm32g4", "stm32g4xx-hal/stm32g484", "hrtim_v2"]
 defmt = ["dep:defmt", "fugit/defmt"]
 
+# F3
+
+[[example]]
+name = "stm32f3"
+required-features = ["stm32f3"]
+path = "examples/stm32f3/hrtim.rs"
+
+
+# G4
+
 [[example]]
 name = "stm32g4-adc-trigger"
 required-features = ["stm32g4"]
@@ -98,4 +108,11 @@ path = "examples/stm32g4/hrtim.rs"
 [[example]]
 name = "stm32g4-master"
 required-features = ["stm32g4"]
-path = "examples/stm32g4/master.rs"
+path = "examples/stm32g4/master.rs"
+
+# H7
+
+[[example]]
+name = "stm32h7"
+required-features = ["stm32h7"]
+path = "examples/stm32h7/hrtim.rs"
diff --git a/examples/stm32g4/adc-trigger.rs b/examples/stm32g4/adc-trigger.rs
@@ -83,7 +83,7 @@ fn main() -> ! {
         ..
     } = dp
         .HRTIM_TIMA
-        .pwm_advanced((pin_a, pin_b), &mut rcc)
+        .pwm_advanced((pin_a, pin_b))
         .prescaler(prescaler)
         .period(period)
         .finalize(&mut hr_control);
diff --git a/examples/stm32g4/capture-dma.rs b/examples/stm32g4/capture-dma.rs
@@ -87,7 +87,7 @@ fn main() -> ! {
         ..
     } = dp
         .HRTIM_TIMA
-        .pwm_advanced(pin_a, &mut rcc)
+        .pwm_advanced(pin_a)
         .prescaler(prescaler)
         .period(period)
         .finalize(&mut hr_control);
diff --git a/examples/stm32g4/capture.rs b/examples/stm32g4/capture.rs
@@ -82,7 +82,7 @@ fn main() -> ! {
         ..
     } = dp
         .HRTIM_TIMA
-        .pwm_advanced(pin_a, &mut rcc)
+        .pwm_advanced(pin_a)
         .prescaler(prescaler)
         .period(period)
         .finalize(&mut hr_control);
diff --git a/examples/stm32g4/eev-comp.rs b/examples/stm32g4/eev-comp.rs
@@ -111,7 +111,7 @@ fn main() -> ! {
         ..
     } = dp
         .HRTIM_TIMA
-        .pwm_advanced(pin_a, &mut rcc)
+        .pwm_advanced(pin_a)
         .prescaler(prescaler)
         .eev_cfg(EevCfgs::default().eev4(EevCfg::default()))
         .period(0xFFFF)
diff --git a/examples/stm32g4/eev.rs b/examples/stm32g4/eev.rs
@@ -83,7 +83,7 @@ fn main() -> ! {
         ..
     } = dp
         .HRTIM_TIMA
-        .pwm_advanced(pin_a, &mut rcc)
+        .pwm_advanced(pin_a)
         .prescaler(prescaler)
         .eev_cfg(EevCfgs::default())
         .period(0xFFFF)
diff --git a/examples/stm32g4/flt-comp.rs b/examples/stm32g4/flt-comp.rs
@@ -115,7 +115,7 @@ fn main() -> ! {
         ..
     } = dp
         .HRTIM_TIMA
-        .pwm_advanced(pin_a, &mut rcc)
+        .pwm_advanced(pin_a)
         .prescaler(prescaler)
         .period(0xFFFF)
         .with_fault_source(fault_source5) // Set fault source
diff --git a/examples/stm32g4/flt.rs b/examples/stm32g4/flt.rs
@@ -81,7 +81,7 @@ fn main() -> ! {
         ..
     } = dp
         .HRTIM_TIMA
-        .pwm_advanced(pin_a, &mut rcc)
+        .pwm_advanced(pin_a)
         .prescaler(prescaler)
         .period(0xFFFF)
         //.with_fault_source(fault_source1)
diff --git a/examples/stm32g4/hrtim.rs b/examples/stm32g4/hrtim.rs
@@ -69,7 +69,7 @@ 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
diff --git a/examples/stm32g4/master.rs b/examples/stm32g4/master.rs
@@ -70,7 +70,7 @@ fn main() -> ! {
         ..
     } = dp
         .HRTIM_TIMA
-        .pwm_advanced((pin_a, pin_b), &mut rcc)
+        .pwm_advanced((pin_a, pin_b))
         .prescaler(prescaler)
         .push_pull_mode(true) // Set push pull mode, out1 and out2 are
         // alternated every period with one being
@@ -86,7 +86,7 @@ fn main() -> ! {
         ..
     } = dp
         .HRTIM_MASTER
-        .pwm_advanced((), &mut rcc)
+        .pwm_advanced(())
         .prescaler(prescaler)
         .preload(MasterPreloadSource::OnMasterRepetitionUpdate)
         .period(0xFFFF)
diff --git a/examples/stm32h7/hrtim.rs b/examples/stm32h7/hrtim.rs
@@ -8,14 +8,15 @@ use stm32_hrtim::{
     HrParts, HrPwmAdvExt, Pscl4,
 };
 use stm32h7xx_hal::{
+    prelude::_embedded_hal_blocking_delay_DelayMs,
     delay::DelayExt,
     gpio::GpioExt,
     pwr::PwrExt,
-    rcc::{self, RccExt},
+    rcc::RccExt,
     stm32::{CorePeripherals, Peripherals},
 };
 
-use fugit::{ExtU32, RateExtU32 as _};
+use fugit::RateExtU32 as _;
 
 #[entry]
 fn main() -> ! {
@@ -34,7 +35,7 @@ fn main() -> ! {
 
     // Acquire the GPIO peripherals. This also enables the clock for
     // the GPIOs in the RCC register.
-    let gpioa = dp.GPIOA.split(ccdr.peripheral.GPIOA);
+    let gpioc = dp.GPIOC.split(ccdr.peripheral.GPIOC);
 
     // Get the delay provider.
     let mut delay = cp.SYST.delay(ccdr.clocks);
@@ -43,8 +44,8 @@ fn main() -> ! {
     // With max the max period set, this would be 960MHz/2^16 ~= 15kHz...
     let prescaler = Pscl4;
 
-    let pin_a = gpioa.pa8;
-    let pin_b = gpioa.pa9;
+    let pin_a = gpioc.pc6.into_input();
+    let pin_b = gpioc.pc7.into_input();
 
     //        .               .               .               .
     //        .  30%          .               .               .
@@ -71,7 +72,7 @@ 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
@@ -97,7 +98,7 @@ fn main() -> ! {
             cr1.set_duty(new_period / 3);
             timer.set_period(new_period);
 
-            delay.delay(500_u32.millis());
+            delay.delay_ms(500_u16);
         }
     }
 }
diff --git a/src/compare_register.rs b/src/compare_register.rs
@@ -23,7 +23,6 @@ use super::adc_trigger::Adc579Trigger as Adc579;
 #[cfg(feature = "stm32g4")]
 use super::adc_trigger::Adc6810Trigger as Adc6810;
 
-#[cfg(feature = "stm32g4")]
 macro_rules! hrtim_cr_helper {
     (HRTIM_MASTER: $cr_type:ident:
         $cmpXYr:ident,
@@ -76,7 +75,6 @@ macro_rules! hrtim_cr_helper {
     };
 }
 
-#[cfg(feature = "stm32g4")]
 macro_rules! hrtim_cr {
     ($($TIMX:ident: [
         [$(($cr1_trigger:ident: $cr1_trigger_bits:expr)),*], [$(($cr1_event_dst:ident, $cr1_tim_event_index:expr)),*],
@@ -144,6 +142,52 @@ hrtim_cr! {
     ]
 }
 
+// TODO: Populate more things
+#[cfg(any(feature = "stm32f3", feature = "stm32h7"))]
+hrtim_cr! {
+    HRTIM_MASTER: [
+        [], [],
+        [], [],
+        [], [],
+        [], []
+    ],
+
+    HRTIM_TIMA: [
+        [], [],
+        [], [],
+        [], [],
+        [], []
+    ],
+
+    HRTIM_TIMB: [
+        [], [],
+        [], [],
+        [], [],
+        [], []
+    ],
+
+    HRTIM_TIMC: [
+        [], [],
+        [], [],
+        [], [],
+        [], []
+    ],
+
+    HRTIM_TIMD: [
+        [], [],
+        [], [],
+        [], [],
+        [], []
+    ],
+
+    HRTIM_TIME: [
+        [], [],
+        [], [],
+        [], [],
+        [], []
+    ]
+}
+
 macro_rules! hrtim_master_cr {
     ($($cr_type:ident: $cr_index:expr),*) => {$(
         /// Compare match event for neighbor timer
diff --git a/src/control.rs b/src/control.rs
@@ -7,24 +7,30 @@ use crate::fault::{
 use crate::{hal, stm32};
 
 #[cfg(feature = "stm32h7")]
-use hal::rcc::{rec::Hrtim as Rcc, ResetEnable as Reset, ResetEnable as Enable};
+use hal::rcc::ResetEnable as _;
 
 #[cfg(not(feature = "stm32h7"))]
 use hal::rcc::{Enable, Reset};
 
-#[cfg(not(feature = "stm32h7"))]
-type Rcc = &mut hal::rcc::Rcc;
-
 use stm32::HRTIM_COMMON;
 
 use super::{external_event::EevInputs, fault::FaultInputs};
 
 pub trait HrControltExt {
-    fn hr_control(self, _rcc: Rcc) -> HrTimOngoingCalibration;
+    #[cfg(feature = "stm32h7")]
+    fn hr_control(self, _rcc: hal::rcc::rec::Hrtim) -> HrTimOngoingCalibration;
+
+    #[cfg(not(feature = "stm32h7"))]
+    fn hr_control(self, _rcc: &mut hal::rcc::Rcc) -> HrTimOngoingCalibration;
 }
 
 impl HrControltExt for HRTIM_COMMON {
-    fn hr_control(self, #[allow(unused_variables)] rcc: Rcc) -> HrTimOngoingCalibration {
+    fn hr_control(self, 
+        #[cfg(feature = "stm32h7")] rcc: hal::rcc::rec::Hrtim,
+
+        #[allow(unused_variables)]
+        #[cfg(not(feature = "stm32h7"))] rcc: &mut hal::rcc::Rcc,
+    ) -> HrTimOngoingCalibration {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
 
         let rcc = {
diff --git a/src/external_event.rs b/src/external_event.rs
@@ -328,12 +328,6 @@ macro_rules! impl_eev6_10_to_es {
 
                 let common = unsafe { &*HRTIM_COMMON::ptr() };
 
-                #[cfg(feature = "stm32h7")]
-                let please_dont_forget_to_remove_this_once_pac_is_fixed = ();
-
-                // SAFETY: Thanks to, `HrTimCalibrated`, we know we have exclusive access to the register,
-                //         we also know no timers are started.
-                #[cfg(not(feature = "stm32h7"))]
                 unsafe {
                     common.eecr2().modify(|_r, w| {
                         w.$eeXsrc()
diff --git a/src/lib.rs b/src/lib.rs
@@ -46,7 +46,6 @@ use self::deadtime::DeadtimeConfig;
 use self::output::ToHrOut;
 use self::timer_eev_cfg::EevCfgs;
 use fugit::HertzU32 as Hertz;
-use hal::rcc::Rcc;
 
 /// Internal enum that keeps track of the count settings before PWM is finalized
 enum CountSettings {
@@ -177,7 +176,6 @@ pub trait HrPwmAdvExt: Sized {
     fn pwm_advanced<PINS>(
         self,
         _pins: PINS,
-        rcc: &mut Rcc,
     ) -> HrPwmBuilder<Self, PsclDefault, Self::PreloadSource, PINS>
     where
         PINS: ToHrOut<Self>;
@@ -550,7 +548,6 @@ macro_rules! hrtim_hal {
                 fn pwm_advanced<PINS>(
                     self,
                     pins: PINS,
-                    _rcc: &mut Rcc,
                 ) -> HrPwmBuilder<Self, PsclDefault, Self::PreloadSource, PINS>
                 where
                     PINS: ToHrOut<$TIMX>,
@@ -704,7 +701,6 @@ impl HrPwmAdvExt for HRTIM_MASTER {
     fn pwm_advanced<PINS>(
         self,
         pins: PINS,
-        _rcc: &mut Rcc,
     ) -> HrPwmBuilder<Self, PsclDefault, Self::PreloadSource, PINS>
     where
         PINS: ToHrOut<HRTIM_MASTER>,
diff --git a/src/output.rs b/src/output.rs
diff --git a/src/stm32h7.rs b/src/stm32h7.rs
