github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-30 21:51:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes during testing

Browse Source
This commit is contained in:
Gunnar Skjold
2020-03-30 21:14:58 +02:00
parent 8457db50f6
commit e96b5bbf1b
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/AmsToMqttBridge.ino
View File

@@ -61,7 +61,6 @@ void setup() {
if(config.hasConfig()) {
config.load();
}
#if DEBUG_MODE
#if HW_ROARFRED
if(config.getMeterType() == 3) {
Serial.begin(2400, SERIAL_8N1);
@@ -70,15 +69,14 @@ void setup() {
}
#else
Serial.begin(115200);
#endif
#endif
if(config.hasConfig()) {
Debug.begin(config.getWifiHostname(), (uint8_t) config.getDebugLevel());
if(config.getAuthSecurity() > 0) {
Debug.setPassword(config.getAuthPassword());
}
Debug.setSerialEnabled(config.isDebugSerial());
Debug.begin(config.getWifiHostname(), (uint8_t) config.getDebugLevel());
if(!config.isDebugTelnet()) {
Debug.stop();
}
@@ -96,7 +94,7 @@ void setup() {
debugI("Voltage: %.2fV", vcc);
}
if (vcc > 0 && vcc < 3.1) {
if (vcc > 0 && vcc < 3.25) {
if(Debug.isActive(RemoteDebug::INFO)) {
debugI("Votltage is too low, sleeping");
Serial.flush();

10
src/web/AmsWebServer.cpp
View File

@@ -248,6 +248,9 @@ void AmsWebServer::configMqttHtml() {
html.replace("${config.mqttUser}", config->getMqttUser());
html.replace("${config.mqttPassword}", config->getMqttPassword());
html.replace("${config.mqttPayloadFormat}", String(config->getMqttPayloadFormat()));
for(int i = 0; i<2; i++) {
html.replace("${config.mqttPayloadFormat" + String(i) + "}", config->getMqttPayloadFormat() == i ? "selected" : "");
}
server.setContentLength(html.length());
server.send(200, "text/html", html);
@@ -496,7 +499,9 @@ void AmsWebServer::handleSave() {
if(config->getAuthSecurity() > 0) {
config->setAuthUser(server.arg("authUser"));
config->setAuthPassword(server.arg("authPassword"));
debugger->setPassword(config->getAuthPassword());
} else {
debugger->setPassword("");
config->clearAuth();
}
}
@@ -505,12 +510,15 @@ void AmsWebServer::handleSave() {
config->setDebugTelnet(server.hasArg("debugTelnet") && server.arg("debugTelnet") == "true");
config->setDebugSerial(server.hasArg("debugSerial") && server.arg("debugSerial") == "true");
config->setDebugLevel(server.arg("debugLevel").toInt());
debugger->stop();
debugger->begin(config->getWifiHostname(), (uint8_t) config->getDebugLevel());
if(config->getAuthSecurity() > 0) {
debugger->setPassword(config->getAuthPassword());
} else {
debugger->setPassword("");
}
debugger->setSerialEnabled(config->isDebugSerial());
debugger->begin(config->getWifiHostname(), (uint8_t) config->getDebugLevel());
if(!config->isDebugTelnet()) {
debugger->stop();
}