Migrate esp32 families to pioarduino platform

2025-12-31 23:21:06 +00:00 · 2025-12-12 12:36:52 -05:00
parent 3a723ceae8
commit aa506ce4ab
124 changed files with 670 additions and 374 deletions
--- a/variants/esp32/chatter2/platformio.ini
+++ b/variants/esp32/chatter2/platformio.ini
@@ -9,5 +9,5 @@ build_flags =
  
 lib_deps =
  ${esp32_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
--- a/variants/esp32/chatter2/variant.h
+++ b/variants/esp32/chatter2/variant.h
@@ -72,7 +72,7 @@
 // Battery

 #define BATTERY_PIN 34 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO34_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_6
 #define ADC_ATTENUATION                                                                                                          \
    ADC_ATTEN_DB_2_5       // 2_5-> 100mv-1250mv, 11-> 150mv-3100mv for ESP32
                           // ESP32-S2/C3/S3 are different
--- a/variants/esp32/diy/9m2ibr_aprs_lora_tracker/variant.h
+++ b/variants/esp32/diy/9m2ibr_aprs_lora_tracker/variant.h
@@ -30,7 +30,7 @@
 // Battery sense
 #define BATTERY_PIN 35
 #define ADC_MULTIPLIER 2.01 // 100k + 100k, and add 1% tolerance
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7
 #define BATTERY_SENSE_RESOLUTION_BITS ADC_RESOLUTION

 // SPI
--- a/variants/esp32/diy/dr-dev/variant.h
+++ b/variants/esp32/diy/dr-dev/variant.h
@@ -3,7 +3,7 @@
 #define I2C_SDA 4
 #define I2C_SCL 5
 #define BATTERY_PIN 34
-#define ADC_CHANNEL ADC1_GPIO34_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_6

 // GPS
 #undef GPS_RX_PIN
--- a/variants/esp32/diy/hydra/variant.h
+++ b/variants/esp32/diy/hydra/variant.h
@@ -11,7 +11,7 @@
 // Note: On the ESP32 base version, gpio34-39 are input-only, and do not have internal pull-ups.
 // If 39 is not being used for a button, it is suggested to remove the #define.
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_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).
--- a/variants/esp32/diy/v1/variant.h
+++ b/variants/esp32/diy/v1/variant.h
@@ -11,7 +11,7 @@

 #define BUTTON_PIN 39  // The middle button GPIO on the T-Beam
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_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).
--- a/variants/esp32/esp32-common.ini
+++ b/variants/esp32/esp32-common.ini
@@ -4,8 +4,10 @@ extends = arduino_base
 custom_esp32_kind =
 custom_mtjson_part =
 platform =
-  # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.12.0
+  # TODO renovate
+  ; https://github.com/tasmota/platform-espressif32/releases/download/2025.12.30/platform-espressif32.zip
+  https://github.com/pioarduino/platform-espressif32/releases/download/55.03.35/platform-espressif32.zip
+  ; https://github.com/pioarduino/platform-espressif32/releases/download/54.03.21-2/platform-espressif32.zip

 extra_scripts =
  ${env.extra_scripts}
@@ -24,10 +26,10 @@ 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
 build_flags =
  ${arduino_base.build_flags}
-  -flto
  -Wall
  -Wextra
  -Isrc/platform/esp32
@@ -36,12 +38,6 @@ build_flags =
  -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
  -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
  -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
  -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
  -DSERIAL_BUFFER_SIZE=4096
  -DSERIAL_HAS_ON_RECEIVE
@@ -54,26 +50,45 @@ 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
+  # TODO renovate
+  https://github.com/jackjansen/esp32_idf5_https_server/archive/v1.1.1.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  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
+  # TODO renovate
+  https://github.com/mverch67/libpax/archive/6f52ee989301cdabaeef00bcbf93bff55708ce2f.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
  rweather/Crypto@0.4.0

 lib_ignore = 
  segger_rtt
  ESP32 BLE Arduino
+  ; Ignore builtin NimBLE libs
+  BLE
+  BluetoothSerial
+  SimpleBLE
+  WiFiProv
+  ArduinoOTA
+  ; Ignore pioarduino esp32 libs we don't use
+  ESP_I2S
+  ESP_NOW
+  ESP_SR
+  Insights
+  Matter
+  OpenThread
+  RainMaker
+  ;SPIFFS
+  USB
+  ;NetworkClientSecure
+  Zigbee
+  Micro-RTSP
+  ; testing below
+  mqtt
+  esp-mqtt

 ; leave this commented out to avoid breaking Windows
 ;upload_port = /dev/ttyUSB0
@@ -86,3 +101,223 @@ lib_ignore =
 ; customize the partition table
 ; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
 board_build.partitions = partition-table.csv
