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

Improve product strings for Aquametro and Sensus

Browse Source
This commit is contained in:
Stefan Wahren 2020-07-08 11:44:17 +02:00
parent 67ea2d3900
commit 8d781ad240
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mbus/mbus-protocol.c
View File

@ -955,14 +955,21 @@ mbus_data_product_name(mbus_data_variable_header *header)
} }
else if (manufacturer == mbus_manufacturer_id("AMT")) else if (manufacturer == mbus_manufacturer_id("AMT"))
{ {
switch (header->version) if (header->version >= 0xC0)
{ {
case 0x80:
strcpy(buff,"Aquametro CALEC MB");
break;
case 0xC0:
strcpy(buff,"Aquametro CALEC ST"); strcpy(buff,"Aquametro CALEC ST");
break; }
else if (header->version >= 0x80)
{
strcpy(buff,"Aquametro CALEC MB");
}
else if (header->version >= 0x40)
{
strcpy(buff,"Aquametro SAPHIR");
}
else
{
strcpy(buff,"Aquametro AMTRON");
} }
} }
else if (manufacturer == mbus_manufacturer_id("BEC")) else if (manufacturer == mbus_manufacturer_id("BEC"))
@ -1266,15 +1273,16 @@ mbus_data_product_name(mbus_data_variable_header *header)
{ {
switch (header->version) switch (header->version)
{ {
case 0x08:
case 0x19:
strcpy(buff,"Sensus PolluCom E");
break;
case 0x0B: case 0x0B:
strcpy(buff,"Sensus PolluTherm"); strcpy(buff,"Sensus PolluTherm");
break; break;
case 0x0E: case 0x0E:
strcpy(buff,"Sensus PolluStat E"); strcpy(buff,"Sensus PolluStat E");
break; break;
case 0x19:
strcpy(buff,"Sensus PolluCom E");
break;
} }
} }
else if (manufacturer == mbus_manufacturer_id("SON")) else if (manufacturer == mbus_manufacturer_id("SON"))

2
test/test-frames/example_data_01.norm.xml
View File

@ -5,7 +5,7 @@
<Id>3575845</Id> <Id>3575845</Id>
<Manufacturer>AMT</Manufacturer> <Manufacturer>AMT</Manufacturer>
<Version>52</Version> <Version>52</Version>
<ProductName></ProductName> <ProductName>Aquametro AMTRON</ProductName>
<Medium>Heat: Outlet</Medium> <Medium>Heat: Outlet</Medium>
<AccessNumber>158</AccessNumber> <AccessNumber>158</AccessNumber>
<Status>00</Status> <Status>00</Status>

2
test/test-frames/example_data_01.xml
View File

@ -5,7 +5,7 @@
<Id>3575845</Id> <Id>3575845</Id>
<Manufacturer>AMT</Manufacturer> <Manufacturer>AMT</Manufacturer>
<Version>52</Version> <Version>52</Version>
<ProductName></ProductName> <ProductName>Aquametro AMTRON</ProductName>
<Medium>Heat: Outlet</Medium> <Medium>Heat: Outlet</Medium>
<AccessNumber>158</AccessNumber> <AccessNumber>158</AccessNumber>
<Status>00</Status> <Status>00</Status>

2
test/test-frames/example_data_02.norm.xml
View File

@ -5,7 +5,7 @@
<Id>3575845</Id> <Id>3575845</Id>
<Manufacturer>AMT</Manufacturer> <Manufacturer>AMT</Manufacturer>
<Version>52</Version> <Version>52</Version>
<ProductName></ProductName> <ProductName>Aquametro AMTRON</ProductName>
<Medium>Heat: Outlet</Medium> <Medium>Heat: Outlet</Medium>
<AccessNumber>161</AccessNumber> <AccessNumber>161</AccessNumber>
<Status>00</Status> <Status>00</Status>

2
test/test-frames/example_data_02.xml
View File

@ -5,7 +5,7 @@
<Id>3575845</Id> <Id>3575845</Id>
<Manufacturer>AMT</Manufacturer> <Manufacturer>AMT</Manufacturer>
<Version>52</Version> <Version>52</Version>
<ProductName></ProductName> <ProductName>Aquametro AMTRON</ProductName>
<Medium>Heat: Outlet</Medium> <Medium>Heat: Outlet</Medium>
<AccessNumber>161</AccessNumber> <AccessNumber>161</AccessNumber>
<Status>00</Status> <Status>00</Status>