From f93dbe65f22644abf799bcb656c43822ef03b960 Mon Sep 17 00:00:00 2001 From: reaw55 <58457329+reaw55@users.noreply.github.com> Date: Fri, 21 Jun 2024 21:58:39 +0700 Subject: [PATCH] changed behavior of system toggle --- src/ise_display.cpp | 46 ++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/src/ise_display.cpp b/src/ise_display.cpp index 70508e3..bfd7ed2 100644 --- a/src/ise_display.cpp +++ b/src/ise_display.cpp @@ -1152,24 +1152,44 @@ bool ISEDisplay::calculateAllState() } void ISEDisplay::toggleSystem() { - toggleLightGroupState(); - // check for ac lock and pm lock, if lock is on do nothing - if (this->ac_lock_state == true) + // toggleLightGroupState(); + // // check for ac lock and pm lock, if lock is on do nothing + // 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 { - toggleAC(); - } - if (this->pm_lock_state == true) - { - ESP_LOGI("ISEDisplay", "PM lock is on, do nothing"); - } - else - { - togglePM(); + setACstate(2, ac_fan_speed, ac_temperature); + setLightGroupState(3); + setPMstate(true, pm_fan_speed); } + + + + + + } void ISEDisplay::allToggleStandby() {