System Frame Updates

Adjusted line construction to ensure we fit maximum content per screen.
This commit is contained in:
Jason P 2025-06-02 08:23:41 -05:00
parent 693aef8256
commit 65869265a9

View File

@ -620,8 +620,10 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
// === Draw memory rows
drawUsageRow("Heap:", heapUsed, heapTotal, true);
#ifdef ESP32
if (psramUsed > 0) {
line += 1;
drawUsageRow("PSRAM:", psramUsed, psramTotal);
}
if (flashTotal > 0) {
line += 1;
drawUsageRow("Flash:", flashUsed, flashTotal);
@ -634,7 +636,7 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
display->setTextAlignment(TEXT_ALIGN_LEFT);
// System Uptime
if (line < 3) {
if (line < 2) {
line += 1;
}
line += 1;
@ -644,6 +646,7 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
int nameX = (SCREEN_WIDTH - textWidth) / 2;
display->drawString(nameX, yPositions[line], appversionstr);
if (SCREEN_HEIGHT > 64 || (SCREEN_HEIGHT <= 64 && line < 4)) { // Only show uptime if the screen can show it
line += 1;
uint32_t uptime = millis() / 1000;
char uptimeStr[6];
@ -669,5 +672,6 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
nameX = (SCREEN_WIDTH - textWidth) / 2;
display->drawString(nameX, yPositions[line], uptimeFullStr);
}
}
} // namespace DebugRenderer
} // namespace graphics