More work on dac trigger and tests

Author: usbalbin

Cargo.toml

@@ -155,6 +155,10 @@ name = "nucleo-g474_hrtim"
 harness = false
 required-features = ["stm32g474", "defmt", "hrtim"]
 
+[[test]]
+name = "nucleo-g474_w_jumpers-hrtim"
+harness = false
+
 [lib]
 test = false
 

examples/utils/mod.rs

@@ -1,3 +1,4 @@
 //! Utilities for examples
 
 pub mod logger;
+pub mod test;

examples/utils/test.rs

@@ -0,0 +1,49 @@
+#![allow(dead_code)]
+
+use fugit::MicrosDurationU32;
+
+use stm32g4xx_hal::stm32;
+
+pub fn is_pax_low(gpioa: &stm32::gpioa::RegisterBlock, x: u8) -> bool {
+    gpioa.idr().read().idr(x).is_low()
+}
+
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[derive(Debug)]
+pub struct ErrorTimedOut;
+
+pub fn await_lo(
+    gpioa: &stm32::gpioa::RegisterBlock,
+    pin: u8,
+    timeout: MicrosDurationU32,
+    now: impl FnMut() -> MicrosDurationU32,
+) -> Result<MicrosDurationU32, ErrorTimedOut> {
+    await_p(|| is_pax_low(gpioa, pin), timeout, now)
+}
+
+pub fn await_hi(
+    gpioa: &stm32::gpioa::RegisterBlock,
+    pin: u8,
+    timeout: MicrosDurationU32,
+    now: impl FnMut() -> MicrosDurationU32,
+) -> Result<MicrosDurationU32, ErrorTimedOut> {
+    await_p(|| !is_pax_low(gpioa, pin), timeout, now)
+}
+
+pub fn await_p(
+    mut p: impl FnMut() -> bool,
+    timeout: MicrosDurationU32,
+    mut now: impl FnMut() -> MicrosDurationU32,
+) -> Result<MicrosDurationU32, ErrorTimedOut> {
+    let before = now();
+
+    loop {
+        let passed_time = now() - before;
+        if p() {
+            return Ok(passed_time);
+        }
+        if passed_time > timeout {
+            return Err(ErrorTimedOut);
+        }
+    }
+}

src/hrtim/dac_trigger.rs

@@ -0,0 +1,37 @@
+use stm32_hrtim::DacResetOnCounterReset;
+use stm32_hrtim::{
+    compare_register::HrCr2, output::HrOut1, timer::HrTim, DacResetOnOut1Set, DacResetTrigger,
+    DacStepOnCmp2, DacStepOnOut1Rst, DacStepTrigger,
+};
+
+use crate::dac::{IncTriggerSource, TriggerSource as RstTriggerSource};
+use crate::stm32;
+
+// TODO: use crate::stasis instead of references
+macro_rules! impl_dac_triggers {
+    ($($TIM:ident: $bits:expr),*) => {$(
+        unsafe impl<PSCL> IncTriggerSource for &HrCr2<stm32::$TIM, PSCL, DacStepOnCmp2> {
+            const BITS: u8 = $bits;
+        }
+        unsafe impl<PSCL, R: DacResetTrigger> IncTriggerSource for &HrOut1<stm32::$TIM, PSCL, R, DacStepOnOut1Rst> {
+            const BITS: u8 = $bits;
+        }
+
+        unsafe impl<PSCL, CPT1, CPT2> RstTriggerSource for &HrTim<stm32::$TIM, PSCL, CPT1, CPT2, DacResetOnCounterReset> {
+            const BITS: u8 = $bits;
+        }
+        unsafe impl<PSCL, S: DacStepTrigger> RstTriggerSource for &HrOut1<stm32::$TIM, PSCL, DacResetOnOut1Set, S> {
+            const BITS: u8 = $bits;
+        }
+    )*};
+}
+
+// RM0440 DAC1 interconnection
+impl_dac_triggers! {
+    HRTIM_TIMA: 9,
+    HRTIM_TIMB: 10,
+    HRTIM_TIMC: 11,
+    HRTIM_TIMD: 12,
+    HRTIM_TIME: 13,
+    HRTIM_TIMF: 14
+}

