Add version 0x34 for qcaloric hca meters.

simulations/simulation_c1.txt

@@ -34,6 +34,13 @@ telegram=|25442D2C6767676730048D203AD2684020|D81579E7F1D5902C00000000006300007F2
 telegram=|314493441234567835087a740000200b6e2701004b6e450100426c5f2ccb086e790000c2086c7f21326cffff046d200b7422|
 {"media":"heat cost allocation","meter":"qcaloric","name":"MyElement","id":"78563412","current_consumption_hca":127,"set_date":"2018-12-31","consumption_at_set_date_hca":145,"set_date_1":"2018-12-31","consumption_at_set_date_1_hca":145,"set_date_17":"2019-01-31","consumption_at_set_date_17_hca":79,"error_date":"2127-15-31","device_date_time":"2019-02-20 11:32","timestamp":"1111-11-11T11:11:11Z"}
 
+# Test another pair of QCalric C1 telegrams
+telegram=|49449344939291903408780DFF5F350082180000800007B06EFFFF970000009F2C70020000BE26970000000000010018002E001F002E0023FF210008000500020000002F046D220FA227|
+{"media":"heat cost allocation","meter":"qcaloric","name":"MyElement2","id":"90919293","current_consumption_hca":0,"set_date":"","consumption_at_set_date_hca":0,"set_date_1":"","consumption_at_set_date_1_hca":0,"set_date_17":"","consumption_at_set_date_17_hca":0,"error_date":"","device_date_time":"2021-07-02 15:34","timestamp":"1111-11-11T11:11:11Z"}
+
+telegram=|314493449392919034087a520000200b6e9700004b6e700200426c9f2ccb086e970000c2086cbe26326cffff046d2d16a227|
+{"media":"heat cost allocation","meter":"qcaloric","name":"MyElement2","id":"90919293","current_consumption_hca":97,"set_date":"2020-12-31","consumption_at_set_date_hca":270,"set_date_1":"2020-12-31","consumption_at_set_date_1_hca":270,"set_date_17":"2021-06-30","consumption_at_set_date_17_hca":97,"error_date":"2127-15-31","device_date_time":"2021-07-02 22:45","timestamp":"1111-11-11T11:11:11Z"}
+
 # Test CMa12w C1 telegrams
 
 telegram=|2744961566666666201B7AF9000020|2F2F02651E094265180902FD1B30030DFD0F05302E302E340F|

src/meter_detection.h

@@ -94,6 +94,7 @@
     X(TSD2,       MANUFACTURER_TCH, 0xf0,  0x76) \
     X(Q400,       MANUFACTURER_AXI, 0x07,  0x10) \
     X(QCALORIC,   MANUFACTURER_QDS, 0x08,  0x35) \
+    X(QCALORIC,   MANUFACTURER_QDS, 0x08,  0x34) \
     X(SHARKY,     MANUFACTURER_HYD, 0x04,  0x20) \
     X(SUPERCOM587,MANUFACTURER_SON, 0x06,  0x3c) \
     X(SUPERCOM587,MANUFACTURER_SON, 0x07,  0x3c) \

tests/config1/etc/wmbusmeters.d/MyElement2

@@ -0,0 +1,4 @@
+name=MyElement2
+type=qcaloric
+id=90919293
+key=

tests/test_c1_meters.sh

@@ -16,6 +16,7 @@ $PROG --format=json simulations/simulation_c1.txt \
       MyWater flowiq2200 52525252 NOKEY \
       Vadden multical21 44556677 NOKEY \
       MyElement qcaloric 78563412 NOKEY \
+      MyElement2 qcaloric 90919293 NOKEY \
       Rum cma12w 66666666 NOKEY \
       My403Cooling multical403 78780102 NOKEY \
       Heat multical603 36363636 NOKEY \