merge rscada/master with arska/feature-ignoretestbinaries

This commit is contained in:
Aarno Aukia
2016-03-25 23:20:34 +01:00
34 changed files with 91 additions and 10 deletions

View File

@ -859,7 +859,16 @@ mbus_data_product_name(mbus_data_variable_header *header)
// please keep this list ordered by manufacturer code
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)
{
@ -938,6 +947,9 @@ mbus_data_product_name(mbus_data_variable_header *header)
case 0x02:
strcpy(buff,"Elster TMP-A");
break;
case 0x0A:
strcpy(buff,"Elster Falcon");
break;
case 0x2F:
strcpy(buff,"Elster F96 Plus");
break;
@ -1058,6 +1070,18 @@ mbus_data_product_name(mbus_data_variable_header *header)
break;
}
}
else if (manufacturer == mbus_manufacturer_id("JAN"))
{
if (header->medium == MBUS_VARIABLE_DATA_MEDIUM_ELECTRICITY)
{
switch (header->version)
{
case 0x09:
strcpy(buff,"Janitza UMG 96S");
break;
}
}
}
else if (manufacturer == mbus_manufacturer_id("LUG"))
{
switch (header->version)
@ -1095,7 +1119,6 @@ mbus_data_product_name(mbus_data_variable_header *header)
case 0x50:
strcpy(buff,"NZR IC-M2");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("RAM"))
@ -1107,6 +1130,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)