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

optimize memory usage for config data, allow 4s timeout for setConfig

Browse Source
This commit is contained in:
andreas
2022-03-11 14:50:48 +01:00
parent 6741222574
commit 4557e6c0bb
6 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/config/GWConfig.cpp
View File

@@ -66,13 +66,10 @@ bool GwConfigHandler::loadConfig(){
bool GwConfigHandler::saveConfig(){
prefs.begin(PREF_NAME,false);
for (int i=0;i<getNumConfig();i++){
String val=configs[i]->asString();
auto it=changedValues.find(configs[i]->getName());
if (it != changedValues.end()){
val=it->second;
if (configs[i]->hasChangedValue){
LOG_DEBUG(GwLog::LOG,"saving %s=%s",configs[i]->getName().c_str(),configs[i]->changedValue.c_str());
prefs.putString(configs[i]->getName().c_str(),configs[i]->changedValue);
}
LOG_DEBUG(GwLog::LOG,"saving %s=%s",configs[i]->getName().c_str(),val.c_str());
prefs.putString(configs[i]->getName().c_str(),val);
}
prefs.end();
LOG_DEBUG(GwLog::LOG,"saved config");
@@ -87,14 +84,14 @@ bool GwConfigHandler::updateValue(String name, String value){
}
else{
LOG_DEBUG(GwLog::LOG,"update config %s=>%s",name.c_str(),i->isSecret()?"***":value.c_str());
changedValues[name]=value;
i->updateValue(value);
}
return true;
}
bool GwConfigHandler::reset(bool save){
LOG_DEBUG(GwLog::LOG,"reset config");
for (int i=0;i<getNumConfig();i++){
changedValues[configs[i]->getName()]=configs[i]->getDefault();
configs[i]->updateValue(configs[i]->getDefault(),true);
}
if (!save) return true;
return saveConfig();

1
lib/config/GWConfig.h
View File

@@ -13,7 +13,6 @@ class GwConfigHandler: public GwConfigDefinitions{
Preferences prefs;
GwLog *logger;
typedef std::map<String,String> StringMap;
StringMap changedValues;
boolean allowChanges=true;
public:
public:

21
lib/config/GwConfigItem.h
View File

@@ -7,11 +7,28 @@ class GwConfigHandler;
class GwConfigInterface{
private:
String name;
String initialValue;
const char * initialValue;
String value;
bool secret=false;
String changedValue;
bool hasChangedValue=false;
void updateValue(String value,bool cmpDefault=false){
hasChangedValue=false;
if (cmpDefault){
if (value != initialValue) {
changedValue=value;
hasChangedValue=true;
}
}
else{
if (value != this->value) {
changedValue=value;
hasChangedValue=true;
}
}
}
public:
GwConfigInterface(const String &name, const String initialValue, bool secret=false){
GwConfigInterface(const String &name, const char * initialValue, bool secret=false){
this->name=name;
this->initialValue=initialValue;
this->value=initialValue;

1
lib/queue/GwMessage.h
View File

@@ -56,6 +56,7 @@ class GwRequestMessage : public GwMessage{
String getContentType(){
return contentType;
}
virtual int getTimeout(){return 500;}
};

2
lib/webserver/GwWebServer.cpp
View File

@@ -68,7 +68,7 @@ GwWebServer::~GwWebServer(){
}
void GwWebServer::handleAsyncWebRequest(AsyncWebServerRequest *request, GwRequestMessage *msg)
{
GwRequestQueue::MessageSendStatus st=queue->sendAndWait(msg,500);
GwRequestQueue::MessageSendStatus st=queue->sendAndWait(msg,msg->getTimeout());
if (st == GwRequestQueue::MSG_ERR)
{
msg->unref(); //our