From 611ae1336260739928940bf3de13011f19acd1b6 Mon Sep 17 00:00:00 2001
From: Evgenii Meshcheriakov <evgeny.meshcheryakov@gmail.com>
Date: Fri, 21 Oct 2022 10:37:11 +0300
Subject: [PATCH] StateHandler: save() now takes only two params. is able to
 check if pressure provided from main or inside of state machine.

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

diff --git a/StateHandler/inc/StateHandler.h b/StateHandler/inc/StateHandler.h
index 70a244c..20ca0e6 100644
--- a/StateHandler/inc/StateHandler.h
+++ b/StateHandler/inc/StateHandler.h
@@ -181,7 +181,7 @@ private:
    * @param counterValue value of the inner Counter
    * @param mode current mode
    */
-  void save (int eventValue, int counterValue, size_t mode);
+  void save (int eventValue, size_t mode);
 
   /** Calculates pid for fan control value
    *
diff --git a/StateHandler/src/StateHandler.cpp b/StateHandler/src/StateHandler.cpp
index 0a90e24..bbbcdb8 100644
--- a/StateHandler/src/StateHandler.cpp
+++ b/StateHandler/src/StateHandler.cpp
@@ -6,6 +6,7 @@
  */
 
 #include <StateHandler.h>
+#define PID 0
 
 StateHandler::StateHandler (LiquidCrystal *lcd, ModbusRegister *A01, PressureWrapper *pressure)
 {
@@ -115,7 +116,7 @@ StateHandler::stateManual (const Event &event)
       handleControlButtons (event.value);
       break;
     case Event::eTick:
-      save (event.value, value[MANUAL].getCurrent (), MANUAL);
+      save (event.value, MANUAL);
       break;
     }
 }
@@ -135,19 +136,16 @@ StateHandler::stateAuto (const Event &event)
       handleControlButtons (event.value);
       break;
     case Event::eTick:
-      save (event.value, value[AUTO].getCurrent (), AUTO);
-      int i = 0;
-//      pid();
-//      this->A01->write(fan_speed.getCurrent());
+      save (event.value, AUTO);
+#if PID
+      pid();
+      this->A01->write(fan_speed.getCurrent());
+#endif
       if(saved_curr_value[AUTO] < saved_set_value[AUTO]) {
 		  fan_speed.inc();
-		  while(i<720) i++;
-		  i = 0;
 		  this->A01->write(fan_speed.getCurrent());
 	  } else if(saved_curr_value[AUTO] > saved_set_value[AUTO]){
 		  fan_speed.dec();
-		  while(i<720) i++;
-		  i = 0;
 		  this->A01->write(fan_speed.getCurrent());
 	  	 }
       break;
@@ -181,7 +179,7 @@ StateHandler::stateSensors (const Event &event)
 	  _lcd->print (line_up);
 	  _lcd->setCursor (0, 1);
 	  _lcd->print (line_down);
-		SetState (&StateHandler::stateManual);
+	  SetState (current_mode? &StateHandler::stateAuto : &StateHandler::stateManual);
 	  break;
 	}
 }
@@ -211,8 +209,17 @@ StateHandler::handleControlButtons (uint8_t button)
 }
 
 void
-StateHandler::save (int eventValue, int counterValue, size_t mode)
+StateHandler::save (int eventValue, size_t mode)
 {
+  /* if pressure is not provided from main it checks it in following if{}*/
+  if(!eventValue) {
+   	  /* Small delay for modbus communications with pressure sensor */
+	  int i = 0;
+	  while(i<7200) i++;
+	  i = 0;
+	  eventValue = pressure->getPressure();
+  }
+  int counterValue = value[mode].getCurrent ();
   if (saved_curr_value[mode] != eventValue
       || saved_set_value[mode] != counterValue)
     {
diff --git a/esp-vent-main/src/esp-vent-main.cpp b/esp-vent-main/src/esp-vent-main.cpp
index 9bb2230..c8fda08 100644
--- a/esp-vent-main/src/esp-vent-main.cpp
+++ b/esp-vent-main/src/esp-vent-main.cpp
@@ -81,8 +81,8 @@ main (void)
   SwitchController sw_toggle (&b_toggle, &glob_time, &ventMachine,
                               BUTTON_CONTROL_TOG_MODE);
 
-  int pressure = 0, pressure_time = 0;
 
+  int pressure = 0, pressure_time = 0;
   while (1)
     {
 
@@ -93,13 +93,15 @@ main (void)
        * TODO:
        * - Update current pressure to eTick
        */
+#if 0
       if(pressure_time == 5) {
 		  pressure = sens.getPressure();
 		  pressure_time = 0;
       }
+      ++pressure_time;
+#endif
 	  ventMachine.HandleState (Event (Event::eTick, pressure));
       glob_time.tickCounter (1);
-      ++pressure_time;
     }
 
   return 0;