From 78ed2b5f13f2598b0b523c111e30b7ef9e13f63b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= <oehrstroem@gmail.com>
Date: Tue, 13 Apr 2021 12:05:59 +0200
Subject: [PATCH] Add test for QWater5.5 and update README/CHANGES.

---
 CHANGES                       | 2 ++
 README.md                     | 1 +
 simulations/simulation_s1.txt | 5 +++++
 tests/test_s1_meters.sh       | 5 +++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5af413c..22abe82 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 
+Mblnk added support for Qundis QWater5.5. Thanks Mblnk!
+
 Support added for the water meter Diehl IZAR RC I G4.
 
 Version 1.3.0: 2021-04-09
diff --git a/README.md b/README.md
index a029f0a..df6d168 100644
--- a/README.md
+++ b/README.md
@@ -299,6 +299,7 @@ Honeywell Q400 (q400)
 Kamstrup Multical 21 (multical21)
 Kamstrup flowIQ 2200 (flowiq2200)
 Kamstrup flowIQ 3100 (flowiq3100)
+Qundis QWater5.5 (lse_07_17)
 Sontex Supercom 587 (supercom587)
 Sensus iPERL (iperl)
 Techem MK Radio 3 and 4 (mkradio3,mkradio4) (non-standard protocols)
diff --git a/simulations/simulation_s1.txt b/simulations/simulation_s1.txt
index e9025eb..f451130 100644
--- a/simulations/simulation_s1.txt
+++ b/simulations/simulation_s1.txt
@@ -10,3 +10,8 @@ telegram=|244465323251839134087a4f0000000b6e0403004b6e660300426c9e29326cffff046d
 telegram=|294465324185990401087a0080000082046c7f018b046e210300046d1a0e6f0202fdac7e012301fd0c01|
 {"media":"heat cost allocation","meter":"lse_08","name":"HCA2","id":"04998541","set_date":"2003-01-31","consumption_at_set_date_hca":321,"device_date_time":"2003-02-15 14:26","duration_since_readout_h":2.489167,"software_version":"1","timestamp":"1111-11-11T11:11:11Z"}
 |HCA2;04998541;2003-01-31;321.000000;1111-11-11 11:11.11
+
+# Test Qundis QWater5.5 S1 meter.
+telegram=|2D4465327663341317077AAA0000000C13044001004C1340620000426C9F2C02BB560000326CFFFF046D180DA924|
+{"media":"water","meter":"lse_07_17","name":"QW","id":"13346376","total_m3":14.004,"due_date_m3":6.24,"due_date":"2020-12-31","error_code":"OK","error_date":"2127-15-31","device_date_time":"2021-04-09 13:24","timestamp":"1111-11-11T11:11:11Z"}
+|QW;13346376;14.004000;6.240000;2020-12-31;OK;2127-15-31;2021-04-09 13:24;1111-11-11 11:11.11
diff --git a/tests/test_s1_meters.sh b/tests/test_s1_meters.sh
index e84f15b..ad39969 100755
--- a/tests/test_s1_meters.sh
+++ b/tests/test_s1_meters.sh
@@ -8,8 +8,9 @@ TEST=testoutput
 TESTNAME="Test S1 meters"
 TESTRESULT="ERROR"
 
-METERS="HCA auto 91835132 NOKEY \
-        HCA2 auto 04998541 NOKEY"
+METERS="HCA  auto 91835132 NOKEY \
+        HCA2 auto 04998541 NOKEY \
+        QW   auto 13346376 NOKEY "
 
 cat simulations/simulation_s1.txt | grep '^{' > $TEST/test_expected.txt
 $PROG --format=json simulations/simulation_s1.txt $METERS > $TEST/test_output.txt 2> $TEST/test_stderr.txt