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/mbus_parse_hex.c
View File

@ -89,7 +89,8 @@ main(int argc, char *argv[])
//mbus_frame_print(&reply);
//mbus_frame_data_print(&frame_data);
printf("%s", mbus_frame_data_xml(&frame_data));
printf("%s", mbus_frame_data_xml_normalized(&frame_data));
// printf("%s", mbus_frame_data_xml(&frame_data));
return 0;
}

1
test/test-frames/frame1.xml
View File

@ -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>

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>

5
test/test-frames/svm_f22_telegram1.xml
View File

@ -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>