Unify the native display config between legacy display and MUI (#6838)

* Add missed include * Another Warning fix * Add another HAS_SCREEN * Namespace fixes * Removed depricated destination types and re-factored destination screen * Get rid of Arduino Strings * Clean up after Copilot * SixthLine Def, Screen Rename Added Sixth Line Definition Screen Rename, and Automatic Line Adjustment * Consistency is hard - fixed "Sixth" * System Frame Updates Adjusted line construction to ensure we fit maximum content per screen. * Fix up notifications * Add a couple more ifdef HAS_SCREEN lines * Add screen->isOverlayBannerShowing() * Don't forget the invert! * Adjust Nodelist Center Divider Adjust Nodelist Center Divider * Fix variable casting * Fix entryText variable as empty before update to fix validation * Altitude is int32_t * Update PowerTelemetry to have correct data type * Fix cppcheck warnings (#6945) * Fix cppcheck warnings * Adjust logic in Power.cpp for power sensor --------- Co-authored-by: Jason P <applewiz@mac.com> * More pixel wrangling so things line up NodeList edition * Adjust NodeList alignments and plumb some background padding for a possible title fix * Better alignment for banner notifications * Move title into drawCommonHeader; initial screen tested * Fonts make spacing items difficult * Improved beeping booping and other buzzer based feedback (#6947) * Improved beeping booping and other buzzer based feedback * audible button feedback (#6949) * Refactor --------- Co-authored-by: todd-herbert <herbert.todd@gmail.com> * Sandpapered the corners of the notification popup * Finalize drawCommonHeader migration * Update Title of Favorite Node Screens * Update node metric alignment on LoRa screen * Update the border for popups to separate it from background * Update PaxcounterModule.cpp with CommonHeader * Update WiFi screen with CommonHeader and related data reflow * It was not, in fact, pointing up * Fix build on wismeshtap * T-deck trackball debounce * Fix uptime on Device Focused page to actually detail * Update Sys screen for new uptime, add label to Freq/Chan on LoRa * Don't display DOP any longer, make Uptime consistent * Revert Uptime change on Favorites, Apply to Device Focused * Label the satelite number to avoid confusion * Boop boop boop boop * Correct GPS positioning and string consistency across strings for GPS * Fix GPS text alignment * Enable canned messages by default * Don't wake screen on new nodes * Cannedmessage list emote support added * Fn+e emote picker for freetext screen * Actually block CannedInput actions while display is shown * Add selection menu to bannerOverlay * Off by one * Move to unified text layouts and spacing * Still my Fav without an "e" * Fully remove EVENT_NODEDB_UPDATED * Simply LoRa screen * Make some char pointers const to fix compilation on native targets * Update drawCompassNorth to include radius * Fix warning * button thread cleanup * Pull OneButton handling from PowerFSM and add MUI switch (#6973) * Trunk * Onebutton Menu Support * Add temporary clock icon * Add gps location to fsi * Banner message state reset * Cast to char to satisfy compiler * Better fast handling of input during banner * Fix warning * Derp * oops * Update ref * Wire buzzer_mode * remove legacy string->print() * Only init screen if one found * Unsigned Char * More buttonThread cleaning * screen.cpp button handling cleanup * The Great Event Rename of 2025 * Fix the Radiomaster * Missed trackball type change * Remove unused function * Make ButtonThread an InputBroker * Coffee hadn't kicked in yet * Add clock icon for Navigation Bar * Restore clock screen definition code - whoops * ExternalNotifications now observe inputBroker * Clock rework (#6992) * Move Clock bits into ClockRenderer space * Rework clock into all device navigation * T-Watch Actually Builds Different * Compile fix --------- Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz> * Add AM/PM to Digital Clock * Flip Seconds and AM/PM on Clock Display * Tik-tok pixels are hard * Fix builds on Thinknode M1 * Check for GPS and don't crash * Don't endif til the end * Rework the OneButton thread to be much less of a mess. (#6997) * Rework the OneButton thread to be much less of a mess. And break lots of targets temporarily * Update src/input/ButtonThread.h Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix GPS toggle * Send the shutdown event, not just the kbchar * Honor the back button in a notificaiton popup * Draw the right size box for popup with options * Try to un-break all the things --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * 24-hour Clock Should have leading zero, but not 12-hour * Fixup some compile errors * Add intRoutine to ButtonThread init, to get more responsive user button back * Add Timezone picker * Fix Warning * Optionally set the initial selection for the chooser popup * Make back buttons work in canned messages * Drop the wrapper classes * LonPressTime now configurable * Clock Frame can not longer be blank; just add valid time * Back buttons everywhere! * Key Verification confirm banner * Make Elecrow M* top button a back button * Add settings saves * EInk responsiveness fixes * Linux Input Fixes * Add Native Trackball/Joystick support, and move UserButton to Input * No Flight Stick Mode * Send input event * Add Channel Utilization to Device Focused frame * Don't shift screens when we draw new ones * Add showOverlayBanner arguments to no-op * trunk * Default Native trackball to NC * Fix crash in simulator mode * Add longLong button press * Get the args right * Adjust Bluetooth Pairing Screen to account for bottom navigation. * Trackball everywhere, and unPhone buttons * Remap visionmaster secondary button to TB_UP * Kill ScanAndSelect * trunk * No longer need the canned messages input filter * All Canned All the time * Fix stm32 compile error regarding inputBroker * Unify tft lineheights (#7033) * Create variable line heights based upon SCREEN_HEIGHT * Refactor textPositions into method -> getTextPositions * Update SharedUIDisplay.h --------- Co-authored-by: Jason P <applewiz@mac.com> * Adjust top distance for larger displays * Adjust icon sizes for larger displays * Fix Paxcounter compile errors after code updates * Pixel wrangling to make larger screens fit better * Alert frame has precedence over banner -- for now * Unify on ALT_BUTTON * Align AM/PM to the digit, not the segment on larger displays * Move some global pin defines into configuration.h * Scaffolding for BMM150 9-axis gyro * Alt button behavior * Don't add the blank GPS frames without HAS_GPS * EVENT_NODEDB_UPDATED has been retired * Clean out LOG_WARN messages from debugging * Add dismiss message function * Minor buttonThread cleanup * Add BMM150 support * Clean up last warning from dev * Simplify bmm150 init return logic * Add option to reply to messages * Add minimal menu upon selecting home screen * Move Messages to slot 2, rename GPS to Position, move variables nearer functional usage in Screen.cpp * Properly dismiss message * T-Deck Trackball press is not user button * Add select on favorite frame to launch cannedMessage DM * Minor wording change * Less capital letters * Fix empty message check, time isn't reliable * drop dead code * Make UIRenderer a static class instead of namespace * Fix the select on favorite * Check if message is empty early and then 'return' * Add kb_found, and show the option to launch freetype if appropriate * Ignore impossible touchscreen touches * Auto scroll fix * Move linebreak after "from" for banners to maximize screen usage. * Center "No messages to show" on Message frame * Start consolidating buzzer behavior * Fixed signed / unsigned warning * Cast second parameter of max() to make some targets happy * Cast kbchar to (char) to make arduino string happy * Shorten the notice of "No messages" * Add buzzer mode chooser * Add regionPicker to Lora icon * Reduce line spacing and reorder Position screen to resolve overlapping issues * Update message titles, fix GPS icons, add Back options * Leftover boops * Remove chirp * Make the region selection dismissable when a region is already set * Add read-aloud functionality on messages w/ esp8266sam * "Last Heard" is a better label * tweak the beep * 5 options * properly tear down freetext upon cancel * de-convelute canned messages just a bit * Correct height of Mail icon in navigation bar * Remove unused warning * Consolidate time methods into TimeFormatters * Oops * Change LoRa Picker Cancel to Back * Tweak selection characters on Banner * Message render not scrolling on 5th line * More fixes for message scrolling * Remove the safety next on text overflow - we found that root cause * Add pin definitions to fix compilation for obscure target * Don't let the touchscreen send unitialized kbchar values * Make virtual KB just a bit quicker * No more double tap, swipe! * Left is left, and Right is right * Update horizontal lightning bolt design * Move from solid to dashed separator for Message Frame * Single emote feature fix * Manually sort overlapping elements for now * Freetext and clearer choices * Fix ESP32 InkHUD builds on the unify-tft branch (#7087) * Remove BaseUI branding * Capitalization is fun * Revert Meshtastic Boot Frame Changes * Add ANZ_433 LoRa region to picker * Update settings.json --------- Co-authored-by: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Jason P <applewiz@mac.com> Co-authored-by: todd-herbert <herbert.todd@gmail.com> Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-06-21 06:36:04 -05:00
parent 82b7cb5dd0
commit 4feaec651f
154 changed files with 9852 additions and 4501 deletions
@@ -0,0 +1,265 @@
+#include "configuration.h"
+#if HAS_SCREEN
+
+#include "DisplayFormatters.h"
+#include "NodeDB.h"
+#include "NotificationRenderer.h"
+#include "graphics/ScreenFonts.h"
+#include "graphics/SharedUIDisplay.h"
+#include "graphics/images.h"
+#include "main.h"
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#ifdef ARCH_ESP32
+#include "esp_task_wdt.h"
+#endif
+
+using namespace meshtastic;
+
+// External references to global variables from Screen.cpp
+extern std::vector<std::string> functionSymbol;
+extern std::string functionSymbolString;
+extern bool hasUnreadMessage;
+
+namespace graphics
+{
+
+char NotificationRenderer::inEvent = INPUT_BROKER_NONE;
+int8_t NotificationRenderer::curSelected = 0;
+char NotificationRenderer::alertBannerMessage[256] = {0};
+uint32_t NotificationRenderer::alertBannerUntil = 0;  // 0 is a special case meaning forever
+uint8_t NotificationRenderer::alertBannerOptions = 0; // last x lines are seelctable options
+std::function<void(int)> NotificationRenderer::alertBannerCallback = NULL;
+bool NotificationRenderer::pauseBanner = false;
+
+// Used on boot when a certificate is being created
+void NotificationRenderer::drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+    display->setFont(FONT_SMALL);
+    display->drawString(64 + x, y, "Creating SSL certificate");
+
+#ifdef ARCH_ESP32
+    yield();
+    esp_task_wdt_reset();
+#endif
+
+    display->setFont(FONT_SMALL);
+    if ((millis() / 1000) % 2) {
+        display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait . . .");
+    } else {
+        display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait . .  ");
+    }
+}
+
+void NotificationRenderer::drawAlertBannerOverlay(OLEDDisplay *display, OLEDDisplayUiState *state)
+{
+    // Exit if no message is active or duration has passed
+    if (!isOverlayBannerShowing())
+        return;
+
+    if (pauseBanner)
+        return;
+
+    // === Layout Configuration ===
+    constexpr uint16_t padding = 5;    // Padding around text inside the box
+    constexpr uint16_t vPadding = 2;   // Padding around text inside the box
+    constexpr uint8_t lineSpacing = 1; // Extra space between lines
+
+    // Search the message to determine if we need the bell added
+    bool needs_bell = (strstr(alertBannerMessage, "Alert Received") != nullptr);
+
+    uint8_t firstOption = 0;
+    uint8_t firstOptionToShow = 0;
+
+    // Setup font and alignment
+    display->setFont(FONT_SMALL);
+    display->setTextAlignment(TEXT_ALIGN_LEFT); // We will manually center per line
+    const int MAX_LINES = 24;
+
+    uint16_t maxWidth = 0;
+    uint16_t arrowsWidth = display->getStringWidth(">  <", 4, true);
+    uint16_t lineWidths[MAX_LINES] = {0};
+    uint16_t lineLengths[MAX_LINES] = {0};
+    char *lineStarts[MAX_LINES + 1];
+    uint16_t lineCount = 0;
+    char lineBuffer[40] = {0};
+    // pointer to the terminating null
+    char *alertEnd = alertBannerMessage + strnlen(alertBannerMessage, sizeof(alertBannerMessage));
+    lineStarts[lineCount] = alertBannerMessage;
+
+    // loop through lines finding \n characters
+    while ((lineCount < MAX_LINES) && (lineStarts[lineCount] < alertEnd)) {
+        lineStarts[lineCount + 1] = std::find(lineStarts[lineCount], alertEnd, '\n');
+        lineLengths[lineCount] = lineStarts[lineCount + 1] - lineStarts[lineCount];
+        if (lineStarts[lineCount + 1][0] == '\n') {
+            lineStarts[lineCount + 1] += 1; // Move the start pointer beyond the \n
+        }
+        lineWidths[lineCount] = display->getStringWidth(lineStarts[lineCount], lineLengths[lineCount], true);
+        if (lineWidths[lineCount] > maxWidth) {
+            maxWidth = lineWidths[lineCount];
+        }
+        if (alertBannerOptions > 0 && lineCount > 0 && lineWidths[lineCount] + arrowsWidth > maxWidth) {
+            maxWidth = lineWidths[lineCount] + arrowsWidth;
+        }
+        lineCount++;
+        // if we are doing a selection, add extra width for arrows
+    }
+
+    if (alertBannerOptions > 0) {
+        // respond to input
+        if (inEvent == INPUT_BROKER_UP || inEvent == INPUT_BROKER_ALT_PRESS) {
+            curSelected--;
+        } else if (inEvent == INPUT_BROKER_DOWN || inEvent == INPUT_BROKER_USER_PRESS) {
+            curSelected++;
+        } else if (inEvent == INPUT_BROKER_SELECT) {
+            alertBannerCallback(curSelected);
+            alertBannerMessage[0] = '\0';
+        } else if ((inEvent == INPUT_BROKER_CANCEL || inEvent == INPUT_BROKER_ALT_LONG) && alertBannerUntil != 0) {
+            alertBannerMessage[0] = '\0';
+        }
+        if (curSelected == -1)
+            curSelected = alertBannerOptions - 1;
+        if (curSelected == alertBannerOptions)
+            curSelected = 0;
+        // compare number of options to number of lines
+        if (lineCount < alertBannerOptions)
+            return;
+        firstOption = lineCount - alertBannerOptions;
+        if (curSelected > 1 && alertBannerOptions > 3) {
+            firstOptionToShow = curSelected + firstOption - 1;
+            // put the selected option in the middle
+        } else {
+            firstOptionToShow = firstOption;
+        }
+    } else { // not in an alert with a callback
+        // TODO: check that at least a second has passed since the alert started
+        if (inEvent == INPUT_BROKER_SELECT || inEvent == INPUT_BROKER_ALT_LONG || inEvent == INPUT_BROKER_CANCEL) {
+            alertBannerMessage[0] = '\0'; // end the alert early
+        }
+    }
+    inEvent = INPUT_BROKER_NONE;
+    if (alertBannerMessage[0] == '\0')
+        return;
+
+    // set width from longest line
+    uint16_t boxWidth = padding * 2 + maxWidth;
+    if (needs_bell) {
+        if (SCREEN_WIDTH > 128 && boxWidth <= 150) {
+            boxWidth += 26;
+        }
+        if (SCREEN_WIDTH <= 128 && boxWidth <= 100) {
+            boxWidth += 20;
+        }
+    }
+    // calculate max lines on screen? for now it's 4
+    // set height from line count
+    uint16_t boxHeight;
+    if (lineCount <= 4) {
+        boxHeight = vPadding * 2 + lineCount * FONT_HEIGHT_SMALL + (lineCount - 1) * lineSpacing;
+    } else {
+        boxHeight = vPadding * 2 + 4 * FONT_HEIGHT_SMALL + 4 * lineSpacing;
+    }
+
+    int16_t boxLeft = (display->width() / 2) - (boxWidth / 2);
+    int16_t boxTop = (display->height() / 2) - (boxHeight / 2);
+    // === Draw background box ===
+    display->setColor(BLACK);
+    display->fillRect(boxLeft - 1, boxTop - 1, boxWidth + 2, boxHeight + 2); // Slightly oversized box
+    display->fillRect(boxLeft, boxTop - 2, boxWidth, 1);                     // Top Line
+    display->fillRect(boxLeft, boxTop + boxHeight + 1, boxWidth, 1);         // Bottom Line
+    display->fillRect(boxLeft - 2, boxTop, 1, boxHeight);                    // Left Line
+    display->fillRect(boxLeft + boxWidth + 1, boxTop, 1, boxHeight);         // Right Line
+    display->setColor(WHITE);
+    display->drawRect(boxLeft, boxTop, boxWidth, boxHeight); // Border
+    display->setColor(BLACK);
+    display->fillRect(boxLeft, boxTop, 1, 1);                                // Top Left
+    display->fillRect(boxLeft + boxWidth - 1, boxTop, 1, 1);                 // Top Right
+    display->fillRect(boxLeft, boxTop + boxHeight - 1, 1, 1);                // Bottom Left
+    display->fillRect(boxLeft + boxWidth - 1, boxTop + boxHeight - 1, 1, 1); // Bottom Right
+    display->setColor(WHITE);
+
+    // === Draw each line centered in the box ===
+    int16_t lineY = boxTop + vPadding;
+
+    for (int i = 0; i < lineCount; i++) {
+        // is this line selected?
+        // if so, start the buffer with -> and strncpy to the 4th location
+        if (i < lineCount - alertBannerOptions || alertBannerOptions == 0) {
+            strncpy(lineBuffer, lineStarts[i], 40);
+            if (lineLengths[i] > 39)
+                lineBuffer[39] = '\0';
+            else
+                lineBuffer[lineLengths[i]] = '\0';
+        } else if (i >= firstOptionToShow && i < firstOptionToShow + 3) {
+            if (i == curSelected + firstOption) {
+                if (lineLengths[i] > 35)
+                    lineLengths[i] = 35;
+                strncpy(lineBuffer, "> ", 3);
+                strncpy(lineBuffer + 2, lineStarts[i], 36);
+                strncpy(lineBuffer + lineLengths[i] + 2, " <", 3);
+                lineLengths[i] += 4;
+                lineWidths[i] += display->getStringWidth(">  <", 4, true);
+                if (lineLengths[i] > 35)
+                    lineBuffer[39] = '\0';
+                else
+                    lineBuffer[lineLengths[i]] = '\0';
+            } else {
+                strncpy(lineBuffer, lineStarts[i], 40);
+                if (lineLengths[i] > 39)
+                    lineBuffer[39] = '\0';
+                else
+                    lineBuffer[lineLengths[i]] = '\0';
+            }
+        } else { // add break for the additional lines
+            continue;
+        }
+
+        int16_t textX = boxLeft + (boxWidth - lineWidths[i]) / 2;
+
+        if (needs_bell && i == 0) {
+            int bellY = lineY + (FONT_HEIGHT_SMALL - 8) / 2;
+            display->drawXbm(textX - 10, bellY, 8, 8, bell_alert);
+            display->drawXbm(textX + lineWidths[i] + 2, bellY, 8, 8, bell_alert);
+        }
+
+        display->drawString(textX, lineY, lineBuffer);
+        lineY += FONT_HEIGHT_SMALL + lineSpacing;
+    }
+}
+
+/// Draw the last text message we received
+void NotificationRenderer::drawCriticalFaultFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
+    display->setFont(FONT_MEDIUM);
+
+    char tempBuf[24];
+    snprintf(tempBuf, sizeof(tempBuf), "Critical fault #%d", error_code);
+    display->drawString(0 + x, 0 + y, tempBuf);
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
+    display->setFont(FONT_SMALL);
+    display->drawString(0 + x, FONT_HEIGHT_MEDIUM + y, "For help, please visit \nmeshtastic.org");
+}
+
+void NotificationRenderer::drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+    display->setFont(FONT_MEDIUM);
+    display->drawString(64 + x, y, "Updating");
+
+    display->setFont(FONT_SMALL);
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
+    display->drawStringMaxWidth(0 + x, 2 + y + FONT_HEIGHT_SMALL * 2, x + display->getWidth(),
+                                "Please be patient and do not power off.");
+}
+
+bool NotificationRenderer::isOverlayBannerShowing()
+{
+    return strlen(alertBannerMessage) > 0 && (alertBannerUntil == 0 || millis() <= alertBannerUntil);
+}
+
+} // namespace graphics
+#endif