thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-02-11 15:13:06 +01:00
Code Releases Activity

Fix for PageClock

Browse Source
This commit is contained in:
norbert-walter
2026-02-05 23:52:10 +01:00
parent d516c82041
commit fbba6ffff2
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/obp60task/PageClock.cpp
View File

@@ -132,8 +132,8 @@ public:
commonData->keydata[4].label = "RUN"; commonData->keydata[4].label = "RUN";
} else { } else {
// Clock modes: like original // Clock modes: like original
commonData->keydata[0].label = "SRC"; commonData->keydata[0].label = "MODE";
commonData->keydata[1].label = "MODE"; commonData->keydata[1].label = "SRC";
commonData->keydata[4].label = "TZ"; commonData->keydata[4].label = "TZ";
} }
} }
@@ -220,18 +220,8 @@ public:
// Clock (A/D) modes key handling – like original PageClock // Clock (A/D) modes key handling – like original PageClock
// Time source (K1) // MODE (K1)
if (key == 1) { if (key == 1) {
switch (source) {
case 'G': source = 'R'; break;
case 'R': source = 'G'; break;
default: source = 'G'; break;
}
return 0;
}
// MODE (K2)
if (key == 2) {
switch (mode) { switch (mode) {
case 'A': mode = 'D'; break; case 'A': mode = 'D'; break;
case 'D': mode = 'T'; break; case 'D': mode = 'T'; break;
@@ -241,6 +231,16 @@ public:
setupKeys(); setupKeys();
return 0; return 0;
} }
// Time source (K2)
if (key == 2) {
switch (source) {
case 'G': source = 'R'; break;
case 'R': source = 'G'; break;
default: source = 'G'; break;
}
return 0;
}
// Time zone: Local / UTC (K5) // Time zone: Local / UTC (K5)
if (key == 5) { if (key == 5) {
@@ -466,7 +466,7 @@ public:
// Clear central area and draw large digital time // Clear central area and draw large digital time
getdisplay().fillRect(0, 110, getdisplay().width(), 80, commonData->bgcolor); getdisplay().fillRect(0, 110, getdisplay().width(), 80, commonData->bgcolor);
getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b); getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
// Determine widths for digits and colon to position selection underline exactly // Determine widths for digits and colon to position selection underline exactly
int16_t x0, y0; int16_t x0, y0;
@@ -500,20 +500,20 @@ public:
selX = baseX + 2 * wDigit + 2 * wColon; // seconds start selX = baseX + 2 * wDigit + 2 * wColon; // seconds start
} }
int16_t underlineY = centerY + hb / 2 + 2; int16_t underlineY = centerY + hb / 2 + 5;
getdisplay().fillRect(selX, underlineY, wDigit, 2, commonData->fgcolor); getdisplay().fillRect(selX, underlineY, wDigit, 6, commonData->fgcolor);
} }
// Small indicators: timezone and source // Small indicators: timezone and source
getdisplay().setFont(&Ubuntu_Bold8pt8b); getdisplay().setFont(&Ubuntu_Bold8pt8b);
getdisplay().setCursor(180, 110); getdisplay().setCursor(185, 110);
if (holdvalues == false) { if (holdvalues == false) {
getdisplay().print(tz == 'L' ? "LOT" : "UTC"); getdisplay().print(tz == 'L' ? "LOT" : "UTC");
} else { } else {
getdisplay().print(unit2old); // date unit getdisplay().print(unit2old); // date unit
} }
getdisplay().setCursor(185, 190); getdisplay().setCursor(185, 210);
if (source == 'G') { if (source == 'G') {
getdisplay().print("GPS"); getdisplay().print("GPS");
} else { } else {
@@ -555,7 +555,7 @@ public:
getdisplay().fillRect(0, 110, getdisplay().width(), 80, commonData->bgcolor); getdisplay().fillRect(0, 110, getdisplay().width(), 80, commonData->bgcolor);
getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b); getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
int16_t x1b, y1b; int16_t x1b, y1b;
uint16_t wb, hb; uint16_t wb, hb;
@@ -568,14 +568,14 @@ public:
getdisplay().print(timeStr); getdisplay().print(timeStr);
getdisplay().setFont(&Ubuntu_Bold8pt8b); getdisplay().setFont(&Ubuntu_Bold8pt8b);
getdisplay().setCursor(180, 110); getdisplay().setCursor(185, 110);
if (holdvalues == false) { if (holdvalues == false) {
getdisplay().print(tz == 'L' ? "LOT" : "UTC"); getdisplay().print(tz == 'L' ? "LOT" : "UTC");
} else { } else {
getdisplay().print(unit2old); // date unit getdisplay().print(unit2old); // date unit
} }
getdisplay().setCursor(185, 190); getdisplay().setCursor(185, 210);
if (source == 'G') { if (source == 'G') {
getdisplay().print("GPS"); getdisplay().print("GPS");
} else { } else {