kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix for incorrect time

Browse Source
This commit is contained in:
Russell Dwarshuis
2024-09-18 16:33:20 -04:00
parent b16166b2ed
commit 6acc700968
4 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rds.cpp
+9 -6
View File
@@ -736,20 +736,23 @@ void showPS() {
}
void showCT() {
char str[6];
time_t t;
if (!screenmute && showclock) {
if (radio.rds.hasCT && !dropout) {
rds_clock = ((radio.rds.hour < 10 ? "0" : "") + String(radio.rds.hour) + ":" + (radio.rds.minute < 10 ? "0" : "") + String(radio.rds.minute));
t = radio.rds.time + radio.rds.offset;
} else if (!radio.rds.hasCT || dropout) {
rds_clock = ((rtc.getHour(true) < 10 ? "0" : "") + String(rtc.getHour(true)) + ":" + (rtc.getMinute() < 10 ? "0" : "") + String(rtc.getMinute()));
t = rtc.getEpoch() + radio.rds.offset;
if (dropout) {
radio.rds.hour = rtc.getHour(true);
radio.rds.minute = rtc.getMinute();
radio.rds.time = static_cast<time_t>(rtc.getEpoch());
}
}
strftime(str, 6, "%H:%M", localtime(&t));
rds_clock = String(str);
if (rds_clock != rds_clockold || hasCTold != radio.rds.hasCT) {
if (radio.rds.hasCT && RDSstatus) {
rtcset = true;
rtc.setTime(0, radio.rds.minute, radio.rds.hour, radio.rds.day, radio.rds.month, radio.rds.year);
rtc.setTime(radio.rds.time);
if (advancedRDS) {
tftReplace(1, rds_clockold, rds_clock, 208, 109, RDSColor, RDSColorSmooth, BackgroundColor, 16);
} else {
@@ -1025,4 +1028,4 @@ void ShowAFEON() {
}
}
#pragma GCC diagnostic pop
#pragma GCC diagnostic pop