mirror of
https://github.com/UtilitechAS/amsreader-firmware.git
synced 2026-04-25 11:51:43 +00:00
Added support for another Croatian Iskra
This commit is contained in:
@@ -648,6 +648,83 @@ IEC6205675::IEC6205675(const char* d, Timezone* tz, uint8_t useMeterType, MeterC
|
|||||||
data = getCosemDataAt(idx++, ((char *) (d)));
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
l3current = ntohs(data->lu.data) / 100.0;
|
l3current = ntohs(data->lu.data) / 100.0;
|
||||||
|
|
||||||
|
listType = 4;
|
||||||
|
lastUpdateMillis = millis64();
|
||||||
|
} else if(data->base.length == 0x1C) {
|
||||||
|
idx = 4;
|
||||||
|
|
||||||
|
// 1.8.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
activeImportCounter = ntohl(data->dlu.data) / 1000.0;
|
||||||
|
|
||||||
|
// 1.8.1
|
||||||
|
// 1.8.2
|
||||||
|
idx += 2;
|
||||||
|
|
||||||
|
// 2.8.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
activeExportCounter = ntohl(data->dlu.data) / 1000.0;
|
||||||
|
|
||||||
|
// 2.8.1
|
||||||
|
// 2.8.2
|
||||||
|
idx += 2;
|
||||||
|
|
||||||
|
// 1.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
activeImportPower = ntohl(data->dlu.data);
|
||||||
|
|
||||||
|
// 2.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
activeExportPower = ntohl(data->dlu.data);
|
||||||
|
|
||||||
|
// 21.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l1activeImportPower = ntohl(data->dlu.data);
|
||||||
|
|
||||||
|
// 41.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l2activeImportPower = ntohl(data->dlu.data);
|
||||||
|
|
||||||
|
// 61.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l3activeImportPower = ntohl(data->dlu.data);
|
||||||
|
|
||||||
|
// 22.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l1activeExportPower = ntohl(data->dlu.data);
|
||||||
|
|
||||||
|
// 42.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l2activeExportPower = ntohl(data->dlu.data);
|
||||||
|
|
||||||
|
// 62.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l3activeExportPower = ntohl(data->dlu.data);
|
||||||
|
|
||||||
|
// 32.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l1voltage = ntohs(data->lu.data) / 10.0;
|
||||||
|
|
||||||
|
// 52.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l2voltage = ntohs(data->lu.data) / 10.0;
|
||||||
|
|
||||||
|
// 72.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l3voltage = ntohs(data->lu.data) / 10.0;
|
||||||
|
|
||||||
|
// 31.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l1current = ntohs(data->lu.data) / 100.0;
|
||||||
|
|
||||||
|
// 51.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l2current = ntohs(data->lu.data) / 100.0;
|
||||||
|
|
||||||
|
// 71.7.0
|
||||||
|
data = getCosemDataAt(idx++, ((char *) (d)));
|
||||||
|
l3current = ntohs(data->lu.data) / 100.0;
|
||||||
|
|
||||||
listType = 4;
|
listType = 4;
|
||||||
lastUpdateMillis = millis64();
|
lastUpdateMillis = millis64();
|
||||||
} else if(data->base.length == 0x0F) {
|
} else if(data->base.length == 0x0F) {
|
||||||
|
|||||||
Reference in New Issue
Block a user