andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 16:59:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

rollback to arduino core 2.5.2 to fix web reload issue - https://github.com/proddy/EMS-ESP/issues/244

Browse Source
This commit is contained in:
Paul
2019-11-28 09:31:23 +01:00
parent 5c8377f429
commit 47c7c2edc2
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
platformio.ini
View File

@@ -26,7 +26,7 @@ custom_flags =
# -DVTABLES_IN_FLASH # -DVTABLES_IN_FLASH
# -DNO_GLOBAL_EEPROM # -DNO_GLOBAL_EEPROM
# -DBEARSSL_SSL_BASIC # -DBEARSSL_SSL_BASIC
general_flags = -std=c++11 -DNO_GLOBAL_EEPROM -DVTABLES_IN_FLASH general_flags = -DNO_GLOBAL_EEPROM
# From https://github.com/esp8266/Arduino/blob/master/tools/sdk/ld # From https://github.com/esp8266/Arduino/blob/master/tools/sdk/ld
# eagle.flash.4m1m.ld = 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer # eagle.flash.4m1m.ld = 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer
@@ -37,22 +37,21 @@ build_flags = ${common.general_flags} ${common.build_flags_4m1m}
[env] [env]
framework = arduino framework = arduino
platform = espressif8266@2.2.3 platform = espressif8266@2.2.2 ; arduino core 2.5.2
;platform = https://github.com/platformio/platform-espressif8266#develop ;platform = https://github.com/platformio/platform-espressif8266#develop
;platform = https://github.com/platformio/platform-espressif8266#feature/stage ;platform = https://github.com/platformio/platform-espressif8266#feature/stage
lib_deps = lib_deps =
https://github.com/rlogiacco/CircularBuffer https://github.com/rlogiacco/CircularBuffer
https://github.com/PaulStoffregen/OneWire https://github.com/PaulStoffregen/OneWire
https://github.com/me-no-dev/ESPAsyncWebServer https://github.com/me-no-dev/ESPAsyncWebServer
;https://github.com/me-no-dev/ESPAsyncWebServer#b0c6144
https://github.com/bakercp/CRC32 https://github.com/bakercp/CRC32
JustWifi@2.0.2 https://github.com/nomis/mcu-uuid-syslog
AsyncMqttClient@0.8.2 JustWifi@2.0.2 ; https://github.com/xoseperez/justwifi
EEPROM_Rotate@0.9.2 AsyncMqttClient@0.8.2 ; https://github.com/marvinroger/async-mqtt-client
ArduinoJson@6.13.0 EEPROM_Rotate@0.9.2 ; https://github.com/xoseperez/eeprom_rotate
ESPAsyncUDP ArduinoJson@6.13.0 ; https://github.com/bblanchon/ArduinoJson
ESPAsyncTCP@1.2.2 ESPAsyncTCP@1.2.2 ; https://github.com/me-no-dev/ESPAsyncTCP
https://github.com/nomis/mcu-uuid-syslog.git https://github.com/me-no-dev/ESPAsyncUDP
upload_speed = 921600 upload_speed = 921600
monitor_speed = 115200 monitor_speed = 115200
@@ -60,9 +59,9 @@ monitor_speed = 115200
;upload_port = /dev/cu.wchusbserial14403 ;upload_port = /dev/cu.wchusbserial14403
;upload_port = /dev/cu.usbserial-1440 ;upload_port = /dev/cu.usbserial-1440
; comment out these next 2 lines if not using OTA and going direct via USB ; uncomment these next 2 lines if using OTA instead of going direct via USB
upload_protocol = espota ;upload_protocol = espota
upload_port = ems-esp.local ;upload_port = ems-esp.local
# #
# These following targets are used by TravisCI to build the firmware versions on Release # These following targets are used by TravisCI to build the firmware versions on Release

2
src/version.h
View File

@@ -1 +1 @@
#define APP_VERSION "1.9.4b17" #define APP_VERSION "1.9.4b18"