HRTIM: Capture cleanup

Author: usbalbin

examples/hrtim/capture.rs

@@ -57,6 +57,9 @@ fn main() -> ! {
     // PA8 (D7 on Nucleo G474RE)
     let pin_a: PA8<Alternate<AF13>> = gpioa.pa8.into_alternate();
 
+    // PB5 (D4 on Nucleo G474RE)
+    let input = gpiob.pb5.into_pull_down_input();
+
     // ...with a prescaler of 128 this gives us a HrTimer with a tick rate of 30MHz
     // With max the max period set, this would be 30MHz/2^16 ~= 458Hz...
     let prescaler = Pscl128;
@@ -71,10 +74,9 @@ fn main() -> ! {
     let (mut hr_control, _flt_inputs, eev_inputs) =
         dp.HRTIM_COMMON.hr_control(&mut rcc).wait_for_calibration();
 
-    // PB5 (D4 on Nucleo G474RE)
     let eev_input6 = eev_inputs
         .eev_input6
-        .bind(gpiob.pb5.into_pull_down_input())
+        .bind(input)
         .edge_or_polarity(external_event::EdgeOrPolarity::Edge(
             external_event::Edge::Falling,
         ))

src/hrtim/capture.rs

@@ -31,19 +31,26 @@ pub trait HrCapture {
     /// Get number of ticks relative to beginning of upcounting
     ///
     /// where captures during down counting count as negative (before the upcount)
+    ///
+    /// ````
+    ///              Counter
+    /// ----------------------------------   <--- period
+    /// \               ^               /
+    ///    \            |            /
+    ///       \         |         /
+    ///          \      |      /
+    /// Down count  \   |   /   Up count
+    ///                \|/
+    /// <-------------- 0 --------------> t
+    /// Negative result | positive result
+    /// ````
     fn get_signed(&self) -> i32 {
         let (value, dir) = self.get();
-        let dir_bit = dir as i32;
-        dir_bit << 31 | i32::from(value)
-    }
 
-    /// Get number of ticks relative to beginning of upcounting
-    ///
-    /// where captures during down counting count as larger (after upcount)
-    fn get_unsigned(&self) -> u32 {
-        let (value, dir) = self.get();
-        let dir_bit = dir as u32;
-        dir_bit << 16 | u32::from(value)
+        match dir {
+            CountingDirection::Up => i32::from(value),
+            CountingDirection::Down => -i32::from(value),
+        }
     }
 
     fn clear_interrupt(&mut self);

src/hrtim/timer.rs

@@ -127,14 +127,6 @@ macro_rules! hrtim_timer {
 
                 tim.$dier.modify(|_r, w| w.$repie().bit(enable));
             }
-
-            pub fn capture_ch1(&mut self) -> &mut HrCapt<$TIMX, PSCL, capture::Ch1> {
-                &mut self.capture_ch1
-            }
-
-            pub fn capture_ch2(&mut self) -> &mut HrCapt<$TIMX, PSCL, capture::Ch2> {
-                &mut self.capture_ch2
-            }
         }
 
         $(// Only for Non-Master timers
@@ -230,6 +222,16 @@ 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),          ])]
 }
 
+impl<TIM, PSCL> HrTim<TIM, PSCL> {
+    pub fn capture_ch1(&mut self) -> &mut HrCapt<TIM, PSCL, capture::Ch1> {
+        &mut self.capture_ch1
+    }
+
+    pub fn capture_ch2(&mut self) -> &mut HrCapt<TIM, PSCL, capture::Ch2> {
+        &mut self.capture_ch2
+    }
+}
+
 /// Master Timer Period event
 impl<DST, PSCL> super::event::TimerResetEventSource<DST, PSCL> for HrTim<HRTIM_MASTER, PSCL> {
     const BITS: u32 = 1 << 4; // MSTPER