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

update existing test-case-output with the changes introduced in 781736fe4cbc78d4a14dc486b446dd813fd5aa20

Browse Source
This commit is contained in:
Aarno Aukia 2016-02-05 14:03:37 +01:00
parent 0751e0d88f
commit 7eaadad124
18 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/test-frames/Elster-F2.xml
View File

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>
<Id>802657</Id> <Id>802657</Id>
<Manufacturer>SVM</Manufacturer> <Manufacturer>SVM</Manufacturer>
<Version>8</Version> <Version>8</Version>
<ProductName>Elster F2</ProductName> <ProductName>Elster F2 / Deltamess F2</ProductName>
<Medium>Heat: Outlet</Medium> <Medium>Heat: Outlet</Medium>
<AccessNumber>70</AccessNumber> <AccessNumber>70</AccessNumber>
<Status>00</Status> <Status>00</Status>

18
test/test-frames/abb_f95.xml
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>
@ -13,78 +14,95 @@
<DataRecord id="0"> <DataRecord id="0">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Energy (100 Wh)</Unit> <Unit>Energy (100 Wh)</Unit>
<Value>0</Value> <Value>0</Value>
</DataRecord> </DataRecord>
<DataRecord id="1"> <DataRecord id="1">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Volume (1e-4 m^3)</Unit> <Unit>Volume (1e-4 m^3)</Unit>
<Value>742</Value> <Value>742</Value>
</DataRecord> </DataRecord>
<DataRecord id="2"> <DataRecord id="2">
<Function>Value during error state</Function> <Function>Value during error state</Function>
<StorageNumber>0</StorageNumber>
<Unit>Power (1e-1 W)</Unit> <Unit>Power (1e-1 W)</Unit>
<Value>144521543</Value> <Value>144521543</Value>
</DataRecord> </DataRecord>
<DataRecord id="3"> <DataRecord id="3">
<Function>Value during error state</Function> <Function>Value during error state</Function>
<StorageNumber>0</StorageNumber>
<Unit>Volume flow (1e-4 m^3/h)</Unit> <Unit>Volume flow (1e-4 m^3/h)</Unit>
<Value>1521543</Value> <Value>1521543</Value>
</DataRecord> </DataRecord>
<DataRecord id="4"> <DataRecord id="4">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Flow temperature (1e-1 deg C)</Unit> <Unit>Flow temperature (1e-1 deg C)</Unit>
<Value>204</Value> <Value>204</Value>
</DataRecord> </DataRecord>
<DataRecord id="5"> <DataRecord id="5">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Return temperature (1e-1 deg C)</Unit> <Unit>Return temperature (1e-1 deg C)</Unit>
<Value>204</Value> <Value>204</Value>
</DataRecord> </DataRecord>
<DataRecord id="6"> <DataRecord id="6">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Temperature Difference (1e-1 deg C)</Unit> <Unit>Temperature Difference (1e-1 deg C)</Unit>
<Value>0</Value> <Value>0</Value>
</DataRecord> </DataRecord>
<DataRecord id="7"> <DataRecord id="7">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Time Point (time &amp; date)</Unit> <Unit>Time Point (time &amp; date)</Unit>
<Value>2012-01-13T16:34:00</Value> <Value>2012-01-13T16:34:00</Value>
</DataRecord> </DataRecord>
<DataRecord id="8"> <DataRecord id="8">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>1</StorageNumber>
<Unit>Energy (100 Wh)</Unit> <Unit>Energy (100 Wh)</Unit>
<Value>0</Value> <Value>0</Value>
</DataRecord> </DataRecord>
<DataRecord id="9"> <DataRecord id="9">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>1</StorageNumber>
<Unit>Time Point (time &amp; date)</Unit> <Unit>Time Point (time &amp; date)</Unit>
<Value>2011-04-30T23:59:00</Value> <Value>2011-04-30T23:59:00</Value>
</DataRecord> </DataRecord>
<DataRecord id="10"> <DataRecord id="10">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>1</StorageNumber>
<Unit>Time Point (time &amp; date)</Unit> <Unit>Time Point (time &amp; date)</Unit>
<Value>2012-04-30T23:59:00</Value> <Value>2012-04-30T23:59:00</Value>
</DataRecord> </DataRecord>
<DataRecord id="11"> <DataRecord id="11">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>2</StorageNumber>
<Tariff>0</Tariff>
<Device>0</Device>
<Unit>Energy (100 Wh)</Unit> <Unit>Energy (100 Wh)</Unit>
<Value>0</Value> <Value>0</Value>
</DataRecord> </DataRecord>
<DataRecord id="12"> <DataRecord id="12">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>2</StorageNumber>
<Tariff>0</Tariff>
<Device>0</Device>
<Unit>Time Point (time &amp; date)</Unit> <Unit>Time Point (time &amp; date)</Unit>
<Value>2011-12-31T23:59:00</Value> <Value>2011-12-31T23:59:00</Value>
</DataRecord> </DataRecord>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

1
test/test-frames/electricity-meter-1.xml
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

1
test/test-frames/electricity-meter-2.xml
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

