Update for gpio changes

Author: usbalbin

src/hrtim/external_event.rs

@@ -4,7 +4,6 @@ use crate::gpio::{
     self,
     gpiob::{PB3, PB4, PB5, PB6, PB7, PB8, PB9},
     gpioc::{PC11, PC12, PC5, PC6},
-    AF13, AF3,
 };
 
 pub trait EevInputExt<const N: u8> {
@@ -14,8 +13,8 @@ pub trait EevInputExt<const N: u8> {
 }
 
 macro_rules! impl_eev_input {
-    ($($N:literal: COMP=[$compX:ident $(, ($compY:ident, $compY_src_bits:literal))*], PINS=[$(($pin:ident, $af:ident)),*])*) => {$(
-        $(unsafe impl<IM> EevSrcBits<$N> for $pin<gpio::Input<IM>>{
+    ($($N:literal: COMP=[$compX:ident $(, ($compY:ident, $compY_src_bits:literal))*], PINS=[$(($pin:ident, $af:literal)),*])*) => {$(
+        $(unsafe impl EevSrcBits<$N> for $pin<gpio::Input>{
             const SRC_BITS: u8 = 0b00;
             fn cfg(self) {
                 self.into_alternate::<$af>();
@@ -48,14 +47,14 @@ macro_rules! impl_eev_input {
 }
 
 impl_eev_input! {
-    1: COMP = [COMP2], PINS = [(PC12, AF3)]
-    2: COMP = [COMP4], PINS = [(PC11, AF3)]
-    3: COMP = [COMP6], PINS = [(PB7, AF13)]
-    4: COMP = [COMP1, (COMP5, 0b10)], PINS = [(PB6, AF13)]
-    5: COMP = [COMP3, (COMP7, 0b10)], PINS = [(PB9, AF13)]
-    6: COMP = [COMP2, (COMP1, 0b10)], PINS = [(PB5, AF13)]
-    7: COMP = [COMP4], PINS = [(PB4, AF13)]
-    8: COMP = [COMP6, (COMP3, 0b10)], PINS = [(PB8, AF13)]
-    9: COMP = [COMP5, (COMP4, 0b11)], PINS = [(PB3, AF13)]
-    10: COMP = [COMP7], PINS = [(PC5, AF13), (PC6, AF3)]
+    1: COMP = [COMP2], PINS = [(PC12, 3)]
+    2: COMP = [COMP4], PINS = [(PC11, 3)]
+    3: COMP = [COMP6], PINS = [(PB7, 13)]
+    4: COMP = [COMP1, (COMP5, 0b10)], PINS = [(PB6, 13)]
+    5: COMP = [COMP3, (COMP7, 0b10)], PINS = [(PB9, 13)]
+    6: COMP = [COMP2, (COMP1, 0b10)], PINS = [(PB5, 13)]
+    7: COMP = [COMP4], PINS = [(PB4, 13)]
+    8: COMP = [COMP6, (COMP3, 0b10)], PINS = [(PB8, 13)]
+    9: COMP = [COMP5, (COMP4, 0b11)], PINS = [(PB3, 13)]
+    10: COMP = [COMP7], PINS = [(PC5, 13), (PC6, 3)]
 }

src/hrtim/fault.rs

@@ -7,7 +7,6 @@ use crate::{
         gpioa::{PA12, PA15},
         gpiob::{PB0, PB10, PB11},
         gpioc::{PC10, PC7},
-        AF13, AF3,
     },
 };
 
@@ -22,7 +21,7 @@ pub trait FaultInput<S> {
 macro_rules! impl_faults {
     ($(
         $input:ident:
-            PINS=[($pin:ident, $af:ident) $(,($pin_b:ident, $af_b:ident))*],
+            PINS=[($pin:ident, $af:literal) $(,($pin_b:ident, $af_b:literal))*],
             COMP=$compX:ident,
     )+) => {$(
         impl FaultInput<$pin<gpio::Alternate<$af>>> for fault::$input {
@@ -52,10 +51,10 @@ macro_rules! impl_faults {
 }
 
 impl_faults!(
-    FaultInput1: PINS=[(PA12, AF13)], COMP=COMP2,
-    FaultInput2: PINS=[(PA15, AF13)], COMP=COMP4,
-    FaultInput3: PINS=[(PB10, AF13)], COMP=COMP6,
-    FaultInput4: PINS=[(PB11, AF13)], COMP=COMP1,
-    FaultInput5: PINS=[(PB0, AF13), (PC7, AF3)], COMP=COMP3,
-    FaultInput6: PINS=[(PC10, AF13)], COMP=COMP5,
+    FaultInput1: PINS=[(PA12, 13)], COMP=COMP2,
+    FaultInput2: PINS=[(PA15, 13)], COMP=COMP4,
+    FaultInput3: PINS=[(PB10, 13)], COMP=COMP6,
+    FaultInput4: PINS=[(PB11, 13)], COMP=COMP1,
+    FaultInput5: PINS=[(PB0, 13), (PC7, 3)], COMP=COMP3,
+    FaultInput6: PINS=[(PC10, 13)], COMP=COMP5,
 );

src/hrtim/mod.rs

@@ -9,7 +9,7 @@ use crate::{
     gpio,
     rcc::{Enable, Reset},
     stm32::{
-        self, HRTIM_COMMON, HRTIM_TIMA, HRTIM_TIMB, HRTIM_TIMC, HRTIM_TIMD, HRTIM_TIME, HRTIM_TIMF,
+        HRTIM_COMMON, HRTIM_TIMA, HRTIM_TIMB, HRTIM_TIMC, HRTIM_TIMD, HRTIM_TIME, HRTIM_TIMF,
     },
 };
 use stm32_hrtim::{
@@ -25,8 +25,7 @@ pub trait HrControltExt {
 }
 
 impl HrControltExt for crate::stm32::HRTIM_COMMON {
-    fn hr_control(self, _rcc: &mut crate::rcc::Rcc) -> HrTimOngoingCalibration {
-        let rcc = unsafe { &*stm32::RCC::ptr() };
+    fn hr_control(self, rcc: &mut crate::rcc::Rcc) -> HrTimOngoingCalibration {
         HRTIM_COMMON::enable(rcc);
         HRTIM_COMMON::reset(rcc);