github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-24 19:40:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Failsafe on combining tariff counters

Browse Source
This commit is contained in:
Gunnar Skjold
2025-01-12 10:16:19 +01:00
parent 0cadedf9df
commit 84860bc684
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/MeterCommunicators/src/IEC6205675.cpp
View File

@@ -391,7 +391,8 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
data = getCosemDataAt(idx++, ((char *) (d))); data = getCosemDataAt(idx++, ((char *) (d)));
double obis182 = ntohl(data->dlu.data) / 1000.0; double obis182 = ntohl(data->dlu.data) / 1000.0;
activeImportCounter = obis181 + obis182; if(activeImportCounter < obis181 + obis182)
activeImportCounter = obis181 + obis182;
// 2.8.1 // 2.8.1
data = getCosemDataAt(idx++, ((char *) (d))); data = getCosemDataAt(idx++, ((char *) (d)));
@@ -401,7 +402,8 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
data = getCosemDataAt(idx++, ((char *) (d))); data = getCosemDataAt(idx++, ((char *) (d)));
double obis282 = ntohl(data->dlu.data) / 1000.0; double obis282 = ntohl(data->dlu.data) / 1000.0;
activeExportCounter = obis281 + obis282; if(activeExportCounter < obis281 + obis282)
activeExportCounter = obis281 + obis282;
// 3.8.1 // 3.8.1
data = getCosemDataAt(idx++, ((char *) (d))); data = getCosemDataAt(idx++, ((char *) (d)));
@@ -411,7 +413,8 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
data = getCosemDataAt(idx++, ((char *) (d))); data = getCosemDataAt(idx++, ((char *) (d)));
double obis382 = ntohl(data->dlu.data) / 1000.0; double obis382 = ntohl(data->dlu.data) / 1000.0;
reactiveImportCounter = obis381 + obis382; if(reactiveImportCounter < obis381 + obis382)
reactiveImportCounter = obis381 + obis382;
// 4.8.1 // 4.8.1
data = getCosemDataAt(idx++, ((char *) (d))); data = getCosemDataAt(idx++, ((char *) (d)));
@@ -421,7 +424,8 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
data = getCosemDataAt(idx++, ((char *) (d))); data = getCosemDataAt(idx++, ((char *) (d)));
double obis482 = ntohl(data->dlu.data) / 1000.0; double obis482 = ntohl(data->dlu.data) / 1000.0;
reactiveExportCounter = obis481 + obis482; if(reactiveExportCounter < obis481 + obis482)
reactiveExportCounter = obis481 + obis482;
lastUpdateMillis = millis64(); lastUpdateMillis = millis64();
} }