From c4441178536fd2a1710c883c7964110bdb4acb53 Mon Sep 17 00:00:00 2001
From: Ollo <Ollo@host>
Date: Sun, 21 Aug 2022 11:59:50 +0200
Subject: [PATCH] code refactoring: use the defined states of header file

---
 esp32/include/HomieTypes.h |  6 +++---
 esp32/include/PlantCtrl.h  |  2 +-
 esp32/src/PlantCtrl.cpp    |  4 ++--
 esp32/src/main.cpp         | 24 ++++++++++++------------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/esp32/include/HomieTypes.h b/esp32/include/HomieTypes.h
index 861a105..95efe6a 100644
--- a/esp32/include/HomieTypes.h
+++ b/esp32/include/HomieTypes.h
@@ -69,9 +69,9 @@ static const char *SENSOR_STRING[] = {
 #define PLANTSTATE_STR_NO_SENSOR        "nosensor"
 #define PLANTSTATE_STR_WET              "wet"
 #define PLANTSTATE_STR_SUNNY_ALARM      "sunny+alarm"
-#define PLANTSTATE_STR_ACTIVE_ALARM     "activate+alarm"
-#define PLANTSTATE_STR_ACTIVE_SUPESSED  "activate+supressed"
-#define PLANTSTATE_STR_ACTIVE           "activate"
+#define PLANTSTATE_STR_ACTIVE_ALARM     "active+alarm"
+#define PLANTSTATE_STR_ACTIVE_SUPESSED  "active+supressed"
+#define PLANTSTATE_STR_ACTIVE           "active"
 #define PLANTSTATE_STR_SUNNY            "sunny"
 #define PLANTSTATE_STR_COOLDOWN_ALARM   "cooldown+alarm"
 #define PLANTSTATE_STR_COOLDOWN         "cooldown"
diff --git a/esp32/include/PlantCtrl.h b/esp32/include/PlantCtrl.h
index 332b1a7..dc4b2e8 100644
--- a/esp32/include/PlantCtrl.h
+++ b/esp32/include/PlantCtrl.h
@@ -197,7 +197,7 @@ public:
         return this->mSetting->pPumpOnlyWhenLowLight->get();
     }
 
-    void publishState(String state);
+    void publishState(int stateNumber, String stateString);
 
     bool switchHandler(const HomieRange &range, const String &value);
 
diff --git a/esp32/src/PlantCtrl.cpp b/esp32/src/PlantCtrl.cpp
index 246d880..ca68bfa 100644
--- a/esp32/src/PlantCtrl.cpp
+++ b/esp32/src/PlantCtrl.cpp
@@ -209,11 +209,11 @@ void Plant::deactivatePump(void)
     }
 }
 
-void Plant::publishState(String state)
+void Plant::publishState(int stateNumber, String stateString)
 {
     if (this->mConnected)
     {
-        this->mPlant->setProperty("state").send(state);
+        this->mPlant->setProperty("state").send(stateString);
     }
 }
 
diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp
index 369cbc5..0df2994 100644
--- a/esp32/src/main.cpp
+++ b/esp32/src/main.cpp
@@ -429,7 +429,7 @@ int determineNextPump(bool isLowLight)
     Plant plant = mPlants[i];
     if (!plant.isPumpTriggerActive())
     {
-      plant.publishState("deactivated");
+      plant.publishState(PLANTSTATE_NUM_DEACTIVATED, PLANTSTATE_STR_DEACTIVATED);
       log(LOG_LEVEL_DEBUG, String(String(i) + " Skip deactivated pump"), LOG_DEBUG_CODE);
       continue;
     }
@@ -437,11 +437,11 @@ int determineNextPump(bool isLowLight)
     {
       if (wateralarm)
       {
-        plant.publishState("cooldown+alarm");
+        plant.publishState(PLANTSTATE_NUM_COOLDOWN_ALARM, PLANTSTATE_STR_COOLDOWN_ALARM);
       }
       else
       {
-        plant.publishState("cooldown");
+        plant.publishState(PLANTSTATE_NUM_COOLDOWN, PLANTSTATE_STR_COOLDOWN);
       }
       log(LOG_LEVEL_DEBUG, String(String(i) + " Skipping due to cooldown " + String(rtcLastWateringPlant[i] + plant.getCooldownInSeconds())), LOG_DEBUG_CODE);
       continue;
@@ -450,11 +450,11 @@ int determineNextPump(bool isLowLight)
     {
       if (wateralarm)
       {
-        plant.publishState("sunny+alarm");
+        plant.publishState(PLANTSTATE_NUM_SUNNY_ALARM, PLANTSTATE_STR_SUNNY_ALARM);
       }
       else
       {
-        plant.publishState("sunny");
+        plant.publishState(PLANTSTATE_NUM_SUNNY, PLANTSTATE_STR_SUNNY);
       }
 
       log(LOG_LEVEL_DEBUG, String(String(i) + " No pump required: due to light"), LOG_DEBUG_CODE);
@@ -464,7 +464,7 @@ int determineNextPump(bool isLowLight)
     {
       if (equalish(plant.getCurrentMoistureRaw(), MISSING_SENSOR))
       {
-        plant.publishState("nosensor");
+        plant.publishState(PLANTSTATE_NUM_NO_SENSOR, PLANTSTATE_STR_NO_SENSOR);
         log(LOG_LEVEL_ERROR, String(String(i) + " No pump possible: missing sensor"), LOG_MISSING_PUMP);
         continue;
       }
@@ -483,17 +483,17 @@ int determineNextPump(bool isLowLight)
       {
         if (wateralarm)
         {
-          plant.publishState("active+alarm");
+          plant.publishState(PLANTSTATE_NUM_ACTIVE_ALARM, PLANTSTATE_STR_ACTIVE_ALARM);
         }
         else
         {
           if (mDownloadMode)
           {
-            plant.publishState("active+supressed");
+            plant.publishState(PLANTSTATE_NUM_ACTIVE_SUPESSED, PLANTSTATE_STR_ACTIVE_SUPESSED);
           }
           else
           {
-            plant.publishState("active");
+            plant.publishState(PLANTSTATE_NUM_ACTIVE, PLANTSTATE_STR_ACTIVE);
           }
         }
 
@@ -510,11 +510,11 @@ int determineNextPump(bool isLowLight)
       {
         if (wateralarm)
         {
-          plant.publishState("after-work+alarm");
+          plant.publishState(PLANTSTATE_NUM_AFTERWORK_ALARM, PLANTSTATE_STR_AFTERWORK_ALARM);
         }
         else
         {
-          plant.publishState("after-work");
+          plant.publishState(PLANTSTATE_NUM_AFTERWORK, PLANTSTATE_STR_AFTERWORK);
         }
         log(LOG_LEVEL_DEBUG, String(String(i) + " ignored due to time boundary: " + String(plant.getHoursStart()) + " to " + String(plant.getHoursEnd()) + " ( current " + String(getCurrentHour()) + " )"), LOG_DEBUG_CODE);
       }
@@ -522,7 +522,7 @@ int determineNextPump(bool isLowLight)
     }
     else
     {
-      plant.publishState("wet");
+      plant.publishState(PLANTSTATE_NUM_WET, PLANTSTATE_STR_WET);
       // plant was detected as wet, remove consecutive count
       consecutiveWateringPlant[i] = 0;
     }