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/svm_f22_telegram1.xml
+++ b/test/test-frames/svm_f22_telegram1.xml
@ -4,7 +4,7 @@
        <Id>1006089</Id>
        <Manufacturer>SVM</Manufacturer>
        <Version>9</Version>
-        <Medium>Heat (Volume measured at flow temperature: inlet)</Medium>
+        <Medium>Heat: Inlet</Medium>
        <AccessNumber>148</AccessNumber>
        <Status>70</Status>
        <Signature>0000</Signature>
@ -89,7 +89,8 @@
    </DataRecord>

    <DataRecord id="13">
-        <Function>Manufacturer specific</Function>
+        <Function>More records follow</Function>
+        <Value></Value>
    </DataRecord>

 </MBusData>