Merge branch 'develop' into t-display-s3-pro

2026-10-22 03:02:08 +10:00 · 2026-05-11 10:37:31 +01:00
parent 3d6f8a3ace 94bb21ecc7
commit f6f5bfab80
511 changed files with 37643 additions and 3373 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.4
@@ -8,9 +8,8 @@ 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.19
+  lovyan03/LovyanGFX@1.2.21
@@ -10,7 +10,6 @@ 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>
@@ -14,4 +14,3 @@ build_flags =
  ${esp32_base.build_flags}
  -D DIY_V1
  -I variants/esp32/diy/hydra
-  -ULED_BUILTIN
@@ -17,4 +17,3 @@ build_flags =
  -D DIY_V1
  -D EBYTE_E22
  -I variants/esp32/diy/v1
-  -ULED_BUILTIN
@@ -39,7 +39,6 @@ build_flags =
  -Wall
  -Wextra
  -Isrc/platform/esp32
-  -include mbedtls/error.h
  -std=gnu++17
  -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG
  -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
@@ -68,11 +67,11 @@ 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/b78f12c86ea65c3ca08968840ff554ff7ed69b60.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
  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
-  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
+  https://github.com/dbinfrago/libpax/archive/df424747f9acb86ab07c5a206ded1e8e3650726a.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
@@ -14,4 +14,3 @@ build_flags =
  ${esp32_base.build_flags}
  -D HELTEC_V2_1
  -I variants/esp32/heltec_v2.1
-  -ULED_BUILTIN
@@ -14,4 +14,3 @@ build_flags =
  ${esp32_base.build_flags}
  -D HELTEC_V2_0
  -I variants/esp32/heltec_v2
-  -ULED_BUILTIN
@@ -10,6 +10,7 @@ build_flags =
  -D BOARD_HAS_PSRAM
  -D RADIOLIB_EXCLUDE_LR11X0=1
  -D RADIOLIB_EXCLUDE_SX128X=1
+  -D RADIOLIB_EXCLUDE_LR2021=1
  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
  -D MESHTASTIC_EXCLUDE_DETECTIONSENSOR=1
  -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
