Split wakeup_page_id from back_page_id

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

View File

@@ -2108,6 +2108,7 @@ script:
disp1->send_command_printf("brightness_dim=%i", 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("wakeup_page_id=%" PRIu8, get_page_id(wakeup_page_name->state.c_str()));
boot_progress->execute(6);
nextion_init->publish_state(disp1->is_setup());
if (api_server->is_connected() and disp1->is_setup()) {
@@ -2353,7 +2354,7 @@ script:
then:
- lambda: |-
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)) {
disp1->set_component_font("screensaver.text", id(screensaver_display_time_font));
disp1->set_component_font_color("screensaver.text", id(screensaver_display_time_color));