lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ArduinoJson to 6.16.1

Browse Source 
Add fsinfo to JSON info
This commit is contained in:
cschwinne 2020-09-15 21:28:43 +02:00
parent 1263f5e046
commit d975f6e23a
4 changed files with 3039 additions and 1814 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platformio.ini
View File

@ -31,7 +31,7 @@ default_envs = travis_esp8266, travis_esp32
; default_envs = heltec_wifi_kit_8 ; default_envs = heltec_wifi_kit_8
; default_envs = h803wf ; default_envs = h803wf
; default_envs = d1_mini_debug ; default_envs = d1_mini_debug
;default_envs = d1_mini_ota ; default_envs = d1_mini_ota
; default_envs = esp32dev ; default_envs = esp32dev
; default_envs = esp8285_4CH_MagicHome ; default_envs = esp8285_4CH_MagicHome
; default_envs = esp8285_4CH_H801 ; default_envs = esp8285_4CH_H801
@ -177,6 +177,7 @@ lib_deps =
#U8g2@~2.27.2 #U8g2@~2.27.2
#For Dallas sensor uncomment following 2 lines #For Dallas sensor uncomment following 2 lines
#OneWire@~2.3.5 #OneWire@~2.3.5
#milesburton/DallasTemperature@^3.9.0
#For BME280 sensor uncomment following #For BME280 sensor uncomment following
#BME280@~3.0.0 #BME280@~3.0.0
lib_ignore = lib_ignore =

6
wled00/json.cpp
View File

@ -399,6 +399,12 @@ void serializeInfo(JsonObject root)
wifi_info["rssi"] = qrssi; wifi_info["rssi"] = qrssi;
wifi_info["signal"] = getSignalQuality(qrssi); wifi_info["signal"] = getSignalQuality(qrssi);
wifi_info["channel"] = WiFi.channel(); wifi_info["channel"] = WiFi.channel();
JsonObject fs_info = root.createNestedObject("fs");
FSInfo fsi;
WLED_FS.info(fsi);
fs_info["u"] = fsi.usedBytes;
fs_info["t"] = fsi.totalBytes;
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#ifdef WLED_DEBUG #ifdef WLED_DEBUG

4842
wled00/src/dependencies/json/ArduinoJson-v6.h
View File

File diff suppressed because it is too large Load Diff

2
wled00/wled.h
View File

@ -91,6 +91,8 @@
#include "src/dependencies/e131/ESPAsyncE131.h" #include "src/dependencies/e131/ESPAsyncE131.h"
#include "src/dependencies/async-mqtt-client/AsyncMqttClient.h" #include "src/dependencies/async-mqtt-client/AsyncMqttClient.h"
#define ARDUINOJSON_DECODE_UNICODE 0
#include "src/dependencies/json/AsyncJson-v6.h" #include "src/dependencies/json/AsyncJson-v6.h"
#include "src/dependencies/json/ArduinoJson-v6.h" #include "src/dependencies/json/ArduinoJson-v6.h"