github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-07 17:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-v2.1.0

Browse Source
This commit is contained in:
Gunnar Skjold
2022-02-20 11:15:49 +01:00
parent 0af2378d05 7e41168606
commit 113b8bf820
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/web/AmsWebServer.cpp
View File

@@ -1283,11 +1283,13 @@ void AmsWebServer::handleSave() {
if(server.hasArg("debugConfig") && server.arg("debugConfig") == "true") {
printD("Received Debug config");
DebugConfig debug;
config->getDebugConfig(debug);
bool active = debug.serial || debug.telnet;
debug.telnet = server.hasArg("debugTelnet") && server.arg("debugTelnet") == "true";
debug.serial = server.hasArg("debugSerial") && server.arg("debugSerial") == "true";
debug.level = server.arg("debugLevel").toInt();
debugger->stop();
if(debug.telnet || debug.serial) {
if(webConfig.security > 0) {
debugger->setPassword(webConfig.password);
@@ -1302,8 +1304,8 @@ void AmsWebServer::handleSave() {
debugger->stop();
}
}
} else {
debugger->stop();
} else if(active) {
performRestart = true;
}
config->setDebugConfig(debug);
}
@@ -1350,7 +1352,7 @@ void AmsWebServer::handleSave() {
//if (debugger->isActive(RemoteDebug::DEBUG)) config->print(debugger);
if (config->save()) {
printI("Successfully saved.");
if(config->isWifiChanged()) {
if(config->isWifiChanged() || performRestart) {
performRestart = true;
server.sendHeader("Location","/restart-wait");
server.send(303);