wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add product strings for devices from ABB, Elster and Relay

Browse Source 
This patch adds product identification for:
* ABB Delta-Meter
* Elster Falcon
* Relay PadPuls M1
* Relay PadPuls M4
* Relay Padin 4
* Relay AnDi 4
* Relay PadPuls M2
This commit is contained in:
Stefan Wahren 2016-02-06 12:04:13 +00:00
parent a659ca0494
commit ed87f62a87
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mbus/mbus-protocol.c
View File

@ -857,7 +857,16 @@ mbus_data_product_name(mbus_data_variable_header *header)
{
manufacturer = (header->manufacturer[1] << 8) + header->manufacturer[0];
if (manufacturer == mbus_manufacturer_id("ACW"))
if (manufacturer == mbus_manufacturer_id("ABB"))
{
switch (header->version)
{
case 0x02:
strcpy(buff,"ABB Delta-Meter");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("ACW"))
{
switch (header->version)
{
@ -933,6 +942,9 @@ mbus_data_product_name(mbus_data_variable_header *header)
{
switch (header->version)
{
case 0x0A:
strcpy(buff,"Elster Falcon");
break;
case 0x2F:
strcpy(buff,"Elster F96 Plus");
break;
@ -1071,6 +1083,27 @@ mbus_data_product_name(mbus_data_variable_header *header)
break;
}
}
else if (manufacturer == mbus_manufacturer_id("REL"))
{
switch (header->version)
{
case 0x08:
strcpy(buff, "Relay PadPuls M1");
break;
case 0x12:
strcpy(buff, "Relay PadPuls M4");
break;
case 0x20:
strcpy(buff, "Relay Padin 4");
break;
case 0x30:
strcpy(buff, "Relay AnDi 4");
break;
case 0x40:
strcpy(buff, "Relay PadPuls M2");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("RKE"))
{
switch (header->version)