tylen/ESP-Ventilation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StateHandler: save() now takes only two params. is able to check if pressure provided from main or inside of state machine.

Browse Source
This commit is contained in:
Evgenii Meshcheriakov 2022-10-21 10:37:11 +03:00
parent 45ae1d0e3e
commit 611ae13362
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
StateHandler/inc/StateHandler.h
View File

@ -181,7 +181,7 @@ private:
* @param counterValue value of the inner Counter * @param counterValue value of the inner Counter
* @param mode current mode * @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 /** Calculates pid for fan control value
* *

29
StateHandler/src/StateHandler.cpp
View File

@ -6,6 +6,7 @@
*/ */
#include <StateHandler.h> #include <StateHandler.h>
#define PID 0
StateHandler::StateHandler (LiquidCrystal *lcd, ModbusRegister *A01, PressureWrapper *pressure) StateHandler::StateHandler (LiquidCrystal *lcd, ModbusRegister *A01, PressureWrapper *pressure)
{ {
@ -115,7 +116,7 @@ StateHandler::stateManual (const Event &event)
handleControlButtons (event.value); handleControlButtons (event.value);
break; break;
case Event::eTick: case Event::eTick:
save (event.value, value[MANUAL].getCurrent (), MANUAL); save (event.value, MANUAL);
break; break;
} }
} }
@ -135,19 +136,16 @@ StateHandler::stateAuto (const Event &event)
handleControlButtons (event.value); handleControlButtons (event.value);
break; break;
case Event::eTick: case Event::eTick:
save (event.value, value[AUTO].getCurrent (), AUTO); save (event.value, AUTO);
int i = 0; #if PID
// pid(); pid();
// this->A01->write(fan_speed.getCurrent()); this->A01->write(fan_speed.getCurrent());
#endif
if(saved_curr_value[AUTO] < saved_set_value[AUTO]) { if(saved_curr_value[AUTO] < saved_set_value[AUTO]) {
fan_speed.inc(); fan_speed.inc();
while(i<720) i++;
i = 0;
this->A01->write(fan_speed.getCurrent()); this->A01->write(fan_speed.getCurrent());
} else if(saved_curr_value[AUTO] > saved_set_value[AUTO]){ } else if(saved_curr_value[AUTO] > saved_set_value[AUTO]){
fan_speed.dec(); fan_speed.dec();
while(i<720) i++;
i = 0;
this->A01->write(fan_speed.getCurrent()); this->A01->write(fan_speed.getCurrent());
} }
break; break;
@ -181,7 +179,7 @@ StateHandler::stateSensors (const Event &event)
_lcd->print (line_up); _lcd->print (line_up);
_lcd->setCursor (0, 1); _lcd->setCursor (0, 1);
_lcd->print (line_down); _lcd->print (line_down);
SetState (&StateHandler::stateManual); SetState (current_mode? &StateHandler::stateAuto : &StateHandler::stateManual);
break; break;
} }
} }
@ -211,8 +209,17 @@ StateHandler::handleControlButtons (uint8_t button)
} }
void 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 if (saved_curr_value[mode] != eventValue
|| saved_set_value[mode] != counterValue) || saved_set_value[mode] != counterValue)
{ {

6
esp-vent-main/src/esp-vent-main.cpp
View File

@ -81,8 +81,8 @@ main (void)
SwitchController sw_toggle (&b_toggle, &glob_time, &ventMachine, SwitchController sw_toggle (&b_toggle, &glob_time, &ventMachine,
BUTTON_CONTROL_TOG_MODE); BUTTON_CONTROL_TOG_MODE);
int pressure = 0, pressure_time = 0;
int pressure = 0, pressure_time = 0;
while (1) while (1)
{ {
@ -93,13 +93,15 @@ main (void)
* TODO: * TODO:
* - Update current pressure to eTick * - Update current pressure to eTick
*/ */
#if 0
if(pressure_time == 5) { if(pressure_time == 5) {
pressure = sens.getPressure(); pressure = sens.getPressure();
pressure_time = 0; pressure_time = 0;
} }
++pressure_time;
#endif
ventMachine.HandleState (Event (Event::eTick, pressure)); ventMachine.HandleState (Event (Event::eTick, pressure));
glob_time.tickCounter (1); glob_time.tickCounter (1);
++pressure_time;
} }
return 0; return 0;