stm32: rename timer channel trait; replace impls via macro with impls generic over timer channels

1 files changed, 18 insertions, 23 deletions

diff --git a/embassy-stm32/src/timer/input_capture.rs b/embassy-stm32/src/timer/input_capture.rs
index da567d504..49e22b10f 100644
--- a/embassy-stm32/src/timer/input_capture.rs
+++ b/embassy-stm32/src/timer/input_capture.rs
@@ -6,12 +6,12 @@ use core::pin::Pin;
 use core::task::{Context, Poll};
 
 use super::low_level::{CountingMode, FilterValue, InputCaptureMode, InputTISelection, Timer};
-use super::{CaptureCompareInterruptHandler, GeneralInstance4Channel, TimerChannel, TimerPin};
+use super::{CaptureCompareInterruptHandler, GeneralInstance4Channel, Channel, TimerPin};
 pub use super::{Ch1, Ch2, Ch3, Ch4};
 use crate::gpio::{AfType, AnyPin, Pull};
 use crate::interrupt::typelevel::{Binding, Interrupt};
 use crate::time::Hertz;
-use crate::timer::Channel;
+use crate::timer::TimerChannel;
 use crate::Peri;
 
 /// Capture pin wrapper.
@@ -21,7 +21,7 @@ pub struct CapturePin<'d, T, C> {
     _pin: Peri<'d, AnyPin>,
     phantom: PhantomData<(T, C)>,
 }
-impl<'d, T: GeneralInstance4Channel, C: Channel> CapturePin<'d, T, C> {
+impl<'d, T: GeneralInstance4Channel, C: TimerChannel> CapturePin<'d, T, C> {
     /// Create a new capture pin instance.
     pub fn new(pin: Peri<'d, impl TimerPin<T, C>>, pull: Pull) -> Self {
         pin.set_as_af(pin.af_num(), AfType::input(pull));
@@ -68,46 +68,41 @@ impl<'d, T: GeneralInstance4Channel> InputCapture<'d, T> {
     }
 
     /// Enable the given channel.
-    pub fn enable(&mut self, channel: TimerChannel) {
+    pub fn enable(&mut self, channel: Channel) {
         self.inner.enable_channel(channel, true);
     }
 
     /// Disable the given channel.
-    pub fn disable(&mut self, channel: TimerChannel) {
+    pub fn disable(&mut self, channel: Channel) {
         self.inner.enable_channel(channel, false);
     }
 
     /// Check whether given channel is enabled
-    pub fn is_enabled(&self, channel: TimerChannel) -> bool {
+    pub fn is_enabled(&self, channel: Channel) -> bool {
         self.inner.get_channel_enable_state(channel)
     }
 
     /// Set the input capture mode for a given channel.
-    pub fn set_input_capture_mode(&mut self, channel: TimerChannel, mode: InputCaptureMode) {
+    pub fn set_input_capture_mode(&mut self, channel: Channel, mode: InputCaptureMode) {
         self.inner.set_input_capture_mode(channel, mode);
     }
 
     /// Set input TI selection.
-    pub fn set_input_ti_selection(&mut self, channel: TimerChannel, tisel: InputTISelection) {
+    pub fn set_input_ti_selection(&mut self, channel: Channel, tisel: InputTISelection) {
         self.inner.set_input_ti_selection(channel, tisel)
     }
 
     /// Get capture value for a channel.
-    pub fn get_capture_value(&self, channel: TimerChannel) -> u32 {
+    pub fn get_capture_value(&self, channel: Channel) -> u32 {
         self.inner.get_capture_value(channel)
     }
 
     /// Get input interrupt.
-    pub fn get_input_interrupt(&self, channel: TimerChannel) -> bool {
+    pub fn get_input_interrupt(&self, channel: Channel) -> bool {
         self.inner.get_input_interrupt(channel)
     }
 
-    fn new_future(
-        &self,
-        channel: TimerChannel,
-        mode: InputCaptureMode,
-        tisel: InputTISelection,
-    ) -> InputCaptureFuture<T> {
+    fn new_future(&self, channel: Channel, mode: InputCaptureMode, tisel: InputTISelection) -> InputCaptureFuture<T> {
         // Configuration steps from ST RM0390 (STM32F446) chapter 17.3.5
         // or ST RM0008 (STM32F103) chapter 15.3.5 Input capture mode
         self.inner.set_input_ti_selection(channel, tisel);
@@ -124,37 +119,37 @@ impl<'d, T: GeneralInstance4Channel> InputCapture<'d, T> {
     }
 
     /// Asynchronously wait until the pin sees a rising edge.
-    pub async fn wait_for_rising_edge(&mut self, channel: TimerChannel) -> u32 {
+    pub async fn wait_for_rising_edge(&mut self, channel: Channel) -> u32 {
         self.new_future(channel, InputCaptureMode::Rising, InputTISelection::Normal)
             .await
     }
 
     /// Asynchronously wait until the pin sees a falling edge.
-    pub async fn wait_for_falling_edge(&mut self, channel: TimerChannel) -> u32 {
+    pub async fn wait_for_falling_edge(&mut self, channel: Channel) -> u32 {
         self.new_future(channel, InputCaptureMode::Falling, InputTISelection::Normal)
             .await
     }
 
     /// Asynchronously wait until the pin sees any edge.
-    pub async fn wait_for_any_edge(&mut self, channel: TimerChannel) -> u32 {
+    pub async fn wait_for_any_edge(&mut self, channel: Channel) -> u32 {
         self.new_future(channel, InputCaptureMode::BothEdges, InputTISelection::Normal)
             .await
     }
 
     /// Asynchronously wait until the (alternate) pin sees a rising edge.
-    pub async fn wait_for_rising_edge_alternate(&mut self, channel: TimerChannel) -> u32 {
+    pub async fn wait_for_rising_edge_alternate(&mut self, channel: Channel) -> u32 {
         self.new_future(channel, InputCaptureMode::Rising, InputTISelection::Alternate)
             .await
     }
 
     /// Asynchronously wait until the (alternate) pin sees a falling edge.
-    pub async fn wait_for_falling_edge_alternate(&mut self, channel: TimerChannel) -> u32 {
+    pub async fn wait_for_falling_edge_alternate(&mut self, channel: Channel) -> u32 {
         self.new_future(channel, InputCaptureMode::Falling, InputTISelection::Alternate)
             .await
     }
 
     /// Asynchronously wait until the (alternate) pin sees any edge.
-    pub async fn wait_for_any_edge_alternate(&mut self, channel: TimerChannel) -> u32 {
+    pub async fn wait_for_any_edge_alternate(&mut self, channel: Channel) -> u32 {
         self.new_future(channel, InputCaptureMode::BothEdges, InputTISelection::Alternate)
             .await
     }
@@ -162,7 +157,7 @@ impl<'d, T: GeneralInstance4Channel> InputCapture<'d, T> {
 
 #[must_use = "futures do nothing unless you `.await` or poll them"]
 struct InputCaptureFuture<T: GeneralInstance4Channel> {
-    channel: TimerChannel,
+    channel: Channel,
     phantom: PhantomData<T>,
 }