From fc00af4b55ca5c16acb91f82b191f2d6d28d9b36 Mon Sep 17 00:00:00 2001
From: Jason P <applewiz@mac.com>
Date: Tue, 3 Jun 2025 21:16:11 -0500
Subject: [PATCH] Update Sys screen for new uptime, add label to Freq/Chan on
 LoRa

---
 src/graphics/draw/DebugRenderer.cpp | 42 +++++++++++++----------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/graphics/draw/DebugRenderer.cpp b/src/graphics/draw/DebugRenderer.cpp
index 402c32baf..b8aa3e353 100644
--- a/src/graphics/draw/DebugRenderer.cpp
+++ b/src/graphics/draw/DebugRenderer.cpp
@@ -428,9 +428,13 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
     float freq = RadioLibInterface::instance->getFreq();
     snprintf(freqStr, sizeof(freqStr), "%.3f", freq);
     if (config.lora.channel_num == 0) {
-        snprintf(frequencyslot, sizeof(frequencyslot), "Freq: %s", freqStr);
+        snprintf(frequencyslot, sizeof(frequencyslot), "Freq: %smhz", freqStr);
     } else {
-        snprintf(frequencyslot, sizeof(frequencyslot), "Freq/Chan: %s (%d)", freqStr, config.lora.channel_num);
+        if (SCREEN_WIDTH > 128) {
+            snprintf(frequencyslot, sizeof(frequencyslot), "Freq/Chan: %smhz (%d)", freqStr, config.lora.channel_num);
+        } else {
+            snprintf(frequencyslot, sizeof(frequencyslot), "Frq/Ch: %smhz (%d)", freqStr, config.lora.channel_num);
+        }
     }
     size_t len = strlen(frequencyslot);
     if (len >= 4 && strcmp(frequencyslot + len - 4, " (0)") == 0) {
@@ -614,29 +618,21 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
 
     if (SCREEN_HEIGHT > 64 || (SCREEN_HEIGHT <= 64 && line < 4)) { // Only show uptime if the screen can show it
         line += 1;
+        char uptimeStr[32] = "";
         uint32_t uptime = millis() / 1000;
-        char uptimeStr[6];
-        uint32_t minutes = uptime / 60, hours = minutes / 60, days = hours / 24;
-
-        if (days > 365) {
-            snprintf(uptimeStr, sizeof(uptimeStr), "?");
-        } else {
-            snprintf(uptimeStr, sizeof(uptimeStr), "%u%c",
-                     days      ? days
-                     : hours   ? hours
-                     : minutes ? minutes
-                               : (int)uptime,
-                     days      ? 'd'
-                     : hours   ? 'h'
-                     : minutes ? 'm'
-                               : 's');
-        }
-
-        char uptimeFullStr[16];
-        snprintf(uptimeFullStr, sizeof(uptimeFullStr), "Uptime: %s", uptimeStr);
-        textWidth = display->getStringWidth(uptimeFullStr);
+        uint32_t days = uptime / 86400;
+        uint32_t hours = (uptime % 86400) / 3600;
+        uint32_t mins = (uptime % 3600) / 60;
+        // Show as "Up: 2d 3h", "Up: 5h 14m", or "Up: 37m"
+        if (days)
+            snprintf(uptimeStr, sizeof(uptimeStr), " Up: %ud %uh", days, hours);
+        else if (hours)
+            snprintf(uptimeStr, sizeof(uptimeStr), " Up: %uh %um", hours, mins);
+        else
+            snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %um", mins);
+        textWidth = display->getStringWidth(uptimeStr);
         nameX = (SCREEN_WIDTH - textWidth) / 2;
-        display->drawString(nameX, yPositions[line], uptimeFullStr);
+        display->drawString(nameX, yPositions[line], uptimeStr);
     }
 }
 } // namespace DebugRenderer