ise-senior-iot/ise-iot-oop-v2
2
0
Fork 0
Code Pull requests Activity

Merge branch 'all-toggle-fix'

Browse source
This commit is contained in:
reaw55 2024-06-22 06:19:04 +07:00
commit f249dfe314
1 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/ise_display.cpp
View file

@ -1152,24 +1152,44 @@ bool ISEDisplay::calculateAllState()
} }
void ISEDisplay::toggleSystem() void ISEDisplay::toggleSystem()
{ {
toggleLightGroupState(); // toggleLightGroupState();
// check for ac lock and pm lock, if lock is on do nothing // // check for ac lock and pm lock, if lock is on do nothing
if (this->ac_lock_state == true) // if (this->ac_lock_state == true)
// {
// ESP_LOGI("ISEDisplay", "AC lock is on, do nothing");
// }
// else
// {
// toggleAC();
// }
// if (this->pm_lock_state == true)
// {
// ESP_LOGI("ISEDisplay", "PM lock is on, do nothing");
// }
// else
// {
// togglePM();
// }
bool state = calculateAllState();
if (state)
{ {
ESP_LOGI("ISEDisplay", "AC lock is on, do nothing"); setACstate(0, ac_fan_speed, ac_temperature);
setLightGroupState(0);
setPMstate(false, pm_fan_speed);
} }
else else
{ {
toggleAC(); setACstate(2, ac_fan_speed, ac_temperature);
} setLightGroupState(3);
if (this->pm_lock_state == true) setPMstate(true, pm_fan_speed);
{
ESP_LOGI("ISEDisplay", "PM lock is on, do nothing");
}
else
{
togglePM();
} }
} }
void ISEDisplay::allToggleStandby() void ISEDisplay::allToggleStandby()
{ {