Merge branch 'develop' into kill-led-builtin

2026-01-08 19:07:26 +00:00 · 2025-12-21 23:23:45 -06:00
parent a14505cafa 5a3855b208
commit e0a720d667
244 changed files with 3392 additions and 823 deletions
--- a/variants/esp32/betafpv_2400_tx_micro/platformio.ini
+++ b/variants/esp32/betafpv_2400_tx_micro/platformio.ini
@@ -15,4 +15,5 @@ upload_protocol = esptool
 upload_speed = 460800
 lib_deps =
  ${esp32_base.lib_deps}
-  adafruit/Adafruit NeoPixel @ ^1.12.0
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.2
--- a/variants/esp32/betafpv_900_tx_nano/platformio.ini
+++ b/variants/esp32/betafpv_900_tx_nano/platformio.ini
@@ -13,5 +13,3 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
 upload_speed = 460800
-lib_deps =
-  ${esp32_base.lib_deps}
--- a/variants/esp32/chatter2/platformio.ini
+++ b/variants/esp32/chatter2/platformio.ini
@@ -9,4 +9,5 @@ build_flags =
  
 lib_deps =
  ${esp32_base.lib_deps}
-  lovyan03/LovyanGFX@^1.2.0
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
+  lovyan03/LovyanGFX@1.2.7
--- a/variants/esp32/diy/dr-dev/platformio.ini
+++ b/variants/esp32/diy/dr-dev/platformio.ini
@@ -2,6 +2,7 @@
 [env:meshtastic-dr-dev]
 extends = esp32_base
 board = esp32doit-devkit-v1
+board_level = extra
 board_upload.maximum_size = 4194304
 board_upload.maximum_ram_size = 532480
 build_flags =
--- a/variants/esp32/esp32.ini
+++ b/variants/esp32/esp32.ini
@@ -5,7 +5,7 @@ custom_esp32_kind = esp32
 custom_mtjson_part =
 platform =
  # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.11.0
+  platformio/espressif32@6.12.0

 extra_scripts =
  ${env.extra_scripts}
@@ -38,6 +38,7 @@ build_flags =
  -DAXP_DEBUG_PORT=Serial
  -DCONFIG_BT_NIMBLE_ENABLED
  -DCONFIG_BT_NIMBLE_MAX_BONDS=6 # default is 3
+  -DCONFIG_BT_NIMBLE_ROLE_CENTRAL_DISABLED
  -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
  -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
  -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
@@ -53,17 +54,18 @@ build_flags =
 lib_deps =
  ${arduino_base.lib_deps}
  ${networking_base.lib_deps}
