Skip to content

Commit 2dc74e4

Browse files
committed
with RTC configured in MIX mode, the SSR is 32-bit value
Give the parameters a 32-bit value to match the SubSecond register of the RTC. Signed-off-by: Francois Ramu <francois.ramu@st.com>
1 parent 1d05b79 commit 2dc74e4

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/BSP/timer_if.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
412412
/* USER CODE END HAL_RTCEx_SSRUEventCallback_Last */
413413
}
414414

415-
uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
415+
uint32_t TIMER_IF_GetTime(uint32_t *mSeconds)
416416
{
417417
uint32_t seconds = 0;
418418
/* USER CODE BEGIN TIMER_IF_GetTime */

src/BSP/timer_if.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick);
140140
* @param[out] subSeconds in ticks
141141
* @return time seconds
142142
*/
143-
uint32_t TIMER_IF_GetTime(uint16_t *subSeconds);
143+
uint32_t TIMER_IF_GetTime(uint32_t *subSeconds);
144144

145145
/**
146146
* @brief write seconds in backUp register

src/STM32CubeWL/Utilities/misc/stm32_systime.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ void SysTimeSet( SysTime_t sysTime )
233233

234234
SysTime_t calendarTime = { .Seconds = 0, .SubSeconds = 0 };
235235

236-
calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint16_t* )&calendarTime.SubSeconds );
236+
calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint32_t* )&calendarTime.SubSeconds );
237237

238238
// sysTime is UNIX epoch
239239
DeltaTime = SysTimeSub( sysTime, calendarTime );
@@ -248,9 +248,9 @@ SysTime_t SysTimeGet( void )
248248
SysTime_t sysTime = { .Seconds = 0, .SubSeconds = 0 };
249249
SysTime_t DeltaTime;
250250

251-
calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint16_t* )&calendarTime.SubSeconds );
251+
calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint32_t* )&calendarTime.SubSeconds );
252252

253-
DeltaTime.SubSeconds = (int16_t)UTIL_SYSTIMDriver.BKUPRead_SubSeconds();
253+
DeltaTime.SubSeconds = (int32_t)UTIL_SYSTIMDriver.BKUPRead_SubSeconds();
254254
DeltaTime.Seconds = UTIL_SYSTIMDriver.BKUPRead_Seconds();
255255

256256
sysTime = SysTimeAdd( DeltaTime, calendarTime );
@@ -263,7 +263,7 @@ SysTime_t SysTimeGetMcuTime( void )
263263
{
264264
SysTime_t calendarTime = { .Seconds = 0, .SubSeconds = 0 };
265265

266-
calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint16_t* )&calendarTime.SubSeconds );
266+
calendarTime.Seconds = UTIL_SYSTIMDriver.GetCalendarTime( ( uint32_t* )&calendarTime.SubSeconds );
267267

268268
return calendarTime;
269269
}
@@ -284,7 +284,7 @@ SysTime_t SysTimeFromMs( uint32_t timeMs )
284284
SysTime_t sysTime = { .Seconds = seconds, .SubSeconds = timeMs - seconds * 1000 };
285285
SysTime_t DeltaTime = { 0 };
286286

287-
DeltaTime.SubSeconds = (int16_t)UTIL_SYSTIMDriver.BKUPRead_SubSeconds();
287+
DeltaTime.SubSeconds = (int32_t)UTIL_SYSTIMDriver.BKUPRead_SubSeconds();
288288
DeltaTime.Seconds = UTIL_SYSTIMDriver.BKUPRead_Seconds();
289289
return SysTimeAdd( sysTime, DeltaTime );
290290
}

src/STM32CubeWL/Utilities/misc/stm32_systime.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ typedef struct
133133
uint32_t (*BKUPRead_Seconds) ( void ); /*!< Get the timer differencebetween real time and rtc time */
134134
void (*BKUPWrite_SubSeconds) ( uint32_t SubSeconds); /*!< Set the timer differencebetween real time and rtc time */
135135
uint32_t (*BKUPRead_SubSeconds) ( void ); /*!< Get the timer differencebetween real time and rtc time */
136-
uint32_t (*GetCalendarTime)( uint16_t* SubSeconds ); /*!< Set the rtc time */
136+
uint32_t (*GetCalendarTime)( uint32_t* SubSeconds ); /*!< Set the rtc time */
137137
} UTIL_SYSTIM_Driver_s;
138138

139139
/**

0 commit comments

Comments
 (0)