pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-11 16:07:13 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Update Screen.cpp

Browse Source
This commit is contained in:
HarukiToreda 2025-04-14 02:19:04 -04:00
parent f1fda7bdeb
commit 257165431f
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/graphics/Screen.cpp
View File

@ -1005,7 +1005,6 @@ constexpr uint32_t mailBlinkInterval = 500;
// *********************** // ***********************
void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y) void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
{ {
LOG_INFO("drawCommonHeader: hasUnreadMessage = %s", hasUnreadMessage ? "true" : "false");
constexpr int HEADER_OFFSET_Y = 1; constexpr int HEADER_OFFSET_Y = 1;
y += HEADER_OFFSET_Y; y += HEADER_OFFSET_Y;
@ -1032,7 +1031,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
lastBlink = now; lastBlink = now;
} }
// ✅ Hybrid condition: wide screen AND landscape layout // Hybrid condition: wide screen AND landscape layout
bool useHorizontalBattery = (SCREEN_WIDTH > 128 && SCREEN_WIDTH > SCREEN_HEIGHT); bool useHorizontalBattery = (SCREEN_WIDTH > 128 && SCREEN_WIDTH > SCREEN_HEIGHT);
if (useHorizontalBattery) { if (useHorizontalBattery) {
@ -1157,6 +1156,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
display->setColor(WHITE); display->setColor(WHITE);
} }
// **************************** // ****************************
// * Text Message Screen * // * Text Message Screen *
// **************************** // ****************************
@ -2628,18 +2628,44 @@ static void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int
int chutil_bar_width = (SCREEN_WIDTH > 128) ? 100 : 50; int chutil_bar_width = (SCREEN_WIDTH > 128) ? 100 : 50;
int chutil_bar_height = (SCREEN_WIDTH > 128) ? 12 : 7; int chutil_bar_height = (SCREEN_WIDTH > 128) ? 12 : 7;
int extraoffset = (SCREEN_WIDTH > 128) ? 6 : 3; int extraoffset = (SCREEN_WIDTH > 128) ? 6 : 3;
int percent = airTime->channelUtilizationPercent(); int chutil_percent = airTime->channelUtilizationPercent();
int fillWidth = (chutil_bar_width * percent) / 100;
int centerofscreen = SCREEN_WIDTH / 2; int centerofscreen = SCREEN_WIDTH / 2;
int total_line_content_width = (chUtil_x + chutil_bar_width + display->getStringWidth(chUtilPercentage) + extraoffset) / 2; int total_line_content_width = (chUtil_x + chutil_bar_width + display->getStringWidth(chUtilPercentage) + extraoffset) / 2;
int starting_position = centerofscreen - total_line_content_width; int starting_position = centerofscreen - total_line_content_width;
display->drawString(starting_position, compactFourthLine, chUtil); display->drawString(starting_position, compactFourthLine, chUtil);
display->drawRect(starting_position + chUtil_x, chUtil_y, chutil_bar_width, chutil_bar_height);
if (fillWidth > 0) { // Weighting for nonlinear segments
display->fillRect(starting_position + chUtil_x + 1, chUtil_y + 1, fillWidth - 1, chutil_bar_height - 2); float milestone1 = 25;
float milestone2 = 40;
float weight1 = 0.4; // Weight for 0–25%
float weight2 = 0.33; // Weight for 25–40%
float weight3 = 0.27; // Weight for 40–100%
float totalWeight = weight1 + weight2 + weight3;
int seg1 = chutil_bar_width * (weight1 / totalWeight);
int seg2 = chutil_bar_width * (weight2 / totalWeight);
int seg3 = chutil_bar_width * (weight3 / totalWeight);
int fillRight = 0;
if (chutil_percent <= milestone1) {
fillRight = (seg1 * (chutil_percent / milestone1));
} else if (chutil_percent <= milestone2) {
fillRight = seg1 + (seg2 * ((chutil_percent - milestone1) / (milestone2 - milestone1)));
} else {
fillRight = seg1 + seg2 + (seg3 * ((chutil_percent - milestone2) / (100 - milestone2)));
} }
// Draw outline
display->drawRect(starting_position + chUtil_x, chUtil_y, chutil_bar_width, chutil_bar_height);
// Fill progress
if (fillRight > 0) {
display->fillRect(starting_position + chUtil_x, chUtil_y, fillRight, chutil_bar_height);
}
display->drawString(starting_position + chUtil_x + chutil_bar_width + extraoffset, compactFourthLine, chUtilPercentage); display->drawString(starting_position + chUtil_x + chutil_bar_width + extraoffset, compactFourthLine, chUtilPercentage);
} }
@ -3635,7 +3661,7 @@ void Screen::setFrames(FrameFocus focus)
break; break;
case FOCUS_PRESERVE: case FOCUS_PRESERVE:
// 🚫 No more adjustment — force stay on same index // No more adjustment — force stay on same index
if (originalPosition < fsi.frameCount) if (originalPosition < fsi.frameCount)
ui->switchToFrame(originalPosition); ui->switchToFrame(originalPosition);
else else