DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update RTC lib

Browse Source
This commit is contained in:
cyberman54 2023-04-17 22:16:33 +02:00
parent 1561d6e028
commit 3145f9750f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio_orig.ini
View File

@ -79,7 +79,7 @@ lib_deps_basic =
greyrook/libpax @ ^1.1.0 greyrook/libpax @ ^1.1.0
https://github.com/SukkoPera/Arduino-Rokkit-Hash.git https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
bblanchon/ArduinoJson @ ^6.20.1 bblanchon/ArduinoJson @ ^6.20.1
makuna/RTC @ ^2.3.6 makuna/RTC @ ^2.3.7
mathertel/OneButton @ ^2.0.3 mathertel/OneButton @ ^2.0.3
lewisxhe/XPowersLib @ ^0.1.5 lewisxhe/XPowersLib @ ^0.1.5
256dpi/MQTT @ ^2.5.1 256dpi/MQTT @ ^2.5.1

4
src/rtctime.cpp
View File

@ -22,7 +22,7 @@ uint8_t rtc_init(void) {
#if (TIME_SYNC_COMPILEDATE) #if (TIME_SYNC_COMPILEDATE)
// initialize a blank RTC without battery backup with build time // initialize a blank RTC without battery backup with build time
RtcDateTime tt = Rtc.GetDateTime(); RtcDateTime tt = Rtc.GetDateTime();
time_t t = tt.Epoch32Time(); // sec2000 -> epoch time_t t = tt.Unix32Time(); // sec2000 -> epoch
if (!Rtc.IsDateTimeValid() || !timeIsValid(t)) { if (!Rtc.IsDateTimeValid() || !timeIsValid(t)) {
ESP_LOGW(TAG, "RTC has no recent time, setting to compiletime"); ESP_LOGW(TAG, "RTC has no recent time, setting to compiletime");
@ -53,7 +53,7 @@ time_t get_rtctime(uint16_t *msec) {
*msec = 0; *msec = 0;
if (Rtc.IsDateTimeValid() && Rtc.GetIsRunning()) { if (Rtc.IsDateTimeValid() && Rtc.GetIsRunning()) {
RtcDateTime tt = Rtc.GetDateTime(); RtcDateTime tt = Rtc.GetDateTime();
t = tt.Epoch32Time(); // sec2000 -> epoch t = tt.Unix32Time(); // sec2000 -> epoch
} }
// if we have a RTC pulse, we calculate msec // if we have a RTC pulse, we calculate msec