diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml index 4c9c60d..7702c61 100644 --- a/advanced/esphome/nspanel_esphome_core.yaml +++ b/advanced/esphome/nspanel_esphome_core.yaml @@ -1761,8 +1761,8 @@ text_sensor: - lambda: |- static const char *const TAG = "text_sensor.version_blueprint"; ESP_LOGD(TAG, "Blueprint version: %s", x.c_str()); + disp1->set_component_text_printf("boot.bluep_version", "%s", x.c_str()); if (current_page->state == "boot") { - disp1->set_component_text_printf("boot.bluep_version", "%s", x.c_str()); disp1->send_command_printf("tm_esphome.en=0"); page_boot->execute(); timer_reset_all->execute("boot"); @@ -1781,8 +1781,8 @@ text_sensor: - lambda: |- static const char *const TAG = "text_sensor.version_esphome"; ESP_LOGD(TAG, "ESPHome version: %s", x.c_str()); + disp1->set_component_text_printf("boot.esph_version", x.c_str()); if (current_page->state == "boot") { - disp1->set_component_text_printf("esph_version", x.c_str()); disp1->send_command_printf("tm_esphome.en=0"); page_boot->execute(); timer_reset_all->execute("boot"); @@ -1792,7 +1792,7 @@ text_sensor: - id: version_tft name: Version TFT platform: nextion - component_name: tft_version + component_name: boot.tft_version entity_category: diagnostic icon: mdi:tag-text-outline internal: false @@ -1966,6 +1966,7 @@ script: page_changed->execute(current_page->state.c_str()); } ESP_LOGV(TAG, "Current page: %s", current_page->state.c_str()); + disp1->set_component_text_printf("boot.bluep_version", "%s", blueprint_version.c_str()); - if: condition: @@ -1975,7 +1976,6 @@ script: then: - lambda: |- ESP_LOGV("script.global_settings", "Boot page is visible"); - disp1->set_component_text_printf("boot.bluep_version", "%s", blueprint_version.c_str()); - wait_until: condition: - not: @@ -2130,7 +2130,7 @@ script: ESP_LOGV(TAG, "Construct boot page"); set_brightness->execute(100); - disp1->set_component_text_printf("esph_version", "${version}"); // ESPHome version + disp1->set_component_text_printf("boot.esph_version", "${version}"); // ESPHome version disp1->set_component_text_printf("framework", "%s", id(framework) == 1 ? "Arduino" : (id(framework) == 2 ? "ESP-IDF" : "Unknown")); // ESPHome framework disp1->send_command_printf("tm_esphome.en=0"); diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI index f31717a..581d6b5 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.HMI and b/advanced/hmi/nspanel_CJK_eu.HMI differ diff --git a/advanced/hmi/nspanel_CJK_eu.tft b/advanced/hmi/nspanel_CJK_eu.tft index 0405171..ac6edb4 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.tft and b/advanced/hmi/nspanel_CJK_eu.tft differ diff --git a/advanced/hmi/nspanel_CJK_eu_code/boot.txt b/advanced/hmi/nspanel_CJK_eu_code/boot.txt index 8285c16..57ef1db 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/boot.txt @@ -99,17 +99,17 @@ Text bluep_label Text tft_version Attributes ID : 8 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.5 + Text : 4.2.6dev Max. Text Size : 9 Text esph_version Attributes ID : 9 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none @@ -119,7 +119,7 @@ Text esph_version Text bluep_version Attributes ID : 10 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none diff --git a/advanced/hmi/nspanel_CJK_us.HMI b/advanced/hmi/nspanel_CJK_us.HMI index 49c15ad..c14d081 100644 Binary files a/advanced/hmi/nspanel_CJK_us.HMI and b/advanced/hmi/nspanel_CJK_us.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us.tft b/advanced/hmi/nspanel_CJK_us.tft index 377dce8..2536af0 100644 Binary files a/advanced/hmi/nspanel_CJK_us.tft and b/advanced/hmi/nspanel_CJK_us.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_code/boot.txt b/advanced/hmi/nspanel_CJK_us_code/boot.txt index cc191cb..5fcd7c7 100644 --- a/advanced/hmi/nspanel_CJK_us_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_us_code/boot.txt @@ -99,11 +99,11 @@ Text bluep_label Text tft_version Attributes ID : 8 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.5 + Text : 4.2.6dev Max. Text Size : 9 Events @@ -116,7 +116,7 @@ Text tft_version Text esph_version Attributes ID : 9 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none @@ -126,7 +126,7 @@ Text esph_version Text bluep_version Attributes ID : 10 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI index 5139408..1661a2c 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.HMI and b/advanced/hmi/nspanel_CJK_us_land.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us_land.tft b/advanced/hmi/nspanel_CJK_us_land.tft index 8b1dfc3..2da50a2 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.tft and b/advanced/hmi/nspanel_CJK_us_land.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt index 8285c16..57ef1db 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt @@ -99,17 +99,17 @@ Text bluep_label Text tft_version Attributes ID : 8 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.5 + Text : 4.2.6dev Max. Text Size : 9 Text esph_version Attributes ID : 9 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none @@ -119,7 +119,7 @@ Text esph_version Text bluep_version Attributes ID : 10 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index 8fff721..37d4fef 100644 Binary files a/advanced/hmi/nspanel_eu.HMI and b/advanced/hmi/nspanel_eu.HMI differ diff --git a/advanced/hmi/nspanel_eu_code/boot.txt b/advanced/hmi/nspanel_eu_code/boot.txt index 8285c16..57ef1db 100644 --- a/advanced/hmi/nspanel_eu_code/boot.txt +++ b/advanced/hmi/nspanel_eu_code/boot.txt @@ -99,17 +99,17 @@ Text bluep_label Text tft_version Attributes ID : 8 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.5 + Text : 4.2.6dev Max. Text Size : 9 Text esph_version Attributes ID : 9 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none @@ -119,7 +119,7 @@ Text esph_version Text bluep_version Attributes ID : 10 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index e2df797..4f344e7 100644 Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ diff --git a/advanced/hmi/nspanel_us_code/boot.txt b/advanced/hmi/nspanel_us_code/boot.txt index cc191cb..5fcd7c7 100644 --- a/advanced/hmi/nspanel_us_code/boot.txt +++ b/advanced/hmi/nspanel_us_code/boot.txt @@ -99,11 +99,11 @@ Text bluep_label Text tft_version Attributes ID : 8 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.5 + Text : 4.2.6dev Max. Text Size : 9 Events @@ -116,7 +116,7 @@ Text tft_version Text esph_version Attributes ID : 9 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none @@ -126,7 +126,7 @@ Text esph_version Text bluep_version Attributes ID : 10 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI index 530897c..6661e6e 100644 Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ diff --git a/advanced/hmi/nspanel_us_land_code/boot.txt b/advanced/hmi/nspanel_us_land_code/boot.txt index 8285c16..57ef1db 100644 --- a/advanced/hmi/nspanel_us_land_code/boot.txt +++ b/advanced/hmi/nspanel_us_land_code/boot.txt @@ -99,17 +99,17 @@ Text bluep_label Text tft_version Attributes ID : 8 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.5 + Text : 4.2.6dev Max. Text Size : 9 Text esph_version Attributes ID : 9 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none @@ -119,7 +119,7 @@ Text esph_version Text bluep_version Attributes ID : 10 - Scope : local + Scope : global Dragging : 0 Send Component ID : on press and release Associated Keyboard: none diff --git a/nspanel_eu.tft b/nspanel_eu.tft index df62580..ec85522 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_us.tft b/nspanel_us.tft index b157138..bcc2ef7 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 66175f0..72ce986 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