Fixed missing last option

Fixes EVENT_MODE firmware builds

.github/workflows/main_matrix.yml

@@ -240,6 +240,7 @@ jobs:
     needs: [build]
     steps:
       - uses: actions/checkout@v6
+        if: github.event_name == 'pull_request_target'
         with:
           filter: blob:none # means we download all the git history but none of the commit (except ones with checkout like the head)
           fetch-depth: 0
@@ -253,18 +254,20 @@ jobs:
         uses: actions/upload-artifact@v6
         id: upload-manifest
         with:
-          name: manifests-all
+          name: manifests-${{ github.sha }}
           overwrite: true
-          path: |
-            manifests-new/*.mt.json
+          path: manifests-new/*.mt.json
       - name: Find the merge base
+        if: github.event_name == 'pull_request_target'
         run: echo "MERGE_BASE=$(git merge-base "origin/$base" "$head")" >> $GITHUB_ENV
         env:
           base: ${{ github.base_ref }}
-          head: ${{ github.head_ref }}
+          head: ${{ github.sha }}
       - name: Download the old manifests
-        run: gh run download -R ${{ github.repository }} --commit ${{ env.MERGE_BASE }} --name manifests-all --dir manifest-old/
+        if: github.event_name == 'pull_request_target'
+        run: gh run download -R ${{ github.repository }} --name manifests-${{ env.MERGE_BASE }} --dir manifest-old/
       - name: Do scan and post comment
+        if: github.event_name == 'pull_request_target'
         run: python3 bin/shame.py ${{ github.event.pull_request.number }} manifests-old/ manifests-new/
 
   release-artifacts:

src/graphics/draw/MenuHandler.cpp

@@ -1092,11 +1092,23 @@ void menuHandler::favoriteBaseMenu()
 
 void menuHandler::positionBaseMenu()
 {
-    enum optionsNumbers { Back, GPSToggle, GPSFormat, CompassMenu, CompassCalibrate, enumEnd };
+    enum optionsNumbers {
+        Back,
+        GPSToggle,
+        GPSFormat,
+        CompassMenu,
+        CompassCalibrate,
+        GPSSmartPosition,
+        GPSUpdateInterval,
+        GPSPositionBroadcast,
+        enumEnd
+    };
 
-    static const char *optionsArray[enumEnd] = {"Back", "GPS Toggle", "GPS Format", "Compass"};
-    static int optionsEnumArray[enumEnd] = {Back, GPSToggle, GPSFormat, CompassMenu};
-    int options = 4;
+    static const char *optionsArray[enumEnd] = {
+        "Back", "On/Off Toggle", "Format", "Smart Position", "Update Interval", "Broadcast Interval", "Compass"};
+    static int optionsEnumArray[enumEnd] = {
+        Back, GPSToggle, GPSFormat, GPSSmartPosition, GPSUpdateInterval, GPSPositionBroadcast, CompassMenu};
+    int options = 7;
 
     if (accelerometerThread) {
         optionsArray[options] = "Compass Calibrate";
@@ -1104,7 +1116,7 @@ void menuHandler::positionBaseMenu()
     }
 
     BannerOverlayOptions bannerOptions;
-    bannerOptions.message = "Position Action";
+    bannerOptions.message = "GPS Action";
     bannerOptions.optionsArrayPtr = optionsArray;
     bannerOptions.optionsEnumPtr = optionsEnumArray;
     bannerOptions.optionsCount = options;
@@ -1120,6 +1132,15 @@ void menuHandler::positionBaseMenu()
             screen->runNow();
         } else if (selected == CompassCalibrate) {
             accelerometerThread->calibrate(30);
+        } else if (selected == GPSSmartPosition) {
+            menuQueue = gps_smart_position_menu;
+            screen->runNow();
+        } else if (selected == GPSUpdateInterval) {
+            menuQueue = gps_update_interval_menu;
+            screen->runNow();
+        } else if (selected == GPSPositionBroadcast) {
+            menuQueue = gps_position_broadcast_menu;
+            screen->runNow();
         }
     };
     screen->showOverlayBanner(bannerOptions);
@@ -1346,6 +1367,203 @@ void menuHandler::GPSFormatMenu()
     bannerOptions.InitialSelected = uiconfig.gps_format + 1;
     screen->showOverlayBanner(bannerOptions);
 }
+
+void menuHandler::GPSSmartPositionMenu()
+{
+    static const char *optionsArray[] = {"Back", "Enabled", "Disabled"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Toggle Smart Position";
+    if (currentResolution == ScreenResolution::UltraLow) {
+        bannerOptions.message = "Smrt Postn";
+    }
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 3;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 0) {
+            menuQueue = position_base_menu;
+            screen->runNow();
+        } else if (selected == 1) {
+            config.position.position_broadcast_smart_enabled = true;
+            saveUIConfig();
+            service->reloadConfig(SEGMENT_CONFIG);
+            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
+        } else if (selected == 2) {
+            config.position.position_broadcast_smart_enabled = false;
+            saveUIConfig();
+            service->reloadConfig(SEGMENT_CONFIG);
+            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
+        }
+    };
+    bannerOptions.InitialSelected = config.position.position_broadcast_smart_enabled ? 1 : 2;
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::GPSUpdateIntervalMenu()
+{
+    static const char *optionsArray[] = {"Back",      "8 seconds", "20 seconds", "40 seconds",  "1 minute",   "80 seconds",
+                                         "2 minutes", "5 minutes", "10 minutes", "15 minutes",  "30 minutes", "1 hour",
+                                         "6 hours",   "12 hours",  "24 hours",   "At Boot Only"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Update Interval";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 16;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 0) {
+            menuQueue = position_base_menu;
+            screen->runNow();
+        } else if (selected == 1) {
+            config.position.gps_update_interval = 8;
+        } else if (selected == 2) {
+            config.position.gps_update_interval = 20;
+        } else if (selected == 3) {
+            config.position.gps_update_interval = 40;
+        } else if (selected == 4) {
+            config.position.gps_update_interval = 60;
+        } else if (selected == 5) {
+            config.position.gps_update_interval = 80;
+        } else if (selected == 6) {
+            config.position.gps_update_interval = 120;
+        } else if (selected == 7) {
+            config.position.gps_update_interval = 300;
+        } else if (selected == 8) {
+            config.position.gps_update_interval = 600;
+        } else if (selected == 9) {
+            config.position.gps_update_interval = 900;
+        } else if (selected == 10) {
+            config.position.gps_update_interval = 1800;
+        } else if (selected == 11) {
+            config.position.gps_update_interval = 3600;
+        } else if (selected == 12) {
+            config.position.gps_update_interval = 21600;
+        } else if (selected == 13) {
+            config.position.gps_update_interval = 43200;
+        } else if (selected == 14) {
+            config.position.gps_update_interval = 86400;
+        } else if (selected == 15) {
+            config.position.gps_update_interval = 2147483647; // At Boot Only
+        }
+
+        if (selected != 0) {
+            saveUIConfig();
+            service->reloadConfig(SEGMENT_CONFIG);
+            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
+        }
+    };
+
+    if (config.position.gps_update_interval == 30) {
+        bannerOptions.InitialSelected = 1;
+    } else if (config.position.gps_update_interval == 60) {
+        bannerOptions.InitialSelected = 2;
+    } else if (config.position.gps_update_interval == 120) {
+        bannerOptions.InitialSelected = 3;
+    } else if (config.position.gps_update_interval == 300) {
+        bannerOptions.InitialSelected = 4;
+    } else if (config.position.gps_update_interval == 600) {
+        bannerOptions.InitialSelected = 5;
+    } else if (config.position.gps_update_interval == 900) {
+        bannerOptions.InitialSelected = 6;
+    } else if (config.position.gps_update_interval == 1800) {
+        bannerOptions.InitialSelected = 7;
+    } else if (config.position.gps_update_interval == 3600) {
+        bannerOptions.InitialSelected = 8;
+    } else if (config.position.gps_update_interval == 21600) {
+        bannerOptions.InitialSelected = 9;
+    } else if (config.position.gps_update_interval == 43200) {
+        bannerOptions.InitialSelected = 10;
+    } else if (config.position.gps_update_interval == 86400) {
+        bannerOptions.InitialSelected = 11;
+    } else if (config.position.gps_update_interval == 2147483647) { // At Boot Only
+        bannerOptions.InitialSelected = 12;
+    } else {
+        bannerOptions.InitialSelected = 0;
+    }
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::GPSPositionBroadcastMenu()
+{
+    static const char *optionsArray[] = {"Back",     "1 minute", "90 seconds", "5 minutes", "15 minutes", "1 hour",
+                                         "2 hours",  "3 hours",  "4 hours",    "5 hours",   "6 hours",    "12 hours",
+                                         "18 hours", "24 hours", "36 hours",   "48 hours",  "72 hours"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Broadcast Interval";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 17;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 0) {
+            menuQueue = position_base_menu;
+            screen->runNow();
+        } else if (selected == 1) {
+            config.position.position_broadcast_secs = 60;
+        } else if (selected == 2) {
+            config.position.position_broadcast_secs = 90;
+        } else if (selected == 3) {
+            config.position.position_broadcast_secs = 300;
+        } else if (selected == 4) {
+            config.position.position_broadcast_secs = 900;
+        } else if (selected == 5) {
+            config.position.position_broadcast_secs = 3600;
+        } else if (selected == 6) {
+            config.position.position_broadcast_secs = 7200;
+        } else if (selected == 7) {
+            config.position.position_broadcast_secs = 10800;
+        } else if (selected == 8) {
+            config.position.position_broadcast_secs = 14400;
+        } else if (selected == 9) {
+            config.position.position_broadcast_secs = 18000;
+        } else if (selected == 10) {
+            config.position.position_broadcast_secs = 21600;
+        } else if (selected == 11) {
+            config.position.position_broadcast_secs = 43200;
+        } else if (selected == 12) {
+            config.position.position_broadcast_secs = 64800;
+        } else if (selected == 13) {
+            config.position.position_broadcast_secs = 86400;
+        } else if (selected == 14) {
+            config.position.position_broadcast_secs = 129600;
+        } else if (selected == 15) {
+            config.position.position_broadcast_secs = 172800;
+        } else if (selected == 16) {
+            config.position.position_broadcast_secs = 259200;
+        }
+
+        if (selected != 0) {
+            saveUIConfig();
+            service->reloadConfig(SEGMENT_CONFIG);
+            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
+        }
+    };
+
+    if (config.position.position_broadcast_secs == 3600) {
+        bannerOptions.InitialSelected = 1;
+    } else if (config.position.position_broadcast_secs == 7200) {
+        bannerOptions.InitialSelected = 2;
+    } else if (config.position.position_broadcast_secs == 10800) {
+        bannerOptions.InitialSelected = 3;
+    } else if (config.position.position_broadcast_secs == 14400) {
+        bannerOptions.InitialSelected = 4;
+    } else if (config.position.position_broadcast_secs == 18000) {
+        bannerOptions.InitialSelected = 5;
+    } else if (config.position.position_broadcast_secs == 21600) {
+        bannerOptions.InitialSelected = 6;
+    } else if (config.position.position_broadcast_secs == 43200) {
+        bannerOptions.InitialSelected = 7;
+    } else if (config.position.position_broadcast_secs == 64800) {
+        bannerOptions.InitialSelected = 8;
+    } else if (config.position.position_broadcast_secs == 86400) {
+        bannerOptions.InitialSelected = 9;
+    } else if (config.position.position_broadcast_secs == 129600) {
+        bannerOptions.InitialSelected = 10;
+    } else if (config.position.position_broadcast_secs == 172800) {
+        bannerOptions.InitialSelected = 11;
+    } else if (config.position.position_broadcast_secs == 259200) {
+        bannerOptions.InitialSelected = 12;
+    } else {
+        bannerOptions.InitialSelected = 0;
+    }
+    screen->showOverlayBanner(bannerOptions);
+}
+
 #endif
 
 void menuHandler::BluetoothToggleMenu()
@@ -2126,6 +2344,15 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
     case gps_format_menu:
         GPSFormatMenu();
         break;
+    case gps_smart_position_menu:
+        GPSSmartPositionMenu();
+        break;
+    case gps_update_interval_menu:
+        GPSUpdateIntervalMenu();
+        break;
+    case gps_position_broadcast_menu:
+        GPSPositionBroadcastMenu();
+        break;
 #endif
     case compass_point_north_menu:
         compassNorthMenu();

src/graphics/draw/MenuHandler.h

@@ -22,6 +22,9 @@ class menuHandler
         node_base_menu,
         gps_toggle_menu,
         gps_format_menu,
+        gps_smart_position_menu,
+        gps_update_interval_menu,
+        gps_position_broadcast_menu,
         compass_point_north_menu,
         reset_node_db_menu,
         buzzermodemenupicker,
@@ -77,6 +80,9 @@ class menuHandler
     static void compassNorthMenu();
     static void GPSToggleMenu();
     static void GPSFormatMenu();
+    static void GPSSmartPositionMenu();
+    static void GPSUpdateIntervalMenu();
+    static void GPSPositionBroadcastMenu();
     static void BuzzerModeMenu();
     static void switchToMUIMenu();
     static void TFTColorPickerMenu(OLEDDisplay *display);

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,14 +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<std::string> nodeConfigLabels; // Persistent labels for Node Config pages
-    uint8_t selectedChannelIndex = 0;          // Currently selected LoRa channel (Node Config → Radio → Channel)
-    bool channelPositionEnabled = false;
-
-    // Recents menu checkbox state (derived from settings.recentlyActiveSeconds)
-    static constexpr uint8_t RECENTS_COUNT = 6;
-    bool recentsSelected[RECENTS_COUNT] = {};
+    std::vector<MenuItem> items; // MenuItems for the current page. Filled by ShowPage
 
     // 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);
-
-    bool showTutorialTips = (settings->tips.firstBoot || needsRegion);
+    // Decide which tips (if any) should be shown to user after the boot screen
 
     // Welcome screen
-    if (showTutorialTips)
+    if (settings->tips.firstBoot)
         tipQueue.push_back(Tip::WELCOME);
 
-    // Finish setup
-    if (needsRegion)
+    // Antenna, region, timezone
+    // 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
-    if (needsRegion)
-        tipQueue.push_back(Tip::PICK_REGION);
-
+    // Applet is foreground immediately at boot, but is obscured by LogoApplet, which is also foreground
+    // LogoApplet can be considered to have a higher Z-index, because it is placed before TipsApplet in the systemApplets vector
     if (!tipQueue.empty())
         bringToForeground();
 }
@@ -54,109 +51,81 @@ void InkHUD::TipsApplet::onRender()
 
     case Tip::FINISH_SETUP: {
         setFont(fontMedium);
-        const char *title = "Tip: Finish Setup";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
+        printAt(0, 0, "Tip: Finish Setup");
 
         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) {
-            uint16_t bh = getWrappedTextHeight(0, width(), text);
-            printWrapped(0, cursorY, width(), text);
-            cursorY += bh + (fontSmall.lineHeight() / 3);
-        };
+        cursorY += fontSmall.lineHeight() * 1.2;
+        printAt(0, cursorY, "- connect a client app");
 
-        drawBullet("- connect antenna");
-        drawBullet("- connect a client app");
+        // Only if region not set
+        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)
-            drawBullet("- set region");
+        // Only if tz not set
+        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))
-            drawBullet("- set timezone");
-
-        cursorY += fontSmall.lineHeight() / 2;
-        drawBullet("More info at meshtastic.org");
+        cursorY += fontSmall.lineHeight() * 1.5;
+        printAt(0, cursorY, "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);
-
-        const char *title = "Tip: Shutdown";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
+        printAt(0, 0, "Tip: Shutdown");
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
-
-        const char *body = "Before removing power, please shut down from InkHUD menu, or a client app.\n\n"
-                           "This ensures data is saved.";
-
-        uint16_t bodyH = getWrappedTextHeight(0, width(), body);
-        printWrapped(0, cursorY, width(), body);
-        cursorY += bodyH + (fontSmall.lineHeight() / 2);
+        std::string shutdown;
+        shutdown += "Before removing power, please shut down from InkHUD menu, or a client app. \n";
+        shutdown += "\n";
+        shutdown += "This ensures data is saved.";
+        printWrapped(0, fontMedium.lineHeight() * 1.5, width(), shutdown);
 
         printAt(0, Y(1.0), "Press button to continue", LEFT, BOTTOM);
+
     } break;
 
     case Tip::CUSTOMIZATION: {
         setFont(fontMedium);
-
-        const char *title = "Tip: Customization";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
+        printAt(0, 0, "Tip: Customization");
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
-
-        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);
+        printWrapped(0, fontMedium.lineHeight() * 1.5, width(),
+                     "Configure & control display with the InkHUD menu. Optional features, layout, rotation, and more.");
 
         printAt(0, Y(1.0), "Press button to continue", LEFT, BOTTOM);
     } break;
 
     case Tip::BUTTONS: {
         setFont(fontMedium);
-
-        const char *title = "Tip: Buttons";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
+        printAt(0, 0, "Tip: Buttons");
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
-
-        auto drawBullet = [&](const char *text) {
-            uint16_t bh = getWrappedTextHeight(0, width(), text);
-            printWrapped(0, cursorY, width(), text);
-            cursorY += bh + (fontSmall.lineHeight() / 3);
-        };
+        int16_t cursorY = fontMedium.lineHeight() * 1.5;
 
         if (!settings->joystick.enabled) {
-            drawBullet("User Button");
-            drawBullet("- short press: next");
-            drawBullet("- long press: select or open menu");
+            printAt(0, cursorY, "User Button");
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- short press: next");
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- long press: select / open menu");
         } else {
-            drawBullet("Joystick");
-            drawBullet("- press: open menu or select");
-            drawBullet("Exit Button");
-            drawBullet("- press: switch tile or close menu");
+            printAt(0, cursorY, "Joystick");
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- open menu / select");
+            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);
-
-        const char *title = "Tip: Rotation";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
+        printAt(0, 0, "Tip: Rotation");
 
         setFont(fontSmall);
         if (!settings->joystick.enabled) {
-            int16_t cursorY = h + fontSmall.lineHeight();
-
-            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);
+            printWrapped(0, fontMedium.lineHeight() * 1.5, width(),
+                         "To rotate the display, use the InkHUD menu. Long-press the user button > Options > Rotate.");
         } 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 logoHLimit = portrait ? Y(0.25) : Y(0.3);
+    uint16_t logoWLimit = X(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 onExitLong();  // Exit button: long press
-    void onNavUp();     // Navigate up
-    void onNavDown();   // Navigate down
-    void onNavLeft();   // Navigate left
-    void onNavRight();  // Navigate right
+    void onExitShort();   // Exit button: short press
+    void onExitLong();    // Exit button: long press
+    void onNavUp();       // Navigate up
+    void onNavDown();     // Navigate down
+    void onNavLeft();     // Navigate left
+    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/input/RotaryEncoderInterruptImpl1.cpp

@@ -27,7 +27,9 @@ bool RotaryEncoderInterruptImpl1::init()
                                      RotaryEncoderInterruptImpl1::handleIntA, RotaryEncoderInterruptImpl1::handleIntB,
                                      RotaryEncoderInterruptImpl1::handleIntPressed);
     inputBroker->registerSource(this);
+#ifndef HAS_PHYSICAL_KEYBOARD
     osk_found = true;
+#endif
     return true;
 }
 

src/input/TrackballInterruptBase.cpp

@@ -45,7 +45,9 @@ void TrackballInterruptBase::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinLef
 
     LOG_DEBUG("Trackball GPIO initialized - UP:%d DOWN:%d LEFT:%d RIGHT:%d PRESS:%d", this->_pinUp, this->_pinDown,
               this->_pinLeft, this->_pinRight, pinPress);
+#ifndef HAS_PHYSICAL_KEYBOARD
     osk_found = true;
+#endif
     this->setInterval(100);
 }
 

src/input/UpDownInterruptImpl1.cpp

@@ -29,7 +29,9 @@ bool UpDownInterruptImpl1::init()
                               eventDownLong, UpDownInterruptImpl1::handleIntDown, UpDownInterruptImpl1::handleIntUp,
                               UpDownInterruptImpl1::handleIntPressed);
     inputBroker->registerSource(this);
+#ifndef HAS_PHYSICAL_KEYBOARD
     osk_found = true;
+#endif
     return true;
 }
 

src/main.cpp

@@ -1465,8 +1465,10 @@ void setup()
 #endif
 
 #if defined(HAS_TRACKBALL) || (defined(INPUTDRIVER_ENCODER_TYPE) && INPUTDRIVER_ENCODER_TYPE == 2)
+#ifndef HAS_PHYSICAL_KEYBOARD
     osk_found = true;
 #endif
+#endif
 
 #if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WEBSERVER
     // Start web server thread.

src/modules/PositionModule.h

@@ -69,7 +69,7 @@ class PositionModule : public ProtobufModule<meshtastic_Position>, private concu
     // In event mode we want to prevent excessive position broadcasts
     // we set the minimum interval to 5m
     const uint32_t minimumTimeThreshold =
-        max(300000, Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30));
+        max(uint32_t(300000), Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30));
 #else
     const uint32_t minimumTimeThreshold =
         Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30);

variants/esp32s3/t-deck-pro/variant.h

@@ -100,3 +100,5 @@
 #define MODEM_DTR 8
 #define MODEM_RX 10
 #define MODEM_TX 11
+
+#define HAS_PHYSICAL_KEYBOARD 1

variants/esp32s3/t-deck/variant.h

@@ -23,6 +23,7 @@
 #define SCREEN_TRANSITION_FRAMERATE 5
 #define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness
 #define USE_TFTDISPLAY 1
+#define HAS_PHYSICAL_KEYBOARD 1
 
 #define HAS_TOUCHSCREEN 1
 #define SCREEN_TOUCH_INT 16

variants/esp32s3/tlora-pager/variant.h

@@ -21,6 +21,7 @@
 #define SCREEN_TRANSITION_FRAMERATE 5
 #define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness
 #define USE_TFTDISPLAY 1
+#define HAS_PHYSICAL_KEYBOARD 1
 
 #define I2C_SDA SDA
 #define I2C_SCL SCL