HRTIM - Fix some clippy warnings and fmt

Author: usbalbin

src/hrtim/capture.rs

@@ -11,6 +11,12 @@ pub struct Ch2;
 pub struct Dma;
 pub struct NoDma;
 
+/// Type alias for the default capture for channel 1
+pub type HrCaptCh1<TIM, PSCL> = HrCapt<TIM, PSCL, Ch1, NoDma>;
+
+/// Type alias for the default capture for channel 2
+pub type HrCaptCh2<TIM, PSCL> = HrCapt<TIM, PSCL, Ch2, NoDma>;
+
 pub struct HrCapt<TIM, PSCL, CH, DMA> {
     _x: PhantomData<(TIM, PSCL, CH, DMA)>,
 }

src/hrtim/control.rs

@@ -137,11 +137,9 @@ impl HrTimOngoingCalibration {
         // Calibration is now done, it is safe to continue
         unsafe { self.init() };
 
-        (
-            HrTimCalibrated,
-            unsafe { FaultInputs::new() },
-            unsafe { EevInputs::new() },
-        )
+        (HrTimCalibrated, unsafe { FaultInputs::new() }, unsafe {
+            EevInputs::new()
+        })
     }
 
     pub fn set_adc1_trigger_psc(mut self, post_scaler: AdcTriggerPostscaler) -> Self {

src/hrtim/fault.rs

@@ -267,4 +267,4 @@ impl_flt_monitor!(
     FltMonitor4: (flt4, flt4c, flt4ie),
     FltMonitor5: (flt5, flt5c, flt5ie),
     FltMonitor6: (flt6, flt6c, flt6ie),
-);
+);

src/hrtim/mod.rs

@@ -13,14 +13,14 @@ pub mod timer_eev_cfg;
 use core::marker::PhantomData;
 use core::mem::MaybeUninit;
 
-use crate::hrtim::capture::HrCapt;
 use crate::hrtim::compare_register::{HrCr1, HrCr2, HrCr3, HrCr4};
 use crate::hrtim::fault::{FaultAction, FaultSource};
 use crate::hrtim::timer::HrTim;
 use crate::stm32::{
     HRTIM_COMMON, HRTIM_MASTER, HRTIM_TIMA, HRTIM_TIMB, HRTIM_TIMC, HRTIM_TIMD, HRTIM_TIME,
     HRTIM_TIMF,
 };
+use capture::{HrCaptCh1, HrCaptCh2};
 use fugit::HertzU64;
 
 use self::control::HrPwmControl;
@@ -188,6 +188,18 @@ pub struct HrPwmBuilder<TIM, PSCL, PS, PINS> {
     out2_polarity: Polarity,
 }
 
+pub struct HrParts<TIM, PSCL, OUT> {
+    pub timer: HrTim<TIM, PSCL, HrCaptCh1<TIM, PSCL>, HrCaptCh2<TIM, PSCL>>,
+
+    pub cr1: HrCr1<TIM, PSCL>,
+    pub cr2: HrCr2<TIM, PSCL>,
+    pub cr3: HrCr3<TIM, PSCL>,
+    pub cr4: HrCr4<TIM, PSCL>,
+
+    pub out: OUT,
+    pub dma_channel: timer::DmaChannel<TIM>,
+}
+
 pub enum PreloadSource {
     /// Preloaded registers are updated on counter roll over or counter reset
     OnCounterReset,
@@ -249,7 +261,7 @@ macro_rules! hrtim_finalize_body {
                 // Set counting direction
                 w.udm().bit($this.counting_direction == HrCountingDirection::UpDown)
             );
-           
+
             tim.cr().modify(|_r, w|
                 // Push-Pull mode
                 w.pshpll().bit($this.enable_push_pull)
@@ -552,20 +564,7 @@ macro_rules! hrtim_hal {
                 PSCL: HrtimPrescaler,
                 PINS: ToHrOut<$TIMX>,
             {
-                pub fn finalize(self, _control: &mut HrPwmControl) -> (
-                    HrTim<$TIMX, PSCL,
-                        HrCapt<$TIMX, PSCL, capture::Ch1, capture::NoDma>,
-                        HrCapt<$TIMX, PSCL, capture::Ch2, capture::NoDma>
-                    >, (
-                            HrCr1<$TIMX, PSCL>,
-                            HrCr2<$TIMX, PSCL>,
-                            HrCr3<$TIMX, PSCL>,
-                            HrCr4<$TIMX, PSCL>
-                        ),
-                        PINS::Out<PSCL>,
-                        timer::DmaChannel<$TIMX>,
-                    ) {
-
+                pub fn finalize(self, _control: &mut HrPwmControl) -> HrParts<$TIMX, PSCL, PINS::Out<PSCL>> {
                     hrtim_finalize_body!(
                         self, PreloadSource,
                         $TIMX, $($out)*
@@ -660,7 +659,6 @@ macro_rules! hrtim_hal {
     };
 }
 
-
 impl HrPwmAdvExt for HRTIM_MASTER {
     type PreloadSource = MasterPreloadSource;
 
@@ -701,25 +699,12 @@ impl HrPwmAdvExt for HRTIM_MASTER {
     }
 }
 
-impl<PSCL, PINS>
-    HrPwmBuilder<HRTIM_MASTER, PSCL, MasterPreloadSource, PINS>
+impl<PSCL, PINS> HrPwmBuilder<HRTIM_MASTER, PSCL, MasterPreloadSource, PINS>
 where
     PSCL: HrtimPrescaler,
     PINS: ToHrOut<HRTIM_MASTER>,
 {
-    pub fn finalize(self, _control: &mut HrPwmControl) -> (
-        HrTim<HRTIM_MASTER, PSCL,
-            HrCapt<HRTIM_MASTER, PSCL, capture::Ch1, capture::NoDma>,
-            HrCapt<HRTIM_MASTER, PSCL, capture::Ch2, capture::NoDma>,
-        >, (
-            HrCr1<HRTIM_MASTER, PSCL>,
-            HrCr2<HRTIM_MASTER, PSCL>,
-            HrCr3<HRTIM_MASTER, PSCL>,
-            HrCr4<HRTIM_MASTER, PSCL>
-        ),
-        timer::DmaChannel<HRTIM_MASTER>,
-    ) {
-
+    pub fn finalize(self, _control: &mut HrPwmControl) -> HrParts<HRTIM_MASTER, PSCL, ()> {
         hrtim_finalize_body!(self, MasterPreloadSource, HRTIM_MASTER,)
     }
 

src/hrtim/timer.rs

@@ -352,4 +352,4 @@ impl<DST, PSCL, CPT1, CPT2> super::event::EventSource<DST, PSCL>
     for HrTim<HRTIM_MASTER, PSCL, CPT1, CPT2>
 {
     const BITS: u32 = 1 << 7; // MSTPER
-}
+}