Improve sanitizeString function for Node Names

Fix PR#8061 SensorLib nRF ThinkNode M-series (#9084 )
pioarduino .gitignore (#9085 )
2025-12-27 13:10:28 +00:00 · 2025-12-26 19:43:13 -06:00 · 2025-12-26 18:55:47 -06:00 · 2025-12-26 17:45:43 -06:00 · 2025-12-27 10:04:43 +11:00 · 2025-12-26 17:26:48 -05:00
82 changed files with 195 additions and 21 deletions
--- a/.github/workflows/main_matrix.yml
+++ b/.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:
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,12 @@ 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/*
--- a/platformio.ini
+++ b/platformio.ini
@@ -55,7 +55,6 @@ 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
--- a/src/graphics/SharedUIDisplay.cpp
+++ b/src/graphics/SharedUIDisplay.cpp
@@ -470,18 +470,49 @@ 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;

-    for (char c : input) {
-        if (std::isalnum(static_cast<unsigned char>(c)) || isAllowedPunctuation(c)) {
+    // 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)) {
            output += c;
            inReplacement = false;
        } else {
            if (!inReplacement) {
-                output += 0xbf; // ISO-8859-1 for inverted question mark
+                output += static_cast<char>(0xBF); // ISO-8859-1 for inverted question mark
                inReplacement = true;
            }
        }
--- a/src/modules/PositionModule.h
+++ b/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);
--- a/variants/esp32/rak11200/pins_arduino.h
+++ b/variants/esp32/rak11200/pins_arduino.h
@@ -6,6 +6,8 @@
 #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;

--- a/variants/esp32/rak11200/variant.h
+++ b/variants/esp32/rak11200/variant.h
@@ -6,6 +6,8 @@
 #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;

--- a/variants/esp32/tbeam/platformio.ini
+++ b/variants/esp32/tbeam/platformio.ini
@@ -9,7 +9,6 @@ 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]
--- a/variants/esp32c6/tlora_c6/platformio.ini
+++ b/variants/esp32c6/tlora_c6/platformio.ini
@@ -8,4 +8,3 @@ build_flags =
  -I variants/esp32c6/tlora_c6
  -DARDUINO_USB_CDC_ON_BOOT=1
  -DARDUINO_USB_MODE=1
-  -ULED_BUILTIN
--- a/variants/esp32s3/heltec_v3/platformio.ini
+++ b/variants/esp32s3/heltec_v3/platformio.ini
@@ -8,4 +8,3 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D HELTEC_V3
  -I variants/esp32s3/heltec_v3
-  -ULED_BUILTIN
--- a/variants/esp32s3/heltec_v4/pins_arduino.h
+++ b/variants/esp32s3/heltec_v4/pins_arduino.h
@@ -6,6 +6,10 @@
 #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;

--- a/variants/esp32s3/heltec_vision_master_e213/pins_arduino.h
+++ b/variants/esp32s3/heltec_vision_master_e213/pins_arduino.h
@@ -3,6 +3,10 @@

 #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;

--- a/variants/esp32s3/heltec_vision_master_e290/pins_arduino.h
+++ b/variants/esp32s3/heltec_vision_master_e290/pins_arduino.h
@@ -3,6 +3,10 @@

 #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;

--- a/variants/esp32s3/heltec_vision_master_t190/pins_arduino.h
+++ b/variants/esp32s3/heltec_vision_master_t190/pins_arduino.h
@@ -3,6 +3,10 @@

 #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;

--- a/variants/esp32s3/heltec_wireless_paper/pins_arduino.h
+++ b/variants/esp32s3/heltec_wireless_paper/pins_arduino.h
@@ -3,6 +3,10 @@

 #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;

--- a/variants/esp32s3/heltec_wireless_paper_v1/pins_arduino.h
+++ b/variants/esp32s3/heltec_wireless_paper_v1/pins_arduino.h
@@ -3,6 +3,10 @@

 #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;
--- a/variants/esp32s3/heltec_wireless_tracker/pins_arduino.h
+++ b/variants/esp32s3/heltec_wireless_tracker/pins_arduino.h
@@ -11,6 +11,10 @@
 #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;

--- a/variants/esp32s3/heltec_wireless_tracker_V1_0/pins_arduino.h
+++ b/variants/esp32s3/heltec_wireless_tracker_V1_0/pins_arduino.h
@@ -11,6 +11,10 @@
 #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;

--- a/variants/esp32s3/heltec_wireless_tracker_v2/pins_arduino.h
+++ b/variants/esp32s3/heltec_wireless_tracker_v2/pins_arduino.h
@@ -10,6 +10,10 @@
 #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;

--- a/variants/esp32s3/m5stack_cores3/pins_arduino.h
+++ b/variants/esp32s3/m5stack_cores3/pins_arduino.h
@@ -10,7 +10,10 @@
 // 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)
-#define RGB_BUILTIN SOC_GPIO_PIN_COUNT + 48
+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_BRIGHTNESS 64

 static const uint8_t TX = 43;
--- a/variants/esp32s3/mesh-tab/pins_arduino.h
+++ b/variants/esp32s3/mesh-tab/pins_arduino.h
@@ -49,6 +49,10 @@ 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)
--- a/variants/esp32s3/rak3312/pins_arduino.h
+++ b/variants/esp32s3/rak3312/pins_arduino.h
@@ -22,4 +22,7 @@ static const uint8_t SCK = 13;
 #define SPI_MISO (10)
 #define SPI_CS (12)

+// LEDs
+#define LED_BUILTIN LED_GREEN
+
 #endif /* Pins_Arduino_h */
--- a/variants/esp32s3/rak_wismesh_tap_v2/pins_arduino.h
+++ b/variants/esp32s3/rak_wismesh_tap_v2/pins_arduino.h
@@ -22,4 +22,7 @@ static const uint8_t SCK = 13;
 #define SPI_MISO (10)
 #define SPI_CS (12)

+// LEDs
+#define LED_BUILTIN LED_GREEN
+
 #endif /* Pins_Arduino_h */
--- a/variants/esp32s3/seeed-sensecap-indicator/pins_arduino.h
+++ b/variants/esp32s3/seeed-sensecap-indicator/pins_arduino.h
@@ -3,6 +3,8 @@

 #include <stdint.h>

+// static const uint8_t LED_BUILTIN = -1;
+
 // static const uint8_t TX = 43;
 // static const uint8_t RX = 44;

--- a/variants/esp32s3/t-deck/pins_arduino.h
+++ b/variants/esp32s3/t-deck/pins_arduino.h
@@ -6,6 +6,8 @@
 #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;

--- a/variants/esp32s3/t-watch-s3/pins_arduino.h
+++ b/variants/esp32s3/t-watch-s3/pins_arduino.h
@@ -3,6 +3,8 @@

 #include <stdint.h>

+// static const uint8_t LED_BUILTIN = -1;
+
 // static const uint8_t TX = 43;
 // static const uint8_t RX = 44;

--- a/variants/esp32s3/tracksenger/internal/pins_arduino.h
+++ b/variants/esp32s3/tracksenger/internal/pins_arduino.h
@@ -11,6 +11,10 @@
 #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;

--- a/variants/esp32s3/tracksenger/lcd/pins_arduino.h
+++ b/variants/esp32s3/tracksenger/lcd/pins_arduino.h
@@ -11,6 +11,10 @@
 #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;

--- a/variants/esp32s3/tracksenger/oled/pins_arduino.h
+++ b/variants/esp32s3/tracksenger/oled/pins_arduino.h
@@ -11,6 +11,10 @@
 #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;

--- a/variants/esp32s3/unphone/pins_arduino.h
+++ b/variants/esp32s3/unphone/pins_arduino.h
@@ -6,6 +6,9 @@
 #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;

--- a/variants/nrf52840/Dongle_nRF52840-pca10059-v1/variant.h
+++ b/variants/nrf52840/Dongle_nRF52840-pca10059-v1/variant.h
@@ -50,6 +50,7 @@ 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
--- a/variants/nrf52840/ELECROW-ThinkNode-M1/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M1/variant.h
@@ -55,6 +55,7 @@ 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)
--- a/variants/nrf52840/ELECROW-ThinkNode-M3/platformio.ini
+++ b/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=PCF8563 packageName=lewisxhe/library/PCF8563_Library
-  lewisxhe/PCF8563_Library@1.0.1
+  ; # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
+  ; lewisxhe/SensorLib@0.3.3
--- a/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
@@ -58,6 +58,7 @@ 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

