kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-19 19:43:52 +01:00
Code Releases Activity

Merge pull request #20448 from benpicco/cpu/sam0_common-rtc-0

Browse Source 
cpu/sam0_common: RTC: avoid negative month after POR
This commit is contained in:
benpicco 2024-03-07 09:39:27 +00:00 committed by GitHub
commit 1bf643dd5a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cpu/sam0_common/periph/rtc_rtt.c
View File

@ -559,12 +559,18 @@ int rtc_get_alarm(struct tm *time)
return -1; return -1;
} }
time->tm_mon = alarm.bit.MONTH - 1; time->tm_mon = alarm.bit.MONTH;
time->tm_mday = alarm.bit.DAY; time->tm_mday = alarm.bit.DAY;
time->tm_hour = alarm.bit.HOUR; time->tm_hour = alarm.bit.HOUR;
time->tm_min = alarm.bit.MINUTE; time->tm_min = alarm.bit.MINUTE;
time->tm_sec = alarm.bit.SECOND; time->tm_sec = alarm.bit.SECOND;
/* struct tm has January as 0, RTC has January as 1 */
/* But after power-on reset, all RTC values are 0 - avoid negative month */
if (time->tm_mon) {
--time->tm_mon;
}
return 0; return 0;
} }
@ -583,11 +589,18 @@ int rtc_get_time(struct tm *time)
return -1; return -1;
} }
time->tm_mon = clock.bit.MONTH - 1; time->tm_mon = clock.bit.MONTH;
time->tm_mday = clock.bit.DAY; time->tm_mday = clock.bit.DAY;
time->tm_hour = clock.bit.HOUR; time->tm_hour = clock.bit.HOUR;
time->tm_min = clock.bit.MINUTE; time->tm_min = clock.bit.MINUTE;
time->tm_sec = clock.bit.SECOND; time->tm_sec = clock.bit.SECOND;
/* struct tm has January as 0, RTC has January as 1 */
/* But after power-on reset, all RTC values are 0 - avoid negative month */
if (time->tm_mon) {
--time->tm_mon;
}
return 0; return 0;
} }