h3n3/NSPanel_HA_Blueprint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split wakeup_page_id from back_page_id

Browse Source 
Solves #1947 and makes the whole wake-up engine more reliable.
This commit is contained in:
Edward Firmo
2024-03-22 10:45:35 +01:00
parent d35c2a77ba
commit dbf57053db
28 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
esphome/nspanel_esphome_core.yaml
View File

@@ -2108,6 +2108,7 @@ script:
disp1->send_command_printf("brightness_dim=%i", int(display_dim_brightness->state)); disp1->send_command_printf("brightness_dim=%i", int(display_dim_brightness->state));
disp1->set_component_value("settings.dimslider", int(display_dim_brightness->state)); disp1->set_component_value("settings.dimslider", int(display_dim_brightness->state));
disp1->send_command_printf("brightness_sleep=%i", int(display_sleep_brightness->state)); disp1->send_command_printf("brightness_sleep=%i", int(display_sleep_brightness->state));
disp1->send_command_printf("wakeup_page_id=%" PRIu8, get_page_id(wakeup_page_name->state.c_str()));
boot_progress->execute(6); boot_progress->execute(6);
nextion_init->publish_state(disp1->is_setup()); nextion_init->publish_state(disp1->is_setup());
if (api_server->is_connected() and disp1->is_setup()) { if (api_server->is_connected() and disp1->is_setup()) {
@@ -2353,7 +2354,7 @@ script:
then: then:
- lambda: |- - lambda: |-
if (current_page->state == "screensaver" and !id(is_uploading_tft)) { if (current_page->state == "screensaver" and !id(is_uploading_tft)) {
disp1->send_command_printf("back_page_id=%" PRIu8, get_page_id(wakeup_page_name->state.c_str())); disp1->send_command_printf("wakeup_page_id=%" PRIu8, get_page_id(wakeup_page_name->state.c_str()));
if (id(screensaver_display_time)) { if (id(screensaver_display_time)) {
disp1->set_component_font("screensaver.text", id(screensaver_display_time_font)); disp1->set_component_font("screensaver.text", id(screensaver_display_time_font));
disp1->set_component_font_color("screensaver.text", id(screensaver_display_time_color)); disp1->set_component_font_color("screensaver.text", id(screensaver_display_time_color));

1
hmi/dev/nspanel_CJK_eu_code/Program.s.txt
View File

@@ -7,6 +7,7 @@ Program.s
int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0 int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0
int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0 int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0
int back_page_id=1 int back_page_id=1
int wakeup_page_id=1
int dimdelta=0 int dimdelta=0
int api=0 // 0 = disconnected from HA, 1 = connected to HA int api=0 // 0 = disconnected from HA, 1 = connected to HA
int is_utilities=0 int is_utilities=0

2
hmi/dev/nspanel_CJK_eu_code/boot.txt
View File

@@ -96,7 +96,7 @@ Text tft_version
Dragging : 0 Dragging : 0
Send Component ID : on press and release Send Component ID : on press and release
Associated Keyboard: none Associated Keyboard: none
Text : 4.3.1 Text : 4.3.2d1
Max. Text Size : 9 Max. Text Size : 9
Text esph_version Text esph_version

4
hmi/dev/nspanel_CJK_eu_code/screensaver.txt
View File

@@ -23,7 +23,7 @@ Page screensaver
printh FF FF FF printh FF FF FF
Touch Release Event Touch Release Event
page back_page_id page wakeup_page_id
Text text Text text
Attributes Attributes
@@ -69,7 +69,7 @@ TouchCap wakeup
Events Events
Touch Press Event Touch Press Event
page back_page_id page wakeup_page_id
TouchCap swipe TouchCap swipe
Attributes Attributes

1
hmi/dev/nspanel_CJK_us_code/Program.s.txt
View File

@@ -7,6 +7,7 @@ Program.s
int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0 int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0
int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0 int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0
int back_page_id=1 int back_page_id=1
int wakeup_page_id=1
int dimdelta=0 int dimdelta=0
int api=0 // 0 = disconnected from HA, 1 = connected to HA int api=0 // 0 = disconnected from HA, 1 = connected to HA
int is_utilities=0 int is_utilities=0

2
hmi/dev/nspanel_CJK_us_code/boot.txt
View File

@@ -96,7 +96,7 @@ Text tft_version
Dragging : 0 Dragging : 0
Send Component ID : on press and release Send Component ID : on press and release
Associated Keyboard: none Associated Keyboard: none
Text : 4.3.1 Text : 4.3.2d1
Max. Text Size : 9 Max. Text Size : 9
Events Events

4
hmi/dev/nspanel_CJK_us_code/screensaver.txt
View File

@@ -23,7 +23,7 @@ Page screensaver
printh FF FF FF printh FF FF FF
Touch Release Event Touch Release Event
page back_page_id page wakeup_page_id
Text text Text text
Attributes Attributes
@@ -69,7 +69,7 @@ TouchCap wakeup
Events Events
Touch Press Event Touch Press Event
page back_page_id page wakeup_page_id
TouchCap swipe TouchCap swipe
Attributes Attributes

1
hmi/dev/nspanel_CJK_us_land_code/Program.s.txt
View File

@@ -7,6 +7,7 @@ Program.s
int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0 int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0
int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0 int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0
int back_page_id=1 int back_page_id=1
int wakeup_page_id=1
int dimdelta=0 int dimdelta=0
int api=0 // 0 = disconnected from HA, 1 = connected to HA int api=0 // 0 = disconnected from HA, 1 = connected to HA
int is_utilities=0 int is_utilities=0

2
hmi/dev/nspanel_CJK_us_land_code/boot.txt
View File

@@ -96,7 +96,7 @@ Text tft_version
Dragging : 0 Dragging : 0
Send Component ID : on press and release Send Component ID : on press and release
Associated Keyboard: none Associated Keyboard: none
Text : 4.3.1 Text : 4.3.2d1
Max. Text Size : 9 Max. Text Size : 9
Text esph_version Text esph_version

4
hmi/dev/nspanel_CJK_us_land_code/screensaver.txt
View File

@@ -23,7 +23,7 @@ Page screensaver
printh FF FF FF printh FF FF FF
Touch Release Event Touch Release Event
page back_page_id page wakeup_page_id
Text text Text text
Attributes Attributes
@@ -69,7 +69,7 @@ TouchCap wakeup
Events Events
Touch Press Event Touch Press Event
page back_page_id page wakeup_page_id
TouchCap swipe TouchCap swipe
Attributes Attributes

1
hmi/dev/nspanel_eu_code/Program.s.txt
View File

@@ -7,6 +7,7 @@ Program.s
int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0 int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0
int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0 int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0
int back_page_id=1 int back_page_id=1
int wakeup_page_id=1
int dimdelta=0 int dimdelta=0
int api=0 // 0 = disconnected from HA, 1 = connected to HA int api=0 // 0 = disconnected from HA, 1 = connected to HA
int is_utilities=0 int is_utilities=0

4
hmi/dev/nspanel_eu_code/screensaver.txt
View File

@@ -23,7 +23,7 @@ Page screensaver
printh FF FF FF printh FF FF FF
Touch Release Event Touch Release Event
page back_page_id page wakeup_page_id
Text text Text text
Attributes Attributes
@@ -69,7 +69,7 @@ TouchCap wakeup
Events Events
Touch Press Event Touch Press Event
page back_page_id page wakeup_page_id
TouchCap swipe TouchCap swipe
Attributes Attributes

1
hmi/dev/nspanel_us_code/Program.s.txt
View File

@@ -7,6 +7,7 @@ Program.s
int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0 int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0
int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0 int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0
int back_page_id=1 int back_page_id=1
int wakeup_page_id=1
int dimdelta=0 int dimdelta=0
int api=0 // 0 = disconnected from HA, 1 = connected to HA int api=0 // 0 = disconnected from HA, 1 = connected to HA
int is_utilities=0 int is_utilities=0

4
hmi/dev/nspanel_us_code/screensaver.txt
View File

@@ -23,7 +23,7 @@ Page screensaver
printh FF FF FF printh FF FF FF
Touch Release Event Touch Release Event
page back_page_id page wakeup_page_id
Text text Text text
Attributes Attributes
@@ -69,7 +69,7 @@ TouchCap wakeup
Events Events
Touch Press Event Touch Press Event
page back_page_id page wakeup_page_id
TouchCap swipe TouchCap swipe
Attributes Attributes

1
hmi/dev/nspanel_us_land_code/Program.s.txt
View File

@@ -7,6 +7,7 @@ Program.s
int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0 int is_buttonpage01=0, is_buttonpage02=0, is_buttonpage03=0, is_buttonpage04=0
int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0 int is_entitypage01=0, is_entitypage02=0, is_entitypage03=0, is_entitypage04=0
int back_page_id=1 int back_page_id=1
int wakeup_page_id=1
int dimdelta=0 int dimdelta=0
int api=0 // 0 = disconnected from HA, 1 = connected to HA int api=0 // 0 = disconnected from HA, 1 = connected to HA
int is_utilities=0 int is_utilities=0

4
hmi/dev/nspanel_us_land_code/screensaver.txt
View File

@@ -23,7 +23,7 @@ Page screensaver
printh FF FF FF printh FF FF FF
Touch Release Event Touch Release Event
page back_page_id page wakeup_page_id
Text text Text text
Attributes Attributes
@@ -69,7 +69,7 @@ TouchCap wakeup
Events Events
Touch Press Event Touch Press Event
page back_page_id page wakeup_page_id
TouchCap swipe TouchCap swipe
Attributes Attributes

BIN
hmi/nspanel_CJK_eu.HMI
View File

Binary file not shown.

BIN
hmi/nspanel_CJK_eu.tft
View File

Binary file not shown.

BIN
hmi/nspanel_CJK_us.HMI
View File

Binary file not shown.

BIN
hmi/nspanel_CJK_us.tft
View File

Binary file not shown.

BIN
hmi/nspanel_CJK_us_land.HMI
View File

Binary file not shown.

BIN
hmi/nspanel_CJK_us_land.tft
View File

Binary file not shown.

BIN
hmi/nspanel_eu.HMI
View File

Binary file not shown.

BIN
hmi/nspanel_eu.tft
View File

Binary file not shown.

BIN
hmi/nspanel_us.HMI
View File

Binary file not shown.

BIN
hmi/nspanel_us.tft
View File

Binary file not shown.

BIN
hmi/nspanel_us_land.HMI
View File

Binary file not shown.

BIN
hmi/nspanel_us_land.tft
View File

Binary file not shown.