From 2c99de86d0645973daeaddf3ab45666045e3f2da Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Wed, 22 Feb 2017 16:26:21 +0100 Subject: [PATCH] RTC Year fix for simulators --- radio/src/targets/common/arm/stm32/rtc_driver.cpp | 2 +- radio/src/targets/simu/simpgmspace.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/targets/common/arm/stm32/rtc_driver.cpp b/radio/src/targets/common/arm/stm32/rtc_driver.cpp index 097d4a7bc..a47f632c8 100644 --- a/radio/src/targets/common/arm/stm32/rtc_driver.cpp +++ b/radio/src/targets/common/arm/stm32/rtc_driver.cpp @@ -52,7 +52,7 @@ void rtcGetTime(struct gtm * t) t->tm_hour = RTC_TimeStruct.RTC_Hours; t->tm_min = RTC_TimeStruct.RTC_Minutes; t->tm_sec = RTC_TimeStruct.RTC_Seconds; - t->tm_year = RTC_DateStruct.RTC_Year + 100; + t->tm_year = RTC_DateStruct.RTC_Year + 100; // STM32 year is two decimals only (so base is currently 2000), gtm is based on number of years since 1900 t->tm_mon = RTC_DateStruct.RTC_Month - 1; t->tm_mday = RTC_DateStruct.RTC_Date; } diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp index 045dfa6d7..c737df300 100644 --- a/radio/src/targets/simu/simpgmspace.cpp +++ b/radio/src/targets/simu/simpgmspace.cpp @@ -615,7 +615,7 @@ void RTC_GetDate(uint32_t RTC_Format, RTC_DateTypeDef * RTC_DateStruct) time_t tme; time(&tme); struct tm * timeinfo = localtime(&tme); - RTC_DateStruct->RTC_Year = timeinfo->tm_year - TM_YEAR_BASE; + RTC_DateStruct->RTC_Year = timeinfo->tm_year - 100; // STM32 year is two decimals only (so base is currently 2000), tm is based on number of years since 1900 RTC_DateStruct->RTC_Month = timeinfo->tm_mon + 1; RTC_DateStruct->RTC_Date = timeinfo->tm_mday; }