diff --git a/src/hasp.cpp b/src/hasp.cpp index bf047dda..36a6cda8 100644 --- a/src/hasp.cpp +++ b/src/hasp.cpp @@ -930,7 +930,7 @@ bool haspGetConfig(const JsonObject & settings) if(haspThemeId != settings[FPSTR(F_CONFIG_THEME)].as()) changed = true; settings[FPSTR(F_CONFIG_THEME)] = haspThemeId; - if(haspThemeHue != settings[FPSTR(F_CONFIG_HUE)].as()) changed = true; + if(haspThemeHue != settings[FPSTR(F_CONFIG_HUE)].as()) changed = true; settings[FPSTR(F_CONFIG_HUE)] = haspThemeHue; if(strcmp(haspZiFontPath, settings[FPSTR(F_CONFIG_ZIFONT)].as().c_str()) != 0) changed = true; diff --git a/src/hasp_config.cpp b/src/hasp_config.cpp index 92f8eb53..97fb0047 100644 --- a/src/hasp_config.cpp +++ b/src/hasp_config.cpp @@ -163,7 +163,7 @@ void configWriteConfig() configFile = String(FPSTR(HASP_CONFIG_FILE)); /* Read Config File */ - DynamicJsonDocument settings(6 * 256); + DynamicJsonDocument settings(8 * 256); Log.notice(F("CONF: Config LOADING first %s"), configFile.c_str()); configGetConfig(settings, false); Log.trace(F("CONF: Config LOADED first %s"), configFile.c_str()); @@ -172,13 +172,13 @@ void configWriteConfig() bool changed = false; #if HASP_USE_WIFI - changed = wifiGetConfig(settings[F("wifi")].to()); + changed = wifiGetConfig(settings[F("wifi")].as()); if(changed) { Log.verbose(F("WIFI: Settings changed")); writefile = true; } #if HASP_USE_MQTT - changed = mqttGetConfig(settings[F("mqtt")].to()); + changed = mqttGetConfig(settings[F("mqtt")].as()); if(changed) { Log.verbose(F("MQTT: Settings changed")); configOutput(settings[F("mqtt")]); @@ -186,7 +186,7 @@ void configWriteConfig() } #endif #if HASP_USE_TELNET - changed = telnetGetConfig(settings[F("telnet")].to()); + changed = telnetGetConfig(settings[F("telnet")].as()); if(changed) { Log.verbose(F("TELNET: Settings changed")); configOutput(settings[F("telnet")]); @@ -194,14 +194,14 @@ void configWriteConfig() } #endif #if HASP_USE_MDNS - changed = mdnsGetConfig(settings[F("mdns")].to()); + changed = mdnsGetConfig(settings[F("mdns")].as()); if(changed) { Log.verbose(F("MDNS: Settings changed")); writefile = true; } #endif #if HASP_USE_HTTP - changed = httpGetConfig(settings[F("http")].to()); + changed = httpGetConfig(settings[F("http")].as()); if(changed) { Log.verbose(F("HTTP: Settings changed")); configOutput(settings[F("http")]); @@ -210,19 +210,19 @@ void configWriteConfig() #endif #endif - changed = debugGetConfig(settings[F("debug")].to()); + changed = debugGetConfig(settings[F("debug")].as()); if(changed) { Log.verbose(F("DEBUG: Settings changed")); writefile = true; } - changed = guiGetConfig(settings[F("gui")].to()); + changed = guiGetConfig(settings[F("gui")].as()); if(changed) { Log.verbose(F("GUI: Settings changed")); writefile = true; } - changed = haspGetConfig(settings[F("hasp")].to()); + changed = haspGetConfig(settings[F("hasp")].as()); if(changed) { Log.verbose(F("HASP: Settings changed")); writefile = true; @@ -238,7 +238,7 @@ void configWriteConfig() file.close(); if(size > 0) { Log.verbose(F("CONF: [SUCCESS] Saved %s"), configFile.c_str()); - // configBackupToEeprom(); + configBackupToEeprom(); return; } } diff --git a/src/hasp_gui.cpp b/src/hasp_gui.cpp index 4435595d..3d36d963 100644 --- a/src/hasp_gui.cpp +++ b/src/hasp_gui.cpp @@ -822,7 +822,7 @@ bool guiGetConfig(const JsonObject & settings) if(guiSleepTime2 != settings[FPSTR(F_GUI_IDLEPERIOD2)].as()) changed = true; settings[FPSTR(F_GUI_IDLEPERIOD2)] = guiSleepTime2; - if(guiBacklightPin != settings[FPSTR(F_GUI_BACKLIGHTPIN)].as()) changed = true; + if(guiBacklightPin != settings[FPSTR(F_GUI_BACKLIGHTPIN)].as()) changed = true; settings[FPSTR(F_GUI_BACKLIGHTPIN)] = guiBacklightPin; if(guiRotation != settings[FPSTR(F_GUI_ROTATION)].as()) changed = true;