thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-03-28 18:06:37 +01:00
Code Releases Activity

Use placeholder from formatter for missing data text

Browse Source
This commit is contained in:
Thomas Hooge
2025-08-22 14:13:35 +02:00
parent cba21574cb
commit 63ae42588f
13 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/obp60task/PageClock.cpp
View File

@@ -208,7 +208,7 @@ public:
epd->print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
}
} else {
epd->print("---");
epd->print(commonData->fmt->placeholder);
}
} else {
epd->print(svalue2old);
@@ -235,7 +235,7 @@ public:
epd->print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
}
} else {
epd->print("---");
epd->print(commonData->fmt->placeholder);
}
}
else {
@@ -246,7 +246,7 @@ public:
epd->print("Time"); // Name
// Show values sunrise
String sunrise = "---";
String sunrise = commonData->fmt->placeholder;
if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
sunrise = String(commonData->sundata.sunriseHour) + ":" + String(commonData->sundata.sunriseMinute + 100).substring(1);
svalue5old = sunrise;
@@ -266,7 +266,7 @@ public:
epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
// Show values sunset
String sunset = "---";
String sunset = commonData->fmt->placeholder;
if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
sunset = String(commonData->sundata.sunsetHour) + ":" + String(commonData->sundata.sunsetMinute + 100).substring(1);
svalue6old = sunset;