From 706ea1ca289761af0125ffd8122956ee00fb4ba2 Mon Sep 17 00:00:00 2001
From: BIBO <49994376+BIBOLV@users.noreply.github.com>
Date: Fri, 14 Apr 2023 04:35:34 +0300
Subject: [PATCH 1/3] Update driver_hydrocalm3.cc

Adding HYDROCAL-M4 - https://github.com/wmbusmeters/wmbusmeters/issues/942
Judging from telegram and documentation all important fields in standard telegram are described. Manufacturer specific one could be battery percentage, judging from documentation.
---
 src/driver_hydrocalm3.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/driver_hydrocalm3.cc b/src/driver_hydrocalm3.cc
index 05b7f20..130d4ce 100644
--- a/src/driver_hydrocalm3.cc
+++ b/src/driver_hydrocalm3.cc
@@ -31,6 +31,7 @@ namespace
         di.setMeterType(MeterType::HeatMeter);
         di.addLinkMode(LinkMode::T1);
         di.addDetection(MANUFACTURER_BMT, 0x0d,  0x0b);
+        di.addDetection(MANUFACTURER_BMT, 0x0d,  0x1a); // HYDROCAL-M4
         di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new Driver(mi, di)); });
     });
 
@@ -162,3 +163,8 @@ namespace
 // telegram=|8E44B409747372710B0D7A798080052F2F_0C0E59600100046D1D36B9290C13679947000C0E000000000C13590000000C13000000000C13000000000A5A18020A5E11020F823D06003D06003D06003D0600140600620500480400E402001601000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002F2F|
 // {"media":"heat/cooling load","meter":"hydrocalm3","name":"HeatCool","id":"71727374","status": "SABOTAGE_ENCLOSURE","total_heating_kwh":4460.833333,"total_cooling_kwh":0,"device_datetime":"2021-09-25 22:29","total_heating_m3":479.967,"total_cooling_m3":0.059,"c1_volume_m3":0,"c2_volume_m3":0,"supply_temperature_c":21.8,"return_temperature_c":21.1,"timestamp":"1111-11-11T11:11:11Z"}
 // |HeatCool;71727374;4460.833333;0;1111-11-11 11:11.11
+//
+// Test:testm4 hydrocalm3 38031627 NOKEY
+// telegram=|2C44B409271603381A0D8C208A7ACE000020_046D0CB6ED240C03267300000C13130800000F6300000000000000|
+// {"media":"heat/cooling load","meter":"hydrocalm3","name":"testm4","id":"38031627","status":"OK","total_heating_kwh":7.326,"device_datetime":"2023-04-13 22:12","total_cooling_kwh":null,"total_heating_m3":0.813,"total_cooling_m3":null,"c1_volume_m3":null,"c2_volume_m3":null,"supply_temperature_c":null,"return_temperature_c":null,"timestamp":"1111-11-11T11:11:11Z"}
+// |testm4;38031627;7.326;2023-04-13 22:12;1111-11-11 11:11.11

From 24c4fda37138183b2f5e29ba95f5fcefa4654eaf Mon Sep 17 00:00:00 2001
From: BIBO <49994376+BIBOLV@users.noreply.github.com>
Date: Fri, 14 Apr 2023 04:49:27 +0300
Subject: [PATCH 2/3] Update driver_hydrocalm3.cc

---
 src/driver_hydrocalm3.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/driver_hydrocalm3.cc b/src/driver_hydrocalm3.cc
index 130d4ce..97f48c5 100644
--- a/src/driver_hydrocalm3.cc
+++ b/src/driver_hydrocalm3.cc
@@ -159,12 +159,12 @@ namespace
      }
 }
 
-// Test:HeatCool hydrocalm3 71727374 NOKEY
+// Test: HeatCool hydrocalm3 71727374 NOKEY
 // telegram=|8E44B409747372710B0D7A798080052F2F_0C0E59600100046D1D36B9290C13679947000C0E000000000C13590000000C13000000000C13000000000A5A18020A5E11020F823D06003D06003D06003D0600140600620500480400E402001601000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002F2F|
 // {"media":"heat/cooling load","meter":"hydrocalm3","name":"HeatCool","id":"71727374","status": "SABOTAGE_ENCLOSURE","total_heating_kwh":4460.833333,"total_cooling_kwh":0,"device_datetime":"2021-09-25 22:29","total_heating_m3":479.967,"total_cooling_m3":0.059,"c1_volume_m3":0,"c2_volume_m3":0,"supply_temperature_c":21.8,"return_temperature_c":21.1,"timestamp":"1111-11-11T11:11:11Z"}
 // |HeatCool;71727374;4460.833333;0;1111-11-11 11:11.11
 //
-// Test:testm4 hydrocalm3 38031627 NOKEY
+// Test: testm4 hydrocalm3 38031627 NOKEY
 // telegram=|2C44B409271603381A0D8C208A7ACE000020_046D0CB6ED240C03267300000C13130800000F6300000000000000|
 // {"media":"heat/cooling load","meter":"hydrocalm3","name":"testm4","id":"38031627","status":"OK","total_heating_kwh":7.326,"device_datetime":"2023-04-13 22:12","total_cooling_kwh":null,"total_heating_m3":0.813,"total_cooling_m3":null,"c1_volume_m3":null,"c2_volume_m3":null,"supply_temperature_c":null,"return_temperature_c":null,"timestamp":"1111-11-11T11:11:11Z"}
 // |testm4;38031627;7.326;2023-04-13 22:12;1111-11-11 11:11.11

From 60c9fe7a1819b33c8beab208022137953f81cbfd Mon Sep 17 00:00:00 2001
From: BIBO <49994376+BIBOLV@users.noreply.github.com>
Date: Fri, 14 Apr 2023 05:05:26 +0300
Subject: [PATCH 3/3] Update driver_hydrocalm3.cc

---
 src/driver_hydrocalm3.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/driver_hydrocalm3.cc b/src/driver_hydrocalm3.cc
index 97f48c5..2777411 100644
--- a/src/driver_hydrocalm3.cc
+++ b/src/driver_hydrocalm3.cc
@@ -167,4 +167,4 @@ namespace
 // Test: testm4 hydrocalm3 38031627 NOKEY
 // telegram=|2C44B409271603381A0D8C208A7ACE000020_046D0CB6ED240C03267300000C13130800000F6300000000000000|
 // {"media":"heat/cooling load","meter":"hydrocalm3","name":"testm4","id":"38031627","status":"OK","total_heating_kwh":7.326,"device_datetime":"2023-04-13 22:12","total_cooling_kwh":null,"total_heating_m3":0.813,"total_cooling_m3":null,"c1_volume_m3":null,"c2_volume_m3":null,"supply_temperature_c":null,"return_temperature_c":null,"timestamp":"1111-11-11T11:11:11Z"}
-// |testm4;38031627;7.326;2023-04-13 22:12;1111-11-11 11:11.11
+// |testm4;38031627;7.326;0;1111-11-11 11:11.11