From 5cc13af700bbb05891c29eef5d1baa90ce9398b1 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 23 Apr 2021 15:32:41 +0200
Subject: [PATCH 1/3] Update platformio_override_sample.ini

---
 platformio_override_sample.ini | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 681144edc..b09b51e99 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -84,9 +84,10 @@ lib_extra_dirs              = ${library.lib_extra_dirs}
 ;build_unflags               = ${tasmota_stage.build_unflags}
 ;build_flags                 = ${tasmota_stage.build_flags}
 
-;platform_packages           = ${core_stage.platform_packages}
-;build_unflags               = ${core_stage.build_unflags}
-;build_flags                 = ${core_stage.build_flags}
+;
+platform_packages           = ${core_stage.platform_packages}
+build_unflags               = ${core_stage.build_unflags}
+build_flags                 = ${core_stage.build_flags}
 
 
 [tasmota_stage]
@@ -102,7 +103,7 @@ build_flags                 = ${esp82xx_defaults.build_flags}
 ; *** Esp8266 core for Arduino version stage
 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.201223
+                              tasmota/toolchain-xtensa @ 5.100200.210303
 build_unflags               = ${esp_defaults.build_unflags}
                               -Wswitch-unreachable
 build_flags                 = ${esp82xx_defaults.build_flags}

From 9d6699b4a0e9c48207ec5eff5de1e2f4681aa611 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 24 Apr 2021 15:36:21 +0200
Subject: [PATCH 2/3] Update platformio_override_sample.ini

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

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index b09b51e99..b69ed2470 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -84,10 +84,9 @@ lib_extra_dirs              = ${library.lib_extra_dirs}
 ;build_unflags               = ${tasmota_stage.build_unflags}
 ;build_flags                 = ${tasmota_stage.build_flags}
 
-;
-platform_packages           = ${core_stage.platform_packages}
-build_unflags               = ${core_stage.build_unflags}
-build_flags                 = ${core_stage.build_flags}
+;platform_packages           = ${core_stage.platform_packages}
+;build_unflags               = ${core_stage.build_unflags}
+;build_flags                 = ${core_stage.build_flags}
 
 
 [tasmota_stage]

From cc749f518e0a840e1a2ee9f141b0a730e19e6a04 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 24 Apr 2021 15:39:26 +0200
Subject: [PATCH 3/3] Update platformio_override_sample.ini

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

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index b69ed2470..ef42c9580 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -101,7 +101,7 @@ build_flags                 = ${esp82xx_defaults.build_flags}
 [core_stage]
 ; *** Esp8266 core for Arduino version stage
 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
+; *** Use Xtensa build chain 10.2. GNU23 from https://github.com/earlephilhower/esp-quick-toolchain
                               tasmota/toolchain-xtensa @ 5.100200.210303
 build_unflags               = ${esp_defaults.build_unflags}
                               -Wswitch-unreachable