Merge remote branch 'upstream/master'

Conflicts: mbus/mbus-serial.c
2012-05-14 00:09:05 +02:00
parent 8f48d75fb0 7d482e47f7
commit 5a7e69f90d
12 changed files with 166 additions and 104 deletions
--- a/test/test-frames/frame1.xml
+++ b/test/test-frames/frame1.xml
@ -12,6 +12,7 @@

    <DataRecord id="0">
        <Function>Manufacturer specific</Function>
+        <Value>5F 42 01 11 FF FF FF FF 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</Value>
    </DataRecord>

 </MBusData>