pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-27 19:49:51 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

centered header contents while highlighted

Browse Source 
Instead of manually centeing the contents of the headers, it now calculates the center on its own, better for other screen resolutions
This commit is contained in:
HarukiToreda 2025-03-29 02:47:08 -04:00
parent 41c44353f7
commit c9e71173de
1 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/graphics/Screen.cpp
View File

@ -1565,6 +1565,8 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
// Must be after distStr is populated // Must be after distStr is populated
screen->drawColumns(display, x, y, fields); screen->drawColumns(display, x, y, fields);
} }
// h! Makes header invert rounder
void drawRoundedHighlight(OLEDDisplay *display, int16_t x, int16_t y, int16_t w, int16_t h, int16_t r) { void drawRoundedHighlight(OLEDDisplay *display, int16_t x, int16_t y, int16_t w, int16_t h, int16_t r) {
// Center rectangles // Center rectangles
display->fillRect(x + r, y, w - 2 * r, h); display->fillRect(x + r, y, w - 2 * r, h);
@ -1577,13 +1579,13 @@ void drawRoundedHighlight(OLEDDisplay *display, int16_t x, int16_t y, int16_t w,
display->fillCircle(x + r, y + h - r - 1, r); // Bottom-left display->fillCircle(x + r, y + h - r - 1, r); // Bottom-left
display->fillCircle(x + w - r - 1, y + h - r - 1, r); // Bottom-right display->fillCircle(x + w - r - 1, y + h - r - 1, r); // Bottom-right
} }
// Each node entry holds a reference to its info and how long ago it was heard from // h! Each node entry holds a reference to its info and how long ago it was heard from
struct NodeEntry { struct NodeEntry {
meshtastic_NodeInfoLite *node; meshtastic_NodeInfoLite *node;
uint32_t lastHeard; uint32_t lastHeard;
}; };
// Calculates bearing between two lat/lon points (used for compass) // h! Calculates bearing between two lat/lon points (used for compass)
float calculateBearing(double lat1, double lon1, double lat2, double lon2) { float calculateBearing(double lat1, double lon1, double lat2, double lon2) {
double dLon = (lon2 - lon1) * DEG_TO_RAD; double dLon = (lon2 - lon1) * DEG_TO_RAD;
lat1 = lat1 * DEG_TO_RAD; lat1 = lat1 * DEG_TO_RAD;
@ -1656,15 +1658,22 @@ void drawScreenHeader(OLEDDisplay *display, const char *title, int16_t x, int16_
int screenWidth = display->getWidth(); int screenWidth = display->getWidth();
int textWidth = display->getStringWidth(title); int textWidth = display->getStringWidth(title);
int titleX = (screenWidth - textWidth) / 2; // Centered X position int titleX = (screenWidth - textWidth) / 2;
// Height of highlight row
const int highlightHeight = FONT_HEIGHT_SMALL - 1;
// Y offset to vertically center text in rounded bar
int textY = y + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
if (isInverted) { if (isInverted) {
drawRoundedHighlight(display, 0, y, screenWidth, FONT_HEIGHT_SMALL - 2, 2); // Full width from 0 drawRoundedHighlight(display, 0, y, screenWidth, highlightHeight, 2);
display->setColor(BLACK); display->setColor(BLACK);
} }
// Fake bold by drawing again with slight offset
display->drawString(titleX, y, title); // Draw text centered vertically and horizontally
if (isBold) display->drawString(titleX + 1, y, title); display->drawString(titleX, textY, title);
if (isBold) display->drawString(titleX + 1, textY, title);
display->setColor(WHITE); display->setColor(WHITE);
} }
@ -1950,46 +1959,49 @@ static void drawDefaultScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
bool isInverted = (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED); bool isInverted = (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED);
bool isBold = config.display.heading_bold; bool isBold = config.display.heading_bold;
const int xOffset = 3; // Padding for top row edges const int xOffset = 3;
const int highlightHeight = FONT_HEIGHT_SMALL - 1;
// Top row highlight (like drawScreenHeader) // Draw header background highlight
if (isInverted) { if (isInverted) {
drawRoundedHighlight(display, 0, y, SCREEN_WIDTH, FONT_HEIGHT_SMALL - 1, 2); drawRoundedHighlight(display, 0, y, SCREEN_WIDTH, highlightHeight, 2);
display->setColor(BLACK); display->setColor(BLACK);
} }
// Top row: Battery icon, %, Voltage // === TOP ROW: Battery, %, Voltage ===
int batteryYOffset = 2; // Adjust for vertical alignment int screenWidth = display->getWidth();
int textYOffset = 2; // Match text with battery height
drawBattery(display, x + xOffset, y + batteryYOffset, imgBattery, powerStatus); // Draw battery icon slightly inset from top
drawBattery(display, x + xOffset, y + 2, imgBattery, powerStatus);
// Calculate vertical center for text (centered in header row)
int textY = y + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
char percentStr[8]; char percentStr[8];
snprintf(percentStr, sizeof(percentStr), "%d%%", powerStatus->getBatteryChargePercent()); snprintf(percentStr, sizeof(percentStr), "%d%%", powerStatus->getBatteryChargePercent());
int screenWidth = display->getWidth();
int batteryOffset = screenWidth > 128 ? 34 : 18; int batteryOffset = screenWidth > 128 ? 34 : 18;
int percentX = x + xOffset + batteryOffset; int percentX = x + xOffset + batteryOffset;
display->drawString(percentX, y + textYOffset, percentStr); display->drawString(percentX, textY, percentStr);
char voltStr[10]; char voltStr[10];
int batV = powerStatus->getBatteryVoltageMv() / 1000; int batV = powerStatus->getBatteryVoltageMv() / 1000;
int batCv = (powerStatus->getBatteryVoltageMv() % 1000) / 10; int batCv = (powerStatus->getBatteryVoltageMv() % 1000) / 10;
snprintf(voltStr, sizeof(voltStr), "%d.%02dV", batV, batCv); snprintf(voltStr, sizeof(voltStr), "%d.%02dV", batV, batCv);
int voltX = SCREEN_WIDTH - xOffset - display->getStringWidth(voltStr); int voltX = SCREEN_WIDTH - xOffset - display->getStringWidth(voltStr);
display->drawString(voltX, y + textYOffset, voltStr); display->drawString(voltX, textY, voltStr);
// Bold only for header row
if (isBold) { if (isBold) {
display->drawString(percentX + 1, y + textYOffset, percentStr); display->drawString(percentX + 1, textY, percentStr);
display->drawString(voltX + 1, y + textYOffset, voltStr); display->drawString(voltX + 1, textY, voltStr);
} }
display->setColor(WHITE); display->setColor(WHITE);
// === Temporarily disable bold for second row === // === Second Row: Node and GPS ===
bool origBold = config.display.heading_bold; bool origBold = config.display.heading_bold;
config.display.heading_bold = false; config.display.heading_bold = false;
// Second row: Node count and satellite info
int secondRowY = y + FONT_HEIGHT_SMALL + 1; int secondRowY = y + FONT_HEIGHT_SMALL + 1;
drawNodes(display, x, secondRowY, nodeStatus); drawNodes(display, x, secondRowY, nodeStatus);
@ -1997,7 +2009,6 @@ static void drawDefaultScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
if (config.position.fixed_position) { if (config.position.fixed_position) {
drawGPS(display, SCREEN_WIDTH - 44, secondRowY, gpsStatus); drawGPS(display, SCREEN_WIDTH - 44, secondRowY, gpsStatus);
} else if (!gpsStatus || !gpsStatus->getIsConnected()) { } else if (!gpsStatus || !gpsStatus->getIsConnected()) {
// Show fallback: either "GPS off" or "No GPS"
String displayLine = config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT ? "No GPS" : "GPS off"; String displayLine = config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT ? "No GPS" : "GPS off";
int posX = SCREEN_WIDTH - display->getStringWidth(displayLine) - 2; int posX = SCREEN_WIDTH - display->getStringWidth(displayLine) - 2;
display->drawString(posX, secondRowY, displayLine); display->drawString(posX, secondRowY, displayLine);
@ -2006,10 +2017,9 @@ static void drawDefaultScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
} }
#endif #endif
// Restore original bold setting
config.display.heading_bold = origBold; config.display.heading_bold = origBold;
// Third row: Centered LongName // === Third Row: LongName Centered ===
meshtastic_NodeInfoLite *ourNode = nodeDB->getMeshNode(nodeDB->getNodeNum()); meshtastic_NodeInfoLite *ourNode = nodeDB->getMeshNode(nodeDB->getNodeNum());
if (ourNode && ourNode->has_user && strlen(ourNode->user.long_name) > 0) { if (ourNode && ourNode->has_user && strlen(ourNode->user.long_name) > 0) {
const char* longName = ourNode->user.long_name; const char* longName = ourNode->user.long_name;
@ -2019,12 +2029,10 @@ static void drawDefaultScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
display->drawString(nameX, nameY, longName); display->drawString(nameX, nameY, longName);
} }
// Fourth row: Centered uptime string (e.g. 1m, 2h, 3d) // === Fourth Row: Uptime ===
uint32_t uptime = millis() / 1000; uint32_t uptime = millis() / 1000;
char uptimeStr[6]; char uptimeStr[6];
uint32_t minutes = uptime / 60; uint32_t minutes = uptime / 60, hours = minutes / 60, days = hours / 24;
uint32_t hours = minutes / 60;
uint32_t days = hours / 24;
if (days > 365) { if (days > 365) {
snprintf(uptimeStr, sizeof(uptimeStr), "?"); snprintf(uptimeStr, sizeof(uptimeStr), "?");
@ -2040,6 +2048,7 @@ static void drawDefaultScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
} }
#if defined(ESP_PLATFORM) && defined(USE_ST7789) #if defined(ESP_PLATFORM) && defined(USE_ST7789)
SPIClass SPI1(HSPI); SPIClass SPI1(HSPI);
#endif #endif