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

JSON settings is fixed

Browse Source
This commit is contained in:
Paul
2019-09-16 21:56:38 +02:00
parent ec281f74ed
commit 53b68944fb
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ems-esp.cpp
View File

@@ -1188,9 +1188,15 @@ void runUnitTest(uint8_t test_num) {
} }
// callback for loading/saving settings to the file system (SPIFFS) // callback for loading/saving settings to the file system (SPIFFS)
bool LoadSaveCallback(MYESP_FSACTION action, JsonObject json) { bool LoadSaveCallback(MYESP_FSACTION action, JsonObject settings) {
if (action == MYESP_FSACTION_LOAD) { if (action == MYESP_FSACTION_LOAD) {
const JsonObject & settings = json["settings"]; // check for valid json
if (settings.isNull()) {
myDebug_P(PSTR("Error processing json settings"));
return false;
}
// serializeJsonPretty(settings, Serial); // for debugging
EMSESP_Settings.led = settings["led"]; EMSESP_Settings.led = settings["led"];
EMSESP_Settings.led_gpio = settings["led_gpio"] | EMSESP_LED_GPIO; EMSESP_Settings.led_gpio = settings["led_gpio"] | EMSESP_LED_GPIO;
@@ -1210,8 +1216,6 @@ bool LoadSaveCallback(MYESP_FSACTION action, JsonObject json) {
} }
if (action == MYESP_FSACTION_SAVE) { if (action == MYESP_FSACTION_SAVE) {
JsonObject settings = json.createNestedObject("settings");
settings["led"] = EMSESP_Settings.led; settings["led"] = EMSESP_Settings.led;
settings["led_gpio"] = EMSESP_Settings.led_gpio; settings["led_gpio"] = EMSESP_Settings.led_gpio;
settings["dallas_gpio"] = EMSESP_Settings.dallas_gpio; settings["dallas_gpio"] = EMSESP_Settings.dallas_gpio;
@@ -1755,7 +1759,6 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
void WIFICallback() { void WIFICallback() {
// This is where we enable the UART service to scan the incoming serial Tx/Rx bus signals // This is where we enable the UART service to scan the incoming serial Tx/Rx bus signals
// This is done after we have a WiFi signal to avoid any resource conflicts // This is done after we have a WiFi signal to avoid any resource conflicts
// TODO see if EMS bus is blocked during startup and whether we still need to delay the UART with the swap below?
// system_uart_swap(); // system_uart_swap();
} }
@@ -2080,7 +2083,6 @@ void setup() {
EMSESP_Settings.dallas_sensors = ds18.setup(EMSESP_Settings.dallas_gpio, EMSESP_Settings.dallas_parasite); // returns #sensors EMSESP_Settings.dallas_sensors = ds18.setup(EMSESP_Settings.dallas_gpio, EMSESP_Settings.dallas_parasite); // returns #sensors
systemCheckTimer.attach(SYSTEMCHECK_TIME, do_systemCheck); // check if EMS is reachable systemCheckTimer.attach(SYSTEMCHECK_TIME, do_systemCheck); // check if EMS is reachable
} }
// //