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

Merge branch 'lastest-confrimed-working'

Browse source
This commit is contained in:
reaw55 2024-05-22 01:42:57 +07:00
commit 94ed11c335
9 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
ise-display/images/standby/adv/Standby-adv-off-pressed.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
ise-display/images/standby/adv/Standby-adv-off.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
ise-display/images/standby/adv/Standby-adv-on-pressed.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
ise-display/images/standby/adv/Standby-adv-on.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
ise-display/ise-display-v2.HMI
View file

Binary file not shown.

BIN
ise-display/ise-display-v2.tft
View file

Binary file not shown.

BIN
ise-display/old-ise-display-v2.tft Normal file
View file

Binary file not shown.

4
src/ise_display.cpp
View file

@ -1206,11 +1206,11 @@ void ISEDisplay::updateAllStandbyToggle()
if (!this->takeSerialMutex()) if (!this->takeSerialMutex())
return; return;
this->displayAdapter->print("s_open_all.pic="); this->displayAdapter->print("s_open_all.pic=");
this->displayAdapter->print(state ? COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_ON : COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_OFF); this->displayAdapter->print(state ? COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_ON : COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_OFF);
this->sendStopBytes(); this->sendStopBytes();
this->displayAdapter->print("s_open_all.pic2="); this->displayAdapter->print("s_open_all.pic2=");
this->displayAdapter->print(state ? COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_ON_PRESSED : COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_OFF_PRESSED); this->displayAdapter->print(state ? COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_ON_PRESSED : COMPONENT_STANDBY_PIC_ADV_SETTING_TOGGLE_OFF_PRESSED);
this->sendStopBytes(); this->sendStopBytes();
this->giveSerialMutex(); this->giveSerialMutex();

6
src/ise_display_definitions.hpp
View file

@ -136,6 +136,12 @@ lights have 4 states
#define COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_ON 6 #define COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_ON 6
#define COMPONENT_STANDBY_PIC_OPEN_ALL_TOGGLE_ON_PRESSED 7 #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 //Standby light toggle
#define COMPONENT_STANDBY_PIC_LIGHT_TOGGLE_OFF 8 #define COMPONENT_STANDBY_PIC_LIGHT_TOGGLE_OFF 8
#define COMPONENT_STANDBY_PIC_LIGHT_TOGGLE_OFF_PRESSED 9 #define COMPONENT_STANDBY_PIC_LIGHT_TOGGLE_OFF_PRESSED 9