From 4f928cf5170020965bbb07ac5c8bd3d8821bba26 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Mon, 22 Jun 2020 21:03:28 +0200
Subject: [PATCH] cleaned up config

---
 platformio.ini | 45 ++++++++++++---------------------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 1ba931070..7f7c9df84 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -8,35 +8,17 @@ default_envs = esp8266
 extra_configs = pio_local.ini
 
 [common]
-# Available ESP8266 lwIP variants (macros):
-#    see https://docs.platformio.org/en/latest/platforms/espressif8266.html
-# -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY v2 Lower Memory (default)
-# -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH v2 Higher Bandwidth
-# -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH v2 Lower Memory (no features)
-# -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH v2 Higher Bandwidth (no features)
-# -D PIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_LOW_MEMORY v2 IPv6 Lower Memory
-# -D PIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_HIGHER_BANDWIDTH v2 IPv6 Higher Bandwidth
-# -D PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH v1.4 Higher Bandwidth
-
 ;debug_flags = -DDEBUG_ESP_PORT=Serial -DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
 debug_flags =
   -D EMSESP_DEBUG
   ; -D EMSESP_SAFE_MODE
-  ; -D ENABLE_CORS -D CORS_ORIGIN=\"http://localhost:3000\"
 
-; default platformio compile flags are:
-; -fno-rtti -std=c++11 -Os -mlongcalls -mtext-section-literals -falign-functions=4 -ffunction-sections -fdata-sections -fno-exceptions -Wall
-; (note -flto doesn't make a different to flash)
+; default platformio compile flags are: -fno-rtti -std=c++11 -Os -mlongcalls -mtext-section-literals -falign-functions=4 -ffunction-sections -fdata-sections -fno-exceptions -Wall
 
 build_flags =
   -D ONEWIRE_CRC16=0
   -D NO_GLOBAL_ARDUINOOTA
   -D ARDUINOJSON_ENABLE_STD_STRING=1
-  -D ARDUINOJSON_USE_DOUBLE=0
-	-D ARDUINOJSON_USE_LONG_LONG=0
-  -D BEARSSL_SSL_BASIC
-  -D PROGMEM_WWW
-  -D UUID_TELNET_HAVE_WIFICLIENT_NODELAY=1
 
 libs_core =
   ArduinoJson
@@ -44,16 +26,13 @@ libs_core =
   AsyncMqttClient
   1@^2.3.5 ; https://github.com/PaulStoffregen/OneWire
 
-libs_esp8266 = 
-libs_esp32 =
-
 [env]
-;lib_ldf_mode = chain+
-;lib_compat_mode = strict
 extra_scripts = scripts/main_script.py
 framework = arduino
+
 monitor_speed = 115200
 upload_speed = 921600
+
 check_tool = cppcheck, clangtidy
 check_severity = high, medium
 check_flags =
@@ -75,23 +54,23 @@ upload_flags =
 upload_port = ems-esp.local
 
 [env:esp8266]
+board = esp12e ; https://github.com/platformio/platform-espressif8266/tree/master/boards
 build_type = release
 platform = espressif8266 ; https://github.com/platformio/platform-espressif8266/releases
-;platform = espressif8266@2.4.0 ; Arduino core 2.6.3 
-board = esp12e
 board_build.flash_mode = dout
-; board = d1_mini ; https://github.com/platformio/platform-espressif8266/blob/master/boards/d1_mini.json
-lib_deps = ${common.libs_core} ${common.libs_esp8266}
+lib_deps = ${common.libs_core}
 board_build.f_cpu = 160000000L ; 160MHz
-board_build.ldscript = eagle.flash.4m1m.ld ; 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer
-; board_build.ldscript = eagle.flash.4m2m.ld ; 1019 KB sketch, 2024 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 1028 KB OTA & buffer
+; eagle.flash.4m1m.ld = 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer
+; eagle.flash.4m2m.ld = 1019 KB sketch, 2024 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 1028 KB OTA & buffer
+board_build.ldscript = eagle.flash.4m1m.ld 
 build_flags = ${common.build_flags} ${common.debug_flags} -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
 lib_ignore =
     AsyncTCP
 
 [env:esp32]
+board = esp32dev
 build_type = release
 platform = espressif32
-board = esp32dev
-lib_deps = ${common.libs_core} ${common.libs_esp32}
-build_flags = ${common.build_flags} ${common.debug_flags} -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
+board_build.partitions = min_spiffs.csv ; https://github.com/espressif/arduino-esp32/blob/master/tools/partitions/
+lib_deps = ${common.libs_core}
+build_flags = ${common.build_flags} ${common.debug_flags}