diff --git a/platformio.ini b/platformio.ini
index 2b21f42eb..cd6f9a84f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ extra_configs =
platformio_special_envs.ini
;default_envs = normal_ESP32_4M
-default_envs = normal_ESP32_16M8M_LittleFS
+default_envs = max_ESP32_16M8M_LittleFS
; default_envs = custom_ESP8266_4M1M
;default_envs = normal_ESP8266_4M1M
@@ -31,7 +31,6 @@ default_envs = normal_ESP32_16M8M_LittleFS
;build_cache_dir = $PROJECT_DIR\.buildcache
-
; add these:
; -Werror -Wall -Wextra -pedantic -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op
; -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-null-sentinel
@@ -90,6 +89,8 @@ monitor_speed = 115200
targets =
src_filter = +<*> -<.git/> -<.svn/> - - - - -<*/Commands/> -<*/ControllerQueue/> -<*/DataStructs/> -<*/DataTypes/> -<*/Globals/> -<*/Helpers/> -<*/PluginStructs/> -<*/WebServer/>
+; Backwards compatibility: https://github.com/platformio/platformio-core/issues/4270
+;build_src_filter = +<*> -<.git/> -<.svn/> - - - - -<*/Commands/> -<*/ControllerQueue/> -<*/DataStructs/> -<*/DataTypes/> -<*/Globals/> -<*/Helpers/> -<*/PluginStructs/> -<*/WebServer/>
[env]
diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini
index 1d3c86885..5a6ef7f1b 100644
--- a/platformio_core_defs.ini
+++ b/platformio_core_defs.ini
@@ -38,7 +38,13 @@ build_flags = -D NDEBUG
-DVTABLES_IN_FLASH
-DPUYA_SUPPORT=1
-fno-strict-aliasing
-lib_ignore = ESP32_ping, ESP32WebServer, ESP32HTTPUpdateServer, ServoESP32, IRremoteESP8266, HeatpumpIR, TinyWireM
+lib_ignore = ESP32_ping
+ ESP32WebServer
+ ESP32HTTPUpdateServer
+ ServoESP32
+ IRremoteESP8266
+ HeatpumpIR
+ TinyWireM
[esp82xx_2_5_x]
build_flags = -DNDEBUG
@@ -80,23 +86,32 @@ lib_ignore = ${esp82xx_defaults.lib_ignore}
; -DPUYA_SUPPORT=1
; -DARDUINO_ESP8266_RELEASE_2_3_0
; -DFORCE_PRE_2_5_0
-;lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR
+;lib_ignore = ${esp82xx_defaults.lib_ignore}
+; IRremoteESP8266
+; HeatpumpIR
;[core_2_4_0]
;platform = https://github.com/TD-er/platform-espressif8266.git#patch/v1.6.0_Puya
;build_flags = ${esp82xx_defaults.build_flags} -DARDUINO_ESP8266_RELEASE_2_4_0 -DFORCE_PRE_2_5_0
-;lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR
+;lib_ignore = ${esp82xx_defaults.lib_ignore}
+; IRremoteESP8266
+; HeatpumpIR
;[core_2_4_1]
;platform = https://github.com/TD-er/platform-espressif8266.git#patch/v1.7.3_Puya
;build_flags = ${esp82xx_defaults.build_flags} -DARDUINO_ESP8266_RELEASE_2_4_1 -DFORCE_PRE_2_5_0
-;lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR
+;lib_ignore = ${esp82xx_defaults.lib_ignore}
+; IRremoteESP8266
+; HeatpumpIR
;[core_2_4_2]
;platform = https://github.com/TD-er/platform-espressif8266.git#patch/v1.8.0_Puya
;build_flags = ${esp82xx_defaults.build_flags} -DARDUINO_ESP8266_RELEASE_2_4_2 -DFORCE_PRE_2_5_0
-;lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR, ServoESP32
+;lib_ignore = ${esp82xx_defaults.lib_ignore}
+; IRremoteESP8266
+; HeatpumpIR
+; ServoESP32
;[core_2_5_0]
;platform = espressif8266@2.0.4
@@ -117,7 +132,12 @@ platform_packages =
build_flags = ${esp82xx_2_6_x.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
-Wno-deprecated-declarations
-lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR, LittleFS(esp8266), ServoESP32, TinyWireM
+lib_ignore = ${esp82xx_defaults.lib_ignore}
+ IRremoteESP8266
+ HeatpumpIR
+ LittleFS(esp8266)
+ ServoESP32
+ TinyWireM
; Core with alternative WiFi for nodes not running stable wifi or slow network response
; e.g. Sonoff Basic R2.
@@ -129,7 +149,12 @@ platform_packages =
build_flags = ${esp82xx_2_6_x.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191122
-Wno-deprecated-declarations
-lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR, LittleFS(esp8266), ServoESP32, TinyWireM
+lib_ignore = ${esp82xx_defaults.lib_ignore}
+ IRremoteESP8266
+ HeatpumpIR
+ LittleFS(esp8266)
+ ServoESP32
+ TinyWireM
[core_3_0_2]
extends = esp82xx_3_0_x
diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini
index 227f9c05d..fd7b1df46 100644
--- a/platformio_esp32_envs.ini
+++ b/platformio_esp32_envs.ini
@@ -5,11 +5,37 @@
; ***************************************************************************************;
[esp32_always]
-lib_ignore = ESP8266WiFi, ESP8266Ping, ESP8266WebServer, ESP8266HTTPUpdateServer, ESP8266mDNS, ESPEasy_ESP8266Ping, RABurton ESP8266 Mutex, TinyWireM, LittleFS_esp32
+lib_ignore = ESP8266Ping
+ ESP8266HTTPUpdateServer
+ ESP8266WiFi
+ ESP8266WebServer
+ ESP8266mDNS
+ ESPEasy_ESP8266Ping
+ RABurton ESP8266 Mutex
+ TinyWireM
+ LittleFS_esp32
+
[esp32_base]
extends = common, core_esp32_IDF4_4__2_0_3
-lib_deps = td-er/ESPeasySerial @ 2.0.8, I2Cdevlib-Core, adafruit/Adafruit ILI9341 @ ^1.5.6, Adafruit GFX Library, LOLIN_EPD, adafruit/Adafruit BusIO @ ^1.10.0, VL53L0X @ 1.3.0, SparkFun VL53L1X 4m Laser Distance Sensor @ 1.2.9, td-er/SparkFun MAX1704x Fuel Gauge Arduino Library @ ^1.0.1, ArduinoOTA, ESP32HTTPUpdateServer, FrogmoreScd30, Multi Channel Relay Arduino Library, SparkFun ADXL345 Arduino Library, ITG3205, Adafruit_ST77xx, ShiftRegister74HC595_NonTemplate
+lib_deps =
+ Adafruit_ST77xx
+ ArduinoOTA
+ ESP32HTTPUpdateServer
+ FrogmoreScd30
+ I2Cdevlib-Core
+ ITG3205
+ LOLIN_EPD
+ Multi Channel Relay Arduino Library
+ ShiftRegister74HC595_NonTemplate
+ SparkFun ADXL345 Arduino Library
+ SparkFun VL53L1X 4m Laser Distance Sensor @ 1.2.9
+ VL53L0X @ 1.3.0
+ adafruit/Adafruit BusIO @ ^1.10.0
+ adafruit/Adafruit GFX Library@^1.11.1
+ adafruit/Adafruit ILI9341@^1.5.10
+ td-er/ESPeasySerial @ 2.0.8
+ td-er/SparkFun MAX1704x Fuel Gauge Arduino Library @ ^1.0.1
extra_scripts = post:tools/pio/post_esp32.py
${extra_scripts_default.extra_scripts}
build_unflags = -Wall
@@ -34,7 +60,11 @@ monitor_filters = esp32_exception_decoder
[esp32_common]
extends = esp32_base
-lib_ignore = ${esp32_always.lib_ignore}, ESP32_ping, IRremoteESP8266, HeatpumpIR, ESP32 BLE Arduino
+lib_ignore = ${esp32_always.lib_ignore}
+ ESP32_ping
+ IRremoteESP8266
+ HeatpumpIR
+ ESP32 BLE Arduino
build_flags = ${esp32_base.build_flags}
extra_scripts = ${esp32_base.extra_scripts}
lib_deps = ${esp32_base.lib_deps}
@@ -46,18 +76,22 @@ extends = esp32_common
build_flags = ${esp32_common.build_flags}
-DUSE_LITTLEFS
extra_scripts = ${esp32_common.extra_scripts}
-lib_deps = ${esp32_common.lib_deps}, LittleFS
+lib_deps = ${esp32_common.lib_deps}
+ LittleFS
board_build.filesystem = littlefs
[esp32_IRExt]
extends = esp32_base
-lib_ignore = AS_BH1750, ${esp32_always.lib_ignore}, ESP32_ping
+lib_ignore = AS_BH1750
+ ${esp32_always.lib_ignore}
+ ESP32_ping
build_flags = ${esp32_base.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_BUILD_NORMAL_IRext
-DTESTING_USE_RTTTL
-lib_deps = ${esp32_base.lib_deps}, LittleFS
+lib_deps = ${esp32_base.lib_deps}
+ LittleFS
@@ -94,7 +128,9 @@ board = esp32_4M
build_flags = ${esp32_base.build_flags}
-DPLUGIN_BUILD_CUSTOM
-DPLUGIN_BUILD_IR
-lib_ignore = ${esp32_always.lib_ignore}, ESP32_ping, HeatpumpIR
+lib_ignore = ${esp32_always.lib_ignore}
+ ESP32_ping
+ HeatpumpIR
extra_scripts = ${esp32_base.extra_scripts}
pre:tools/pio/pre_custom_esp32.py
@@ -102,19 +138,15 @@ extra_scripts = ${esp32_base.extra_scripts}
[env:normal_ESP32_4M316k]
extends = esp32_common
board = esp32_4M
-lib_deps = ${esp32_common.lib_deps}, ServoESP32
+lib_deps = ${esp32_common.lib_deps}
+ ServoESP32
[env:normal_ESP32_4M316k_LittleFS]
extends = esp32_common_LittleFS
board = esp32_4M
-lib_deps = ${esp32_common_LittleFS.lib_deps}, ServoESP32
-
-
-[env:normal_ESP32_16M8M_LittleFS]
-extends = esp32_common_LittleFS
-board = esp32_16M8M
-lib_deps = ${esp32_common_LittleFS.lib_deps}, ServoESP32
+lib_deps = ${esp32_common_LittleFS.lib_deps}
+ ServoESP32
@@ -176,7 +208,8 @@ build_flags = ${esp32_IRExt.build_flags}
[env:energy_ESP32_4M316k]
extends = esp32_common
board = esp32_4M
-lib_deps = ${esp32_common.lib_deps}, ServoESP32
+lib_deps = ${esp32_common.lib_deps}
+ ServoESP32
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_ENERGY_COLLECTION
@@ -184,7 +217,8 @@ build_flags = ${esp32_common.build_flags}
[env:display_ESP32_4M316k]
extends = esp32_common
board = esp32_4M
-lib_deps = ${esp32_common.lib_deps}, ServoESP32
+lib_deps = ${esp32_common.lib_deps}
+ ServoESP32
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_DISPLAY_COLLECTION
@@ -232,7 +266,8 @@ build_flags = ${env:test_D_ESP32_4M316k.build_flags}
[env:max_ESP32_16M1M]
extends = esp32_base
board = esp32_16M1M
-lib_ignore = ${esp32_always.lib_ignore}, ESP32_ping
+lib_ignore = ${esp32_always.lib_ignore}
+ ESP32_ping
build_flags = ${esp32_base.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_BUILD_MAX_ESP32
@@ -248,14 +283,16 @@ build_flags = ${env:max_ESP32_16M1M.build_flags}
[env:max_ESP32_16M8M_LittleFS]
extends = esp32_base
board = esp32_16M8M
-lib_ignore = ${esp32_always.lib_ignore}, ESP32_ping
+lib_ignore = ${esp32_always.lib_ignore}
+ ESP32_ping
build_flags = ${esp32_base.build_flags}
-DUSE_LITTLEFS
-DFEATURE_ARDUINO_OTA
-DPLUGIN_BUILD_MAX_ESP32
-DPLUGIN_BUILD_IR_EXTENDED
extra_scripts = ${esp32_base.extra_scripts}
-lib_deps = ${esp32_base.lib_deps}, LittleFS
+lib_deps = ${esp32_base.lib_deps}
+ LittleFS
board_build.filesystem = littlefs
; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M8M_LittleFS definition
diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini
index afdd47f11..a0f273491 100644
--- a/platformio_esp32s2_envs.ini
+++ b/platformio_esp32s2_envs.ini
@@ -4,7 +4,11 @@
[esp32s2_common]
extends = esp32_base
-lib_ignore = ${esp32_always.lib_ignore}, ESP32_ping, IRremoteESP8266, HeatpumpIR, ESP32 BLE Arduino
+lib_ignore = ${esp32_always.lib_ignore}
+ ESP32_ping
+ IRremoteESP8266
+ HeatpumpIR
+ ESP32 BLE Arduino
build_flags = ${esp32_base.build_flags}
-DFEATURE_ARDUINO_OTA
extra_scripts = ${esp32_base.extra_scripts}
@@ -16,7 +20,8 @@ build_unflags = ${esp32_base.build_unflags}
extends = esp32s2_common
build_flags = ${esp32s2_common.build_flags}
-DUSE_LITTLEFS
-lib_deps = ${esp32s2_common.lib_deps}, LittleFS
+lib_deps = ${esp32s2_common.lib_deps}
+ LittleFS
board_build.filesystem = littlefs
@@ -35,7 +40,9 @@ board = esp32s2
build_flags = ${esp32s2_common.build_flags}
-DPLUGIN_BUILD_CUSTOM
-DPLUGIN_BUILD_IR
-lib_ignore = ${esp32_always.lib_ignore}, ESP32_ping, HeatpumpIR
+lib_ignore = ${esp32_always.lib_ignore}
+ ESP32_ping
+ HeatpumpIR
extra_scripts = ${esp32s2_common.extra_scripts}
pre:tools/pio/pre_custom_esp32.py
@@ -44,7 +51,8 @@ extra_scripts = ${esp32s2_common.extra_scripts}
[env:normal_ESP32s2_4M316k]
extends = esp32s2_common
board = esp32s2
-lib_deps = ${esp32s2_common.lib_deps}, ServoESP32
+lib_deps = ${esp32s2_common.lib_deps}
+ ServoESP32
[env:test_A_ESP32s2_4M316k]
extends = esp32s2_common
@@ -78,13 +86,15 @@ build_flags = ${esp32s2_common.build_flags}
[env:energy_ESP32s2_4M316k]
extends = esp32s2_common
board = esp32s2
-lib_deps = ${esp32s2_common.lib_deps}, ServoESP32
+lib_deps = ${esp32s2_common.lib_deps}
+ ServoESP32
build_flags = ${esp32s2_common.build_flags}
-D PLUGIN_ENERGY_COLLECTION
[env:display_ESP32s2_4M316k]
extends = esp32s2_common
board = esp32s2
-lib_deps = ${esp32s2_common.lib_deps}, ServoESP32
+lib_deps = ${esp32s2_common.lib_deps}
+ ServoESP32
build_flags = ${esp32s2_common.build_flags}
-D PLUGIN_DISPLAY_COLLECTION
diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini
index 7fe973b6d..82df882b7 100644
--- a/platformio_esp82xx_base.ini
+++ b/platformio_esp82xx_base.ini
@@ -40,7 +40,9 @@ lib_ignore = SD(esp8266), SD, SDFS
lib_ignore = LittleFS(esp8266)
[generic_build]
-lib_ignore = ${no_ir.lib_ignore}, ${no_sd.lib_ignore}, ${no_littlefs.lib_ignore}
+lib_ignore = ${no_ir.lib_ignore}
+ ${no_sd.lib_ignore}
+ ${no_littlefs.lib_ignore}
[esp82xx_common]
extends = common
@@ -49,8 +51,32 @@ build_flags = ${debug_flags.build_flags}
-DHTTPCLIENT_1_1_COMPATIBLE=0
build_unflags = -DDEBUG_ESP_PORT
-fexceptions
-lib_deps = td-er/ESPeasySerial @ 2.0.8, I2Cdevlib-Core, ESP8266WebServer, adafruit/Adafruit ILI9341 @ ^1.5.6, Adafruit GFX Library, LOLIN_EPD, adafruit/Adafruit BusIO @ ^1.10.0, bblanchon/ArduinoJson @ ^6.17.2, VL53L0X @ 1.3.0, SparkFun VL53L1X 4m Laser Distance Sensor @ 1.2.9, td-er/RABurton ESP8266 Mutex @ ^1.0.2, td-er/SparkFun MAX1704x Fuel Gauge Arduino Library @ ^1.0.1, ESP8266HTTPUpdateServer, FrogmoreScd30, Multi Channel Relay Arduino Library, SparkFun ADXL345 Arduino Library, ITG3205, Adafruit_ST77xx, ShiftRegister74HC595_NonTemplate
-lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR, LittleFS(esp8266), ServoESP32, TinyWireM
+lib_deps =
+ Adafruit_ST77xx
+ ESP8266HTTPUpdateServer
+ ESP8266WebServer
+ FrogmoreScd30
+ I2Cdevlib-Core
+ ITG3205
+ LOLIN_EPD
+ Multi Channel Relay Arduino Library
+ ShiftRegister74HC595_NonTemplate
+ SparkFun ADXL345 Arduino Library
+ SparkFun VL53L1X 4m Laser Distance Sensor @ 1.2.9
+ VL53L0X @ 1.3.0
+ adafruit/Adafruit BusIO @ ^1.10.0
+ adafruit/Adafruit GFX Library@^1.11.1
+ adafruit/Adafruit ILI9341@^1.5.10
+ bblanchon/ArduinoJson @ ^6.17.2
+ td-er/ESPeasySerial @ 2.0.8
+ td-er/RABurton ESP8266 Mutex @ ^1.0.2
+ td-er/SparkFun MAX1704x Fuel Gauge Arduino Library @ ^1.0.1
+lib_ignore = ${esp82xx_defaults.lib_ignore}
+ IRremoteESP8266
+ HeatpumpIR
+ LittleFS(esp8266)
+ ServoESP32
+ TinyWireM
monitor_filters = esp8266_exception_decoder
extra_scripts = pre:tools/pio/pre_default_check.py
${extra_scripts_esp8266.extra_scripts}
@@ -65,20 +91,32 @@ extra_scripts = pre:tools/pio/pre_default_check.py
platform = ${regular_platform.platform}
platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
-lib_ignore = ${regular_platform.lib_ignore}, SD(esp8266), SD, SDFS, LittleFS(esp8266)
+lib_ignore = ${regular_platform.lib_ignore}
+ SD(esp8266)
+ SD
+ SDFS
+ LittleFS(esp8266)
[normal_alt_wifi]
platform = ${regular_platform_alt_wifi.platform}
platform_packages = ${regular_platform_alt_wifi.platform_packages}
build_flags = ${regular_platform_alt_wifi.build_flags}
-lib_ignore = ${regular_platform_alt_wifi.lib_ignore}, SD(esp8266), SD, SDFS, LittleFS(esp8266)
+lib_ignore = ${regular_platform_alt_wifi.lib_ignore}
+ SD(esp8266)
+ SD
+ SDFS
+ LittleFS(esp8266)
[normal_beta]
platform = ${beta_platform.platform}
platform_packages = ${beta_platform.platform_packages}
build_flags = ${beta_platform.build_flags}
-lib_ignore = ${beta_platform.lib_ignore}, SD(esp8266), SD, SDFS, LittleFS(esp8266)
+lib_ignore = ${beta_platform.lib_ignore}
+ SD(esp8266)
+ SD
+ SDFS
+ LittleFS(esp8266)
;;; TEST *************************************************************
@@ -116,7 +154,14 @@ lib_ignore = ${beta_platform.lib_ignore}
platform = ${regular_platform.platform}
platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
-lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, SD(esp8266), SD, SDFS, LittleFS(esp8266)
+lib_ignore = ESP32_ping
+ ESP32WebServer
+ ServoESP32
+ ESP32HTTPUpdateServer
+ SD(esp8266)
+ SD
+ SDFS
+ LittleFS(esp8266)
[ir_alt_wifi]
platform = ${regular_platform_alt_wifi.platform}
diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini
index c31889fbb..25efdcbc8 100644
--- a/platformio_esp82xx_envs.ini
+++ b/platformio_esp82xx_envs.ini
@@ -10,17 +10,14 @@ build_flags = ${regular_platform.build_flags}
-DBUILD_NO_DEBUG
-DPLUGIN_BUILD_CUSTOM
-[hard_esp82xx_alt_wifi]
-platform = ${regular_platform_alt_wifi.platform}
-platform_packages = ${regular_platform_alt_wifi.platform_packages}
-build_flags = ${regular_platform_alt_wifi.build_flags}
- -DBUILD_NO_DEBUG
- -DPLUGIN_BUILD_CUSTOM
-
[esp8266_custom_common]
-;lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, Adafruit GFX Library, LOLIN_EPD, Adafruit ILI9341
-lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, IRremoteESP8266, HeatpumpIR
+lib_ignore = ESP32_ping
+ ESP32HTTPUpdateServer
+ ESP32WebServer
+ HeatpumpIR
+ IRremoteESP8266
+ ServoESP32
extra_scripts = pre:tools/pio/pre_custom_esp82xx.py
${extra_scripts_esp8266.extra_scripts}
@@ -45,7 +42,17 @@ build_flags = ${regular_platform.build_flags}
${esp8266_4M1M.build_flags}
-DPLUGIN_BUILD_CUSTOM
-DPLUGIN_BUILD_IR
-lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, Adafruit GFX Library, LOLIN_EPD, Adafruit ILI9341, adafruit/Adafruit BusIO, Adafruit NeoPixel, Adafruit Motor Shield V2 Library, Adafruit_ST77xx
+lib_ignore = ESP32_ping
+ ESP32WebServer
+ ServoESP32
+ ESP32HTTPUpdateServer
+ adafruit/Adafruit GFX Library
+ LOLIN_EPD
+ adafruit/Adafruit ILI9341
+ adafruit/Adafruit BusIO
+ Adafruit NeoPixel
+ Adafruit Motor Shield V2 Library
+ Adafruit_ST77xx
extra_scripts = ${esp8266_custom_common.extra_scripts}
@@ -90,7 +97,17 @@ platform_packages = ${beta_platform.platform_packages}
build_flags = ${beta_platform.build_flags}
${esp8266_4M1M.build_flags}
-DPLUGIN_BUILD_CUSTOM
-lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, Adafruit GFX Library, LOLIN_EPD, Adafruit ILI9341, adafruit/Adafruit BusIO, Adafruit NeoPixel, Adafruit Motor Shield V2 Library, Adafruit_ST77xx
+lib_ignore = ESP32_ping
+ ESP32WebServer
+ ServoESP32
+ ESP32HTTPUpdateServer
+ adafruit/Adafruit GFX Library
+ LOLIN_EPD
+ adafruit/Adafruit ILI9341
+ adafruit/Adafruit BusIO
+ Adafruit NeoPixel
+ Adafruit Motor Shield V2 Library
+ Adafruit_ST77xx
extra_scripts = ${esp8266_custom_common.extra_scripts}
@@ -199,7 +216,11 @@ platform = ${regular_platform_alt_wifi.platform}
platform_packages = ${regular_platform_alt_wifi.platform_packages}
build_flags = ${regular_platform_alt_wifi.build_flags}
${esp8266_1M.build_flags}
-lib_ignore = ${regular_platform_alt_wifi.lib_ignore}, SD(esp8266), SD, SDFS, LittleFS(esp8266)
+lib_ignore = ${regular_platform_alt_wifi.lib_ignore}
+ SD(esp8266)
+ SD
+ SDFS
+ LittleFS(esp8266)
;[env:normal_302_ESP8266_1M]
@@ -225,7 +246,11 @@ platform_packages = ${regular_platform_alt_wifi.platform_packages}
build_flags = ${regular_platform_alt_wifi.build_flags}
${esp8266_1M.build_flags}
-D FEATURE_ADC_VCC=true
-lib_ignore = ${regular_platform_alt_wifi.lib_ignore}, SD(esp8266), SD, SDFS, LittleFS(esp8266)
+lib_ignore = ${regular_platform_alt_wifi.lib_ignore}
+ SD(esp8266)
+ SD
+ SDFS
+ LittleFS(esp8266)
@@ -269,7 +294,11 @@ platform = ${regular_platform_alt_wifi.platform}
platform_packages = ${regular_platform_alt_wifi.platform_packages}
build_flags = ${regular_platform_alt_wifi.build_flags}
${esp8266_4M1M.build_flags}
-lib_ignore = ${regular_platform_alt_wifi.lib_ignore}, SD(esp8266), SD, SDFS, LittleFS(esp8266)
+lib_ignore = ${regular_platform_alt_wifi.lib_ignore}
+ SD(esp8266)
+ SD
+ SDFS
+ LittleFS(esp8266)
@@ -280,7 +309,10 @@ platform = ${core_3_0_2.platform}
platform_packages = ${core_3_0_2.platform_packages}
build_flags = ${core_3_0_2.build_flags}
${esp8266_4M1M.build_flags}
-lib_ignore = ${core_3_0_2.lib_ignore}, SD, SDFS, LittleFS(esp8266)
+lib_ignore = ${core_3_0_2.lib_ignore}
+ SD
+ SDFS
+ LittleFS(esp8266)
[env:normal_beta_ESP8266_4M1M]
extends = esp8266_4M1M
@@ -288,7 +320,10 @@ platform = ${normal_beta.platform}
platform_packages = ${normal_beta.platform_packages}
build_flags = ${normal_beta.build_flags}
${esp8266_4M1M.build_flags}
-lib_ignore = ${normal_beta.lib_ignore}, SD, SDFS, LittleFS(esp8266)
+lib_ignore = ${normal_beta.lib_ignore}
+ SD
+ SDFS
+ LittleFS(esp8266)
; NORMAL: 16M version --- LittleFS --------------
; LittleFS is determined by using "LittleFS" in the pio env name
@@ -299,7 +334,14 @@ platform_packages = ${normal_beta.platform_packages}
build_flags = ${normal_beta.build_flags}
${esp8266_16M.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y
-lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, IRremoteESP8266, HeatpumpIR, SD, SDFS
+lib_ignore = ESP32_ping
+ ESP32WebServer
+ ServoESP32
+ ESP32HTTPUpdateServer
+ IRremoteESP8266
+ HeatpumpIR
+ SD
+ SDFS
@@ -471,7 +513,12 @@ build_flags = ${testing_beta.build_flags}
${esp8266_16M.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y
board_build.filesystem = littlefs
-lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, IRremoteESP8266, HeatpumpIR
+lib_ignore = ESP32_ping
+ ESP32WebServer
+ ServoESP32
+ ESP32HTTPUpdateServer
+ IRremoteESP8266
+ HeatpumpIR
[env:test_A_ESP8266_4M1M]
@@ -588,7 +635,12 @@ build_flags = ${testing_alt_wifi.build_flags}
; -DFEATURE_MDNS
; -DFEATURE_SD
; -DLIMIT_BUILD_SIZE
-;lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, IRremoteESP8266, HeatpumpIRLittleFS(esp8266)
+;lib_ignore = ESP32_ping
+; ESP32WebServer
+; ServoESP32
+; ESP32HTTPUpdateServer
+; IRremoteESP8266
+; HeatpumpIRLittleFS(esp8266)
;[env:test_A_beta_ESP8266_4M1M]
@@ -623,7 +675,7 @@ build_flags = ${testing_alt_wifi.build_flags}
; -DLIMIT_BUILD_SIZE
; -DPLUGIN_BUILD_TESTING_E
; -DTESTING_USE_RTTTL
- -DTESTING_USE_RTTTL
+; -DTESTING_USE_RTTTL
; Test: 16M version -- LittleFS --------------
; LittleFS is determined by using "LittleFS" in the pio env name
@@ -717,7 +769,9 @@ build_flags = ${regular_platform.build_flags}
; GPIO12 Red Led and Relay (0 = Off, 1 = On)
; GPIO13 Blue Led (0 = On, 1 = Off)
[env:hard_SONOFF_POW_4M1M]
-extends = esp8266_4M1M, hard_esp82xx
+extends = esp8266_4M1M
+platform = ${hard_esp82xx.platform}
+platform_packages = ${hard_esp82xx.platform_packages}
build_flags = ${hard_esp82xx.build_flags}
${esp8266_4M1M.build_flags}
-D PLUGIN_SET_SONOFF_POW
@@ -726,7 +780,7 @@ build_flags = ${hard_esp82xx.build_flags}
; Build including power measurement plugins for those devices that have only 1M flash.
; For example those made by BlitzWolf SHP
[env:hard_other_POW_ESP8285_1M]
-extends = esp8266_1M_OTA, hard_esp82xx
+extends = esp8266_1M_OTA
platform = ${hard_esp82xx.platform}
platform_packages = ${hard_esp82xx.platform_packages}
build_flags = ${hard_esp82xx.build_flags}
@@ -736,7 +790,7 @@ build_flags = ${hard_esp82xx.build_flags}
; ITEAD / SONOFF S20 version --------------------
;[env:hard_SONOFF_S20_1M]
-;extends = esp8266_1M_OTA, hard_esp82xx
+;extends = esp8266_1M_OTA
;platform = ${hard_esp82xx.platform}
;platform_packages = ${hard_esp82xx.platform_packages}
;build_flags = ${hard_esp82xx.build_flags} ${esp8266_1M_OTA.build_flags} -D PLUGIN_SET_SONOFF_S2x
@@ -744,7 +798,7 @@ build_flags = ${hard_esp82xx.build_flags}
; ITEAD / SONOFF 4CH version --------------------
;[env:hard_SONOFF_4CH_1M]
-;extends = esp8285_1M_OTA, hard_esp82xx
+;extends = esp8285_1M_OTA
;platform = ${hard_esp82xx.platform}
;platform_packages = ${hard_esp82xx.platform_packages}
;build_flags = ${hard_esp82xx.build_flags} ${esp8285_1M_OTA.build_flags} -D PLUGIN_SET_SONOFF_4CH
@@ -753,7 +807,7 @@ build_flags = ${hard_esp82xx.build_flags}
; ITEAD / SONOFF TOUCH version ------------------
;[env:hard_SONOFF_TOUCH_1M]
-;extends = esp8285_1M_OTA, hard_esp82xx
+;extends = esp8285_1M_OTA
;platform = ${hard_esp82xx.platform}
;platform_packages = ${hard_esp82xx.platform_packages}
;build_flags = ${hard_esp82xx.build_flags} ${esp8285_1M_OTA.build_flags} -D PLUGIN_SET_SONOFF_TOUCH
@@ -764,7 +818,7 @@ build_flags = ${hard_esp82xx.build_flags}
; GPIO04 Relay (non inverted)
; GPIO05 Button
[env:hard_Shelly_1_2M256]
-extends = esp8266_2M256, hard_esp82xx
+extends = esp8266_2M256
platform = ${hard_esp82xx.platform}
platform_packages = ${hard_esp82xx.platform_packages}
build_flags = ${hard_esp82xx.build_flags}
@@ -772,7 +826,7 @@ build_flags = ${hard_esp82xx.build_flags}
-D PLUGIN_SET_SHELLY_1
[env:hard_Shelly_PLUG_S_2M256]
-extends = esp8266_2M256, hard_esp82xx
+extends = esp8266_2M256
platform = ${hard_esp82xx.platform}
platform_packages = ${hard_esp82xx.platform_packages}
build_flags = ${hard_esp82xx.build_flags}
@@ -783,7 +837,7 @@ build_flags = ${hard_esp82xx.build_flags}
; Ventus W266 weather station
; https://www.letscontrolit.com/wiki/index.php/VentusW266
[env:hard_Ventus_W266_1M]
-extends = esp8266_1M, hard_esp82xx
+extends = esp8266_1M
platform = ${hard_esp82xx.platform}
platform_packages = ${hard_esp82xx.platform_packages}
build_flags = ${hard_esp82xx.build_flags}
@@ -791,7 +845,7 @@ build_flags = ${hard_esp82xx.build_flags}
-D PLUGIN_SET_VENTUS_W266
[env:hard_LCtech_relay_x2_1M]
-extends = esp8266_1M, hard_esp82xx
+extends = esp8266_1M
platform = ${hard_esp82xx.platform}
platform_packages = ${hard_esp82xx.platform_packages}
build_flags = ${hard_esp82xx.build_flags}
diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini
index 5f82f904b..64f77b9ba 100644
--- a/platformio_special_envs.ini
+++ b/platformio_special_envs.ini
@@ -13,42 +13,72 @@ build_flags = ${compiler_warnings.build_flags}
[env:spec_debug_custom_ESP8266_4M1M]
-extends = esp8266_4M1M, debug_pio
+extends = esp8266_4M1M
+build_type = ${debug_pio.build_type}
+check_tool = ${debug_pio.check_tool}
+check_flags = ${debug_pio.check_flags}
platform = ${regular_platform.platform}
platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
${debug_pio.build_flags}
${esp8266_4M1M.build_flags}
-DPLUGIN_BUILD_CUSTOM
-lib_ignore = ${regular_platform.lib_ignore}, IRremoteESP8266, HeatpumpIR, LittleFS(esp8266)
+lib_ignore = ${regular_platform.lib_ignore}
+ IRremoteESP8266
+ HeatpumpIR
+ LittleFS(esp8266)
extra_scripts = ${extra_scripts_esp8266.extra_scripts}
[env:spec_debug_custom_IR_ESP8266_4M1M]
-extends = esp8266_4M1M, debug_pio
+extends = esp8266_4M1M
+build_type = ${debug_pio.build_type}
+check_tool = ${debug_pio.check_tool}
+check_flags = ${debug_pio.check_flags}
platform = ${regular_platform.platform}
platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
${debug_pio.build_flags}
${esp8266_4M1M.build_flags}
-DPLUGIN_BUILD_CUSTOM
-lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, Adafruit GFX Library, LOLIN_EPD, Adafruit ILI9341, adafruit/Adafruit BusIO, Adafruit NeoPixel, Adafruit Motor Shield V2 Library
+lib_ignore = ESP32_ping
+ ESP32WebServer
+ ServoESP32
+ ESP32HTTPUpdateServer
+ adafruit/Adafruit GFX Library
+ LOLIN_EPD
+ adafruit/Adafruit ILI9341
+ adafruit/Adafruit BusIO
+ Adafruit NeoPixel
+ Adafruit Motor Shield V2 Library
extra_scripts = ${extra_scripts_esp8266.extra_scripts}
[env:spec_debug_beta_custom_ESP8266_4M1M]
-extends = esp8266_4M1M, debug_pio
+extends = esp8266_4M1M
+build_type = ${debug_pio.build_type}
+check_tool = ${debug_pio.check_tool}
+check_flags = ${debug_pio.check_flags}
platform = ${beta_platform.platform}
platform_packages = ${beta_platform.platform_packages}
build_flags = ${beta_platform.build_flags}
${debug_pio.build_flags}
${esp8266_4M1M.build_flags}
-DPLUGIN_BUILD_CUSTOM
-lib_ignore = ${regular_platform.lib_ignore}, IRremoteESP8266, HeatpumpIR, SD(esp8266), SD, SDFS, LittleFS(esp8266)
+lib_ignore = ${regular_platform.lib_ignore}
+ IRremoteESP8266
+ HeatpumpIR
+ SD(esp8266)
+ SD
+ SDFS
+ LittleFS(esp8266)
extra_scripts = ${extra_scripts_esp8266.extra_scripts}
[env:spec_debug_custom_ESP32_4M316k]
-extends = esp32_common, debug_pio
+extends = esp32_common
+build_type = ${debug_pio.build_type}
+check_tool = ${debug_pio.check_tool}
+check_flags = ${debug_pio.check_flags}
platform = ${esp32_common.platform}
build_flags = ${esp32_common.build_flags} ${debug_pio.build_flags} -DPLUGIN_BUILD_CUSTOM
board = esp32dev
@@ -56,9 +86,12 @@ extra_scripts = ${esp32_common.extra_scripts}
pre:tools/pio/pre_custom_esp32.py
[env:spec_debug_max_ESP32_16M8M]
-extends = esp32_common, debug_pio
-lib_ignore = ${esp32_always.lib_ignore}, ESP32_ping
-lib_deps = ${esp32_common.lib_deps}, VL53L0X
+extends = esp32_common
+build_type = ${debug_pio.build_type}
+check_tool = ${debug_pio.check_tool}
+check_flags = ${debug_pio.check_flags}
+lib_ignore = ${esp32_always.lib_ignore}
+ ESP32_ping
board_upload.maximum_size = 4194304
build_flags = ${esp32_common.build_flags}
${debug_pio.build_flags}
diff --git a/requirements.txt b/requirements.txt
index 618bf9f37..d6bc28ff5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ MarkupSafe==2.0.1
marshmallow==3.14.0
packaging==21.0
pathtools==0.1.2
-platformio>=5.2.3
+platformio<6
port-for==0.6.1
pycparser==2.20
pyelftools==0.27