+
+custom_component_remove =
+  espressif/esp_hosted
+  espressif/esp_wifi_remote
+  espressif/esp_modem
+  espressif/esp-dsp
+  espressif/esp32-camera
+  espressif/libsodium
+  espressif/esp-modbus
+  espressif/qrcode
+  espressif/esp_insights
+  espressif/esp_diag_data_store
+  espressif/esp_diagnostics
+  espressif/esp_rainmaker
+  espressif/rmaker_common
+  espressif/network_provisioning
+  chmorgan/esp-libhelix-mp3
+  espressif/esp-tflite-micro
+  espressif/esp-sr
+  espressif/esp_matter
+  espressif/esp-zboss-lib
+  espressif/esp-zigbee-lib
+  espressif/mqtt
+
+custom_sdkconfig =
+  ; CONFIG_LOG_DEFAULT_LEVEL=4
+  ; CONFIG_LOG_MAXIMUM_LEVEL=4
+  ; CONFIG_BT_NIMBLE_CPP_LOG_LEVEL=1
+  CONFIG_LOG_COLORS=y
+  CONFIG_ARDUHAL_LOG_COLORS=y
+  CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+  CONFIG_IDF_EXPERIMENTAL_FEATURES=y
+  ;
+  ; Compiler options
+  ;
+  CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=n
+  CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
+  CONFIG_COMPILER_CXX_EXCEPTIONS=n
+  CONFIG_COMPILER_STACK_CHECK_MODE_NORM=n
+  CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
+  CONFIG_COMPILER_DISABLE_GCC12_WARNINGS=y
+  CONFIG_COMPILER_DISABLE_GCC13_WARNINGS=y
+  CONFIG_COMPILER_DISABLE_GCC14_WARNINGS=y
+  CONFIG_COMPILER_ORPHAN_SECTIONS_WARNING=n
+  CONFIG_COMPILER_ORPHAN_SECTIONS_PLACE=y
+  CONFIG_ESP_GDBSTUB_ENABLED=n
+  CONFIG_ESP_TASK_WDT_INIT=n
+  CONFIG_NEWLIB_NANO_FORMAT=y
+  ; LIBC_NEWLIB_NANO_FORMAT is enabled via 'esp32_extra.py' to allow float support
+  CONFIG_ESP_COREDUMP_ENABLE=n
+  CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=n
+  CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
+  CONFIG_ESP32_ENABLE_COREDUMP=n
+  CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=n
+  CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=n
+  CONFIG_FREERTOS_USE_TRACE_FACILITY=n
+  CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+  CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
+  CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
+  CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM=y
+  CONFIG_ESP_WIFI_IRAM_OPT=n
+  CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+  CONFIG_SPIRAM_CACHE_LIBCHAR_IN_IRAM=n
+  CONFIG_SPIRAM_CACHE_LIBSTR_IN_IRAM=n
+  CONFIG_SPIRAM_CACHE_LIBMISC_IN_IRAM=n
+  CONFIG_SPIRAM_CACHE_LIBTIME_IN_IRAM=n
+  CONFIG_UNITY_ENABLE_FLOAT=n
+  CONFIG_UNITY_ENABLE_DOUBLE=n
+  CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=n
+  CONFIG_SUPPORT_TERMIOS=n
+  CONFIG_VFS_SUPPORT_TERMIOS=n
+  CONFIG_VFS_SUPPORT_SELECT=n
+  CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=n
+  CONFIG_WS_TRANSPORT=n
+  CONFIG_PPP_SUPPORT=n
+  ; CONFIG_LWIP_DHCPS=n
+  CONFIG_LWIP_PPP_SUPPORT=n
+  CONFIG_LWIP_IP_FORWARD=n
+  CONFIG_LWIP_IPV4_NAPT=n
+  ;
+  ; MBEDTLS
+  ;
+  CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
+  CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=n
+  CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y
+  ; Switch to custom CA bundle (for Meshtastic MQTT/etc) in the future
+  ; https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-reference/kconfig-reference.html#certificate-bundle-configuration
+  ; CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y
+  ; CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH=""
+  CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=1
+  ; #shame
+  CONFIG_MBEDTLS_ALLOW_WEAK_CERTIFICATE_VERIFICATION=y
+  CONFIG_MBEDTLS_SSL_RENEGOTIATION=n
+  CONFIG_MBEDTLS_SSL_PROTO_DTLS=n
+  CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=n
+  CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=n
+  CONFIG_MBEDTLS_PKCS7_C=n
+  CONFIG_MBEDTLS_CAMELLIA_C=n
+  CONFIG_MBEDTLS_CCM_C=n
+  CONFIG_MBEDTLS_CMAC_C=n
+  CONFIG_MBEDTLS_SHA512_C=n
+  CONFIG_MBEDTLS_X509_CRL_PARSE_C=n
+  CONFIG_MBEDTLS_X509_CSR_PARSE_C=n
+  CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK=n
+  CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=n
+  CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=n
+  CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=n
+  CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=n
+  CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=n
+  CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=n
+  CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=n
+  CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=n
+  CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=n
+  CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=n
+  CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=n
+  CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=n
+  CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=n
+  CONFIG_MDNS_ENABLE_CONSOLE_CLI=n
+  CONFIG_MDNS_PREDEF_NETIF_AP=n
+  ; CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
+  CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=n
+  CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=n
+  CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=n
+  CONFIG_ESP_WIFI_ENABLE_SAE_H2E=n
+  CONFIG_OPENTHREAD_ENABLED=n
+  CONFIG_ZB_ENABLED=n
+  CONFIG_IEEE802154_ENABLED=n
+  CONFIG_ESP_INSIGHTS_ENABLED=n
+  CONFIG_HTTPD_WS_SUPPORT=n
+  CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n
+  CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=n
+  ; using esp-idf5-https_server library instead, for now?
+  CONFIG_ESP_HTTPS_SERVER_ENABLE=n
+  ;
+  ; Builtin ESP-MQTT, we don't use this (yet?)
+  ;
+  CONFIG_MQTT_TRANSPORT_SSL=n
+  CONFIG_MQTT_TRANSPORT_WEBSOCKET=n
+  CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=n
+  CONFIG_MQTT_PROTOCOL_311=n
+  ;
+  ; Ethernet
+  ; Disabled in esp32_common, re-enable on variants that need it
+  ;
+  CONFIG_ETH_ENABLED=n
+  CONFIG_ARDUINO_SELECTIVE_Ethernet=n
+  ;
+  ; Bluetooth
+  ;
+  CONFIG_BLE_MESH=n
+  CONFIG_BT_ENABLED=y
+  CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+  CONFIG_BT_BLUEDROID_ENABLED=n
+  CONFIG_BT_NIMBLE_ENABLED=y
+  CONFIG_BT_NIMBLE_NVS_PERSIST=y
+  CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
+  CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
+  CONFIG_BT_CONTROLLER_ENABLED=y
+  CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
+  CONFIG_BT_NIMBLE_MAX_CCCDS=20
+  CONFIG_BT_NIMBLE_MAX_BONDS=6
+  CONFIG_BT_NIMBLE_ENABLE_PERIODIC_SYNC=n
+  CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV=n
+  CONFIG_BT_NIMBLE_EXT_SCAN=n
+  CONFIG_BT_NIMBLE_PERIODIC_ADV_SYNC_TRANSFER=n
+  CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY=n
+  CONFIG_BT_NIMBLE_BLUFI_ENABLE=n
+  CONFIG_BT_NIMBLE_PROX_SERVICE=n
+  CONFIG_BT_NIMBLE_ANS_SERVICE=n
+  CONFIG_BT_NIMBLE_CTS_SERVICE=n
+  CONFIG_BT_NIMBLE_HTP_SERVICE=n
+  CONFIG_BT_NIMBLE_IPSS_SERVICE=n
+  CONFIG_BT_NIMBLE_TPS_SERVICE=n
+  CONFIG_BT_NIMBLE_IAS_SERVICE=n
+  CONFIG_BT_NIMBLE_LLS_SERVICE=n
+  CONFIG_BT_NIMBLE_SPS_SERVICE=n
+  CONFIG_BT_NIMBLE_HR_SERVICE=n
+  CONFIG_BT_NIMBLE_HID_SERVICE=n
+  CONFIG_BT_NIMBLE_BAS_SERVICE=n
+  CONFIG_BT_NIMBLE_DIS_SERVICE=n
+  ;
+  ; Arduino selective compilation
+  ; Disable unused Arduino libraries to save space
+  ;
+  CONFIG_ARDUINO_SELECTIVE_COMPILATION=y
+  CONFIG_ARDUINO_SELECTIVE_SPI=y
+  CONFIG_ARDUINO_SELECTIVE_Wire=y
+  CONFIG_ARDUINO_SELECTIVE_ESP_SR=n
+  CONFIG_ARDUINO_SELECTIVE_EEPROM=y
+  CONFIG_ARDUINO_SELECTIVE_Preferences=y
+  CONFIG_ARDUINO_SELECTIVE_Ticker=y
+  CONFIG_ARDUINO_SELECTIVE_Update=y
+  CONFIG_ARDUINO_SELECTIVE_Zigbee=n
+  CONFIG_ARDUINO_SELECTIVE_FS=y
+  CONFIG_ARDUINO_SELECTIVE_SD=y
+  CONFIG_ARDUINO_SELECTIVE_SD_MMC=y
+  CONFIG_ARDUINO_SELECTIVE_SPIFFS=y
+  CONFIG_ARDUINO_SELECTIVE_FFat=n
+  CONFIG_ARDUINO_SELECTIVE_LittleFS=y
+  CONFIG_ARDUINO_SELECTIVE_Network=y
+  ; CONFIG_ARDUINO_SELECTIVE_Ethernet=n
+  CONFIG_ARDUINO_SELECTIVE_PPP=n
+  CONFIG_ARDUINO_SELECTIVE_Hash=y
+  CONFIG_ARDUINO_SELECTIVE_ArduinoOTA=n
+  CONFIG_ARDUINO_SELECTIVE_AsyncUDP=y
+  CONFIG_ARDUINO_SELECTIVE_DNSServer=n
+  CONFIG_ARDUINO_SELECTIVE_ESPmDNS=y
+  CONFIG_ARDUINO_SELECTIVE_HTTPClient=n
+  CONFIG_ARDUINO_SELECTIVE_Matter=n
+  CONFIG_ARDUINO_SELECTIVE_NetBIOS=n
+  CONFIG_ARDUINO_SELECTIVE_WebServer=n
+  CONFIG_ARDUINO_SELECTIVE_WiFi=y
+  CONFIG_ARDUINO_SELECTIVE_NetworkClientSecure=y
+  CONFIG_ARDUINO_SELECTIVE_WiFiProv=n
+  CONFIG_ARDUINO_SELECTIVE_BLE=n
+  CONFIG_ARDUINO_SELECTIVE_BluetoothSerial=n
+  CONFIG_ARDUINO_SELECTIVE_SimpleBLE=n
+  CONFIG_ARDUINO_SELECTIVE_RainMaker=n
+  CONFIG_ARDUINO_SELECTIVE_OpenThread=n
+  CONFIG_ARDUINO_SELECTIVE_Insights=n
--- a/variants/esp32/esp32.ini
+++ b/variants/esp32/esp32.ini
@@ -6,3 +6,8 @@ custom_esp32_kind = esp32

 build_flags =
  ${esp32_common.build_flags}
