jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 21:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve output for size and clarity

Browse Source
This commit is contained in:
fvanroie 2020-02-02 13:27:26 +01:00
parent c2faed28af
commit 7e29d09186
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/hasp_config.cpp
View File

@ -34,9 +34,20 @@ void configLoop()
} }
} }
void configStartDebug(bool setupdebug, String & configFile)
{
if(setupdebug) {
debugSetup(); // Debug started, now we can use it; HASP header sent
debugPrintln(F("FILE: [SUCCESS] SPI flash FS mounted"));
spiffsList();
}
debugPrintln(String(F("CONF: Loading ")) + configFile);
}
void configGetConfig(JsonDocument & settings, bool setupdebug = false) void configGetConfig(JsonDocument & settings, bool setupdebug = false)
{ {
File file = SPIFFS.open(FPSTR(HASP_CONFIG_FILE), "r"); String configFile = String(FPSTR(HASP_CONFIG_FILE));
File file = SPIFFS.open(configFile, "r");
if(file) { if(file) {
size_t size = file.size(); size_t size = file.size();
@ -49,40 +60,35 @@ void configGetConfig(JsonDocument & settings, bool setupdebug = false)
if(!error) { if(!error) {
file.close(); file.close();
if(setupdebug) { configStartDebug(setupdebug, configFile);
debugSetup(); // Debug started, now we can use it; HASP header sent
debugPrintln(F("FILE: [SUCCESS] SPI flash FS mounted"));
spiffsList();
}
debugPrintln(String(F("CONF: Loading ")) + String(FPSTR(HASP_CONFIG_FILE)));
// show settings in log // show settings in log
String output; String output;
serializeJson(settings, output); serializeJson(settings, output);
String passmask = F("********");
output.replace(settings[F("http")][F("pass")].as<String>(), passmask);
output.replace(settings[F("mqtt")][F("pass")].as<String>(), passmask);
output.replace(settings[F("wifi")][F("pass")].as<String>(), passmask);
debugPrintln(String(F("CONF: ")) + output); debugPrintln(String(F("CONF: ")) + output);
debugPrintln(String(F("CONF: [SUCCESS] Loaded ")) + String(FPSTR(HASP_CONFIG_FILE))); debugPrintln(String(F("CONF: [SUCCESS] Loaded ")) + configFile);
return; return;
} }
} }
if(setupdebug) { configStartDebug(setupdebug, configFile);
// setup debugging defaults errorPrintln(String(F("CONF: %sFailed to load ")) + configFile);
debugSetup(); // Debug started, now we can use it; HASP header sent
debugPrintln(F("FILE: [SUCCESS] SPI flash FS mounted"));
spiffsList();
}
debugPrintln(String(F("CONF: Loading ")) + String(FPSTR(HASP_CONFIG_FILE)));
errorPrintln(String(F("CONF: %sFailed to load ")) + String(FPSTR(HASP_CONFIG_FILE)));
} }
void configWriteConfig() void configWriteConfig()
{ {
String configFile = String(FPSTR(HASP_CONFIG_FILE));
/* Read Config File */ /* Read Config File */
DynamicJsonDocument settings(2 * 1024); DynamicJsonDocument settings(2 * 1024);
debugPrintln(String(F("CONF: Config LOADING first ")) + String(FPSTR(HASP_CONFIG_FILE))); debugPrintln(String(F("CONF: Config LOADING first ")) + configFile);
configGetConfig(settings, false); configGetConfig(settings, false);
debugPrintln(String(F("CONF: Config LOADED first ")) + String(FPSTR(HASP_CONFIG_FILE))); debugPrintln(String(F("CONF: Config LOADED first ")) + configFile);
bool changed = true; bool changed = true;
// changed |= debugGetConfig(settings[F("debug")].to<JsonObject>()); // changed |= debugGetConfig(settings[F("debug")].to<JsonObject>());
@ -96,18 +102,18 @@ void configWriteConfig()
changed |= wifiGetConfig(settings[F("wifi")].to<JsonObject>()); changed |= wifiGetConfig(settings[F("wifi")].to<JsonObject>());
if(changed) { if(changed) {
File file = SPIFFS.open(FPSTR(HASP_CONFIG_FILE), "w"); File file = SPIFFS.open(configFile, "w");
if(file) { if(file) {
debugPrintln(F("CONF: Writing /config.json")); debugPrintln(String(F("CONF: Writing ")) + configFile);
size_t size = serializeJson(settings, file); size_t size = serializeJson(settings, file);
file.close(); file.close();
if(size > 0) { if(size > 0) {
debugPrintln(F("CONF: [SUCCESS] /config.json saved")); debugPrintln(String(F("CONF: [SUCCESS] Saved ")) + configFile);
return; return;
} }
} }
errorPrintln(F("CONF: %sFailed to write /config.json")); errorPrintln(String(F("CONF: %sFailed to write ")) + configFile);
} else { } else {
debugPrintln(F("CONF: Configuration was not changed")); debugPrintln(F("CONF: Configuration was not changed"));
} }