Merge branch 'master' into dev-v2.1.0

This commit is contained in:
Gunnar Skjold
2022-02-19 10:33:17 +01:00
2 changed files with 20 additions and 13 deletions

View File

@@ -1288,18 +1288,22 @@ void AmsWebServer::handleSave() {
debug.level = server.arg("debugLevel").toInt();
debugger->stop();
if(webConfig.security > 0) {
debugger->setPassword(webConfig.password);
} else {
debugger->setPassword("");
}
debugger->setSerialEnabled(debug.serial);
WiFiConfig wifi;
if(config->getWiFiConfig(wifi) && strlen(wifi.hostname) > 0) {
debugger->begin(wifi.hostname, (uint8_t) debug.level);
if(!debug.telnet) {
debugger->stop();
if(debug.telnet || debug.serial) {
if(webConfig.security > 0) {
debugger->setPassword(webConfig.password);
} else {
debugger->setPassword("");
}
debugger->setSerialEnabled(debug.serial);
WiFiConfig wifi;
if(config->getWiFiConfig(wifi) && strlen(wifi.hostname) > 0) {
debugger->begin(wifi.hostname, (uint8_t) debug.level);
if(!debug.telnet) {
debugger->stop();
}
}
} else {
debugger->stop();
}
config->setDebugConfig(debug);
}