github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-28 13:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for IEC62056-21

Browse Source
This commit is contained in:
Gunnar Skjold
2021-11-16 20:07:47 +01:00
parent f192ddae81
commit 24025d6785
16 changed files with 794 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/web/AmsWebServer.cpp
View File

@@ -399,9 +399,21 @@ void AmsWebServer::configMeterHtml() {
case AmsTypeAidon:
manufacturer = "Aidon";
break;
case AmsTypeKaifa:
manufacturer = "Kaifa";
break;
case AmsTypeKamstrup:
manufacturer = "Kamstrup";
break;
case AmsTypeIskra:
manufacturer = "Iskra";
break;
case AmsTypeLandis:
manufacturer = "Landis + Gyro";
break;
case AmsTypeSagemcom:
manufacturer = "Sagemcom";
break;
default:
manufacturer = "Unknown";
break;
@@ -412,9 +424,12 @@ void AmsWebServer::configMeterHtml() {
html.replace("{mid}", meterState->getMeterId());
html.replace("{b}", String(meterConfig->baud));
html.replace("{b2400}", meterConfig->baud == 2400 ? "selected" : "");
html.replace("{b9600}", meterConfig->baud == 9600 ? "selected" : "");
html.replace("{b115200}", meterConfig->baud == 115200 ? "selected" : "");
html.replace("{c}", String(meterConfig->baud));
html.replace("{c2}", meterConfig->parity == 2 ? "selected" : "");
html.replace("{c3}", meterConfig->parity == 3 ? "selected" : "");
html.replace("{c10}", meterConfig->parity == 10 ? "selected" : "");
html.replace("{c11}", meterConfig->parity == 11 ? "selected" : "");
html.replace("{i}", meterConfig->invert ? "checked" : "");
html.replace("{d}", String(meterConfig->distributionSystem));
@@ -715,7 +730,7 @@ void AmsWebServer::dataJson() {
mqttStatus = 3;
}
char json[290];
char json[300];
snprintf_P(json, sizeof(json), DATA_JSON,
maxPwr == 0 ? meterState->isThreePhase() ? 20000 : 10000 : maxPwr,
meterConfig->productionCapacity,