Merge branch 'master' into master

2026-04-16 07:07:03 -05:00
parent 15b474172a c1bee82baf
commit e7b66281fa
805 changed files with 21556 additions and 5792 deletions
@@ -13,7 +13,3 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
 upload_speed = 460800
-lib_deps =
-  ${esp32_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
@@ -14,7 +14,7 @@
 #define LORA_CS 5
 #define RF95_FAN_EN 17

-// #define LED_PIN 16 // This is a LED_WS2812 not a standard LED
+// This is a LED_WS2812 not a standard LED
 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 1                     // How many neopixels are connected
 #define NEOPIXEL_DATA 16                     // gpio pin used to send data to the neopixels
@@ -20,7 +20,7 @@
 #define LORA_DIO2
 #define LORA_DIO3

-#define LED_PIN 16 // green - blue is at 17
+#define LED_POWER 16 // green - blue is at 17

 #define BUTTON_PIN 25
 #define BUTTON_NEED_PULLUP
@@ -8,8 +8,9 @@ build_flags =
  -I variants/esp32/chatter2
  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
+  -ULED_BUILTIN
  
 lib_deps =
  ${esp32_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  lovyan03/LovyanGFX@1.2.19
@@ -23,8 +23,6 @@
 #define SX126X_TXEN RADIOLIB_NC
 #define SX126X_RXEN RADIOLIB_NC

-// Status
-// #define LED_PIN 1
 // External notification
 // FIXME: Check if EXT_NOTIFY_OUT actualy has any effect and removes the need for setting the external notication pin in the
 // app/preferences
@@ -79,7 +77,7 @@
                           // lower dB for lower voltage rnage
 #define ADC_MULTIPLIER 5.0 // VBATT---10k--pin34---2.5K---GND
 // Chatter2 uses 3 AAA cells
-#define CELL_TYPE_ALKALINE
+#define OCV_ARRAY 1580, 1400, 1350, 1300, 1280, 1250, 1230, 1190, 1150, 1100, 1000
 #define NUM_CELLS 3
 #undef EXT_PWR_DETECT

@@ -98,7 +96,6 @@
 #define KB_LOAD 21 // load values from the switch and store in shift register
 #define KB_CLK 22  // clock pin for serial data out
 #define KB_DATA 23 // data pin
-#define CANNED_MESSAGE_MODULE_ENABLE 1

 /////////////////////////////////////////////////////////////////////////////////
 //                                                                             //
@@ -10,3 +10,7 @@ build_flags =
  -D EBYTE_E22
  -D EBYTE_E22_900M30S ; Assume Tx power curve is identical to 900M30S as there is no documentation
  -I variants/esp32/diy/9m2ibr_aprs_lora_tracker
+  -ULED_BUILTIN
+build_src_filter =
+  ${esp32_base.build_src_filter}
+  +<../variants/esp32/diy/9m2ibr_aprs_lora_tracker>
@@ -0,0 +1,8 @@
+#include "variant.h"
+#include "Arduino.h"
+
+void earlyInitVariant()
+{
+    pinMode(USER_LED, OUTPUT);
+    digitalWrite(USER_LED, HIGH ^ LED_STATE_ON);
+}
@@ -21,8 +21,8 @@
 #define BUTTON_PIN 15 // Right side button - if not available, set device.button_gpio to 0 from Meshtastic client

 // LEDs
-#define LED_PIN 13 // Tx LED
-#define USER_LED 2 // Rx LED
+#define LED_POWER 13 // Tx LED
+#define USER_LED 2   // Rx LED

 // Buzzer
 #define PIN_BUZZER 33
@@ -14,3 +14,4 @@ build_flags =
  ${esp32_base.build_flags}
  -D DIY_V1
  -I variants/esp32/diy/hydra
+  -ULED_BUILTIN
@@ -15,7 +15,7 @@
 #define ADC_MULTIPLIER 1.85 // (R1 = 470k, R2 = 680k)
 #define EXT_PWR_DETECT 4    // Pin to detect connected external power source for LILYGO® TTGO T-Energy T18 and other DIY boards
 #define EXT_NOTIFY_OUT 12   // Overridden default pin to use for Ext Notify Module (#975).
-#define LED_PIN 2           // add status LED (compatible with core-pcb and DIY targets)
+#define LED_POWER 2         // add status LED (compatible with core-pcb and DIY targets)

 // Radio
 #define USE_SX1262 // E22-900M30S uses SX1262
@@ -17,3 +17,4 @@ build_flags =
  -D DIY_V1
  -D EBYTE_E22
  -I variants/esp32/diy/v1
+  -ULED_BUILTIN
@@ -15,7 +15,7 @@
 #define ADC_MULTIPLIER 1.85 // (R1 = 470k, R2 = 680k)
 #define EXT_PWR_DETECT 4    // Pin to detect connected external power source for LILYGO® TTGO T-Energy T18 and other DIY boards
 #define EXT_NOTIFY_OUT 12   // Overridden default pin to use for Ext Notify Module (#975).
-#define LED_PIN 2           // add status LED (compatible with core-pcb and DIY targets)
+#define LED_POWER 2         // add status LED (compatible with core-pcb and DIY targets)

 #define LORA_DIO0 26  // a No connect on the SX1262/SX1268 module
 #define LORA_RESET 23 // RST for SX1276, and for SX1262/SX1268
@@ -5,7 +5,10 @@ custom_esp32_kind =
 custom_mtjson_part =
 platform =
  # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.12.0
+  platformio/espressif32@6.13.0
+platform_packages =
+  # renovate: datasource=custom.pio depName=platformio/tool-mklittlefs packageName=platformio/tool/tool-mklittlefs
+  platformio/tool-mklittlefs@1.203.210628

 extra_scripts =
  ${env.extra_scripts}
@@ -24,14 +27,20 @@ board_build.filesystem = littlefs
 # Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
 # See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h
 # This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h
-build_unflags = -fno-lto
+build_unflags =
+  -fno-lto
+  # Keep explicit std unflags on ESP32; base-level unflags are not sufficient
+  # to prevent framework-injected C++11 fallback on this platform.
+  -std=c++11
+  -std=gnu++11
 build_flags =
  ${arduino_base.build_flags}
  -flto
  -Wall
  -Wextra
  -Isrc/platform/esp32
-  -std=c++11
+  -include mbedtls/error.h
+  -std=gnu++17
  -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG
  -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
  -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
@@ -59,13 +68,13 @@ lib_deps =
  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
-  https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
+  https://github.com/meshtastic/esp32_https_server/archive/0c71f380390ad483ff134ad938e07f6cf1226c5b.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
-  h2zero/NimBLE-Arduino@^1.4.3
+  h2zero/NimBLE-Arduino@1.4.3
  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
-  # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
-  https://github.com/lewisxhe/XPowersLib/archive/v0.3.2.zip
+  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
+  lewisxhe/XPowersLib@0.3.3
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
  rweather/Crypto@0.4.0

@@ -4,25 +4,29 @@
 extends = esp32_common
 custom_esp32_kind = esp32

+build_src_filter =
+  ${esp32_common.build_src_filter}
+  -<modules/esp32/PaxcounterModule.cpp>
+  -<mesh/http/>
+
 build_flags =
  ${esp32_common.build_flags}
  -DMESHTASTIC_EXCLUDE_AUDIO=1
-; Override lib_deps to use environmental_extra_no_bsec instead of environmental_extra
-; BSEC library uses ~3.5KB DRAM which causes overflow on original ESP32 targets
+  -DMESHTASTIC_EXCLUDE_ACCELEROMETER=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
+  -DMESHTASTIC_EXCLUDE_RANGETEST=1
+
 lib_deps =
  ${arduino_base.lib_deps}
  ${networking_base.lib_deps}
  ${networking_extra.lib_deps}
+  ${radiolib_base.lib_deps}
  ${environmental_base.lib_deps}
  ${environmental_extra_no_bsec.lib_deps}
-  ${radiolib_base.lib_deps}
-  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
-  https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
-  h2zero/NimBLE-Arduino@^1.4.3
-  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
-  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
-  # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
-  https://github.com/lewisxhe/XPowersLib/archive/v0.3.2.zip
+  h2zero/NimBLE-Arduino@1.4.3
+  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
+  lewisxhe/XPowersLib@0.3.3
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  rweather/Crypto@0.4.0
@@ -3,7 +3,7 @@
 // HACKBOX LoRa IO Kit
 // Uses a ESP-32-WROOM and a RA-01SH (SX1262) LoRa Board

-#define LED_PIN 2      // LED
+#define LED_POWER 2    // LED
 #define LED_STATE_ON 1 // State when LED is lit

 #define HAS_SCREEN 0
@@ -12,7 +12,7 @@

 #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller

-#define LED_PIN 25   // If defined we will blink this LED
+#define LED_POWER 25 // If defined we will blink this LED
 #define BUTTON_PIN 0 // If defined, this will be used for user button presses

 #define USE_RF95
@@ -14,3 +14,4 @@ build_flags =
  ${esp32_base.build_flags}
  -D HELTEC_V2_1
  -I variants/esp32/heltec_v2.1
+  -ULED_BUILTIN
@@ -18,7 +18,7 @@
 #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller

 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
+#define LED_POWER 25   // If defined we will blink this LED
 #define BUTTON_PIN 0   // If defined, this will be used for user button presses

 #define USE_RF95
@@ -14,3 +14,4 @@ build_flags =
  ${esp32_base.build_flags}
  -D HELTEC_V2_0
  -I variants/esp32/heltec_v2
+  -ULED_BUILTIN
@@ -13,7 +13,7 @@
 #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller

 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
+#define LED_POWER 25   // If defined we will blink this LED
 #define BUTTON_PIN 0   // If defined, this will be used for user button presses

 #define USE_RF95
@@ -15,7 +15,7 @@
 #undef GPS_TX_PIN

 // Green / Lora = PIN 22 / GPIO2, Yellow / Wifi = PIN 23 / GPIO0, Blue / BLE = PIN 25 / GPIO16
-#define LED_PIN 22
+#define LED_POWER 22
 #define WIFI_LED 23
 #define BLE_LED 25

@@ -1,7 +1,7 @@
 #define I2C_SCL SCL
 #define I2C_SDA SDA

-#define LED_PIN LED
+#define LED_POWER LED

 // active low, powers the Battery reader, but no lora antenna boost (?)
 // #define VEXT_ENABLE Vext
@@ -30,10 +30,9 @@ build_flags =
  -DTFT_BL=32
  -DSPI_FREQUENCY=40000000
  -DSPI_READ_FREQUENCY=16000000
-  -DDISABLE_ALL_LIBRARY_WARNINGS
 lib_ignore =
  m5stack-core
 lib_deps = 
  ${esp32_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  lovyan03/LovyanGFX@1.2.19
@@ -19,9 +19,9 @@ build_flags =
 lib_deps = 
  ${esp32_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.5
+  zinggjm/GxEPD2@1.6.8
  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
-  lewisxhe/SensorLib@0.3.3
+  lewisxhe/SensorLib@0.3.4
 lib_ignore =
  m5stack-coreink
 monitor_filters = esp32_exception_decoder
@@ -11,11 +11,10 @@

 // Green LED
 #define LED_STATE_ON 1 // State when LED is lit
-#define LED_PIN 10
+#define LED_POWER 10

 // PCF8563 RTC Module
 #define PCF8563_RTC 0x51
-#define HAS_RTC 1

 // Wheel
 //  Down 37
@@ -9,8 +9,9 @@ custom_meshtastic_display_name = Nano G1 Explorer
 custom_meshtastic_tags = B&Q

 extends = esp32_base
-board = ttgo-t-beam
+board = ttgo-tbeam
 build_flags = 
  ${esp32_base.build_flags}
  -D NANO_G1_EXPLORER
  -I variants/esp32/nano-g1-explorer
+  -ULED_BUILTIN
@@ -9,8 +9,9 @@ custom_meshtastic_display_name = Nano G1
 custom_meshtastic_tags = B&Q

 extends = esp32_base
-board = ttgo-t-beam
+board = ttgo-tbeam
 build_flags = 
  ${esp32_base.build_flags}
  -D NANO_G1
  -I variants/esp32/nano-g1
+  -ULED_BUILTIN
@@ -9,6 +9,7 @@ build_flags =
  -DHAS_STK8XXX=1
  -O2
  -I variants/esp32/radiomaster_900_bandit
+  -ULED_BUILTIN
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
@@ -13,5 +13,6 @@ build_flags =
  -DCONFIG_DISABLE_HAL_LOCKS=1
  -O2
  -I variants/esp32/radiomaster_900_bandit_nano
+  -ULED_BUILTIN
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
@@ -16,5 +16,6 @@ build_flags =
  -DCONFIG_DISABLE_HAL_LOCKS=1
  -O2
  -I variants/esp32/radiomaster_900_bandit_nano
+  -ULED_BUILTIN
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
@@ -37,7 +37,7 @@
 /*
  LED PIN setup.
 */
-#define LED_PIN 15
+#define LED_POWER 15

 /*
  Five way button when using ADC.
@@ -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;

@@ -16,4 +16,8 @@ build_flags =
  ${esp32_base.build_flags}
  -D RAK_11200
  -I variants/esp32/rak11200
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
+  -DMESHTASTIC_EXCLUDE_RANGETEST=1
+  -DMESHTASTIC_EXCLUDE_MQTT=1
 upload_speed = 115200
@@ -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;

@@ -45,7 +43,7 @@ static const uint8_t SCK = 33;
 #undef GPS_TX_PIN
 #define GPS_TX_PIN (TX1)

-#define LED_PIN LED_BLUE
+#define LED_POWER LED_BLUE

 #define PIN_VBAT WB_A0
 #define BATTERY_PIN PIN_VBAT
@@ -9,8 +9,9 @@ custom_meshtastic_display_name = Station G1
 custom_meshtastic_tags = B&Q

 extends = esp32_base
-board = ttgo-t-beam
+board = ttgo-tbeam
 build_flags = 
  ${esp32_base.build_flags}
  -D STATION_G1
  -I variants/esp32/station-g1
+  -ULED_BUILTIN
@@ -10,14 +10,13 @@ custom_meshtastic_images = tbeam.svg
 custom_meshtastic_tags = LilyGo

 extends = esp32_base
-board = ttgo-t-beam
+board = ttgo-tbeam

 board_check = true
 build_flags = ${esp32_base.build_flags}
  -D TBEAM_V10
  -I variants/esp32/tbeam
-  -DBOARD_HAS_PSRAM
-  -mfix-esp32-psram-cache-issue
+  -ULED_BUILTIN
 upload_speed = 921600

 [env:tbeam-displayshield]
@@ -31,5 +30,5 @@ lib_deps =
  ${env:tbeam.lib_deps}
  # renovate: datasource=github-tags depName=meshtastic-st7796 packageName=meshtastic/st7796
  https://github.com/meshtastic/st7796/archive/1.0.5.zip
-  # renovate: datasource=custom.pio depName=lewisxhe-SensorLib packageName=lewisxhe/library/SensorLib
-  lewisxhe/SensorLib@0.3.3
+  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
+  lewisxhe/SensorLib@0.3.4
@@ -9,7 +9,7 @@
 #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.

 #define LED_STATE_ON 0 // State when LED is lit
-#define LED_PIN 4      // Newer tbeams (1.1) have an extra led on GPIO4
+#define LED_POWER 4    // Newer tbeams (1.1) have an extra led on GPIO4

 // TTGO uses a common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
 // not found then probe for SX1262
@@ -49,7 +49,7 @@

 #undef EXT_NOTIFY_OUT
 #undef LED_STATE_ON
-#undef LED_PIN
+#undef LED_POWER

 #define HAS_CST226SE 1
 #define HAS_TOUCHSCREEN 1
@@ -57,7 +57,6 @@
 #ifndef TOUCH_IRQ
 #define TOUCH_IRQ -1
 #endif
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define USE_VIRTUAL_KEYBOARD 1

 #define ST7796_NSS 25
@@ -9,7 +9,7 @@ custom_meshtastic_tags = LilyGo

 board_level = extra
 extends = esp32_base
-board = ttgo-t-beam
+board = ttgo-tbeam
 build_flags = 
  ${esp32_base.build_flags}
  -D TBEAM_V07
@@ -13,4 +13,5 @@ build_flags =
  ${esp32_base.build_flags}
  -D TLORA_V1
  -I variants/esp32/tlora_v1
+  -ULED_BUILTIN
 upload_speed = 115200
@@ -5,7 +5,7 @@

 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
 #define VEXT_ON_VALUE LOW
-#define LED_PIN 2    // If defined we will blink this LED
+#define LED_POWER 2  // If defined we will blink this LED
 #define BUTTON_PIN 0 // If defined, this will be used for user button presses
 #define BUTTON_NEED_PULLUP
 #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.
@@ -7,7 +7,7 @@
 #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller

 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
+#define LED_POWER 25   // If defined we will blink this LED
 #define BUTTON_PIN 36
 #define BUTTON_NEED_PULLUP

@@ -5,7 +5,7 @@
 #define I2C_SCL 22

 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
+#define LED_POWER 25   // If defined we will blink this LED
 #define BUTTON_PIN                                                                                                               \
    0 // If defined, this will be used for user button presses, if your board doesn't have a physical switch, you can wire one
      // between this pin and ground
@@ -12,7 +12,7 @@ extends = esp32_base
 board = ttgo-lora32-v21
 board_check = true
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16
+  ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16 -ULED_BUILTIN
 upload_speed = 115200

 [env:sugarcube]
@@ -22,4 +22,4 @@ build_flags =
  ${env:tlora-v2-1-1_6.build_flags}
  -DBUTTON_PIN=0
  -DPIN_BUZZER=25
-  -DLED_PIN=-1
+  -DLED_POWER=-1
@@ -8,10 +8,10 @@
 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22

-#if defined(LED_PIN) && LED_PIN == -1
-#undef LED_PIN
+#if defined(LED_POWER) && LED_POWER == -1
+#undef LED_POWER
 #else
-#define LED_PIN 25 // If defined we will blink this LED
+#define LED_POWER 25 // If defined we will blink this LED
 #endif

 #define USE_RF95
@@ -7,4 +7,5 @@ build_flags =
  -D TLORA_V2_1_16
  -I variants/esp32/tlora_v2_1_16
  -D LORA_TCXO_GPIO=33
-upload_speed = 115200
+  -ULED_BUILTIN
+upload_speed = 115200
@@ -6,7 +6,7 @@
 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22

-#define LED_PIN 25    // If defined we will blink this LED
+#define LED_POWER 25  // If defined we will blink this LED
 #define BUTTON_PIN 12 // If defined, this will be used for user button presses,

 #define BUTTON_NEED_PULLUP
@@ -6,4 +6,5 @@ build_flags =
  -D TLORA_V2_1_16
  -I variants/esp32/tlora_v2_1_16
  -D LORA_TCXO_GPIO=12
-  -D BUTTON_PIN=0
+  -D BUTTON_PIN=0
+  -ULED_BUILTIN
@@ -8,9 +8,8 @@
 #define GPS_RX_PIN 9
 #define GPS_TX_PIN 10

-#define LED_PIN 13 // 13 red, 2 blue, 15 red
+#define LED_POWER 13 // 13 red, 2 blue, 15 red

-// #define HAS_BUTTON 0
 #define BUTTON_PIN 0
 #define BUTTON_NEED_PULLUP

@@ -11,7 +11,7 @@ build_flags =
 lib_deps = 
  ${esp32_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  lovyan03/LovyanGFX@1.2.19
  # renovate: datasource=custom.pio depName=SX1509 IO Expander packageName=sparkfun/library/SX1509 IO Expander
  sparkfun/SX1509 IO Expander@3.0.6
  # renovate: datasource=custom.pio depName=APA102 packageName=pololu/library/APA102
@@ -26,7 +26,6 @@
 #undef GPS_TX_PIN
 #define NO_GPS 1
 #define HAS_GPS 0
-#define NO_SCREEN
 #define HAS_SCREEN 0

 // Default SPI1 will be mapped to the display
@@ -4,7 +4,7 @@
 #define I2C_SCL SCL

 #define BUTTON_PIN 9 // BOOT button
-#define LED_PIN 30   // RGB LED
+#define LED_POWER 30 // RGB LED

 #define USE_RF95
 #define LORA_SCK 4
@@ -3,7 +3,7 @@
 // Hackerboxes LoRa ESP32-C3 OLED Kit
 // Uses a ESP32-C3 OLED Board and a RA-01SH (SX1262) LoRa Board

-#define LED_PIN 8      // LED
+#define LED_POWER 8    // LED
 #define LED_STATE_ON 1 // State when LED is lit

 #define HAS_SCREEN 0
@@ -3,7 +3,7 @@
 // LED pin on HT-DEV-ESP_V2 and HT-DEV-ESP_V3
 // https://resource.heltec.cn/download/HT-CT62/HT-CT62_Reference_Design.pdf
 // https://resource.heltec.cn/download/HT-DEV-ESP/HT-DEV-ESP_V3_Sch.pdf
-#define LED_PIN 2      // LED
+#define LED_POWER 2    // LED
 #define LED_STATE_ON 1 // State when LED is lit

 #define HAS_SCREEN 0
@@ -5,6 +5,3 @@ build_flags =
  ${esp32c3_base.build_flags}
  -D HELTEC_HRU_3601
  -I variants/esp32c3/heltec_hru_3601
-lib_deps = ${esp32c3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
@@ -3,12 +3,14 @@ extends = esp32_common
 platform =
  # Do not renovate until we have switched to pioarduino tagged builds
  https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.zip
+platform_packages =
+  # HACK: This release was automatically removed upstream
+  framework-arduinoespressif32 @ https://github.com/vidplace7/platform-espressif32/releases/download/meshtastic-esp32c6/framework-arduinoespressif32-all-release_v5.1-124d64e.zip
 build_flags =
  ${arduino_base.build_flags}
  -Wall
  -Wextra
  -Isrc/platform/esp32
-  -std=c++11
  -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
  -DSERIAL_BUFFER_SIZE=4096
  -DLIBPAX_ARDUINO
@@ -28,7 +30,7 @@ lib_deps =
  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@0.3.2
+  lewisxhe/XPowersLib@0.3.3
  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
@@ -23,8 +23,6 @@ build_unflags =
  -D HAS_WIFI
 lib_deps =
  ${esp32c6_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@2.3.7
 build_flags = 
@@ -43,4 +41,4 @@ lib_ignore =
  NonBlockingRTTTL
  libpax
 build_src_filter = 
- ${esp32c6_base.build_src_filter} +<../variants/esp32c6/m5stack_unitc6l>
+ ${esp32c6_base.build_src_filter} +<../variants/esp32c6/m5stack_unitc6l>
@@ -50,3 +50,5 @@ void c6l_init();
 #endif
 #define SCREEN_TRANSITION_FRAMERATE 10
 #define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness
+
+#define SERIAL_PRINT_PORT 1
@@ -8,3 +8,4 @@ build_flags =
  -I variants/esp32c6/tlora_c6
  -DARDUINO_USB_CDC_ON_BOOT=1
  -DARDUINO_USB_MODE=1
+  -ULED_BUILTIN
@@ -1,7 +1,7 @@
 #define I2C_SDA 8 // I2C pins for this board
 #define I2C_SCL 9

-#define LED_PIN 7      // If defined we will blink this LED
+#define LED_POWER 7    // If defined we will blink this LED
 #define LED_STATE_ON 0 // State when LED is lit

 #define USE_SX1262
@@ -19,3 +19,5 @@
 #define SX126X_TXEN 14
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
+
+#define SERIAL_PRINT_PORT 1
@@ -1,7 +1,7 @@
 #define I2C_SDA 34 // I2C pins for this board
 #define I2C_SCL 36

-#define LED_PIN 15 // If defined we will blink this LED
+#define LED_POWER 15 // If defined we will blink this LED

 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 3                     // How many neopixels are connected
@@ -8,7 +8,8 @@
 // DIO6 -> RFSW1_V2
 // DIO7 -> not connected on E80 module - note that GNSS and Wifi scanning are not possible.

-static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC, RADIOLIB_NC};
+static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC,
+                                             RADIOLIB_NC};

 static const Module::RfSwitchMode_t rfswitch_table[] = {
    // mode             DIO5  DIO6  DIO7
@@ -1,7 +1,7 @@
 // EByte EoRA-Hub
 // Uses E80 (LR1121) LoRa module

-#define LED_PIN 35
+#define LED_POWER 35

 // Button - user interface
 #define BUTTON_PIN 0 // BOOT button
@@ -1,5 +1,5 @@
 // LED - status indication
-#define LED_PIN 37
+#define LED_POWER 37

 // Button - user interface
 #define BUTTON_PIN 0 // This is the BOOT button, and it has its own pull-up resistor
@@ -100,7 +100,7 @@
 */

 // Status
-#define LED_PIN 1
+#define LED_POWER 1
 #define LED_STATE_ON 1 // State when LED is lit
 // External notification
 // FIXME: Check if EXT_NOTIFY_OUT actualy has any effect and removes the need for setting the external notication pin in the
@@ -1,6 +1,3 @@
-// Status
-#define LED_PIN 1
-
 #define PIN_BUTTON1 47 // 功能键
 #define PIN_BUTTON2 4  // 电源键
 #define ALT_BUTTON_PIN PIN_BUTTON2
@@ -11,6 +11,10 @@ custom_meshtastic_requires_dfu = false

 extends = esp32s3_base
 board = ESP32-S3-WROOM-1-N4
+build_src_filter =
+  ${esp32s3_base.build_src_filter}
+  +<../variants/esp32s3/ELECROW-ThinkNode-M5>
+
 build_flags =
  ${esp32s3_base.build_flags}
  -D ELECROW_ThinkNode_M5
@@ -27,6 +31,8 @@ build_flags =

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
+  https://github.com/meshtastic/GxEPD2/archive/c7eb4c3c167cf396ef4f541cc5d4c6aa42f3c46b.zip
  # renovate: datasource=custom.pio depName=PCA9557-arduino packageName=maxpromer/library/PCA9557-arduino
  maxpromer/PCA9557-arduino@1.0.0
+  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
+  lewisxhe/SensorLib@0.3.4
@@ -0,0 +1,23 @@
+#include "variant.h"
+#include <PCA9557.h>
+
+PCA9557 io(0x18, &Wire1);
+
+void earlyInitVariant()
+{
+    Wire1.begin(48, 47);
+    io.pinMode(PCA_PIN_EINK_EN, OUTPUT);
+    io.pinMode(PCA_PIN_POWER_EN, OUTPUT);
+    io.pinMode(PCA_LED_POWER, OUTPUT);
+    io.pinMode(PCA_LED_NOTIFICATION, OUTPUT);
+    io.pinMode(PCA_LED_ENABLE, OUTPUT);
+
+    io.digitalWrite(PCA_PIN_POWER_EN, HIGH);
+    io.digitalWrite(PCA_LED_NOTIFICATION, LOW);
+    io.digitalWrite(PCA_LED_ENABLE, LOW);
+}
+
+void variant_shutdown()
+{
+    io.digitalWrite(PCA_PIN_POWER_EN, LOW);
+}
@@ -4,17 +4,21 @@
 #define UART_TX 43
 #define UART_RX 44

+#define HAS_PCA9557
+
 // LED
 // Both of these are on the GPIO expander
-#define PCA_LED_USER 1  // the Blue LED
-#define PCA_LED_POWER 3 // the Red LED? Seems to have hardware logic to blink when USB is plugged in.
+#define PCA_LED_NOTIFICATION 1 // the Blue LED
+#define PCA_LED_ENABLE 2       // the power supply to the LEDs, in an OR arrangement with VBUS power
+#define PCA_LED_POWER 3        // the Red LED? Seems to have hardware logic to blink when USB is plugged in.
+#define POWER_LED_HARDWARE_BLINKS_WHILE_CHARGING

 // USB_CHECK
 #define EXT_PWR_DETECT 12
 #define BATTERY_PIN 8
 #define ADC_CHANNEL ADC1_GPIO8_CHANNEL

-#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
+#define ADC_MULTIPLIER 2.0 // 2.0 + 10% for correction of display undervoltage.

 #define PIN_BUZZER 9

@@ -28,6 +32,9 @@
 #define I2C_SCL 1
 #define I2C_SDA 2

+// PCF8563 RTC Module
+#define PCF8563_RTC 0x51
+
 // GPS pins
 #define GPS_SWITH 10
 #define HAS_GPS 1
@@ -79,4 +86,7 @@

 #define BUTTON_PIN PIN_BUTTON1
 #define BUTTON_PIN_ALT PIN_BUTTON2
+#define ALT_BUTTON_WAKE
+
+#define SERIAL_PRINT_PORT 0
 #endif
@@ -11,7 +11,7 @@
 #define I2C_SDA 12
 #define I2C_SCL 14

-#define LED_PIN 46
+#define LED_POWER 46
 #define LED_STATE_ON 0 // State when LED is litted

 // #define BUTTON_PIN 15 // Pico OLED 1.3 User key 0 - removed User key 1 (17)
@@ -26,7 +26,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
+  https://github.com/meshtastic/GxEPD2/archive/c7eb4c3c167cf396ef4f541cc5d4c6aa42f3c46b.zip

 [env:crowpanel-esp32s3-4-epaper]
 extends = esp32s3_base
@@ -56,7 +56,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
+  https://github.com/meshtastic/GxEPD2/archive/c7eb4c3c167cf396ef4f541cc5d4c6aa42f3c46b.zip

 [env:crowpanel-esp32s3-2-epaper]
 extends = esp32s3_base
@@ -86,4 +86,4 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
+  https://github.com/meshtastic/GxEPD2/archive/c7eb4c3c167cf396ef4f541cc5d4c6aa42f3c46b.zip
@@ -26,7 +26,7 @@
 // #define GPS_RX_PIN 44
 // #define GPS_TX_PIN 43

-#define LED_PIN 41
+#define LED_POWER 41
 #define BUTTON_PIN 2
 #define BUTTON_NEED_PULLUP

@@ -11,9 +11,7 @@ upload_speed = 921600
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.5
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  zinggjm/GxEPD2@1.6.8
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -11,7 +11,7 @@
 #define I2C_SDA 18 // 1 // I2C pins for this board
 #define I2C_SCL 17 // 2

-// #define LED_PIN 38     // This is a RGB LED not a standard LED
+// #define LED_POWER 38     // This is a RGB LED not a standard LED
 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 1                     // How many neopixels are connected
 #define NEOPIXEL_DATA 38                     // gpio pin used to send data to the neopixels
@@ -8,10 +8,6 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM0
 upload_speed = 921600
-lib_deps =
-  ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -11,7 +11,7 @@
 #define I2C_SDA 18 // 1 // I2C pins for this board
 #define I2C_SCL 17 // 2

-// #define LED_PIN 38     // This is a RGB LED not a standard LED
+// #define LED_POWER 38     // This is a RGB LED not a standard LED
 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 1                     // How many neopixels are connected
 #define NEOPIXEL_DATA 38                     // gpio pin used to send data to the neopixels
@@ -12,8 +12,8 @@ build_flags =
  -D ARDUINO_USB_CDC_ON_BOOT=1

 lib_deps = ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
-  earlephilhower/ESP8266Audio@1.9.9
+  # renovate: datasource=git-refs depName=ESP8266Audio packageName=https://github.com/meshtastic/ESP8266Audio gitBranch=meshtastic-2.0.0-dacfix
+  https://github.com/meshtastic/ESP8266Audio/archive/343024632ee78d6216907b2353fc943a62422d80.zip
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
  earlephilhower/ESP8266SAM@1.1.0

@@ -6,7 +6,7 @@
 #define I2C_SDA1 45
 #define I2C_SCL1 46

-#define LED_PIN 6
+#define LED_POWER 6
 #define LED_STATE_ON 1
 #define BUTTON_PIN 0

@@ -41,8 +41,8 @@ build_flags = ${esp32s3_base.build_flags} -Os

 lib_deps = ${esp32s3_base.lib_deps}
  ${device-ui_base.lib_deps}
-  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
-  earlephilhower/ESP8266Audio@1.9.9
+  # renovate: datasource=git-refs depName=ESP8266Audio packageName=https://github.com/meshtastic/ESP8266Audio gitBranch=meshtastic-2.0.0-dacfix
+  https://github.com/meshtastic/ESP8266Audio/archive/343024632ee78d6216907b2353fc943a62422d80.zip
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
  earlephilhower/ESP8266SAM@1.1.0
  # renovate: datasource=custom.pio depName=TCA9534 packageName=hideakitai/library/TCA9534
@@ -84,6 +84,7 @@ custom_meshtastic_images = crowpanel_2_4.svg, crowpanel_2_8.svg
 custom_meshtastic_tags = Elecrow
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = crowpanel_small_esp32s3_base
 build_flags =
@@ -119,6 +120,7 @@ custom_meshtastic_images = crowpanel_3_5.svg
 custom_meshtastic_tags = Elecrow
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = crowpanel_small_esp32s3_base
 board_level = pr
@@ -158,6 +160,7 @@ custom_meshtastic_images = crowpanel_5_0.svg, crowpanel_7_0.svg
 custom_meshtastic_tags = Elecrow
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = crowpanel_large_esp32s3_base
 build_flags =
@@ -23,6 +23,4 @@ build_flags = ${esp32s3_base.build_flags}

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.5
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  zinggjm/GxEPD2@1.6.8
@@ -8,7 +8,6 @@
 #define EXT_NOTIFY_OUT 22
 #define BUTTON_PIN 0 // 17

-// #define LED_PIN PIN_LED
 // Board has RGB LED 21
 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 1                     // How many neopixels are connected
@@ -6,6 +6,10 @@ board_check = true
 board_build.partitions = default_16MB.csv
 upload_protocol = esptool

+build_src_filter =
+  ${esp32s3_base.build_src_filter}
+  +<../variants/esp32s3/hackaday-communicator>
+
 build_flags = ${esp32s3_base.build_flags} 
  -D HACKADAY_COMMUNICATOR
  -D BOARD_HAS_PSRAM
@@ -13,4 +17,4 @@ build_flags = ${esp32s3_base.build_flags}

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-Arduino_GFX packageName=https://github.com/meshtastic/Arduino_GFX gitBranch=master
-  https://github.com/meshtastic/Arduino_GFX/archive/054e81ffaf23784830a734e3c184346789349406.zip
+  https://github.com/meshtastic/Arduino_GFX/archive/054e81ffaf23784830a734e3c184346789349406.zip
@@ -0,0 +1,6 @@
+#include "variant.h"
+#include "Arduino.h"
+void earlyInitVariant()
+{
+    pinMode(KB_INT, INPUT);
+}
@@ -16,22 +16,12 @@
 #define SLEEP_TIME 120

 #define GPS_DEFAULT_NOT_PRESENT 1
-// #define GPS_RX_PIN 44
-// #define GPS_TX_PIN 43
-
-// #define BATTERY_PIN 4 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-//  ratio of voltage divider = 2.0 (RD2=100k, RD3=100k)
-// #define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
-// #define ADC_CHANNEL ADC1_GPIO4_CHANNEL

 // keyboard
 #define I2C_SDA 47 // I2C pins for this board
 #define I2C_SCL 14
-// #define KB_POWERON -1                  // must be set to HIGH
-// #define KB_SLAVE_ADDRESS TDECK_KB_ADDR // 0x55
 // #define KB_BL_PIN 46                   // not used for now
 #define KB_INT 13
-#define CANNED_MESSAGE_MODULE_ENABLE 1

 #define TFT_DC 39
 #define TFT_CS 41
@@ -44,11 +34,9 @@
 #define LORA_MOSI 3
 #define LORA_CS 17

-// #define LORA_DIO0 -1 // a No connect on the SX1262 module
 #define LORA_RESET 18
 #define LORA_DIO1 16 // SX1262 IRQ
 #define LORA_DIO2 15 // SX1262 BUSY
-// #define LORA_DIO3    // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled

 #define SX126X_CS LORA_CS
 #define SX126X_DIO1 LORA_DIO1
@@ -58,4 +46,5 @@
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

-// #define LED_PIN 1
+#define LED_NOTIFICATION 1
+#define LED_STATE_ON 0
@@ -6,4 +6,5 @@ board_build.partitions = default_8MB.csv
 build_flags = 
  ${esp32s3_base.build_flags} -I variants/esp32s3/heltec_capsule_sensor_v3
  -D HELTEC_CAPSULE_SENSOR_V3
+  -ULED_BUILTIN
  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
@@ -1,5 +1,5 @@
-#define LED_PIN 33
-#define LED_PIN2 34
+#define LED_POWER 33
+#define LED_POWER2 34
 #define EXT_PWR_DETECT 35

 #define BUTTON_PIN 18
@@ -7,7 +7,4 @@ build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/heltec_sensor_hub
  -D HELTEC_SENSOR_HUB
-
-lib_deps = ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.2
+  -ULED_BUILTIN
@@ -18,3 +18,4 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D HELTEC_V3
  -I variants/esp32s3/heltec_v3
+  -ULED_BUILTIN
@@ -1,4 +1,4 @@
-#define LED_PIN LED
+#define LED_POWER LED

 #define USE_SSD1306 // Heltec_v3 has a SSD1306 display

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

@@ -6,7 +6,9 @@ board_build.partitions = default_16MB.csv
 build_flags = 
  ${esp32s3_base.build_flags}
  -D HELTEC_V4
+  -D HAS_LORA_FEM=1
  -I variants/esp32s3/heltec_v4
+  -ULED_BUILTIN


 [env:heltec-v4]
@@ -20,13 +22,14 @@ custom_meshtastic_images = heltec_v4.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = heltec_v4_base
 build_flags = 
  ${heltec_v4_base.build_flags}
  -D HELTEC_V4_OLED
  -D USE_SSD1306 ; Heltec_v4 has an SSD1315 display (compatible with SSD1306 driver)
-  -D LED_PIN=35
+  -D LED_POWER=35
  -D RESET_OLED=21
  -D I2C_SDA=17
  -D I2C_SCL=18
@@ -66,7 +69,10 @@ build_flags =
  -D INPUTDRIVER_BUTTON_TYPE=0
  -D HAS_SCREEN=1
  -D HAS_TFT=1
-  -D RAM_SIZE=1560
+  -D MAP_TILES_GREY ; required for 2MB PSRAM
+  -D RAM_SIZE=1432
+  -D STBI_ARENA_SIZE=450000
+  -D LV_CACHE_DEF_SIZE=0
  -D LV_LVGL_H_INCLUDE_SIMPLE
  -D LV_CONF_INCLUDE_SIMPLE
  -D LV_COMP_CONF_INCLUDE_SIMPLE
@@ -81,9 +87,9 @@ build_flags =
  -D USE_PACKET_API
  -D LGFX_DRIVER=LGFX_HELTEC_V4_TFT
  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_HELTEC_V4_TFT.h\"
-  -D VIEW_320x240
-  -D MAP_FULL_REDRAW
-  -D DISPLAY_SIZE=320x240 ; landscape mode
+  -D VIEW_240x320
+  -D DISPLAY_SET_RESOLUTION
+  -D DISPLAY_SIZE=240x320 ; portrait mode
  -D LGFX_PIN_SCK=17
  -D LGFX_PIN_MOSI=33
  -D LGFX_PIN_DC=16
@@ -124,11 +130,8 @@ build_flags =
  -D SCREEN_TOUCH_RST=TOUCH_RST_PIN

 lib_deps = ${heltec_v4_base.lib_deps}
-  ; ${device-ui_base.lib_deps}
+  ${device-ui_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.0
+  lovyan03/LovyanGFX@1.2.19
  # renovate: datasource=git-refs depName=Quency-D_chsc6x packageName=https://github.com/Quency-D/chsc6x gitBranch=master
-  https://github.com/Quency-D/chsc6x/archive/5cbead829d6b432a8d621ed1aafd4eb474fd4f27.zip
-  ; TODO revert to official device-ui (when merged)
-  # renovate: datasource=git-refs depName=Quency-D_device-ui packageName=https://github.com/Quency-D/device-ui gitBranch=heltec-v4-tft
-  https://github.com/Quency-D/device-ui/archive/7c9870b8016641190b059bdd90fe16c1012a39eb.zip
+  https://github.com/Quency-D/chsc6x/archive/5cbead829d6b432a8d621ed1aafd4eb474fd4f27.zip
@@ -30,8 +30,8 @@
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

 // ---- GC1109 RF FRONT END CONFIGURATION ----
-// The Heltec V4 uses a GC1109 FEM chip with integrated PA and LNA
-// RF path: SX1262 -> GC1109 PA -> Pi attenuator -> Antenna
+// The Heltec V4.2 uses a GC1109 FEM chip with integrated PA and LNA
+// RF path: SX1262 -> Pi attenuator -> GC1109 PA -> Antenna
 // Measured net TX gain (non-linear due to PA compression):
 //   +11dB at 0-15dBm input  (e.g., 10dBm in -> 21dBm out)
 //   +10dB at 16-17dBm input
@@ -47,15 +47,31 @@
 //   CSD (pin 4)  -> GPIO2: Chip enable (HIGH=on, LOW=shutdown)
 //   CPS (pin 5)  -> GPIO46: PA mode select (HIGH=full PA, LOW=bypass)
 //   VCC0/VCC1    -> Vfem via U3 LDO, controlled by GPIO7
-#define USE_GC1109_PA
-#define LORA_PA_POWER 7  // VFEM_Ctrl - GC1109 LDO power enable
-#define LORA_PA_EN 2     // CSD - GC1109 chip enable (HIGH=on)
-#define LORA_PA_TX_EN 46 // CPS - GC1109 PA mode (HIGH=full PA, LOW=bypass)
-
 // GC1109 FEM: TX/RX path switching is handled by DIO2 -> CTX pin (via SX126X_DIO2_AS_RF_SWITCH)
-// GPIO46 is CPS (PA mode), not TX control - setTransmitEnable() handles it in SX126xInterface.cpp
 // Do NOT use SX126X_TXEN/RXEN as that would cause double-control of GPIO46

+#define LORA_PA_POWER 7         // VFEM_Ctrl - GC1109 and KCT8103L LDO power enable
+#define LORA_GC1109_PA_EN 2     // CSD - GC1109 chip enable (HIGH=on)
+#define LORA_GC1109_PA_TX_EN 46 // CPS - GC1109 PA mode (HIGH=full PA, LOW=bypass)
+
+// ---- KCT8103L RF FRONT END CONFIGURATION ----
+// The Heltec V4.3 uses a KCT8103L FEM chip with integrated PA and LNA
+// RF path: SX1262 -> Pi attenuator -> KCT8103L PA -> Antenna
+// Control logic (from KCT8103L datasheet):
+//   Transmit PA:     CSD=1, CTX=1, CPS=1
+//   Receive LNA:     CSD=1, CTX=0, CPS=X  (21dB gain, 1.9dB NF)
+//   Receive bypass:  CSD=1, CTX=1, CPS=0
+//   Shutdown:        CSD=0, CTX=X, CPS=X
+// Pin mapping:
+//   CPS (pin 5)  -> SX1262 DIO2: TX/RX path select (automatic via SX126X_DIO2_AS_RF_SWITCH)
+//   CSD (pin 4)  -> GPIO2: Chip enable (HIGH=on, LOW=shutdown)
+//   CTX (pin 6)  -> GPIO5: Switch between Receive LNA Mode and Receive Bypass Mode. (HIGH=RX bypass, LOW=RX LNA)
+//   VCC0/VCC1    -> Vfem via U3 LDO, controlled by GPIO7
+// KCT8103L FEM: TX/RX path switching is handled by DIO2 -> CPS pin (via SX126X_DIO2_AS_RF_SWITCH)
+
+#define LORA_KCT8103L_PA_CSD 2 // CSD - KCT8103L chip enable (HIGH=on)
+#define LORA_KCT8103L_PA_CTX 5 // CTX - Switch between Receive LNA Mode and Receive Bypass Mode. (HIGH=RX bypass, LOW=RX LNA)
+
 #if HAS_TFT
 #define USE_TFTDISPLAY 1
 #endif
@@ -11,6 +11,7 @@
 // Applets
 #include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/DM/DMApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/FavoritesMap/FavoritesMapApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
@@ -87,6 +88,7 @@ void setupNicheGraphics()
    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // -
    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // -
    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
+    inkhud->addApplet("Favorites Map", new InkHUD::FavoritesMapApplet);          // -
    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // -
    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, not autoshown, default on tile 0

@@ -114,4 +116,4 @@ void setupNicheGraphics()
    buttons->start();
 }

-#endif
+#endif
@@ -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;

@@ -9,6 +9,7 @@ custom_meshtastic_images = heltec-vision-master-e213.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 8MB
+custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = heltec_vision_master_e213
@@ -29,7 +30,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
+  https://github.com/meshtastic/GxEPD2/archive/c7eb4c3c167cf396ef4f541cc5d4c6aa42f3c46b.zip
 upload_speed = 115200

 [env:heltec-vision-master-e213-inkhud]
@@ -1,4 +1,4 @@
-#define LED_PIN 45 // LED is not populated on earliest board variant
+#define LED_POWER 45 // LED is not populated on earliest board variant
 #define BUTTON_PIN 0
 #define PIN_BUTTON2 21             // Second built-in button
 #define ALT_BUTTON_PIN PIN_BUTTON2 // Send the up event
@@ -24,6 +24,7 @@ Different NicheGraphics UIs and different hardware variants will each have their
 // Applets
 #include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/DM/DMApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/FavoritesMap/FavoritesMapApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
@@ -84,6 +85,7 @@ void setupNicheGraphics()
    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // -
    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // -
    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
+    inkhud->addApplet("Favorites Map", new InkHUD::FavoritesMapApplet);          // -
    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // -
    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, not autoshown, default on tile 0

@@ -111,4 +113,4 @@ void setupNicheGraphics()
    buttons->start();
 }

-#endif
+#endif
@@ -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;

@@ -10,6 +10,7 @@ custom_meshtastic_images = heltec-vision-master-e290.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 8MB
+custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = heltec_vision_master_e290
@@ -32,7 +33,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
+  https://github.com/meshtastic/GxEPD2/archive/c7eb4c3c167cf396ef4f541cc5d4c6aa42f3c46b.zip
 upload_speed = 115200

 [env:heltec-vision-master-e290-inkhud]
@@ -1,4 +1,4 @@
-#define LED_PIN 45 // LED is not populated on earliest board variant
+#define LED_POWER 45 // LED is not populated on earliest board variant
 #define BUTTON_PIN 0
 #define PIN_BUTTON2 21             // Second built-in button
 #define ALT_BUTTON_PIN PIN_BUTTON2 // Send the up event
@@ -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/Show More
+++ b/Show More