src/hrtim/mod.rs

@@ -1,5 +1,6 @@
 pub mod adc_trigger;
 pub mod capture;
+pub mod dac_trigger;
 pub mod external_event;
 pub mod fault;
 
@@ -13,7 +14,7 @@ use crate::{
 use stm32_hrtim::{
     control::{HrPwmControl, HrTimOngoingCalibration},
     output::{HrOut1, HrOut2, ToHrOut},
-    HrParts, HrPwmBuilder,
+    DacResetTrigger, DacStepTrigger, HrParts, HrPwmBuilder,
 };
 
 pub use stm32_hrtim;
@@ -33,18 +34,31 @@ impl HrControltExt for crate::stm32::HRTIM_COMMON {
     }
 }
 
-pub trait HrPwmBuilderExt<TIM, PSCL, PINS: ToHrOut<TIM>> {
-    fn finalize(self, control: &mut HrPwmControl) -> HrParts<TIM, PSCL, PINS::Out<PSCL>>;
+pub trait HrPwmBuilderExt<TIM, PSCL, PINS: ToHrOut<TIM>, DacRst, DacStp>
+where
+    DacRst: DacResetTrigger,
+    DacStp: DacStepTrigger,
+{
+    fn finalize(
+        self,
+        control: &mut HrPwmControl,
+    ) -> HrParts<TIM, PSCL, PINS::Out<PSCL>, DacRst, DacStp>;
 }
+
 macro_rules! impl_finalize {
     ($($TIMX:ident),+) => {$(
-        impl<PSCL: stm32_hrtim::HrtimPrescaler, PINS: HrtimPin<$TIMX>> HrPwmBuilderExt<$TIMX, PSCL, PINS>
-            for HrPwmBuilder<$TIMX, PSCL, stm32_hrtim::PreloadSource, PINS>
+        impl<PSCL, PINS, DacRst, DacStp> HrPwmBuilderExt<$TIMX, PSCL, PINS, DacRst, DacStp>
+            for HrPwmBuilder<$TIMX, PSCL, stm32_hrtim::PreloadSource, PINS, DacRst, DacStp>
+            where
+                PSCL: stm32_hrtim::HrtimPrescaler,
+                PINS: HrtimPin<$TIMX>,
+                DacRst: DacResetTrigger,
+                DacStp: DacStepTrigger
         {
             fn finalize(
                 self,
                 control: &mut HrPwmControl,
-            ) -> HrParts<$TIMX, PSCL, <PINS as ToHrOut<$TIMX>>::Out<PSCL>> {
+            ) -> HrParts<$TIMX, PSCL, <PINS as ToHrOut<$TIMX>>::Out<PSCL>, DacRst, DacStp> {
                 let pins = self._init(control);
                 pins.connect_to_hrtim();
                 unsafe { MaybeUninit::uninit().assume_init() }
@@ -93,8 +107,12 @@ macro_rules! pins_helper {
     ($TIMX:ty, $HrOutY:ident, $CHY:ident<$CHY_AF:literal>) => {
         //impl sealed::Sealed<$TIMX> for $CHY<GpioInputMode> {}
 
-        unsafe impl ToHrOut<$TIMX> for $CHY<gpio::DefaultMode> {
-            type Out<PSCL> = $HrOutY<$TIMX, PSCL>;
+        unsafe impl<DacRst, DacStp> ToHrOut<$TIMX, DacRst, DacStp> for $CHY<gpio::DefaultMode>
+        where
+            DacRst: DacResetTrigger,
+            DacStp: DacStepTrigger,
+        {
+            type Out<PSCL> = $HrOutY<$TIMX, PSCL, DacRst, DacStp>;
         }
 
         impl HrtimPin<$TIMX> for $CHY<gpio::DefaultMode> {