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

Merge pull request #387 from lassebm/lg-e360-fixes

Browse Source 
Landis+Gyr E360 fixes
This commit is contained in:
Gunnar Skjold
2022-12-19 16:45:52 +01:00
committed by GitHub
parent c40e20c8e9 5b4f680114
commit 8f057e687c
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/AmsData.h
View File

@@ -10,7 +10,7 @@ enum AmsType {
AmsTypeKaifa = 0x02,
AmsTypeKamstrup = 0x03,
AmsTypeIskra = 0x08,
AmsTypeLandis = 0x09,
AmsTypeLandisGyr = 0x09,
AmsTypeSagemcom = 0x0A,
AmsTypeLng = 0x0B,
AmsTypeCustom = 0x88,

8
src/IEC6205621.cpp
View File

@@ -28,11 +28,14 @@ IEC6205621::IEC6205621(const char* p) {
meterType = AmsTypeIskra;
listId = listId.substring(0,5);
} else if(listId.startsWith("XMX")) {
meterType = AmsTypeLandis;
meterType = AmsTypeLandisGyr;
listId = listId.substring(0,6);
} else if(listId.startsWith("Ene") || listId.startsWith("EST")) {
meterType = AmsTypeSagemcom;
listId = listId.substring(0,4);
} else if(listId.startsWith("LGF")) {
meterType = AmsTypeLandisGyr;
listId = listId.substring(0,4);
} else {
meterType = AmsTypeUnknown;
listId = listId.substring(0,4);
@@ -136,6 +139,9 @@ IEC6205621::IEC6205621(const char* p) {
l2current = (((activeImportPower - activeExportPower) * sqrt(3)) - (l1voltage * l1current) - (l3voltage * l3current)) / l2voltage;
}
}
if (l1activeImportPower > 0 || l2activeImportPower > 0 || l3activeImportPower > 0 || l1activeExportPower > 0 || l2activeExportPower > 0 || l3activeExportPower > 0)
listType = 4;
}
String IEC6205621::extract(String payload, String obis) {

2
src/web/AmsWebServer.cpp
View File

@@ -329,7 +329,7 @@ void AmsWebServer::configMeterHtml() {
case AmsTypeIskra:
manufacturer = F("Iskra");
break;
case AmsTypeLandis:
case AmsTypeLandisGyr:
manufacturer = F("Landis+Gyr");
break;
case AmsTypeSagemcom:

2
web/application.js
View File

@@ -854,7 +854,7 @@ var fetch = function() {
$('.jmt').html("Iskra");
break;
case 9:
$('.jmt').html("Landis");
$('.jmt').html("Landis+Gyr");
break;
case 10:
$('.jmt').html("Sagemcom");