Skip to content

[Enhancement] Add date retention support to stm32f1xx boards #1187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[Enhancement] Add date retention support to stm32f1xx boards #1187

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions system/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@

/* Includes ------------------------------------------------------------------*/
#include "stm32f1xx_hal.h"
#include <string.h>

/** @addtogroup STM32F1xx_HAL_Driver
* @{
Expand Down Expand Up @@ -389,10 +390,30 @@ HAL_StatusTypeDef HAL_RTC_Init(RTC_HandleTypeDef *hrtc)
return HAL_ERROR;
}

/* Initialize date to 1st of January 2000 */
hrtc->DateToUpdate.Year = 0x00U;
hrtc->DateToUpdate.Month = RTC_MONTH_JANUARY;
hrtc->DateToUpdate.Date = 0x01U;
// Copy date data back out of the BackUp registers
RTC_DateTypeDef BackupDate;
RTC_TimeTypeDef DummyTime;
uint32_t dateMem;
dateMem = HAL_RTCEx_BKUPRead(hrtc, RTC_BKP_DR3);
dateMem |= HAL_RTCEx_BKUPRead(hrtc, RTC_BKP_DR2) << 16;
memcpy(&BackupDate, &dateMem, sizeof(uint32_t));
if(IS_RTC_YEAR(BackupDate.Year) && IS_RTC_MONTH(BackupDate.Month) && IS_RTC_DATE(BackupDate.Date)) {
/* Change the date retrieved from the backup registers */
hrtc->DateToUpdate.Year = BackupDate.Year;
hrtc->DateToUpdate.Month = BackupDate.Month;
hrtc->DateToUpdate.Date = BackupDate.Date;

/* Read the time so that the date is rolled over if required */
HAL_RTC_GetTime(hrtc, &DummyTime, RTC_FORMAT_BIN);
} else {
/* Initialize date to 1st of January 2000 */
hrtc->DateToUpdate.Year = 0x00U;
hrtc->DateToUpdate.Month = RTC_MONTH_JANUARY;
hrtc->DateToUpdate.Date = 0x01U;
}

/* Calculate the current weekday */
hrtc->DateToUpdate.WeekDay = RTC_WeekDayNum(hrtc->DateToUpdate.Year, hrtc->DateToUpdate.Month, hrtc->DateToUpdate.Date);

/* Set RTC state */
hrtc->State = HAL_RTC_STATE_READY;
Expand Down Expand Up @@ -954,6 +975,12 @@ HAL_StatusTypeDef HAL_RTC_SetDate(RTC_HandleTypeDef *hrtc, RTC_DateTypeDef *sDat
/* WeekDay set by user can be ignored because automatically calculated */
hrtc->DateToUpdate.WeekDay = RTC_WeekDayNum(hrtc->DateToUpdate.Year, hrtc->DateToUpdate.Month, hrtc->DateToUpdate.Date);
sDate->WeekDay = hrtc->DateToUpdate.WeekDay;

/* Store the date in the backup registers so we can pull it back out on RTC_Init (allows us to keep date details through power cycles) */
uint32_t dateToStore;
memcpy(&dateToStore, &hrtc->DateToUpdate, 4);
HAL_RTCEx_BKUPWrite(hrtc, RTC_BKP_DR2, dateToStore >> 16);
HAL_RTCEx_BKUPWrite(hrtc, RTC_BKP_DR3, dateToStore & 0xffff);

/* Reset time to be aligned on the same day */
/* Read the time counter*/
Expand Down Expand Up @@ -1868,6 +1895,12 @@ static void RTC_DateUpdate(RTC_HandleTypeDef *hrtc, uint32_t DayElapsed)

/* Update day of the week */
hrtc->DateToUpdate.WeekDay = RTC_WeekDayNum(year, month, day);

/* Store the date in the backup registers so we can pull it back out on RTC_Init (allows us to keep date details through power cycles) */
uint32_t dateToStore;
memcpy(&dateToStore, &hrtc->DateToUpdate, 4);
HAL_RTCEx_BKUPWrite(hrtc, RTC_BKP_DR2, dateToStore >> 16);
HAL_RTCEx_BKUPWrite(hrtc, RTC_BKP_DR3, dateToStore & 0xffff);
}

/**
Expand Down