github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-27 20:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Human readable parity in config file

Browse Source
This commit is contained in:
Gunnar Skjold
2022-02-05 21:52:13 +01:00
parent 4cfd274e52
commit b742c8f3c6
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/web/AmsWebServer.cpp
View File

@@ -2150,7 +2150,22 @@ void AmsWebServer::configFileDownload() {
if(includeMeter) { if(includeMeter) {
server.sendContent(buf, snprintf(buf, sizeof(buf), "meterBaud %d\n", meter.baud)); server.sendContent(buf, snprintf(buf, sizeof(buf), "meterBaud %d\n", meter.baud));
server.sendContent(buf, snprintf(buf, sizeof(buf), "meterParity %d\n", meter.parity)); char parity[4] = "";
switch(meter.parity) {
case 2:
strcpy(parity, "7N1");
break;
case 3:
strcpy(parity, "8N1");
break;
case 10:
strcpy(parity, "7E1");
break;
case 11:
strcpy(parity, "8E1");
break;
}
if(strlen(parity) > 0) server.sendContent(buf, snprintf(buf, sizeof(buf), "meterParity %d\n", parity));
server.sendContent(buf, snprintf(buf, sizeof(buf), "meterInvert %d\n", meter.invert ? 1 : 0)); server.sendContent(buf, snprintf(buf, sizeof(buf), "meterInvert %d\n", meter.invert ? 1 : 0));
server.sendContent(buf, snprintf(buf, sizeof(buf), "meterDistributionSystem %d\n", meter.distributionSystem)); server.sendContent(buf, snprintf(buf, sizeof(buf), "meterDistributionSystem %d\n", meter.distributionSystem));
server.sendContent(buf, snprintf(buf, sizeof(buf), "meterMainFuse %d\n", meter.mainFuse)); server.sendContent(buf, snprintf(buf, sizeof(buf), "meterMainFuse %d\n", meter.mainFuse));
@@ -2402,7 +2417,10 @@ void AmsWebServer::configFileParse() {
} else if(strncmp(buf, "meterBaud ", 10) == 0) { } else if(strncmp(buf, "meterBaud ", 10) == 0) {
meter.baud = String(buf+10).toInt(); meter.baud = String(buf+10).toInt();
} else if(strncmp(buf, "meterParity ", 12) == 0) { } else if(strncmp(buf, "meterParity ", 12) == 0) {
meter.parity = String(buf+12).toInt(); if(strncmp(buf+12, "7N1", 3) == 0) meter.parity = 2;
if(strncmp(buf+12, "8N1", 3) == 0) meter.parity = 3;
if(strncmp(buf+12, "7E1", 3) == 0) meter.parity = 10;
if(strncmp(buf+12, "8E1", 3) == 0) meter.parity = 11;
} else if(strncmp(buf, "meterInvert ", 12) == 0) { } else if(strncmp(buf, "meterInvert ", 12) == 0) {
meter.invert = String(buf+12).toInt() == 1;; meter.invert = String(buf+12).toInt() == 1;;
} else if(strncmp(buf, "meterDistributionSystem ", 24) == 0) { } else if(strncmp(buf, "meterDistributionSystem ", 24) == 0) {