run trunk fmt -a (#9400)

* run trunk fmt -a

* fix bracket bug

This was introduced by @tedwardd and @thebentern in 021106dfe5.

See this diff:
         else
+            checkConfigPort = false;
             printf("Using config file %d\n", TCPPort);

monitor/filter_c3_exception_decoder.py

@@ -43,13 +43,11 @@ class Esp32C3ExceptionDecoder(DeviceMonitorFilterBase):
         self.enabled = self.setup_paths()
 
         if self.config.get("env:" + self.environment, "build_type") != "debug":
-            print(
+            print("""
-                """
 Please build project in debug configuration to get more details about an exception.
 See https://docs.platformio.org/page/projectconf/build_configurations.html
 
-"""
+""")
-            )
 
         return self
 

src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp

@@ -155,18 +155,6 @@ void InkHUD::LogoApplet::onShutdown()
     // This is then drawn by InkHUD::Events::onShutdown, with a blocking FULL update, after InkHUD's flash write is complete
 }
 
-void InkHUD::LogoApplet::onApplyingChanges()
-{
-    bringToForeground();
-
-    textLeft = "";
-    textRight = "";
-    textTitle = "Applying changes";
-    fontTitle = fontSmall;
-
-    inkhud->forceUpdate(Drivers::EInk::FAST, false);
-}
-
 void InkHUD::LogoApplet::onReboot()
 {
     bringToForeground();

src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h

@@ -26,7 +26,6 @@ class LogoApplet : public SystemApplet, public concurrency::OSThread
     void onBackground() override;
     void onShutdown() override;
     void onReboot() override;
-    void onApplyingChanges();
 
   protected:
     int32_t runOnce() override;

src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h

@@ -22,7 +22,6 @@ enum MenuAction {
     STORE_CANNEDMESSAGE_SELECTION,
     SEND_CANNEDMESSAGE,
     SHUTDOWN,
-    BACK,
     NEXT_TILE,
     TOGGLE_BACKLIGHT,
     TOGGLE_GPS,
@@ -37,84 +36,6 @@ enum MenuAction {
     TOGGLE_NOTIFICATIONS,
     TOGGLE_INVERT_COLOR,
     TOGGLE_12H_CLOCK,
-    // Regions
-    SET_REGION_US,
-    SET_REGION_EU_868,
-    SET_REGION_EU_433,
-    SET_REGION_CN,
-    SET_REGION_JP,
-    SET_REGION_ANZ,
-    SET_REGION_KR,
-    SET_REGION_TW,
-    SET_REGION_RU,
-    SET_REGION_IN,
-    SET_REGION_NZ_865,
-    SET_REGION_TH,
-    SET_REGION_LORA_24,
-    SET_REGION_UA_433,
-    SET_REGION_UA_868,
-    SET_REGION_MY_433,
-    SET_REGION_MY_919,
-    SET_REGION_SG_923,
-    SET_REGION_PH_433,
-    SET_REGION_PH_868,
-    SET_REGION_PH_915,
-    SET_REGION_ANZ_433,
-    SET_REGION_KZ_433,
-    SET_REGION_KZ_863,
-    SET_REGION_NP_865,
-    SET_REGION_BR_902,
-    // Device Roles
-    SET_ROLE_CLIENT,
-    SET_ROLE_CLIENT_MUTE,
-    SET_ROLE_ROUTER,
-    SET_ROLE_REPEATER,
-    // Presets
-    SET_PRESET_LONG_SLOW,
-    SET_PRESET_LONG_MODERATE,
-    SET_PRESET_LONG_FAST,
-    SET_PRESET_MEDIUM_SLOW,
-    SET_PRESET_MEDIUM_FAST,
-    SET_PRESET_SHORT_SLOW,
-    SET_PRESET_SHORT_FAST,
-    SET_PRESET_SHORT_TURBO,
-    // Timezones
-    SET_TZ_US_HAWAII,
-    SET_TZ_US_ALASKA,
-    SET_TZ_US_PACIFIC,
-    SET_TZ_US_ARIZONA,
-    SET_TZ_US_MOUNTAIN,
-    SET_TZ_US_CENTRAL,
-    SET_TZ_US_EASTERN,
-    SET_TZ_BR_BRAZILIA,
-    SET_TZ_UTC,
-    SET_TZ_EU_WESTERN,
-    SET_TZ_EU_CENTRAL,
-    SET_TZ_EU_EASTERN,
-    SET_TZ_ASIA_KOLKATA,
-    SET_TZ_ASIA_HONG_KONG,
-    SET_TZ_AU_AWST,
-    SET_TZ_AU_ACST,
-    SET_TZ_AU_AEST,
-    SET_TZ_PACIFIC_NZ,
-    // Power
-    TOGGLE_POWER_SAVE,
-    CALIBRATE_ADC,
-    // Bluetooth
-    TOGGLE_BLUETOOTH,
-    TOGGLE_BLUETOOTH_PAIR_MODE,
-    // Channel
-    TOGGLE_CHANNEL_UPLINK,
-    TOGGLE_CHANNEL_DOWNLINK,
-    TOGGLE_CHANNEL_POSITION,
-    SET_CHANNEL_PRECISION,
-    // Display
-    TOGGLE_DISPLAY_UNITS,
-    // Network
-    TOGGLE_WIFI,
-    // Administration
-    RESET_NODEDB_ALL,
-    RESET_NODEDB_KEEP_FAVORITES,
 };
 
 } // namespace NicheGraphics::InkHUD

src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h

@@ -35,7 +35,6 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
     void onRender() override;
 
     void show(Tile *t); // Open the menu, onto a user tile
-    void setStartPage(MenuPage page);
 
   protected:
     Drivers::LatchingBacklight *backlight = nullptr; // Convenient access to the backlight singleton
@@ -57,7 +56,6 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
     void sendText(NodeNum dest, ChannelIndex channel, const char *message); // Send a text message to mesh
     void freeCannedMessageResources();                                      // Clear MenuApplet's canned message processing data
 
-    MenuPage startPageOverride = MenuPage::ROOT;
     MenuPage currentPage = MenuPage::ROOT;
     MenuPage previousPage = MenuPage::EXIT;
     uint8_t cursor = 0;       // Which menu item is currently highlighted
@@ -65,15 +63,7 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
 
     uint16_t systemInfoPanelHeight = 0; // Need to know before we render
 
-    std::vector<MenuItem> items;               // MenuItems for the current page. Filled by ShowPage
+    std::vector<MenuItem> items; // MenuItems for the current page. Filled by ShowPage
-    std::vector<std::string> nodeConfigLabels; // Persistent labels for Node Config pages
-    uint8_t selectedChannelIndex = 0;          // Currently selected LoRa channel (Node Config → Radio → Channel)
-    bool channelPositionEnabled = false;
-    bool gpsEnabled = false;
-
-    // Recents menu checkbox state (derived from settings.recentlyActiveSeconds)
-    static constexpr uint8_t RECENTS_COUNT = 6;
-    bool recentsSelected[RECENTS_COUNT] = {};
 
     // Data for selecting and sending canned messages via the menu
     // Placed into a sub-class for organization only

src/graphics/niche/InkHUD/Applets/System/Menu/MenuItem.h

@@ -30,7 +30,6 @@ class MenuItem
     MenuAction action = NO_ACTION;
     MenuPage nextPage = EXIT;
     bool *checkState = nullptr;
-    bool isHeader = false; // Non-selectable section label
 
     // Various constructors, depending on the intended function of the item
 
@@ -41,12 +40,6 @@ class MenuItem
         : label(label), action(action), nextPage(nextPage), checkState(checkState)
     {
     }
-    static MenuItem Header(const char *label)
-    {
-        MenuItem item(label, NO_ACTION, EXIT);
-        item.isHeader = true;
-        return item;
-    }
 };
 
 } // namespace NicheGraphics::InkHUD

