Merge branch 'develop' into kill-led-builtin

.github/workflows/main_matrix.yml

@@ -240,7 +240,6 @@ 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
@@ -254,24 +253,18 @@ jobs:
         uses: actions/upload-artifact@v6
         id: upload-manifest
         with:
-          name: manifests-${{ github.sha }}
+          name: manifests-all
           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.sha }}
+          head: ${{ github.head_ref }}
       - name: Download the old manifests
-        if: github.event_name == 'pull_request_target'
-        run: gh run download -R "$repo" --name "manifests-$merge_base" --dir manifest-old/
-        env:
-          GH_TOKEN: ${{ github.token }}
-          merge_base: ${{ env.MERGE_BASE }}
-          repo: ${{ github.repository }}
+        run: gh run download -R ${{ github.repository }} --commit ${{ env.MERGE_BASE }} --name manifests-all --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:

.gitignore

@@ -41,12 +41,3 @@ src/mesh/raspihttp/private_key.pem
 
 # Ignore logo (set at build time with platformio-custom.py)
 data/boot/logo.*
-
-# pioarduino platform
-managed_components/*
-arduino-lib-builder*
-dependencies.lock
-idf_component.yml
-CMakeLists.txt
-sdkconfig.*
-.dummy/*

.trunk/trunk.yaml

@@ -9,9 +9,9 @@ plugins:
 lint:
   enabled:
     - checkov@3.2.495
-    - renovate@42.66.8
+    - renovate@42.64.1
     - prettier@3.7.4
-    - trufflehog@3.92.4
+    - trufflehog@3.92.3
     - yamllint@1.37.1
     - bandit@1.9.2
     - trivy@0.68.2

bin/build-nrf52.sh

@@ -21,14 +21,13 @@ rm -f $BUILDDIR/firmware*
 export APP_VERSION=$VERSION
 
 basename=firmware-$1-$VERSION
-ota_basename=${basename}-ota
 
 pio run --environment $1 -t mtjson # -v
 
 cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
 
 echo "Copying NRF52 dfu (OTA) file"
-cp $BUILDDIR/$basename.zip $OUTDIR/$ota_basename.zip
+cp $BUILDDIR/$basename.zip $OUTDIR/$basename.zip
 
 echo "Copying NRF52 UF2 file"
 cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,6 +87,9 @@
   </screenshots>
 
   <releases>
+    <release version="2.7.18" date="2025-12-20">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.18</url>
+    </release>
     <release version="2.7.17" date="2025-11-28">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.17</url>
     </release>

bin/platformio-custom.py

@@ -17,8 +17,6 @@ lfsbin = f"{progname.replace('firmware-', 'littlefs-')}.bin"
 
 def manifest_gather(source, target, env):
     out = []
-    board_platform = env.BoardConfig().get("platform")
-    needs_ota_suffix = board_platform == "nordicnrf52"
     check_paths = [
         progname,
         f"{progname}.elf",
@@ -34,11 +32,8 @@ def manifest_gather(source, target, env):
     for p in check_paths:
         f = env.File(env.subst(f"$BUILD_DIR/{p}"))
         if f.exists():
-            manifest_name = p
-            if needs_ota_suffix and p == f"{progname}.zip":
-                manifest_name = f"{progname}-ota.zip"
             d = {
-                "name": manifest_name,
+                "name": p,
                 "md5": f.get_content_hash(), # Returns MD5 hash
                 "bytes": f.get_size() # Returns file size in bytes
             }

debian/changelog

@@ -1,3 +1,9 @@
+meshtasticd (2.7.18.0) unstable; urgency=medium
+
+  * Version 2.7.18
+
+ -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Sat, 20 Dec 2025 15:47:25 +0000
+
 meshtasticd (2.7.17.0) unstable; urgency=medium
 
   * Version 2.7.17

platformio.ini

@@ -55,6 +55,7 @@ build_flags = -Wno-missing-field-initializers
 	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
 	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
 	-D MAX_THREADS=40 ; As we've split modules, we have more threads to manage
+	-DLED_BUILTIN=-1
 	#-DBUILD_EPOCH=$UNIX_TIME ; set in platformio-custom.py now
 	#-D OLED_PL=1
 	#-D DEBUG_HEAP=1 ; uncomment to add free heap space / memory leak debugging logs
@@ -64,7 +65,7 @@ monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master
-	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/b34c6817c25d6faabb3a8a162b5d14fb75395433.zip
+	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/2887bf4a19f64d92c984dcc8fd5ca7429e425e4a.zip
 	# renovate: datasource=git-refs depName=meshtastic-OneButton packageName=https://github.com/meshtastic/OneButton gitBranch=master
 	https://github.com/meshtastic/OneButton/archive/fa352d668c53f290cfa480a5f79ad422cd828c70.zip
 	# renovate: datasource=git-refs depName=meshtastic-arduino-fsm packageName=https://github.com/meshtastic/arduino-fsm gitBranch=master

src/graphics/SharedUIDisplay.cpp

@@ -325,7 +325,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *ti
                 int iconX = iconRightEdge - mute_symbol_width;
                 int iconY = textY + (FONT_HEIGHT_SMALL - mail_height) / 2;
 
-                if (isInverted && !force_no_invert) {
+                if (isInverted) {
                     display->setColor(WHITE);
                     display->fillRect(iconX - 1, iconY - 1, mute_symbol_width + 2, mute_symbol_height + 2);
                     display->setColor(BLACK);
@@ -470,49 +470,18 @@ bool isAllowedPunctuation(char c)
     return allowed.find(c) != std::string::npos;
 }
 
-static void replaceAll(std::string &s, const std::string &from, const std::string &to)
-{
-    if (from.empty())
-        return;
-    size_t pos = 0;
-    while ((pos = s.find(from, pos)) != std::string::npos) {
-        s.replace(pos, from.size(), to);
-        pos += to.size();
-    }
-}
-
 std::string sanitizeString(const std::string &input)
 {
     std::string output;
     bool inReplacement = false;
 
-    // Make a mutable copy so we can normalize UTF-8 “smart punctuation” into ASCII first.
-    std::string s = input;
-
-    // Curly single quotes: ‘ ’
-    replaceAll(s, "\xE2\x80\x98", "'"); // U+2018
-    replaceAll(s, "\xE2\x80\x99", "'"); // U+2019
-
-    // Curly double quotes: “ ”
-    replaceAll(s, "\xE2\x80\x9C", "\""); // U+201C
-    replaceAll(s, "\xE2\x80\x9D", "\""); // U+201D
-
-    // En dash / Em dash: – —
-    replaceAll(s, "\xE2\x80\x93", "-"); // U+2013
-    replaceAll(s, "\xE2\x80\x94", "-"); // U+2014
-
-    // Non-breaking space
-    replaceAll(s, "\xC2\xA0", " "); // U+00A0
-
-    // Now do your original sanitize pass over the normalized string.
-    for (unsigned char uc : s) {
-        char c = static_cast<char>(uc);
-        if (std::isalnum(uc) || isAllowedPunctuation(c)) {
+    for (char c : input) {
+        if (std::isalnum(static_cast<unsigned char>(c)) || isAllowedPunctuation(c)) {
             output += c;
             inReplacement = false;
         } else {
             if (!inReplacement) {
-                output += static_cast<char>(0xBF); // ISO-8859-1 for inverted question mark
+                output += 0xbf; // ISO-8859-1 for inverted question mark
                 inReplacement = true;
             }
         }

src/graphics/draw/MenuHandler.cpp

@@ -20,8 +20,8 @@
 #include "mesh/MeshTypes.h"
 #include "modules/AdminModule.h"
 #include "modules/CannedMessageModule.h"
-#include "modules/ExternalNotificationModule.h"
 #include "modules/KeyVerificationModule.h"
+
 #include "modules/TraceRouteModule.h"
 #include <algorithm>
 #include <array>
@@ -843,20 +843,12 @@ void menuHandler::messageViewModeMenu()
 
 void menuHandler::homeBaseMenu()
 {
-    enum optionsNumbers { Back, Mute, Backlight, Position, Preset, Freetext, Sleep, enumEnd };
+    enum optionsNumbers { Back, Backlight, Position, Preset, Freetext, Sleep, enumEnd };
 
     static const char *optionsArray[enumEnd] = {"Back"};
     static int optionsEnumArray[enumEnd] = {Back};
     int options = 1;
 
-    if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DISABLED) {
-        if (!isMuted) {
-            optionsArray[options] = "Temporarily Mute";
-        } else {
-            optionsArray[options] = "Unmute";
-        }
-        optionsEnumArray[options++] = Mute;
-    }
 #if defined(PIN_EINK_EN) || defined(PCA_PIN_EINK_EN)
     optionsArray[options] = "Toggle Backlight";
     optionsEnumArray[options++] = Backlight;
@@ -880,14 +872,7 @@ void menuHandler::homeBaseMenu()
     bannerOptions.optionsEnumPtr = optionsEnumArray;
     bannerOptions.optionsCount = options;
     bannerOptions.bannerCallback = [](int selected) -> void {
-        if (selected == Mute) {
-            if (moduleConfig.external_notification.enabled && externalNotificationModule) {
-                bool isMuted = externalNotificationModule->getMute();
-                externalNotificationModule->setMute(!isMuted);
-                IF_SCREEN(graphics::isMuted = !isMuted; if (!isMuted) externalNotificationModule->stopNow();)
-            }
-        } else if (selected == Backlight) {
-            screen->setOn(false);
+        if (selected == Backlight) {
 #if defined(PIN_EINK_EN)
             if (uiconfig.screen_brightness == 1) {
                 uiconfig.screen_brightness = 0;
@@ -964,7 +949,6 @@ void menuHandler::systemBaseMenu()
 
     optionsArray[options] = "Notifications";
     optionsEnumArray[options++] = Notifications;
-
     optionsArray[options] = "Display Options";
     optionsEnumArray[options++] = ScreenOptions;
 
@@ -1001,7 +985,7 @@ void menuHandler::systemBaseMenu()
     bannerOptions.optionsEnumPtr = optionsEnumArray;
     bannerOptions.bannerCallback = [](int selected) -> void {
         if (selected == Notifications) {
-            menuHandler::menuQueue = menuHandler::buzzermodemenupicker;
+            menuHandler::menuQueue = menuHandler::notifications_menu;
             screen->runNow();
         } else if (selected == ScreenOptions) {
             menuHandler::menuQueue = menuHandler::screen_options_menu;
@@ -1108,23 +1092,11 @@ void menuHandler::favoriteBaseMenu()
 
 void menuHandler::positionBaseMenu()
 {
-    enum optionsNumbers {
-        Back,
-        GPSToggle,
-        GPSFormat,
-        CompassMenu,
-        CompassCalibrate,
-        GPSSmartPosition,
-        GPSUpdateInterval,
-        GPSPositionBroadcast,
-        enumEnd
-    };
+    enum optionsNumbers { Back, GPSToggle, GPSFormat, CompassMenu, CompassCalibrate, enumEnd };
 
-    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;
+    static const char *optionsArray[enumEnd] = {"Back", "GPS Toggle", "GPS Format", "Compass"};
+    static int optionsEnumArray[enumEnd] = {Back, GPSToggle, GPSFormat, CompassMenu};
+    int options = 4;
 
     if (accelerometerThread) {
         optionsArray[options] = "Compass Calibrate";
@@ -1132,7 +1104,7 @@ void menuHandler::positionBaseMenu()
     }
 
     BannerOverlayOptions bannerOptions;
-    bannerOptions.message = "GPS Action";
+    bannerOptions.message = "Position Action";
     bannerOptions.optionsArrayPtr = optionsArray;
     bannerOptions.optionsEnumPtr = optionsEnumArray;
     bannerOptions.optionsCount = options;
@@ -1148,15 +1120,6 @@ 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);
@@ -1383,217 +1346,6 @@ 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 == 8) {
-        bannerOptions.InitialSelected = 1;
-    } else if (config.position.gps_update_interval == 20) {
-        bannerOptions.InitialSelected = 2;
-    } else if (config.position.gps_update_interval == 40) {
-        bannerOptions.InitialSelected = 3;
-    } else if (config.position.gps_update_interval == 60) {
-        bannerOptions.InitialSelected = 4;
-    } else if (config.position.gps_update_interval == 80) {
-        bannerOptions.InitialSelected = 5;
-    } else if (config.position.gps_update_interval == 120) {
-        bannerOptions.InitialSelected = 6;
-    } else if (config.position.gps_update_interval == 300) {
-        bannerOptions.InitialSelected = 7;
-    } else if (config.position.gps_update_interval == 600) {
-        bannerOptions.InitialSelected = 8;
-    } else if (config.position.gps_update_interval == 900) {
-        bannerOptions.InitialSelected = 9;
-    } else if (config.position.gps_update_interval == 1800) {
-        bannerOptions.InitialSelected = 10;
-    } else if (config.position.gps_update_interval == 3600) {
-        bannerOptions.InitialSelected = 11;
-    } else if (config.position.gps_update_interval == 21600) {
-        bannerOptions.InitialSelected = 12;
-    } else if (config.position.gps_update_interval == 43200) {
-        bannerOptions.InitialSelected = 13;
-    } else if (config.position.gps_update_interval == 86400) {
-        bannerOptions.InitialSelected = 14;
-    } else if (config.position.gps_update_interval == 2147483647) { // At Boot Only
-        bannerOptions.InitialSelected = 15;
-    } 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 == 60) {
-        bannerOptions.InitialSelected = 1;
-    } else if (config.position.position_broadcast_secs == 90) {
-        bannerOptions.InitialSelected = 2;
-    } else if (config.position.position_broadcast_secs == 300) {
-        bannerOptions.InitialSelected = 3;
-    } else if (config.position.position_broadcast_secs == 900) {
-        bannerOptions.InitialSelected = 4;
-    } else if (config.position.position_broadcast_secs == 3600) {
-        bannerOptions.InitialSelected = 5;
-    } else if (config.position.position_broadcast_secs == 7200) {
-        bannerOptions.InitialSelected = 6;
-    } else if (config.position.position_broadcast_secs == 10800) {
-        bannerOptions.InitialSelected = 7;
-    } else if (config.position.position_broadcast_secs == 14400) {
-        bannerOptions.InitialSelected = 8;
-    } else if (config.position.position_broadcast_secs == 18000) {
-        bannerOptions.InitialSelected = 9;
-    } else if (config.position.position_broadcast_secs == 21600) {
-        bannerOptions.InitialSelected = 10;
-    } else if (config.position.position_broadcast_secs == 43200) {
-        bannerOptions.InitialSelected = 11;
-    } else if (config.position.position_broadcast_secs == 64800) {
-        bannerOptions.InitialSelected = 12;
-    } else if (config.position.position_broadcast_secs == 86400) {
-        bannerOptions.InitialSelected = 13;
-    } else if (config.position.position_broadcast_secs == 129600) {
-        bannerOptions.InitialSelected = 14;
-    } else if (config.position.position_broadcast_secs == 172800) {
-        bannerOptions.InitialSelected = 15;
-    } else if (config.position.position_broadcast_secs == 259200) {
-        bannerOptions.InitialSelected = 16;
-    } else {
-        bannerOptions.InitialSelected = 0;
-    }
-    screen->showOverlayBanner(bannerOptions);
-}
-
 #endif
 
 void menuHandler::BluetoothToggleMenu()
@@ -1620,9 +1372,9 @@ void menuHandler::BluetoothToggleMenu()
 
 void menuHandler::BuzzerModeMenu()
 {
-    static const char *optionsArray[] = {"All Enabled", "All Disabled", "Notifications", "System Only", "DMs Only"};
+    static const char *optionsArray[] = {"All Enabled", "Disabled", "Notifications", "System Only", "DMs Only"};
     BannerOverlayOptions bannerOptions;
-    bannerOptions.message = "Notification Sounds";
+    bannerOptions.message = "Buzzer Mode";
     bannerOptions.optionsArrayPtr = optionsArray;
     bannerOptions.optionsCount = 5;
     bannerOptions.bannerCallback = [](int selected) -> void {
@@ -1997,6 +1749,30 @@ void menuHandler::wifiToggleMenu()
     screen->showOverlayBanner(bannerOptions);
 }
 
+void menuHandler::notificationsMenu()
+{
+    enum optionsNumbers { Back, BuzzerActions };
+    static const char *optionsArray[] = {"Back", "Buzzer Actions"};
+    static int optionsEnumArray[] = {Back, BuzzerActions};
+    int options = 2;
+
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Notifications";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = options;
+    bannerOptions.optionsEnumPtr = optionsEnumArray;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == BuzzerActions) {
+            menuHandler::menuQueue = menuHandler::buzzermodemenupicker;
+            screen->runNow();
+        } else {
+            menuQueue = system_base_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
 void menuHandler::screenOptionsMenu()
 {
     // Check if brightness is supported
@@ -2350,15 +2126,6 @@ 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();
@@ -2414,6 +2181,9 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
     case bluetooth_toggle_menu:
         BluetoothToggleMenu();
         break;
+    case notifications_menu:
+        notificationsMenu();
+        break;
     case screen_options_menu:
         screenOptionsMenu();
         break;

src/graphics/draw/MenuHandler.h

@@ -22,9 +22,6 @@ 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,
@@ -39,6 +36,7 @@ class menuHandler
         number_test,
         wifi_toggle_menu,
         bluetooth_toggle_menu,
+        notifications_menu,
         screen_options_menu,
         power_menu,
         system_base_menu,
@@ -79,9 +77,6 @@ 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);
@@ -97,6 +92,7 @@ class menuHandler
     static void numberTest();
     static void wifiBaseMenu();
     static void wifiToggleMenu();
+    static void notificationsMenu();
     static void screenOptionsMenu();
     static void powerMenu();
     static void nodeNameLengthMenu();

src/main.cpp

@@ -1186,6 +1186,11 @@ void setup()
 #endif
 #endif
 
+#ifdef PIN_PWR_DELAY_MS
+    // This may be required to give the peripherals time to power up.
+    delay(PIN_PWR_DELAY_MS);
+#endif
+
 #ifdef ARCH_PORTDUINO
     // as one can't use a function pointer to the class constructor:
     auto loraModuleInterface = [](LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,

src/mesh/MeshService.cpp

@@ -195,13 +195,15 @@ void MeshService::handleToRadio(meshtastic_MeshPacket &p)
 
     p.rx_time = getValidTime(RTCQualityFromNet); // Record the time the packet arrived from the phone
 
-    IF_SCREEN(if (p.decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP && p.decoded.payload.size > 0 &&
-                  p.to != NODENUM_BROADCAST && p.to != 0) // DM only
-              {
-                  perhapsDecode(&p);
-                  const StoredMessage &sm = messageStore.addFromPacket(p);
-                  graphics::MessageRenderer::handleNewMessage(nullptr, sm, p); // notify UI
-              })
+#if HAS_SCREEN
+    if (p.decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP && p.decoded.payload.size > 0 && p.to != NODENUM_BROADCAST &&
+        p.to != 0) // DM only
+    {
+        perhapsDecode(&p);
+        const StoredMessage &sm = messageStore.addFromPacket(p);
+        graphics::MessageRenderer::handleNewMessage(nullptr, sm, p); // notify UI
+    }
+#endif
     // Send the packet into the mesh
     DEBUG_HEAP_BEFORE;
     auto a = packetPool.allocCopy(p);

src/mesh/NodeDB.cpp

@@ -805,8 +805,7 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.output_ms = 500;
     moduleConfig.external_notification.nag_timeout = 2;
 #endif
-#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) || defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3) ||          \
-    defined(ELECROW_ThinkNode_M6)
+#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) || defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3)
     // Default to PIN_LED2 for external notification output (LED color depends on device variant)
     moduleConfig.external_notification.enabled = true;
     moduleConfig.external_notification.output = PIN_LED2;

src/modules/PositionModule.cpp

@@ -429,9 +429,7 @@ int32_t PositionModule::runOnce()
 
     if (lastGpsSend == 0 || msSinceLastSend >= intervalMs) {
         if (waitingForFreshPosition) {
-#ifdef GPS_DEBUG
             LOG_DEBUG("Skip initial position send; no fresh position since boot");
-#endif
         } else if (nodeDB->hasValidPosition(node)) {
             lastGpsSend = now;
 

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(uint32_t(300000), Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30));
+        max(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);

src/modules/StatusLEDModule.cpp

@@ -20,7 +20,7 @@ int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
     switch (arg->getStatusType()) {
     case STATUS_TYPE_POWER: {
         meshtastic::PowerStatus *powerStatus = (meshtastic::PowerStatus *)arg;
-        if (powerStatus->getHasUSB() || powerStatus->getIsCharging()) {
+        if (powerStatus->getHasUSB()) {
             power_state = charging;
             if (powerStatus->getBatteryChargePercent() >= 100) {
                 power_state = charged;

src/modules/TextMessageModule.cpp

@@ -21,17 +21,18 @@ ProcessMessage TextMessageModule::handleReceived(const meshtastic_MeshPacket &mp
     // We only store/display messages destined for us.
     devicestate.rx_text_message = mp;
     devicestate.has_rx_text_message = true;
-    IF_SCREEN(
-        // Guard against running in MeshtasticUI or with no screen
-        if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
-            // Store in the central message history
-            const StoredMessage &sm = messageStore.addFromPacket(mp);
+#if HAS_SCREEN
+    // Guard against running in MeshtasticUI
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
+        // Store in the central message history
+        const StoredMessage &sm = messageStore.addFromPacket(mp);
 
-            // Pass message to renderer (banner + thread switching + scroll reset)
-            // Use the global Screen singleton to retrieve the current OLED display
-            auto *display = screen ? screen->getDisplayDevice() : nullptr;
-            graphics::MessageRenderer::handleNewMessage(display, sm, mp);
-        })
+        // Pass message to renderer (banner + thread switching + scroll reset)
+        // Use the global Screen singleton to retrieve the current OLED display
+        auto *display = screen ? screen->getDisplayDevice() : nullptr;
+        graphics::MessageRenderer::handleNewMessage(display, sm, mp);
+    }
+#endif
     // Only trigger screen wake if configuration allows it
     if (shouldWakeOnReceivedMessage()) {
         powerFSM.trigger(EVENT_RECEIVED_MSG);

src/platform/portduino/PortduinoGlue.cpp

@@ -279,7 +279,7 @@ void portduinoSetup()
         //      RAK6421-13300-S1:aabbcc123456:5ba85807d92138b7519cfb60460573af:3061e8d8
         // <model string>:mac address :<16 random unique bytes in hexidecimal> : crc32
         // crc32 is calculated on the eeprom string up to but not including the final colon
-        if (strlen(autoconf_product) < 6 && portduino_config.i2cdev != "") {
+        if (strlen(autoconf_product) < 6) {
             try {
                 char *mac_start = nullptr;
                 char *devID_start = nullptr;
@@ -869,4 +869,4 @@ void readGPIOFromYaml(YAML::Node sourceNode, pinMapping &destPin, int pinDefault
         destPin.line = destPin.pin;
         destPin.gpiochip = portduino_config.lora_default_gpiochip;
     }
-}
+}

variants/esp32/rak11200/pins_arduino.h

@@ -6,8 +6,6 @@
 #define LED_GREEN 12
 #define LED_BLUE 2
 
-#define LED_BUILTIN LED_GREEN
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 

variants/esp32/rak11200/variant.h

@@ -6,8 +6,6 @@
 #define LED_GREEN 12
 #define LED_BLUE 2
 
-#define LED_BUILTIN LED_GREEN
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 

variants/esp32/tbeam/platformio.ini

@@ -9,6 +9,7 @@ build_flags = ${esp32_base.build_flags}
   -I variants/esp32/tbeam
   -DBOARD_HAS_PSRAM
   -mfix-esp32-psram-cache-issue
+  -ULED_BUILTIN
 upload_speed = 921600
 
 [env:tbeam-displayshield]

variants/esp32c6/tlora_c6/platformio.ini

@@ -8,3 +8,4 @@ build_flags =
   -I variants/esp32c6/tlora_c6
   -DARDUINO_USB_CDC_ON_BOOT=1
   -DARDUINO_USB_MODE=1
+  -ULED_BUILTIN

variants/esp32s3/heltec_v3/platformio.ini

@@ -8,3 +8,4 @@ build_flags =
   ${esp32s3_base.build_flags}
   -D HELTEC_V3
   -I variants/esp32s3/heltec_v3
+  -ULED_BUILTIN

variants/esp32s3/heltec_v4/pins_arduino.h

@@ -6,10 +6,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-static const uint8_t LED_BUILTIN = 35;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/heltec_vision_master_e213/pins_arduino.h

@@ -3,10 +3,6 @@
 
 #include <stdint.h>
 
-static const uint8_t LED_BUILTIN = 45; // LED is not populated on earliest board variant
-#define BUILTIN_LED LED_BUILTIN        // Backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/heltec_vision_master_e290/pins_arduino.h

@@ -3,10 +3,6 @@
 
 #include <stdint.h>
 
-static const uint8_t LED_BUILTIN = 45; // LED is not populated on earliest board variant
-#define BUILTIN_LED LED_BUILTIN        // Backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/heltec_vision_master_t190/pins_arduino.h

@@ -3,10 +3,6 @@
 
 #include <stdint.h>
 
-static const uint8_t LED_BUILTIN = 35;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/heltec_wireless_paper/pins_arduino.h

@@ -3,10 +3,6 @@
 
 #include <stdint.h>
 
-static const uint8_t LED_BUILTIN = 18;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/heltec_wireless_paper_v1/pins_arduino.h

@@ -3,10 +3,6 @@
 
 #include <stdint.h>
 
-static const uint8_t LED_BUILTIN = 18;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t KEY_BUILTIN = 0;
 
 static const uint8_t TX = 43;

variants/esp32s3/heltec_wireless_tracker/pins_arduino.h

@@ -11,10 +11,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-static const uint8_t LED_BUILTIN = 18;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/heltec_wireless_tracker_V1_0/pins_arduino.h

@@ -11,10 +11,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-static const uint8_t LED_BUILTIN = 18;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/heltec_wireless_tracker_v2/pins_arduino.h

@@ -10,10 +10,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-static const uint8_t LED_BUILTIN = 18;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/m5stack_cores3/pins_arduino.h

@@ -10,10 +10,7 @@
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
 // and change this setup for the chosen pin (for example 38)
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 48;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BUILTIN SOC_GPIO_PIN_COUNT + 48
 #define RGB_BRIGHTNESS 64
 
 static const uint8_t TX = 43;

variants/esp32s3/mesh-tab/pins_arduino.h

@@ -49,10 +49,6 @@ static const uint8_t T14 = 14;
 static const uint8_t VBAT_SENSE = 2;
 static const uint8_t VBUS_SENSE = 34;
 
-// User LED
-#define LED_BUILTIN 13
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-
 static const uint8_t RGB_DATA = 40;
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
 #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT)

variants/esp32s3/rak3312/pins_arduino.h

@@ -22,7 +22,4 @@ static const uint8_t SCK = 13;
 #define SPI_MISO (10)
 #define SPI_CS (12)
 
-// LEDs
-#define LED_BUILTIN LED_GREEN
-
 #endif /* Pins_Arduino_h */

