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

state-handler: simplify displaySet()

Browse Source 
Simplify the function with a switch
This commit is contained in:
Vasily Davydov 2022-10-25 15:21:53 +03:00
parent cd06e2b3ba
commit 566d1d2659
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,12 +60,7 @@ enum _bars
enum _mode enum _mode
{ {
MANUAL, MANUAL,
AUTO AUTO,
};
enum _display
{
MODES,
SENSORS SENSORS
}; };
@ -105,9 +100,9 @@ public:
* *
* AUTO MODE: P. SET: XXPa P. CURR: XXPa * AUTO MODE: P. SET: XXPa P. CURR: XXPa
* *
* @param sensors the current printing mode * @param mode the current printing mode
*/ */
void displaySet (bool sensors); void displaySet (size_t mode);
/** Handle the given event of the current state /** Handle the given event of the current state
* *

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

@ -26,29 +26,31 @@ StateHandler::~StateHandler ()
} }
void void
StateHandler::displaySet (bool sensors) StateHandler::displaySet (size_t mode)
{ {
char line_up[16] = { 0 }; char line_up[16] = { 0 };
char line_down[16] = { 0 }; char line_down[16] = { 0 };
if (sensors) switch (mode)
{ {
case MANUAL:
snprintf (line_up, 16, "SPEED: %02d%", saved_set_value[current_mode]);
snprintf (line_down, 16, "PRESSURE: %02dPa",
saved_curr_value[current_mode]);
break;
case AUTO:
snprintf (line_up, 16, "P. SET: %02dPa", saved_set_value[current_mode]);
snprintf (line_down, 16, "P. CURR: %02dPa",
saved_curr_value[current_mode]);
break;
case SENSORS:
snprintf (line_up, 16, "PRE:%02d TEM:%02d", sensors_data[PRESSUREDAT], snprintf (line_up, 16, "PRE:%02d TEM:%02d", sensors_data[PRESSUREDAT],
sensors_data[TEMPERATURE]); sensors_data[TEMPERATURE]);
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;
else if (current_mode == MANUAL) default:
{ break;
snprintf (line_up, 16, "SPEED: %02d%", saved_set_value[current_mode]);
snprintf (line_down, 16, "PRESSURE: %02dPa",
saved_curr_value[current_mode]);
}
else if (current_mode == AUTO)
{
snprintf (line_up, 16, "P. SET: %02dPa", saved_set_value[current_mode]);
snprintf (line_down, 16, "P. CURR: %02dPa",
saved_curr_value[current_mode]);
} }
_lcd->clear (); _lcd->clear ();
@ -247,7 +249,7 @@ StateHandler::save (int eventValue, size_t mode)
{ {
saved_curr_value[mode] = eventValue; saved_curr_value[mode] = eventValue;
saved_set_value[mode] = counterValue; saved_set_value[mode] = counterValue;
displaySet (MODES); displaySet ((current_mode) ? AUTO : MANUAL);
} }
} }