src/graphics/niche/InkHUD/Applets/System/Menu/MenuPage.h

@@ -20,27 +20,10 @@ enum MenuPage : uint8_t {
     SEND,
     CANNEDMESSAGE_RECIPIENT, // Select destination for a canned message
     OPTIONS,
-    NODE_CONFIG,
-    NODE_CONFIG_LORA,
-    NODE_CONFIG_CHANNELS,       // List of channels
-    NODE_CONFIG_CHANNEL_DETAIL, // Per-channel options
-    NODE_CONFIG_CHANNEL_PRECISION,
-    NODE_CONFIG_PRESET,
-    NODE_CONFIG_DEVICE,
-    NODE_CONFIG_DEVICE_ROLE,
-    NODE_CONFIG_POWER,
-    NODE_CONFIG_POWER_ADC_CAL,
-    NODE_CONFIG_NETWORK,
-    NODE_CONFIG_DISPLAY,
-    NODE_CONFIG_BLUETOOTH,
-    NODE_CONFIG_POSITION,
-    NODE_CONFIG_ADMIN_RESET,
-    TIMEZONE,
     APPLETS,
     AUTOSHOW,
     RECENTS, // Select length of "recentlyActiveSeconds"
-    REGION,
+    EXIT,    // Dismiss the menu applet
-    EXIT, // Dismiss the menu applet
 };
 
 } // namespace NicheGraphics::InkHUD