@@ -113,7 +114,8 @@ extern "C" {
 #define LR11X0_DIO_AS_RF_SWITCH

 // PCF8563 RTC Module
-#define PCF8563_RTC 0x51
+// REVISIT https://github.com/meshtastic/firmware/pull/9084
+// #define PCF8563_RTC 0x51

 #ifdef __cplusplus
 }
--- a/variants/nrf52840/ELECROW-ThinkNode-M6/platformio.ini
+++ b/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=PCF8563 packageName=lewisxhe/library/PCF8563_Library
-  lewisxhe/PCF8563_Library@1.0.1
+  ; # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
+  ; lewisxhe/SensorLib@0.3.3
--- a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
@@ -40,6 +40,7 @@ extern "C" {
 #define NUM_ANALOG_OUTPUTS (0)

 // LEDs
+#define LED_BUILTIN -1
 #define LED_BLUE -1
 #define LED_CHARGE (12)
 #define LED_PAIRING (7)
@@ -118,7 +119,8 @@ static const uint8_t A0 = PIN_A0;
 #define PIN_SERIAL2_TX (24)

 // PCF8563 RTC Module
-#define PCF8563_RTC 0x51
+// REVISIT https://github.com/meshtastic/firmware/pull/9084
+// #define PCF8563_RTC 0x51

 // SPI
 #define SPI_INTERFACES_COUNT 1
--- a/variants/nrf52840/ME25LS01-4Y10TD/variant.h
+++ b/variants/nrf52840/ME25LS01-4Y10TD/variant.h
@@ -51,6 +51,7 @@ 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
--- a/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.h
+++ b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.h
@@ -51,6 +51,7 @@ 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
--- a/variants/nrf52840/MS24SF1/variant.h
+++ b/variants/nrf52840/MS24SF1/variant.h
@@ -51,6 +51,7 @@ 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
--- a/variants/nrf52840/MakePython_nRF52840_eink/variant.h
+++ b/variants/nrf52840/MakePython_nRF52840_eink/variant.h
@@ -29,6 +29,7 @@ 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
--- a/variants/nrf52840/MakePython_nRF52840_oled/variant.h
+++ b/variants/nrf52840/MakePython_nRF52840_oled/variant.h
@@ -29,6 +29,7 @@ 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
--- a/variants/nrf52840/TWC_mesh_v4/variant.h
+++ b/variants/nrf52840/TWC_mesh_v4/variant.h
@@ -34,6 +34,7 @@ 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
--- a/variants/nrf52840/canaryone/variant.h
+++ b/variants/nrf52840/canaryone/variant.h
@@ -52,6 +52,7 @@ 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
--- a/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
+++ b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
@@ -81,6 +81,7 @@ 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
--- a/variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h
+++ b/variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h
@@ -38,6 +38,7 @@ 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
--- a/variants/nrf52840/feather_diy/variant.h
+++ b/variants/nrf52840/feather_diy/variant.h
@@ -49,6 +49,8 @@ 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

--- a/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
+++ b/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
@@ -48,6 +48,7 @@ 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
--- a/variants/nrf52840/heltec_mesh_node_t114-inkhud/variant.h
+++ b/variants/nrf52840/heltec_mesh_node_t114-inkhud/variant.h
@@ -30,6 +30,7 @@ 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
--- a/variants/nrf52840/heltec_mesh_node_t114/variant.h
+++ b/variants/nrf52840/heltec_mesh_node_t114/variant.h
@@ -74,6 +74,7 @@ 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
--- a/variants/nrf52840/heltec_mesh_pocket/variant.h
+++ b/variants/nrf52840/heltec_mesh_pocket/variant.h
@@ -26,6 +26,7 @@ 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

--- a/variants/nrf52840/heltec_mesh_solar/variant.h
+++ b/variants/nrf52840/heltec_mesh_solar/variant.h
@@ -42,6 +42,7 @@ 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
--- a/variants/nrf52840/meshlink/variant.h
+++ b/variants/nrf52840/meshlink/variant.h
@@ -31,6 +31,7 @@ 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
--- a/variants/nrf52840/meshtiny/variant.h
+++ b/variants/nrf52840/meshtiny/variant.h
@@ -49,6 +49,7 @@ 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
--- a/variants/nrf52840/monteops_hw1/variant.h
+++ b/variants/nrf52840/monteops_hw1/variant.h
@@ -52,6 +52,7 @@ 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
--- a/variants/nrf52840/muzi_base/variant.h
+++ b/variants/nrf52840/muzi_base/variant.h
@@ -45,6 +45,7 @@ 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

--- a/variants/nrf52840/nano-g2-ultra/variant.h
+++ b/variants/nrf52840/nano-g2-ultra/variant.h
@@ -50,6 +50,7 @@ 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
--- a/variants/nrf52840/r1-neo/variant.h
+++ b/variants/nrf52840/r1-neo/variant.h
@@ -47,6 +47,7 @@ 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
--- a/variants/nrf52840/rak2560/variant.h
+++ b/variants/nrf52840/rak2560/variant.h
@@ -48,6 +48,7 @@ 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
--- a/variants/nrf52840/rak3401_1watt/variant.h
+++ b/variants/nrf52840/rak3401_1watt/variant.h
@@ -47,6 +47,7 @@ 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
--- a/variants/nrf52840/rak4631/variant.h
+++ b/variants/nrf52840/rak4631/variant.h
@@ -47,6 +47,7 @@ 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
--- a/variants/nrf52840/rak4631_epaper/variant.h
+++ b/variants/nrf52840/rak4631_epaper/variant.h
@@ -47,6 +47,7 @@ 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
--- a/variants/nrf52840/rak4631_epaper_onrxtx/variant.h
+++ b/variants/nrf52840/rak4631_epaper_onrxtx/variant.h
@@ -29,6 +29,7 @@ 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
--- a/variants/nrf52840/rak4631_eth_gw/variant.h
+++ b/variants/nrf52840/rak4631_eth_gw/variant.h
@@ -47,6 +47,7 @@ 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
--- a/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
+++ b/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
@@ -47,6 +47,7 @@ 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
--- a/variants/nrf52840/rak_wismeshtag/variant.h
+++ b/variants/nrf52840/rak_wismeshtag/variant.h
@@ -47,6 +47,7 @@ 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
--- a/variants/nrf52840/rak_wismeshtap/variant.h
+++ b/variants/nrf52840/rak_wismeshtap/variant.h
@@ -47,6 +47,7 @@ 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
--- a/variants/nrf52840/seeed_solar_node/variant.h
+++ b/variants/nrf52840/seeed_solar_node/variant.h
@@ -23,6 +23,7 @@
 #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
--- a/variants/nrf52840/seeed_wio_tracker_L1/variant.h
+++ b/variants/nrf52840/seeed_wio_tracker_L1/variant.h
@@ -23,6 +23,7 @@
 #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
--- a/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
+++ b/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
@@ -23,6 +23,7 @@
 #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
--- a/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
+++ b/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
@@ -69,6 +69,8 @@ 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

--- a/variants/nrf52840/t-echo-lite/variant.h
+++ b/variants/nrf52840/t-echo-lite/variant.h
@@ -52,6 +52,7 @@ 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

--- a/variants/nrf52840/t-echo/variant.h
+++ b/variants/nrf52840/t-echo/variant.h
@@ -52,6 +52,7 @@ 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
--- a/variants/nrf52840/tracker-t1000-e/variant.h
+++ b/variants/nrf52840/tracker-t1000-e/variant.h
@@ -48,6 +48,7 @@ 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

--- a/variants/nrf52840/wio-sdk-wm1110/variant.h
+++ b/variants/nrf52840/wio-sdk-wm1110/variant.h
@@ -58,6 +58,8 @@ 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

--- a/variants/nrf52840/wio-t1000-s/variant.h
+++ b/variants/nrf52840/wio-t1000-s/variant.h
@@ -48,6 +48,7 @@ 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

--- a/variants/nrf52840/wio-tracker-wm1110/variant.h
+++ b/variants/nrf52840/wio-tracker-wm1110/variant.h
@@ -54,6 +54,8 @@ 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

--- a/variants/rp2040/challenger_2040_lora/pins_arduino.h
+++ b/variants/rp2040/challenger_2040_lora/pins_arduino.h
@@ -45,6 +45,8 @@
 #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);
--- a/variants/rp2040/rak11310/pins_arduino.h
+++ b/variants/rp2040/rak11310/pins_arduino.h
@@ -26,6 +26,7 @@ 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

--- a/variants/rp2040/rak11310/variant.h
+++ b/variants/rp2040/rak11310/variant.h
@@ -11,7 +11,7 @@
 #define I2C_SCL1 3

 #define LED_CONN PIN_LED2
-#define LED_PIN PIN_LED
+#define LED_PIN LED_BUILTIN
 #define ledOff(pin) pinMode(pin, INPUT)

 #define BUTTON_PIN 9
--- a/variants/rp2040/rpipicow/variant.h
+++ b/variants/rp2040/rpipicow/variant.h
@@ -19,6 +19,8 @@
 #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
--- a/variants/rp2040/senselora_rp2040/pins_arduino.h
+++ b/variants/rp2040/senselora_rp2040/pins_arduino.h
@@ -13,6 +13,7 @@ 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

--- a/variants/stm32/wio-e5/variant.h
+++ b/variants/stm32/wio-e5/variant.h
@@ -19,4 +19,9 @@ 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
Author	SHA1	Message	Date
Jason P	b335a42257	Improve sanitizeString function for Node Names	2025-12-26 19:43:13 -06:00
Austin	3473c32e81	Fix PR#8061 SensorLib nRF ThinkNode M-series (#9084 )	2025-12-26 18:55:47 -06:00
Austin	db2224ed0e	pioarduino .gitignore (#9085 ) I'm already going insane!	2025-12-26 17:45:43 -06:00
Austin	29c5713a7e	Correctly set type for event_mode max() position threshold (#9083 ) Fixes EVENT_MODE firmware builds	2025-12-27 10:04:43 +11:00
Jorropo	82cf2bf16a	action: skip trying to comment binary size change results if it is not a PR (#9033 ) * action: skip trying to comment binary size change results if it is not a PR * action: fix halucinations in the clanker's code * action: cleanup one line --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Austin <vidplace7@gmail.com>	2025-12-26 17:26:48 -05:00