From 54b09fc46d05124682a84fe3072a66cf7a58b43d Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Mon, 24 Oct 2022 16:34:09 +0300 Subject: [PATCH] state-handler: add sttaeGetPressure functionality --- .../src/StateHandler/StateHandler.cpp | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/esp-vent-main/src/StateHandler/StateHandler.cpp b/esp-vent-main/src/StateHandler/StateHandler.cpp index 0472a74..c4962d8 100644 --- a/esp-vent-main/src/StateHandler/StateHandler.cpp +++ b/esp-vent-main/src/StateHandler/StateHandler.cpp @@ -119,7 +119,7 @@ StateHandler::stateManual (const Event &event) this->A01->write (value[MANUAL].getCurrent () * 10); break; case Event::eTick: - save (event.value, MANUAL); + SetState (&StateHandler::stateGetPressure); break; } } @@ -139,12 +139,7 @@ StateHandler::stateAuto (const Event &event) handleControlButtons (event.value); break; case Event::eTick: - save (event.value, AUTO); -#if PID - pid (); - this->A01->write (fan_speed.getCurrent ()); -#endif -#if !PID + SetState (&StateHandler::stateGetPressure); if (saved_curr_value[AUTO] < saved_set_value[AUTO]) { fan_speed.inc (); @@ -155,7 +150,6 @@ StateHandler::stateAuto (const Event &event) fan_speed.dec (); this->A01->write (fan_speed.getCurrent ()); } -#endif break; } } @@ -210,14 +204,14 @@ StateHandler::stateGetPressure (const Event &event) handleControlButtons (event.value); break; case Event::eTick: - if (pressure_status) - { - save (pressure->getPressure (), ((current_mode) ? AUTO : MANUAL)); - } - else + if (!pressure_status) { pressure->wakeUp (); + break; } + save (pressure->getPressure (), ((current_mode) ? AUTO : MANUAL)); + SetState (current_mode ? &StateHandler::stateAuto + : &StateHandler::stateManual); break; } }