src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp

@@ -10,37 +10,34 @@ using namespace NicheGraphics;
 
 InkHUD::TipsApplet::TipsApplet()
 {
-    bool needsRegion = (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET);
+    // Decide which tips (if any) should be shown to user after the boot screen
-
-    bool showTutorialTips = (settings->tips.firstBoot || needsRegion);
 
     // Welcome screen
-    if (showTutorialTips)
+    if (settings->tips.firstBoot)
         tipQueue.push_back(Tip::WELCOME);
 
-    // Finish setup
+    // Antenna, region, timezone
-    if (needsRegion)
+    // Shown at boot if region not yet set
+    if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET)
         tipQueue.push_back(Tip::FINISH_SETUP);
 
-    // Using the UI
-    if (showTutorialTips) {
-        tipQueue.push_back(Tip::CUSTOMIZATION);
-        tipQueue.push_back(Tip::BUTTONS);
-    }
-
     // Shutdown info
     // Shown until user performs one valid shutdown
     if (!settings->tips.safeShutdownSeen)
         tipQueue.push_back(Tip::SAFE_SHUTDOWN);
 
+    // Using the UI
+    if (settings->tips.firstBoot) {
+        tipQueue.push_back(Tip::CUSTOMIZATION);
+        tipQueue.push_back(Tip::BUTTONS);
+    }
+
     // Catch an incorrect attempt at rotating display
     if (config.display.flip_screen)
         tipQueue.push_back(Tip::ROTATION);
 
-    // Region picker
+    // Applet is foreground immediately at boot, but is obscured by LogoApplet, which is also foreground
-    if (needsRegion)
+    // LogoApplet can be considered to have a higher Z-index, because it is placed before TipsApplet in the systemApplets vector
-        tipQueue.push_back(Tip::PICK_REGION);
-
     if (!tipQueue.empty())
         bringToForeground();
 }
@@ -54,109 +51,81 @@ void InkHUD::TipsApplet::onRender()
 
     case Tip::FINISH_SETUP: {
         setFont(fontMedium);
-        const char *title = "Tip: Finish Setup";
+        printAt(0, 0, "Tip: Finish Setup");
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
+        int16_t cursorY = fontMedium.lineHeight() * 1.5;
+        printAt(0, cursorY, "- connect antenna");
 
-        auto drawBullet = [&](const char *text) {
+        cursorY += fontSmall.lineHeight() * 1.2;
-            uint16_t bh = getWrappedTextHeight(0, width(), text);
+        printAt(0, cursorY, "- connect a client app");
-            printWrapped(0, cursorY, width(), text);
-            cursorY += bh + (fontSmall.lineHeight() / 3);
-        };
 
-        drawBullet("- connect antenna");
+        // Only if region not set
-        drawBullet("- connect a client app");
+        if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- set region");
+        }
 
-        if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET)
+        // Only if tz not set
-            drawBullet("- set region");
+        if (!(*config.device.tzdef && config.device.tzdef[0] != 0)) {
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- set timezone");
+        }
 
-        if (!(*config.device.tzdef && config.device.tzdef[0] != 0))
+        cursorY += fontSmall.lineHeight() * 1.5;
-            drawBullet("- set timezone");
+        printAt(0, cursorY, "More info at meshtastic.org");
-
-        cursorY += fontSmall.lineHeight() / 2;
-        drawBullet("More info at meshtastic.org");
 
+        setFont(fontSmall);
         printAt(0, Y(1.0), "Press button to continue", LEFT, BOTTOM);
     } break;
 
