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

state-handler: fix: reset of integral value after error state. Display wiht 3 digits

Browse Source
This commit is contained in:
Evgenii Meshcheriakov 2022-10-27 20:23:34 +03:00
parent 3d9ea14c76
commit 641cdefe58
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ enum _global_values
TIMER_GLOBAL_TIMEOUT = 120000, TIMER_GLOBAL_TIMEOUT = 120000,
TIMER_SENSORS_TIMEOUT = 5000, TIMER_SENSORS_TIMEOUT = 5000,
TIMER_PRESSURE_TIMEOUT = 150, TIMER_PRESSURE_TIMEOUT = 150,
TIMER_ERROR_VALUE = -255,
}; };
#endif /* COMMON_CONTROL_VALUES_H_ */ #endif /* COMMON_CONTROL_VALUES_H_ */

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

@ -34,21 +34,21 @@ StateHandler::displaySet (size_t mode)
switch (mode) switch (mode)
{ {
case MANUAL: case MANUAL:
snprintf (line_up, LCD_SIZE, "SPEED: %02d (M)", snprintf (line_up, LCD_SIZE, "SPEED: %03d (M)",
saved_set_value[current_mode]); saved_set_value[current_mode]);
snprintf (line_down, LCD_SIZE, "PRESSURE: %02dPa", snprintf (line_down, LCD_SIZE, "PRESSURE: %03dPa",
saved_curr_value[current_mode]); saved_curr_value[current_mode]);
break; break;
case AUTO: case AUTO:
snprintf (line_up, LCD_SIZE, "P.SET: %02dPa (A)", snprintf (line_up, LCD_SIZE, "P.SET: %03dPa(A)",
saved_set_value[current_mode]); saved_set_value[current_mode]);
snprintf (line_down, LCD_SIZE, "P.CURR: %02dPa", snprintf (line_down, LCD_SIZE, "P.CURR: %03dPa",
saved_curr_value[current_mode]); saved_curr_value[current_mode]);
break; break;
case SENSORS: case SENSORS:
snprintf (line_up, LCD_SIZE, "PRE:%02d TEM:%02d", snprintf (line_up, LCD_SIZE, "PRE:%03d TEM:%02d",
sensors_data[PRESSUREDAT], sensors_data[TEMPERATURE]); sensors_data[PRESSUREDAT], sensors_data[TEMPERATURE]);
snprintf (line_down, LCD_SIZE, "HUM:%02d CO2:%02d", snprintf (line_down, LCD_SIZE, "HUM:%02d CO2:%03d",
sensors_data[HUMIDITY], sensors_data[CO2]); sensors_data[HUMIDITY], sensors_data[CO2]);
break; break;
case ERROR_TIMEOUT: case ERROR_TIMEOUT:
@ -245,8 +245,8 @@ StateHandler::handleTickValue (int value)
if (error_timer > TIMER_GLOBAL_TIMEOUT && task_is_pending) if (error_timer > TIMER_GLOBAL_TIMEOUT && task_is_pending)
{ {
this->fan_speed.setInit (0); this->fan_speed.setInit (0);
this->_propeller->spin (0);
this->value[(current_mode)].setInit (0); this->value[(current_mode)].setInit (0);
integral = 0;
saveSetAndDisplay (AUTO); saveSetAndDisplay (AUTO);
displaySet (ERROR_TIMEOUT); displaySet (ERROR_TIMEOUT);
state_timer->Sleep (2000); state_timer->Sleep (2000);