Update for h7 (broken)

Author: usbalbin

Cargo.toml

@@ -11,7 +11,10 @@ stm32f3 = { git = "https://github.com/stm32-rs/stm32-rs-nightlies", optional = t
 
 #stm32f3xx-hal = { version = "0.10.0", optional = true }
 stm32f3xx-hal = { git = "https://github.com/usbalbin/stm32f3xx-hal", branch = "update_for_new_pac", optional = true }
-stm32h7xx-hal = { version = "0.16.0", optional = true }
+#stm32h7xx-hal = { version = "0.16.0", optional = true }
+stm32h7xx-hal = { git = "https://github.com/usbalbin/stm32h7xx-hal", branch = "update_for_new_pac", optional = true }
+#stm32h7xx-hal = { path = "../stm32h7xx-hal", optional = true }
+
 #stm32g4xx-hal = { version = "0.0.1", optional = true }
 stm32g4xx-hal = { git = "https://github.com/stm32-rs/stm32g4xx-hal", branch = "staged-pac", optional = true }
 #stm32g4xx-hal = { path = "../stm32g4xx-hal", optional = true }

src/control.rs

@@ -5,20 +5,29 @@ use crate::fault::{
 };
 
 use crate::{hal, stm32};
-use hal::rcc::{Enable, Rcc, Reset};
+
+#[cfg(feature = "stm32h7")]
+use hal::rcc::{rec::Hrtim as Rcc, ResetEnable as Reset, ResetEnable as Enable};
+
+#[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: &mut Rcc) -> HrTimOngoingCalibration;
+    fn hr_control(self, _rcc: Rcc) -> HrTimOngoingCalibration;
 }
 
 impl HrControltExt for HRTIM_COMMON {
-    fn hr_control(self, #[allow(unused_variables)] rcc: &mut Rcc) -> HrTimOngoingCalibration {
+    fn hr_control(self, #[allow(unused_variables)] rcc: Rcc) -> HrTimOngoingCalibration {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
 
-        let rcc_ptr = {
+        let rcc = {
             #[cfg(feature = "stm32g4")]
             unsafe {
                 &*stm32::RCC::ptr()
@@ -28,10 +37,20 @@ impl HrControltExt for HRTIM_COMMON {
             {
                 &mut rcc.apb2
             }
+
+            #[cfg(feature = "stm32h7")]
+            {
+                rcc
+            }
         };
 
-        <HRTIM_COMMON as Enable>::enable(rcc_ptr);
-        <HRTIM_COMMON as Reset>::reset(rcc_ptr);
+        #[cfg(not(feature = "stm32h7"))]
+        <HRTIM_COMMON as Enable>::enable(rcc);
+        #[cfg(not(feature = "stm32h7"))]
+        <HRTIM_COMMON as Reset>::reset(rcc);
+
+        #[cfg(feature = "stm32h7")]
+        rcc.enable().reset();
 
         // Start calibration procedure
         common
@@ -136,6 +155,11 @@ impl HrTimOngoingCalibration {
             common
                 .fltinr2()
                 .write(|w| w.fltsd().bits(flt_divider as u8));
+
+            #[cfg(feature = "stm32h7")]
+            let please_dont_forget_to_remove_this_once_pac_is_fixed = ();
+
+            #[cfg(not(feature = "stm32h7"))]
             common.eecr3().write(|w| w.eevsd().bits(eev_divider as u8));
 
             #[cfg(feature = "stm32g4")]

src/external_event.rs

@@ -328,8 +328,12 @@ 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()

src/lib.rs

@@ -17,7 +17,8 @@ pub mod timer_eev_cfg;
 mod mcu;
 
 #[cfg(feature = "stm32h7")]
-pub use stm32h7xx_hal as hal;
+#[path = "stm32h7.rs"]
+mod mcu;
 
 #[cfg(feature = "stm32g4")]
 #[path = "stm32g4.rs"]
@@ -604,7 +605,7 @@ macro_rules! hrtim_hal {
                         )
                     }
 
-                    #[cfg(feature = "stm32g4")] {
+                    #[cfg(not(feature = "stm32f3"))] {
                         hrtim_finalize_body!(self, PreloadSource, $TIMX, [$($out)*],)
                     }
                 }
@@ -764,7 +765,7 @@ where
             )
         }
 
-        #[cfg(feature = "stm32g4")]
+        #[cfg(not(feature = "stm32f3"))]
         {
             hrtim_finalize_body!(self, MasterPreloadSource, HRTIM_MASTER, [],)
         }

src/stm32h7.rs

@@ -0,0 +1,9 @@
+pub use hal::stm32;
+pub use stm32h7xx_hal as hal;
+
+pub type GpioInputMode = hal::gpio::Input;
+
+pub use hal::pwm::Alignment;
+
+#[cfg(feature = "stm32h7")]
+pub use hal::pwm::Polarity;