From ed177396b29d28df2fe11ace6a0f2c04412426ca Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Tue, 30 Mar 2021 11:59:06 +0200
Subject: [PATCH] cleaned up pio scripts

---
 pio_local.ini_example |  5 ++---
 platformio.ini        | 37 +++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pio_local.ini_example b/pio_local.ini_example
index 5a60e66df..04abb5b2e 100644
--- a/pio_local.ini_example
+++ b/pio_local.ini_example
@@ -8,9 +8,8 @@ upload_flags =
 upload_port = 10.10.10.101
 
 [common]
-; EMSESP_DEBUG EMSESP_UART_DEBUG EMSESP_TEST ENABLE_CORS DEMSESP_DEFAULT_BOARD_PROFILE
-; debug_flags = -DENABLE_CORS -DCORS_ORIGIN=\"http://localhost:3000\" 
-; debug_flags = -DEMSESP_DEBUG -DEMSESP_TEST
+; options are EMSESP_DEBUG EMSESP_UART_DEBUG EMSESP_TEST ENABLE_CORS DEMSESP_DEFAULT_BOARD_PROFILE
+; debug_flags = -DENABLE_CORS -DEMSESP_DEBUG -DEMSESP_TEST -DCORS_ORIGIN=\"http://localhost:3000\" 
 ; debug_flags = -DEMSESP_DEFAULT_BOARD_PROFILE=\"NODEMCU\"
 
 [env:esp32]
diff --git a/platformio.ini b/platformio.ini
index caf608a23..66c02e074 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1,21 +1,24 @@
 ; PlatformIO Project Configuration File for EMS-ESP
+; override any settings with your own local ones in pio_local.ini
 
 [platformio]
 default_envs = esp32
 
-# override any settings with your own local ones in pio_local.ini
 extra_configs = 
   factory_settings.ini
   pio_local.ini
 
 [common]
-core_build_flags =    -Wno-deprecated-declarations
-                      -Wreturn-type
-                      -DCORE_DEBUG_LEVEL=0
-                      -DNDEBUG
+core_build_flags =
+  -Wall
+  -D CORE_DEBUG_LEVEL=0
+  -D NDEBUG
+  -D ARDUINO_ARCH_ESP32=1
+  -D ESP32=1
+  ; -std=c++17 -std=gnu++17
 
-esp32_build_flags   = -DARDUINO_ARCH_ESP32=1 -DESP32=1
-                    ; -std=c17 -std=c++17 -std=gnu++17  
+core_unbuild_flags =  
+  ; -std=gnu++11                  
 
 build_flags =
   ${common.core_build_flags}
@@ -23,13 +26,11 @@ build_flags =
   -D ONEWIRE_CRC16=0
   -D NO_GLOBAL_ARDUINOOTA
   -D ARDUINOJSON_ENABLE_STD_STRING=1
-  
-build_unflags = -Wall -Wdeprecated-declarations
 
-esp32_build_unflags = 
-     ; -std=gnu++11
+unbuild_flags =
+  ${common.core_unbuild_flags}
 
-; set these in your pio_local.ini
+; these are set in your pio_local.ini
 debug_flags =
 
 [env]
@@ -42,8 +43,8 @@ lib_ldf_mode = chain+
 check_tool = cppcheck, clangtidy
 check_severity = high, medium
 check_flags =
-    cppcheck: --std=c++11 -v
-    clangtidy: --checks=-*,clang-analyzer-*,performance-*
+  cppcheck: --std=c++11 -v
+  clangtidy: --checks=-*,clang-analyzer-*,performance-*
 
 ; build for GitHub Actions CI
 [env:ci]
@@ -51,8 +52,8 @@ extra_scripts = scripts/rename_fw.py
 board = esp32dev
 platform = espressif32
 board_build.partitions = esp32_partition_app1984k_spiffs64k.csv 
-build_flags = ${common.build_flags} ${common.esp32_build_flags}
-build_unflags = ${common.build_unflags} ${common.esp32_build_unflags}
+build_flags = ${common.build_flags}
+build_unflags = ${common.unbuild_flags}
 
 [env:esp32]
 extra_scripts =
@@ -66,5 +67,5 @@ platform = espressif32
 ;                      toolchain-xtensa32 @ 2.80400.2020
 ; platform = https://github.com/platformio/platform-espressif32.git
 board_build.partitions = esp32_partition_app1984k_spiffs64k.csv
-build_flags = ${common.build_flags} ${common.esp32_build_flags} ${common.debug_flags}
-build_unflags = ${common.build_unflags} ${common.esp32_build_unflags}
+build_flags = ${common.build_flags} ${common.debug_flags}
+build_unflags = ${common.unbuild_flags}