HRTIM: adc trigger impl into

Author: usbalbin

examples/hrtim/adc-trigger.rs

@@ -116,7 +116,7 @@ fn main() -> ! {
 
     adc.set_external_trigger((
         adc::config::TriggerMode::RisingEdge,
-        hr_control.adc_trigger1.as_adc12_trigger(),
+        &hr_control.adc_trigger1,
     ));
     adc.enable_temperature(&dp.ADC12_COMMON);
     adc.set_continuous(Continuous::Discontinuous);

src/adc.rs

@@ -2239,8 +2239,8 @@ macro_rules! adc {
 
                 /// Sets which external trigger to use and if it is disabled, rising, falling or both
                 #[inline(always)]
-                pub fn set_external_trigger(&mut self, (edge, extsel): (config::TriggerMode, $trigger_type)) {
-                    self.adc.set_external_trigger( (edge, extsel) )
+                pub fn set_external_trigger<T: Into<$trigger_type>>(&mut self, (edge, extsel): (config::TriggerMode, T)) {
+                    self.adc.set_external_trigger( (edge, extsel.into()) )
                 }
 
                 /// Sets auto delay to true or false

src/hrtim/control.rs

@@ -245,14 +245,16 @@ macro_rules! impl_adc1234_trigger {
                     common.$adcXr.modify(|r, w| w.bits(r.bits() | T::BITS));
                 }
             }
+        }
 
-            $(
-                pub fn as_adc12_trigger(&self) -> crate::adc::config::ExternalTrigger12 {
-                    crate::adc::config::ExternalTrigger12::$variant12
-                }
-            )*
+        $(impl Into<crate::adc::config::ExternalTrigger12> for &$t {
+            fn into(self) -> crate::adc::config::ExternalTrigger12 {
+                crate::adc::config::ExternalTrigger12::$variant12
+            }
+        })*
 
-            pub fn as_adc345_trigger(&self) -> crate::adc::config::ExternalTrigger345 {
+        impl Into<crate::adc::config::ExternalTrigger345> for &$t {
+            fn into(self) -> crate::adc::config::ExternalTrigger345 {
                 crate::adc::config::ExternalTrigger345::$variant345
             }
         }
@@ -272,15 +274,20 @@ macro_rules! impl_adc5678910_trigger {
                     .adcer
                     .modify(|_r, w| w.$adcXtrg().variant(T::BITS as u8));
             }
+        }
 
-            pub fn as_adc12_trigger(&self) -> crate::adc::config::ExternalTrigger12 {
+        impl Into<crate::adc::config::ExternalTrigger12> for &$t {
+            fn into(self) -> crate::adc::config::ExternalTrigger12 {
                 crate::adc::config::ExternalTrigger12::$variant12
             }
+        }
 
-            pub fn as_adc345_trigger(&self) -> crate::adc::config::ExternalTrigger345 {
+        impl Into<crate::adc::config::ExternalTrigger345> for &$t {
+            fn into(self) -> crate::adc::config::ExternalTrigger345 {
                 crate::adc::config::ExternalTrigger345::$variant345
             }
         }
+
     )*}
 }