noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #150 from martinayotte/master 

Stm32F4. Fix bug related to missing 7 days in getTime()
This commit is contained in:
Roger Clark 2015-12-05 10:57:37 +11:00
parent 2f97268bd4 c9d796cdf1
commit d68220b964
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
STM32F4/libraries/RTClock/src/RTClock.cpp
View File

@ -219,7 +219,7 @@ time_t RTClock::getTime() {
int secs = 10 * ((tr_reg & 0x00000070) >> 4) + (tr_reg & 0x0000000F); int secs = 10 * ((tr_reg & 0x00000070) >> 4) + (tr_reg & 0x0000000F);
// seconds from 1970 till 1 jan 00:00:00 of the given year // seconds from 1970 till 1 jan 00:00:00 of the given year
time_t t = (years + 30) * SECS_PER_DAY * 365; time_t t = (years + 30) * SECS_PER_DAY * 365;
for (int i = 0; i < years; i++) { for (int i = 0; i < (years + 30); i++) {
if (LEAP_YEAR(i)) { if (LEAP_YEAR(i)) {
t += SECS_PER_DAY; // add extra days for leap years t += SECS_PER_DAY; // add extra days for leap years
} }
@ -227,9 +227,9 @@ time_t RTClock::getTime() {
// add days for this year, months start from 1 // add days for this year, months start from 1
for (int i = 1; i < months; i++) { for (int i = 1; i < months; i++) {
if ( (i == 2) && LEAP_YEAR(years)) { if ( (i == 2) && LEAP_YEAR(years)) {
t += SECS_PER_DAY * 29; t += SECS_PER_DAY * 29;
} else { } else {
t += SECS_PER_DAY * monthDays[i - 1]; //monthDays array starts from 0 t += SECS_PER_DAY * monthDays[i - 1]; //monthDays array starts from 0
} }
} }
t += (days - 1) * SECS_PER_DAY + hours * SECS_PER_HOUR + mins * SECS_PER_MIN + secs; t += (days - 1) * SECS_PER_DAY + hours * SECS_PER_HOUR + mins * SECS_PER_MIN + secs;