pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-25 22:20:27 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Jonathan Bennett 2025-06-01 15:46:35 -05:00
parent f6a75a5f80
commit 7208ebe583
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/draw/DebugRenderer.cpp
View File

@ -431,7 +431,9 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false); auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false);
char regionradiopreset[25]; char regionradiopreset[25];
const char *region = myRegion ? myRegion->name : NULL; const char *region = myRegion ? myRegion->name : NULL;
snprintf(regionradiopreset, sizeof(regionradiopreset), "%s/%s", region, mode); if (region != nullptr) {
snprintf(regionradiopreset, sizeof(regionradiopreset), "%s/%s", region, mode);
}
textWidth = display->getStringWidth(regionradiopreset); textWidth = display->getStringWidth(regionradiopreset);
nameX = (SCREEN_WIDTH - textWidth) / 2; nameX = (SCREEN_WIDTH - textWidth) / 2;
display->drawString(nameX, compactSecondLine, regionradiopreset); display->drawString(nameX, compactSecondLine, regionradiopreset);
@ -565,7 +567,7 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
char combinedStr[24]; char combinedStr[24];
if (SCREEN_WIDTH > 128) { if (SCREEN_WIDTH > 128) {
snprintf(combinedStr, sizeof(combinedStr), "%s%3d%% %lu/%luKB", (percent > 80) ? "! " : "", percent, used / 1024, snprintf(combinedStr, sizeof(combinedStr), "%s%3d%% %u/%uKB", (percent > 80) ? "! " : "", percent, used / 1024,
total / 1024); total / 1024);
} else { } else {
snprintf(combinedStr, sizeof(combinedStr), "%s%3d%%", (percent > 80) ? "! " : "", percent); snprintf(combinedStr, sizeof(combinedStr), "%s%3d%%", (percent > 80) ? "! " : "", percent);

6
src/graphics/draw/NodeListRenderer.cpp
View File

@ -713,11 +713,11 @@ void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, in
uint32_t mins = (uptime % 3600) / 60; uint32_t mins = (uptime % 3600) / 60;
if (days > 0) { if (days > 0) {
snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %dd %dh", days, hours); snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %ud %uh", days, hours);
} else if (hours > 0) { } else if (hours > 0) {
snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %dh %dm", hours, mins); snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %uh %um", hours, mins);
} else { } else {
snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %dm", mins); snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %um", mins);
} }
} }
if (uptimeStr[0] && line < 5) { if (uptimeStr[0] && line < 5) {