From 8efd06fdbdd8bfe005f1dee5604eee5910b05b40 Mon Sep 17 00:00:00 2001 From: Th3maz1ng Date: Sun, 1 May 2022 16:28:56 +0200 Subject: [PATCH] Minor changes due to the way system time is now handled --- src/app/app.ino | 5 +++-- src/app/views.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/app.ino b/src/app/app.ino index 004b500..cf75444 100644 --- a/src/app/app.ino +++ b/src/app/app.ino @@ -67,10 +67,11 @@ void setup() sab.getScreenManager().addView(&(dummy), NULL, 8); //for testing purposes sab.getScreenManager().displayView(0); - if(sab.getRtcManager().hasLostPower()) + if(sab.getRTC_DS3231().lostPower()) { Serial.println("Clock lost power"); - sab.getRtcManager().setDateTime(DateTime(F(__DATE__), F(__TIME__))); + sab.getRTC_DS3231().adjust(DateTime(F(__DATE__), F(__TIME__))); + sab.getRtcManager().setDateTime(sab.getRTC_DS3231().now()); } sab.getWebServer().addApiRoutine("/sab/web/apitester", &(apiTesterApi), NULL); diff --git a/src/app/views.cpp b/src/app/views.cpp index 684c509..3e087ae 100644 --- a/src/app/views.cpp +++ b/src/app/views.cpp @@ -39,7 +39,7 @@ boolean rtcInfo(Adafruit_SSD1306 &display, void *pData) char buffer[300] = ""; SAB *p = (SAB *) pData; TimeSpan ts(p->getUpTime()); - sprintf_P(buffer, PSTR("Rtc temp : %.2f C\nUp Time : \n %d d %d h %d m %d s"), p->getRtcManager().getTemperature(), ts.days(), ts.hours(), ts.minutes(), ts.seconds()); + sprintf_P(buffer, PSTR("Rtc temp : %.2f C\nUp Time : \n %d d %d h %d m %d s"), p->getRTC_DS3231().getTemperature(), ts.days(), ts.hours(), ts.minutes(), ts.seconds()); display.println(buffer);