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

Smart portrait logic for battery

Browse Source
This commit is contained in:
HarukiToreda 2025-04-06 15:57:19 -04:00
parent 99f6b398b3
commit d5d20fe33f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/graphics/Screen.cpp
View File

@ -1022,7 +1022,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
// === Battery dynamically scaled === // === Battery dynamically scaled ===
const int nubSize = 2; const int nubSize = 2;
const int batteryLong = SCREEN_WIDTH > 200 ? 29 : 25; // Was 28/24 const int batteryLong = SCREEN_WIDTH > 200 ? 29 : 25;
const int batteryShort = highlightHeight - nubSize - 2; const int batteryShort = highlightHeight - nubSize - 2;
int batteryX = x + xOffset; int batteryX = x + xOffset;
@ -1037,7 +1037,10 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
lastBlink = now; lastBlink = now;
} }
if (SCREEN_WIDTH > 128) { // ✅ Hybrid condition: wide screen AND landscape layout
bool useHorizontalBattery = (SCREEN_WIDTH > 128 && SCREEN_WIDTH > SCREEN_HEIGHT);
if (useHorizontalBattery) {
// === Horizontal battery === // === Horizontal battery ===
batteryY = y + (highlightHeight - batteryShort) / 2; batteryY = y + (highlightHeight - batteryShort) / 2;
@ -1098,7 +1101,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
char percentStr[8]; char percentStr[8];
snprintf(percentStr, sizeof(percentStr), "%d%%", chargePercent); snprintf(percentStr, sizeof(percentStr), "%d%%", chargePercent);
const int batteryOffset = SCREEN_WIDTH > 128 ? 34 : 9; const int batteryOffset = useHorizontalBattery ? 34 : 9;
const int percentX = x + xOffset + batteryOffset; const int percentX = x + xOffset + batteryOffset;
display->drawString(percentX, textY, percentStr); display->drawString(percentX, textY, percentStr);
if (isBold) if (isBold)