+  ${networking_extra.lib_deps}
  ${environmental_base.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
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
-  h2zero/NimBLE-Arduino@^1.4.3
+  h2zero/NimBLE-Arduino@^2.3.7
  # 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.2
  # 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
--- a/variants/esp32/m5stack_core/platformio.ini
+++ b/variants/esp32/m5stack_core/platformio.ini
@@ -25,4 +25,5 @@ lib_ignore =
  m5stack-core
 lib_deps = 
  ${esp32_base.lib_deps}
-  lovyan03/LovyanGFX@^1.2.0
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
+  lovyan03/LovyanGFX@1.2.7
--- a/variants/esp32/m5stack_coreink/platformio.ini
+++ b/variants/esp32/m5stack_coreink/platformio.ini
@@ -18,8 +18,10 @@ build_flags =
  -DM5STACK
 lib_deps = 
  ${esp32_base.lib_deps}
-  zinggjm/GxEPD2@^1.6.2
-  lewisxhe/PCF8563_Library@^1.0.1
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
+  zinggjm/GxEPD2@1.6.5
+  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
+  lewisxhe/SensorLib@0.3.2
 lib_ignore =
  m5stack-coreink
 monitor_filters = esp32_exception_decoder
--- a/variants/esp32/m5stack_coreink/variant.h
+++ b/variants/esp32/m5stack_coreink/variant.h
@@ -13,7 +13,6 @@
 #define LED_STATE_ON 1 // State when LED is lit
 #define LED_PIN 10

-#include "pcf8563.h"
 // PCF8563 RTC Module
 #define PCF8563_RTC 0x51
 #define HAS_RTC 1
--- a/variants/esp32/nano-g1-explorer/platformio.ini
+++ b/variants/esp32/nano-g1-explorer/platformio.ini
@@ -2,8 +2,6 @@
 [env:nano-g1-explorer]
 extends = esp32_base
 board = ttgo-t-beam
-lib_deps =
-  ${esp32_base.lib_deps}
 build_flags = 
  ${esp32_base.build_flags}
  -D NANO_G1_EXPLORER
--- a/variants/esp32/nano-g1/platformio.ini
+++ b/variants/esp32/nano-g1/platformio.ini
@@ -2,8 +2,6 @@
 [env:nano-g1]
 extends = esp32_base
 board = ttgo-t-beam
-lib_deps =
-  ${esp32_base.lib_deps}
 build_flags = 
  ${esp32_base.build_flags}
  -D NANO_G1
--- a/variants/esp32/radiomaster_900_bandit/platformio.ini
+++ b/variants/esp32/radiomaster_900_bandit/platformio.ini
@@ -13,4 +13,5 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
  ${esp32_base.lib_deps}
+  # renovate: datasource=github-tags depName=STK8xxx-Accelerometer packageName=gjelsoe/STK8xxx-Accelerometer
  https://github.com/gjelsoe/STK8xxx-Accelerometer/archive/v0.1.1.zip
--- a/variants/esp32/radiomaster_900_bandit_micro/platformio.ini
+++ b/variants/esp32/radiomaster_900_bandit_micro/platformio.ini
@@ -15,5 +15,3 @@ build_flags =
  -I variants/esp32/radiomaster_900_bandit_nano
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
-lib_deps =
-  ${esp32_base.lib_deps}
--- a/variants/esp32/radiomaster_900_bandit_nano/platformio.ini
+++ b/variants/esp32/radiomaster_900_bandit_nano/platformio.ini
@@ -10,5 +10,3 @@ build_flags =
  -I variants/esp32/radiomaster_900_bandit_nano
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
-lib_deps =
-  ${esp32_base.lib_deps}
--- a/variants/esp32/station-g1/platformio.ini
+++ b/variants/esp32/station-g1/platformio.ini
@@ -2,8 +2,6 @@
 [env:station-g1]
 extends = esp32_base
 board = ttgo-t-beam
-lib_deps =
-  ${esp32_base.lib_deps}
 build_flags = 
  ${esp32_base.build_flags}
  -D STATION_G1
--- a/variants/esp32/tbeam/platformio.ini
+++ b/variants/esp32/tbeam/platformio.ini
@@ -2,9 +2,8 @@
 [env:tbeam]
 extends = esp32_base
 board = ttgo-t-beam
-board_level = pr
+board_level = extra
 board_check = true
-lib_deps = ${esp32_base.lib_deps}
 build_flags = ${esp32_base.build_flags}
  -D TBEAM_V10
  -I variants/esp32/tbeam
@@ -22,5 +21,7 @@ build_flags =

 lib_deps =
  ${env:tbeam.lib_deps}
-  https://github.com/meshtastic/st7796/archive/refs/tags/1.0.5.zip ; display addon
-  lewisxhe/SensorLib@0.3.1 ; touchscreen addon
+  # 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.1
--- a/variants/esp32/wiphone/platformio.ini
+++ b/variants/esp32/wiphone/platformio.ini
@@ -10,6 +10,9 @@ build_flags =
  -I variants/esp32/wiphone
 lib_deps = 
  ${esp32_base.lib_deps}
-  lovyan03/LovyanGFX@^1.2.0
-  sparkfun/SX1509 IO Expander@^3.0.5
-  pololu/APA102@^3.0.0
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
+  lovyan03/LovyanGFX@1.2.7
+  # 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
+  pololu/APA102@3.0.0