HRTIM: Add forgotten traitification impls

Author: usbalbin

src/hrtim/external_event.rs

@@ -298,6 +298,13 @@ macro_rules! impl_eev1_5_to_es {
                 ExternalEventSource { _x: PhantomData }
             }
         }
+
+        /// EEV$1 event
+        impl<const IS_FAST: bool, DST, PSCL> super::event::EventSource<DST, PSCL>
+            for ExternalEventSource<$N, IS_FAST>
+        {
+            const BITS: u32 = 1 << ($N + 20); // EEV1 is at bit 21
+        }
     };
 }
 
@@ -333,6 +340,11 @@ macro_rules! impl_eev6_10_to_es {
                 ExternalEventSource { _x: PhantomData }
             }
         }
+
+        /// EEV$1 event
+        impl<DST, PSCL> super::event::EventSource<DST, PSCL> for ExternalEventSource<$N, false> {
+            const BITS: u32 = 1 << ($N + 20); // EEV1 is at bit 21
+        }
     };
 }
 

src/hrtim/output.rs

@@ -1,6 +1,4 @@
-use crate::stm32::{
-    HRTIM_TIMA, HRTIM_TIMB, HRTIM_TIMC, HRTIM_TIMD, HRTIM_TIME, HRTIM_TIMF,
-};
+use crate::stm32::{HRTIM_TIMA, HRTIM_TIMB, HRTIM_TIMC, HRTIM_TIMD, HRTIM_TIME, HRTIM_TIMF};
 use core::marker::PhantomData;
 
 use super::event::EventSource;

src/hrtim/timer.rs

@@ -154,14 +154,14 @@ macro_rules! hrtim_timer {
                 /// * `HrTimerMode::Continuous`: Enabling the timer enables and starts it simultaneously.
                 ///   When the counter reaches the PER value, it rolls-over to 0x0000 and resumes counting.
                 ///   The counter can be reset at any time
-                pub fn enable_reset_event<E: super::event::TimerResetEventSource<$TIMX, PSCL>>(&mut self, _event: E) {
+                pub fn enable_reset_event<E: super::event::TimerResetEventSource<$TIMX, PSCL>>(&mut self, _event: &E) {
                     let tim = unsafe { &*$TIMX::ptr() };
 
                     unsafe { tim.$rstXr.modify(|r, w| w.bits(r.bits() | E::BITS)); }
                 }
 
                 /// Stop listening to the specified event
-                pub fn disable_reset_event<E: super::event::TimerResetEventSource<$TIMX, PSCL>>(&mut self, _event: E) {
+                pub fn disable_reset_event<E: super::event::TimerResetEventSource<$TIMX, PSCL>>(&mut self, _event: &E) {
                     let tim = unsafe { &*$TIMX::ptr() };
 
                     unsafe { tim.$rstXr.modify(|r, w| w.bits(r.bits() & !E::BITS)); }
@@ -230,6 +230,12 @@ hrtim_timer_adc_trigger! {
     HRTIM_TIMF: [(Adc13: [(PER: 1 << 24), (RST: 1 << 28)]), (Adc24: [(PER: 1 << 24),               ]), (Adc579: [(PER: 30), (RST: 31)]), (Adc6810: [(PER: 31),          ])]
 }
 
+/// Master Timer Period event
 impl<DST, PSCL> super::event::TimerResetEventSource<DST, PSCL> for HrTim<HRTIM_MASTER, PSCL> {
     const BITS: u32 = 1 << 4; // MSTPER
 }
+
+/// Master Timer Period event
+impl<DST, PSCL> super::event::EventSource<DST, PSCL> for HrTim<HRTIM_MASTER, PSCL> {
+    const BITS: u32 = 1 << 7; // MSTPER
+}