diff --git a/test/test-frames/Elster-F2.hex b/test/test-frames/Elster-F2.hex new file mode 100644 index 0000000..ea2515d --- /dev/null +++ b/test/test-frames/Elster-F2.hex @@ -0,0 +1 @@ +68 90 90 68 08 01 72 57 26 80 00 CD 4E 08 04 46 00 00 00 04 06 98 14 00 00 04 14 6B D6 01 00 84 40 14 79 66 01 00 02 5B 1C 00 02 5F 22 00 02 62 00 00 04 22 B1 A1 00 00 04 26 B1 A1 00 00 04 3B 00 00 00 00 04 2C 00 00 00 00 04 6D 0C 0C BD 16 84 40 6E 00 00 00 00 84 80 40 6E 00 00 00 00 1F C4 09 01 01 12 00 01 01 01 07 57 26 80 00 CD 4E 08 04 07 A3 FF 03 57 26 80 00 04 04 0D 02 FF 0F 05 3C FF 62 E7 62 96 0A 89 0A 02 00 15 40 17 01 00 00 63 42 DE 16 diff --git a/test/test-frames/Elster-F2.xml b/test/test-frames/Elster-F2.xml new file mode 100644 index 0000000..7fea60b --- /dev/null +++ b/test/test-frames/Elster-F2.xml @@ -0,0 +1,97 @@ + + + + 802657 + SVM + 8 + Elster F2 + Heat: Outlet + 70 + 00 + 0000 + + + + Instantaneous value + Energy (kWh) + 5272 + + + + Instantaneous value + Volume (1e-2 m^3) + 120427 + + + + Instantaneous value + Volume (1e-2 m^3) + 91769 + + + + Instantaneous value + Flow temperature (deg C) + 28 + + + + Instantaneous value + Return temperature (deg C) + 34 + + + + Instantaneous value + Temperature Difference (1e-1 deg C) + 0 + + + + Instantaneous value + On time (hours) + 41393 + + + + Instantaneous value + Operating time (hours) + 41393 + + + + Instantaneous value + Volume flow (m m^3/h) + 0 + + + + Instantaneous value + Power (10 W) + 0 + + + + Instantaneous value + Time Point (time & date) + 2013-06-29T12:12:00 + + + + Instantaneous value + Units for H.C.A. + 0 + + + + Instantaneous value + Units for H.C.A. + 0 + + + + More records follow + C4 09 01 01 12 00 01 01 01 07 57 26 80 00 CD 4E 08 04 07 A3 FF 03 57 26 80 00 04 04 0D 02 FF 0F 05 3C FF 62 E7 62 96 0A 89 0A 02 00 15 40 17 01 00 00 63 42 + + + diff --git a/test/test-frames/abb_f95.xml b/test/test-frames/abb_f95.xml index 1545820..2db805d 100644 --- a/test/test-frames/abb_f95.xml +++ b/test/test-frames/abb_f95.xml @@ -4,6 +4,7 @@ 26718590 HYD 40 + ABB F95 Typ US770 Heat: Outlet 115 50 diff --git a/test/test-frames/allmess_cf50.xml b/test/test-frames/allmess_cf50.xml index c2cb03a..c16a2c1 100644 --- a/test/test-frames/allmess_cf50.xml +++ b/test/test-frames/allmess_cf50.xml @@ -4,6 +4,7 @@ 2205100 SLB 2 + Allmess Megacontrol CF-50 Heat: Outlet 0 88 diff --git a/test/test-frames/electricity-meter-1.xml b/test/test-frames/electricity-meter-1.xml index 9b285b0..10c83d5 100644 --- a/test/test-frames/electricity-meter-1.xml +++ b/test/test-frames/electricity-meter-1.xml @@ -4,6 +4,7 @@ 5000244 SBC 18 + Electricity 19 00 diff --git a/test/test-frames/electricity-meter-2.xml b/test/test-frames/electricity-meter-2.xml index 5d0a7d4..ff07f0d 100644 --- a/test/test-frames/electricity-meter-2.xml +++ b/test/test-frames/electricity-meter-2.xml @@ -4,6 +4,7 @@ 5000345 @@@ 18 + Electricity 37 00 diff --git a/test/test-frames/els_tmpa_telegramm1.xml b/test/test-frames/els_tmpa_telegramm1.xml index 872df93..d0b4fa9 100644 --- a/test/test-frames/els_tmpa_telegramm1.xml +++ b/test/test-frames/els_tmpa_telegramm1.xml @@ -4,6 +4,7 @@ 70112345 ELS 2 + Elster TMP-A Water 2 00 diff --git a/test/test-frames/elv_temp_humid.xml b/test/test-frames/elv_temp_humid.xml index 91ee7bb..c02fcc3 100644 --- a/test/test-frames/elv_temp_humid.xml +++ b/test/test-frames/elv_temp_humid.xml @@ -4,7 +4,7 @@ 54000834 ELV 50 - + Elvaco CMa11 Other 242 00 @@ -15,90 +15,77 @@ Instantaneous value Digital input (binary) 0 - 1970-01-01T00:00:00 Instantaneous value 1e-2 %RH 4564 - 1970-01-01T00:00:00 Minimum value 1e-2 %RH 4552 - 1970-01-01T00:00:00 Maximum value 1e-2 %RH 5812 - 1970-01-01T00:00:00 Instantaneous value External temperature (1e-2 deg C) 2256 - 1970-01-01T00:00:00 Minimum value External temperature (1e-2 deg C) 2160 - 1970-01-01T00:00:00 Maximum value External temperature (1e-2 deg C) 2339 - 1970-01-01T00:00:00 Instantaneous value Averaging Duration (hours) 24 - 1970-01-01T00:00:00 Instantaneous value External temperature (1e-2 deg C) 2276 - 1970-01-01T00:00:00 Instantaneous value External temperature (1e-2 deg C) 2269 - 1970-01-01T00:00:00 Instantaneous value Fabrication number 54000834 - 1970-01-01T00:00:00 Instantaneous value Software version 262144 - 1970-01-01T00:00:00 More records follow - 1970-01-01T00:00:00 diff --git a/test/test-frames/emh_diz.xml b/test/test-frames/emh_diz.xml index 9b37129..78117ee 100644 --- a/test/test-frames/emh_diz.xml +++ b/test/test-frames/emh_diz.xml @@ -4,6 +4,7 @@ 623702 EMH 0 + EMH DIZ Electricity 7 00 diff --git a/test/test-frames/frame1.xml b/test/test-frames/frame1.xml index 32f246d..6b7daa7 100644 --- a/test/test-frames/frame1.xml +++ b/test/test-frames/frame1.xml @@ -4,6 +4,7 @@ 10060958 LSE 22 + Bus/System 123 00 diff --git a/test/test-frames/frame2.xml b/test/test-frames/frame2.xml index f1372ca..2b1211e 100644 --- a/test/test-frames/frame2.xml +++ b/test/test-frames/frame2.xml @@ -4,6 +4,7 @@ 12345678 PAD 1 + Water 85 00 diff --git a/test/test-frames/kamstrup_multical_601.xml b/test/test-frames/kamstrup_multical_601.xml index 7be7b49..856f7dc 100644 --- a/test/test-frames/kamstrup_multical_601.xml +++ b/test/test-frames/kamstrup_multical_601.xml @@ -4,6 +4,7 @@ 6855817 KAM 8 + Kamstrup Multical 601 Heat: Outlet 4 00 diff --git a/test/test-frames/manual_frame3.xml b/test/test-frames/manual_frame3.xml index f1372ca..2b1211e 100644 --- a/test/test-frames/manual_frame3.xml +++ b/test/test-frames/manual_frame3.xml @@ -4,6 +4,7 @@ 12345678 PAD 1 + Water 85 00 diff --git a/test/test-frames/manual_frame7.xml b/test/test-frames/manual_frame7.xml index 41f9653..dc166e3 100644 --- a/test/test-frames/manual_frame7.xml +++ b/test/test-frames/manual_frame7.xml @@ -4,6 +4,7 @@ 12345678 PAD 1 + Water 19 00 diff --git a/test/test-frames/nzr_dhz_5_63.xml b/test/test-frames/nzr_dhz_5_63.xml index e5361f0..f7120a3 100644 --- a/test/test-frames/nzr_dhz_5_63.xml +++ b/test/test-frames/nzr_dhz_5_63.xml @@ -4,6 +4,7 @@ 30100608 NZR 1 + NZR DHZ 5/63 Electricity 1 00 diff --git a/test/test-frames/svm_f22_telegram1.xml b/test/test-frames/svm_f22_telegram1.xml index 00e2178..19f4743 100644 --- a/test/test-frames/svm_f22_telegram1.xml +++ b/test/test-frames/svm_f22_telegram1.xml @@ -4,6 +4,7 @@ 1006089 SVM 9 + Kamstrup SVM F22 Heat: Inlet 148 70 diff --git a/test/test-frames/wmbus-converted.xml b/test/test-frames/wmbus-converted.xml index ec235a9..aefeabd 100644 --- a/test/test-frames/wmbus-converted.xml +++ b/test/test-frames/wmbus-converted.xml @@ -15,7 +15,6 @@ Instantaneous value Energy (Wh) 5000 - 1970-01-01T00:00:00