8
test/test-frames/frame2.xml
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>
@ -13,18 +14,25 @@
<DataRecord id="0"> <DataRecord id="0">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Volume (m m^3)</Unit> <Unit>Volume (m m^3)</Unit>
<Value>12565</Value> <Value>12565</Value>
</DataRecord> </DataRecord>
<DataRecord id="1"> <DataRecord id="1">
<Function>Maximum value</Function> <Function>Maximum value</Function>
<StorageNumber>5</StorageNumber>
<Tariff>0</Tariff>
<Device>0</Device>
<Unit>Volume flow (m m^3/h)</Unit> <Unit>Volume flow (m m^3/h)</Unit>
<Value>113</Value> <Value>113</Value>
</DataRecord> </DataRecord>
<DataRecord id="2"> <DataRecord id="2">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Tariff>2</Tariff>
<Device>1</Device>
<Unit>Energy (10 Wh)</Unit> <Unit>Energy (10 Wh)</Unit>
<Value>21837</Value> <Value>21837</Value>
</DataRecord> </DataRecord>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

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

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>

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

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>
<Id>1006089</Id> <Id>1006089</Id>
<Manufacturer>SVM</Manufacturer> <Manufacturer>SVM</Manufacturer>
<Version>9</Version> <Version>9</Version>
<ProductName>Kamstrup SVM F22</ProductName> <ProductName>Elster F4 / Kamstrup SVM F22</ProductName>
<Medium>Heat: Inlet</Medium> <Medium>Heat: Inlet</Medium>
<AccessNumber>148</AccessNumber> <AccessNumber>148</AccessNumber>
<Status>70</Status> <Status>70</Status>
@ -13,78 +14,97 @@
<DataRecord id="0"> <DataRecord id="0">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Energy (kWh)</Unit> <Unit>Energy (kWh)</Unit>
<Value>28014</Value> <Value>28014</Value>
</DataRecord> </DataRecord>
<DataRecord id="1"> <DataRecord id="1">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Volume (m m^3)</Unit> <Unit>Volume (m m^3)</Unit>
<Value>640581</Value> <Value>640581</Value>
</DataRecord> </DataRecord>
<DataRecord id="2"> <DataRecord id="2">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Tariff>0</Tariff>
<Device>1</Device>
<Unit>Volume (m m^3)</Unit> <Unit>Volume (m m^3)</Unit>
<Value>640581</Value> <Value>640581</Value>
</DataRecord> </DataRecord>
<DataRecord id="3"> <DataRecord id="3">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Flow temperature (deg C)</Unit> <Unit>Flow temperature (deg C)</Unit>
<Value>243</Value> <Value>243</Value>
</DataRecord> </DataRecord>
<DataRecord id="4"> <DataRecord id="4">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Return temperature (deg C)</Unit> <Unit>Return temperature (deg C)</Unit>
<Value>243</Value> <Value>243</Value>
</DataRecord> </DataRecord>
<DataRecord id="5"> <DataRecord id="5">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Temperature Difference (1e-1 deg C)</Unit> <Unit>Temperature Difference (1e-1 deg C)</Unit>
<Value>0</Value> <Value>0</Value>
</DataRecord> </DataRecord>
<DataRecord id="6"> <DataRecord id="6">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>On time (hours)</Unit> <Unit>On time (hours)</Unit>
<Value>6370</Value> <Value>6370</Value>
</DataRecord> </DataRecord>
<DataRecord id="7"> <DataRecord id="7">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Operating time (hours)</Unit> <Unit>Operating time (hours)</Unit>
<Value>6363</Value> <Value>6363</Value>
</DataRecord> </DataRecord>
<DataRecord id="8"> <DataRecord id="8">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Volume flow (m m^3/h)</Unit> <Unit>Volume flow (m m^3/h)</Unit>
<Value>0</Value> <Value>0</Value>
</DataRecord> </DataRecord>
<DataRecord id="9"> <DataRecord id="9">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Power (10 W)</Unit> <Unit>Power (10 W)</Unit>
<Value>0</Value> <Value>0</Value>
</DataRecord> </DataRecord>
<DataRecord id="10"> <DataRecord id="10">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Unit>Time Point (time &amp; date)</Unit> <Unit>Time Point (time &amp; date)</Unit>
<Value>2021-02-08T21:12:00</Value> <Value>2021-02-08T21:12:00</Value>
</DataRecord> </DataRecord>
<DataRecord id="11"> <DataRecord id="11">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Tariff>0</Tariff>
<Device>1</Device>
<Unit>Units for H.C.A.</Unit> <Unit>Units for H.C.A.</Unit>
<Value>0</Value> <Value>0</Value>
</DataRecord> </DataRecord>
<DataRecord id="12"> <DataRecord id="12">
<Function>Instantaneous value</Function> <Function>Instantaneous value</Function>
<StorageNumber>0</StorageNumber>
<Tariff>0</Tariff>
<Device>2</Device>
<Unit>Units for H.C.A.</Unit> <Unit>Units for H.C.A.</Unit>
<Value>0</Value> <Value>0</Value>
</DataRecord> </DataRecord>

1
test/test-frames/wmbus-converted.xml
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<MBusData> <MBusData>
<SlaveInformation> <SlaveInformation>