thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-16 07:23:07 +01:00
Code Releases Activity

intermediate: restructure wifi,log

Browse Source
This commit is contained in:
andreas
2021-10-17 15:41:35 +02:00
parent ec67767ca6
commit 0fe10aeef8
8 changed files with 185 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/config/GWConfig.cpp
View File

@@ -7,9 +7,9 @@ bool isTrue(const char * value){
return (strcasecmp(value,"true") == 0);
}
class DummyConfig : public ConfigItem{
class DummyConfig : public GwConfigItem{
public:
DummyConfig():ConfigItem("dummy",""){}
DummyConfig():GwConfigItem("dummy",""){}
virtual void fromString(const String v){
};
virtual void reset(){
@@ -17,7 +17,7 @@ class DummyConfig : public ConfigItem{
};
DummyConfig dummyConfig;
String ConfigHandler::toString() const{
String GwConfigHandler::toString() const{
String rt;
rt+="Config: ";
for (int i=0;i<getNumConfig();i++){
@@ -29,7 +29,7 @@ String ConfigHandler::toString() const{
return rt;
}
String ConfigHandler::toJson() const{
String GwConfigHandler::toJson() const{
String rt;
DynamicJsonDocument jdoc(50);
for (int i=0;i<getNumConfig();i++){
@@ -38,19 +38,26 @@ String ConfigHandler::toJson() const{
serializeJson(jdoc,rt);
return rt;
}
ConfigItem * ConfigHandler::findConfig(const String name, bool dummy){
GwConfigItem * GwConfigHandler::findConfig(const String name, bool dummy){
for (int i=0;i<getNumConfig();i++){
if (configs[i]->getName() == name) return configs[i];
}
if (!dummy) return NULL;
return &dummyConfig;
}
#define PREF_NAME "gwprefs"
ConfigHandler::ConfigHandler(){
GwConfigInterface * GwConfigHandler::getConfigItem(const String name, bool dummy) const{
for (int i=0;i<getNumConfig();i++){
if (configs[i]->getName() == name) return configs[i];
}
if (!dummy) return NULL;
return &dummyConfig;
}
bool ConfigHandler::loadConfig(){
#define PREF_NAME "gwprefs"
GwConfigHandler::GwConfigHandler(GwLog *logger){
this->logger=logger;
}
bool GwConfigHandler::loadConfig(){
logger->logString("config load");
prefs.begin(PREF_NAME,true);
for (int i=0;i<getNumConfig();i++){
String v=prefs.getString(configs[i]->getName().c_str(),configs[i]->getDefault());
@@ -58,31 +65,36 @@ bool ConfigHandler::loadConfig(){
prefs.end();
return true;
}
bool ConfigHandler::saveConfig(){
bool GwConfigHandler::saveConfig(){
prefs.begin(PREF_NAME,false);
for (int i=0;i<getNumConfig();i++){
prefs.putString(configs[i]->getName().c_str(),configs[i]->asString());
}
prefs.end();
logger->logString("saved config");
return true;
}
bool ConfigHandler::updateValue(const char *name, const char * value){
return false;
bool GwConfigHandler::updateValue(const char *name, const char * value){
GwConfigItem *i=findConfig(name);
if (i == NULL) return false;
logger->logString("update config %s=>%s",name,value);
i->fromString(value);
}
bool ConfigHandler::reset(bool save){
bool GwConfigHandler::reset(bool save){
logger->logString("reset config");
for (int i=0;i<getNumConfig();i++){
configs[i]->reset();
}
if (!save) return true;
return saveConfig();
}
String ConfigHandler::getString(const String name){
ConfigItem *i=findConfig(name);
String GwConfigHandler::getString(const String name){
GwConfigItem *i=findConfig(name);
if (!i) return String();
return i->asString();
}
bool ConfigHandler::getBool(const String name){
ConfigItem *i=findConfig(name);
bool GwConfigHandler::getBool(const String name){
GwConfigItem *i=findConfig(name);
if (!i) return false;
return i->asBoolean();
}