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