-    case Tip::PICK_REGION: {
-        setFont(fontMedium);
-        printAt(0, 0, "Set Region");
-
-        setFont(fontSmall);
-        printWrapped(0, fontMedium.lineHeight() * 1.5, width(), "Please select your LoRa region to complete setup.");
-
-        printAt(0, Y(1.0), "Press button to choose", LEFT, BOTTOM);
-    } break;
-
     case Tip::SAFE_SHUTDOWN: {
         setFont(fontMedium);
-
+        printAt(0, 0, "Tip: Shutdown");
-        const char *title = "Tip: Shutdown";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
+        std::string shutdown;
-
+        shutdown += "Before removing power, please shut down from InkHUD menu, or a client app. \n";
-        const char *body = "Before removing power, please shut down from InkHUD menu, or a client app.\n\n"
+        shutdown += "\n";
-                           "This ensures data is saved.";
+        shutdown += "This ensures data is saved.";
-
+        printWrapped(0, fontMedium.lineHeight() * 1.5, width(), shutdown);
-        uint16_t bodyH = getWrappedTextHeight(0, width(), body);
-        printWrapped(0, cursorY, width(), body);
-        cursorY += bodyH + (fontSmall.lineHeight() / 2);
 
         printAt(0, Y(1.0), "Press button to continue", LEFT, BOTTOM);
+
     } break;
 
     case Tip::CUSTOMIZATION: {
         setFont(fontMedium);
-
+        printAt(0, 0, "Tip: Customization");
-        const char *title = "Tip: Customization";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
+        printWrapped(0, fontMedium.lineHeight() * 1.5, width(),
-
+                     "Configure & control display with the InkHUD menu. Optional features, layout, rotation, and more.");
-        const char *body = "Configure & control display with the InkHUD menu. "
-                           "Optional features, layout, rotation, and more.";
-
-        uint16_t bodyH = getWrappedTextHeight(0, width(), body);
-        printWrapped(0, cursorY, width(), body);
-        cursorY += bodyH + (fontSmall.lineHeight() / 2);
 
         printAt(0, Y(1.0), "Press button to continue", LEFT, BOTTOM);
     } break;
 
     case Tip::BUTTONS: {
         setFont(fontMedium);
-
+        printAt(0, 0, "Tip: Buttons");
-        const char *title = "Tip: Buttons";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
+        int16_t cursorY = fontMedium.lineHeight() * 1.5;
-
-        auto drawBullet = [&](const char *text) {
-            uint16_t bh = getWrappedTextHeight(0, width(), text);
-            printWrapped(0, cursorY, width(), text);
-            cursorY += bh + (fontSmall.lineHeight() / 3);
-        };
 
         if (!settings->joystick.enabled) {
-            drawBullet("User Button");
+            printAt(0, cursorY, "User Button");
-            drawBullet("- short press: next");
+            cursorY += fontSmall.lineHeight() * 1.2;
-            drawBullet("- long press: select or open menu");
+            printAt(0, cursorY, "- short press: next");
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- long press: select / open menu");
         } else {
-            drawBullet("Joystick");
+            printAt(0, cursorY, "Joystick");
-            drawBullet("- press: open menu or select");
+            cursorY += fontSmall.lineHeight() * 1.2;
-            drawBullet("Exit Button");
+            printAt(0, cursorY, "- open menu / select");
-            drawBullet("- press: switch tile or close menu");
+            cursorY += fontSmall.lineHeight() * 1.5;
+            printAt(0, cursorY, "Exit Button");
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- switch tile / close menu");
         }
 
         printAt(0, Y(1.0), "Press button to continue", LEFT, BOTTOM);
@@ -164,21 +133,12 @@ void InkHUD::TipsApplet::onRender()
 
     case Tip::ROTATION: {
         setFont(fontMedium);
-
+        printAt(0, 0, "Tip: Rotation");
-        const char *title = "Tip: Rotation";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
 
         setFont(fontSmall);
         if (!settings->joystick.enabled) {
-            int16_t cursorY = h + fontSmall.lineHeight();
+            printWrapped(0, fontMedium.lineHeight() * 1.5, width(),
-
+                         "To rotate the display, use the InkHUD menu. Long-press the user button > Options > Rotate.");
-            const char *body = "To rotate the display, use the InkHUD menu. "
-                               "Long-press the user button > Options > Rotate.";
-
-            uint16_t bh = getWrappedTextHeight(0, width(), body);
-            printWrapped(0, cursorY, width(), body);
-            cursorY += bh + (fontSmall.lineHeight() / 2);
         } else {
             printWrapped(0, fontMedium.lineHeight() * 1.5, width(),
                          "To rotate the display, use the InkHUD menu. Press the user button > Options > Rotate.");
@@ -199,15 +159,12 @@ void InkHUD::TipsApplet::renderWelcome()
 {
     uint16_t padW = X(0.05);
 
-    // Detect portrait orientation
-    bool portrait = height() > width();
-
     // Block 1 - logo & title
     // ========================
 
     // Logo size
-    uint16_t logoWLimit = portrait ? X(0.5) : X(0.3);
+    uint16_t logoWLimit = X(0.3);
-    uint16_t logoHLimit = portrait ? Y(0.25) : Y(0.3);
+    uint16_t logoHLimit = Y(0.3);
     uint16_t logoW = getLogoWidth(logoWLimit, logoHLimit);
     uint16_t logoH = getLogoHeight(logoWLimit, logoHLimit);
 
@@ -220,7 +177,7 @@ void InkHUD::TipsApplet::renderWelcome()
 
     // Center the block
     // Desired effect: equal margin from display edge for logo left and title right
-    int16_t block1Y = portrait ? Y(0.2) : Y(0.3);
+    int16_t block1Y = Y(0.3);
     int16_t block1CX = X(0.5) + (logoW / 2) - (titleW / 2);
     int16_t logoCX = block1CX - (logoW / 2) - (padW / 2);
     int16_t titleCX = block1CX + (titleW / 2) + (padW / 2);
@@ -235,7 +192,7 @@ void InkHUD::TipsApplet::renderWelcome()
     std::string subtitle = "InkHUD";
     if (width() >= 200)
         subtitle += "  -  A Heads-Up Display"; // Future proofing: narrower for tiny display
-    printAt(X(0.5), portrait ? Y(0.45) : Y(0.6), subtitle, CENTER, MIDDLE);
+    printAt(X(0.5), Y(0.6), subtitle, CENTER, MIDDLE);
 
     // Block 3 - press to continue
     // ============================
@@ -267,37 +224,26 @@ void InkHUD::TipsApplet::onBackground()
 // While our SystemApplet::handleInput flag is true
 void InkHUD::TipsApplet::onButtonShortPress()
 {
-    bool needsRegion = (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET);
-    // If we're prompting the user to pick a region, hand off to the menu
-    if (!tipQueue.empty() && tipQueue.front() == Tip::PICK_REGION) {
-        tipQueue.pop_front();
-
-        // Signal InkHUD to open the menu on Region page
-        inkhud->forceRegionMenu = true;
-
-        // Close tips and open menu
-        sendToBackground();
-        inkhud->openMenu();
-        return;
-    }
-    // Consume current tip
     tipQueue.pop_front();
 
     // All tips done
     if (tipQueue.empty()) {
         // Record that user has now seen the "tutorial" set of tips
         // Don't show them on subsequent boots
-        if (settings->tips.firstBoot && !needsRegion) {
+        if (settings->tips.firstBoot) {
             settings->tips.firstBoot = false;
             inkhud->persistence->saveSettings();
         }
 
-        // Close applet and clean the screen
+        // Close applet, and full refresh to clean the screen
+        // Need to force update, because our request would be ignored otherwise, as we are now background
         sendToBackground();
         inkhud->forceUpdate(EInk::UpdateTypes::FULL);
-    } else {
-        requestUpdate();
     }
+
+    // More tips left
+    else
+        requestUpdate();
 }
 
 // Functions the same as the user button in this instance

src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h

@@ -23,7 +23,6 @@ class TipsApplet : public SystemApplet
     enum class Tip {
         WELCOME,
         FINISH_SETUP,
-        PICK_REGION,
         SAFE_SHUTDOWN,
         CUSTOMIZATION,
         BUTTONS,

src/graphics/niche/InkHUD/Events.cpp

@@ -276,15 +276,6 @@ int InkHUD::Events::beforeDeepSleep(void *unused)
     return 0; // We agree: deep sleep now
 }
 
-// Display an intermediate screen while configuration changes are applied
-void InkHUD::Events::applyingChanges()
-{
-    // Bring the logo applet forward with a temporary message
-    for (SystemApplet *sa : inkhud->systemApplets) {
-        sa->onApplyingChanges();
-    }
-}
-
 // Callback for rebootObserver
 // Same as shutdown, without drawing the logoApplet
 // Makes sure we don't lose message history / InkHUD config

src/graphics/niche/InkHUD/Events.h

@@ -29,13 +29,12 @@ class Events
 
     void onButtonShort(); // User button: short press
     void onButtonLong();  // User button: long press
-    void applyingChanges();
+    void onExitShort();   // Exit button: short press
-    void onExitShort(); // Exit button: short press
+    void onExitLong();    // Exit button: long press
-    void onExitLong();  // Exit button: long press
+    void onNavUp();       // Navigate up
-    void onNavUp();     // Navigate up
+    void onNavDown();     // Navigate down
-    void onNavDown();   // Navigate down
+    void onNavLeft();     // Navigate left
-    void onNavLeft();   // Navigate left
+    void onNavRight();    // Navigate right
-    void onNavRight();  // Navigate right
 
     int beforeDeepSleep(void *unused);                             // Prepare for shutdown
     int beforeReboot(void *unused);                                // Prepare for reboot

src/graphics/niche/InkHUD/InkHUD.cpp

@@ -53,13 +53,6 @@ void InkHUD::InkHUD::addApplet(const char *name, Applet *a, bool defaultActive,
     windowManager->addApplet(name, a, defaultActive, defaultAutoshow, onTile);
 }
 
-void InkHUD::InkHUD::notifyApplyingChanges()
-{
-    if (events) {
-        events->applyingChanges();
-    }
-}
-
 // Start InkHUD!
 // Call this only after you have configured InkHUD
 void InkHUD::InkHUD::begin()

src/graphics/niche/InkHUD/InkHUD.h

@@ -47,7 +47,6 @@ class InkHUD
     void setDriver(Drivers::EInk *driver);
     void setDisplayResilience(uint8_t fastPerFull = 5, float stressMultiplier = 2.0);
     void addApplet(const char *name, Applet *a, bool defaultActive = false, bool defaultAutoshow = false, uint8_t onTile = -1);
-    void notifyApplyingChanges();
 
     void begin();
 
@@ -77,9 +76,6 @@ class InkHUD
     void rotateJoystick(uint8_t angle = 1); // rotate 90 deg by default
     void toggleBatteryIcon();
 
-    // Used by TipsApplet to force menu to start on Region selection
-    bool forceRegionMenu = false;
-
     // Updating the display
     // - called by various InkHUD components
 

src/graphics/niche/InkHUD/SystemApplet.h

@@ -27,7 +27,6 @@ class SystemApplet : public Applet
     bool lockRequests = false;  // - prevent other applets from triggering display updates
 
     virtual void onReboot() { onShutdown(); } // - handle reboot specially
-    virtual void onApplyingChanges() {}
 
     // Other system applets may take precedence over our own system applet though
     // The order an applet is passed to WindowManager::addSystemApplet determines this hierarchy (added earlier = higher rank)

src/platform/portduino/PortduinoGlue.cpp

@@ -61,11 +61,12 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
 {
     switch (key) {
     case 'p':
-        if (sscanf(arg, "%d", &TCPPort) < 1)
+        if (sscanf(arg, "%d", &TCPPort) < 1) {
             return ARGP_ERR_UNKNOWN;
-        else
+        } else {
             checkConfigPort = false;
             printf("Using config file %d\n", TCPPort);
+        }
         break;
     case 'c':
         configPath = arg;
@@ -887,10 +888,8 @@ bool loadConfig(const char *configPath)
             }
             if (checkConfigPort) {
                 portduino_config.api_port = (yamlConfig["General"]["APIPort"]).as<int>(-1);
-                if (portduino_config.api_port != -1 &&
+                if (portduino_config.api_port != -1 && portduino_config.api_port > 1023 && portduino_config.api_port < 65536) {
-                portduino_config.api_port > 1023 &&
+                    TCPPort = (portduino_config.api_port);
-                portduino_config.api_port < 65536) {
-                TCPPort = (portduino_config.api_port);
                 }
             }
             portduino_config.mac_address = (yamlConfig["General"]["MACAddress"]).as<std::string>("");

variants/esp32s3/CDEBYTE_EoRa-Hub/rfswitch.h

@@ -8,7 +8,8 @@
 // DIO6 -> RFSW1_V2
 // DIO7 -> not connected on E80 module - note that GNSS and Wifi scanning are not possible.
 
-static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC, RADIOLIB_NC};
+static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC,
+                                             RADIOLIB_NC};
 
 static const Module::RfSwitchMode_t rfswitch_table[] = {
     // mode             DIO5  DIO6  DIO7