diff --git a/ise-display/images/standby/adv/Standby-adv-off-pressed.png b/ise-display/images/standby/adv/Standby-adv-off-pressed.png deleted file mode 100644 index d0aadfd..0000000 Binary files a/ise-display/images/standby/adv/Standby-adv-off-pressed.png and /dev/null differ diff --git a/ise-display/images/standby/adv/Standby-adv-off.png b/ise-display/images/standby/adv/Standby-adv-off.png deleted file mode 100644 index 6855f2b..0000000 Binary files a/ise-display/images/standby/adv/Standby-adv-off.png and /dev/null differ diff --git a/ise-display/images/standby/adv/Standby-adv-on-pressed.png b/ise-display/images/standby/adv/Standby-adv-on-pressed.png deleted file mode 100644 index 266fa2e..0000000 Binary files a/ise-display/images/standby/adv/Standby-adv-on-pressed.png and /dev/null differ diff --git a/ise-display/images/standby/adv/Standby-adv-on.png b/ise-display/images/standby/adv/Standby-adv-on.png deleted file mode 100644 index b0918ca..0000000 Binary files a/ise-display/images/standby/adv/Standby-adv-on.png and /dev/null differ diff --git a/ise-display/ise-display-v2.HMI b/ise-display/ise-display-v2.HMI index 5e71a9f..791e6f2 100644 Binary files a/ise-display/ise-display-v2.HMI and b/ise-display/ise-display-v2.HMI differ diff --git a/ise-display/ise-display-v2.tft b/ise-display/ise-display-v2.tft index 8cf3fec..f64401e 100644 Binary files a/ise-display/ise-display-v2.tft and b/ise-display/ise-display-v2.tft differ diff --git a/ise-display/old-ise-display-v2.tft b/ise-display/old-ise-display-v2.tft deleted file mode 100644 index f64401e..0000000 Binary files a/ise-display/old-ise-display-v2.tft and /dev/null differ diff --git a/src/ise_display.cpp b/src/ise_display.cpp index 70508e3..70275b5 100644 --- a/src/ise_display.cpp +++ b/src/ise_display.cpp @@ -1206,11 +1206,11 @@ void ISEDisplay::updateAllStandbyToggle() if (!this->takeSerialMutex()) return; this->displayAdapter->print("s_open_all.pic="); - this->displayAdapter->print(state ? COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_ON : COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_OFF); + this->displayAdapter->print(state ? COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_ON : COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_OFF); this->sendStopBytes(); this->displayAdapter->print("s_open_all.pic2="); - this->displayAdapter->print(state ? COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_ON_PRESSED : COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_OFF_PRESSED); + this->displayAdapter->print(state ? COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_ON_PRESSED : COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_OFF_PRESSED); this->sendStopBytes(); this->giveSerialMutex(); diff --git a/src/ise_display_definitions.hpp b/src/ise_display_definitions.hpp index 19a849b..34785f8 100644 --- a/src/ise_display_definitions.hpp +++ b/src/ise_display_definitions.hpp @@ -136,12 +136,6 @@ lights have 4 states #define COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_ON 6 #define COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_ON_PRESSED 7 -//Standby adv setting toggle -#define COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_OFF 88 -#define COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_OFF_PRESSED 89 -#define COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_ON 90 -#define COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_ON_PRESSED 91 - //Standby light toggle #define COMPONENT_STANDBY_PIC_LIGHT_TOGGLE_OFF 8 #define COMPONENT_STANDBY_PIC_LIGHT_TOGGLE_OFF_PRESSED 9