Merge branch 'master' into develop

Author: thebentern

protobufs

@@ -190,6 +190,7 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
     const char *titleStr = "";
     // === Header ===
     graphics::drawCommonHeader(display, x, y, titleStr, true, true);
+    int line = 0;
 
 #ifdef T_WATCH_S3
     if (nimbleBluetooth && nimbleBluetooth->isConnected()) {
@@ -299,6 +300,15 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
     display->drawString(startingHourMinuteTextX + timeStringWidth - xOffset, (display->getHeight() - hourMinuteTextY) - yOffset,
                         secondString);
 #endif
+
+    // Display GPS derived date
+    char datetimeStr[25];
+    UIRenderer::formatDateTime(datetimeStr, sizeof(datetimeStr), rtc_sec, display, false);
+    char fullLine[40];
+    snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr);
+    yOffset = (isHighResolution) ? 12 : 1;
+    display->drawString(startingHourMinuteTextX + timeStringWidth - display->getStringWidth(fullLine),
+                        getTextPositions(display)[line] + yOffset, fullLine);
 }
 
 void drawBluetoothConnectedIcon(OLEDDisplay *display, int16_t x, int16_t y)
@@ -314,6 +324,7 @@ void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     const char *titleStr = "";
     // === Header ===
     graphics::drawCommonHeader(display, x, y, titleStr, true, true);
+    int line = 0;
 
 #ifdef T_WATCH_S3
     if (nimbleBluetooth && nimbleBluetooth->isConnected()) {
@@ -511,6 +522,19 @@ void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
         // draw second hand
         display->drawLine(centerX, centerY, secondX, secondY);
 #endif
+
+        display->setFont(FONT_SMALL);
+        // Display GPS derived date
+        char datetimeStr[25];
+        UIRenderer::formatDateTime(datetimeStr, sizeof(datetimeStr), rtc_sec, display, false);
+        char fullLine[40];
+        if (isHighResolution) {
+            snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr);
+        } else {
+            snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]);
+        }
+        display->drawString(display->getWidth() - 1 - display->getStringWidth(fullLine), getTextPositions(display)[line],
+                            fullLine);
     }
 }
 

src/graphics/draw/ClockRenderer.cpp

@@ -447,7 +447,7 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
     display->drawString(nameX, getTextPositions(display)[line++], frequencyslot);
 
 #if !defined(M5STACK_UNITC6L)
-    // === Fourth Row: Channel Utilization ===
+    // === Fifth Row: Channel Utilization ===
     const char *chUtil = "ChUtil:";
     char chUtilPercentage[10];
     snprintf(chUtilPercentage, sizeof(chUtilPercentage), "%2.0f%%", airTime->channelUtilizationPercent());