From 7208ebe583ce65de6db9502723343920ba2ffbad Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Sun, 1 Jun 2025 15:46:35 -0500 Subject: [PATCH] Fix warnings --- src/graphics/draw/DebugRenderer.cpp | 6 ++++-- src/graphics/draw/NodeListRenderer.cpp | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/graphics/draw/DebugRenderer.cpp b/src/graphics/draw/DebugRenderer.cpp index 167fd602d..00aabedfb 100644 --- a/src/graphics/draw/DebugRenderer.cpp +++ b/src/graphics/draw/DebugRenderer.cpp @@ -431,7 +431,9 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false); char regionradiopreset[25]; 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); nameX = (SCREEN_WIDTH - textWidth) / 2; display->drawString(nameX, compactSecondLine, regionradiopreset); @@ -565,7 +567,7 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, char combinedStr[24]; 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); } else { snprintf(combinedStr, sizeof(combinedStr), "%s%3d%%", (percent > 80) ? "! " : "", percent); diff --git a/src/graphics/draw/NodeListRenderer.cpp b/src/graphics/draw/NodeListRenderer.cpp index ab497fec2..4385e0f1b 100644 --- a/src/graphics/draw/NodeListRenderer.cpp +++ b/src/graphics/draw/NodeListRenderer.cpp @@ -713,11 +713,11 @@ void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, in uint32_t mins = (uptime % 3600) / 60; 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) { - snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %dh %dm", hours, mins); + snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %uh %um", hours, mins); } else { - snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %dm", mins); + snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %um", mins); } } if (uptimeStr[0] && line < 5) {