From 946c9a03937ff88a2f686f2518c473a2b1020083 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 8 May 2020 08:49:18 +0200
Subject: [PATCH] Use extends in Core flavour

---
 platformio_override_sample.ini | 36 ++++++++--------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 22bd8cf70..f4c1d9ccd 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -83,16 +83,14 @@ extra_scripts             = ${scripts_defaults.extra_scripts}
 
 [tasmota_stage]
 ; *** Esp8266 core for Arduino version Tasmota stage
-platform                  = espressif8266@2.5.0
+extends                   = tasmota_core
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#36e047e908cfa6eafaaf824988070b49f2c2ff2a
-build_flags               = ${esp82xx_defaults.build_flags}
-                            -DBEARSSL_SSL_BASIC
+;
+; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
 ; NONOSDK22x_190313
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313
-; NONOSDK22x_190703 = 2.2.1+100-dev(38a443e) (Tasmota default) (Firmware 2K smaller than NONOSDK22x_191105)
-                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
 ; NONOSDK22x_191024 = 2.2.1+111-dev(5ab15d1)
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024
 ; NONOSDK22x_191105 = 2.2.1+113-dev(bb83b9b)
@@ -109,34 +107,24 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
 ; lwIP 2 - Higher Bandwidth Low Memory no Features
 ;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH
-; lwIP 2 - Higher Bandwidth no Features (Tasmota default)
-                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-; VTABLES in Flash (Tasmota default)
-                            -DVTABLES_IN_FLASH
 ; VTABLES in Heap
 ;                            -DVTABLES_IN_DRAM
 ; VTABLES in IRAM
 ;                            -DVTABLES_IN_IRAM
-; enable one option set -> No exception recommended
-; No exception code in firmware
-                            -fno-exceptions
-                            -lstdc++
-; Exception code in firmware /needs much space! 90k
+; Exception code in firmware /needs much space!
 ;                           -fexceptions
 ;                           -lstdc++-exc
 
 [core_stage]
 ; *** Esp8266 core for Arduino version latest development version
-platform                  = espressif8266@2.5.0
+extends                   = tasmota_core
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
-build_flags               = ${esp82xx_defaults.build_flags}
-                            -DBEARSSL_SSL_BASIC
+;
+; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
 ; NONOSDK22x_190313
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313
-; NONOSDK22x_190703 = 2.2.1+100-dev(38a443e) (Tasmota default) (Firmware 2K smaller than NONOSDK22x_191105)
-                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
 ; NONOSDK22x_191024 = 2.2.1+111-dev(5ab15d1)
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024
 ; NONOSDK22x_191105 = 2.2.1+113-dev(bb83b9b)
@@ -153,19 +141,11 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
 ; lwIP 2 - Higher Bandwidth Low Memory no Features
 ;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH
-; lwIP 2 - Higher Bandwidth no Features (Tasmota default)
-                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-; VTABLES in Flash (Tasmota default)
-                            -DVTABLES_IN_FLASH
 ; VTABLES in Heap
 ;                            -DVTABLES_IN_DRAM
 ; VTABLES in IRAM
 ;                            -DVTABLES_IN_IRAM
-; enable one option set -> No exception recommended
-; No exception code in firmware
-                            -fno-exceptions
-                            -lstdc++
-; Exception code in firmware /needs much space! 90k
+; Exception code in firmware /needs much space!
 ;                           -fexceptions
 ;                           -lstdc++-exc