mkvoya
/
rt-thread
forked from springcute/rt-thread
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5360 from iysheng/fix_gmtime 

[bsp][stm32] Modify variable name p_tm to tm
This commit is contained in:
guo 2021-12-10 18:43:24 +08:00 committed by GitHub
parent 8a3ee36b1a b6d90dffcf
commit 034b41c6fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bsp/stm32/libraries/HAL_Drivers/drv_rtc.c
View File

@ -65,21 +65,21 @@ static rt_err_t set_rtc_time_stamp(time_t time_stamp)
{
RTC_TimeTypeDef RTC_TimeStruct = {0};
RTC_DateTypeDef RTC_DateStruct = {0};
struct tm p_tm = {0};
struct tm tm = {0};
gmtime_r(&time_stamp, &p_tm);
if (p_tm.tm_year < 100)
gmtime_r(&time_stamp, &tm);
if (tm.tm_year < 100)
{
return -RT_ERROR;
}
RTC_TimeStruct.Seconds = p_tm.tm_sec ;
RTC_TimeStruct.Minutes = p_tm.tm_min ;
RTC_TimeStruct.Hours = p_tm.tm_hour;
RTC_DateStruct.Date = p_tm.tm_mday;
RTC_DateStruct.Month = p_tm.tm_mon + 1 ;
RTC_DateStruct.Year = p_tm.tm_year - 100;
RTC_DateStruct.WeekDay = p_tm.tm_wday + 1;
RTC_TimeStruct.Seconds = tm.tm_sec ;
RTC_TimeStruct.Minutes = tm.tm_min ;
RTC_TimeStruct.Hours = tm.tm_hour;
RTC_DateStruct.Date = tm.tm_mday;
RTC_DateStruct.Month = tm.tm_mon + 1 ;
RTC_DateStruct.Year = tm.tm_year - 100;
RTC_DateStruct.WeekDay = tm.tm_wday + 1;
if (HAL_RTC_SetTime(&RTC_Handler, &RTC_TimeStruct, RTC_FORMAT_BIN) != HAL_OK)
{