pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-08 14:12:05 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert Uptime change on Favorites, Apply to Device Focused

Browse Source
This commit is contained in:
Jason P 2025-06-04 16:34:13 -05:00
parent 1ad5766dbb
commit e7c3009247
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/graphics/draw/UIRenderer.cpp
View File

@ -354,11 +354,11 @@ void drawNodeInfo(OLEDDisplay *display, const OLEDDisplayUiState *state, int16_t
uint32_t mins = (uptime % 3600) / 60; uint32_t mins = (uptime % 3600) / 60;
// Show as "Up: 2d 3h", "Up: 5h 14m", or "Up: 37m" // Show as "Up: 2d 3h", "Up: 5h 14m", or "Up: 37m"
if (days) if (days)
snprintf(uptimeStr, sizeof(uptimeStr), "Up: %ud %uh", days, hours); snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %ud %uh", days, hours);
else if (hours) else if (hours)
snprintf(uptimeStr, sizeof(uptimeStr), "Up: %uh %um", hours, mins); snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %uh %um", hours, mins);
else else
snprintf(uptimeStr, sizeof(uptimeStr), "Up: %um", mins); snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %um", mins);
} }
if (uptimeStr[0] && line < 5) { if (uptimeStr[0] && line < 5) {
display->drawString(x, yPositions[line++], uptimeStr); display->drawString(x, yPositions[line++], uptimeStr);
@ -547,11 +547,11 @@ void drawDeviceFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t
uint32_t mins = (uptime % 3600) / 60; uint32_t mins = (uptime % 3600) / 60;
// Show as "Up: 2d 3h", "Up: 5h 14m", or "Up: 37m" // Show as "Up: 2d 3h", "Up: 5h 14m", or "Up: 37m"
if (days) if (days)
snprintf(uptimeStr, sizeof(uptimeStr), " Up: %ud %uh", days, hours); snprintf(uptimeStr, sizeof(uptimeStr), "Up: %ud %uh", days, hours);
else if (hours) else if (hours)
snprintf(uptimeStr, sizeof(uptimeStr), " Up: %uh %um", hours, mins); snprintf(uptimeStr, sizeof(uptimeStr), "Up: %uh %um", hours, mins);
else else
snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %um", mins); snprintf(uptimeStr, sizeof(uptimeStr), "Up: %um", mins);
display->drawString(SCREEN_WIDTH - display->getStringWidth(uptimeStr), display->drawString(SCREEN_WIDTH - display->getStringWidth(uptimeStr),
((rows == 4) ? compactFirstLine : ((SCREEN_HEIGHT > 64) ? compactFirstLine : moreCompactFirstLine)), ((rows == 4) ? compactFirstLine : ((SCREEN_HEIGHT > 64) ? compactFirstLine : moreCompactFirstLine)),
uptimeStr); uptimeStr);