fix: add debug for esp, fix sample in server

brushknight · Sep 29, 2021 · 6a1c12a · 6a1c12a
1 parent ae0028d
commit 6a1c12a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/esp32/src/climate.cpp b/esp32/src/climate.cpp
@@ -125,8 +125,11 @@ time in UTC
         // Serial.println("4: cold side");
         ClimateData coldSide = readTempHumid(dhtColdSide);
 
-        // debug
-        coldSide = readTempHumid(dhtHotSide);
+        if (DEBUG){
+            // debug
+            coldSide = readTempHumid(dhtHotSide);
+        }
+
 
         if ((hotSide.t > 0 || hotCenter.t > 0) && (coldCenter.t > 0 || coldSide.t > 0))
         {

diff --git a/server/server.go b/server/server.go
@@ -42,16 +42,16 @@ type Data struct {
 	Heater      bool          `json:"heater"`
 	Config      ClimateConfig `json:"climate_config"`
 	HeaterPhase string        `json:"heater_phase"`
+	System      System        `json:"system"`
 }
 
 var errResponse struct {
 	Message string `json:"error"`
 }
 
 type Storage struct {
-	Data      Data   `json:"data"`
-	Timestamp int64  `json:"timestamp"`
-	System    System `json:"system"`
+	Data      Data  `json:"data"`
+	Timestamp int64 `json:"timestamp"`
 }
 
 var storage map[int]Storage