Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2

platformio.ini

@@ -2,9 +2,9 @@
 ; For EMS-ESP
 
 [platformio]
-default_envs = esp8266
-;default_envs = esp32
-;default_envs = esp32_d1
+;default_envs = esp8266
+; default_envs = esp32
+default_envs = esp32_d1
 
 # override any settings with your own local ones in pio_local.ini
 extra_configs = pio_local.ini
@@ -34,6 +34,7 @@ build_flags = -std=c++11 -Os -fno-exceptions
 	-D ARDUINOJSON_USE_LONG_LONG=0
   -D BEARSSL_SSL_BASIC
   -D PROGMEM_WWW
+  -D UUID_TELNET_HAVE_WIFICLIENT_NODELAY=0
 
 libs_core =
   ArduinoJson
@@ -45,9 +46,8 @@ libs_esp8266 =
 libs_esp32 =
 
 [env]
-build_unflags = -fno-rtti ; for dynamic_cast<>
-lib_ldf_mode = chain+
-lib_compat_mode = strict
+;lib_ldf_mode = chain+
+;lib_compat_mode = strict
 extra_scripts = scripts/main_script.py
 framework = arduino
 monitor_speed = 115200
@@ -58,13 +58,14 @@ check_flags =
     cppcheck: --std=c++11
     clangtidy: --checks=-*,clang-analyzer-*,performance-*
 
+; USB upload
+upload_protocol = esptool
 ; example ports for OSX
 ;upload_port = /dev/cu.wchusbserial14403
 ;upload_port = /dev/cu.usbserial-1440
 ;upload_port = /dev/cu.SLAB_USBtoUART
 
-; OTA
-upload_protocol = esptool
+; OTA upload
 ; upload_protocol = espota
 ; upload_flags = 
 ;    --port=8266
@@ -80,7 +81,7 @@ board = esp12e
 lib_deps = ${common.libs_core} ${common.libs_esp8266}
 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 ; same as above but with 2024 KB SPIFFS
+board_build.ldscript = eagle.flash.4m2m.ld ; 1019 KB sketch, 2024 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 1028 KB OTA & buffer
 build_flags = ${common.build_flags} ${common.debug_flags} -flto -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
 
 [env:esp32]