Fix dac trigger types

Author: usbalbin

Cargo.toml

@@ -19,7 +19,7 @@ fugit = "0.3.7"
 stm32-usbd = { version = "0.7.0", optional = true }
 fixed = { version = "1.28.0", optional = true }
 embedded-io = "0.6"
-stm32-hrtim = { git = "https://github.com/usbalbin/stm32-hrtim", rev = "e8ab6db", optional = true }
+stm32-hrtim = { git = "https://github.com/usbalbin/stm32-hrtim", rev = "cb7c960", optional = true }
 
 [dependencies.cortex-m]
 version = "0.7.7"

src/hrtim/mod.rs

@@ -34,8 +34,9 @@ impl HrControltExt for crate::stm32::HRTIM_COMMON {
     }
 }
 
-pub trait HrPwmBuilderExt<TIM, PSCL, PINS: ToHrOut<TIM>, DacRst, DacStp>
+pub trait HrPwmBuilderExt<TIM, PSCL, PINS, DacRst, DacStp>
 where
+    PINS: ToHrOut<TIM, DacRst, DacStp>,
     DacRst: DacResetTrigger,
     DacStp: DacStepTrigger,
 {
@@ -51,14 +52,14 @@ macro_rules! impl_finalize {
             for HrPwmBuilder<$TIMX, PSCL, stm32_hrtim::PreloadSource, PINS, DacRst, DacStp>
             where
                 PSCL: stm32_hrtim::HrtimPrescaler,
-                PINS: HrtimPin<$TIMX>,
+                PINS: HrtimPin<$TIMX> + ToHrOut<$TIMX, DacRst, DacStp>,
                 DacRst: DacResetTrigger,
                 DacStp: DacStepTrigger
         {
             fn finalize(
                 self,
                 control: &mut HrPwmControl,
-            ) -> HrParts<$TIMX, PSCL, <PINS as ToHrOut<$TIMX>>::Out<PSCL>, DacRst, DacStp> {
+            ) -> HrParts<$TIMX, PSCL, <PINS as ToHrOut<$TIMX, DacRst, DacStp>>::Out<PSCL>, DacRst, DacStp> {
                 let pins = self._init(control);
                 pins.connect_to_hrtim();
                 unsafe { MaybeUninit::uninit().assume_init() }

tests/nucleo-g474_w_jumpers-hrtim.rs

@@ -195,7 +195,7 @@ const VREF_ADC_BITS: u16 = 1504;
 
 struct Peripherals<PSCL> {
     timer:
-        HrParts<HRTIM_TIMA, PSCL, HrOut1<HRTIM_TIMA, PSCL>, DacResetOnCounterReset, DacStepOnCmp2>,
+        HrParts<HRTIM_TIMA, PSCL, HrOut1<HRTIM_TIMA, PSCL, DacResetOnCounterReset, DacStepOnCmp2>, DacResetOnCounterReset, DacStepOnCmp2>,
     hr_control: HrPwmControl,
     eev_input4: ExternalEventSource<4, false>,
     comp: Comparator<comparator::COMP1, comparator::Enabled>,
@@ -281,7 +281,7 @@ fn setup<PSCL: HrtimPrescaler>(
     let mut hr_control = hr_control.constrain();
     let eev_cfgs =
         EevCfgs::default().eev4(EevCfg::default().filter(EventFilter::BlankingResetToCmp1));
-    let mut timer = dp
+    let mut timer: HrParts<_, PSCL, HrOut1<_, PSCL, DacResetOnCounterReset, DacStepOnCmp2>, DacResetOnCounterReset, DacStepOnCmp2> = dp
         .HRTIM_TIMA
         .pwm_advanced(pa8)
         .prescaler(prescaler)
@@ -306,6 +306,7 @@ fn setup<PSCL: HrtimPrescaler>(
         .comparator(pa1, comp_ref, comparator::Config::default(), &rcc.clocks)
         .enable();
 
+    let timer: HrParts<_, _, HrOut1<_, _, DacResetOnCounterReset, DacStepOnCmp2>, _, _> = timer;
     Peripherals {
         timer,
         hr_control,