Just set LED_BUILTIN universally to -1, as we don't use it.

2025-12-14 06:42:34 +00:00 · 2025-12-01 16:30:23 -06:00
parent 4b2f241478
commit 8fb0365833
73 changed files with 3 additions and 135 deletions
--- a/platformio.ini
+++ b/platformio.ini
@@ -53,6 +53,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
--- a/variants/esp32/rak11200/pins_arduino.h
+++ b/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;

--- a/variants/esp32/rak11200/variant.h
+++ b/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;

--- a/variants/esp32s3/heltec_v4/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/heltec_vision_master_e213/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/heltec_vision_master_e290/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/heltec_vision_master_t190/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/heltec_wireless_paper/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/heltec_wireless_paper_v1/pins_arduino.h
+++ b/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;
--- a/variants/esp32s3/heltec_wireless_tracker/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/heltec_wireless_tracker_V1_0/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/heltec_wireless_tracker_v2/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/m5stack_cores3/pins_arduino.h
+++ b/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;
--- a/variants/esp32s3/mesh-tab/pins_arduino.h
+++ b/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)
--- a/variants/esp32s3/rak3312/pins_arduino.h
+++ b/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 */
--- a/variants/esp32s3/rak_wismesh_tap_v2/pins_arduino.h
+++ b/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 */
--- a/variants/esp32s3/seeed-sensecap-indicator/pins_arduino.h
+++ b/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;

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

--- a/variants/esp32s3/t-watch-s3/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/tracksenger/internal/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/tracksenger/lcd/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/tracksenger/oled/pins_arduino.h
+++ b/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;

--- a/variants/esp32s3/unphone/pins_arduino.h
+++ b/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;

--- a/variants/nrf52840/Dongle_nRF52840-pca10059-v1/variant.h
+++ b/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
--- a/variants/nrf52840/ELECROW-ThinkNode-M1/variant.h
+++ b/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)
--- a/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
@@ -57,7 +57,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

--- a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
@@ -40,7 +40,6 @@ extern "C" {
 #define NUM_ANALOG_OUTPUTS (0)

 // LEDs
-#define LED_BUILTIN -1
 #define LED_BLUE -1
 #define LED_CHARGE (12)
 #define LED_PAIRING (7)
--- a/variants/nrf52840/ME25LS01-4Y10TD/variant.h
+++ b/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
--- a/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.h
+++ b/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
--- a/variants/nrf52840/MS24SF1/variant.h
+++ b/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
--- a/variants/nrf52840/MakePython_nRF52840_eink/variant.h
+++ b/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
--- a/variants/nrf52840/MakePython_nRF52840_oled/variant.h
+++ b/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
--- a/variants/nrf52840/TWC_mesh_v4/variant.h
+++ b/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
--- a/variants/nrf52840/canaryone/variant.h
+++ b/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
--- a/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
+++ b/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
--- a/variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h
+++ b/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
--- a/variants/nrf52840/feather_diy/variant.h
+++ b/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

--- a/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
+++ b/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
--- a/variants/nrf52840/heltec_mesh_node_t114-inkhud/variant.h
+++ b/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
--- a/variants/nrf52840/heltec_mesh_node_t114/variant.h
+++ b/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
--- a/variants/nrf52840/heltec_mesh_pocket/variant.h
+++ b/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

--- a/variants/nrf52840/heltec_mesh_solar/variant.h
+++ b/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
--- a/variants/nrf52840/meshlink/variant.h
+++ b/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
--- a/variants/nrf52840/meshtiny/variant.h
+++ b/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
--- a/variants/nrf52840/monteops_hw1/variant.h
+++ b/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
--- a/variants/nrf52840/muzi_base/variant.h
+++ b/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

--- a/variants/nrf52840/nano-g2-ultra/variant.h
+++ b/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
--- a/variants/nrf52840/r1-neo/variant.h
+++ b/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
--- a/variants/nrf52840/rak2560/variant.h
+++ b/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
--- a/variants/nrf52840/rak3401_1watt/variant.h
+++ b/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
--- a/variants/nrf52840/rak4631/variant.h
+++ b/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
--- a/variants/nrf52840/rak4631_epaper/variant.h
+++ b/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
--- a/variants/nrf52840/rak4631_epaper_onrxtx/variant.h
+++ b/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
--- a/variants/nrf52840/rak4631_eth_gw/variant.h
+++ b/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
--- a/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
+++ b/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
--- a/variants/nrf52840/rak_wismeshtag/variant.h
+++ b/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
--- a/variants/nrf52840/rak_wismeshtap/variant.h
+++ b/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
--- a/variants/nrf52840/seeed_solar_node/variant.h
+++ b/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
--- a/variants/nrf52840/seeed_wio_tracker_L1/variant.h
+++ b/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
--- a/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
+++ b/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
--- a/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
+++ b/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

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

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

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

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

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

--- a/variants/rp2040/challenger_2040_lora/pins_arduino.h
+++ b/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);
--- a/variants/rp2040/rak11310/pins_arduino.h
+++ b/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

--- 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 LED_BUILTIN
+#define LED_PIN PIN_LED
 #define ledOff(pin) pinMode(pin, INPUT)

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

--- a/variants/stm32/wio-e5/variant.h
+++ b/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