From cc7a0e40f2ee701e1f9efe1d08fcbe9b36c27c29 Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Wed, 26 Oct 2022 21:28:27 +0300
Subject: [PATCH] state-handler: wrap up etick into a separate method

---
 esp-vent-main/inc/StateHandler/StateHandler.h |  6 ++
 .../src/StateHandler/StateHandler.cpp         | 55 ++++++++-----------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/esp-vent-main/inc/StateHandler/StateHandler.h b/esp-vent-main/inc/StateHandler/StateHandler.h
index 2416bc9..9d18406 100644
--- a/esp-vent-main/inc/StateHandler/StateHandler.h
+++ b/esp-vent-main/inc/StateHandler/StateHandler.h
@@ -184,6 +184,12 @@ private:
    */
   void handleControlButtons (uint8_t button);
 
+  /** Handle the timer value of eTick event
+   *
+   * @param value current event value
+   */
+  void handleTickValue (int value);
+
   /** Save values to class' varibales
    *
    * @param eventValue value coming from an event
diff --git a/esp-vent-main/src/StateHandler/StateHandler.cpp b/esp-vent-main/src/StateHandler/StateHandler.cpp
index 141f0d0..f521453 100644
--- a/esp-vent-main/src/StateHandler/StateHandler.cpp
+++ b/esp-vent-main/src/StateHandler/StateHandler.cpp
@@ -130,22 +130,7 @@ StateHandler::stateManual (const Event &event)
       handleControlButtons (event.value);
       break;
     case Event::eTick:
-      if (event.value % 5000 == 0)
-        {
-          updateSensorValues ();
-          displaySet (SENSORS);
-        }
-      if (event.value % 500 == 0)
-        {
-          SetState (&StateHandler::stateGetPressure);
-        }
-      if (event.value < 0)
-        {
-          displaySet (ERROR_TIMEOUT);
-          fan_speed.setInit (0);
-          value[(current_mode)].setInit (0);
-          SetState (&StateHandler::stateInit);
-        }
+      handleTickValue (event.value);
       break;
     }
 }
@@ -164,22 +149,7 @@ StateHandler::stateAuto (const Event &event)
       handleControlButtons (event.value);
       break;
     case Event::eTick:
-      if (event.value % 5000 == 0)
-        {
-          updateSensorValues ();
-          displaySet (SENSORS);
-        }
-      if (event.value % 500 == 0)
-        {
-          SetState (&StateHandler::stateGetPressure);
-        }
-      if (event.value < 0)
-        {
-          displaySet (ERROR_TIMEOUT);
-          fan_speed.setInit (0);
-          value[(current_mode)].setInit (0);
-          SetState (&StateHandler::stateInit);
-        }
+      handleTickValue (event.value);
       pid ();
       this->A01->write (fan_speed.getCurrent ());
       break;
@@ -232,6 +202,27 @@ StateHandler::handleControlButtons (uint8_t button)
     }
 }
 
+void
+StateHandler::handleTickValue (int value)
+{
+  if (value % 5000 == 0)
+    {
+      updateSensorValues ();
+      displaySet (SENSORS);
+    }
+  if (value % 500 == 0)
+    {
+      SetState (&StateHandler::stateGetPressure);
+    }
+  if (value < 0)
+    {
+      displaySet (ERROR_TIMEOUT);
+      this->fan_speed.setInit (0);
+      this->value[(current_mode)].setInit (0);
+      SetState (&StateHandler::stateInit);
+    }
+}
+
 void
 StateHandler::save (int eventValue, size_t mode)
 {