diff --git a/core_version.h b/core_version.h index 19c6bb113..c593bf82d 100644 --- a/core_version.h +++ b/core_version.h @@ -1,4 +1,4 @@ -#define ARDUINO_ESP32_GIT_VER 0x38c3f487 -#define ARDUINO_ESP32_GIT_DESC 2.0.5.3 -#define ARDUINO_ESP32_RELEASE_2_0_5_3 -#define ARDUINO_ESP32_RELEASE "2_0_5_3" +#define ARDUINO_ESP32_GIT_VER 0xcbaeab4e +#define ARDUINO_ESP32_GIT_DESC 2.0.6 +#define ARDUINO_ESP32_RELEASE_2_0_6 +#define ARDUINO_ESP32_RELEASE "2_0_6" diff --git a/package.json b/package.json index 8f72c8441..4a482e7e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "framework-arduinoespressif32", - "version": "2.0.5", + "version": "2.0.6", "description": "Tasmota Arduino Framework for the Espressif ESP32, ESP32-S and ESP32-C series of SoCs", "keywords": [ "tasmota", diff --git a/tools/archive-build.sh b/tools/archive-build.sh index a36a56f25..f3ba888c0 100755 --- a/tools/archive-build.sh +++ b/tools/archive-build.sh @@ -16,10 +16,14 @@ echo "Creating framework-arduinoespressif32" cp -rf ../components/arduino arduino-esp32 rm -rf arduino-esp32/docs rm -rf arduino-esp32/tests +rm -rf arduino-esp32/libraries/RainMaker +rm -rf arduino-esp32/libraries/Insights rm -rf arduino-esp32/package rm -rf arduino-esp32/tools/sdk rm -rf arduino-esp32/tools/esptool.py rm -rf arduino-esp32/tools/gen_esp32part.py +rm -rf arduino-esp32/tools/gen_insights_package.py +rm -rf arduino-esp32/tools/gen_insights_package.exe rm -rf arduino-esp32/tools/platformio-build-*.py rm -rf arduino-esp32/platform.txt rm -rf arduino-esp32/package.json diff --git a/tools/config.sh b/tools/config.sh index 093d9476c..86c2b196a 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -34,7 +34,7 @@ AR_USER="tasmota" AR_REPO="$AR_USER/arduino-esp32" # Arduino branch to use -AR_BRANCH="master" +AR_BRANCH="work_ipv6" AR_REPO_URL="https://github.com/$AR_REPO.git" if [ -n $GITHUB_TOKEN ]; then diff --git a/tools/update-components.sh b/tools/update-components.sh index 70daaf71e..572faa3b9 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -2,13 +2,11 @@ source ./tools/config.sh -DL_REPO_URL="https://github.com/espressif/esp-dl.git" -SR_REPO_URL="https://github.com/espressif/esp-sr.git" - # # CLONE/UPDATE ARDUINO # +echo "Updating ESP32 Arduino..." if [ ! -d "$AR_COMPS/arduino" ]; then git clone $AR_REPO_URL "$AR_COMPS/arduino" fi @@ -46,27 +44,3 @@ if [ "$AR_BRANCH" ]; then git -C "$AR_COMPS/arduino" pull --ff-only fi if [ $? -ne 0 ]; then exit 1; fi - -# -# CLONE/UPDATE ESP-DL -# - -#if [ ! -d "$AR_COMPS/esp-dl" ]; then -# git clone $DL_REPO_URL "$AR_COMPS/esp-dl" -#else -# git -C "$AR_COMPS/esp-dl" fetch && \ -# git -C "$AR_COMPS/esp-dl" pull --ff-only -#fi -#if [ $? -ne 0 ]; then exit 1; fi - -# -# CLONE/UPDATE ESP-SR -# - -#if [ ! -d "$AR_COMPS/esp-sr" ]; then -# git clone $SR_REPO_URL "$AR_COMPS/esp-sr" -#else -# git -C "$AR_COMPS/esp-sr" fetch && \ -# git -C "$AR_COMPS/esp-sr" pull --ff-only -#fi -#if [ $? -ne 0 ]; then exit 1; fi