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

timers: create proper timeouts

Browse Source
This commit is contained in:
Vasily Davydov 2022-10-27 18:05:16 +03:00
parent 6cf950cc98
commit dc43afd441
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,6 +117,7 @@ private:
int saved_curr_value[2] = { 0, 0 }; int saved_curr_value[2] = { 0, 0 };
int sensors_data[4] = { 0 }; int sensors_data[4] = { 0 };
int sensor_timer = 0; int sensor_timer = 0;
int error_timer = 0;
LiquidCrystal *_lcd; LiquidCrystal *_lcd;
Fan *_propeller; Fan *_propeller;
PressureWrapper *_pressure; PressureWrapper *_pressure;

4
esp-vent-main/inc/common_control_values.h
View File

@ -18,8 +18,8 @@
enum _global_values enum _global_values
{ {
LCD_SIZE = 16, LCD_SIZE = 16,
TIMER_GLOBAL_TIMEOUT = 120000, TIMER_GLOBAL_TIMEOUT = 10000,
TIMER_SENSORS_TIMEOUT = 5, TIMER_SENSORS_TIMEOUT = 5000,
TIMER_PRESSURE_TIMEOUT = 150, TIMER_PRESSURE_TIMEOUT = 150,
TIMER_ERROR_VALUE = -255, TIMER_ERROR_VALUE = -255,
}; };

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

@ -226,15 +226,20 @@ StateHandler::handleTickValue (int value)
if (value > TIMER_PRESSURE_TIMEOUT) if (value > TIMER_PRESSURE_TIMEOUT)
{ {
SetState (&StateHandler::stateGetPressure); SetState (&StateHandler::stateGetPressure);
++sensor_timer; sensor_timer += value;
error_timer += value;
state_timer->resetCounter (); state_timer->resetCounter ();
} }
if (value == TIMER_ERROR_VALUE) if (error_timer > TIMER_GLOBAL_TIMEOUT)
{ {
displaySet (ERROR_TIMEOUT);
this->fan_speed.setInit (0); this->fan_speed.setInit (0);
this->value[(current_mode)].setInit (0); this->value[(current_mode)].setInit (0);
saveSetAndDisplay(AUTO);
displaySet (ERROR_TIMEOUT);
SetState (&StateHandler::stateInit); SetState (&StateHandler::stateInit);
state_timer->Sleep(2000);
state_timer->resetCounter();
error_timer = 0;
} }
} }

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

@ -87,11 +87,6 @@ main (void)
i1 = DWT->CYCCNT; i1 = DWT->CYCCNT;
getcounterValue = glob_time.getCounter (); getcounterValue = glob_time.getCounter ();
if (getcounterValue > TIMER_GLOBAL_TIMEOUT)
{
glob_time.resetCounter ();
ventMachine.HandleState (Event (Event::eTick, TIMER_ERROR_VALUE));
}
sw_up.listen (); sw_up.listen ();
sw_down.listen (); sw_down.listen ();
sw_toggle.listen (); sw_toggle.listen ();