Try to support stm32f334

Author: usbalbin

Cargo.toml

@@ -5,6 +5,10 @@ edition = "2021"
 
 [dependencies]
 
+stm32f3 = { git = "https://github.com/stm32-rs/stm32-rs-nightlies", optional = true }
+#stm32h7 = { git = "", optional = true }
+#stm32g4 = { git = "", optional = true }
+
 stm32f3xx-hal = { version = "0.10.0", optional = true }
 stm32h7xx-hal = { version = "0.16.0", optional = true }
 #stm32g4xx-hal = { version = "0.0.1", optional = true }
@@ -20,7 +24,7 @@ hrtim_v1 = []
 hrtim_v1_1 = []
 hrtim_v2 = []
 
-stm32f3 = []
+stm32f3 = ["stm32f3/stm32f3x4"]
 stm32h7 = []
 stm32g4 = []
 

src/adc_trigger.rs

@@ -1,17 +1,21 @@
 use core::marker::PhantomData;
 
+#[cfg(feature = "stm32g4")]
 pub trait Adc13Trigger {
     const BITS: u32;
 }
 
+#[cfg(feature = "stm32g4")]
 pub trait Adc24Trigger {
     const BITS: u32;
 }
 
+#[cfg(feature = "stm32g4")]
 pub trait Adc579Trigger {
     const BITS: u32;
 }
 
+#[cfg(feature = "stm32g4")]
 pub trait Adc6810Trigger {
     const BITS: u32;
 }

src/capture.rs

@@ -1,11 +1,16 @@
-use crate::{hal, stm32};
+use crate::stm32;
 
 use super::timer;
+
+#[cfg(feature = "stm32g4")]
 use crate::mcu::DmaMuxResources;
-use hal::dma::traits::TargetAddress;
-use hal::dma::PeripheralToMemory;
-use stm32::{HRTIM_TIMA, HRTIM_TIMB, HRTIM_TIMC, HRTIM_TIMD, HRTIM_TIME, HRTIM_TIMF};
+#[cfg(feature = "stm32g4")]
+use crate::hal::dma::PeripheralToMemory;
+
 use core::marker::PhantomData;
+#[cfg(feature = "hrtim_v2")]
+use stm32::HRTIM_TIMF;
+use stm32::{HRTIM_TIMA, HRTIM_TIMB, HRTIM_TIMC, HRTIM_TIMD, HRTIM_TIME};
 
 pub struct Ch1;
 pub struct Ch2;
