chore(tim): add HAL v2 support

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

cores/arduino/wiring_analog.c

@@ -215,7 +215,8 @@ void analogWrite(pin_size_t pinNumber, int value)
       dac_write_value(p, value, do_init);
     } else
 #endif //HAL_DAC_MODULE_ENABLED && !HAL_DAC_MODULE_ONLY
-#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
+#if !defined(HAL_TIM_MODULE_ONLY) &&\
+    (defined(HAL_TIM_MODULE_ENABLED) || (defined(USE_HAL_TIM_MODULE) && (USE_HAL_TIM_MODULE == 1)))
       if (pin_in_pinmap(p, PinMap_TIM)) {
         if (is_pin_configured(p, g_anOutputPinConfigured) == false) {
           set_pin_configured(p, g_anOutputPinConfigured);

libraries/SrcWrapper/inc/HardwareTimer.h

@@ -32,7 +32,8 @@
 #include "timer.h"
 #include "stm32yyxx_ll_tim.h"
 
-#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
+#if !defined(HAL_TIM_MODULE_ONLY) &&\
+    (defined(HAL_TIM_MODULE_ENABLED) || (defined(USE_HAL_TIM_MODULE) && (USE_HAL_TIM_MODULE == 1)))
 
 #define  TIMER_CHANNELS 4    // channel5 and channel 6 are not considered here has they don't have gpio output and they don't have interrupt
 
@@ -113,6 +114,14 @@ typedef enum {
   FILTER_DTS32_N8,  // Sampling rate is DTS/32, n=8 events
 } ChannelInputFilter_t;
 
+typedef enum {
+  DISABLE_IT,  // default
+  ENABLE_IT,
+  CLEAR_IT,
+  CLEAR_AND_ENABLE_IT,
+  IS_ENABLE_IT,
+} ChannelITConfig_t;
+
 #ifdef __cplusplus
 
 #include <functional>
@@ -171,19 +180,29 @@ class HardwareTimer {
 
     uint32_t getTimerClkFreq();  // return timer clock frequency in Hz.
 
+#if defined(USE_HALV2_DRIVER)
+    static void captureCompareCallback(hal_tim_handle_t *htim, hal_tim_channel_t hal_channel); // Generic Capture and Compare callback which will call user callback
+    static void updateCallback(hal_tim_handle_t *htim);  // Generic Update (rollover) callback which will call user callback
+#else
     static void captureCompareCallback(TIM_HandleTypeDef *htim); // Generic Capture and Compare callback which will call user callback
     static void updateCallback(TIM_HandleTypeDef *htim);  // Generic Update (rollover) callback which will call user callback
-
+#endif
     void updateRegistersIfNotRunning(TIM_TypeDef *TIMx); // Take into account registers update immediately if timer is not running,
 
     bool isRunning(); // return true if HardwareTimer is running
     bool isRunningChannel(uint32_t channel); // return true if channel is running
 
     // The following function(s) are available for more advanced timer options
+#if defined(USE_HALV2_DRIVER)
+    hal_tim_handle_t *getHandle();  // return the handle address for HAL related configuration
+    hal_tim_channel_t getChannel(uint32_t channel);
+#else
     TIM_HandleTypeDef *getHandle();  // return the handle address for HAL related configuration
     uint32_t getChannel(uint32_t channel);
+#endif
     uint32_t getLLChannel(uint32_t channel);
-    uint32_t getIT(uint32_t channel);
+
+    bool manageIT(uint32_t channel, ChannelITConfig_t config = DISABLE_IT);
     uint32_t getAssociatedChannel(uint32_t channel);
 
   private:

libraries/SrcWrapper/inc/analog.h

@@ -74,7 +74,8 @@ void dac_write_value(PinName pin, uint32_t value, bool do_init);
 void dac_stop(PinName pin);
 #endif
 #endif /* !HAL_DAC_MODULE_ONLY */
-#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
+#if !defined(HAL_TIM_MODULE_ONLY) &&\
+    (defined(HAL_TIM_MODULE_ENABLED) || (defined(USE_HAL_TIM_MODULE) && (USE_HAL_TIM_MODULE == 1)))
 void pwm_start(PinName pin, uint32_t clock_freq, uint32_t value, TimerCompareFormat_t resolution);
 void pwm_stop(PinName pin);
 #endif

libraries/SrcWrapper/inc/timer.h

@@ -22,8 +22,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
-
+#if !defined(HAL_TIM_MODULE_ONLY) &&\
+    (defined(HAL_TIM_MODULE_ENABLED) || (defined(USE_HAL_TIM_MODULE) && (USE_HAL_TIM_MODULE == 1)))
 /* Exported constants --------------------------------------------------------*/
 #ifndef TIM_IRQ_PRIO
 #if (__CORTEX_M == 0x00U)
@@ -65,6 +65,9 @@ extern "C" {
       defined(STM32WBxx) || defined(STM32WBAxx) ||defined(STM32WLxx)
 #define TIM1_IRQn TIM1_UP_IRQn
 #define TIM1_IRQHandler TIM1_UP_IRQHandler
+#elif defined(STM32C5xx)
+#define TIM1_IRQn TIM1_UPD_IRQn
+#define TIM1_IRQHandler TIM1_UPD_IRQHandler
 #endif
 #endif
 
@@ -86,9 +89,9 @@ extern "C" {
 #if defined(STM32G0xx) || defined(STM32U0xx)
 #define TIM6_IRQn TIM6_DAC_LPTIM1_IRQn
 #define TIM6_IRQHandler TIM6_DAC_LPTIM1_IRQHandler
-#elif !defined(STM32F1xx) && !defined(STM32H5xx) && !defined(STM32L1xx) &&\
-      !defined(STM32L5xx) && !defined(STM32MP1xx) && !defined(STM32U3xx) &&\
-      !defined(STM32U5xx)
+#elif !defined(STM32C5xx) && !defined(STM32F1xx) && !defined(STM32H5xx) &&\
+      !defined(STM32L1xx) && !defined(STM32L5xx) && !defined(STM32MP1xx) &&\
+       !defined(STM32U3xx) && !defined(STM32U5xx)
 #define TIM6_IRQn TIM6_DAC_IRQn
 #define TIM6_IRQHandler TIM6_DAC_IRQHandler
 #endif
@@ -115,6 +118,9 @@ extern "C" {
       defined(STM32U5xx)
 #define TIM8_IRQn TIM8_UP_IRQn
 #define TIM8_IRQHandler TIM8_UP_IRQHandler
+#elif defined(STM32C5xx)
+#define TIM8_IRQn TIM8_UPD_IRQn
+#define TIM8_IRQHandler TIM8_UPD_IRQHandler
 #endif
 #endif
 
@@ -276,25 +282,36 @@ typedef enum {
 typedef struct  {
   // Those 2 first fields must remain in this order at the beginning of the structure
   void    *__this;
+#if defined(USE_HALV2_DRIVER)
+  hal_tim_handle_t handle;
+#else
   TIM_HandleTypeDef handle;
+#endif
+  TIM_TypeDef *instance;
   uint32_t preemptPriority;
   uint32_t subPriority;
 } timerObj_t;
 
 /* Exported functions ------------------------------------------------------- */
+#if defined(USE_HALV2_DRIVER)
+timerObj_t *get_timer_obj(hal_tim_handle_t *htim);
+#else
 timerObj_t *get_timer_obj(TIM_HandleTypeDef *htim);
-
-void enableTimerClock(TIM_HandleTypeDef *htim);
-void disableTimerClock(TIM_HandleTypeDef *htim);
+#endif
+void enableTimerClock(TIM_TypeDef *instance);
+void disableTimerClock(TIM_TypeDef *instance);
 
 uint32_t getTimerIrq(TIM_TypeDef *tim);
 uint8_t getTimerClkSrc(TIM_TypeDef *tim);
 
 IRQn_Type getTimerUpIrq(TIM_TypeDef *tim);
 IRQn_Type getTimerCCIrq(TIM_TypeDef *tim);
 
+#if defined(USE_HALV2_DRIVER)
+hal_tim_channel_t getTimerChannel(PinName pin);
+#else
 uint32_t getTimerChannel(PinName pin);
-
+#endif
 #endif /* HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY */
 
 #ifdef __cplusplus