@@ -35,4 +35,4 @@ lib_ignore =
 lib_deps = 
  ${esp32_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21
@@ -19,7 +19,7 @@ build_flags =
 lib_deps = 
  ${esp32_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.8
+  zinggjm/GxEPD2@1.6.9
  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
  lewisxhe/SensorLib@0.3.4
 lib_ignore =
@@ -14,4 +14,3 @@ build_flags =
  ${esp32_base.build_flags}
  -D NANO_G1_EXPLORER
  -I variants/esp32/nano-g1-explorer
-  -ULED_BUILTIN
@@ -14,4 +14,3 @@ build_flags =
  ${esp32_base.build_flags}
  -D NANO_G1
  -I variants/esp32/nano-g1
-  -ULED_BUILTIN
@@ -9,7 +9,6 @@ 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,6 +13,5 @@ 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,6 +16,5 @@ 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
@@ -14,4 +14,3 @@ build_flags =
  ${esp32_base.build_flags}
  -D STATION_G1
  -I variants/esp32/station-g1
-  -ULED_BUILTIN
@@ -16,7 +16,6 @@ board_check = true
 build_flags = ${esp32_base.build_flags}
  -D TBEAM_V10
  -I variants/esp32/tbeam
-  -ULED_BUILTIN
 upload_speed = 921600

 [env:tbeam-displayshield]
@@ -35,9 +35,10 @@
 // code)
 #endif

-// Leave undefined to disable our PMU IRQ handler.  DO NOT ENABLE THIS because the pmuirq can cause sperious interrupts
-// and waking from light sleep
-// #define PMU_IRQ 35
+// Voiding more warranties.
+#define PMU_IRQ 35
+#define PMU_POWER_BUTTON_IS_CANCEL // maps a short click of the power button to a cancel action (turning off the screen)
+
 #define HAS_AXP192
 #define GPS_UBLOX
 #define GPS_RX_PIN 34
@@ -13,5 +13,4 @@ build_flags =
  ${esp32_base.build_flags}
  -D TLORA_V1
  -I variants/esp32/tlora_v1
-  -ULED_BUILTIN
 upload_speed = 115200
@@ -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 -ULED_BUILTIN
+  ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16
 upload_speed = 115200

 [env:sugarcube]
@@ -7,5 +7,4 @@ build_flags =
  -D TLORA_V2_1_16
  -I variants/esp32/tlora_v2_1_16
  -D LORA_TCXO_GPIO=33
-  -ULED_BUILTIN
 upload_speed = 115200
@@ -7,4 +7,3 @@ build_flags =
  -I variants/esp32/tlora_v2_1_16
  -D LORA_TCXO_GPIO=12
  -D BUTTON_PIN=0
-  -ULED_BUILTIN
@@ -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.19
+  lovyan03/LovyanGFX@1.2.21
  # 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
@@ -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.4
@@ -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.4
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@2.3.7
 build_flags = 
@@ -8,4 +8,3 @@ build_flags =
  -I variants/esp32c6/tlora_c6
  -DARDUINO_USB_CDC_ON_BOOT=1
  -DARDUINO_USB_MODE=1
-  -ULED_BUILTIN
@@ -9,11 +9,11 @@ void earlyInitVariant()
    io.pinMode(PCA_PIN_EINK_EN, OUTPUT);
    io.pinMode(PCA_PIN_POWER_EN, OUTPUT);
    io.pinMode(PCA_LED_POWER, OUTPUT);
-    io.pinMode(PCA_LED_USER, OUTPUT);
+    io.pinMode(PCA_LED_NOTIFICATION, OUTPUT);
    io.pinMode(PCA_LED_ENABLE, OUTPUT);

    io.digitalWrite(PCA_PIN_POWER_EN, HIGH);
-    io.digitalWrite(PCA_LED_USER, LOW);
+    io.digitalWrite(PCA_LED_NOTIFICATION, LOW);
    io.digitalWrite(PCA_LED_ENABLE, LOW);
 }

@@ -8,9 +8,9 @@

 // LED
 // Both of these are on the GPIO expander
-#define PCA_LED_USER 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 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
@@ -18,7 +18,7 @@
 #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

@@ -86,6 +86,7 @@

 #define BUTTON_PIN PIN_BUTTON1
 #define BUTTON_PIN_ALT PIN_BUTTON2
+#define ALT_BUTTON_WAKE

 #define SERIAL_PRINT_PORT 0
 #endif
@@ -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.8
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
+  zinggjm/GxEPD2@1.6.9
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -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.4
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -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.8
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
+  zinggjm/GxEPD2@1.6.9
@@ -6,5 +6,4 @@ 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,6 +1,7 @@
 #define LED_POWER 33
 #define LED_POWER2 34
 #define EXT_PWR_DETECT 35
+#define EXT_PWR_DETECT_MODE INPUT_PULLUP

 #define BUTTON_PIN 18
 #define BUTTON_ACTIVE_LOW false
@@ -7,8 +7,3 @@ build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/heltec_sensor_hub
  -D HELTEC_SENSOR_HUB
-  -ULED_BUILTIN
-
-lib_deps = ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
@@ -1,4 +1,5 @@
 #define EXT_PWR_DETECT 20
+#define EXT_PWR_DETECT_MODE INPUT_PULLUP

 #define BUTTON_PIN 17
 #define BUTTON_ACTIVE_LOW false
@@ -18,4 +18,3 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D HELTEC_V3
  -I variants/esp32s3/heltec_v3
-  -ULED_BUILTIN
@@ -8,7 +8,6 @@ build_flags =
  -D HELTEC_V4
  -D HAS_LORA_FEM=1
  -I variants/esp32s3/heltec_v4
-  -ULED_BUILTIN


 [env:heltec-v4]
@@ -22,6 +21,7 @@ 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 = 
@@ -89,8 +89,10 @@ build_flags =
  -D VIEW_240x320
  -D DISPLAY_SET_RESOLUTION
  -D DISPLAY_SIZE=240x320 ; portrait mode
+  -D LGFX_SPI_3WIRE=true
  -D LGFX_PIN_SCK=17
  -D LGFX_PIN_MOSI=33
+  -D LGFX_PIN_MISO=-1
  -D LGFX_PIN_DC=16
  -D LGFX_PIN_CS=15
  -D LGFX_PIN_BL=21
@@ -120,10 +122,10 @@ build_flags =
  -D TFT_OFFSET_Y=0
  -D TFT_OFFSET_ROTATION=0
  -D SCREEN_ROTATE
-  -D SCREEN_TRANSITION_FRAMERATE=5
+  -D SCREEN_TRANSITION_FRAMERATE=30
  -D BRIGHTNESS_DEFAULT=130 ; Medium Low Brightness
  -D HAS_TOUCHSCREEN=1
-  -D TOUCH_I2C_PORT=0
+  -D TOUCH_I2C_PORT=1
  -D TOUCH_SLAVE_ADDRESS=0x2E
  -D SCREEN_TOUCH_INT=TOUCH_INT_PIN
  -D SCREEN_TOUCH_RST=TOUCH_RST_PIN
@@ -131,6 +133,6 @@ build_flags =
 lib_deps = ${heltec_v4_base.lib_deps}
  ${device-ui_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21
  # 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
+  https://github.com/Quency-D/chsc6x/archive/5cbead829d6b432a8d621ed1aafd4eb474fd4f27.zip
@@ -0,0 +1,56 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 17;
+static const uint8_t SCL = 18;
+
+static const uint8_t SS = 8;
+static const uint8_t MOSI = 10;
+static const uint8_t MISO = 11;
+static const uint8_t SCK = 9;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+static const uint8_t A18 = 19;
+static const uint8_t A19 = 20;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+#endif /* Pins_Arduino_h */
@@ -0,0 +1,145 @@
+[heltec_v4_r8_base] 
+extends = esp32s3_base
+board = heltec_v4_r8
+board_check = true
+board_build.partitions = default_16MB.csv
+build_flags = 
+  ${esp32s3_base.build_flags}
+  -D HELTEC_V4_R8
+  -D HAS_LORA_FEM=1
+  -D BOARD_HAS_PSRAM
+  -I variants/esp32s3/heltec_v4_r8
+  -ULED_BUILTIN
+
+[env:heltec-v4-r8-oled]
+custom_meshtastic_hw_model = 132
+custom_meshtastic_hw_model_slug = HELTEC_V4_R8
+custom_meshtastic_architecture = esp32-s3
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 1
+custom_meshtastic_display_name = Heltec V4 R8
+custom_meshtastic_images = heltec_v4_r8.svg
+custom_meshtastic_tags = Heltec
+custom_meshtastic_requires_dfu = true
+custom_meshtastic_partition_scheme = 16MB
+
+extends = heltec_v4_r8_base
+build_flags = 
+  ${heltec_v4_r8_base.build_flags}
+  -D HELTEC_V4_R8_OLED
+  -D USE_SSD1306 ; Heltec_v4_R8 has an SSD1315 display (compatible with SSD1306 driver)
+  -D LED_POWER=46
+  -D RESET_OLED=21
+  -D I2C_SDA=17
+  -D I2C_SCL=18
+
+[env:heltec-v4-r8-tft]
+custom_meshtastic_hw_model = 132
+custom_meshtastic_hw_model_slug = HELTEC_V4_R8
+custom_meshtastic_architecture = esp32-s3
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 1
+custom_meshtastic_display_name = Heltec V4 R8 TFT
+custom_meshtastic_images = heltec_v4_r8_tft.svg
+custom_meshtastic_tags = Heltec
+custom_meshtastic_requires_dfu = true
+custom_meshtastic_partition_scheme = 16MB
+
+extends = heltec_v4_r8_base
+build_flags = 
+  ${heltec_v4_r8_base.build_flags} ;-Os
+  -D HELTEC_V4_R8_TFT
+  -D I2C_SDA=17
+  -D I2C_SCL=18
+  -D PIN_BUTTON2=46
+  -D ALT_BUTTON_PIN=PIN_BUTTON2
+  -D ALT_BUTTON_ACTIVE_LOW=false
+  -D PIN_BUZZER=4
+  -D USE_PIN_BUZZER=PIN_BUZZER
+  -D CONFIG_ARDUHAL_LOG_COLORS
+  -D RADIOLIB_DEBUG_SPI=0
+  -D RADIOLIB_DEBUG_PROTOCOL=0
+  -D RADIOLIB_DEBUG_BASIC=0
+  -D RADIOLIB_VERBOSE_ASSERT=0
+  -D RADIOLIB_SPI_PARANOID=0
+  -D CONFIG_DISABLE_HAL_LOCKS=1
+  -D INPUTDRIVER_BUTTON_TYPE=0
+  -D HAS_SCREEN=1
+  -D HAS_TFT=1
+  -D RAM_SIZE=5120
+  -D LV_LVGL_H_INCLUDE_SIMPLE
+  -D LV_CONF_INCLUDE_SIMPLE
+  -D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D LV_USE_SYSMON=0
+  -D LV_USE_PROFILER=0
+  -D LV_USE_PERF_MONITOR=0
+  -D LV_USE_MEM_MONITOR=0
+  -D LV_USE_LOG=0
+  -D LV_BUILD_TEST=0
+  -D USE_LOG_DEBUG
+  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
+  -D USE_PACKET_API
+  -D LGFX_DRIVER=LGFX_HELTEC_V4_TFT
+  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_HELTEC_V4_TFT.h\"
+  -D VIEW_240x320
+  -D DISPLAY_SET_RESOLUTION
+  -D DISPLAY_SIZE=240x320 ; portrait mode
+  -D LGFX_SPI_3WIRE=false
+  -D LGFX_PIN_SCK=16
+  -D LGFX_PIN_MOSI=15
+  -D LGFX_PIN_MISO=45
+  -D LGFX_PIN_DC=48
+  -D LGFX_PIN_CS=47
+  -D LGFX_PIN_BL=44
+  -D LGFX_PIN_RST=21
+  -D CUSTOM_TOUCH_DRIVER
+  -D TOUCH_SDA_PIN=I2C_SDA
+  -D TOUCH_SCL_PIN=I2C_SCL
+  -D TOUCH_INT_PIN=-1
+  -D TOUCH_RST_PIN=-1
+;base UI
+  -D TFT_CS=LGFX_PIN_CS
+  -D ST7789_CS=TFT_CS
+  -D ST7789_RS=LGFX_PIN_DC
+  -D ST7789_SDA=LGFX_PIN_MOSI
+  -D ST7789_SCK=LGFX_PIN_SCK
+  -D ST7789_RESET=LGFX_PIN_RST
+  -D ST7789_MISO=LGFX_PIN_MISO
+  -D ST7789_BUSY=-1
+  -D ST7789_BL=LGFX_PIN_BL
+  -D ST7789_SPI_HOST=SPI3_HOST
+  -D TFT_BL=ST7789_BL
+  -D SPI_FREQUENCY=75000000
+  -D SPI_READ_FREQUENCY=SPI_FREQUENCY
+  -D SPI_3_WIRE=false
+  -D TFT_HEIGHT=320
+  -D TFT_WIDTH=240
+  -D TFT_OFFSET_X=0
+  -D TFT_OFFSET_Y=0
+  -D TFT_OFFSET_ROTATION=0
+  -D SCREEN_ROTATE
+  -D SCREEN_TRANSITION_FRAMERATE=5
+  -D BRIGHTNESS_DEFAULT=130 ; Medium Low Brightness
+  -D HAS_TOUCHSCREEN=1
+  -D TOUCH_I2C_PORT=0
+  -D TOUCH_SLAVE_ADDRESS=0x2E
+  -D SCREEN_TOUCH_INT=TOUCH_INT_PIN
+  -D SCREEN_TOUCH_RST=TOUCH_RST_PIN
+
+; Have SPI interface SD card slot
+  -D HAS_SDCARD
+  -D SDCARD_USE_SPI1
+  -D SDCARD_USER_SPI_BEGIN
+  -D SPI_MOSI=LGFX_PIN_MOSI
+  -D SPI_SCK=LGFX_PIN_SCK
+  -D SPI_MISO=LGFX_PIN_MISO
+  -D SPI_CS=3
+  -D SDCARD_CS=SPI_CS
+  -D SD_SPI_FREQUENCY=SPI_FREQUENCY
+
+lib_deps = ${heltec_v4_r8_base.lib_deps}
+  ${device-ui_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
+  lovyan03/LovyanGFX@1.2.21
+  # renovate: datasource=git-refs depName=Quency-D_chsc6x packageName=https://github.com/Quency-D/chsc6x gitBranch=master
+  https://github.com/Quency-D/chsc6x/archive/3b2b6cebf3177b3e2c33d06e07909b0b10159516.zip
@@ -0,0 +1,72 @@
+#define VEXT_ENABLE 40 // active low, powers the oled display and the lora antenna boost
+#define VEXT_ON_VALUE LOW
+#define BUTTON_PIN 0
+
+#define BATTERY_PIN 1 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+#define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
+#define ADC_MULTIPLIER 4.9 * 1.035
+
+#define USE_SX1262
+#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_RESET 12
+#define LORA_DIO1 14 // SX1262 IRQ
+#define LORA_DIO2 13 // SX1262 BUSY
+#define LORA_DIO3    // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TCXO is enabled
+
+#define LORA_SCK 9
+#define LORA_MISO 11
+#define LORA_MOSI 10
+#define LORA_CS 8
+
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+
+// Enable Traffic Management Module for Heltec V4
+#ifndef HAS_TRAFFIC_MANAGEMENT
+#define HAS_TRAFFIC_MANAGEMENT 1
+#endif
+#ifndef TRAFFIC_MANAGEMENT_CACHE_SIZE
+#define TRAFFIC_MANAGEMENT_CACHE_SIZE 2048
+#endif
+
+// ---- 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 USE_KCT8103L_PA
+#define LORA_PA_POWER 7        // VFEM_Ctrl - KCT8103L LDO power enable
+#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
+/*
+ * GPS pins
+ */
+#define GPS_L76K
+#define PIN_GPS_EN (42)
+#define GPS_EN_ACTIVE LOW
+#define PERIPHERAL_WARMUP_MS 1000 // Make sure I2C QuickLink has stable power before continuing
+#define PIN_GPS_PPS (41)
+// Seems to be missing on this new board
+#define GPS_TX_PIN (38) // This is for bits going TOWARDS the CPU
+#define GPS_RX_PIN (39) // This is for bits going TOWARDS the GPS
+#define GPS_THREAD_INTERVAL 50
@@ -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
@@ -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
@@ -20,5 +20,5 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
-  https://github.com/meshtastic/st7789/archive/9ee76d6b18b9a8f45a2c5cae06b1134a587691eb.zip
+  https://github.com/meshtastic/st7789/archive/5180423ae2dbf5885168a8bfb308c7fb7eff6930.zip
 upload_speed = 921600
@@ -9,6 +9,7 @@ custom_meshtastic_display_name = Heltec Wireless Paper
 custom_meshtastic_images = heltec-wireless-paper.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_partition_scheme = 8MB
+custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
@@ -24,4 +24,4 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21
@@ -22,4 +22,4 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21
@@ -21,4 +21,4 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21
@@ -17,4 +17,3 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D HELTEC_WSL_V3
  -I variants/esp32s3/heltec_wsl_v3
-  -ULED_BUILTIN
@@ -11,3 +11,4 @@ build_flags =
  -DRADIOLIB_EXCLUDE_SX128X=1
  -DRADIOLIB_EXCLUDE_SX127X=1
  -DRADIOLIB_EXCLUDE_LR11X0=1
+  -DRADIOLIB_EXCLUDE_LR2021=1
@@ -10,18 +10,13 @@ build_flags =
  -D M5STACK_CARDPUTER_ADV
  -D ARDUINO_USB_CDC_ON_BOOT=1
  -I variants/esp32s3/m5stack_cardputer_adv
-build_src_filter =
-  ${esp32s3_base.build_src_filter}
-  +<../variants/esp32s3/m5stack_cardputer_adv>
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
-  https://github.com/meshtastic/st7789/archive/9ee76d6b18b9a8f45a2c5cae06b1134a587691eb.zip
+  https://github.com/meshtastic/st7789/archive/5180423ae2dbf5885168a8bfb308c7fb7eff6930.zip
  # renovate: datasource=github-tags depName=pschatzmann_arduino-audio-driver packageName=pschatzmann/arduino-audio-driver
  https://github.com/pschatzmann/arduino-audio-driver/archive/v0.2.1.zip
  # 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=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
@@ -1,40 +0,0 @@
-#include "AudioBoard.h"
-#include "configuration.h"
-
-DriverPins PinsAudioBoardES8311;
-AudioBoard board(AudioDriverES8311, PinsAudioBoardES8311);
-
-// M5stack Cardputer ADV specific init
-
-void lateInitVariant()
-{
-    // AudioDriverLogger.begin(Serial, AudioDriverLogLevel::Debug);
-    //  I2C: function, scl, sda
-    PinsAudioBoardES8311.addI2C(PinFunction::CODEC, Wire);
-    // I2S: function, mclk, bck, ws, data_out, data_in
-    PinsAudioBoardES8311.addI2S(PinFunction::CODEC, DAC_I2S_MCLK, DAC_I2S_BCK, DAC_I2S_WS, DAC_I2S_DOUT, DAC_I2S_DIN);
-
-    // configure codec
-    CodecConfig cfg;
-    cfg.input_device = ADC_INPUT_LINE1;
-    cfg.output_device = DAC_OUTPUT_ALL;
-    cfg.i2s.bits = BIT_LENGTH_16BITS;
-    cfg.i2s.rate = RATE_44K;
-    board.begin(cfg);
-
-    // extra ES8311 init
-    auto es8311_write_reg = [](uint8_t reg, uint8_t val) {
-        Wire.beginTransmission(0x18); // ES8311 i2c address
-        Wire.write(reg);
-        Wire.write(val);
-        Wire.endTransmission();
-    };
-    es8311_write_reg(0x00, 0x80); // reset, power on
-    es8311_write_reg(0x01, 0xB5); // MCLK = BCLK
-    es8311_write_reg(0x02, 0x18); // CLOCK_MANAGER/ MULT_PRE=3
-    es8311_write_reg(0x0D, 0x01); // analog power up
-    es8311_write_reg(0x12, 0x00); // DAC power up
-    es8311_write_reg(0x13, 0x10); // enable HP drive
-    es8311_write_reg(0x32, 0xBF); // DAC volume (0dB)
-    es8311_write_reg(0x37, 0x08); // EQ bypass
-}
@@ -9,6 +9,7 @@
 #define ST7789_BUSY -1
 // #define VTFT_CTRL 38
 #define VTFT_LEDA 38
+#define TFT_BACKLIGHT_ON HIGH
 // #define ST7789_BL (32+6)
 #define ST7789_SPI_HOST SPI2_HOST
 // #define TFT_BL (32+6)
@@ -12,6 +12,7 @@ build_flags = ${esp32s3_base.build_flags}
  -D CONFIG_ARDUHAL_ESP_LOG
  -D CONFIG_ARDUHAL_LOG_COLORS=1
  -D CONFIG_DISABLE_HAL_LOCKS=1
+  -D MESHTASTIC_EXCLUDE_SCREEN=1
  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
  -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
  -D MESHTASTIC_EXCLUDE_BLUETOOTH=1
@@ -31,7 +32,10 @@ build_flags = ${esp32s3_base.build_flags}
  -D HAS_SCREEN=0
  -D HAS_TFT=1
  -D USE_PIN_BUZZER
-  -D RAM_SIZE=1024
+  -D MAP_TILES_GREY ; required for 2MB PSRAM
+  -D RAM_SIZE=1432
+  -D STBI_ARENA_SIZE=450000
+  -D LV_CACHE_DEF_SIZE=0
  -D LGFX_DRIVER_TEMPLATE
  -D LGFX_DRIVER=LGFX_GENERIC
  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\"
@@ -51,7 +55,7 @@ lib_deps =
  ${esp32s3_base.lib_deps}
  ${device-ui_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21

 [mesh_tab_xpt2046]
 extends = mesh_tab_base
@@ -98,7 +98,7 @@ void setupNicheGraphics()
    buttons->setTwoWayRockerPressHandlers(
        [inkhud]() {
            bool systemHandlingInput = false;
-            for (InkHUD::SystemApplet *sa : inkhud->systemApplets) {
+            for (const InkHUD::SystemApplet *sa : inkhud->systemApplets) {
                if (sa->handleInput) {
                    systemHandlingInput = true;
                    break;
@@ -112,7 +112,7 @@ void setupNicheGraphics()
        },
        [inkhud]() {
            bool systemHandlingInput = false;
-            for (InkHUD::SystemApplet *sa : inkhud->systemApplets) {
+            for (const InkHUD::SystemApplet *sa : inkhud->systemApplets) {
                if (sa->handleInput) {
                    systemHandlingInput = true;
                    break;
@@ -1,5 +1,5 @@
 [env:mini-epaper-s3]
-;custom_meshtastic_hw_model =
+custom_meshtastic_hw_model = 125
 custom_meshtastic_hw_model_slug = MINI_EPAPER_S3
 custom_meshtastic_architecture = esp32-s3
 custom_meshtastic_actively_supported = true
@@ -8,6 +8,7 @@ custom_meshtastic_display_name = LILYGO Mini ePaper S3 E-Ink
 custom_meshtastic_images = mini-epaper-s3.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = no
+custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = mini-epaper-s3
@@ -6,6 +6,7 @@ custom_meshtastic_actively_supported = true
 custom_meshtastic_support_level = 3
 custom_meshtastic_display_name = Pi Computer S3
 custom_meshtastic_partition_scheme = 8MB
+custom_meshtastic_has_mui = true

 extends = esp32s3_base
 board = bpi_picow_esp32_s3
@@ -24,7 +25,7 @@ build_flags =
 lib_deps = 
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21

 build_src_filter =
  ${esp32s3_base.build_src_filter}
@@ -47,10 +47,9 @@
 #define TFT_OFFSET_Y 0
 #define TFT_OFFSET_ROTATION 0
 #define SCREEN_ROTATE
-#define SCREEN_TRANSITION_FRAMERATE 5
+#define SCREEN_TRANSITION_FRAMERATE 30

 // Picomputer gets a white on black display
-#define TFT_MESH_OVERRIDE COLOR565(255, 255, 255)

 #define INPUTBROKER_MATRIX_TYPE 1

@@ -9,6 +9,7 @@ custom_meshtastic_images = rak_3312.svg
 custom_meshtastic_tags = RAK
 custom_meshtastic_requires_dfu = false
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = wiscore_rak3312
@@ -20,6 +20,7 @@ custom_meshtastic_display_name = RAK WisMesh Tap V2
 custom_meshtastic_images = rak-wismesh-tap-v2.svg
 custom_meshtastic_tags = RAK
 custom_meshtastic_partition_scheme = 8MB
+custom_meshtastic_has_mui = true

 extends = esp32s3_base
 board = wiscore_rak3312
@@ -36,13 +37,14 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21

 [env:rak_wismesh_tap_v2-tft]
 extends = env:rak_wismesh_tap_v2

 build_flags =
  ${env:rak_wismesh_tap_v2.build_flags}
+  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
  -D CONFIG_ARDUHAL_ESP_LOG
  -D CONFIG_ARDUHAL_LOG_COLORS=1
  -D CONFIG_DISABLE_HAL_LOCKS=1
@@ -9,7 +9,7 @@ custom_meshtastic_display_name = Seeed SenseCAP Indicator
 custom_meshtastic_images = seeed-sensecap-indicator.svg
 custom_meshtastic_tags = Seeed
 custom_meshtastic_partition_scheme = 8MB
- = true
+custom_meshtastic_has_mui = true

 extends = esp32s3_base
 platform_packages =
@@ -36,7 +36,7 @@
 #define TFT_OFFSET_ROTATION 0
 #define TFT_BL 45
 #define SCREEN_ROTATE
-#define SCREEN_TRANSITION_FRAMERATE 5 // fps
+#define SCREEN_TRANSITION_FRAMERATE 30 // fps
 #define USE_TFTDISPLAY 1

 #define HAS_TOUCHSCREEN 1
@@ -8,6 +8,7 @@ custom_meshtastic_support_level = 1
 custom_meshtastic_display_name = LILYGO T-Beam 1W
 custom_meshtastic_images = tbeam-1w.svg
 custom_meshtastic_tags = LilyGo
+custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = t-beam-1w
@@ -0,0 +1,19 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// used for keyboard, touch controller, beam sensor, and gyroscope
+static const uint8_t SDA = 13;
+static const uint8_t SCL = 14;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = 3;
+static const uint8_t MOSI = 33;
+static const uint8_t MISO = 47;
+static const uint8_t SCK = 36;
+
+#endif /* Pins_Arduino_h */
@@ -0,0 +1,41 @@
+[env:t-deck-pro-v1_1]
+custom_meshtastic_hw_model = 102
+custom_meshtastic_hw_model_slug = T_DECK_PRO
+custom_meshtastic_architecture = esp32-s3
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 1
+custom_meshtastic_display_name = LILYGO T-Deck Pro
+custom_meshtastic_images = tdeck_pro.svg
+custom_meshtastic_tags = LilyGo
+custom_meshtastic_requires_dfu = true
+custom_meshtastic_partition_scheme = 16MB
+
+extends = esp32s3_base
+board = t-deck-pro
+board_check = true
+upload_protocol = esptool
+
+build_flags = 
+  ${esp32s3_base.build_flags} -I variants/esp32s3/t-deck-pro-v1_1
+  -D T_DECK_PRO
+  -D USE_EINK
+  -D EINK_DISPLAY_MODEL=GxEPD2_310_GDEQ031T10
+  -D EINK_WIDTH=240
+  -D EINK_HEIGHT=320
+  ;-D USE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
+  -D EINK_LIMIT_FASTREFRESH=10           ; How many consecutive fast-refreshes are permitted
+  -D EINK_LIMIT_GHOSTING_PX=2000        ; (Optional) How much image ghosting is tolerated
+  -D EINK_NOT_HIBERNATE                 ; Disable hibernate to avoid issues with elink
+
+lib_deps =
+  ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
+  zinggjm/GxEPD2@1.6.9
+  # renovate: datasource=git-refs depName=CSE_Touch packageName=https://github.com/CIRCUITSTATE/CSE_Touch gitBranch=main
+  https://github.com/CIRCUITSTATE/CSE_Touch/archive/b44f23b6f870b848f1fbe453c190879bc6cfaafa.zip
+  # renovate: datasource=github-tags depName=CSE_CST328 packageName=CIRCUITSTATE/CSE_CST328
+  https://github.com/CIRCUITSTATE/CSE_CST328/archive/refs/tags/v0.0.4.zip
+  # renovate: datasource=git-refs depName=BQ27220 packageName=https://github.com/mverch67/BQ27220 gitBranch=main
+  https://github.com/mverch67/BQ27220/archive/07d92be846abd8a0258a50c23198dac0858b22ed.zip
+  # renovate: datasource=custom.pio depName=Adafruit DRV2605 packageName=adafruit/library/Adafruit DRV2605 Library
+  adafruit/Adafruit DRV2605 Library@1.2.4
@@ -0,0 +1,106 @@
+// Display (E-Ink)
+#define PIN_EINK_CS 34
+#define PIN_EINK_BUSY 37
+#define PIN_EINK_DC 35
+#define PIN_EINK_RES 16
+#define PIN_EINK_SCLK 36
+#define PIN_EINK_MOSI 47
+#define TFT_BL 45 // option , default not backlight
+
+#define I2C_SDA SDA
+#define I2C_SCL SCL
+
+// CST328 touch screen (implementation in src/platform/extra_variants/t_deck_pro/variant.cpp)
+#define HAS_TOUCHSCREEN 1
+#define CST328_PIN_INT 12
+#define CST328_PIN_RST 38
+
+#define USE_POWERSAVE
+#define SLEEP_TIME 120
+
+// GNSS
+#define HAS_GPS 1
+#define GPS_BAUDRATE 38400
+#define PIN_GPS_EN 39
+#define GPS_EN_ACTIVE 1
+#define GPS_RX_PIN 44
+#define GPS_TX_PIN 43
+#define PIN_GPS_PPS 1
+
+#define BUTTON_PIN 0
+
+// vibration motor
+#define HAS_DRV2605
+#define PIN_DRV_EN 2
+
+// Have SPI interface SD card slot
+#define HAS_SDCARD
+#define SDCARD_USE_SPI1
+#define SPI_MOSI (33)
+#define SPI_SCK (36)
+#define SPI_MISO (47)
+#define SPI_CS (48)
+#define SDCARD_CS SPI_CS
+#define SD_SPI_FREQUENCY 75000000U
+
+// TCA8418 keyboard
+#define KB_BL_PIN 42
+#define CANNED_MESSAGE_MODULE_ENABLE 1
+
+// microphone PCM5102A
+#define PCM5102A_SCK 47
+#define PCM5102A_DIN 17
+#define PCM5102A_LRCK 18
+
+// LTR_553ALS light sensor
+#define HAS_LTR553ALS
+
+// gyroscope BHI260AP
+// #define BOARD_1V8_EN 38 //Deck-Pro remove 1.8v en pin
+#define HAS_BHI260AP
+
+// battery charger BQ25896
+#define HAS_PPM 1
+#define XPOWERS_CHIP_BQ25896
+
+// battery quality management BQ27220
+#define HAS_BQ27220 1
+#define BQ27220_I2C_SDA SDA
+#define BQ27220_I2C_SCL SCL
+#define BQ27220_DESIGN_CAPACITY 1400
+
+// LoRa
+#define USE_SX1262
+#define USE_SX1268
+
+#define LORA_EN 46 // LoRa enable pin
+#define LORA_SCK 36
+#define LORA_MISO 47
+#define LORA_MOSI 33
+#define LORA_CS 3
+
+#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_RESET 4
+#define LORA_DIO1 5 // SX1262 IRQ
+#define LORA_DIO2 6 // 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 // FIXME - we really should define LORA_CS instead
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+// Not really an E22 but TTGO seems to be trying to clone that
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 2.4
+// Internally the TTGO module hooks the SX1262-DIO2 in to control the TX/RX switch (which is the default for the sx1262interface
+// code)
+
+#define MODEM_POWER_EN 41
+#define MODEM_PWRKEY 40
+#define MODEM_RST 9
+#define MODEM_RI 7
+#define MODEM_DTR 8
+#define MODEM_RX 10
+#define MODEM_TX 11
+
+#define HAS_PHYSICAL_KEYBOARD 1
@@ -9,6 +9,7 @@ custom_meshtastic_images = tdeck_pro.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = t-deck-pro
@@ -33,7 +34,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.8
+  zinggjm/GxEPD2@1.6.9
  # renovate: datasource=git-refs depName=CSE_Touch packageName=https://github.com/CIRCUITSTATE/CSE_Touch gitBranch=main
  https://github.com/CIRCUITSTATE/CSE_Touch/archive/b44f23b6f870b848f1fbe453c190879bc6cfaafa.zip
  # renovate: datasource=github-tags depName=CSE_CST328 packageName=CIRCUITSTATE/CSE_CST328
@@ -10,6 +10,7 @@ custom_meshtastic_images = t-deck.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = esp32s3_base
 board = t-deck
@@ -28,7 +29,7 @@ build_flags = ${esp32s3_base.build_flags}

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21
  # 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
@@ -20,7 +20,7 @@
 #define TFT_OFFSET_Y 0
 #define TFT_OFFSET_ROTATION 0
 #define SCREEN_ROTATE
-#define SCREEN_TRANSITION_FRAMERATE 5
+#define SCREEN_TRANSITION_FRAMERATE 30
 #define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness
 #define USE_TFTDISPLAY 1
 #define HAS_PHYSICAL_KEYBOARD 1
@@ -22,7 +22,7 @@ build_flags = ${esp32s3_base.build_flags}

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21
  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
  lewisxhe/SensorLib@0.3.4
  # renovate: datasource=custom.pio depName=Adafruit DRV2605 packageName=adafruit/library/Adafruit DRV2605 Library
@@ -39,9 +39,10 @@
 #define DAC_I2S_BCK 48
 #define DAC_I2S_WS 15
 #define DAC_I2S_DOUT 46
-#define DAC_I2S_MCLK 0
+#define DAC_I2S_MCLK -1

 #define HAS_AXP2101
+#define PMU_POWER_BUTTON_IS_CANCEL // maps a short click of the power button to a cancel action (turning off the screen)

 // PCF8563 RTC Module
 #define PCF8563_RTC 0x51
@@ -60,6 +61,8 @@

 #define BUTTON_PIN 0 // only for Plus version

+#define PMU_IRQ 21 // Interrupt pin for the PMU
+
 #define USE_SX1262
 #define USE_SX1268

@@ -6,26 +6,27 @@ NicheGraphics attempts a different approach:
 Per-device config takes place in this setupNicheGraphics() method
 (And a small amount in platformio.ini)

-This file sets up InkHUD for Heltec VM-E290.
-Different NicheGraphics UIs and different hardware variants will each have their own setup procedure.
+This file sets up InkHUD for the LilyGo T5-E-Paper-S3-Pro.
+
+The board uses a 4.7" ED047TC1 parallel e-paper display (960×540, 8-bit parallel interface).
+This is driven via the FastEPD library through the NicheGraphics ED047TC1 driver adapter.

 */

 #pragma once

 #include "configuration.h"
-#include "mesh/MeshModule.h"

 #ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS

 // InkHUD-specific components
 // ---------------------------
-// #include "graphics/niche/InkHUD/InkHUD.h"
-#include "graphics/niche/InkHUD/WindowManager.h"
+#include "graphics/niche/InkHUD/InkHUD.h"

 // 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"
@@ -33,27 +34,20 @@ Different NicheGraphics UIs and different hardware variants will each have their

 // Shared NicheGraphics components
 // --------------------------------
-#include "graphics/niche/Drivers/Backlight/LatchingBacklight.h"
-#include "graphics/niche/Drivers/EInk/DEPG0290BNS800.h"
+#include "graphics/niche/Drivers/EInk/ED047TC1.h"
 #include "graphics/niche/Inputs/TwoButton.h"

 void setupNicheGraphics()
 {
    using namespace NicheGraphics;

-    // SPI
-    // -----------------------------
-
-    // Display is connected to HSPI
-    SPIClass *hspi = new SPIClass(HSPI);
-    hspi->begin(PIN_EINK_SCLK, -1, PIN_EINK_MOSI, PIN_EINK_CS);
-
    // E-Ink Driver
    // -----------------------------
+    // The ED047TC1 is a parallel display — no SPI bus setup needed.
+    // begin() args are part of the EInk interface but are ignored for parallel displays.

-    // Use E-Ink driver
-    Drivers::EInk *driver = new Drivers::DEPG0290BNS800;
-    driver->begin(hspi, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY);
+    Drivers::EInk *driver = new Drivers::ED047TC1;
+    driver->begin(nullptr, 0, 0, 0);

    // InkHUD
    // ----------------------------
@@ -67,57 +61,59 @@ void setupNicheGraphics()
    // Set how unhealthy additional FAST updates beyond this number are
    inkhud->setDisplayResilience(7, 1.5);

-    // Prepare fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
-    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;
+    // Prepare fonts — use larger sizes to suit the 4.7" screen at ~234 DPI
+    InkHUD::Applet::fontLarge = FREESANS_24PT_WIN1253;
+    InkHUD::Applet::fontMedium = FREESANS_18PT_WIN1253;
+    InkHUD::Applet::fontSmall = FREESANS_12PT_WIN1253;

-    // Init settings, and customize defaults
+    // Customize default settings
    inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle?
-    inkhud->persistence->settings.rotation = 1;           // 90 degrees clockwise
+    inkhud->persistence->settings.rotation = 3;           // 270 degrees clockwise
    inkhud->persistence->settings.userTiles.count = 1;    // One tile only by default, keep things simple for new users
-    inkhud->persistence->settings.optionalMenuItems.nextTile = false;  // Behavior handled by aux button instead
-    inkhud->persistence->settings.optionalFeatures.batteryIcon = true; // Device definitely has a battery
+    inkhud->persistence->settings.optionalFeatures.batteryIcon = true;
+    inkhud->persistence->settings.optionalMenuItems.backlight = false;

-    // Setup backlight
-    // Note: AUX button behavior configured further down
-    Drivers::LatchingBacklight *backlight = Drivers::LatchingBacklight::getInstance();
-    backlight->setPin(PIN_EINK_EN);
+    // Alignment must cancel rotation for visual-frame touch input: (rotation + alignment) % 4 == 0.
+    inkhud->persistence->settings.joystick.alignment = (4 - inkhud->persistence->settings.rotation) % 4;

    // Pick applets
    // Note: order of applets determines priority of "auto-show" feature
-    // Optional arguments for defaults:
-    // - is activated?
-    // - is autoshown?
-    // - is foreground on a specific tile (index)?
-    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
-    inkhud->addApplet("DMs", new InkHUD::DMApplet);
-    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("Recents List", new InkHUD::RecentsListApplet);
+    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, false, false);      // Not Active, not autoshown
+    inkhud->addApplet("DMs", new InkHUD::DMApplet, true, true);                         // Activated, Autoshown
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0), true, true);   // Activated, Autoshown
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1), false, false); // Not Active, not autoshown
+    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true, false);           // Activated, not autoshown
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet, true, false);      // Activated, not autoshown
    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0
-    // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet);
-    // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet);
+    inkhud->addApplet("Favorites Map", new InkHUD::FavoritesMapApplet, false, false); // Not Active, not autoshown
+
+    // Enable reusable InkHUD touch status indicator for this touch-capable board.
+    inkhud->setTouchEnabledProvider(isTouchInputEnabled);

    // Start running InkHUD
    inkhud->begin();
+    // Arm GT911 capacitive-home callback only after InkHUD startup is complete.
+    t5SetHomeCapButtonEventsEnabled(true);
+
+    // Keep Wireless Paper single-button semantics regardless of persisted settings:
+    // short press advances, long press opens menu/selects.
+    inkhud->persistence->settings.joystick.enabled = false;

    // Buttons
    // --------------------------

    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // A shared NicheGraphics component

-    // Setup the main user button (0)
+    // #0: BOOT button (primary user input for InkHUD navigation on T5-S3)
+#if defined(T5_S3_EPAPER_PRO_V1)
+    buttons->setWiring(0, PIN_BUTTON2);
+#else
    buttons->setWiring(0, BUTTON_PIN);
-    buttons->setHandlerShortPress(0, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
-    buttons->setHandlerLongPress(0, []() { InkHUD::InkHUD::getInstance()->longpress(); });
-
-    // Setup the aux button (1)
-    // Bonus feature of VME290
-    buttons->setWiring(1, BUTTON_PIN_SECONDARY);
-    buttons->setHandlerShortPress(1, []() { InkHUD::InkHUD::getInstance()->nextTile(); });
+#endif
+    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
+    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });

    buttons->start();
 }

-#endif
+#endif
@@ -5,7 +5,7 @@ board_build.partition = default_16MB.csv
 board_check = true
 upload_protocol = esptool
 build_flags = -fno-strict-aliasing
-  ${esp32_base.build_flags} 
+  ${esp32s3_base.build_flags} 
  -I variants/esp32s3/t5s3_epaper
  -D T5_S3_EPAPER_PRO
  -D USE_EINK
@@ -1,28 +1,9 @@
-#include "configuration.h"
-
-#ifdef T5_S3_EPAPER_PRO
-
-#include "TouchDrvGT911.hpp"
-#include "Wire.h"
-#include "input/TouchScreenImpl1.h"
-
-TouchDrvGT911 touch;
-
-bool readTouch(int16_t *x, int16_t *y)
-{
-    if (!digitalRead(GT911_PIN_INT)) {
-        int16_t raw_x;
-        int16_t raw_y;
-        if (touch.getPoint(&raw_x, &raw_y)) {
-            // rotate 90° for landscape
-            *x = raw_y;
-            *y = EPD_WIDTH - 1 - raw_x;
-            LOG_DEBUG("touched(%d/%d)", *x, *y);
-            return true;
-        }
-    }
-    return false;
-}
+// Pin-level early init only. All touch, backlight, and InkHUD code lives in
+// src/platform/extra_variants/t5s3_epaper/variant.cpp where PlatformIO's
+// library dependency finder can resolve headers like TouchDrvGT911.hpp.
+#include "variant.h"
+#include "Arduino.h"
+#include "pins_arduino.h"

 void earlyInitVariant()
 {
@@ -31,17 +12,28 @@ void earlyInitVariant()
    pinMode(SDCARD_CS, OUTPUT);
    digitalWrite(SDCARD_CS, HIGH);
    pinMode(BOARD_BL_EN, OUTPUT);
-}
+    // Backlight ON at boot (active-HIGH). Full backlight state management
+    // lives in src/platform/extra_variants/t5s3_epaper/variant.cpp.
+    digitalWrite(BOARD_BL_EN, HIGH);

-// T5-S3-ePaper Pro specific (late-) init
-void lateInitVariant(void)
-{
-    touch.setPins(GT911_PIN_RST, GT911_PIN_INT);
-    if (touch.begin(Wire, GT911_SLAVE_ADDRESS_L, GT911_PIN_SDA, GT911_PIN_SCL)) {
-        touchScreenImpl1 = new TouchScreenImpl1(EPD_WIDTH, EPD_HEIGHT, readTouch);
-        touchScreenImpl1->init();
-    } else {
-        LOG_ERROR("Failed to find touch controller!");
-    }
+    // Program GT911 touch controller to I2C address 0x14 (GT911_SLAVE_ADDRESS_H) before
+    // the I2C bus scan runs.  GPIO3 (INT) defaults LOW on ESP32-S3 cold boot, which would
+    // leave the GT911 at 0x5D (GT911_SLAVE_ADDRESS_L) — the same address as the SFA30
+    // air quality sensor — causing a false-positive SFA30 detection during the I2C scan.
+    //
+    // GT911 datasheet §4.3 "Address Selection":
+    //   Pull INT HIGH before releasing RST → device latches address 0x14 (SLAVE_ADDRESS_H)
+    //   Pull INT LOW  before releasing RST → device latches address 0x5D (SLAVE_ADDRESS_L)
+    //   Minimum RST assert time: 100 µs; minimum startup time after RST deassert: 5 ms.
+    //
+    // lateInitVariant() calls touch.begin() which repeats this sequence internally while
+    // also performing full I2C initialisation; the double-reset is harmless.
+    pinMode(GT911_PIN_RST, OUTPUT);
+    digitalWrite(GT911_PIN_RST, LOW);
+    pinMode(GT911_PIN_INT, OUTPUT);
+    digitalWrite(GT911_PIN_INT, HIGH); // HIGH → latch address 0x14
+    delay(1);                          // > 100 µs
+    digitalWrite(GT911_PIN_RST, HIGH);
+    delay(10);                     // > 5 ms startup
+    pinMode(GT911_PIN_INT, INPUT); // release INT for interrupt use
 }
-#endif
@@ -16,6 +16,11 @@
 #define I2C_SCL SCL

 #define HAS_TOUCHSCREEN 1
+#define TOUCH_POLL_INTERVAL_IDLE 25
+#define TOUCH_POLL_INTERVAL_ACTIVE 15
+#define TOUCH_POLL_INTERVAL_RELEASE 20
+#define TOUCH_POLL_INTERVAL_ACTIVE_FAST 8
+#define TOUCH_POLL_INTERVAL_RELEASE_FAST 8
 #define GT911_PIN_SDA SDA
 #define GT911_PIN_SCL SCL
 #if defined(T5_S3_EPAPER_PRO_V1)
@@ -25,10 +30,34 @@
 #define GT911_PIN_INT 3
 #define GT911_PIN_RST 9
 #endif
+// Do not use touch as a light-sleep wake source on T5-S3.
+// Wake should come from physical buttons/radio/timer only.
+#define SCREEN_TOUCH_INT GT911_PIN_INT

-#define PCF85063_RTC 0x51
+// Touch control helpers for this variant
+bool isTouchInputEnabled();
+void setTouchInputEnabled(bool enabled, bool showIndicator);
+void toggleTouchInputEnabled();
+
+// Backlight control helpers for this variant (non-latching behavior)
+void t5BacklightSetUserEnabled(bool enabled);
+bool t5BacklightIsUserEnabled();
+void t5BacklightToggleUser();
+void t5BacklightSetForcedByTimeout(bool forced);
+void t5BacklightSetForcedBySleep(bool forced);
+void t5BacklightHandleUserInput();
+
+// Touch timeout/wake helpers for this variant
+void t5TouchSetForcedByTimeout(bool forced);
+bool t5TouchIsForcedByTimeout();
+void t5TouchHandleUserInput();
+
+// Gate GT911 capacitive-home callback delivery until InkHUD startup is complete.
+void t5SetHomeCapButtonEventsEnabled(bool enabled);
+
+#define PCF8563_RTC 0x51
 #define HAS_RTC 1
-#define PCF85063_INT 2
+#define PCF8563_INT 2

 #define USE_POWERSAVE
 #define SLEEP_TIME 120
@@ -45,8 +74,10 @@
 #define ALT_BUTTON_PIN PIN_BUTTON2
 #else
 #define BUTTON_PIN 0
+#define BOARD_PCA9535_ADDR 0x20
+#define BOARD_PCA9535_INT 38
+#define BOARD_PCA9535_BUTTON_MASK 0x04
 #endif
-
 // SD card
 #define HAS_SDCARD
 #define SDCARD_CS SPI_CS
@@ -9,8 +9,6 @@
 #define BUTTON_PIN 0 // The middle button GPIO on the T-Beam S3
 //  #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.

-#define LED_STATE_ON 0 // State when LED is lit
-
 // 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
 #define USE_SX1262
@@ -48,9 +46,9 @@
 #define LR11X0_DIO_AS_RF_SWITCH
 #endif

-// Leave undefined to disable our PMU IRQ handler.  DO NOT ENABLE THIS because the pmuirq can cause sperious interrupts
-// and waking from light sleep
-// #define PMU_IRQ 40
+// Voiding warrenties, we're gonna try the IRQ
+#define PMU_IRQ 40
+#define PMU_POWER_BUTTON_IS_CANCEL // maps a short click of the power button to a cancel action (turning off the screen)
 #define HAS_AXP2101

 // PCF8563 RTC Module
@@ -76,4 +74,4 @@
 // has 32768 Hz crystal
 #define HAS_32768HZ 1

-#define USE_SH1106
+#define USE_SH1106
@@ -10,6 +10,7 @@ custom_meshtastic_images = lilygo-tlora-pager.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = esp32s3_base
 board = t-deck-pro ; same as T-Deck Pro
@@ -32,7 +33,7 @@ build_flags = ${esp32s3_base.build_flags}

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21
  # 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
@@ -18,7 +18,7 @@
 #define TFT_OFFSET_Y 0
 #define TFT_OFFSET_ROTATION 3
 #define SCREEN_ROTATE
-#define SCREEN_TRANSITION_FRAMERATE 5
+#define SCREEN_TRANSITION_FRAMERATE 30
 #define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness
 #define USE_TFTDISPLAY 1
 #define HAS_PHYSICAL_KEYBOARD 1
@@ -8,6 +8,7 @@ custom_meshtastic_display_name = LILYGO T-LoRa T3-S3 E-Ink
 custom_meshtastic_images = tlora-t3s3-epaper.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = true
+custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = tlora-t3s3-v1
@@ -73,7 +73,6 @@
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

 // Picomputer gets a white on black display
-#define TFT_MESH_OVERRIDE COLOR565(255, 255, 255)

 // keyboard changes

@@ -89,4 +88,4 @@
    {                                                                                                                            \
        26, 37, 17, 16, 15, 7                                                                                                    \
    }
-// #end keyboard
+// #end keyboard
@@ -97,7 +97,6 @@
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

 // Picomputer gets a white on black display
-#define TFT_MESH_OVERRIDE COLOR565(255, 255, 255)

 // keyboard changes

@@ -113,4 +112,4 @@
    {                                                                                                                            \
        26, 37, 17, 16, 15, 7                                                                                                    \
    }
-// #end keyboard
+// #end keyboard
@@ -74,7 +74,6 @@
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

 // Picomputer gets a white on black display
-#define TFT_MESH_OVERRIDE COLOR565(255, 255, 255)

 // keyboard changes

@@ -90,4 +89,4 @@
    {                                                                                                                            \
        26, 37, 17, 16, 15, 7                                                                                                    \
    }
-// #end keyboard
+// #end keyboard
@@ -22,7 +22,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21

 [env:tracksenger-lcd]
 custom_meshtastic_hw_model = 48
@@ -48,7 +48,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21

 [env:tracksenger-oled]
 custom_meshtastic_hw_model = 48
@@ -37,11 +37,9 @@ build_src_filter =

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21
  # TODO renovate https://gitlab.com/hamishcunningham/unphonelibrary#meshtastic@9.0.0
  https://gitlab.com/hamishcunningham/unphonelibrary/-/archive/meshtastic/unphonelibrary-meshtastic.zip
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4

 [env:unphone-tft]
 board_level = extra
@@ -35,7 +35,7 @@
 #define TFT_OFFSET_ROTATION 6 // unPhone's screen wired unusually, 0 typical
 #define TFT_INVERT false
 #define SCREEN_ROTATE true
-#define SCREEN_TRANSITION_FRAMERATE 5
+#define SCREEN_TRANSITION_FRAMERATE 30
 #define USE_TFTDISPLAY 1

 #define HAS_TOUCHSCREEN 1
@@ -74,4 +74,4 @@

 // #define BATTERY_PIN 13 // battery V measurement pin; vbat divider is here
 // #define ADC_CHANNEL ADC2_GPIO13_CHANNEL
-// #define BAT_MEASURE_ADC_UNIT 2
+// #define BAT_MEASURE_ADC_UNIT 2
@@ -2,7 +2,7 @@
 [portduino_base]
 platform =
  # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop
-  https://github.com/meshtastic/platform-native/archive/f566d364204416cdbf298e349213f7d551f793d9.zip
+  https://github.com/meshtastic/platform-native/archive/cab4b21d902973e43c938dab3cf4844ba02547ec.zip
 framework = arduino

 build_src_filter = 
@@ -27,36 +27,47 @@ lib_deps =
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
  rweather/Crypto@0.4.0
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
+  lovyan03/LovyanGFX@1.2.21
  ; # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
  https://github.com/pine64/libch341-spi-userspace/archive/23c42319a69cffcb65868e3c72e6bed83974a393.zip
  # renovate: datasource=custom.pio depName=adafruit/Adafruit seesaw Library packageName=adafruit/library/Adafruit seesaw Library
 	adafruit/Adafruit seesaw Library@1.7.9
  # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
  https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
-  # renovate: datasource=custom.pio depName=Adafruit_BME680 packageName=adafruit/library/Adafruit BME680 Library
-  adafruit/Adafruit BME680 Library@2.0.6
+  # renovate: datasource=github-tags depName=Adafruit_BME680 packageName=adafruit/Adafruit_BME680
+  https://github.com/adafruit/Adafruit_BME680/archive/refs/tags/2.0.6.zip

-build_flags =
+; Cross-platform build flags shared between native (Linux) and native-macos builds.
+; Anything Linux-only (libbluetooth, libgpiod, libi2c, /sys/class/gpio,
+; PORTDUINO_LINUX_HARDWARE, glibc-style _FORTIFY_SOURCE) goes in `build_flags`
+; instead. UDP multicast also lives there because the firmware's
+; UdpMulticastHandler.h unconditionally `#include <WiFi.h>` on non-NRF52
+; targets, which requires the framework's bundled WiFi shim that we
+; lib_ignore on macOS.
+build_flags_common =
  ${arduino_base.build_flags}
  -D ARCH_PORTDUINO
  -fPIC
-  -D_FORTIFY_SOURCE=2
-  -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4
  -Isrc/platform/portduino
  -DRADIOLIB_EEPROM_UNSUPPORTED
-  -DPORTDUINO_LINUX_HARDWARE
-  -DHAS_UDP_MULTICAST=1
  -lpthread
-  -lstdc++fs
-  -lbluetooth
-  -lgpiod
  -lyaml-cpp
-  -li2c
  -luv
  -std=gnu17
  -std=gnu++17
+
+build_flags =
+  ${portduino_base.build_flags_common}
+  -DHAS_UDP_MULTICAST=1
+  -D_FORTIFY_SOURCE=2
+  -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4
+  -DPORTDUINO_LINUX_HARDWARE
+  -lstdc++fs
+  -lbluetooth
+  -lgpiod
+  -li2c
 lib_ignore =
  Adafruit NeoPixel
  Adafruit ST7735 and ST7789 Library
+  Adafruit SSD1306
  SD
@@ -117,3 +117,128 @@ build_flags = -lgcov --coverage -fprofile-abs-path -fsanitize=address ${env:nati
 test_testing_command =
  ${platformio.build_dir}/${this.__env__}/meshtasticd
  -s
+
+; ---------------------------------------------------------------------------
+; Native build for macOS (Darwin / arm64 + x86_64). Headless meshtasticd that
+; runs in SimRadio mode (`-s`) or against real LoRa hardware via a CH341
+; USB-SPI bridge. No BlueZ, libgpiod, or Linux I2C — those require Linux.
+;
+; Prerequisites (Homebrew):
+;   brew install platformio yaml-cpp libuv openssl@3 libusb argp-standalone pkg-config
+;   # Optional: enable the HTTP API (PiWebServer) on macOS:
+;   brew install ulfius
+;
+; The macOS-side patches now live upstream:
+;   * meshtastic/platform-native — `String.h`-shadow shim, `-Wno-enum-constexpr-conversion`,
+;     empty-variant-dir guard. Pulled via `portduino_base.platform` zip pin.
+;   * meshtastic/framework-portduino — LinuxHardwareI2C macOS stubs, AsyncUDP
+;     SOCK_NONBLOCK fallback, Common.h __APPLE__ guard, WiFiServer.cpp extern-C
+;     fix, package.json URL refresh. Pulled by platform-native at its pinned commit.
+; This env therefore only carries the firmware-side build flags and src filter.
+;
+; Real LoRa hardware on macOS:
+;   The same lib_dep `pine64/libch341-spi-userspace` used on Linux works on
+;   macOS as-is — its `libusb_detach_kernel_driver()` call is `__linux__`-
+;   guarded, but on macOS the kernel doesn't bind a driver to a CH341A SPI
+;   bridge (PID 0x5512; bDeviceClass=0xff vendor-specific) by default, so
+;   no detach is needed. Apple's bundled CH34x driver targets the CH340
+;   *UART* variant (PID 0x7523) — different product. libusb opens the device
+;   and claims interface 0 directly via IOUSBHostInterface.
+;
+;   To use, point `meshtasticd` at any of the existing `bin/config.d/lora-*.yaml`
+;   files that specify `spidev: ch341` — they're platform-agnostic. Example:
+;     pio run -e native-macos
+;     mkdir -p ~/.meshtasticd && cp bin/config-dist.yaml ~/.meshtasticd/config.yaml
+;     # Edit ~/.meshtasticd/config.yaml: ConfigDirectory: ./config.d/
+;     mkdir ~/.meshtasticd/config.d && cp bin/config.d/lora-meshstick-1262.yaml ~/.meshtasticd/config.d/
+;     cd ~/.meshtasticd && /path/to/firmware/.pio/build/native-macos/meshtasticd
+;
+;   The MAC address auto-derives from the CH341's USB serial + product string
+;   (PortduinoGlue.cpp ~497-518); on Linux a BlueZ HCI socket is the fallback
+;   when that path isn't taken, but BlueZ is `__linux__`-guarded so the
+;   serial-derivation path is mandatory on macOS. Override with
+;   `MACAddress: AA:BB:CC:DD:EE:FF` in config.yaml's `General:` section if
+;   the device's serial isn't 8 hex chars.
+;
+;   Diagnosing CH341 issues on macOS:
+;     ioreg -p IOUSB -l -w 0 | grep -B2 -A30 0x5512
+;       Children should be `IOUSBHostInterface`. If a vendor driver class
+;       (e.g. `com.wch.CH34xVCPDriver` from a third-party WCH installer)
+;       claims interface 0, libusb will fail with LIBUSB_ERROR_BUSY.
+;       Workaround: `sudo kmutil unload -b <bundleID>`.
+;     LIBUSB_DEBUG=4 .pio/build/native-macos/meshtasticd
+;       Verbose libusb trace — useful when claim_interface fails.
+; ---------------------------------------------------------------------------
+[env:native-macos]
+extends = native_base
+; Apple's ld doesn't accept GNU ld's `-Wl,-Map,<file>` syntax (inherited from
+; the top-level platformio.ini). Strip it; the linker map isn't useful for
+; the macOS dev loop anyway, and Apple ld's equivalent (`-Wl,-map,<file>`)
+; uses different argument shape.
+build_unflags = -Wl,-Map,"${platformio.build_dir}"/output.map
+build_flags = ${portduino_base.build_flags_common}
+  -I variants/native/portduino
+  -I/opt/homebrew/include
+  -I/opt/homebrew/opt/argp-standalone/include
+  -I/opt/homebrew/opt/yaml-cpp/include
+  -L/opt/homebrew/lib
+  -L/opt/homebrew/opt/argp-standalone/lib
+  -L/opt/homebrew/opt/yaml-cpp/lib
+  -largp
+  -DPORTDUINO_DARWIN
+  ; Headless build — variants/native/portduino/variant.h would otherwise
+  ; default HAS_SCREEN to 1 and pull in screen-renderer source that uses
+  ; VLA-with-initializer (a GNU/GCC extension Apple Clang rejects).
+  ; MESHTASTIC_EXCLUDE_SCREEN gates the optional `screen->setHeading(...)`-
+  ; style screen-driver hooks scattered through sensor sources.
+  -DHAS_SCREEN=0
+  -DMESHTASTIC_EXCLUDE_SCREEN=1
+  ; openssl@3 is the keg-only Homebrew formula; --cflags is required so the
+  ; compiler finds <openssl/*.h> in the Homebrew prefix (not just the linker).
+  !pkg-config --cflags --libs openssl --silence-errors || :
+  ; PiWebServer (src/mesh/raspihttp/PiWebServer.cpp) auto-engages when ulfius
+  ; headers are reachable via `#if __has_include(<ulfius.h>)`. The `|| :`
+  ; tail keeps the build green when the user hasn't run `brew install ulfius`
+  ; — they just don't get the HTTP API in that case.
+  !pkg-config --cflags --libs liborcania --silence-errors || :
+  !pkg-config --cflags --libs libyder --silence-errors || :
+  !pkg-config --cflags --libs libulfius --silence-errors || :
+; src/input/Linux*.{cpp,h} drive evdev (`<linux/input.h>`) which doesn't exist
+; on macOS. graphics/Panel_sdl.* and graphics/TFTDisplay.cpp pull LovyanGFX
+; (which we lib_ignore on macOS for the <malloc.h> issue). Neither is needed
+; for the headless build.
+build_src_filter = ${native_base.build_src_filter}
+  -<input/LinuxInput.cpp>
+  -<input/LinuxInputImpl.cpp>
+  -<graphics/Panel_sdl.cpp>
+  -<graphics/TFTDisplay.cpp>
+; LovyanGFX includes <malloc.h> (Linux-only) and is only needed by TFT
+; variants — not relevant for the headless macOS build.
+lib_ignore =
+  ${portduino_base.lib_ignore}
+  LovyanGFX
+
+; ---------------------------------------------------------------------------
+; Same as [env:native-macos] but built with AddressSanitizer for catching
+; use-after-free, leaks, and OOB access during local development. Headless
+; (no SDL/X11/libinput) so it stays cheap to build. Mirrors the shape of
+; [env:native-tft-debug] but without the TFT/X11 dependencies.
+;
+;   pio run -e native-macos-debug
+;   .pio/build/native-macos-debug/meshtasticd -s
+;
+; ASan runtime tuning (set in the shell before launching):
+;   ASAN_OPTIONS=detect_leaks=1:halt_on_error=0:abort_on_error=1
+;   MallocStackLogging=1   # macOS: nicer stack traces in malloc reports
+; ---------------------------------------------------------------------------
+[env:native-macos-debug]
+extends = native_base
+build_type = debug
+build_unflags = ${env:native-macos.build_unflags}
+build_flags = ${env:native-macos.build_flags}
+  -O0
+  -g
+  -fsanitize=address
+  -fno-omit-frame-pointer
+build_src_filter = ${env:native-macos.build_src_filter}
+lib_ignore = ${env:native-macos.lib_ignore}
@@ -12,5 +12,5 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/Dongle_
 lib_deps = 
  ${nrf52840_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.8
+  zinggjm/GxEPD2@1.6.9
 debug_tool = jlink
@@ -8,6 +8,7 @@ custom_meshtastic_support_level = 1
 custom_meshtastic_display_name = ThinkNode M1
 custom_meshtastic_images = thinknode_m1.svg
 custom_meshtastic_tags = Elecrow
+custom_meshtastic_has_ink_hud = true

 extends = nrf52840_base
 board = ThinkNode-M1
@@ -85,7 +85,6 @@ static const uint8_t A0 = PIN_A0;

 // charger status
 #define EXT_CHRG_DETECT (32 + 6)
-#define EXT_CHRG_DETECT_VALUE HIGH

 // SPI
 #define SPI_INTERFACES_COUNT 1
@@ -20,6 +20,7 @@

 #include "variant.h"
 #include "nrf.h"
+#include "power.h"
 #include "wiring_constants.h"
 #include "wiring_digital.h"

@@ -65,7 +66,11 @@ void variant_shutdown()
    nrf_gpio_pin_sense_t sense1 = NRF_GPIO_PIN_SENSE_LOW;
    nrf_gpio_cfg_sense_set(PIN_BUTTON1, sense1);

-    nrf_gpio_cfg_input(EXT_CHRG_DETECT, NRF_GPIO_PIN_PULLUP); // Configure the pin to be woken up as an input
-    nrf_gpio_pin_sense_t sense2 = NRF_GPIO_PIN_SENSE_LOW;
-    nrf_gpio_cfg_sense_set(EXT_CHRG_DETECT, sense2);
+    // If we are sleeping because of low battery, wake up when the solar charger detects power.
+    // But if the user intentionally put us to sleep with the button, don't wake up just because the lights are on
+    if (power->isLowBattery()) {
+        nrf_gpio_cfg_input(EXT_CHRG_DETECT, NRF_GPIO_PIN_PULLUP); // Configure the pin to be woken up as an input
+        nrf_gpio_pin_sense_t sense2 = NRF_GPIO_PIN_SENSE_LOW;
+        nrf_gpio_cfg_sense_set(EXT_CHRG_DETECT, sense2);
+    }
 }
@@ -138,7 +138,7 @@ static const uint8_t A0 = PIN_A0;

 #define HAS_SOLAR

-#define OCV_ARRAY 4080, 3990, 3935, 3880, 3825, 3770, 3715, 3660, 3605, 3550, 3450
+#define OCV_ARRAY 4080, 3990, 3935, 3880, 3825, 3770, 3715, 3660, 3605, 3550, 3490

 #ifdef __cplusplus
 }
@@ -16,7 +16,7 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ME25LS0
 lib_deps = 
  ${nrf52840_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.8
+  zinggjm/GxEPD2@1.6.9
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 upload_protocol = nrfutil
 ;upload_port = /dev/ttyACM1
@@ -15,6 +15,6 @@ lib_deps =
  # 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=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.8
+  zinggjm/GxEPD2@1.6.9
 debug_tool = jlink
 ;upload_port = /dev/ttyACM4
@@ -9,5 +9,5 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/TWC_mes
 lib_deps = 
  ${nrf52840_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.8
+  zinggjm/GxEPD2@1.6.9
 debug_tool = jlink
@@ -15,6 +15,7 @@ board = promicro-nrf52840
 build_flags = ${nrf52840_base.build_flags}
  -I variants/nrf52840/diy/nrf52_promicro_diy_tcxo
  -D NRF52_PROMICRO_DIY
+  ; -D RADIOLIB_GODMODE=1 ; needed for some LR2021 items, but not enabled by default.
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/diy/nrf52_promicro_diy_tcxo>
 debug_tool = jlink

--- a/Show More
+++ b/Show More