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

@@ -37,8 +37,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,
 {
@@ -54,14 +55,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() }
@@ -91,7 +92,7 @@ use gpio::{
 
 use gpio::gpioc::{PC6, PC7};
 
-trait HrtimPin<TIM>: ToHrOut<TIM> {
+trait HrtimPin<TIM> {
     fn connect_to_hrtim(self);
 }