From c42370bb3391afae1eca5bc8d152c5a4bbdf1153 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 31 May 2021 18:12:48 +0200
Subject: [PATCH 1/4] Use latest IDF and Arduino master

---
 platformio_tasmota_cenv_sample.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index f5f7ae8c4..10e7b072f 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -61,7 +61,7 @@ lib_ignore                  =
 [env:tasmota32idf4]
 extends                     = env:tasmota32_base
 platform                    = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-idf-v4.4
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}

From f8992562e1639cd4a2d1482af69c49404500cd21 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 31 May 2021 19:47:08 +0200
Subject: [PATCH 2/4] Use latest IDF / Arduino ESP32

---
 platformio_tasmota_cenv_sample.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index 10e7b072f..9bcb05d19 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -28,9 +28,9 @@ build_flags                 = ${esp82xx_defaults.build_flags}
 extends                     = env:tasmota32_base
 board                       = esp32s2
 board_build.flash_mode      = qio
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz
+platform                    = https://github.com/platformio/platform-espressif32.git#feature/idf-master
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz
                               platformio/tool-mklittlefs @ ~1.203.200522
-                              platformio/tool-esptoolpy @ ~1.30000.0
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${common32.build_flags} -DFIRMWARE_LITE
 lib_extra_dirs              = lib/libesp32
@@ -44,7 +44,7 @@ lib_ignore                  =
 extends                     = env:tasmota32_base
 board                       = esp32c3
 platform                    = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-c3
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz
                               tasmota/toolchain-riscv32
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags} -mtarget-align

From 485947914bdd7af2d84f9310c00e51801d16c9c0 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 31 May 2021 19:52:43 +0200
Subject: [PATCH 3/4] Use Platformio idf-master branch

---
 platformio_tasmota_cenv_sample.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index 9bcb05d19..10d360fa6 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -60,7 +60,7 @@ lib_ignore                  =
 ; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4.
 [env:tasmota32idf4]
 extends                     = env:tasmota32_base
-platform                    = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-idf-v4.4
+platform                    = https://github.com/platformio/platform-espressif32.git#feature/idf-master
 platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags}

From 330d254cbd39ce1f8146ca0939d5c3fe8787d538 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 31 May 2021 20:01:47 +0200
Subject: [PATCH 4/4] toolchain-xtensa32 2.80400.0 for ESP32

---
 platformio_tasmota_cenv_sample.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index 10d360fa6..9f2d8e764 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -62,6 +62,7 @@ lib_ignore                  =
 extends                     = env:tasmota32_base
 platform                    = https://github.com/platformio/platform-espressif32.git#feature/idf-master
 platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz
+                              toolchain-xtensa32 @ ~2.80400.0
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}