diff --git a/test/test-frames/Elster-F2.xml b/test/test-frames/Elster-F2.xml index 7fea60b..e020ffb 100644 --- a/test/test-frames/Elster-F2.xml +++ b/test/test-frames/Elster-F2.xml @@ -13,78 +13,97 @@ Instantaneous value + 0 Energy (kWh) 5272 Instantaneous value + 0 Volume (1e-2 m^3) 120427 Instantaneous value + 0 + 0 + 1 Volume (1e-2 m^3) 91769 Instantaneous value + 0 Flow temperature (deg C) 28 Instantaneous value + 0 Return temperature (deg C) 34 Instantaneous value + 0 Temperature Difference (1e-1 deg C) 0 Instantaneous value + 0 On time (hours) 41393 Instantaneous value + 0 Operating time (hours) 41393 Instantaneous value + 0 Volume flow (m m^3/h) 0 Instantaneous value + 0 Power (10 W) 0 Instantaneous value + 0 Time Point (time & date) 2013-06-29T12:12:00 Instantaneous value + 0 + 0 + 1 Units for H.C.A. 0 Instantaneous value + 0 + 0 + 2 Units for H.C.A. 0 diff --git a/test/test-frames/abb_f95.xml b/test/test-frames/abb_f95.xml index 2db805d..7c29d3a 100644 --- a/test/test-frames/abb_f95.xml +++ b/test/test-frames/abb_f95.xml @@ -91,6 +91,7 @@ Instantaneous value + 0 Operating time (hours) 86553 diff --git a/test/test-frames/allmess_cf50.xml b/test/test-frames/allmess_cf50.xml index c16a2c1..612bdd9 100644 --- a/test/test-frames/allmess_cf50.xml +++ b/test/test-frames/allmess_cf50.xml @@ -13,54 +13,63 @@ Instantaneous value + 0 Energy (10 kWh) 0 Instantaneous value + 0 Volume (1e-1 m^3) 3 Instantaneous value + 0 Power (kW) 0 Instantaneous value + 0 Volume flow (m m^3/h) 0 Instantaneous value + 0 Flow temperature (1e-1 deg C) 1288 Instantaneous value + 0 Return temperature (1e-1 deg C) 516 Instantaneous value + 0 Temperature Difference (1e-2 deg C) 7723 Instantaneous value + 0 Time Point (date) 2012-01-12 Instantaneous value + 0 Operating time (days) 3383 diff --git a/test/test-frames/electricity-meter-1.xml b/test/test-frames/electricity-meter-1.xml index af4de7d..8d25237 100644 --- a/test/test-frames/electricity-meter-1.xml +++ b/test/test-frames/electricity-meter-1.xml @@ -13,120 +13,156 @@ Instantaneous value + 0 + 1 + 0 Energy (10 Wh) 1252 Instantaneous value + 2 + 1 + 0 Energy (10 Wh) 1252 Instantaneous value + 0 + 2 + 0 Energy (10 Wh) 1774433 Instantaneous value + 2 + 2 + 0 Energy (10 Wh) 1774433 Instantaneous value + 0 V 237 Instantaneous value + 0 1e-1 A 32 Instantaneous value + 0 Power (10 W) 79 Instantaneous value + 0 + 0 + 1 Power (10 W) -18 Instantaneous value + 0 V 231 Instantaneous value + 0 1e-1 A 35 Instantaneous value + 0 Power (10 W) 81 Instantaneous value + 0 + 0 + 1 Power (10 W) -15 Instantaneous value + 0 V 228 Instantaneous value + 0 1e-1 A 69 Instantaneous value + 0 Power (10 W) 160 Instantaneous value + 0 + 0 + 1 Power (10 W) -32 Instantaneous value + 0 Manufacturer specific 0 Instantaneous value + 0 Power (10 W) 320 Instantaneous value + 0 + 0 + 1 Power (10 W) -65 Instantaneous value + 0 Manufacturer specific 4 diff --git a/test/test-frames/electricity-meter-2.xml b/test/test-frames/electricity-meter-2.xml index ff07f0d..1045933 100644 --- a/test/test-frames/electricity-meter-2.xml +++ b/test/test-frames/electricity-meter-2.xml @@ -13,120 +13,156 @@ Instantaneous value + 0 + 1 + 0 Energy (10 Wh) 254 Instantaneous value + 2 + 1 + 0 Energy (10 Wh) 254 Instantaneous value + 0 + 2 + 0 Energy (10 Wh) 444128 Instantaneous value + 2 + 2 + 0 Energy (10 Wh) 444128 Instantaneous value + 0 V 233 Instantaneous value + 0 1e-1 A 1 Instantaneous value + 0 Power (10 W) 0 Instantaneous value + 0 + 0 + 1 Power (10 W) 0 Instantaneous value + 0 V 234 Instantaneous value + 0 1e-1 A 0 Instantaneous value + 0 Power (10 W) 0 Instantaneous value + 0 + 0 + 1 Power (10 W) 0 Instantaneous value + 0 V 235 Instantaneous value + 0 1e-1 A 1 Instantaneous value + 0 Power (10 W) 0 Instantaneous value + 0 + 0 + 1 Power (10 W) 0 Instantaneous value + 0 Manufacturer specific 0 Instantaneous value + 0 Power (10 W) 0 Instantaneous value + 0 + 0 + 1 Power (10 W) 0 Instantaneous value + 0 Manufacturer specific 4 diff --git a/test/test-frames/els_tmpa_telegramm1.xml b/test/test-frames/els_tmpa_telegramm1.xml index d0b4fa9..4a22242 100644 --- a/test/test-frames/els_tmpa_telegramm1.xml +++ b/test/test-frames/els_tmpa_telegramm1.xml @@ -13,30 +13,35 @@ Instantaneous value + 0 Volume (m m^3) 1234567 Instantaneous value + 0 Time Point (time & date) 2007-02-06T13:58:00 Instantaneous value + 1 Time Point (date) 2007-01-01 Instantaneous value + 1 Volume (m m^3) 456951 Instantaneous value + 1 Time Point (date) 2008-01-01 diff --git a/test/test-frames/elv_temp_humid.xml b/test/test-frames/elv_temp_humid.xml index c02fcc3..6ebb57a 100644 --- a/test/test-frames/elv_temp_humid.xml +++ b/test/test-frames/elv_temp_humid.xml @@ -13,72 +13,86 @@ Instantaneous value + 0 Digital input (binary) 0 Instantaneous value + 0 1e-2 %RH 4564 Minimum value + 0 1e-2 %RH 4552 Maximum value + 0 1e-2 %RH 5812 Instantaneous value + 0 External temperature (1e-2 deg C) 2256 Minimum value + 0 External temperature (1e-2 deg C) 2160 Maximum value + 0 External temperature (1e-2 deg C) 2339 Instantaneous value + 0 Averaging Duration (hours) 24 Instantaneous value + 1 External temperature (1e-2 deg C) 2276 Instantaneous value + 2 + 0 + 0 External temperature (1e-2 deg C) 2269 Instantaneous value + 0 Fabrication number 54000834 Instantaneous value + 0 Software version 262144 diff --git a/test/test-frames/emh_diz.xml b/test/test-frames/emh_diz.xml index 78117ee..46dc68a 100644 --- a/test/test-frames/emh_diz.xml +++ b/test/test-frames/emh_diz.xml @@ -13,18 +13,25 @@ Instantaneous value + 0 + 1 + 0 Energy (10 Wh) 409 Instantaneous value + 1 + 0 + 0 Power (1e-1 W) 0 Instantaneous value + 0 Error flags 0 diff --git a/test/test-frames/gmc_emmod206.xml b/test/test-frames/gmc_emmod206.xml index d12d307..ab18ed2 100644 --- a/test/test-frames/gmc_emmod206.xml +++ b/test/test-frames/gmc_emmod206.xml @@ -13,120 +13,180 @@ Instantaneous value + 0 + 0 + 1 1e-1 V 864 Instantaneous value + 0 + 0 + 2 1e-1 V 959 Instantaneous value + 0 + 0 + 3 1e-1 V 1056 Instantaneous value + 0 + 0 + 1 m A 957 Instantaneous value + 0 + 0 + 2 m A 1055 Instantaneous value + 0 + 0 + 3 m A 1150 Instantaneous value + 0 + 0 + 1 Power (W) 224 Instantaneous value + 0 + 0 + 1 Power (W) -202 Instantaneous value + 0 + 1 + 0 Energy (10 Wh) 10388 Instantaneous value + 0 + 2 + 0 Energy (10 Wh) 15000 Instantaneous value + 0 + 1 + 1 Energy (10 Wh) 20159 Instantaneous value + 0 + 2 + 1 Energy (10 Wh) 25000 Instantaneous value + 0 + 1 + 2 Energy (10 Wh) 30091 Instantaneous value + 0 + 2 + 2 Energy (10 Wh) 35000 Instantaneous value + 0 + 1 + 3 Energy (10 Wh) 40237 Instantaneous value + 0 + 2 + 3 Energy (10 Wh) 45000 Instantaneous value + 2 + 0 + 1 Power (W) 224 Instantaneous value + 4 + 0 + 1 Power (W) 0 Instantaneous value + 6 + 0 + 1 Power (W) 0 Instantaneous value + 8 + 0 + 1 Power (W) 202 diff --git a/test/test-frames/kamstrup_multical_601.xml b/test/test-frames/kamstrup_multical_601.xml index 856f7dc..5b74577 100644 --- a/test/test-frames/kamstrup_multical_601.xml +++ b/test/test-frames/kamstrup_multical_601.xml @@ -13,162 +13,209 @@ Instantaneous value + 0 Fabrication number 6855817 Instantaneous value + 0 Energy (kWh) 37351 Instantaneous value + 0 Volume (1e-2 m^3) 56108 Instantaneous value + 0 On time (hours) 985 Instantaneous value + 0 Flow temperature (1e-2 deg C) 10169 Instantaneous value + 0 Return temperature (1e-2 deg C) 4616 Instantaneous value + 0 Temperature Difference (1e-2 deg C) 5553 Instantaneous value + 0 Power (100 W) 347 Maximum value + 0 Power (100 W) 448 Instantaneous value + 0 Volume flow (m m^3/h) 543 Maximum value + 0 Volume flow (m m^3/h) 628 Instantaneous value + 0 + 1 + 0 Energy (kWh) 0 Instantaneous value + 0 + 2 + 0 Energy (kWh) 0 Instantaneous value + 0 + 0 + 1 Volume (1e-2 m^3) 0 Instantaneous value + 0 + 0 + 2 Volume (1e-2 m^3) 0 Instantaneous value + 0 + 0 + 3 Energy (kWh) 0 Instantaneous value + 0 Time Point (time & date) 2011-01-05T15:26:00 Instantaneous value + 1 Energy (kWh) 33361 Instantaneous value + 1 Volume (1e-2 m^3) 50098 Maximum value + 1 Power (100 W) 550 Maximum value + 1 Volume flow (m m^3/h) 1027 Instantaneous value + 1 + 1 + 0 Energy (kWh) 0 Instantaneous value + 1 + 2 + 0 Energy (kWh) 0 Instantaneous value + 1 + 0 + 1 Volume (1e-2 m^3) 0 Instantaneous value + 1 + 0 + 2 Volume (1e-2 m^3) 0 Instantaneous value + 1 + 0 + 3 Energy (kWh) 0 Instantaneous value + 1 Time Point (date) 2010-12-31 diff --git a/test/test-frames/manual_frame3.xml b/test/test-frames/manual_frame3.xml index 2b1211e..34a51b5 100644 --- a/test/test-frames/manual_frame3.xml +++ b/test/test-frames/manual_frame3.xml @@ -13,18 +13,25 @@ Instantaneous value + 0 Volume (m m^3) 12565 Maximum value + 5 + 0 + 0 Volume flow (m m^3/h) 113 Instantaneous value + 0 + 2 + 1 Energy (10 Wh) 21837 diff --git a/test/test-frames/manual_frame7.xml b/test/test-frames/manual_frame7.xml index dc166e3..a3c2dad 100644 --- a/test/test-frames/manual_frame7.xml +++ b/test/test-frames/manual_frame7.xml @@ -13,6 +13,7 @@ Instantaneous value + 0 Fabrication number 1020304 diff --git a/test/test-frames/nzr_dhz_5_63.xml b/test/test-frames/nzr_dhz_5_63.xml index f7120a3..40b91b2 100644 --- a/test/test-frames/nzr_dhz_5_63.xml +++ b/test/test-frames/nzr_dhz_5_63.xml @@ -13,36 +13,42 @@ Instantaneous value + 0 Energy (Wh) 1274 Instantaneous value + 0 Energy (Wh) 1274 Instantaneous value + 0 1e-1 V 2372 Instantaneous value + 0 1e-1 A 0 Instantaneous value + 0 Power (W) 0 Instantaneous value + 0 Fabrication number 30100608 diff --git a/test/test-frames/wmbus-converted.xml b/test/test-frames/wmbus-converted.xml index aefeabd..e7f0686 100644 --- a/test/test-frames/wmbus-converted.xml +++ b/test/test-frames/wmbus-converted.xml @@ -13,6 +13,7 @@ Instantaneous value + 0 Energy (Wh) 5000