variants/esp32s3/rak_wismesh_tap_v2/pins_arduino.h

@@ -22,7 +22,4 @@ static const uint8_t SCK = 13;
 #define SPI_MISO (10)
 #define SPI_CS (12)
 
-// LEDs
-#define LED_BUILTIN LED_GREEN
-
 #endif /* Pins_Arduino_h */

variants/esp32s3/seeed-sensecap-indicator/pins_arduino.h

@@ -3,8 +3,6 @@
 
 #include <stdint.h>
 
-// static const uint8_t LED_BUILTIN = -1;
-
 // static const uint8_t TX = 43;
 // static const uint8_t RX = 44;
 

variants/esp32s3/t-deck/pins_arduino.h

@@ -6,8 +6,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-// static const uint8_t LED_BUILTIN = -1;
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/t-watch-s3/pins_arduino.h

@@ -3,8 +3,6 @@
 
 #include <stdint.h>
 
-// static const uint8_t LED_BUILTIN = -1;
-
 // static const uint8_t TX = 43;
 // static const uint8_t RX = 44;
 

variants/esp32s3/tracksenger/internal/pins_arduino.h

@@ -11,10 +11,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-static const uint8_t LED_BUILTIN = 18;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/tracksenger/lcd/pins_arduino.h

@@ -11,10 +11,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-static const uint8_t LED_BUILTIN = 18;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/tracksenger/oled/pins_arduino.h

