From 8fb30e3043e72a0302325eac9d348408475f3b7e Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 19 Nov 2020 19:32:49 +0100
Subject: [PATCH 1/3] Esptool 3.0 from Platformio registry

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

diff --git a/platformio.ini b/platformio.ini
index 77ac348d3..7645a668e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -149,6 +149,6 @@ platform                    = espressif8266 @ 2.6.2
 platform_packages           = tasmota/framework-arduinoespressif8266 @ 3.20704.7
                               platformio/toolchain-xtensa @ 2.40802.200502
                               platformio/tool-esptool @ 1.413.0
-                              tool-esptoolpy @ https://github.com/Jason2866/esptool/releases/download/v3.0/esptool-3.0.zip
+                              platformio/tool-esptoolpy @ ~1.30000.0
 build_unflags               = ${esp_defaults.build_unflags}
 build_flags                 = ${esp82xx_defaults.build_flags}

From 3c48a2f86f9dd39527a6dab6d3d02d8b8f8ec1cb Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 19 Nov 2020 19:34:22 +0100
Subject: [PATCH 2/3] Esptool 3.0 from Platformio

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

diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 372356be8..1b433b095 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -86,7 +86,7 @@ build_flags                 = ${esp_defaults.build_flags}
 
 [core32]
 platform                    = espressif32 @ 2.0.0
-platform_packages           = tool-esptoolpy @ https://github.com/Jason2866/esptool/releases/download/v3.0/esptool-3.0.zip
+platform_packages           = platformio/tool-esptoolpy @ ~1.30000.0
                               framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.4.2/esp32-1.0.4.2.zip
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}

From 674fa8e29322eb8b34c95707f5dc74dc9d21e86e Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 19 Nov 2020 19:37:16 +0100
Subject: [PATCH 3/3] Esptool 3.0 from Platformio registry

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

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 164f74464..7e63fcd9a 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -78,7 +78,7 @@ lib_extra_dirs              = ${library.lib_extra_dirs}
 ; *** Esp8266 core for Arduino version Tasmota stage (PR7231 and Backport PR7514)
 platform_packages           = tasmota/framework-arduinoespressif8266 @ 3.20704.7
                               platformio/toolchain-xtensa @ 2.40802.200502
-                              tool-esptoolpy @ https://github.com/Jason2866/esptool/releases/download/v3.0/esptool-3.0.zip
+                              platformio/tool-esptoolpy @ ~1.30000.0
                               platformio/tool-esptool @ 1.413.0
 build_unflags               = ${esp_defaults.build_unflags}
 build_flags                 = ${esp82xx_defaults.build_flags}
@@ -88,7 +88,7 @@ build_flags                 = ${esp82xx_defaults.build_flags}
 platform_packages           = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
 ; *** Use Xtensa build chain 10.2. GNU13 from https://github.com/earlephilhower/esp-quick-toolchain
                               mcspr/toolchain-xtensa @ 5.100200.200918
-                              tool-esptoolpy @ https://github.com/Jason2866/esptool/releases/download/v3.0/esptool-3.0.zip
+                              platformio/tool-esptoolpy @ ~1.30000.0
                               platformio/tool-esptool @ 1.413.0
 build_unflags               = ${esp_defaults.build_unflags}
                               -Wswitch-unreachable
@@ -125,7 +125,7 @@ lib_extra_dirs              = ${library.lib_extra_dirs}
 
 [core32_stage]
 platform                    = espressif32 @ 2.0.0
-platform_packages           = tool-esptoolpy @ https://github.com/Jason2866/esptool/releases/download/v3.0/esptool-3.0.zip
+platform_packages           = platformio/tool-esptoolpy @ ~1.30000.0
                               framework-arduinoespressif32 @ https://github.com/Jason2866/arduino-esp32/releases/download/1.0.5-rc2/esp32-1.0.5-rc2.zip
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}