thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-14 22:43:07 +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

19
src/main.cpp
View File

@@ -460,7 +460,7 @@ class SetConfigRequest : public GwRequestMessage
public:
SetConfigRequest() : GwRequestMessage(F("application/json"),F("setConfig")){};
StringMap args;
virtual int getTimeout(){return 4000;}
protected:
virtual void processRequest()
{
@@ -475,6 +475,10 @@ protected:
result=JSON_INVALID_PASS;
return;
}
logger.logDebug(GwLog::DEBUG,"Heap free=%ld, minFree=%ld",
(long)xPortGetFreeHeapSize(),
(long)xPortGetMinimumEverFreeHeapSize()
);
for (StringMap::iterator it = args.begin(); it != args.end(); it++)
{
if (it->first.indexOf("_")>= 0) continue;
@@ -489,12 +493,19 @@ protected:
error += it->second;
error += ",";
}
logger.flush();
}
if (ok)
{
result = JSON_OK;
logger.logDebug(GwLog::ERROR,"update config and restart");
config.saveConfig();
logger.flush();
logger.logDebug(GwLog::DEBUG,"Heap free=%ld, minFree=%ld",
(long)xPortGetFreeHeapSize(),
(long)xPortGetMinimumEverFreeHeapSize()
);
logger.flush();
delayedRestart();
}
else
@@ -632,13 +643,11 @@ void setup() {
webserver.registerMainHandler("/api/setConfig",
[](AsyncWebServerRequest *request)->GwRequestMessage *
{
StringMap args;
SetConfigRequest *msg = new SetConfigRequest();
for (int i = 0; i < request->args(); i++)
{
args[request->argName(i)] = request->arg(i);
msg->args[request->argName(i)] = request->arg(i);
}
SetConfigRequest *msg = new SetConfigRequest();
msg->args = args;
return msg;
});
webserver.registerMainHandler("/api/resetConfig", [](AsyncWebServerRequest *request)->GwRequestMessage *