feat: adapt timer to use rtc

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

src/STM32CubeWL/Utilities/misc/stm32_systime.c

@@ -233,7 +233,7 @@ void SysTimeSet( SysTime_t sysTime )
 
   SysTime_t calendarTime = { .Seconds = 0, .SubSeconds = 0 };
 
-  calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint16_t* )&calendarTime.SubSeconds );
+  calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint32_t* )&calendarTime.SubSeconds );
 
   // sysTime is UNIX epoch
   DeltaTime = SysTimeSub( sysTime, calendarTime );
@@ -248,9 +248,9 @@ SysTime_t SysTimeGet( void )
   SysTime_t sysTime = { .Seconds = 0, .SubSeconds = 0 };
   SysTime_t DeltaTime;
 
-  calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint16_t* )&calendarTime.SubSeconds );
+  calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint32_t* )&calendarTime.SubSeconds );
 
-  DeltaTime.SubSeconds = (int16_t)UTIL_SYSTIMDriver.BKUPRead_SubSeconds();
+  DeltaTime.SubSeconds = (int32_t)UTIL_SYSTIMDriver.BKUPRead_SubSeconds();
   DeltaTime.Seconds = UTIL_SYSTIMDriver.BKUPRead_Seconds();
 
   sysTime = SysTimeAdd( DeltaTime, calendarTime );
@@ -263,7 +263,7 @@ SysTime_t SysTimeGetMcuTime( void )
 {
   SysTime_t calendarTime = { .Seconds = 0, .SubSeconds = 0 };
 
-  calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint16_t* )&calendarTime.SubSeconds );
+  calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint32_t* )&calendarTime.SubSeconds );
 
   return calendarTime;
 }
@@ -284,7 +284,7 @@ SysTime_t SysTimeFromMs( uint32_t timeMs )
   SysTime_t sysTime = { .Seconds = seconds, .SubSeconds =  timeMs - seconds * 1000 };
   SysTime_t DeltaTime = { 0 };
 
-  DeltaTime.SubSeconds = (int16_t)UTIL_SYSTIMDriver.BKUPRead_SubSeconds();
+  DeltaTime.SubSeconds = (int32_t)UTIL_SYSTIMDriver.BKUPRead_SubSeconds();
   DeltaTime.Seconds = UTIL_SYSTIMDriver.BKUPRead_Seconds();
   return SysTimeAdd( sysTime, DeltaTime );
 }

src/STM32CubeWL/Utilities/misc/stm32_systime.h

@@ -133,7 +133,7 @@ typedef struct
   uint32_t (*BKUPRead_Seconds) ( void ); /*!< Get the timer differencebetween real time and rtc time */
   void     (*BKUPWrite_SubSeconds) ( uint32_t SubSeconds);  /*!< Set the timer differencebetween real time and rtc time */
   uint32_t (*BKUPRead_SubSeconds) ( void ); /*!< Get the timer differencebetween real time and rtc time */
-  uint32_t (*GetCalendarTime)( uint16_t* SubSeconds );          /*!< Set the rtc time */
+  uint32_t (*GetCalendarTime)( uint32_t* SubSeconds );          /*!< Set the rtc time */
 } UTIL_SYSTIM_Driver_s;
 
 /**

src/STM32CubeWL/Utilities/timer/stm32_timer.c

@@ -116,11 +116,11 @@ bool TimerExists( UTIL_TIMER_Object_t *TimerObject );
   *  @{
   */
 
-UTIL_TIMER_Status_t UTIL_TIMER_Init(void)
+UTIL_TIMER_Status_t UTIL_TIMER_Init(RTC_HandleTypeDef *RtcHandle)
 {
   UTIL_TIMER_INIT_CRITICAL_SECTION();
   TimerListHead = NULL;
-  return UTIL_TimerDriver.InitTimer();
+  return UTIL_TimerDriver.InitTimer(RtcHandle);
 }
 
 UTIL_TIMER_Status_t UTIL_TIMER_DeInit(void)

src/STM32CubeWL/Utilities/timer/stm32_timer.h

@@ -57,6 +57,7 @@
 #include <stddef.h>   
 #include <cmsis_compiler.h>
 #include "../../../BSP/utilities_conf.h"
+#include "rtc.h"
 
 /* Exported types ------------------------------------------------------------*/
 /** @defgroup TIMER_SERVER_exported_TypeDef TIMER_SERVER exported Typedef
@@ -103,7 +104,7 @@ typedef struct TimerEvent_s
   */
 typedef struct
 {
-    UTIL_TIMER_Status_t   (* InitTimer )( void );                  /*!< Initialisation of the low layer timer    */
+    UTIL_TIMER_Status_t   (* InitTimer )( RTC_HandleTypeDef * );                  /*!< Initialisation of the low layer timer    */
     UTIL_TIMER_Status_t   (* DeInitTimer )( void );                /*!< Un-Initialisation of the low layer timer */
 
     UTIL_TIMER_Status_t   (* StartTimerEvt )( uint32_t timeout );  /*!< Start the low layer timer */
@@ -156,9 +157,10 @@ extern const UTIL_TIMER_Driver_s UTIL_TimerDriver;
 /**
   * @brief Initialize the timer server
   *
+  * @param RtcHandle RTC_HandleTypeDef
   * @retval Status based on @ref UTIL_TIMER_Status_t
   */
-UTIL_TIMER_Status_t UTIL_TIMER_Init(void);
+UTIL_TIMER_Status_t UTIL_TIMER_Init(RTC_HandleTypeDef *RtcHandle);
 
 /**
   * @brief Un-Initialize the timer server