From eb3186f88511aa509d373293fd77ea1a2bc55c29 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 24 Jun 2022 15:32:31 +0200 Subject: [PATCH] [PIO] Update to esp8266/Arduino @ 4.0.1 --- platformio_core_defs.ini | 32 +++++++++++++++++---------- platformio_esp82xx_base.ini | 8 +++---- platformio_esp82xx_envs.ini | 44 ++++++++++++++++++------------------- tools/build_ESPeasy.sh | 2 +- 4 files changed, 47 insertions(+), 39 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 07af7bbae..5d65487bf 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -164,6 +164,26 @@ platform_packages = mcspr/toolchain-xtensa @ ~5.100300.211127 build_flags = ${esp82xx_3_0_x.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 +lib_ignore = ${esp82xx_defaults.lib_ignore} + IRremoteESP8266 + HeatpumpIR + LittleFS(esp8266) + ServoESP32 + TinyWireM + +[core_4_0_1] +extends = esp82xx_3_0_x +platform = espressif8266@4.0.1 +platform_packages = +build_flags = ${esp82xx_3_0_x.build_flags} + -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 +lib_ignore = ${esp82xx_defaults.lib_ignore} + IRremoteESP8266 + HeatpumpIR + LittleFS(esp8266) + ServoESP32 + TinyWireM + [core_stage] extends = esp82xx_3_0_x @@ -173,19 +193,12 @@ build_flags = ${esp82xx_3_0_x.build_flags} -DPIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED -DUSE_SECOND_HEAP -DPHASE_LOCKED_WAVEFORM - - - platform_packages = platformio/framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git mcspr/toolchain-xtensa @ ~5.100300.211127 -[core_esp32_2_1_0] -platform = espressif32@2.1.0 -build_flags = -DESP32_STAGE - ; Updated ESP-IDF to the latest stable 4.0.1 ; See: https://github.com/platformio/platform-espressif32/releases @@ -196,11 +209,6 @@ platform = https://github.com/tasmota/platform-espressif32/re platform_packages = build_flags = -DESP32_STAGE -[core_esp32_3_5_0] -platform = espressif32 @ 3.5.0 -platform_packages = -build_flags = -DESP32_STAGE - [core_esp32_stage] platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master platform_packages = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1/framework-arduinoespressif32-release_IDF4.4.tar.gz diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini index f872648d5..7cce176ae 100644 --- a/platformio_esp82xx_base.ini +++ b/platformio_esp82xx_base.ini @@ -17,10 +17,10 @@ lib_ignore = ${core_2_7_4_alt_wifi.lib_ignore} [core302_platform] -build_flags = ${core_3_0_2.build_flags} -platform = ${core_3_0_2.platform} -platform_packages = ${core_3_0_2.platform_packages} -lib_ignore = ${core_3_0_2.lib_ignore} +build_flags = ${core_4_0_1.build_flags} +platform = ${core_4_0_1.platform} +platform_packages = ${core_4_0_1.platform_packages} +lib_ignore = ${core_4_0_1.lib_ignore} [beta_platform] diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini index cf0cb1076..143e42560 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -70,9 +70,9 @@ extra_scripts = ${esp8266_custom_common.extra_scripts} [env:custom_302_ESP8266_4M1M] extends = esp8266_4M1M -platform = ${core_3_0_2.platform} -platform_packages = ${core_3_0_2.platform_packages} -build_flags = ${core_3_0_2.build_flags} +platform = ${core302_platform.platform} +platform_packages = ${core302_platform.platform_packages} +build_flags = ${core302_platform.build_flags} ${esp8266_4M1M.build_flags} -DPLUGIN_BUILD_CUSTOM lib_ignore = ${esp8266_custom_common.lib_ignore} @@ -230,9 +230,9 @@ lib_ignore = ${regular_platform_alt_wifi.lib_ignore} ;[env:normal_302_ESP8266_1M] ;extends = esp8266_1M -;platform = ${core_3_0_2.platform} -;platform_packages = ${core_3_0_2.platform_packages} -;build_flags = ${core_3_0_2.build_flags} +;platform = ${core302_platform.platform} +;platform_packages = ${core302_platform.platform_packages} +;build_flags = ${core302_platform.build_flags} ; ${esp8266_1M.build_flags} @@ -321,11 +321,11 @@ lib_ignore = ${regular_platform_alt_wifi.lib_ignore} [env:normal_302_ESP8266_4M1M] extends = esp8266_4M1M -platform = ${core_3_0_2.platform} -platform_packages = ${core_3_0_2.platform_packages} -build_flags = ${core_3_0_2.build_flags} +platform = ${core302_platform.platform} +platform_packages = ${core302_platform.platform_packages} +build_flags = ${core302_platform.build_flags} ${esp8266_4M1M.build_flags} -lib_ignore = ${core_3_0_2.lib_ignore} +lib_ignore = ${core302_platform.lib_ignore} SD SDFS LittleFS(esp8266) @@ -391,17 +391,17 @@ build_flags = ${regular_platform.build_flags} [env:minimal_core_302_ESP8266_1M_OTA_Domoticz] extends = esp8266_1M_OTA -platform = ${core_3_0_2.platform} -platform_packages = ${core_3_0_2.platform_packages} -build_flags = ${core_3_0_2.build_flags} +platform = ${core302_platform.platform} +platform_packages = ${core302_platform.platform_packages} +build_flags = ${core302_platform.build_flags} ${esp8266_1M_OTA.build_flags} ${minimal_OTA_domoticz.build_flags} [env:minimal_core_302_ESP8285_1M_OTA_Domoticz] extends = esp8285_1M_OTA -platform = ${core_3_0_2.platform} -platform_packages = ${core_3_0_2.platform_packages} -build_flags = ${core_3_0_2.build_flags} +platform = ${core302_platform.platform} +platform_packages = ${core302_platform.platform_packages} +build_flags = ${core302_platform.build_flags} ${esp8285_1M_OTA.build_flags} ${minimal_OTA_domoticz.build_flags} @@ -424,17 +424,17 @@ build_flags = ${regular_platform.build_flags} [env:minimal_core_302_ESP8266_1M_OTA_FHEM_HA] extends = esp8266_1M_OTA -platform = ${core_3_0_2.platform} -platform_packages = ${core_3_0_2.platform_packages} -build_flags = ${core_3_0_2.build_flags} +platform = ${core302_platform.platform} +platform_packages = ${core302_platform.platform_packages} +build_flags = ${core302_platform.build_flags} ${esp8266_1M_OTA.build_flags} ${minimal_OTA_FHEM_HA.build_flags} [env:minimal_core_302_ESP8285_1M_OTA_FHEM_HA] extends = esp8285_1M_OTA -platform = ${core_3_0_2.platform} -platform_packages = ${core_3_0_2.platform_packages} -build_flags = ${core_3_0_2.build_flags} +platform = ${core302_platform.platform} +platform_packages = ${core302_platform.platform_packages} +build_flags = ${core302_platform.build_flags} ${esp8285_1M_OTA.build_flags} ${minimal_OTA_FHEM_HA.build_flags} diff --git a/tools/build_ESPeasy.sh b/tools/build_ESPeasy.sh index 89a09d101..0a4f11321 100755 --- a/tools/build_ESPeasy.sh +++ b/tools/build_ESPeasy.sh @@ -289,7 +289,7 @@ set -o pipefail; pip install -r ${SRC}/requirements.txt | { grep -v "already sat # Update (and clean) all targets # N.B. clean does also install missing packages which must be installed before applying patches. -platformio update +platformio pkg update platformio run --target clean # patch platformio core libs for PUYA bug (https://github.com/letscontrolit/ESPEasy/issues/650) cd ${SRC}/patches; ./check_puya_patch;