From 16507dcb23acfb9b10449c7248d877904e7b1174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= <oehrstroem@gmail.com>
Date: Sat, 16 Oct 2021 21:09:05 +0200
Subject: [PATCH] Rename unknown fields in hydrocalm3.

---
 simulations/simulation_t1.txt | 2 +-
 src/meter_hydrocalm3.cc       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/simulations/simulation_t1.txt b/simulations/simulation_t1.txt
index 6f02a8d..e7bd49c 100644
--- a/simulations/simulation_t1.txt
+++ b/simulations/simulation_t1.txt
@@ -285,7 +285,7 @@ telegram=|6044B8059430040001037A1D005085E2B670BCF1A5C87E0C1A51DA18924EF984613DA2
 
 # Test Hydrocal M3 heat/cooling meter
 telegram=|8E44B409747372710B0D7A798080052F2F|0C0E59600100046D1D36B9290C13679947000C0E000000000C13590000000C13000000000C13000000000A5A18020A5E11020F823D06003D06003D06003D0600140600620500480400E402001601000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002F2F|
-{"media":"heat/cooling load","meter":"hydrocalm3","name":"HeatCool","id":"71727374","total_heating_kwh":4460.833333,"total_cooling_kwh":0,"device_date_time":"2021-09-25 22:29","total_heating_m3":0.059,"total_cooling_m3":0,"total_cooling_m3":0,"supply_volume_m3":0,"return_volume_m3":0,"supply_temperature_c":21.8,"return_temperature_c":21.1,"timestamp":"1111-11-11T11:11:11Z"}
+{"media":"heat/cooling load","meter":"hydrocalm3","name":"HeatCool","id":"71727374","total_heating_kwh":4460.833333,"total_cooling_kwh":0,"device_date_time":"2021-09-25 22:29","total_heating_m3":0.059,"total_cooling_m3":0,"total_cooling_m3":0,"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.000000;1111-11-11 11:11.11
 
 # Test Weptech Munia temperature hygrometer
diff --git a/src/meter_hydrocalm3.cc b/src/meter_hydrocalm3.cc
index dda48b4..2ad0e08 100644
--- a/src/meter_hydrocalm3.cc
+++ b/src/meter_hydrocalm3.cc
@@ -85,12 +85,12 @@ MeterHydrocalM3::MeterHydrocalM3(MeterInfo &mi) :
              "Total cooling volume of media.",
              false, true);
 
-    addPrint("supply_volume", Quantity::Volume,
+    addPrint("c1_volume", Quantity::Volume,
              [&](Unit u){ assertQuantity(u, Quantity::Volume); return convert(c1_volume_m3_, Unit::M3, u); },
              "Supply c1 volume.",
              false, true);
 
-    addPrint("return_volume", Quantity::Volume,
+    addPrint("c2_volume", Quantity::Volume,
              [&](Unit u){ assertQuantity(u, Quantity::Volume); return convert(c2_volume_m3_, Unit::M3, u); },
              "Return c2 volume.",
              false, true);