Merge branch 'dev' of github.com:xoseperez/espurna into dev

code/platformio.ini

@@ -11,11 +11,11 @@ data_dir = espurna/data
 #
 #   platformIO 1.5.0 = arduino core 2.3.0
 #   platformIO 1.6.0 = arduino core 2.4.0
-#   platformIO 1.7.0 = arduino core 2.4.1
+#   platformIO 1.7.1 = arduino core 2.4.1
 # ------------------------------------------------------------------------------
 platform_150 = espressif8266@1.5.0
 platform_160 = espressif8266@1.6.0
-platform_170 = espressif8266@1.7.0
+platform_171 = espressif8266@1.7.1
 platform = ${common.platform_150}
 
 # ------------------------------------------------------------------------------
@@ -23,17 +23,20 @@ platform = ${common.platform_150}
 #
 # ------------------------------------------------------------------------------
 debug_flags = -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
+#if needed (for memleaks etc) also add; -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h"
 
 # ------------------------------------------------------------------------------
 # FLAGS: build flags
 #   build flags for 512k/1m ESP's are different because we use Linker Scripts to adjust flash split
-#   512 KB = 487 KB sketch, 20 KB eeprom
-#     1 MB = 999 KB sketch, 20 KB eeprom
+#    build_flags_512k ( 512 KB) =  487 KB sketch, 20 KB eeprom
+#    build_flags_1m0m (1024 KB) =  999 KB sketch, 20 KB eeprom
+#    build_flags_4m1m (4096 KB) = 1019 KB sketch, 16 KB eeprom,  992 KB spiffs, 16 KB reserved, 2048 KB empty/ota?
+#    build_flags_4m3m (4096 KB) = 1019 KB sketch, 16 KB eeprom, 3040 KB spiffs, 16 KB reserved
 #
 # Available lwIP variants (macros):
-#    -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH v1.4 Higher Bandwidth (default)
-#    -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY v2 Lower Memory
-#    -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH v2 Higher Bandwidth
+#    -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH  = v1.4 Higher Bandwidth (default)
+#    -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY       = v2 Lower Memory
+#    -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH = v2 Higher Bandwidth
 # ------------------------------------------------------------------------------
 build_flags = -g -w -DMQTT_MAX_PACKET_SIZE=400 -DNO_GLOBAL_EEPROM ${env.ESPURNA_FLAGS} -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
 build_flags_512k = ${common.build_flags} -Wl,-Teagle.flash.512k0m1s.ld
@@ -246,7 +249,7 @@ upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
-extra_scripts = ${common.extra_scripts
+extra_scripts = ${common.extra_scripts}
 modules = ${common.modules}
 
 # ------------------------------------------------------------------------------
@@ -276,7 +279,6 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-extra_scripts = ${common.extra_scripts
 modules = ${common.modules} sensor
 
 [env:tinkerman-espurna-h08]