+  -mtext-section-literals
+  -DMESHTASTIC_EXCLUDE_AUDIO=1
+
+custom_sdkconfig =
+  ${esp32_common.custom_sdkconfig}
--- a/variants/esp32/heltec_wsl_v2.1/variant.h
+++ b/variants/esp32/heltec_wsl_v2.1/variant.h
@@ -12,7 +12,7 @@
 #define ADC_CTRL 21
 #define ADC_CTRL_ENABLED LOW
 #define BATTERY_PIN 37 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_CHANNEL_1
+#define ADC_CHANNEL ADC_CHANNEL_1
 // ratio of voltage divider = 3.20 (R1=100k, R2=220k)
 #define ADC_MULTIPLIER 3.2

--- a/variants/esp32/m5stack_core/platformio.ini
+++ b/variants/esp32/m5stack_core/platformio.ini
@@ -25,5 +25,5 @@ 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
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
--- a/variants/esp32/m5stack_coreink/variant.h
+++ b/variants/esp32/m5stack_coreink/variant.h
@@ -93,7 +93,7 @@
 #define PIN_EINK_MOSI 23 // EPD_MOSI

 #define BATTERY_PIN 35
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7
 // https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/schematic/Core/m5paper/M5_PAPER_SCH.pdf
 // https://github.com/m5stack/M5Core-Ink/blob/master/examples/Basics/FactoryTest/FactoryTest.ino#L58
 //  VBAT
--- a/variants/esp32/nano-g1-explorer/variant.h
+++ b/variants/esp32/nano-g1-explorer/variant.h
@@ -33,7 +33,7 @@
 #endif

 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7
 #define BATTERY_SENSE_SAMPLES 15 // Set the number of samples, It has an effect of increasing sensitivity.
 #define ADC_MULTIPLIER 2

--- a/variants/esp32/radiomaster_900_bandit/platformio.ini
+++ b/variants/esp32/radiomaster_900_bandit/platformio.ini
@@ -7,7 +7,7 @@ build_flags =
  -DVTABLES_IN_FLASH=1
  -DCONFIG_DISABLE_HAL_LOCKS=1
  -DHAS_STK8XXX=1
-  -O2
+  ; -O2
  -I variants/esp32/radiomaster_900_bandit
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
--- a/variants/esp32/rak11200/variant.h
+++ b/variants/esp32/rak11200/variant.h
@@ -49,7 +49,7 @@ static const uint8_t SCK = 33;

 #define PIN_VBAT WB_A0
 #define BATTERY_PIN PIN_VBAT
-#define ADC_CHANNEL ADC1_GPIO36_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_0

 // https://docs.rakwireless.com/Product-Categories/WisBlock/RAK13300/

--- a/variants/esp32/station-g1/variant.h
+++ b/variants/esp32/station-g1/variant.h
@@ -32,7 +32,7 @@
 #endif

 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7
 #define BATTERY_SENSE_SAMPLES 30 // Set the number of samples, It has an effect of increasing sensitivity.
 #define ADC_MULTIPLIER 6.45
 #define CELL_TYPE_LION // same curve for liion/lipo
--- a/variants/esp32/tbeam_v07/variant.h
+++ b/variants/esp32/tbeam_v07/variant.h
@@ -6,7 +6,7 @@
 #define BUTTON_PIN 39
 #define BATTERY_PIN 35    // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7

 #define USE_RF95
 #define LORA_DIO0 26 // a No connect on the SX1262 module
--- a/variants/esp32/tlora_v1_3/variant.h
+++ b/variants/esp32/tlora_v1_3/variant.h
@@ -1,5 +1,5 @@
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7

 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22
--- a/variants/esp32/tlora_v2/variant.h
+++ b/variants/esp32/tlora_v2/variant.h
@@ -1,5 +1,5 @@
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7

 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22
--- a/variants/esp32/tlora_v2_1_16/variant.h
+++ b/variants/esp32/tlora_v2_1_16/variant.h
@@ -1,5 +1,5 @@
 #define BATTERY_PIN 35
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7
 #define BATTERY_SENSE_SAMPLES 30

 // ratio of voltage divider = 2.0 (R42=100k, R43=100k)
--- a/variants/esp32/tlora_v2_1_18/variant.h
+++ b/variants/esp32/tlora_v2_1_18/variant.h
@@ -1,7 +1,7 @@
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 // ratio of voltage divider = 2.0 (R42=100k, R43=100k)
 #define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7

 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22
--- a/variants/esp32/trackerd/variant.h
+++ b/variants/esp32/trackerd/variant.h
@@ -23,7 +23,7 @@
 #undef BAT_MEASURE_ADC_UNIT
 #define BATTERY_PIN 35      // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_MULTIPLIER 1.34 //  tracked resistance divider is 100k+470k, so it can not fillfull well on esp32 adc
-#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7
 #define ADC_ATTENUATION ADC_ATTEN_DB_12 // lower dB for high resistance voltage divider

 #undef GPS_RX_PIN
