From 9113932bcbe83bb70e7832e8f9e824b73f47494d Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 17 May 2022 00:20:37 +0200 Subject: [PATCH 1/6] [PlatformIO] Revert to PlatformIO 5.2.5 See: https://github.com/platformio/platformio-core/issues/4270 --- platformio.ini | 3 ++- platformio_esp32_envs.ini | 9 +++++++-- platformio_esp82xx_base.ini | 8 ++++++-- platformio_esp82xx_envs.ini | 33 ++++++++++++++------------------- platformio_special_envs.ini | 27 +++++++++++++++++++++------ requirements.txt | 2 +- 6 files changed, 51 insertions(+), 31 deletions(-) diff --git a/platformio.ini b/platformio.ini index 2b21f42eb..4a55744ea 100644 --- a/platformio.ini +++ b/platformio.ini @@ -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_esp32_envs.ini b/platformio_esp32_envs.ini index 227f9c05d..d42a0b856 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -8,8 +8,13 @@ lib_ignore = ESP8266WiFi, ESP8266Ping, ESP8266WebServer, ESP8266HTTPUpdateServer, 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 +extends = core_esp32_IDF4_4__2_0_3 +lib_archive = ${common.lib_archive} +framework = ${common.framework} +upload_speed = ${common.upload_speed} +monitor_speed = ${common.monitor_speed} +targets = ${common.targets} +lib_deps = td-er/ESPeasySerial @ 2.0.8, I2Cdevlib-Core, Adafruit ILI9341 ESPEasy, adafruit/Adafruit GFX Library@^1.11.1, 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 extra_scripts = post:tools/pio/post_esp32.py ${extra_scripts_default.extra_scripts} build_unflags = -Wall diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini index 7fe973b6d..9f2cf75dd 100644 --- a/platformio_esp82xx_base.ini +++ b/platformio_esp82xx_base.ini @@ -43,13 +43,17 @@ lib_ignore = LittleFS(esp8266) lib_ignore = ${no_ir.lib_ignore}, ${no_sd.lib_ignore}, ${no_littlefs.lib_ignore} [esp82xx_common] -extends = common +lib_archive = ${common.lib_archive} +framework = ${common.framework} +upload_speed = ${common.upload_speed} +monitor_speed = ${common.monitor_speed} +targets = ${common.targets} build_flags = ${debug_flags.build_flags} ${mqtt_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_deps = td-er/ESPeasySerial @ 2.0.8, I2Cdevlib-Core, ESP8266WebServer, Adafruit ILI9341 ESPEasy, adafruit/Adafruit GFX Library@^1.11.1, 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 monitor_filters = esp8266_exception_decoder extra_scripts = pre:tools/pio/pre_default_check.py diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini index fab60e7a2..43cce407e 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -10,16 +10,9 @@ 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, adafruit/Adafruit GFX Library@^1.11.1, LOLIN_EPD, Adafruit ILI9341 lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, IRremoteESP8266, HeatpumpIR extra_scripts = pre:tools/pio/pre_custom_esp82xx.py ${extra_scripts_esp8266.extra_scripts} @@ -44,7 +37,7 @@ 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@^1.11.1, LOLIN_EPD, Adafruit ILI9341 ESPEasy, adafruit/Adafruit BusIO, Adafruit NeoPixel, Adafruit Motor Shield V2 Library, Adafruit_ST77xx extra_scripts = ${esp8266_custom_common.extra_scripts} @@ -89,7 +82,7 @@ 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@^1.11.1, LOLIN_EPD, Adafruit ILI9341 ESPEasy, adafruit/Adafruit BusIO, Adafruit NeoPixel, Adafruit Motor Shield V2 Library, Adafruit_ST77xx extra_scripts = ${esp8266_custom_common.extra_scripts} @@ -716,7 +709,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 @@ -725,7 +720,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} @@ -735,7 +730,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 @@ -743,7 +738,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 @@ -752,7 +747,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 @@ -763,7 +758,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} @@ -771,7 +766,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} @@ -782,7 +777,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} @@ -790,7 +785,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..3a286e22a 100644 --- a/platformio_special_envs.ini +++ b/platformio_special_envs.ini @@ -13,7 +13,10 @@ 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} @@ -24,19 +27,25 @@ lib_ignore = ${regular_platform.lib_ignore}, IRremoteESP8266, Hea 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@^1.11.1, LOLIN_EPD, 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} @@ -48,7 +57,10 @@ 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,7 +68,10 @@ extra_scripts = ${esp32_common.extra_scripts} pre:tools/pio/pre_custom_esp32.py [env:spec_debug_max_ESP32_16M8M] -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} lib_ignore = ${esp32_always.lib_ignore}, ESP32_ping lib_deps = ${esp32_common.lib_deps}, VL53L0X board_upload.maximum_size = 4194304 diff --git a/requirements.txt b/requirements.txt index b737c31c8..84a73a241 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,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 From b1ce9a71d4438ad079cc7f05d9ed8c0c4c26f28c Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 17 May 2022 00:38:15 +0200 Subject: [PATCH 2/6] [PIO lib_deps] Set Adafruit ILI9341 library version --- platformio_esp32_envs.ini | 2 +- platformio_esp82xx_base.ini | 2 +- platformio_esp82xx_envs.ini | 6 +++--- platformio_special_envs.ini | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index d42a0b856..f241c8f47 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -14,7 +14,7 @@ framework = ${common.framework} upload_speed = ${common.upload_speed} monitor_speed = ${common.monitor_speed} targets = ${common.targets} -lib_deps = td-er/ESPeasySerial @ 2.0.8, I2Cdevlib-Core, Adafruit ILI9341 ESPEasy, adafruit/Adafruit GFX Library@^1.11.1, 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 = td-er/ESPeasySerial @ 2.0.8, I2Cdevlib-Core, adafruit/Adafruit ILI9341@^1.5.10, adafruit/Adafruit GFX Library@^1.11.1, 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 extra_scripts = post:tools/pio/post_esp32.py ${extra_scripts_default.extra_scripts} build_unflags = -Wall diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini index 9f2cf75dd..9cd8e194d 100644 --- a/platformio_esp82xx_base.ini +++ b/platformio_esp82xx_base.ini @@ -53,7 +53,7 @@ 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 ILI9341 ESPEasy, adafruit/Adafruit GFX Library@^1.11.1, 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_deps = td-er/ESPeasySerial @ 2.0.8, I2Cdevlib-Core, ESP8266WebServer, adafruit/Adafruit ILI9341@^1.5.10, adafruit/Adafruit GFX Library@^1.11.1, 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 monitor_filters = esp8266_exception_decoder extra_scripts = pre:tools/pio/pre_default_check.py diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini index 43cce407e..ff47ee0ef 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -12,7 +12,7 @@ build_flags = ${regular_platform.build_flags} [esp8266_custom_common] -;lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, adafruit/Adafruit GFX Library@^1.11.1, LOLIN_EPD, Adafruit ILI9341 +;lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, adafruit/Adafruit GFX Library@^1.11.1, LOLIN_EPD, adafruit/Adafruit ILI9341@^1.5.10 lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, IRremoteESP8266, HeatpumpIR extra_scripts = pre:tools/pio/pre_custom_esp82xx.py ${extra_scripts_esp8266.extra_scripts} @@ -37,7 +37,7 @@ build_flags = ${regular_platform.build_flags} ${esp8266_4M1M.build_flags} -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR -lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, adafruit/Adafruit GFX Library@^1.11.1, LOLIN_EPD, Adafruit ILI9341 ESPEasy, adafruit/Adafruit BusIO, Adafruit NeoPixel, Adafruit Motor Shield V2 Library, Adafruit_ST77xx +lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, adafruit/Adafruit GFX Library@^1.11.1, LOLIN_EPD, adafruit/Adafruit ILI9341@^1.5.10, adafruit/Adafruit BusIO, Adafruit NeoPixel, Adafruit Motor Shield V2 Library, Adafruit_ST77xx extra_scripts = ${esp8266_custom_common.extra_scripts} @@ -82,7 +82,7 @@ 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/Adafruit GFX Library@^1.11.1, LOLIN_EPD, Adafruit ILI9341 ESPEasy, adafruit/Adafruit BusIO, Adafruit NeoPixel, Adafruit Motor Shield V2 Library, Adafruit_ST77xx +lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, adafruit/Adafruit GFX Library@^1.11.1, LOLIN_EPD, adafruit/Adafruit ILI9341@^1.5.10, adafruit/Adafruit BusIO, Adafruit NeoPixel, Adafruit Motor Shield V2 Library, Adafruit_ST77xx extra_scripts = ${esp8266_custom_common.extra_scripts} diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini index 3a286e22a..8dc458381 100644 --- a/platformio_special_envs.ini +++ b/platformio_special_envs.ini @@ -37,7 +37,7 @@ 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/Adafruit GFX Library@^1.11.1, 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@^1.11.1, LOLIN_EPD, adafruit/Adafruit ILI9341@^1.5.10, adafruit/Adafruit BusIO, Adafruit NeoPixel, Adafruit Motor Shield V2 Library extra_scripts = ${extra_scripts_esp8266.extra_scripts} From 9e010d0a3aeb0afb741329c2bc6776a1b4471c2d Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 17 May 2022 00:49:31 +0200 Subject: [PATCH 3/6] [PIO] Make lib_deps multi-line definitions --- platformio_esp32_envs.ini | 44 ++++++++++++++++++++++++++++--------- platformio_esp32s2_envs.ini | 12 ++++++---- platformio_esp82xx_base.ini | 21 +++++++++++++++++- platformio_special_envs.ini | 3 ++- 4 files changed, 64 insertions(+), 16 deletions(-) diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index f241c8f47..bee2a765b 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -14,7 +14,24 @@ framework = ${common.framework} upload_speed = ${common.upload_speed} monitor_speed = ${common.monitor_speed} targets = ${common.targets} -lib_deps = td-er/ESPeasySerial @ 2.0.8, I2Cdevlib-Core, adafruit/Adafruit ILI9341@^1.5.10, adafruit/Adafruit GFX Library@^1.11.1, 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 @@ -51,7 +68,8 @@ 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 @@ -62,7 +80,8 @@ 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 @@ -107,20 +126,22 @@ 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 +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 [env:test_A_ESP32_4M316k] @@ -181,7 +202,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 @@ -189,7 +211,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 @@ -260,7 +283,8 @@ build_flags = ${esp32_base.build_flags} -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..117bb453d 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -16,7 +16,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 @@ -44,7 +45,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 +80,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 9cd8e194d..bcdadce1e 100644 --- a/platformio_esp82xx_base.ini +++ b/platformio_esp82xx_base.ini @@ -53,7 +53,26 @@ 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.10, adafruit/Adafruit GFX Library@^1.11.1, 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_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 diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini index 8dc458381..e4d20e566 100644 --- a/platformio_special_envs.ini +++ b/platformio_special_envs.ini @@ -73,7 +73,8 @@ 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 -lib_deps = ${esp32_common.lib_deps}, VL53L0X +lib_deps = ${esp32_common.lib_deps} + VL53L0X board_upload.maximum_size = 4194304 build_flags = ${esp32_common.build_flags} ${debug_pio.build_flags} From 12cd3fc153ebe74c9fad77a511f11555a837900c Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 17 May 2022 09:11:02 +0200 Subject: [PATCH 4/6] [PlatformIO] Change to multi-line lib_ignore --- platformio_core_defs.ini | 39 ++++++++++++++--- platformio_esp32_envs.ini | 31 +++++++++++--- platformio_esp32s2_envs.ini | 10 ++++- platformio_esp82xx_base.ini | 38 ++++++++++++++--- platformio_esp82xx_envs.ini | 85 +++++++++++++++++++++++++++++++------ platformio_special_envs.ini | 27 ++++++++++-- 6 files changed, 192 insertions(+), 38 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index c7bf7da0a..07af7bbae 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 bee2a765b..b5328f8a1 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -5,7 +5,16 @@ ; ***************************************************************************************; [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 = core_esp32_IDF4_4__2_0_3 @@ -56,7 +65,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} @@ -75,7 +88,9 @@ 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 @@ -118,7 +133,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 @@ -260,7 +277,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 @@ -276,7 +294,8 @@ 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 diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 117bb453d..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} @@ -36,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 diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini index bcdadce1e..a28b5653c 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] lib_archive = ${common.lib_archive} @@ -73,7 +75,12 @@ lib_deps = 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 +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} @@ -88,20 +95,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 ************************************************************* @@ -139,7 +158,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 ff47ee0ef..8820b365e 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -12,8 +12,12 @@ build_flags = ${regular_platform.build_flags} [esp8266_custom_common] -;lib_ignore = ESP32_ping, ESP32WebServer, ServoESP32, ESP32HTTPUpdateServer, adafruit/Adafruit GFX Library@^1.11.1, LOLIN_EPD, adafruit/Adafruit ILI9341@^1.5.10 -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} @@ -37,7 +41,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/Adafruit GFX Library@^1.11.1, LOLIN_EPD, adafruit/Adafruit ILI9341@^1.5.10, 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} @@ -82,7 +96,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/Adafruit GFX Library@^1.11.1, LOLIN_EPD, adafruit/Adafruit ILI9341@^1.5.10, 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} @@ -191,7 +215,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] @@ -217,7 +245,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) @@ -261,7 +293,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) @@ -272,7 +308,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 @@ -280,7 +319,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 @@ -291,7 +333,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 @@ -463,7 +512,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] @@ -580,7 +634,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] @@ -615,7 +674,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 diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini index e4d20e566..3329c643a 100644 --- a/platformio_special_envs.ini +++ b/platformio_special_envs.ini @@ -23,7 +23,10 @@ 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] @@ -37,7 +40,16 @@ 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/Adafruit GFX Library@^1.11.1, LOLIN_EPD, adafruit/Adafruit ILI9341@^1.5.10, 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} @@ -52,7 +64,13 @@ 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} @@ -72,7 +90,8 @@ 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 +lib_ignore = ${esp32_always.lib_ignore} + ESP32_ping lib_deps = ${esp32_common.lib_deps} VL53L0X board_upload.maximum_size = 4194304 From 2964480d41b47b27244ab9e76cf0be066b9251bf Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 17 May 2022 09:19:21 +0200 Subject: [PATCH 5/6] [PlatformIO] Remove normal_ESP32_16M8M_LittleFS env. --- platformio_esp32_envs.ini | 6 ------ 1 file changed, 6 deletions(-) diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index b5328f8a1..1447c53ef 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -154,12 +154,6 @@ 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 - [env:test_A_ESP32_4M316k] extends = esp32_common From ab332f4a0954c968a625bd92b20e214553b13521 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 17 May 2022 10:01:19 +0200 Subject: [PATCH 6/6] [PlatformIO] Clean up ini files. --- platformio.ini | 2 +- platformio_esp32_envs.ini | 7 +------ platformio_esp82xx_base.ini | 6 +----- platformio_special_envs.ini | 2 -- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/platformio.ini b/platformio.ini index 4a55744ea..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 diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index 1447c53ef..fd7b1df46 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -17,12 +17,7 @@ lib_ignore = ESP8266Ping [esp32_base] -extends = core_esp32_IDF4_4__2_0_3 -lib_archive = ${common.lib_archive} -framework = ${common.framework} -upload_speed = ${common.upload_speed} -monitor_speed = ${common.monitor_speed} -targets = ${common.targets} +extends = common, core_esp32_IDF4_4__2_0_3 lib_deps = Adafruit_ST77xx ArduinoOTA diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini index a28b5653c..82df882b7 100644 --- a/platformio_esp82xx_base.ini +++ b/platformio_esp82xx_base.ini @@ -45,11 +45,7 @@ lib_ignore = ${no_ir.lib_ignore} ${no_littlefs.lib_ignore} [esp82xx_common] -lib_archive = ${common.lib_archive} -framework = ${common.framework} -upload_speed = ${common.upload_speed} -monitor_speed = ${common.monitor_speed} -targets = ${common.targets} +extends = common build_flags = ${debug_flags.build_flags} ${mqtt_flags.build_flags} -DHTTPCLIENT_1_1_COMPATIBLE=0 diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini index 3329c643a..64f77b9ba 100644 --- a/platformio_special_envs.ini +++ b/platformio_special_envs.ini @@ -92,8 +92,6 @@ check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} lib_ignore = ${esp32_always.lib_ignore} ESP32_ping -lib_deps = ${esp32_common.lib_deps} - VL53L0X board_upload.maximum_size = 4194304 build_flags = ${esp32_common.build_flags} ${debug_pio.build_flags}