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

Order device detection by manufacurer

Browse Source 
merging ELS so that TMP-A is detected again
This commit is contained in:
Aarno Aukia 2016-02-08 14:06:24 +01:00
parent eaeb6e5502
commit b9b131d064
1 changed files with 68 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
mbus/mbus-protocol.c
View File

@ -857,6 +857,8 @@ mbus_data_product_name(mbus_data_variable_header *header)
{
manufacturer = (header->manufacturer[1] << 8) + header->manufacturer[0];
// please keep this list ordered by manufacturer code
if (manufacturer == mbus_manufacturer_id("ACW"))
{
switch (header->version)
@ -933,6 +935,9 @@ mbus_data_product_name(mbus_data_variable_header *header)
{
switch (header->version)
{
case 0x02:
strcpy(buff,"Elster TMP-A");
break;
case 0x2F:
strcpy(buff,"Elster F96 Plus");
break;
@ -968,6 +973,15 @@ mbus_data_product_name(mbus_data_variable_header *header)
break;
}
}
else if (manufacturer == mbus_manufacturer_id("EMH"))
{
switch (header->version)
{
case 0x00:
strcpy(buff,"EMH DIZ");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("EMU"))
{
if (header->medium == MBUS_VARIABLE_DATA_MEDIUM_ELECTRICITY)
@ -1011,6 +1025,18 @@ mbus_data_product_name(mbus_data_variable_header *header)
break;
}
}
else if (manufacturer == mbus_manufacturer_id("KAM"))
{
switch (header->version)
{
case 0x01:
strcpy(buff,"Kamstrup 382 (6850-005)");
break;
case 0x08:
strcpy(buff,"Kamstrup Multical 601");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("SLB"))
{
switch (header->version)
@ -1050,6 +1076,28 @@ mbus_data_product_name(mbus_data_variable_header *header)
break;
}
}
else if (manufacturer == mbus_manufacturer_id("LSE"))
{
switch (header->version)
{
case 0x99:
strcpy(buff,"Siemens WFH21");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("NZR"))
{
switch (header->version)
{
case 0x01:
strcpy(buff,"NZR DHZ 5/63");
break;
case 0x50:
strcpy(buff,"NZR IC-M2");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("RAM"))
{
switch (header->version)
@ -1068,33 +1116,16 @@ mbus_data_product_name(mbus_data_variable_header *header)
break;
}
}
else if (manufacturer == mbus_manufacturer_id("SVM"))
else if (manufacturer == mbus_manufacturer_id("SBC"))
{
switch (header->version)
switch (header->id_bcd[3])
{
case 0x08:
strcpy(buff,"Elster F2 / Deltamess F2");
case 0x10:
case 0x19:
strcpy(buff,"Saia-Burgess ALE3");
break;
case 0x09:
strcpy(buff,"Elster F4 / Kamstrup SVM F22");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("SON"))
{
switch (header->version)
{
case 0x0D:
strcpy(buff,"Sontex Supercal 531");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("LSE"))
{
switch (header->version)
{
case 0x99:
strcpy(buff,"Siemens WFH21");
case 0x11:
strcpy(buff,"Saia-Burgess AWD3");
break;
}
}
@ -1113,6 +1144,15 @@ mbus_data_product_name(mbus_data_variable_header *header)
break;
}
}
else if (manufacturer == mbus_manufacturer_id("SON"))
{
switch (header->version)
{
case 0x0D:
strcpy(buff,"Sontex Supercal 531");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("SPX"))
{
switch (header->version)
@ -1123,46 +1163,15 @@ mbus_data_product_name(mbus_data_variable_header *header)
break;
}
}
else if (manufacturer == mbus_manufacturer_id("ELS"))
else if (manufacturer == mbus_manufacturer_id("SVM"))
{
switch (header->version)
{
case 0x02:
strcpy(buff,"Elster TMP-A");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("NZR"))
{
switch (header->version)
{
case 0x01:
strcpy(buff,"NZR DHZ 5/63");
break;
case 0x50:
strcpy(buff,"NZR IC-M2");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("KAM"))
{
switch (header->version)
{
case 0x01:
strcpy(buff,"Kamstrup 382 (6850-005)");
break;
case 0x08:
strcpy(buff,"Kamstrup Multical 601");
strcpy(buff,"Elster F2 / Deltamess F2");
break;
}
}
else if (manufacturer == mbus_manufacturer_id("EMH"))
{
switch (header->version)
{
case 0x00:
strcpy(buff,"EMH DIZ");
case 0x09:
strcpy(buff,"Elster F4 / Kamstrup SVM F22");
break;
}
}
@ -1187,19 +1196,6 @@ mbus_data_product_name(mbus_data_variable_header *header)
break;
}
}
else if (manufacturer == mbus_manufacturer_id("SBC"))
{
switch (header->id_bcd[3])
{
case 0x10:
case 0x19:
strcpy(buff,"Saia-Burgess ALE3");
break;
case 0x11:
strcpy(buff,"Saia-Burgess AWD3");
break;
}
}
}