@@ -11,10 +11,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-static const uint8_t LED_BUILTIN = 18;
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/esp32s3/unphone/pins_arduino.h

@@ -6,9 +6,6 @@
 #define USB_VID 0x16D0
 #define USB_PID 0x1178
 
-#define LED_BUILTIN 13
-#define BUILTIN_LED LED_BUILTIN // backward compatibility
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 

variants/nrf52840/Dongle_nRF52840-pca10059-v1/variant.h

@@ -50,7 +50,6 @@ extern "C" {
 #define RGBLED_BLUE (0 + 12)  // Blue of RGB   P0.12
 #define RGBLED_CA             // comment out this line if you have a common cathode type, as defined use common anode logic
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/ELECROW-ThinkNode-M1/variant.h

@@ -55,7 +55,6 @@ extern "C" {
 #define LED_RED PIN_LED3
 #define LED_BLUE PIN_LED1
 #define LED_GREEN PIN_LED2
-#define LED_BUILTIN LED_BLUE
 #define LED_CONN PIN_GREEN
 #define LED_STATE_ON 0 // State when LED is lit  // LED灯亮时的状态
 #define PIN_BUZZER (0 + 6)

variants/nrf52840/ELECROW-ThinkNode-M3/platformio.ini

@@ -15,5 +15,5 @@ lib_deps =
   ${nrf52840_base.lib_deps}
   # renovate: datasource=custom.pio depName=nRF52_PWM packageName=khoih-prog/library/nRF52_PWM
   khoih-prog/nRF52_PWM@1.0.1
-  ; # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
-  ; lewisxhe/SensorLib@0.3.3
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
+  lewisxhe/PCF8563_Library@1.0.1

variants/nrf52840/ELECROW-ThinkNode-M3/variant.h

@@ -58,7 +58,6 @@ extern "C" {
 #define LED_BLUE 37
 #define LED_PAIRING LED_BLUE // Signals the Status LED Module to handle this LED
 
-#define LED_BUILTIN -1
 #define LED_STATE_ON LOW
 #define LED_STATE_OFF HIGH
 
@@ -114,8 +113,7 @@ extern "C" {
 #define LR11X0_DIO_AS_RF_SWITCH
 
 // PCF8563 RTC Module
-// REVISIT https://github.com/meshtastic/firmware/pull/9084
-// #define PCF8563_RTC 0x51
+#define PCF8563_RTC 0x51
 
 #ifdef __cplusplus
 }

variants/nrf52840/ELECROW-ThinkNode-M6/platformio.ini

@@ -12,5 +12,5 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ELECROW-ThinkNode-M6>
 lib_deps =
   ${nrf52840_base.lib_deps}
-  ; # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
-  ; lewisxhe/SensorLib@0.3.3
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
+  lewisxhe/PCF8563_Library@1.0.1

variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp

@@ -41,30 +41,3 @@ void initVariant()
     pinMode(VDD_FLASH_EN, OUTPUT);
     digitalWrite(VDD_FLASH_EN, HIGH);
 }
-
-// called from main-nrf52.cpp during the cpuDeepSleep() function
-void variant_shutdown()
-{
-    // This sets the pin to OUTPUT and LOW for the pins *not* in the if block.
-    for (int pin = 0; pin < 48; pin++) {
-        if (pin == PIN_GPS_EN || pin == ADC_CTRL || pin == PIN_BUTTON1 || pin == PIN_SPI_MISO || pin == PIN_SPI_MOSI ||
-            pin == PIN_SPI_SCK) {
-            continue;
-        }
-        pinMode(pin, OUTPUT);
-        digitalWrite(pin, LOW);
-        if (pin >= 32) {
-            NRF_P1->DIRCLR = (1 << (pin - 32));
-        } else {
-            NRF_GPIO->DIRCLR = (1 << pin);
-        }
-    }
-
-    digitalWrite(PIN_GPS_EN, LOW);
-    digitalWrite(ADC_CTRL, LOW);
-    // digitalWrite(RTC_POWER, LOW);
-
-    nrf_gpio_cfg_input(PIN_BUTTON1, NRF_GPIO_PIN_PULLUP); // Configure the pin to be woken up as an input
-    nrf_gpio_pin_sense_t sense1 = NRF_GPIO_PIN_SENSE_LOW;
-    nrf_gpio_cfg_sense_set(PIN_BUTTON1, sense1);
-}

variants/nrf52840/ELECROW-ThinkNode-M6/variant.h

@@ -40,14 +40,11 @@ extern "C" {
 #define NUM_ANALOG_OUTPUTS (0)
 
 // LEDs
-#define LED_BUILTIN -1
 #define LED_BLUE -1
 #define LED_CHARGE (12)
 #define LED_PAIRING (7)
-#define PIN_LED2 LED_PAIRING
 
-#define LED_STATE_ON HIGH
-#define LED_STATE_OFF LOW
+#define LED_STATE_ON 1
 
 // USB power detection
 #define EXT_PWR_DETECT (13)
@@ -121,8 +118,7 @@ static const uint8_t A0 = PIN_A0;
 #define PIN_SERIAL2_TX (24)
 
 // PCF8563 RTC Module
-// REVISIT https://github.com/meshtastic/firmware/pull/9084
-// #define PCF8563_RTC 0x51
+#define PCF8563_RTC 0x51
 
 // SPI
 #define SPI_INTERFACES_COUNT 1

variants/nrf52840/ME25LS01-4Y10TD/variant.h

@@ -51,7 +51,6 @@ extern "C" {
 #define PIN_LED1 (32 + 7) // P1.07 Blue D2
 
 #define LED_PIN PIN_LED1
-#define LED_BUILTIN -1
 
 #define LED_BLUE -1
 #define LED_STATE_ON 1 // State when LED is lit

variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.h

@@ -51,7 +51,6 @@ extern "C" {
 #define PIN_LED1 (32 + 7) // P1.07 Blue D2
 
 #define LED_PIN PIN_LED1
-#define LED_BUILTIN -1
 
 #define LED_BLUE -1
 #define LED_STATE_ON 1 // State when LED is lit

variants/nrf52840/MS24SF1/variant.h

@@ -51,7 +51,6 @@ extern "C" {
 #define PIN_LED1 (-1)
 
 #define LED_PIN PIN_LED1
-#define LED_BUILTIN -1
 
 #define LED_BLUE -1
 #define LED_STATE_ON 1 // State when LED is lit

variants/nrf52840/MakePython_nRF52840_eink/variant.h

@@ -29,7 +29,6 @@ extern "C" {
 #define PIN_LED1 (32 + 10) // LED        P1.15
 #define PIN_LED2 (-1)      //
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/MakePython_nRF52840_oled/variant.h

@@ -29,7 +29,6 @@ extern "C" {
 #define PIN_LED1 (32 + 10) // LED        P1.15
 #define PIN_LED2 (-1)      //
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/TWC_mesh_v4/variant.h

@@ -34,7 +34,6 @@ extern "C" {
 // #define PIN_LED1 (32 + 9) Green
 // #define PIN_LED1 (0 + 12) Blue
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/canaryone/variant.h

@@ -52,7 +52,6 @@ extern "C" {
 
 #define LED_BLUE PIN_LED1
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED3
 
 #define LED_STATE_ON 0 // State when LED is lit
@@ -103,7 +102,7 @@ static const uint8_t A0 = PIN_A0;
 #define EXTERNAL_FLASH_USE_QSPI
 
 // Add a delay on startup to allow LoRa and GPS to power up
-#define PERIPHERAL_WARMUP_MS 100
+#define PIN_PWR_DELAY_MS 100
 
 /*
  * Lora radio
@@ -178,4 +177,4 @@ static const uint8_t A0 = PIN_A0;
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
 
-#endif
+#endif

variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h

@@ -81,7 +81,6 @@ NRF52 PRO MICRO PIN ASSIGNMENT
 
 // LED
 #define PIN_LED1 (0 + 15) // P0.15
-#define LED_BUILTIN PIN_LED1
 // Actually red
 #define LED_BLUE PIN_LED1
 #define LED_STATE_ON 1 // State when LED is lit

variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h

@@ -38,7 +38,6 @@ extern "C" {
 #define PIN_LED PIN_LED1
 #define LED_PWR (PINS_COUNT)
 
-#define LED_BUILTIN PIN_LED
 #define LED_STATE_ON 1 // State when LED is lit
 
 // XIAO Wio-SX1262 Shield User button

variants/nrf52840/feather_diy/variant.h

@@ -49,8 +49,6 @@ extern "C" {
 #define PIN_LED1 (32 + 15) // P1.15 3
 #define PIN_LED2 (32 + 10) // P1.10 4
 
-#define LED_BUILTIN PIN_LED1
-
 #define LED_GREEN PIN_LED2 // Actually red
 #define LED_BLUE PIN_LED1
 

variants/nrf52840/gat562_mesh_trial_tracker/variant.h

@@ -48,7 +48,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/heltec_mesh_node_t114-inkhud/variant.h

@@ -30,7 +30,6 @@ extern "C" {
 #define PIN_LED1 (32 + 3) // green (confirmed on 1.0 board)
 #define LED_BLUE PIN_LED1 // fake for bluefruit library
 #define LED_GREEN PIN_LED1
-#define LED_BUILTIN LED_GREEN
 #define LED_STATE_ON 0 // State when LED is lit
 
 #define HAS_NEOPIXEL                         // Enable the use of neopixels

variants/nrf52840/heltec_mesh_node_t114/variant.h

@@ -74,7 +74,6 @@ extern "C" {
 #define PIN_LED1 (32 + 3) // green (confirmed on 1.0 board)
 #define LED_BLUE PIN_LED1 // fake for bluefruit library
 #define LED_GREEN PIN_LED1
-#define LED_BUILTIN LED_GREEN
 #define LED_STATE_ON 0 // State when LED is lit
 
 #define HAS_NEOPIXEL                         // Enable the use of neopixels

variants/nrf52840/heltec_mesh_pocket/variant.h

@@ -26,7 +26,6 @@ extern "C" {
 #define LED_RED PIN_LED1
 #define LED_BLUE PIN_LED1
 #define LED_GREEN PIN_LED1
-#define LED_BUILTIN LED_BLUE
 #define LED_CONN LED_BLUE
 #define LED_STATE_ON 0 // State when LED is lit
 

variants/nrf52840/heltec_mesh_solar/variant.h

@@ -42,7 +42,6 @@ extern "C" {
 #define PIN_LED1 (0 + 4)  // green (confirmed on 1.0 board)
 #define LED_BLUE PIN_LED1 // fake for bluefruit library
 #define LED_GREEN PIN_LED1
-#define LED_BUILTIN LED_GREEN
 #define LED_STATE_ON 0 // State when LED is lit
 
 #define HAS_NEOPIXEL                         // Enable the use of neopixels

variants/nrf52840/meshlink/variant.h

@@ -31,7 +31,6 @@ extern "C" {
 // LEDs
 #define PIN_LED1 (24) // Built in white led for status
 #define LED_BLUE PIN_LED1
-#define LED_BUILTIN PIN_LED1
 
 #define LED_STATE_ON 0 // State when LED is litted
 #define LED_INVERTED 1

variants/nrf52840/meshtiny/variant.h

@@ -49,7 +49,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/monteops_hw1/variant.h

@@ -52,7 +52,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36) // Connected to WWAN host LED (if present)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/muzi_base/variant.h

@@ -45,7 +45,6 @@ extern "C" {
 #define PIN_LED1 (32 + 3) // P1.03, Green
 #define PIN_LED2 (32 + 4) // P1.04, Blue
 
-#define LED_BUILTIN -1 // PIN_LED1
 #define LED_BLUE PIN_LED2
 #define LED_STATE_ON 0 // State when LED is lit
 

variants/nrf52840/nano-g2-ultra/variant.h

@@ -50,7 +50,6 @@ extern "C" {
 #define LED_BLUE PIN_LED1
 #define LED_GREEN PIN_LED2
 
-#define LED_BUILTIN LED_BLUE
 #define LED_CONN PIN_GREEN
 
 #define LED_STATE_ON 0 // State when LED is lit

variants/nrf52840/r1-neo/variant.h

@@ -47,7 +47,6 @@ extern "C" {
 #define PIN_LED1 (32 + 4) // P1.04 Controls Green LED
 #define PIN_LED2 (28)     // P0.28 Controls Blue LED
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/rak2560/variant.h

@@ -48,7 +48,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/rak3401_1watt/variant.h

@@ -47,7 +47,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/rak4631/variant.h

@@ -47,7 +47,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/rak4631_epaper/variant.h

@@ -47,7 +47,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/rak4631_epaper_onrxtx/variant.h

@@ -29,7 +29,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/rak4631_eth_gw/variant.h

@@ -47,7 +47,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h

@@ -47,7 +47,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/rak_wismeshtag/variant.h

@@ -47,7 +47,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/rak_wismeshtap/variant.h

@@ -47,7 +47,6 @@ extern "C" {
 #define PIN_LED1 (35)
 #define PIN_LED2 (36)
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/seeed_solar_node/variant.h

@@ -23,7 +23,6 @@
 #define PIN_LED1 (12) // LED        P1.15
 #define PIN_LED2 (11) //
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/seeed_wio_tracker_L1/variant.h

@@ -23,7 +23,6 @@
 #define PIN_LED1 (11) // LED        P1.15
 #define PIN_LED2 (12) //
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h

@@ -23,7 +23,6 @@
 #define PIN_LED1 (11) // LED        P1.15
 #define PIN_LED2 (12) //
 
-#define LED_BUILTIN PIN_LED1
 #define LED_CONN PIN_LED2
 
 #define LED_GREEN PIN_LED1

variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h

@@ -69,8 +69,6 @@ static const uint8_t A5 = PIN_A5;
 #define PIN_LED2 LED_BLUE
 #define PIN_LED3 LED_RED
 
-#define LED_BUILTIN LED_RED // LED_BUILTIN is used by framework-arduinoadafruitnrf52 to indicate flash writes
-
 #define LED_PWR LED_RED
 #define USER_LED LED_BLUE
 

variants/nrf52840/t-echo-lite/variant.h

@@ -52,7 +52,6 @@ extern "C" {
 
 #define BLE_LED LED_BLUE
 #define BLE_LED_INVERTED 1
-#define LED_BUILTIN LED_GREEN
 #define LED_CONN LED_GREEN
 #define LED_STATE_ON 0 // State when LED is lit
 

variants/nrf52840/t-echo/variant.h

@@ -52,7 +52,6 @@ extern "C" {
 #define LED_BLUE PIN_LED1
 #define LED_GREEN PIN_LED2
 
-#define LED_BUILTIN LED_BLUE
 #define LED_CONN PIN_GREEN
 
 #define LED_STATE_ON 0 // State when LED is lit

variants/nrf52840/tracker-t1000-e/variant.h

@@ -48,7 +48,6 @@ extern "C" {
 
 #define PIN_LED1 (0 + 24) // P0.24
 #define LED_PIN PIN_LED1
-#define LED_BUILTIN -1
 #define LED_BLUE -1    // Actually green
 #define LED_STATE_ON 1 // State when LED is lit
 

variants/nrf52840/wio-sdk-wm1110/variant.h

@@ -58,8 +58,6 @@ extern "C" {
 #define PIN_LED1 (0 + 13) // P0.13
 #define PIN_LED2 (0 + 14) // P0.14
 
-#define LED_BUILTIN PIN_LED1
-
 #define LED_GREEN PIN_LED1
 #define LED_BLUE PIN_LED2 // Actually red
 

variants/nrf52840/wio-t1000-s/variant.h

@@ -48,7 +48,6 @@ extern "C" {
 
 #define PIN_LED1 (0 + 24) // P0.24
 #define LED_PIN PIN_LED1
-#define LED_BUILTIN -1
 #define LED_BLUE -1    // Actually green
 #define LED_STATE_ON 1 // State when LED is lit
 

variants/nrf52840/wio-tracker-wm1110/variant.h

@@ -54,8 +54,6 @@ extern "C" {
 #define PIN_LED1 (0 + 6)      // P0.06
 #define PIN_LED2 (PINS_COUNT) // P0.14
 
-#define LED_BUILTIN PIN_LED1
-
 #define LED_GREEN PIN_LED1
 #define LED_BLUE PIN_LED2
 

variants/rp2040/challenger_2040_lora/pins_arduino.h

@@ -45,8 +45,6 @@
 #define SPI_HOWMANY (2u)
 #define WIRE_HOWMANY (1u)
 
-#define LED_BUILTIN PIN_LED
-
 static const uint8_t D0 = (16u);
 static const uint8_t D1 = (17u);
 static const uint8_t D2 = (20u);

variants/rp2040/rak11310/pins_arduino.h

@@ -26,7 +26,6 @@ static const uint8_t A3 = PIN_A3;
 #define PIN_LED (23u)
 #define PIN_LED1 PIN_LED
 #define PIN_LED2 (24u)
-#define LED_BUILTIN PIN_LED
 
 #define ADC_RESOLUTION 12
 

variants/rp2040/rak11310/variant.h

@@ -11,7 +11,7 @@
 #define I2C_SCL1 3
 
 #define LED_CONN PIN_LED2
-#define LED_PIN LED_BUILTIN
+#define LED_PIN PIN_LED
 #define ledOff(pin) pinMode(pin, INPUT)
 
 #define BUTTON_PIN 9

variants/rp2040/rpipicow/variant.h

@@ -19,8 +19,6 @@
 #define EXT_NOTIFY_OUT 22
 #define BUTTON_PIN 17
 
-#define LED_PIN LED_BUILTIN
-
 #define BATTERY_PIN 26
 // ratio of voltage divider = 3.0 (R17=200k, R18=100k)
 #define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic

variants/rp2040/senselora_rp2040/pins_arduino.h

@@ -13,7 +13,6 @@ static const uint8_t A3 = PIN_A3;
 // LEDs
 #define PIN_LED (23u)
 #define PIN_LED1 PIN_LED
-#define LED_BUILTIN PIN_LED
 
 #define ADC_RESOLUTION 12
 

variants/stm32/wio-e5/variant.h

@@ -19,9 +19,4 @@ Do not expect a working Meshtastic device with this target.
 
 #define WIO_E5
 
-#if (defined(LED_BUILTIN) && LED_BUILTIN == PNUM_NOT_DEFINED)
-#undef LED_BUILTIN
-#define LED_BUILTIN (LED_PIN)
-#endif
-
 #endif

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 7
-build = 17
+build = 18