From 15bf2150ca5f6324f7ccf9fe07dd18cb544946a1 Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sun, 16 Oct 2022 14:29:22 +0300
Subject: [PATCH] state-handler: add proper way of non-blinking lcd

This commit adds a save() method for comparison of
values communicating via main and stateHandler to avoid
printing every milliseconds
---
 StateHandler/inc/StateHandler.h   | 11 ++++++++++-
 StateHandler/src/StateHandler.cpp | 30 ++++++++++++++----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/StateHandler/inc/StateHandler.h b/StateHandler/inc/StateHandler.h
index c328f2d..e95b025 100644
--- a/StateHandler/inc/StateHandler.h
+++ b/StateHandler/inc/StateHandler.h
@@ -103,7 +103,8 @@ private:
   void SetState (state_pointer newstate);
   bool current_mode;
   Counter value[2] = { { 0, 100 }, { 0, 120 } };
-  int saved_set_value, saved_curr_value;
+  int saved_set_value[2] = { 0, 0 };
+  int saved_curr_value[2] = { 0, 0 };
   LiquidCrystal *_lcd;
 
   /** Initialization state
@@ -136,6 +137,14 @@ private:
    * @param button current button
    */
   void handleControlButtons (uint8_t button);
+
+  /** Save values to class' varibales
+   *
+   * @param eventValue value coming from an event
+   * @param counterValue value of the inner Counter
+   * @param mode current mode
+   */
+  void save (int eventValue, int counterValue, size_t mode);
 };
 
 #endif /* STATE_HANDLER_H_ */
diff --git a/StateHandler/src/StateHandler.cpp b/StateHandler/src/StateHandler.cpp
index c152f1e..f706c03 100644
--- a/StateHandler/src/StateHandler.cpp
+++ b/StateHandler/src/StateHandler.cpp
@@ -13,8 +13,6 @@ StateHandler::StateHandler (LiquidCrystal *lcd)
   current = &StateHandler::stateInit;
   (this->*current) (Event (Event::eEnter));
   current_mode = MANUAL;
-  saved_set_value = 0;
-  saved_curr_value = 0;
 }
 
 StateHandler::~StateHandler ()
@@ -112,13 +110,7 @@ StateHandler::stateManual (const Event &event)
       handleControlButtons (event.value);
       break;
     case Event::eTick:
-      if (saved_curr_value != event.value
-          || saved_set_value != value[MANUAL].getCurrent ())
-        {
-          saved_curr_value = event.value;
-          saved_set_value = value[MANUAL].getCurrent ();
-          displaySet (value[MANUAL].getCurrent (), event.value);
-        }
+      save (event.value, value[MANUAL].getCurrent (), MANUAL);
       break;
     }
 }
@@ -137,13 +129,7 @@ StateHandler::stateAuto (const Event &event)
       handleControlButtons (event.value);
       break;
     case Event::eTick:
-      if (saved_curr_value != event.value
-          || saved_set_value != value[AUTO].getCurrent ())
-        {
-          saved_curr_value = event.value;
-          saved_set_value = value[AUTO].getCurrent ();
-          displaySet (value[AUTO].getCurrent (), event.value);
-        }
+      save (event.value, value[AUTO].getCurrent (), AUTO);
       break;
     }
 }
@@ -167,3 +153,15 @@ StateHandler::handleControlButtons (uint8_t button)
       break;
     }
 }
+
+void
+StateHandler::save (int eventValue, int counterValue, size_t mode)
+{
+  if (saved_curr_value[mode] != eventValue
+      || saved_set_value[mode] != counterValue)
+    {
+      saved_curr_value[mode] = eventValue;
+      saved_set_value[mode] = counterValue;
+      displaySet (counterValue, eventValue);
+    }
+}