--- a/variants/esp32/wiphone/platformio.ini
+++ b/variants/esp32/wiphone/platformio.ini
@@ -10,8 +10,8 @@ build_flags =
  -I variants/esp32/wiphone
 lib_deps = 
  ${esp32_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
  # 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
--- a/variants/esp32c3/align-text.handler_execute-4.ld
+++ b/variants/esp32c3/align-text.handler_execute-4.ld
@@ -0,0 +1,11 @@
+/* Arduino fix: catch esp_event's orphaned .text.handler_execute section and align to 4 bytes */
+SECTIONS
+{
+  .text.handler_execute :
+  {
+    KEEP(*(.text.handler_execute))
+    KEEP(*(.text.handler_execute.*))
+    . = ALIGN(4);
+  }
+}
+INSERT AFTER .flash.text;
--- a/variants/esp32c3/esp32c3.ini
+++ b/variants/esp32c3/esp32c3.ini
@@ -7,5 +7,18 @@ monitor_filters = esp32_c3_exception_decoder

 build_flags =
  ${esp32_common.build_flags}
-  -DCONFIG_BT_NIMBLE_EXT_ADV=1
-  -DCONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
+  ; Linker script to align text.handler_execute section to 4 bytes
+  -Wl,-Tvariants/esp32c3/align-text.handler_execute-4.ld
+
+custom_sdkconfig =
+  ${esp32_common.custom_sdkconfig}
+  ; ESP32c3 doesn't support SD_MMC
+  CONFIG_ARDUINO_SELECTIVE_SD_MMC=n
+  CONFIG_BT_NIMBLE_EXT_ADV=y
+  CONFIG_BT_NIMBLE_TRANSPORT_EVT_SIZE=257
+  CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
+
+lib_deps =
+  ${esp32_common.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
--- a/variants/esp32c6/esp32c6.ini
+++ b/variants/esp32c6/esp32c6.ini
@@ -1,48 +1,32 @@
 [esp32c6_base]
 extends = esp32_common
-platform =
-  # Do not renovate until we have switched to pioarduino tagged builds
-  https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.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
-  -DLIBPAX_WIFI
-  -DLIBPAX_BLE
-  -DMESHTASTIC_EXCLUDE_WEBSERVER
-  ;-DDEBUG_HEAP
-  ; TEMP
-  -DHAS_BLUETOOTH=0
-  -DMESHTASTIC_EXCLUDE_PAXCOUNTER
-  -DMESHTASTIC_EXCLUDE_BLUETOOTH
+custom_esp32_kind = esp32c6

-lib_deps =
-  ${arduino_base.lib_deps}
-  ${networking_base.lib_deps}
-  ${environmental_base.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
-  # 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
-  rweather/Crypto@0.4.0
+build_flags =
+  ${esp32_common.build_flags}
+  ; Exclude Paxcounter, it uses 'esp_vhci_host_send_packet' whch is not available on ESP32-C6
+  ; https://github.com/espressif/arduino-esp32/issues/11716
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER

 build_src_filter = 
-  ${esp32_common.build_src_filter} -<mesh/http>
+ ${esp32_common.build_src_filter}

 monitor_speed = 460800
 monitor_filters = esp32_c3_exception_decoder

+custom_sdkconfig =
+  ${esp32_common.custom_sdkconfig}
+  ; ESP32c6 doesn't support SD_MMC
+  CONFIG_ARDUINO_SELECTIVE_SD_MMC=n
+  CONFIG_BT_NIMBLE_EXT_ADV=y
+  CONFIG_BT_NIMBLE_TRANSPORT_EVT_SIZE=257
+  CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
+
 lib_ignore =
  ${esp32_common.lib_ignore}
-  NonBlockingRTTTL
-  NimBLE-Arduino
  libpax
-  
+
+lib_deps =
+  ${esp32_common.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
--- a/variants/esp32c6/m5stack_unitc6l/platformio.ini
+++ b/variants/esp32c6/m5stack_unitc6l/platformio.ini
@@ -6,29 +6,16 @@ board = esp32-c6-devkitc-1
 ;Normal method
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM2
-build_unflags =
-  -D HAS_BLUETOOTH
-  -D MESHTASTIC_EXCLUDE_BLUETOOTH
-  -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 = 
  ${esp32c6_base.build_flags}
  -D M5STACK_UNITC6L
  -I variants/esp32c6/m5stack_unitc6l
-  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
  -DARDUINO_USB_CDC_ON_BOOT=1
  -DARDUINO_USB_MODE=1
-  -D HAS_BLUETOOTH=1
-	-DCONFIG_BT_NIMBLE_EXT_ADV=1
-	-DCONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
 monitor_speed=115200
-lib_ignore =
-  NonBlockingRTTTL
-  libpax
 build_src_filter = 
 ${esp32c6_base.build_src_filter} +<../variants/esp32c6/m5stack_unitc6l>
--- a/variants/esp32c6/tlora_c6/platformio.ini
+++ b/variants/esp32c6/tlora_c6/platformio.ini
@@ -8,3 +8,10 @@ build_flags =
  -I variants/esp32c6/tlora_c6
  -DARDUINO_USB_CDC_ON_BOOT=1
  -DARDUINO_USB_MODE=1
+  ; Disable audio.
+  ; ESP32-C6 with 4MB flash is TIGHT on space.
+  -DMESHTASTIC_EXCLUDE_AUDIO=1
+
+lib_ignore =
+  ${esp32c6_base.lib_ignore}
+  ESP32 Codec2
--- a/variants/esp32s2/esp32s2.ini
+++ b/variants/esp32s2/esp32s2.ini
@@ -12,8 +12,17 @@ build_flags =
  -DHAS_BLUETOOTH=0
  -DMESHTASTIC_EXCLUDE_PAXCOUNTER
  -DMESHTASTIC_EXCLUDE_BLUETOOTH
-  
+  -mtext-section-literals
+
+custom_sdkconfig =
+  ${esp32_common.custom_sdkconfig}
+
 lib_ignore = 
  ${esp32_common.lib_ignore}
  NimBLE-Arduino
  libpax
+
+lib_deps =
+  ${esp32_common.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
--- a/variants/esp32s3/CDEBYTE_EoRa-S3/variant.h
+++ b/variants/esp32s3/CDEBYTE_EoRa-S3/variant.h
@@ -18,7 +18,7 @@

 // Battery voltage monitoring - TODO: test, currently untested, copied from T3S3 variant
 #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_CHANNEL ADC_CHANNEL_0
 #define ADC_MULTIPLIER                                                                                                           \
    2.11 // ratio of voltage divider = 2.0 (R10=1M, R13=1M), plus some undervoltage correction - TODO: this was carried over from
         // the T3S3, test to see if the undervoltage correction is needed.
--- a/variants/esp32s3/ELECROW-ThinkNode-M2/variant.h
+++ b/variants/esp32s3/ELECROW-ThinkNode-M2/variant.h
@@ -43,8 +43,8 @@
 // Battery
 // #define BATTERY_PIN 2
 #define BATTERY_PIN 17
-// #define ADC_CHANNEL ADC1_GPIO2_CHANNEL
-#define ADC_CHANNEL ADC2_GPIO17_CHANNEL
+// #define ADC_CHANNEL ADC_CHANNEL_1
+#define ADC_CHANNEL ADC_CHANNEL_6
 #define BATTERY_SENSE_RESOLUTION_BITS 12
 #define BATTERY_SENSE_RESOLUTION 4096.0
 #undef AREF_VOLTAGE
--- a/variants/esp32s3/ELECROW-ThinkNode-M5/variant.h
+++ b/variants/esp32s3/ELECROW-ThinkNode-M5/variant.h
@@ -12,7 +12,7 @@
 // USB_CHECK
 #define EXT_PWR_DETECT 12
 #define BATTERY_PIN 8
-#define ADC_CHANNEL ADC1_GPIO8_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_7

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

--- a/variants/esp32s3/crowpanel-esp32s3-5-epaper/variant.h
+++ b/variants/esp32s3/crowpanel-esp32s3-5-epaper/variant.h
@@ -17,7 +17,7 @@
 // #define BATTERY_PIN 1 // A battery voltage measurement pin, voltage divider connected here to
 //  measure battery voltage ratio of voltage divider = 2.0 (assumption)
 // #define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
-// #define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+// #define ADC_CHANNEL ADC_CHANNEL_0

 #define I2C_SDA SDA // 21
 #define I2C_SCL SCL // 15
--- a/variants/esp32s3/diy/my_esp32s3_diy_eink/platformio.ini
+++ b/variants/esp32s3/diy/my_esp32s3_diy_eink/platformio.ini
@@ -14,9 +14,6 @@ lib_deps =
  zinggjm/GxEPD2@1.6.5
  # 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
 build_flags = 
  ${esp32s3_base.build_flags}
  -D PRIVATE_HW
@@ -28,3 +25,4 @@ build_flags =
  -DBOARD_HAS_PSRAM
  -mfix-esp32-psram-cache-issue
  -DARDUINO_USB_MODE=0
+  -DARDUINO_USB_CDC_ON_BOOT=1
--- a/variants/esp32s3/diy/my_esp32s3_diy_oled/platformio.ini
+++ b/variants/esp32s3/diy/my_esp32s3_diy_oled/platformio.ini
@@ -12,13 +12,9 @@ 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
 build_flags = 
  ${esp32s3_base.build_flags}
  -D PRIVATE_HW
  -I variants/esp32s3/diy/my_esp32s3_diy_oled
  -DBOARD_HAS_PSRAM
  -mfix-esp32-psram-cache-issue
-  -DARDUINO_USB_MODE=0
--- a/variants/esp32s3/diy/t-energy-s3_e22/platformio.ini
+++ b/variants/esp32s3/diy/t-energy-s3_e22/platformio.ini
@@ -6,13 +6,10 @@ board_build.partitions = default_16MB.csv
 board_level = extra
 board_upload.flash_size = 16MB ;Specify the FLASH capacity as 16MB
 board_build.arduino.memory_type = qio_opi ;Enable internal PSRAM
-build_unflags =
-  ${esp32s3_base.build_unflags}
-  -D ARDUINO_USB_MODE=1
 build_flags =
  ${esp32s3_base.build_flags}
  -D EBYTE_ESP32_S3
  -D BOARD_HAS_PSRAM
-  -D ARDUINO_USB_MODE=0
+  -D ARDUINO_USB_MODE=1
  -D ARDUINO_USB_CDC_ON_BOOT=1
  -I variants/esp32s3/diy/t-energy-s3_e22
--- a/variants/esp32s3/diy/t-energy-s3_e22/variant.h
+++ b/variants/esp32s3/diy/t-energy-s3_e22/variant.h
@@ -4,7 +4,7 @@
 // Battery
 #define BATTERY_PIN 3
 #define ADC_MULTIPLIER 2.0
-#define ADC_CHANNEL ADC1_GPIO3_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_2

 // Button on NanoVHF PCB
 #define BUTTON_PIN 39
--- a/variants/esp32s3/dreamcatcher/platformio.ini
+++ b/variants/esp32s3/dreamcatcher/platformio.ini
@@ -13,7 +13,7 @@ build_flags =

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
-  earlephilhower/ESP8266Audio@1.9.9
+  earlephilhower/ESP8266Audio@2.4.1
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
  earlephilhower/ESP8266SAM@1.1.0

--- a/variants/esp32s3/elecrow_panel/pins_arduino.h
+++ b/variants/esp32s3/elecrow_panel/pins_arduino.h
@@ -15,9 +15,9 @@ static const uint8_t MOSI = 48;
 static const uint8_t MISO = 47;
 static const uint8_t SCK = 41;

-static const uint8_t SPI_MOSI = 6;
-static const uint8_t SPI_SCK = 5;
-static const uint8_t SPI_MISO = 4;
+// static const uint8_t SPI_MOSI = 6;
+// static const uint8_t SPI_SCK = 5;
+// static const uint8_t SPI_MISO = 4;

 static const uint8_t A0 = 1;
 static const uint8_t A1 = 2;
--- a/variants/esp32s3/elecrow_panel/platformio.ini
+++ b/variants/esp32s3/elecrow_panel/platformio.ini
@@ -38,15 +38,19 @@ build_flags = ${esp32s3_base.build_flags} -Os
  -D USE_PACKET_API
  -D HAS_SDCARD
  -D SD_SPI_FREQUENCY=75000000
+  -D SPI_MISO=4
+  -D SPI_MOSI=6
+  -D SPI_SCK=5

 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
+  earlephilhower/ESP8266Audio@2.4.1
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
-  earlephilhower/ESP8266SAM@1.0.1
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.0 ; note: v1.2.7 breaks the elecrow 7" display functionality
+  earlephilhower/ESP8266SAM@1.1.0
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
+  ; REVISIT note: v1.2.7 breaks the elecrow 7" display functionality
  # renovate: datasource=custom.pio depName=TCA9534 packageName=hideakitai/library/TCA9534
  hideakitai/TCA9534@0.1.1

--- a/variants/esp32s3/esp32-s3-pico/variant.h
+++ b/variants/esp32s3/esp32-s3-pico/variant.h
@@ -22,8 +22,8 @@
 // https://www.waveshare.com/img/devkit/ESP32-S3-Pico/ESP32-S3-Pico-details-inter-1.jpg
 // digram is incorrect labeled as battery pin is getting readings on GPIO7_CH1?
 #define BATTERY_PIN 7
-#define ADC_CHANNEL ADC1_GPIO7_CHANNEL
-// #define ADC_CHANNEL ADC1_GPIO6_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_6
+// #define ADC_CHANNEL ADC_CHANNEL_5
 //   ratio of voltage divider = 3.0 (R17=200k, R18=100k)
 #define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic

--- a/variants/esp32s3/esp32s3.ini
+++ b/variants/esp32s3/esp32s3.ini
@@ -6,5 +6,15 @@ monitor_speed = 115200

 build_flags =
  ${esp32_common.build_flags}
-  -DCONFIG_BT_NIMBLE_EXT_ADV=1
-  -DCONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
+  -mtext-section-literals
+
+custom_sdkconfig =
+  ${esp32_common.custom_sdkconfig}
+  CONFIG_BT_NIMBLE_EXT_ADV=y
+  CONFIG_BT_NIMBLE_TRANSPORT_EVT_SIZE=257
+  CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
+
+lib_deps =
+  ${esp32_common.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
--- a/variants/esp32s3/hackaday-communicator/variant.h
+++ b/variants/esp32s3/hackaday-communicator/variant.h
@@ -22,7 +22,7 @@
 // #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
+// #define ADC_CHANNEL ADC_CHANNEL_3

 // keyboard
 #define I2C_SDA 47 // I2C pins for this board
--- a/variants/esp32s3/heltec_capsule_sensor_v3/variant.h
+++ b/variants/esp32s3/heltec_capsule_sensor_v3/variant.h
@@ -7,7 +7,7 @@
 #define BUTTON_ACTIVE_PULLUP false

 #define BATTERY_PIN 7 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO7_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_6
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER (4.9 * 1.045)
 #define ADC_CTRL 36 // active HIGH, powers the voltage divider. Only on 1.1
--- a/variants/esp32s3/heltec_sensor_hub/variant.h
+++ b/variants/esp32s3/heltec_sensor_hub/variant.h
@@ -5,7 +5,7 @@
 #define BUTTON_ACTIVE_PULLUP false

 #define BATTERY_PIN 7 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO7_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_6
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER (4.9 * 1.045)
 #define ADC_CTRL 34 // active HIGH, powers the voltage divider. Only on 1.1
--- a/variants/esp32s3/heltec_v3/variant.h
+++ b/variants/esp32s3/heltec_v3/variant.h
@@ -16,7 +16,7 @@
 #define ADC_CTRL 37
 #define ADC_CTRL_ENABLED LOW
 #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_CHANNEL ADC_CHANNEL_0
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9 * 1.045

--- a/variants/esp32s3/heltec_v4/platformio.ini
+++ b/variants/esp32s3/heltec_v4/platformio.ini
@@ -103,8 +103,8 @@ 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.0
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
  # 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)
--- a/variants/esp32s3/heltec_v4/variant.h
+++ b/variants/esp32s3/heltec_v4/variant.h
@@ -4,7 +4,7 @@
 #define ADC_CTRL 37
 #define ADC_CTRL_ENABLED HIGH
 #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_CHANNEL ADC_CHANNEL_0
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9 * 1.045

--- a/variants/esp32s3/heltec_vision_master_e213/platformio.ini
+++ b/variants/esp32s3/heltec_vision_master_e213/platformio.ini
@@ -4,6 +4,7 @@ board = heltec_vision_master_e213
 board_build.partitions = default_8MB.csv
 build_flags = 
  ${esp32s3_base.build_flags}
+  -DBOARD_HAS_PSRAM
  -Ivariants/esp32s3/heltec_vision_master_e213 
  -DHELTEC_VISION_MASTER_E213
  -DUSE_EINK
@@ -32,6 +33,7 @@ build_src_filter =
 build_flags =  
  ${esp32s3_base.build_flags}
  ${inkhud.build_flags}
+  -D BOARD_HAS_PSRAM
  -I variants/esp32s3/heltec_vision_master_e213
  -D HELTEC_VISION_MASTER_E213
 lib_deps =
--- a/variants/esp32s3/heltec_vision_master_e213/variant.h
+++ b/variants/esp32s3/heltec_vision_master_e213/variant.h
@@ -28,7 +28,7 @@
 #define ADC_CTRL 46
 #define ADC_CTRL_ENABLED HIGH
 #define BATTERY_PIN 7
-#define ADC_CHANNEL ADC1_GPIO7_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_6
 #define ADC_MULTIPLIER 4.9 * 1.03
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5

--- a/variants/esp32s3/heltec_vision_master_e290/variant.h
+++ b/variants/esp32s3/heltec_vision_master_e290/variant.h
@@ -27,7 +27,7 @@
 #define ADC_CTRL 46
 #define ADC_CTRL_ENABLED HIGH
 #define BATTERY_PIN 7
-#define ADC_CHANNEL ADC1_GPIO7_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_6
 #define ADC_MULTIPLIER 4.9 * 1.03
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5

--- a/variants/esp32s3/heltec_vision_master_t190/variant.h
+++ b/variants/esp32s3/heltec_vision_master_t190/variant.h
@@ -45,7 +45,7 @@
 #define ADC_CTRL 46
 #define ADC_CTRL_ENABLED HIGH
 #define BATTERY_PIN 6
-#define ADC_CHANNEL ADC1_GPIO6_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_5
 #define ADC_MULTIPLIER 4.9 * 1.03        // Voltage divider is roughly 1:1
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // Voltage divider output is quite high

--- a/variants/esp32s3/heltec_wireless_paper/variant.h
+++ b/variants/esp32s3/heltec_wireless_paper/variant.h
@@ -24,7 +24,7 @@
 #define VEXT_ON_VALUE LOW
 #define ADC_CTRL 19
 #define BATTERY_PIN 20
-#define ADC_CHANNEL ADC2_GPIO20_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_9
 #define ADC_MULTIPLIER 2                // Voltage divider is roughly 1:1
 #define BAT_MEASURE_ADC_UNIT 2          // Use ADC2
 #define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high
--- a/variants/esp32s3/heltec_wireless_paper_v1/variant.h
+++ b/variants/esp32s3/heltec_wireless_paper_v1/variant.h
@@ -25,7 +25,7 @@
 #define VEXT_ON_VALUE LOW
 #define ADC_CTRL 19
 #define BATTERY_PIN 20
-#define ADC_CHANNEL ADC2_GPIO20_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_9
 #define ADC_MULTIPLIER 2                // Voltage divider is roughly 1:1
 #define BAT_MEASURE_ADC_UNIT 2          // Use ADC2
 #define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high
--- a/variants/esp32s3/heltec_wireless_tracker/platformio.ini
+++ b/variants/esp32s3/heltec_wireless_tracker/platformio.ini
@@ -4,13 +4,15 @@ board = heltec_wireless_tracker
 board_build.partitions = default_8MB.csv
 upload_protocol = esptool

-build_flags = 
+build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/heltec_wireless_tracker
  -D HELTEC_TRACKER_V1_1
+  -DARDUINO_USB_CDC_ON_BOOT=1
+  -DARDUINO_USB_MODE=1
  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output

 lib_deps =
  ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
--- a/variants/esp32s3/heltec_wireless_tracker/variant.h
+++ b/variants/esp32s3/heltec_wireless_tracker/variant.h
@@ -39,7 +39,7 @@
 #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_CHANNEL ADC_CHANNEL_0
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9 * 1.045
 #define ADC_CTRL 2     // active HIGH, powers the voltage divider. Only on 1.1
--- a/variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini
+++ b/variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini
@@ -11,5 +11,5 @@ build_flags =
  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
 lib_deps =
  ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
--- a/variants/esp32s3/heltec_wireless_tracker_V1_0/variant.h
+++ b/variants/esp32s3/heltec_wireless_tracker_V1_0/variant.h
@@ -35,7 +35,7 @@
 #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_CHANNEL ADC_CHANNEL_0
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9 * 1.045

--- a/variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini
+++ b/variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini
@@ -10,5 +10,5 @@ build_flags =
  -D HELTEC_WIRELESS_TRACKER_V2
 lib_deps =
  ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
--- a/variants/esp32s3/heltec_wireless_tracker_v2/variant.h
+++ b/variants/esp32s3/heltec_wireless_tracker_v2/variant.h
@@ -34,7 +34,7 @@
 #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_CHANNEL ADC_CHANNEL_0
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9 * 1.045
 #define ADC_CTRL 2     // active HIGH, powers the voltage divider.
--- a/variants/esp32s3/heltec_wsl_v3/variant.h
+++ b/variants/esp32s3/heltec_wsl_v3/variant.h
@@ -10,7 +10,7 @@
 #define ADC_CTRL 37
 #define ADC_CTRL_ENABLED LOW
 #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_CHANNEL ADC_CHANNEL_0
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9 * 1.045

--- a/variants/esp32s3/icarus/platformio.ini
+++ b/variants/esp32s3/icarus/platformio.ini
@@ -7,12 +7,10 @@ board_build.mcu = esp32s3
 board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 upload_speed = 921600
-build_unflags =
-  ${esp32s3_base.build_unflags}
-  -DARDUINO_USB_MODE=1
 build_flags = 
  ${esp32s3_base.build_flags}
  -D PRIVATE_HW
  -I variants/esp32s3/icarus
  -DBOARD_HAS_PSRAM
+  -DARDUINO_USB_CDC_ON_BOOT=1
  -DARDUINO_USB_MODE=0
--- a/variants/esp32s3/mesh-tab/platformio.ini
+++ b/variants/esp32s3/mesh-tab/platformio.ini
@@ -50,8 +50,8 @@ build_src_filter = ${esp32s3_base.build_src_filter}
 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.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip

 [mesh_tab_xpt2046]
 extends = mesh_tab_base
--- a/variants/esp32s3/mesh-tab/variant.h
+++ b/variants/esp32s3/mesh-tab/variant.h
@@ -10,7 +10,7 @@
 #define BATTERY_PIN 4 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 // ratio of voltage divider (100k, 220k)
 #define ADC_MULTIPLIER 1.6 // 1.45 + 10% for correction of display undervoltage.
-#define ADC_CHANNEL ADC1_GPIO4_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_3

 // LED
 #define LED_PIN 21
--- a/variants/esp32s3/picomputer-s3/platformio.ini
+++ b/variants/esp32s3/picomputer-s3/platformio.ini
@@ -15,8 +15,8 @@ build_flags =

 lib_deps = 
  ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip

 build_src_filter =
  ${esp32s3_base.build_src_filter}
--- a/variants/esp32s3/picomputer-s3/variant.h
+++ b/variants/esp32s3/picomputer-s3/variant.h
@@ -11,7 +11,7 @@
 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 // ratio of voltage divider = 3.0 (R11=200k, R7=100k)
 #define ADC_MULTIPLIER 3.1 // 3.0 with correction of display undervoltage.
-#define ADC_CHANNEL ADC1_GPIO2_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_1

 #define USE_RF95 // RFM95/SX127x

--- a/variants/esp32s3/rak3312/variant.h
+++ b/variants/esp32s3/rak3312/variant.h
@@ -40,5 +40,5 @@
 #define GPS_RX_PIN 44

 #define BATTERY_PIN 1
-#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_0
 #define ADC_MULTIPLIER 1.667
--- a/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
+++ b/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
@@ -15,8 +15,8 @@ build_flags =

 lib_deps =
  ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip

 [ft5x06]
 extends = mesh_tab_base
--- a/variants/esp32s3/rak_wismesh_tap_v2/variant.h
+++ b/variants/esp32s3/rak_wismesh_tap_v2/variant.h
@@ -54,7 +54,7 @@
 #define USE_VIRTUAL_KEYBOARD 1

 #define BATTERY_PIN 1
-#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_0
 #define ADC_MULTIPLIER 1.667

 #define PIN_BUZZER 38
--- a/variants/esp32s3/seeed-sensecap-indicator/platformio.ini
+++ b/variants/esp32s3/seeed-sensecap-indicator/platformio.ini
@@ -2,7 +2,8 @@
 [env:seeed-sensecap-indicator]
 extends = esp32s3_base
 platform_packages =
-    platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32/archive/aef7fef6de3329ed6f75512d46d63bba12b09bb5.zip ; add_tca9535 (based on 2.0.16)
+  ; Version needs to match the pioarduino version used in esp32_common.ini
+  platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32#60946733b52c30e3d5b58a7158700d65fc1dddae

 board = seeed-sensecap-indicator
 board_check = true
@@ -12,7 +13,7 @@ upload_protocol = esptool
 build_flags = ${esp32s3_base.build_flags}
  -Ivariants/esp32s3/seeed-sensecap-indicator
  -DSENSECAP_INDICATOR
-  -DCONFIG_ARDUHAL_LOG_COLORS
+  -DUSE_ARDUINO_HAL_GPIO
  -DRADIOLIB_DEBUG_SPI=0
  -DRADIOLIB_DEBUG_PROTOCOL=0
  -DRADIOLIB_DEBUG_BASIC=0
@@ -21,13 +22,14 @@ build_flags = ${esp32s3_base.build_flags}
  -DIO_EXPANDER=0x40
  -DIO_EXPANDER_IRQ=42
  ;-DIO_EXPANDER_DEBUG
-  -DUSE_ARDUINO_HAL_GPIO
+  ; mverch's hacks:
+  -D lcd_periph_signals=lcd_periph_rgb_signals

 lib_deps = ${esp32s3_base.lib_deps}
  ; TODO switch back to official LovyanGFX
-  https://github.com/mverch67/LovyanGFX/archive/4c76238c1344162a234ae917b27651af146d6fb2.zip
+  https://github.com/mverch67/LovyanGFX/archive/a1c1278fc9116d1c6cb15a7bb14565aef59a9a97.zip
  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
-  earlephilhower/ESP8266Audio@1.9.9
+  earlephilhower/ESP8266Audio@2.4.1
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
  earlephilhower/ESP8266SAM@1.1.0

@@ -43,10 +45,10 @@ build_flags =
  -D HAS_SCREEN=1
  -D HAS_TFT=1
  -D DISPLAY_SET_RESOLUTION
-  -D RAM_SIZE=4096
-	-D LV_LVGL_H_INCLUDE_SIMPLE
-	-D LV_CONF_INCLUDE_SIMPLE
-	-D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D RAM_SIZE=3072
+  -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
--- a/variants/esp32s3/seeed-sensecap-indicator/variant.h
+++ b/variants/esp32s3/seeed-sensecap-indicator/variant.h
@@ -4,7 +4,7 @@
 // This board has a serial coprocessor for sensor readings
 #define SENSOR_RP2040_TXD 19
 #define SENSOR_RP2040_RXD 20
-#define SENSOR_PORT_NUM 2
+#define SENSOR_PORT_NUM UART_NUM_2
 #define SENSOR_BAUD_RATE 115200

 #define BUTTON_PIN 38
@@ -14,7 +14,7 @@
 // #define BUTTON_NEED_PULLUP

 // #define BATTERY_PIN 27 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-// #define ADC_CHANNEL ADC1_GPIO27_CHANNEL
+// #define ADC_CHANNEL ADC2_GPIO27_CHANNEL
 // #define ADC_MULTIPLIER 2

 // ST7701 TFT LCD
--- a/variants/esp32s3/seeed_xiao_s3/platformio.ini
+++ b/variants/esp32s3/seeed_xiao_s3/platformio.ini
@@ -6,12 +6,8 @@ board_check = true
 board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 upload_speed = 921600
-build_unflags =
-  ${esp32s3_base.build_unflags}
-  -DARDUINO_USB_MODE=1
 build_flags = 
  ${esp32s3_base.build_flags}
  -D SEEED_XIAO_S3
  -I variants/esp32s3/seeed_xiao_s3
  -DBOARD_HAS_PSRAM 
-  -DARDUINO_USB_MODE=0
--- a/variants/esp32s3/seeed_xiao_s3/variant.h
+++ b/variants/esp32s3/seeed_xiao_s3/variant.h
@@ -37,7 +37,7 @@ L76K GPS Module Information : https://www.seeedstudio.com/L76K-GNSS-Module-for-S
 #define BUTTON_NEED_PULLUP

 #define BATTERY_PIN -1
-#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_0
 #define BATTERY_SENSE_RESOLUTION_BITS 12

 /*Warning:
--- a/variants/esp32s3/station-g2/platformio.ini
+++ b/variants/esp32s3/station-g2/platformio.ini
@@ -8,13 +8,9 @@ board_build.mcu = esp32s3
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM0
 upload_speed = 921600
-build_unflags =
-  ${esp32s3_base.build_unflags}
-  -DARDUINO_USB_MODE=1
 build_flags = 
  ${esp32s3_base.build_flags}
  -D STATION_G2
  -I variants/esp32s3/station-g2
  -DBOARD_HAS_PSRAM
  -DSTATION_G2
-  -DARDUINO_USB_MODE=0
--- a/variants/esp32s3/station-g2/variant.h
+++ b/variants/esp32s3/station-g2/variant.h
@@ -42,7 +42,7 @@ Board Information: https://wiki.uniteng.com/en/meshtastic/station-g2

 /*
 #define BATTERY_PIN 4 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO4_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_3
 #define ADC_MULTIPLIER 4
 #define BATTERY_SENSE_SAMPLES 15 // Set the number of samples, It has an effect of increasing sensitivity.
 #define BAT_FULLVOLT 8400
--- a/variants/esp32s3/t-deck/platformio.ini
+++ b/variants/esp32s3/t-deck/platformio.ini
@@ -12,10 +12,10 @@ build_flags = ${esp32s3_base.build_flags}
  -I variants/esp32s3/t-deck

 lib_deps = ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
-  earlephilhower/ESP8266Audio@1.9.9
+  earlephilhower/ESP8266Audio@2.4.1
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
  earlephilhower/ESP8266SAM@1.1.0

--- a/variants/esp32s3/t-deck/variant.h
+++ b/variants/esp32s3/t-deck/variant.h
@@ -53,7 +53,7 @@
 #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
+#define ADC_CHANNEL ADC_CHANNEL_3

 // keyboard
 #define I2C_SDA 18 // I2C pins for this board
--- a/variants/esp32s3/t-eth-elite/platformio.ini
+++ b/variants/esp32s3/t-eth-elite/platformio.ini
@@ -10,10 +10,15 @@ build_flags =
  -D HAS_UDP_MULTICAST=1
  -I variants/esp32s3/t-eth-elite

-lib_ignore = 
-    Ethernet
+custom_sdkconfig =
+  ${esp32s3_base.custom_sdkconfig}
+  CONFIG_ETH_ENABLED=y
+  CONFIG_ARDUINO_SELECTIVE_Ethernet=y

-lib_deps = 
-  ${esp32s3_base.lib_deps}
-  # renovate: datasource=github-tags depName=ETHClass2 packageName=meshtastic/ETHClass2
-  https://github.com/meshtastic/ETHClass2/archive/v1.0.0.zip
+; lib_ignore =
+;     Ethernet
+
+; lib_deps =
+;   ${esp32s3_base.lib_deps}
+;   # renovate: datasource=github-tags depName=ETHClass2 packageName=meshtastic/ETHClass2
+;   https://github.com/meshtastic/ETHClass2/archive/v1.0.0.zip
--- a/variants/esp32s3/t-watch-s3/platformio.ini
+++ b/variants/esp32s3/t-watch-s3/platformio.ini
@@ -11,13 +11,13 @@ build_flags = ${esp32s3_base.build_flags}
  -Ivariants/esp32s3/t-watch-s3

 lib_deps = ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
  lewisxhe/SensorLib@0.3.3
  # renovate: datasource=custom.pio depName=Adafruit DRV2605 packageName=adafruit/library/Adafruit DRV2605 Library
  adafruit/Adafruit DRV2605 Library@1.2.4
  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
-  earlephilhower/ESP8266Audio@1.9.9
+  earlephilhower/ESP8266Audio@2.4.1
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
  earlephilhower/ESP8266SAM@1.1.0
--- a/variants/esp32s3/tlora-pager/platformio.ini
+++ b/variants/esp32s3/tlora-pager/platformio.ini
@@ -17,12 +17,12 @@ build_flags = ${esp32s3_base.build_flags}
  -D ROTARY_BUXTRONICS

 lib_deps = ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
-  earlephilhower/ESP8266Audio@1.9.9
+  earlephilhower/ESP8266Audio@2.4.1
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
-  earlephilhower/ESP8266SAM@1.0.1
+  earlephilhower/ESP8266SAM@1.1.0
  # renovate: datasource=custom.pio depName=Adafruit DRV2605 packageName=adafruit/library/Adafruit DRV2605 Library
  adafruit/Adafruit DRV2605 Library@1.2.4
  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
--- a/variants/esp32s3/tlora_t3s3_epaper/variant.h
+++ b/variants/esp32s3/tlora_t3s3_epaper/variant.h
@@ -12,7 +12,7 @@
 #define BATTERY_PIN 1 // A battery voltage measurement pin, voltage divider connected here to
 // measure battery voltage ratio of voltage divider = 2.0 (assumption)
 #define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
-#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_0

 #define I2C_SDA SDA
 #define I2C_SCL SCL
--- a/variants/esp32s3/tlora_t3s3_v1/variant.h
+++ b/variants/esp32s3/tlora_t3s3_v1/variant.h
@@ -6,7 +6,7 @@
 #define BATTERY_PIN 1 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 // ratio of voltage divider = 2.0 (R42=100k, R43=100k)
 #define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
-#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+#define ADC_CHANNEL ADC_CHANNEL_0

 #define I2C_SDA 18 // I2C pins for this board
 #define I2C_SCL 17
--- a/variants/esp32s3/tracksenger/internal/variant.h
+++ b/variants/esp32s3/tracksenger/internal/variant.h
@@ -35,7 +35,7 @@
 #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_CHANNEL ADC_CHANNEL_0
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9
 #define ADC_CTRL 2 // active HIGH, powers the voltage divider. Only on 1.1
--- a/variants/esp32s3/tracksenger/lcd/variant.h
+++ b/variants/esp32s3/tracksenger/lcd/variant.h
@@ -59,7 +59,7 @@
 #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_CHANNEL ADC_CHANNEL_0
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9
 #define ADC_CTRL 2 // active HIGH, powers the voltage divider. Only on 1.1
--- a/variants/esp32s3/tracksenger/oled/variant.h
+++ b/variants/esp32s3/tracksenger/oled/variant.h
@@ -36,7 +36,7 @@
 #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_CHANNEL ADC_CHANNEL_0
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9
 #define ADC_CTRL 2 // active HIGH, powers the voltage divider. Only on 1.1
--- a/variants/esp32s3/tracksenger/platformio.ini
+++ b/variants/esp32s3/tracksenger/platformio.ini
@@ -12,8 +12,8 @@ build_flags =

 lib_deps =
  ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip

 [env:tracksenger-lcd]
 extends = esp32s3_base
@@ -29,8 +29,8 @@ build_flags =

 lib_deps =
  ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip

 [env:tracksenger-oled]
 extends = esp32s3_base
--- a/variants/esp32s3/unphone/platformio.ini
+++ b/variants/esp32s3/unphone/platformio.ini
@@ -12,7 +12,6 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D UNPHONE
  -I variants/esp32s3/unphone
-  -D ARDUINO_USB_MODE=0
  -D UNPHONE_ACCEL=0
  -D UNPHONE_TOUCHS=0
  -D UNPHONE_SDCARD=0
@@ -27,8 +26,8 @@ build_src_filter =
  +<../variants/esp32s3/unphone>

 lib_deps = ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.0
+  # renovate: datasource=git-refs depName=LovyanGFX-develop packageName=https://github.com/lovyan03/LovyanGFX gitBranch=develop
+  https://github.com/lovyan03/LovyanGFX/archive/2689b7c12e384558991d324e19bc67782f986551.zip
  # TODO renovate
  https://gitlab.com/hamishcunningham/unphonelibrary#meshtastic@9.0.0
  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel