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

Add product string of Hydrometer Sharky 775

Browse Source
This commit is contained in:
Stefan Wahren 2019-02-20 21:58:28 +01:00
parent 2f9fa5ccc8
commit 36a85d3737
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mbus/mbus-protocol.c
View File

@ -503,14 +503,14 @@ mbus_data_bcd_decode(unsigned char *bcd_data, size_t bcd_data_size)
{ {
for (i = bcd_data_size; i > 0; i--) for (i = bcd_data_size; i > 0; i--)
{ {
val *= 10; val = (val * 10);
if (bcd_data[i-1]>>4 < 0xA) if (bcd_data[i-1]>>4 < 0xA)
{ {
val += ((bcd_data[i-1]>>4) & 0xF); val += ((bcd_data[i-1]>>4) & 0xF);
} }
val = (val * 10) + (bcd_data[i-1] & 0xF); val = (val * 10) + ( bcd_data[i-1] & 0xF);
} }
// hex code Fh in the MSD position signals a negative BCD number // hex code Fh in the MSD position signals a negative BCD number
@ -1105,6 +1105,9 @@ mbus_data_product_name(mbus_data_variable_header *header)
case 0x28: case 0x28:
strcpy(buff,"ABB F95 Typ US770"); strcpy(buff,"ABB F95 Typ US770");
break; break;
case 0x2F:
strcpy(buff,"Hydrometer Sharky 775");
break;
} }
} }
else if (manufacturer == mbus_manufacturer_id("JAN")) else if (manufacturer == mbus_manufacturer_id("JAN"))