feat: add heater phase telemetry

brushknight · May 18, 2021 · 18cbb41 · 18cbb41
1 parent e66d012
commit 18cbb41
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/esp32/src/climate.cpp b/esp32/src/climate.cpp
@@ -39,11 +39,6 @@ namespace Climate
 
     volatile byte relayState = LOW;
 
-    enum HeaterPhase
-    {
-        heating,
-        cooling
-    };
 
     HeaterPhase heaterPhase;
 
@@ -166,6 +161,7 @@ namespace Climate
         telemetryData.hotCenter = hotCenter;
         telemetryData.coldCenter = coldCenter;
         telemetryData.coldSide = coldSide;
+        telemetryData.heaterPhase = heaterPhase;
 
         telemetryData.climateConfig.dayMaxTemp = DAY_MAX_TEMP;
         telemetryData.climateConfig.nightMaxTemp = NIGHT_MAX_TEMP;

diff --git a/esp32/src/climate_data.h b/esp32/src/climate_data.h
@@ -11,6 +11,13 @@ namespace Climate
          float t;
          float h;
     };
+
+
+    enum HeaterPhase
+    {
+        heating,
+        cooling
+    };
 }
 
 #endif
diff --git a/esp32/src/telemetry.cpp b/esp32/src/telemetry.cpp
@@ -19,6 +19,13 @@ namespace Telemetry
         StaticJsonDocument<400> doc;
 
         doc["heater"] = telemteryData.heater;
+        if (telemteryData.heaterPhase == cooling){
+            doc["heater_phase"] = "cooling";
+        }else{
+            doc["heater_phase"] = "heating";
+        }
+
+
 
         doc.createNestedObject("hot_side");
         doc["hot_side"]["H"] = telemteryData.hotSide.h;

diff --git a/esp32/src/telemetry.h b/esp32/src/telemetry.h
@@ -26,6 +26,7 @@ namespace Telemetry
         ClimateData coldSide;
         ClimateConfig climateConfig;
         bool heater;
+        HeaterPhase heaterPhase;
     };
 
     void send(TelemteryData telemteryData);

diff --git a/server/server.go b/server/server.go
@@ -24,12 +24,13 @@ type ClimateConfig struct {
 }
 
 type Data struct {
-	HotSide    ClimateData   `json:"hot_side"`
-	HotCenter  ClimateData   `json:"hot_center"`
-	ColdCenter ClimateData   `json:"cold_center"`
-	ColdSide   ClimateData   `json:"cold_side"`
-	Heater     bool          `json:"heater"`
-	Config     ClimateConfig `json:"climate_config"`
+	HotSide     ClimateData   `json:"hot_side"`
+	HotCenter   ClimateData   `json:"hot_center"`
+	ColdCenter  ClimateData   `json:"cold_center"`
+	ColdSide    ClimateData   `json:"cold_side"`
+	Heater      bool          `json:"heater"`
+	Config      ClimateConfig `json:"climate_config"`
+	HeaterPhase string        `json:"heater_phase"`
 }
 
 var errResponse struct {