jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-24 19:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use settings structs

Browse Source
This commit is contained in:
fvanroie 2021-02-16 17:26:50 +01:00
parent d04d3b4140
commit a19d82f06c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hasp_config.cpp
View File

@ -19,11 +19,18 @@
//#include "hasp_eeprom.h" //#include "hasp_eeprom.h"
#include "hasp/hasp.h" #include "hasp/hasp.h"
#include "hasp/hasp_dispatch.h"
#if HASP_USE_EEPROM > 0 #if HASP_USE_EEPROM > 0
#include "EEPROM.h" #include "EEPROM.h"
#endif #endif
extern uint16_t dispatchTelePeriod;
extern uint32_t dispatchLastMillis;
extern gui_conf_t gui_settings;
extern dispatch_conf_t dispatch_settings;
void confDebugSet(const __FlashStringHelper * fstr_name) void confDebugSet(const __FlashStringHelper * fstr_name)
{ {
/*char buffer[128]; /*char buffer[128];
@ -86,7 +93,7 @@ void configStartDebug(bool setupdebug, String & configFile)
#endif #endif
} }
void configGetConfig(JsonDocument & settings, bool setupdebug = false) void configRead(JsonDocument & settings, bool setupdebug = false)
{ {
String configFile((char *)0); String configFile((char *)0);
configFile.reserve(32); configFile.reserve(32);
@ -116,8 +123,8 @@ void configGetConfig(JsonDocument & settings, bool setupdebug = false)
// show settings in log // show settings in log
String output; String output;
serializeJson(settings, output); serializeJson(settings, output);
String passmask = F(D_PASSWORD_MASK); String passmask = F(D_PASSWORD_MASK);
const __FlashStringHelper * pass = F("pass"); const __FlashStringHelper * pass = F("pass");
output.replace(settings[FPSTR(FP_HTTP)][pass].as<String>(), passmask); output.replace(settings[FPSTR(FP_HTTP)][pass].as<String>(), passmask);
output.replace(settings[FPSTR(FP_MQTT)][pass].as<String>(), passmask); output.replace(settings[FPSTR(FP_MQTT)][pass].as<String>(), passmask);
output.replace(settings[FPSTR(FP_WIFI)][pass].as<String>(), passmask); output.replace(settings[FPSTR(FP_WIFI)][pass].as<String>(), passmask);
@ -177,7 +184,7 @@ void configBackupToEeprom()
#endif #endif
} }
*/ */
void configWriteConfig() void configWrite()
{ {
String configFile((char *)0); String configFile((char *)0);
configFile.reserve(32); configFile.reserve(32);
@ -190,7 +197,7 @@ void configWriteConfig()
/* Read Config File */ /* Read Config File */
DynamicJsonDocument doc(8 * 256); DynamicJsonDocument doc(8 * 256);
LOG_TRACE(TAG_CONF, F(D_FILE_LOADING), configFile.c_str()); LOG_TRACE(TAG_CONF, F(D_FILE_LOADING), configFile.c_str());
configGetConfig(doc, false); configRead(doc, false);
LOG_INFO(TAG_CONF, F(D_FILE_LOADED), configFile.c_str()); LOG_INFO(TAG_CONF, F(D_FILE_LOADED), configFile.c_str());
// Make sure we have a valid JsonObject to start from // Make sure we have a valid JsonObject to start from
@ -367,7 +374,7 @@ void configSetup()
return; return;
} }
#endif #endif
configGetConfig(settings, true); configRead(settings, true);
} }
//#if HASP_USE_SPIFFS > 0 //#if HASP_USE_SPIFFS > 0