diff --git a/test/test-frames/Elster-F2.xml b/test/test-frames/Elster-F2.xml index e020ffb..1a1e508 100644 --- a/test/test-frames/Elster-F2.xml +++ b/test/test-frames/Elster-F2.xml @@ -1,10 +1,11 @@ + 802657 SVM 8 - Elster F2 + Elster F2 / Deltamess F2 Heat: Outlet 70 00 diff --git a/test/test-frames/abb_f95.xml b/test/test-frames/abb_f95.xml index 7c29d3a..4ddaadf 100644 --- a/test/test-frames/abb_f95.xml +++ b/test/test-frames/abb_f95.xml @@ -1,3 +1,4 @@ + @@ -13,78 +14,95 @@ Instantaneous value + 0 Energy (100 Wh) 0 Instantaneous value + 0 Volume (1e-4 m^3) 742 Value during error state + 0 Power (1e-1 W) 144521543 Value during error state + 0 Volume flow (1e-4 m^3/h) 1521543 Instantaneous value + 0 Flow temperature (1e-1 deg C) 204 Instantaneous value + 0 Return temperature (1e-1 deg C) 204 Instantaneous value + 0 Temperature Difference (1e-1 deg C) 0 Instantaneous value + 0 Time Point (time & date) 2012-01-13T16:34:00 Instantaneous value + 1 Energy (100 Wh) 0 Instantaneous value + 1 Time Point (time & date) 2011-04-30T23:59:00 Instantaneous value + 1 Time Point (time & date) 2012-04-30T23:59:00 Instantaneous value + 2 + 0 + 0 Energy (100 Wh) 0 Instantaneous value + 2 + 0 + 0 Time Point (time & date) 2011-12-31T23:59:00 diff --git a/test/test-frames/allmess_cf50.xml b/test/test-frames/allmess_cf50.xml index 612bdd9..ce72541 100644 --- a/test/test-frames/allmess_cf50.xml +++ b/test/test-frames/allmess_cf50.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/electricity-meter-1.xml b/test/test-frames/electricity-meter-1.xml index 8d25237..5a32f2e 100644 --- a/test/test-frames/electricity-meter-1.xml +++ b/test/test-frames/electricity-meter-1.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/electricity-meter-2.xml b/test/test-frames/electricity-meter-2.xml index 1045933..d5a1c47 100644 --- a/test/test-frames/electricity-meter-2.xml +++ b/test/test-frames/electricity-meter-2.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/els_tmpa_telegramm1.xml b/test/test-frames/els_tmpa_telegramm1.xml index 4a22242..697807a 100644 --- a/test/test-frames/els_tmpa_telegramm1.xml +++ b/test/test-frames/els_tmpa_telegramm1.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/elv_temp_humid.xml b/test/test-frames/elv_temp_humid.xml index 6ebb57a..abf07eb 100644 --- a/test/test-frames/elv_temp_humid.xml +++ b/test/test-frames/elv_temp_humid.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/emh_diz.xml b/test/test-frames/emh_diz.xml index 46dc68a..fc83cd6 100644 --- a/test/test-frames/emh_diz.xml +++ b/test/test-frames/emh_diz.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/frame1.xml b/test/test-frames/frame1.xml index 6b7daa7..13d24cd 100644 --- a/test/test-frames/frame1.xml +++ b/test/test-frames/frame1.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/frame2.xml b/test/test-frames/frame2.xml index 2b1211e..a7eaeca 100644 --- a/test/test-frames/frame2.xml +++ b/test/test-frames/frame2.xml @@ -1,3 +1,4 @@ + @@ -13,18 +14,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/gmc_emmod206.xml b/test/test-frames/gmc_emmod206.xml index ab18ed2..a62b611 100644 --- a/test/test-frames/gmc_emmod206.xml +++ b/test/test-frames/gmc_emmod206.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/kamstrup_multical_601.xml b/test/test-frames/kamstrup_multical_601.xml index 5b74577..8314ced 100644 --- a/test/test-frames/kamstrup_multical_601.xml +++ b/test/test-frames/kamstrup_multical_601.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/manual_frame2.xml b/test/test-frames/manual_frame2.xml index 131dd59..c612475 100644 --- a/test/test-frames/manual_frame2.xml +++ b/test/test-frames/manual_frame2.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/manual_frame3.xml b/test/test-frames/manual_frame3.xml index 34a51b5..a7eaeca 100644 --- a/test/test-frames/manual_frame3.xml +++ b/test/test-frames/manual_frame3.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/manual_frame7.xml b/test/test-frames/manual_frame7.xml index a3c2dad..290bc4e 100644 --- a/test/test-frames/manual_frame7.xml +++ b/test/test-frames/manual_frame7.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/nzr_dhz_5_63.xml b/test/test-frames/nzr_dhz_5_63.xml index 40b91b2..fd056d7 100644 --- a/test/test-frames/nzr_dhz_5_63.xml +++ b/test/test-frames/nzr_dhz_5_63.xml @@ -1,3 +1,4 @@ + diff --git a/test/test-frames/svm_f22_telegram1.xml b/test/test-frames/svm_f22_telegram1.xml index 19f4743..93cd0c6 100644 --- a/test/test-frames/svm_f22_telegram1.xml +++ b/test/test-frames/svm_f22_telegram1.xml @@ -1,10 +1,11 @@ + 1006089 SVM 9 - Kamstrup SVM F22 + Elster F4 / Kamstrup SVM F22 Heat: Inlet 148 70 @@ -13,78 +14,97 @@ Instantaneous value + 0 Energy (kWh) 28014 Instantaneous value + 0 Volume (m m^3) 640581 Instantaneous value + 0 + 0 + 1 Volume (m m^3) 640581 Instantaneous value + 0 Flow temperature (deg C) 243 Instantaneous value + 0 Return temperature (deg C) 243 Instantaneous value + 0 Temperature Difference (1e-1 deg C) 0 Instantaneous value + 0 On time (hours) 6370 Instantaneous value + 0 Operating time (hours) 6363 Instantaneous value + 0 Volume flow (m m^3/h) 0 Instantaneous value + 0 Power (10 W) 0 Instantaneous value + 0 Time Point (time & date) 2021-02-08T21: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/wmbus-converted.xml b/test/test-frames/wmbus-converted.xml index e7f0686..742426a 100644 --- a/test/test-frames/wmbus-converted.xml +++ b/test/test-frames/wmbus-converted.xml @@ -1,3 +1,4 @@ +