thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-13 05:53:06 +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();
}

44
lib/config/GWConfig.h
View File

@@ -2,27 +2,37 @@
#define _GWCONFIG_H
#include <Arduino.h>
#include <Preferences.h>
#include "GwLog.h"
class ConfigItem{
class GwConfigInterface{
public:
virtual String asString() const=0;
virtual const char * asCString() const =0;
virtual bool asBoolean() const = 0;
};
class GwConfigItem: public GwConfigInterface{
private:
String name;
String initialValue;
String value;
public:
ConfigItem(const String &name, const String initialValue){
GwConfigItem(const String &name, const String initialValue){
this->name=name;
this->initialValue=initialValue;
this->value=initialValue;
}
ConfigItem(const String &name, bool initalValue):
ConfigItem(name,initalValue?String("true"):String("false")){};
String asString() const{
GwConfigItem(const String &name, bool initalValue):
GwConfigItem(name,initalValue?String("true"):String("false")){};
virtual String asString() const{
return value;
}
virtual const char * asCString() const{
return value.c_str();
};
virtual void fromString(const String v){
value=v;
};
bool asBoolean() const{
virtual bool asBoolean() const{
return strcasecmp(value.c_str(),"true") == 0;
}
String getName() const{
@@ -40,9 +50,10 @@ class ConfigItem{
};
class ConfigHandler{
class GwConfigHandler{
private:
Preferences prefs;
GwLog *logger;
public:
public:
const String sendUsb="sendUsb";
@@ -50,7 +61,7 @@ class ConfigHandler{
const String wifiClient="wifiClient";
const String wifiPass="wifiPass";
const String wifiSSID="wifiSSID";
ConfigHandler();
GwConfigHandler(GwLog *logger);
bool loadConfig();
bool saveConfig();
bool updateValue(const char *name, const char * value);
@@ -59,17 +70,18 @@ class ConfigHandler{
String toJson() const;
String getString(const String name);
bool getBool(const String name);
ConfigItem * findConfig(const String name, bool dummy=false);
GwConfigItem * findConfig(const String name, bool dummy=false);
GwConfigInterface * getConfigItem(const String name, bool dummy=false) const;
private:
ConfigItem* configs[5]={
new ConfigItem(sendUsb,true),
new ConfigItem (receiveUsb,false),
new ConfigItem (wifiClient,false),
new ConfigItem (wifiSSID,""),
new ConfigItem (wifiPass,"")
GwConfigItem* configs[5]={
new GwConfigItem(sendUsb,true),
new GwConfigItem (receiveUsb,false),
new GwConfigItem (wifiClient,false),
new GwConfigItem (wifiSSID,""),
new GwConfigItem (wifiPass,"")
};
int getNumConfig() const{
return sizeof(configs)/sizeof(ConfigItem*);
return sizeof(configs)/sizeof(GwConfigItem*);
}
};
#endif