diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index 6a28805..afb68f4 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -595,8 +595,8 @@ api: ESP_LOGV("service.page_settings", "sleep_mode: %s", sleep_mode.c_str()); ESP_LOGV("service.page_settings", "brightness: %s", brightness.c_str()); ESP_LOGV("service.page_settings", "dimming: %s", dimming.c_str()); - if (not reboot.empty()) id(disp1).set_component_text_printf("settings.lbl_reboot", "%s", reboot.c_str()); - if (not sleep_mode.empty()) id(disp1).set_component_text_printf("settings.lbl_sleep", "%s", sleep_mode.c_str()); + if (not reboot.empty()) id(disp1).set_component_text_printf("settings.lbl_reboot", " %s", reboot.c_str()); + if (not sleep_mode.empty()) id(disp1).set_component_text_printf("settings.lbl_sleep", " %s", sleep_mode.c_str()); if (not brightness.empty()) id(disp1).set_component_text_printf("settings.lbl_brightness", "%s", brightness.c_str()); if (not dimming.empty()) id(disp1).set_component_text_printf("settings.lbl_dimming", "%s", dimming.c_str()); @@ -1512,6 +1512,7 @@ display: - lambda: |- id(disp1).send_command_printf("page 8"); id(disp1).set_component_text_printf("boot.esph_version", "%s", "${version}"); // ### esphome-version ### + id(disp1).show_component("bt_reboot"); - wait_until: api.connected - lambda: |- @@ -2049,7 +2050,7 @@ script: - id: check_versions mode: restart then: - - delay: 15s + - delay: 30s - lambda: |- ESP_LOGD("script.check_versions", "ESPHome version: ${version}"); ESP_LOGD("script.check_versions", "TFT version: %s", id(version_tft).c_str()); diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index cdcd004..d2a8b7e 100644 Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 2c6cd69..8aee0b8 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt index 0e727fd..c35f6ac 100644 --- a/nspanel_eu_code/boot.txt +++ b/nspanel_eu_code/boot.txt @@ -21,6 +21,7 @@ Page boot prints nspanelevent.txt,0 printh 00 printh FF FF FF + vis bt_reboot,0 Variable (int32) counter Attributes @@ -139,7 +140,7 @@ Text bluep_version Text : Max. Text Size : 8 -Dual-state Button a01 +Dual-state Button bt_reboot Attributes ID : 4 Scope : local diff --git a/nspanel_eu_code/settings.txt b/nspanel_eu_code/settings.txt index 8e085a7..08b5886 100644 --- a/nspanel_eu_code/settings.txt +++ b/nspanel_eu_code/settings.txt @@ -67,8 +67,8 @@ Text lbl_reboot Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Reboot - Max. Text Size : 15 + Text : Reboot + Max. Text Size : 25 Text lbl_sleep Attributes @@ -77,8 +77,8 @@ Text lbl_sleep Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Sleep mode - Max. Text Size : 15 + Text : Sleep mode + Max. Text Size : 25 Text lbl_brightness Attributes diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 4def032..90b4215 100644 Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 0e9b040..904c862 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt index 0e727fd..c35f6ac 100644 --- a/nspanel_us_code/boot.txt +++ b/nspanel_us_code/boot.txt @@ -21,6 +21,7 @@ Page boot prints nspanelevent.txt,0 printh 00 printh FF FF FF + vis bt_reboot,0 Variable (int32) counter Attributes @@ -139,7 +140,7 @@ Text bluep_version Text : Max. Text Size : 8 -Dual-state Button a01 +Dual-state Button bt_reboot Attributes ID : 4 Scope : local diff --git a/nspanel_us_code/settings.txt b/nspanel_us_code/settings.txt index 42e112b..2096ae4 100644 --- a/nspanel_us_code/settings.txt +++ b/nspanel_us_code/settings.txt @@ -67,8 +67,8 @@ Text lbl_reboot Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Reboot - Max. Text Size : 15 + Text : Reboot + Max. Text Size : 25 Text lbl_sleep Attributes @@ -77,8 +77,8 @@ Text lbl_sleep Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Sleep mode - Max. Text Size : 15 + Text : Sleep mode + Max. Text Size : 25 Text lbl_brightness Attributes diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index 58fbf80..cb0ce36 100644 Binary files a/nspanel_us_land.HMI and b/nspanel_us_land.HMI differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 19da1b1..d28f9e5 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt index 0e727fd..c35f6ac 100644 --- a/nspanel_us_land_code/boot.txt +++ b/nspanel_us_land_code/boot.txt @@ -21,6 +21,7 @@ Page boot prints nspanelevent.txt,0 printh 00 printh FF FF FF + vis bt_reboot,0 Variable (int32) counter Attributes @@ -139,7 +140,7 @@ Text bluep_version Text : Max. Text Size : 8 -Dual-state Button a01 +Dual-state Button bt_reboot Attributes ID : 4 Scope : local diff --git a/nspanel_us_land_code/settings.txt b/nspanel_us_land_code/settings.txt index 01d38dc..db740b0 100644 --- a/nspanel_us_land_code/settings.txt +++ b/nspanel_us_land_code/settings.txt @@ -67,8 +67,8 @@ Text lbl_reboot Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Reboot - Max. Text Size : 15 + Text : Reboot + Max. Text Size : 25 Text lbl_sleep Attributes @@ -77,8 +77,8 @@ Text lbl_sleep Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Sleep mode - Max. Text Size : 15 + Text : Sleep mode + Max. Text Size : 25 Text lbl_brightness Attributes