HRTIM: Fix bugs caused by traitification

Author: usbalbin

src/hrtim/control.rs

@@ -212,70 +212,70 @@ pub struct HrPwmControl {
 use super::adc_trigger::{Adc13Trigger, Adc24Trigger, Adc579Trigger, Adc6810Trigger};
 
 impl HrPwmControl {
-    pub fn enable_adc_trigger1_source<T: Adc13Trigger>(&mut self, _trigger: T) {
+    pub fn enable_adc_trigger1_source<T: Adc13Trigger>(&mut self, _trigger: &T) {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
         unsafe {
             common.adc1r.modify(|r, w| w.bits(r.bits() | T::BITS));
         }
     }
 
-    pub fn enable_adc_trigger2_source<T: Adc24Trigger>(&mut self, _trigger: T) {
+    pub fn enable_adc_trigger2_source<T: Adc24Trigger>(&mut self, _trigger: &T) {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
         unsafe {
             common.adc2r.modify(|r, w| w.bits(r.bits() | T::BITS));
         }
     }
 
-    pub fn enable_adc_trigger3_source<T: Adc13Trigger>(&mut self, _trigger: T) {
+    pub fn enable_adc_trigger3_source<T: Adc13Trigger>(&mut self, _trigger: &T) {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
         unsafe {
             common.adc3r.modify(|r, w| w.bits(r.bits() | T::BITS));
         }
     }
 
-    pub fn enable_adc_trigger4_source<T: Adc24Trigger>(&mut self, _trigger: T) {
+    pub fn enable_adc_trigger4_source<T: Adc24Trigger>(&mut self, _trigger: &T) {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
         unsafe {
             common.adc4r.modify(|r, w| w.bits(r.bits() | T::BITS));
         }
     }
 
-    pub fn enable_adc_trigger5_source<T: Adc579Trigger>(&mut self, _trigger: T) {
+    pub fn enable_adc_trigger5_source<T: Adc579Trigger>(&mut self, _trigger: &T) {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
         common
             .adcer
             .modify(|_r, w| w.adc5trg().variant(T::BITS as u8));
     }
 
-    pub fn enable_adc_trigger6_source<T: Adc6810Trigger>(&mut self, _trigger: T) {
+    pub fn enable_adc_trigger6_source<T: Adc6810Trigger>(&mut self, _trigger: &T) {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
         common
             .adcer
             .modify(|_r, w| w.adc6trg().variant(T::BITS as u8));
     }
 
-    pub fn enable_adc_trigger7_source<T: Adc579Trigger>(&mut self, _trigger: T) {
+    pub fn enable_adc_trigger7_source<T: Adc579Trigger>(&mut self, _trigger: &T) {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
         common
             .adcer
             .modify(|_r, w| w.adc7trg().variant(T::BITS as u8));
     }
 
-    pub fn enable_adc_trigger8_source<T: Adc6810Trigger>(&mut self, _trigger: T) {
+    pub fn enable_adc_trigger8_source<T: Adc6810Trigger>(&mut self, _trigger: &T) {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
         common
             .adcer
             .modify(|_r, w| w.adc8trg().variant(T::BITS as u8));
     }
 
-    pub fn enable_adc_trigger9_source<T: Adc579Trigger>(&mut self, _trigger: T) {
+    pub fn enable_adc_trigger9_source<T: Adc579Trigger>(&mut self, _trigger: &T) {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
         common
             .adcer
             .modify(|_r, w| w.adc9trg().variant(T::BITS as u8));
     }
 
-    pub fn enable_adc_trigger10_source<T: Adc6810Trigger>(&mut self, _trigger: T) {
+    pub fn enable_adc_trigger10_source<T: Adc6810Trigger>(&mut self, _trigger: &T) {
         let common = unsafe { &*HRTIM_COMMON::ptr() };
         common
             .adcer

src/hrtim/output.rs

@@ -28,20 +28,20 @@ macro_rules! hrtim_out {
                 common.odisr.write(|w| { w.$tXYodis().set_bit() });
             }
 
-            fn enable_set_event<ES: EventSource<PSCL, $TIMX>>(&mut self, _set_event: &ES) {
+            fn enable_set_event<ES: EventSource<$TIMX, PSCL>>(&mut self, _set_event: &ES) {
                 let tim = unsafe { &*$TIMX::ptr() };
                 unsafe { tim.$setXYr.modify(|r, w| w.bits(r.bits() | ES::BITS)); }
             }
-            fn disable_set_event<ES: EventSource<PSCL, $TIMX>>(&mut self, _set_event: &ES) {
+            fn disable_set_event<ES: EventSource<$TIMX, PSCL>>(&mut self, _set_event: &ES) {
                 let tim = unsafe { &*$TIMX::ptr() };
                 unsafe { tim.$setXYr.modify(|r, w| w.bits(r.bits() & !ES::BITS)); }
             }
 
-            fn enable_rst_event<ES: EventSource<PSCL, $TIMX>>(&mut self, _reset_event: &ES) {
+            fn enable_rst_event<ES: EventSource<$TIMX, PSCL>>(&mut self, _reset_event: &ES) {
                 let tim = unsafe { &*$TIMX::ptr() };
                 unsafe { tim.$rstXYr.modify(|r, w| w.bits(r.bits() | ES::BITS)); }
             }
-            fn disable_rst_event<ES: EventSource<PSCL, $TIMX>>(&mut self, _reset_event: &ES) {
+            fn disable_rst_event<ES: EventSource<$TIMX, PSCL>>(&mut self, _reset_event: &ES) {
                 let tim = unsafe { &*$TIMX::ptr() };
                 unsafe { tim.$rstXYr.modify(|r, w| w.bits(r.bits() & !ES::BITS)); }
             }
@@ -97,25 +97,25 @@ pub trait HrOutput<PSCL, TIM> {
     ///
     /// NOTE: Enabling the same event for both SET and RESET
     /// will make that event TOGGLE the output
-    fn enable_set_event<ES: EventSource<PSCL, TIM>>(&mut self, set_event: &ES);
+    fn enable_set_event<ES: EventSource<TIM, PSCL>>(&mut self, set_event: &ES);
 
     /// Stop listening to the specified event
-    fn disable_set_event<ES: EventSource<PSCL, TIM>>(&mut self, set_event: &ES);
+    fn disable_set_event<ES: EventSource<TIM, PSCL>>(&mut self, set_event: &ES);
 
     /// Set this output to *not* active every time the specified event occurs
     ///
     /// NOTE: Enabling the same event for both SET and RESET
     /// will make that event TOGGLE the output
-    fn enable_rst_event<ES: EventSource<PSCL, TIM>>(&mut self, reset_event: &ES);
+    fn enable_rst_event<ES: EventSource<TIM, PSCL>>(&mut self, reset_event: &ES);
 
     /// Stop listening to the specified event
-    fn disable_rst_event<ES: EventSource<PSCL, TIM>>(&mut self, reset_event: &ES);
+    fn disable_rst_event<ES: EventSource<TIM, PSCL>>(&mut self, reset_event: &ES);
 
     /// Get current state of the output
     fn get_state(&self) -> State;
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Copy, Clone)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum State {
     Idle,