From 34d5e8bc50f112264e288bde7972d64c54a5c76b Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 19 Jun 2020 20:25:02 +0200
Subject: [PATCH] Refactor...

and add missing entrys
---
 platformio_override_sample.ini | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 81cf0dec0..1c8745c50 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -7,8 +7,6 @@
 ;
 ; Please visit documentation for the options and examples
 ; http://docs.platformio.org/en/stable/projectconf.html
-;
-
 
 [platformio]
 extra_configs = platformio_tasmota_env32.ini
@@ -42,7 +40,6 @@ platform                  = ${core_active.platform}
 platform_packages         = ${core_active.platform_packages}
 build_unflags             = ${core_active.build_unflags}
 build_flags               = ${core_active.build_flags}
-
 ; *** Optional Debug messages
 ;                            -DDEBUG_TASMOTA_CORE
 ;                            -DDEBUG_TASMOTA_DRIVER
@@ -90,10 +87,11 @@ extra_scripts             = ${scripts_defaults.extra_scripts}
 
 [tasmota_stage]
 ; *** Esp8266 core for Arduino version Tasmota stage
-extends                   = tasmota_core
+extends                   = core
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#52b3e5b7b3ccedcede665682f7896b637b64dbf5
-build_unflags             = -Wall
+build_unflags             = ${esp_defaults.build_unflags}
 build_flags               = ${esp82xx_defaults.build_flags}
+
 ; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
@@ -125,9 +123,9 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 [core_stage]
 ; *** Esp8266 core for Arduino version latest development version
-extends                   = tasmota_core
+extends                   = core
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
-build_unflags             = -Wall
+build_unflags             = ${esp_defaults.build_unflags}
 build_flags               = ${esp82xx_defaults.build_flags}
 
 ; *********** Alternative Options, enable only if you know exactly what you do ********
@@ -162,7 +160,10 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 ; *** Debug version used for PlatformIO Home Project Inspection
 [env:tasmota-debug]
-build_type = debug
+extends                   = core
+build_type                = debug
+build_unflags             = ${esp_defaults.build_unflags}
+build_flags               = ${esp82xx_defaults.build_flags}
 
 
 ; ***        Experimental ESP32 Tasmota version               ***
@@ -177,7 +178,7 @@ board_build.partitions  = esp32_partition_app1984k_spiffs64k.csv
 board_build.flash_mode  = ${common.board_build.flash_mode}
 board_build.f_flash     = ${common.board_build.f_flash}
 board_build.f_cpu       = ${common.board_build.f_cpu}
-build_unflags           = ${common.build_unflags}
+build_unflags           = ${esp_defaults.build_unflags}
                           -Wpointer-arith
 monitor_speed           = ${common.monitor_speed}
 upload_port             = ${common.upload_port}