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

state-handler: add timeout_error handling

Browse Source
This commit is contained in:
Vasily Davydov 2022-10-26 21:21:54 +03:00
parent 942e87b37c
commit a6d7bc0b27
4 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
esp-vent-main/inc/StateHandler/StateHandler.h
View File

@ -60,7 +60,8 @@ enum _mode
{ {
MANUAL, MANUAL,
AUTO, AUTO,
SENSORS SENSORS,
ERROR_TIMEOUT
}; };
enum _sensors enum _sensors

29
esp-vent-main/src/StateHandler/StateHandler.cpp
View File

@ -48,6 +48,12 @@ StateHandler::displaySet (size_t mode)
snprintf (line_down, 16, "HUM:%02d CO2:%02d", sensors_data[HUMIDITY], snprintf (line_down, 16, "HUM:%02d CO2:%02d", sensors_data[HUMIDITY],
sensors_data[CO2]); sensors_data[CO2]);
break; break;
case ERROR_TIMEOUT:
snprintf (line_up, 16, " FORCE STOP ", sensors_data[PRESSUREDAT],
sensors_data[TEMPERATURE]);
snprintf (line_down, 16, "REAS: TIMEOUT", sensors_data[HUMIDITY],
sensors_data[CO2]);
break;
default: default:
break; break;
} }
@ -93,7 +99,6 @@ StateHandler::stateInit (const Event &event)
case Event::eEnter: case Event::eEnter:
break; break;
case Event::eExit: case Event::eExit:
_lcd->clear ();
break; break;
case Event::eKey: case Event::eKey:
handleControlButtons (event.value); handleControlButtons (event.value);
@ -133,8 +138,15 @@ StateHandler::stateManual (const Event &event)
if (event.value % 500 == 0) if (event.value % 500 == 0)
{ {
SetState (&StateHandler::stateGetPressure); SetState (&StateHandler::stateGetPressure);
break;
} }
if (event.value < 0)
{
displaySet (ERROR_TIMEOUT);
fan_speed.setInit (0);
value[(current_mode)].setInit (0);
SetState (&StateHandler::stateInit);
}
break;
} }
} }
@ -161,6 +173,13 @@ StateHandler::stateAuto (const Event &event)
{ {
SetState (&StateHandler::stateGetPressure); SetState (&StateHandler::stateGetPressure);
} }
if (event.value < 0)
{
displaySet (ERROR_TIMEOUT);
fan_speed.setInit (0);
value[(current_mode)].setInit (0);
SetState (&StateHandler::stateInit);
}
pid (); pid ();
this->A01->write (fan_speed.getCurrent ()); this->A01->write (fan_speed.getCurrent ());
break; break;
@ -199,10 +218,10 @@ StateHandler::handleControlButtons (uint8_t button)
switch (button) switch (button)
{ {
case BUTTON_CONTROL_DOWN: case BUTTON_CONTROL_DOWN:
this->value[(current_mode) ? AUTO : MANUAL].dec (); this->value[(current_mode)].dec ();
break; break;
case BUTTON_CONTROL_UP: case BUTTON_CONTROL_UP:
this->value[(current_mode) ? AUTO : MANUAL].inc (); this->value[(current_mode)].inc ();
break; break;
case BUTTON_CONTROL_TOG_MODE: case BUTTON_CONTROL_TOG_MODE:
current_mode = !current_mode; current_mode = !current_mode;
@ -235,7 +254,6 @@ StateHandler::fan_speed_normalized ()
return speed * 10; return speed * 10;
} }
void void
StateHandler::pid () StateHandler::pid ()
{ {
@ -258,4 +276,3 @@ StateHandler::updateSensorValues ()
state_timer->tickCounter (5); state_timer->tickCounter (5);
sensors_data[HUMIDITY] = humidity.readRH (); sensors_data[HUMIDITY] = humidity.readRH ();
} }

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

@ -83,6 +83,11 @@ main (void)
while (1) while (1)
{ {
getcounterValue = glob_time.getCounter (); getcounterValue = glob_time.getCounter ();
if (getcounterValue > 15000)
{
glob_time.resetCounter ();
ventMachine.HandleState (Event (Event::eTick, -1));
}
sw_up.listen (); sw_up.listen ();
sw_down.listen (); sw_down.listen ();
sw_toggle.listen (); sw_toggle.listen ();