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

Merge remote branch 'upstream/master'

Browse Source 
Conflicts:
	mbus/mbus-serial.c
This commit is contained in:
Stefan Wahren
2012-05-14 00:09:05 +02:00
parent 8f48d75fb0 7d482e47f7
commit 5a7e69f90d
12 changed files with 166 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/test-frames/kamstrup_multical_601.xml
View File

@ -4,7 +4,7 @@
<Id>6855817</Id>
<Manufacturer>KAM</Manufacturer>
<Version>8</Version>
<Medium>Heat</Medium>
<Medium>Heat: Outlet</Medium>
<AccessNumber>4</AccessNumber>
<Status>00</Status>
<Signature>0000</Signature>
@ -174,6 +174,7 @@
<DataRecord id="27">
<Function>Manufacturer specific</Function>
<Value>00 00 00 00 E7 E4 00 00 63 66 00 00 00 00 00 00 00 00 00 00 00 00 00 00 5B C9 A5 02 34 53 00 00 E0 B2 03 00 89 9C 68 00 00 00 00 00 01 00 01 07 07 09 01 03 00 00 00 00 00</Value>
</DataRecord>
</MBusData>