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

Merge branch 'main' into pnu

Browse Source
This commit is contained in:
Gunnar Skjold
2024-12-05 18:15:37 +01:00
parent a5fc1f0cbe 0947d335ce
commit c0d95f918e
4 changed files with 120 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/HomeAssistantMqttHandler/json/ha1.json
View File

@@ -1,3 +1,3 @@
{
"P" : %d
"P" : %lu
}

8
lib/HomeAssistantMqttHandler/json/ha3.json
View File

@@ -2,10 +2,10 @@
"lv" : "%s",
"id" : "%s",
"type" : "%s",
"P" : %d,
"Q" : %d,
"PO" : %d,
"QO" : %d,
"P" : %lu,
"Q" : %lu,
"PO" : %lu,
"QO" : %lu,
"I1" : %.2f,
"I2" : %.2f,
"I3" : %.2f,

20
lib/HomeAssistantMqttHandler/json/ha4.json
View File

@@ -2,16 +2,16 @@
"lv" : "%s",
"id" : "%s",
"type" : "%s",
"P" : %d,
"P1" : %d,
"P2" : %d,
"P3" : %d,
"Q" : %d,
"PO" : %d,
"PO1" : %d,
"PO2" : %d,
"PO3" : %d,
"QO" : %d,
"P" : %lu,
"P1" : %lu,
"P2" : %lu,
"P3" : %lu,
"Q" : %lu,
"PO" : %lu,
"PO1" : %lu,
"PO2" : %lu,
"PO3" : %lu,
"QO" : %lu,
"I1" : %.2f,
"I2" : %.2f,
"I3" : %.2f,

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

@@ -197,21 +197,126 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
apply(state);
listType = 3;
// 42.0.0 COSEM logical device name
idx++;
// 96.1.3 Device ID 4
data = getCosemDataAt(idx++, ((char *) (d)));
memcpy(str, data->oct.data, data->oct.length);
str[data->oct.length] = 0x00;
meterId = String(str);
// 96.3.10 Disconnect control
// 96.14.0 Currently acrive energy tariff
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;
// 3.8.0
data = getCosemDataAt(idx++, ((char *) (d)));
reactiveImportCounter = ntohl(data->dlu.data) / 1000.0;
// 4.8.0
data = getCosemDataAt(idx++, ((char *) (d)));
reactiveExportCounter = ntohl(data->dlu.data) / 1000.0;
lastUpdateMillis = millis64();
} else if(data->base.length == 0x0A) {
apply(state);
listType = 2;
// 42.0.0 COSEM logical device name
idx++;
// 96.1.2 Device ID 3
data = getCosemDataAt(idx++, ((char *) (d)));
memcpy(str, data->oct.data, data->oct.length);
str[data->oct.length] = 0x00;
meterId = String(str);
// 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);
// 3.7.0
data = getCosemDataAt(idx++, ((char *) (d)));
reactiveImportPower = ntohl(data->dlu.data);
// 4.7.0
data = getCosemDataAt(idx++, ((char *) (d)));
reactiveExportPower = ntohl(data->dlu.data);
// 32.7.0
data = getCosemDataAt(idx++, ((char *) (d)));
l1voltage = ntohs(data->lu.data) / 10.0;
// Current?
data = getCosemDataAt(idx++, ((char *) (d)));
l1current = ntohs(data->lu.data) / 100.0;
// 2.8.1
// 2.8.2
idx += 2;
lastUpdateMillis = millis64();
} else if(data->base.length == 0x09) {
apply(state);
listType = 2;
// 42.0.0 COSEM logical device name
idx++;
// 96.1.2 Device ID 3
data = getCosemDataAt(idx++, ((char *) (d)));
memcpy(str, data->oct.data, data->oct.length);
str[data->oct.length] = 0x00;
meterId = String(str);
// 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);
// 3.7.0
data = getCosemDataAt(idx++, ((char *) (d)));
reactiveImportPower = ntohl(data->dlu.data);
// 4.7.0
data = getCosemDataAt(idx++, ((char *) (d)));
reactiveExportPower = ntohl(data->dlu.data);
// 32.7.0
data = getCosemDataAt(idx++, ((char *) (d)));
l1voltage = ntohs(data->lu.data) / 10.0;
// 2.8.1
// 2.8.2
idx += 2;
lastUpdateMillis = millis64();
}
} else if(useMeterType == AmsTypeIskra && data->base.type == CosemTypeOctetString) { // Iskra special case