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

This commit is contained in:
MichaelDvP
2020-05-28 08:25:36 +02:00
36 changed files with 857 additions and 532 deletions

View File

@@ -2,9 +2,9 @@
; For EMS-ESP
[platformio]
;default_envs = esp8266
default_envs = esp8266
; default_envs = esp32
default_envs = esp32_d1
;default_envs = esp32_d1
# override any settings with your own local ones in pio_local.ini
extra_configs = pio_local.ini
@@ -34,7 +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
-D UUID_TELNET_HAVE_WIFICLIENT_NODELAY=1
libs_core =
ArduinoJson
@@ -59,18 +59,18 @@ check_flags =
clangtidy: --checks=-*,clang-analyzer-*,performance-*
; USB upload
upload_protocol = esptool
; 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
; upload_protocol = espota
; upload_flags =
; --port=8266
; --auth=neo
; upload_port = ems-esp.local
upload_protocol = espota
upload_flags =
--port=8266
--auth=neo
upload_port = 192.168.0.20
[env:esp8266]
build_type = release