@@ -27,6 +32,7 @@ pub struct HrCapt<TIM, PSCL, CH, DMA> {
 #[derive(Copy, Clone, Debug)]
 pub enum CountingDirection {
     Up = 0,
+    #[cfg(feature = "hrtim_v2")]
     Down = 1,
 }
 
@@ -129,6 +135,7 @@ pub trait HrCapture {
         // The capture counter always counts up and restarts at period
         match dir {
             CountingDirection::Up => i32::from(value),
+            #[cfg(feature = "hrtim_v2")]
             CountingDirection::Down => i32::from(value) - i32::from(period),
         }
     }
@@ -140,10 +147,14 @@ pub trait HrCapture {
 
 pub fn dma_value_to_dir_and_value(x: u32) -> (u16, CountingDirection) {
     let value = (x & 0xFFFF) as u16;
+    #[cfg(feature = "hrtim_v2")]
     match x & (1 << 16) != 0 {
         true => (value, CountingDirection::Down),
         false => (value, CountingDirection::Up),
     }
+
+    #[cfg(any(feature = "hrtim_v1", feature = "hrtim_v1_1"))]
+    (value, CountingDirection::Up)
 }
 
 pub fn dma_value_to_signed(x: u32, period: u16) -> i32 {
@@ -152,6 +163,7 @@ pub fn dma_value_to_signed(x: u32, period: u16) -> i32 {
     // The capture counter always counts up and restarts at period
     match dir {
         CountingDirection::Up => i32::from(value),
+        #[cfg(feature = "hrtim_v2")]
         CountingDirection::Down => i32::from(value) - i32::from(period),
     }
 }
@@ -219,10 +231,14 @@ macro_rules! impl_capture {
                 let tim = unsafe { &*$TIMX::ptr() };
                 let data = tim.$cptXr().read();
 
+                #[cfg(feature = "hrtim_v2")]
                 let dir = match data.dir().bit() {
                     true => CountingDirection::Down,
                     false => CountingDirection::Up,
                 };
+                #[cfg(any(feature = "hrtim_v1", feature = "hrtim_v1_1"))]
+                let dir = CountingDirection::Up;
+
                 let value = data.cpt().bits();
 
                 (value, dir)
@@ -243,7 +259,8 @@ macro_rules! impl_capture {
             }
         }
 
-        unsafe impl<PSCL> TargetAddress<PeripheralToMemory> for HrCapt<$TIMX, PSCL, $CH, Dma> {
+        #[cfg(feature = "stm32g4")]
+        unsafe impl<PSCL> crate::hal::dma::traits::TargetAddress<PeripheralToMemory> for HrCapt<$TIMX, PSCL, $CH, Dma> {
             #[inline(always)]
             fn address(&self) -> u32 {
                 let tim = unsafe { &*$TIMX::ptr() };
@@ -262,6 +279,10 @@ impl_capture! {
     HRTIM_TIMB,
     HRTIM_TIMC,
     HRTIM_TIMD,
-    HRTIM_TIME,
+    HRTIM_TIME
+}
+
+#[cfg(feature = "hrtim_v2")]
+impl_capture! {
     HRTIM_TIMF
 }

src/compare_register.rs

@@ -1,8 +1,10 @@
 use core::marker::PhantomData;
 
 use crate::stm32::{
-    HRTIM_MASTER, HRTIM_TIMA, HRTIM_TIMB, HRTIM_TIMC, HRTIM_TIMD, HRTIM_TIME, HRTIM_TIMF,
+    HRTIM_MASTER, HRTIM_TIMA, HRTIM_TIMB, HRTIM_TIMC, HRTIM_TIMD, HRTIM_TIME,
 };
+#[cfg(feature = "hrtim_v2")]
+use crate::stm32::HRTIM_TIMF;
 
 pub trait HrCompareRegister {
     fn get_duty(&self) -> u16;
@@ -14,11 +16,16 @@ pub struct HrCr2<TIM, PSCL>(PhantomData<(TIM, PSCL)>);
 pub struct HrCr3<TIM, PSCL>(PhantomData<(TIM, PSCL)>);
 pub struct HrCr4<TIM, PSCL>(PhantomData<(TIM, PSCL)>);
 
+#[cfg(feature = "stm32g4")]
 use super::adc_trigger::Adc13Trigger as Adc13;
+#[cfg(feature = "stm32g4")]
 use super::adc_trigger::Adc24Trigger as Adc24;
+#[cfg(feature = "stm32g4")]
 use super::adc_trigger::Adc579Trigger as Adc579;
+#[cfg(feature = "stm32g4")]
 use super::adc_trigger::Adc6810Trigger as Adc6810;
 
+#[cfg(feature = "stm32g4")]
 macro_rules! hrtim_cr_helper {
     (HRTIM_MASTER: $cr_type:ident:
         $cmpXYr:ident,
@@ -71,6 +78,7 @@ macro_rules! hrtim_cr_helper {
     };
 }
 
+#[cfg(feature = "stm32g4")]
 macro_rules! hrtim_cr {
     ($($TIMX:ident: [
         [$(($cr1_trigger:ident: $cr1_trigger_bits:expr)),*], [$(($cr1_event_dst:ident, $cr1_tim_event_index:expr)),*],
@@ -86,6 +94,7 @@ macro_rules! hrtim_cr {
 }
 
 // See RM0440 Table 218. 'Events mapping across timer A to F'
+#[cfg(feature = "stm32g4")]
 hrtim_cr! {
     HRTIM_MASTER: [
         [(Adc13: 1 << 0),  (Adc24: 1 << 0),  (Adc579: 0),  (Adc6810: 0) ], [],
@@ -179,8 +188,11 @@ hrtim_timer_rst! {
     HRTIM_TIMD: HrCr4: 3,
 
     HRTIM_TIME: HrCr2: 2,
-    HRTIM_TIME: HrCr4: 3,
+    HRTIM_TIME: HrCr4: 3
+}
 
+#[cfg(feature = "hrtim_v2")]
+hrtim_timer_rst! {
     HRTIM_TIMF: HrCr2: 2,
     HRTIM_TIMF: HrCr4: 3
-}
+}