From 6c724f824e0e5045a30889afc99e84974f614216 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 2 Nov 2021 17:22:04 +0100
Subject: [PATCH] Stabilize Platformio when overriding

* Stabilize override
---
 platformio_override_sample.ini     |  5 +++--
 platformio_tasmota_cenv_sample.ini | 35 +++++++++++++++---------------
 platformio_tasmota_env32.ini       |  5 +++--
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 06eae19c2..3ce7709fe 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -91,8 +91,9 @@ lib_extra_dirs          = ${library.lib_extra_dirs}
 [env:tasmota32_base]
 ; *** Uncomment next lines ";" to enable Beta Tasmota Arduino version ESP32 IDF4.4
 ;platform                = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
-;platform_packages       = ${core32.platform_packages}
-;                          framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
+;platform_packages       = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
+;                          platformio/tool-esptoolpy @ https://github.com/tasmota/esptool/releases/download/v3.2/esptool-v3.2.zip
+;                          platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags           = ${esp32_defaults.build_unflags}
 build_flags             = ${esp32_defaults.build_flags}
 
diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index 57c41ac23..1b72d4856 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -1,25 +1,12 @@
 ; *** Tasmota32 development core version ESP32 IDF4.4
 [env:tasmota32-dev]
-extends                     = env:tasmota32idf4
-platform_packages           = ${core32.platform_packages}
-                              framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/511/framework-arduinoespressif32-release_v4.4-432c3c78c.tar.gz
+extends                     = env:tasmota32_base
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/511/framework-arduinoespressif32-release_v4.4-432c3c78c.tar.gz
+                              platformio/tool-esptoolpy @ https://github.com/tasmota/esptool/releases/download/v3.2/esptool-v3.2.zip
+                              platformio/tool-mklittlefs @ ~1.203.200522
 build_flags                 = ${env:tasmota32idf4.build_flags}
                               -D FIRMWARE_TASMOTA32
 
-[env:tasmota-rangeextender]
-build_flags                 = ${env.build_flags}
-                              -D FIRMWARE_RANGE_EXTENDER
-                              -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
-                              -D USE_WIFI_RANGE_EXTENDER
-                              -D USE_WIFI_RANGE_EXTENDER_NAPT
-
-[env:tasmota32-rangeextender]
-extends                     = env:tasmota32idf4
-build_flags                 = ${env:tasmota32idf4.build_flags}
-                              -D FIRMWARE_TASMOTA32
-                              -D USE_WIFI_RANGE_EXTENDER
-                              -D USE_WIFI_RANGE_EXTENDER_NAPT
-
 ;*** Beta Tasmota version for ESP32-S2
 ;*** Example how to override the standard core with [tasmota32-dev] core
 [env:tasmota32s2]
@@ -34,6 +21,20 @@ lib_extra_dirs              = lib/libesp32
                               lib/lib_ssl
                               lib/lib_display
 
+[env:tasmota-rangeextender]
+build_flags                 = ${env.build_flags}
+                              -D FIRMWARE_RANGE_EXTENDER
+                              -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
+                              -D USE_WIFI_RANGE_EXTENDER
+                              -D USE_WIFI_RANGE_EXTENDER_NAPT
+
+[env:tasmota32-rangeextender]
+extends                     = env:tasmota32idf4
+build_flags                 = ${env:tasmota32idf4.build_flags}
+                              -D FIRMWARE_TASMOTA32
+                              -D USE_WIFI_RANGE_EXTENDER
+                              -D USE_WIFI_RANGE_EXTENDER_NAPT
+
 ; *** Debug version used for PlatformIO Home Project Inspection
 [env:tasmota-debug]
 build_type                  = debug
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 373feae32..e3eb28a38 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -36,8 +36,9 @@ lib_ignore                  =
 [env:tasmota32idf4]
 extends                 = env:tasmota32_base
 platform                = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
-platform_packages       = ${core32.platform_packages}
-                          framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
+platform_packages       = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
+                          platformio/tool-esptoolpy @ https://github.com/tasmota/esptool/releases/download/v3.2/esptool-v3.2.zip
+                          platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags           = ${env:tasmota32_base.build_unflags}
                           -Wswitch-unreachable
                           -Wstringop-overflow