diff --git a/esphome/nspanel_esphome_addon_upload_tft.yaml b/esphome/nspanel_esphome_addon_upload_tft.yaml index b2d87c1..b2c98a0 100644 --- a/esphome/nspanel_esphome_addon_upload_tft.yaml +++ b/esphome/nspanel_esphome_addon_upload_tft.yaml @@ -136,13 +136,12 @@ script: - lambda: |- ESP_LOGD("addon_upload_tft.script.open_upload_dialog", "Showing upload dialog page"); disp1->goto_page("confirm"); - page_id->update(); - wait_until: condition: - - lambda: return (page_id->state == 26); + - lambda: return (current_page->state == "confirm"); timeout: 2s - lambda: |- - if (page_id->state == 26) { + if (current_page->state == "confirm") { disp1->hide_component("bclose"); disp1->hide_component("bt_accept"); disp1->hide_component("bt_clear"); @@ -152,7 +151,6 @@ script: #elif defined(USE_ESP_IDF) disp1->set_component_text_printf("confirm.title", "Upload TFT\\rESP-IDF"); #endif - page_id->update(); - id: report_upload_progress mode: restart @@ -162,7 +160,7 @@ script: - lambda: |- ESP_LOGD("addon_upload_tft.script.report_upload_progress", "%s", message.c_str()); if (id(tft_is_valid)) { - if (page_id->state != 26) { + if (current_page->state != "confirm") { open_upload_dialog->execute(); } display_wrapped_text->execute("confirm.body", message.c_str(), 18); @@ -207,10 +205,9 @@ script: - delay: 2s - script.execute: open_upload_dialog - script.wait: open_upload_dialog - - lambda: page_id->update(); - wait_until: condition: - - lambda: return (page_id->state == 26); + - lambda: return (current_page->state == "confirm"); timeout: 2s - script.execute: id: report_upload_progress diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml index 099ae8f..e0aa7e8 100644 --- a/esphome/nspanel_esphome_core.yaml +++ b/esphome/nspanel_esphome_core.yaml @@ -859,12 +859,8 @@ display: - script.execute: setup_sequence on_page: lambda: |- - if (!id(is_uploading_tft)) { - page_id->update(); - if (current_page->state != page_names[x] or x == 9) { - current_page->publish_state(page_names[x]); - page_changed->execute(page_names[x]); - } + if (current_page->state != page_names[x] or x == 9) { + current_page->publish_state(page_names[x]); } on_touch: @@ -1528,23 +1524,6 @@ sensor: internal: false disabled_by_default: false - ###### Page Id - Current ##### - - id: page_id - name: Page Id - platform: nextion - variable_name: dp - precision: 0 - accuracy_decimals: 0 - internal: true - entity_category: diagnostic - on_value: - then: - - lambda: |- - if (!id(is_uploading_tft) and current_page->state != page_names[x]) { - current_page->publish_state(page_names[x]); - page_changed->execute(page_names[x]); - } - ##### Display mode (1 = EU, 2 = US, 3 = US Landscape) - id: display_mode name: Display mode @@ -1666,10 +1645,17 @@ text_sensor: ##### Current page name ##### - id: current_page name: Current Page - platform: template + platform: nextion + component_name: current_page icon: mdi:tablet-dashboard internal: false disabled_by_default: false + on_value: + then: + - lambda: |- + if (!id(is_uploading_tft)) { + page_changed->execute(x.c_str()); + } - id: notification_label name: Notification Label @@ -2646,12 +2632,6 @@ script: - id: setup_sequence mode: restart then: - - lambda: |- - page_id->update(); - - wait_until: - condition: - - lambda: !lambda return (not isnan(page_id->state)); - timeout: 15s - lambda: display_charset->update(); - wait_until: condition: diff --git a/hmi/dev/nspanel_blank_code/blank.txt b/hmi/dev/nspanel_blank_code/blank.txt index 30eae3e..edbf89d 100644 --- a/hmi/dev/nspanel_blank_code/blank.txt +++ b/hmi/dev/nspanel_blank_code/blank.txt @@ -12,7 +12,12 @@ Page blank Events Preinitialize Event - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "blank",0 + printh 00 + printh FF FF FF dim=100 covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" @@ -83,7 +88,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : TFT: v2024.1.2 + Text : TFT: v2024.3.0 Max. Text Size : 20 Events @@ -189,7 +194,12 @@ Timer tm_esphome { rest } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "blank",0 + printh 00 + printh FF FF FF printh 91 prints "display_mode",0 printh 00 diff --git a/hmi/dev/nspanel_eu_code/alarm.txt b/hmi/dev/nspanel_eu_code/alarm.txt index 9bb1c6a..f7bdd14 100644 --- a/hmi/dev/nspanel_eu_code/alarm.txt +++ b/hmi/dev/nspanel_eu_code/alarm.txt @@ -24,7 +24,12 @@ Page alarm vis bt_bypass,0 } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "alarm",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_eu_code/boot.txt b/hmi/dev/nspanel_eu_code/boot.txt index 98f9254..52706d5 100644 --- a/hmi/dev/nspanel_eu_code/boot.txt +++ b/hmi/dev/nspanel_eu_code/boot.txt @@ -16,7 +16,12 @@ Page boot covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "boot",0 + printh 00 + printh FF FF FF Page Exit Event dim=0 @@ -185,7 +190,12 @@ Timer tm_esphome { rest } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "boot",0 + printh 00 + printh FF FF FF printh 91 prints "display_mode",0 printh 00 diff --git a/hmi/dev/nspanel_eu_code/buttonpage01.txt b/hmi/dev/nspanel_eu_code/buttonpage01.txt index 0d1b9c9..7bf6975 100644 --- a/hmi/dev/nspanel_eu_code/buttonpage01.txt +++ b/hmi/dev/nspanel_eu_code/buttonpage01.txt @@ -39,7 +39,12 @@ Page buttonpage01 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage01",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_eu_code/buttonpage02.txt b/hmi/dev/nspanel_eu_code/buttonpage02.txt index ec2f1e9..7234ead 100644 --- a/hmi/dev/nspanel_eu_code/buttonpage02.txt +++ b/hmi/dev/nspanel_eu_code/buttonpage02.txt @@ -39,7 +39,12 @@ Page buttonpage02 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage02",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_eu_code/buttonpage03.txt b/hmi/dev/nspanel_eu_code/buttonpage03.txt index dedf149..bb10da9 100644 --- a/hmi/dev/nspanel_eu_code/buttonpage03.txt +++ b/hmi/dev/nspanel_eu_code/buttonpage03.txt @@ -39,7 +39,12 @@ Page buttonpage03 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage03",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_eu_code/buttonpage04.txt b/hmi/dev/nspanel_eu_code/buttonpage04.txt index c8ac33f..10773be 100644 --- a/hmi/dev/nspanel_eu_code/buttonpage04.txt +++ b/hmi/dev/nspanel_eu_code/buttonpage04.txt @@ -39,7 +39,12 @@ Page buttonpage04 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage04",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_eu_code/climate.txt b/hmi/dev/nspanel_eu_code/climate.txt index e016bb6..85f8cae 100644 --- a/hmi/dev/nspanel_eu_code/climate.txt +++ b/hmi/dev/nspanel_eu_code/climate.txt @@ -33,7 +33,12 @@ Page climate page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "climate",0 + printh 00 + printh FF FF FF Page Exit Event covx embedded.val,va2.txt,0,0 diff --git a/hmi/dev/nspanel_eu_code/confirm.txt b/hmi/dev/nspanel_eu_code/confirm.txt index 38da546..9675795 100644 --- a/hmi/dev/nspanel_eu_code/confirm.txt +++ b/hmi/dev/nspanel_eu_code/confirm.txt @@ -17,7 +17,12 @@ Page confirm page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "confirm",0 + printh 00 + printh FF FF FF Variable (int32) page_id Attributes diff --git a/hmi/dev/nspanel_eu_code/cover.txt b/hmi/dev/nspanel_eu_code/cover.txt index 6b74670..55f323e 100644 --- a/hmi/dev/nspanel_eu_code/cover.txt +++ b/hmi/dev/nspanel_eu_code/cover.txt @@ -17,7 +17,12 @@ Page cover page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "cover",0 + printh 00 + printh FF FF FF Variable (string) va1 Attributes diff --git a/hmi/dev/nspanel_eu_code/entitypage01.txt b/hmi/dev/nspanel_eu_code/entitypage01.txt index 4408d70..3944cd8 100644 --- a/hmi/dev/nspanel_eu_code/entitypage01.txt +++ b/hmi/dev/nspanel_eu_code/entitypage01.txt @@ -37,7 +37,12 @@ Page entitypage01 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage01",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_eu_code/entitypage02.txt b/hmi/dev/nspanel_eu_code/entitypage02.txt index 2f5ad4b..acaea22 100644 --- a/hmi/dev/nspanel_eu_code/entitypage02.txt +++ b/hmi/dev/nspanel_eu_code/entitypage02.txt @@ -37,7 +37,12 @@ Page entitypage02 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage02",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_eu_code/entitypage03.txt b/hmi/dev/nspanel_eu_code/entitypage03.txt index 91f7c22..428e485 100644 --- a/hmi/dev/nspanel_eu_code/entitypage03.txt +++ b/hmi/dev/nspanel_eu_code/entitypage03.txt @@ -37,7 +37,12 @@ Page entitypage03 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage03",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_eu_code/entitypage04.txt b/hmi/dev/nspanel_eu_code/entitypage04.txt index 3a661c6..d40e216 100644 --- a/hmi/dev/nspanel_eu_code/entitypage04.txt +++ b/hmi/dev/nspanel_eu_code/entitypage04.txt @@ -37,7 +37,12 @@ Page entitypage04 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage04",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_eu_code/fan.txt b/hmi/dev/nspanel_eu_code/fan.txt index 95478b5..7b6a37d 100644 --- a/hmi/dev/nspanel_eu_code/fan.txt +++ b/hmi/dev/nspanel_eu_code/fan.txt @@ -18,7 +18,12 @@ Page fan } vis unavailable,0 vis bt_oscillate,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "fan",0 + printh 00 + printh FF FF FF Variable (string) fansetting Attributes diff --git a/hmi/dev/nspanel_eu_code/home.txt b/hmi/dev/nspanel_eu_code/home.txt index 47e8ec6..28d8285 100644 --- a/hmi/dev/nspanel_eu_code/home.txt +++ b/hmi/dev/nspanel_eu_code/home.txt @@ -12,6 +12,12 @@ Page home Events Preinitialize Event + printh 92 + prints "current_page",0 + printh 00 + prints "home",0 + printh 00 + printh FF FF FF back_page_id=0 if(qrcode.qrcode_value.txt=="") { @@ -31,7 +37,6 @@ Page home vis right_bt_text,0 } vis unavailable,0 - sendme Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_eu_code/keyb_num.txt b/hmi/dev/nspanel_eu_code/keyb_num.txt index 3c62216..02430bb 100644 --- a/hmi/dev/nspanel_eu_code/keyb_num.txt +++ b/hmi/dev/nspanel_eu_code/keyb_num.txt @@ -17,7 +17,12 @@ Page keyb_num page page_id.val } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "keyb_num",0 + printh 00 + printh FF FF FF Variable (int32) page_id Attributes diff --git a/hmi/dev/nspanel_eu_code/light.txt b/hmi/dev/nspanel_eu_code/light.txt index 734b183..b68ce46 100644 --- a/hmi/dev/nspanel_eu_code/light.txt +++ b/hmi/dev/nspanel_eu_code/light.txt @@ -37,7 +37,12 @@ Page light vis color_button,0 } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "light",0 + printh 00 + printh FF FF FF Variable (int32) rgb565 Attributes diff --git a/hmi/dev/nspanel_eu_code/media_player.txt b/hmi/dev/nspanel_eu_code/media_player.txt index dcf2a2f..7ed7ad7 100644 --- a/hmi/dev/nspanel_eu_code/media_player.txt +++ b/hmi/dev/nspanel_eu_code/media_player.txt @@ -17,7 +17,12 @@ Page media_player page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "media_player",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_eu_code/notification.txt b/hmi/dev/nspanel_eu_code/notification.txt index b6a6951..34e38af 100644 --- a/hmi/dev/nspanel_eu_code/notification.txt +++ b/hmi/dev/nspanel_eu_code/notification.txt @@ -17,7 +17,12 @@ Page notification page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "notification",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_eu_code/qrcode.txt b/hmi/dev/nspanel_eu_code/qrcode.txt index 6e55366..55fef89 100644 --- a/hmi/dev/nspanel_eu_code/qrcode.txt +++ b/hmi/dev/nspanel_eu_code/qrcode.txt @@ -13,7 +13,12 @@ Page qrcode Events Preinitialize Event vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "qrcode",0 + printh 00 + printh FF FF FF Text qrcode_label Attributes diff --git a/hmi/dev/nspanel_eu_code/screensaver.txt b/hmi/dev/nspanel_eu_code/screensaver.txt index 6f8da50..e74eae1 100644 --- a/hmi/dev/nspanel_eu_code/screensaver.txt +++ b/hmi/dev/nspanel_eu_code/screensaver.txt @@ -15,7 +15,12 @@ Page screensaver vis text,0 dim=brightness_sleep vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "screensaver",0 + printh 00 + printh FF FF FF Touch Release Event page back_page_id diff --git a/hmi/dev/nspanel_eu_code/settings.txt b/hmi/dev/nspanel_eu_code/settings.txt index 1881ea9..0fbcd17 100644 --- a/hmi/dev/nspanel_eu_code/settings.txt +++ b/hmi/dev/nspanel_eu_code/settings.txt @@ -19,7 +19,12 @@ Page settings vis lbl_sleep,0 vis bt_sleep,0 vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "settings",0 + printh 00 + printh FF FF FF Text bright_text Attributes diff --git a/hmi/dev/nspanel_eu_code/utilities.txt b/hmi/dev/nspanel_eu_code/utilities.txt index 540eab7..dd54019 100644 --- a/hmi/dev/nspanel_eu_code/utilities.txt +++ b/hmi/dev/nspanel_eu_code/utilities.txt @@ -20,7 +20,12 @@ Page utilities vis title_icon,1 vis title,1 vis button_back,1 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "utilities",0 + printh 00 + printh FF FF FF Variable (int32) line_main_d Attributes diff --git a/hmi/dev/nspanel_eu_code/weather01.txt b/hmi/dev/nspanel_eu_code/weather01.txt index 878553e..05e71ba 100644 --- a/hmi/dev/nspanel_eu_code/weather01.txt +++ b/hmi/dev/nspanel_eu_code/weather01.txt @@ -17,7 +17,12 @@ Page weather01 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather01",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_eu_code/weather02.txt b/hmi/dev/nspanel_eu_code/weather02.txt index 9dbf735..a6453cf 100644 --- a/hmi/dev/nspanel_eu_code/weather02.txt +++ b/hmi/dev/nspanel_eu_code/weather02.txt @@ -17,7 +17,12 @@ Page weather02 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather02",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_eu_code/weather03.txt b/hmi/dev/nspanel_eu_code/weather03.txt index d0d38c9..25cb106 100644 --- a/hmi/dev/nspanel_eu_code/weather03.txt +++ b/hmi/dev/nspanel_eu_code/weather03.txt @@ -17,7 +17,12 @@ Page weather03 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather03",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_eu_code/weather04.txt b/hmi/dev/nspanel_eu_code/weather04.txt index 208299d..883dfe8 100644 --- a/hmi/dev/nspanel_eu_code/weather04.txt +++ b/hmi/dev/nspanel_eu_code/weather04.txt @@ -17,7 +17,12 @@ Page weather04 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather04",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_eu_code/weather05.txt b/hmi/dev/nspanel_eu_code/weather05.txt index 73bd1b8..594d52a 100644 --- a/hmi/dev/nspanel_eu_code/weather05.txt +++ b/hmi/dev/nspanel_eu_code/weather05.txt @@ -17,7 +17,12 @@ Page weather05 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather05",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_us_code/alarm.txt b/hmi/dev/nspanel_us_code/alarm.txt index a2a65cf..1028126 100644 --- a/hmi/dev/nspanel_us_code/alarm.txt +++ b/hmi/dev/nspanel_us_code/alarm.txt @@ -24,7 +24,12 @@ Page alarm vis bt_bypass,0 } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "alarm",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_code/boot.txt b/hmi/dev/nspanel_us_code/boot.txt index af87cbd..2c993a9 100644 --- a/hmi/dev/nspanel_us_code/boot.txt +++ b/hmi/dev/nspanel_us_code/boot.txt @@ -16,7 +16,12 @@ Page boot covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "boot",0 + printh 00 + printh FF FF FF Page Exit Event dim=0 @@ -192,7 +197,12 @@ Timer tm_esphome { rest } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "boot",0 + printh 00 + printh FF FF FF printh 91 prints "display_mode",0 printh 00 diff --git a/hmi/dev/nspanel_us_code/buttonpage01.txt b/hmi/dev/nspanel_us_code/buttonpage01.txt index 0d1b9c9..7bf6975 100644 --- a/hmi/dev/nspanel_us_code/buttonpage01.txt +++ b/hmi/dev/nspanel_us_code/buttonpage01.txt @@ -39,7 +39,12 @@ Page buttonpage01 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage01",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_code/buttonpage02.txt b/hmi/dev/nspanel_us_code/buttonpage02.txt index ec2f1e9..7234ead 100644 --- a/hmi/dev/nspanel_us_code/buttonpage02.txt +++ b/hmi/dev/nspanel_us_code/buttonpage02.txt @@ -39,7 +39,12 @@ Page buttonpage02 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage02",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_code/buttonpage03.txt b/hmi/dev/nspanel_us_code/buttonpage03.txt index dedf149..bb10da9 100644 --- a/hmi/dev/nspanel_us_code/buttonpage03.txt +++ b/hmi/dev/nspanel_us_code/buttonpage03.txt @@ -39,7 +39,12 @@ Page buttonpage03 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage03",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_code/buttonpage04.txt b/hmi/dev/nspanel_us_code/buttonpage04.txt index 9ebe624..76ba7d4 100644 --- a/hmi/dev/nspanel_us_code/buttonpage04.txt +++ b/hmi/dev/nspanel_us_code/buttonpage04.txt @@ -39,7 +39,12 @@ Page buttonpage04 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage04",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_code/climate.txt b/hmi/dev/nspanel_us_code/climate.txt index 3ba81b3..d948bf6 100644 --- a/hmi/dev/nspanel_us_code/climate.txt +++ b/hmi/dev/nspanel_us_code/climate.txt @@ -33,7 +33,12 @@ Page climate page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "climate",0 + printh 00 + printh FF FF FF Page Exit Event covx embedded.val,va2.txt,0,0 diff --git a/hmi/dev/nspanel_us_code/confirm.txt b/hmi/dev/nspanel_us_code/confirm.txt index 38da546..9675795 100644 --- a/hmi/dev/nspanel_us_code/confirm.txt +++ b/hmi/dev/nspanel_us_code/confirm.txt @@ -17,7 +17,12 @@ Page confirm page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "confirm",0 + printh 00 + printh FF FF FF Variable (int32) page_id Attributes diff --git a/hmi/dev/nspanel_us_code/cover.txt b/hmi/dev/nspanel_us_code/cover.txt index a103257..b356399 100644 --- a/hmi/dev/nspanel_us_code/cover.txt +++ b/hmi/dev/nspanel_us_code/cover.txt @@ -17,7 +17,12 @@ Page cover page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "cover",0 + printh 00 + printh FF FF FF Variable (string) va1 Attributes diff --git a/hmi/dev/nspanel_us_code/entitypage01.txt b/hmi/dev/nspanel_us_code/entitypage01.txt index 4408d70..3944cd8 100644 --- a/hmi/dev/nspanel_us_code/entitypage01.txt +++ b/hmi/dev/nspanel_us_code/entitypage01.txt @@ -37,7 +37,12 @@ Page entitypage01 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage01",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_us_code/entitypage02.txt b/hmi/dev/nspanel_us_code/entitypage02.txt index 2f5ad4b..acaea22 100644 --- a/hmi/dev/nspanel_us_code/entitypage02.txt +++ b/hmi/dev/nspanel_us_code/entitypage02.txt @@ -37,7 +37,12 @@ Page entitypage02 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage02",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_us_code/entitypage03.txt b/hmi/dev/nspanel_us_code/entitypage03.txt index 7aa4858..f2a403d 100644 --- a/hmi/dev/nspanel_us_code/entitypage03.txt +++ b/hmi/dev/nspanel_us_code/entitypage03.txt @@ -37,7 +37,12 @@ Page entitypage03 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage03",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_us_code/entitypage04.txt b/hmi/dev/nspanel_us_code/entitypage04.txt index 3a661c6..d40e216 100644 --- a/hmi/dev/nspanel_us_code/entitypage04.txt +++ b/hmi/dev/nspanel_us_code/entitypage04.txt @@ -37,7 +37,12 @@ Page entitypage04 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage04",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_us_code/fan.txt b/hmi/dev/nspanel_us_code/fan.txt index 95478b5..7b6a37d 100644 --- a/hmi/dev/nspanel_us_code/fan.txt +++ b/hmi/dev/nspanel_us_code/fan.txt @@ -18,7 +18,12 @@ Page fan } vis unavailable,0 vis bt_oscillate,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "fan",0 + printh 00 + printh FF FF FF Variable (string) fansetting Attributes diff --git a/hmi/dev/nspanel_us_code/home.txt b/hmi/dev/nspanel_us_code/home.txt index 99bd032..a10480a 100644 --- a/hmi/dev/nspanel_us_code/home.txt +++ b/hmi/dev/nspanel_us_code/home.txt @@ -12,6 +12,12 @@ Page home Events Preinitialize Event + printh 92 + prints "current_page",0 + printh 00 + prints "home",0 + printh 00 + printh FF FF FF back_page_id=0 if(qrcode.qrcode_value.txt=="") { @@ -31,7 +37,6 @@ Page home vis right_bt_text,0 } vis unavailable,0 - sendme Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_code/keyb_num.txt b/hmi/dev/nspanel_us_code/keyb_num.txt index adcc655..ccd096f 100644 --- a/hmi/dev/nspanel_us_code/keyb_num.txt +++ b/hmi/dev/nspanel_us_code/keyb_num.txt @@ -17,7 +17,12 @@ Page keyb_num page page_id.val } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "keyb_num",0 + printh 00 + printh FF FF FF Variable (int32) page_id Attributes diff --git a/hmi/dev/nspanel_us_code/light.txt b/hmi/dev/nspanel_us_code/light.txt index 54e4869..337e204 100644 --- a/hmi/dev/nspanel_us_code/light.txt +++ b/hmi/dev/nspanel_us_code/light.txt @@ -37,7 +37,12 @@ Page light vis color_button,0 } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "light",0 + printh 00 + printh FF FF FF Variable (int32) rgb565 Attributes diff --git a/hmi/dev/nspanel_us_code/media_player.txt b/hmi/dev/nspanel_us_code/media_player.txt index 4050fd7..94bf532 100644 --- a/hmi/dev/nspanel_us_code/media_player.txt +++ b/hmi/dev/nspanel_us_code/media_player.txt @@ -17,7 +17,12 @@ Page media_player page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "media_player",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_code/notification.txt b/hmi/dev/nspanel_us_code/notification.txt index 731f0d7..570f9f6 100644 --- a/hmi/dev/nspanel_us_code/notification.txt +++ b/hmi/dev/nspanel_us_code/notification.txt @@ -17,7 +17,12 @@ Page notification page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "notification",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_code/qrcode.txt b/hmi/dev/nspanel_us_code/qrcode.txt index 6e55366..55fef89 100644 --- a/hmi/dev/nspanel_us_code/qrcode.txt +++ b/hmi/dev/nspanel_us_code/qrcode.txt @@ -13,7 +13,12 @@ Page qrcode Events Preinitialize Event vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "qrcode",0 + printh 00 + printh FF FF FF Text qrcode_label Attributes diff --git a/hmi/dev/nspanel_us_code/screensaver.txt b/hmi/dev/nspanel_us_code/screensaver.txt index 6f8da50..e74eae1 100644 --- a/hmi/dev/nspanel_us_code/screensaver.txt +++ b/hmi/dev/nspanel_us_code/screensaver.txt @@ -15,7 +15,12 @@ Page screensaver vis text,0 dim=brightness_sleep vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "screensaver",0 + printh 00 + printh FF FF FF Touch Release Event page back_page_id diff --git a/hmi/dev/nspanel_us_code/settings.txt b/hmi/dev/nspanel_us_code/settings.txt index 7d51a3e..60098e1 100644 --- a/hmi/dev/nspanel_us_code/settings.txt +++ b/hmi/dev/nspanel_us_code/settings.txt @@ -19,7 +19,12 @@ Page settings vis lbl_sleep,0 vis bt_sleep,0 vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "settings",0 + printh 00 + printh FF FF FF Text bright_text Attributes diff --git a/hmi/dev/nspanel_us_code/utilities.txt b/hmi/dev/nspanel_us_code/utilities.txt index 65d27be..b1386de 100644 --- a/hmi/dev/nspanel_us_code/utilities.txt +++ b/hmi/dev/nspanel_us_code/utilities.txt @@ -20,7 +20,12 @@ Page utilities vis title_icon,1 vis title,1 vis button_back,1 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "utilities",0 + printh 00 + printh FF FF FF Variable (int32) line_main_d Attributes diff --git a/hmi/dev/nspanel_us_code/weather01.txt b/hmi/dev/nspanel_us_code/weather01.txt index 878553e..05e71ba 100644 --- a/hmi/dev/nspanel_us_code/weather01.txt +++ b/hmi/dev/nspanel_us_code/weather01.txt @@ -17,7 +17,12 @@ Page weather01 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather01",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_us_code/weather02.txt b/hmi/dev/nspanel_us_code/weather02.txt index 9dbf735..a6453cf 100644 --- a/hmi/dev/nspanel_us_code/weather02.txt +++ b/hmi/dev/nspanel_us_code/weather02.txt @@ -17,7 +17,12 @@ Page weather02 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather02",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_us_code/weather03.txt b/hmi/dev/nspanel_us_code/weather03.txt index d0d38c9..25cb106 100644 --- a/hmi/dev/nspanel_us_code/weather03.txt +++ b/hmi/dev/nspanel_us_code/weather03.txt @@ -17,7 +17,12 @@ Page weather03 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather03",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_us_code/weather04.txt b/hmi/dev/nspanel_us_code/weather04.txt index 208299d..883dfe8 100644 --- a/hmi/dev/nspanel_us_code/weather04.txt +++ b/hmi/dev/nspanel_us_code/weather04.txt @@ -17,7 +17,12 @@ Page weather04 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather04",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_us_code/weather05.txt b/hmi/dev/nspanel_us_code/weather05.txt index 73bd1b8..594d52a 100644 --- a/hmi/dev/nspanel_us_code/weather05.txt +++ b/hmi/dev/nspanel_us_code/weather05.txt @@ -17,7 +17,12 @@ Page weather05 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather05",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_us_land_code/alarm.txt b/hmi/dev/nspanel_us_land_code/alarm.txt index 9bb1c6a..f7bdd14 100644 --- a/hmi/dev/nspanel_us_land_code/alarm.txt +++ b/hmi/dev/nspanel_us_land_code/alarm.txt @@ -24,7 +24,12 @@ Page alarm vis bt_bypass,0 } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "alarm",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_land_code/boot.txt b/hmi/dev/nspanel_us_land_code/boot.txt index 98f9254..52706d5 100644 --- a/hmi/dev/nspanel_us_land_code/boot.txt +++ b/hmi/dev/nspanel_us_land_code/boot.txt @@ -16,7 +16,12 @@ Page boot covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "boot",0 + printh 00 + printh FF FF FF Page Exit Event dim=0 @@ -185,7 +190,12 @@ Timer tm_esphome { rest } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "boot",0 + printh 00 + printh FF FF FF printh 91 prints "display_mode",0 printh 00 diff --git a/hmi/dev/nspanel_us_land_code/buttonpage01.txt b/hmi/dev/nspanel_us_land_code/buttonpage01.txt index 0d1b9c9..7bf6975 100644 --- a/hmi/dev/nspanel_us_land_code/buttonpage01.txt +++ b/hmi/dev/nspanel_us_land_code/buttonpage01.txt @@ -39,7 +39,12 @@ Page buttonpage01 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage01",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_land_code/buttonpage02.txt b/hmi/dev/nspanel_us_land_code/buttonpage02.txt index ec2f1e9..7234ead 100644 --- a/hmi/dev/nspanel_us_land_code/buttonpage02.txt +++ b/hmi/dev/nspanel_us_land_code/buttonpage02.txt @@ -39,7 +39,12 @@ Page buttonpage02 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage02",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_land_code/buttonpage03.txt b/hmi/dev/nspanel_us_land_code/buttonpage03.txt index dedf149..bb10da9 100644 --- a/hmi/dev/nspanel_us_land_code/buttonpage03.txt +++ b/hmi/dev/nspanel_us_land_code/buttonpage03.txt @@ -39,7 +39,12 @@ Page buttonpage03 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage03",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_land_code/buttonpage04.txt b/hmi/dev/nspanel_us_land_code/buttonpage04.txt index c8ac33f..10773be 100644 --- a/hmi/dev/nspanel_us_land_code/buttonpage04.txt +++ b/hmi/dev/nspanel_us_land_code/buttonpage04.txt @@ -39,7 +39,12 @@ Page buttonpage04 vis page_index,1 } } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "buttonpage04",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_land_code/climate.txt b/hmi/dev/nspanel_us_land_code/climate.txt index e016bb6..85f8cae 100644 --- a/hmi/dev/nspanel_us_land_code/climate.txt +++ b/hmi/dev/nspanel_us_land_code/climate.txt @@ -33,7 +33,12 @@ Page climate page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "climate",0 + printh 00 + printh FF FF FF Page Exit Event covx embedded.val,va2.txt,0,0 diff --git a/hmi/dev/nspanel_us_land_code/confirm.txt b/hmi/dev/nspanel_us_land_code/confirm.txt index 38da546..9675795 100644 --- a/hmi/dev/nspanel_us_land_code/confirm.txt +++ b/hmi/dev/nspanel_us_land_code/confirm.txt @@ -17,7 +17,12 @@ Page confirm page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "confirm",0 + printh 00 + printh FF FF FF Variable (int32) page_id Attributes diff --git a/hmi/dev/nspanel_us_land_code/cover.txt b/hmi/dev/nspanel_us_land_code/cover.txt index 6b74670..55f323e 100644 --- a/hmi/dev/nspanel_us_land_code/cover.txt +++ b/hmi/dev/nspanel_us_land_code/cover.txt @@ -17,7 +17,12 @@ Page cover page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "cover",0 + printh 00 + printh FF FF FF Variable (string) va1 Attributes diff --git a/hmi/dev/nspanel_us_land_code/entitypage01.txt b/hmi/dev/nspanel_us_land_code/entitypage01.txt index 4408d70..3944cd8 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage01.txt +++ b/hmi/dev/nspanel_us_land_code/entitypage01.txt @@ -37,7 +37,12 @@ Page entitypage01 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage01",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_us_land_code/entitypage02.txt b/hmi/dev/nspanel_us_land_code/entitypage02.txt index 2f5ad4b..acaea22 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage02.txt +++ b/hmi/dev/nspanel_us_land_code/entitypage02.txt @@ -37,7 +37,12 @@ Page entitypage02 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage02",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_us_land_code/entitypage03.txt b/hmi/dev/nspanel_us_land_code/entitypage03.txt index 91f7c22..428e485 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage03.txt +++ b/hmi/dev/nspanel_us_land_code/entitypage03.txt @@ -37,7 +37,12 @@ Page entitypage03 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage03",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_us_land_code/entitypage04.txt b/hmi/dev/nspanel_us_land_code/entitypage04.txt index 3a661c6..d40e216 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage04.txt +++ b/hmi/dev/nspanel_us_land_code/entitypage04.txt @@ -37,7 +37,12 @@ Page entitypage04 { vis page_index,0 } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage04",0 + printh 00 + printh FF FF FF Text value01_label Attributes diff --git a/hmi/dev/nspanel_us_land_code/fan.txt b/hmi/dev/nspanel_us_land_code/fan.txt index 95478b5..7b6a37d 100644 --- a/hmi/dev/nspanel_us_land_code/fan.txt +++ b/hmi/dev/nspanel_us_land_code/fan.txt @@ -18,7 +18,12 @@ Page fan } vis unavailable,0 vis bt_oscillate,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "fan",0 + printh 00 + printh FF FF FF Variable (string) fansetting Attributes diff --git a/hmi/dev/nspanel_us_land_code/home.txt b/hmi/dev/nspanel_us_land_code/home.txt index 47e8ec6..28d8285 100644 --- a/hmi/dev/nspanel_us_land_code/home.txt +++ b/hmi/dev/nspanel_us_land_code/home.txt @@ -12,6 +12,12 @@ Page home Events Preinitialize Event + printh 92 + prints "current_page",0 + printh 00 + prints "home",0 + printh 00 + printh FF FF FF back_page_id=0 if(qrcode.qrcode_value.txt=="") { @@ -31,7 +37,6 @@ Page home vis right_bt_text,0 } vis unavailable,0 - sendme Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_land_code/keyb_num.txt b/hmi/dev/nspanel_us_land_code/keyb_num.txt index 3c62216..02430bb 100644 --- a/hmi/dev/nspanel_us_land_code/keyb_num.txt +++ b/hmi/dev/nspanel_us_land_code/keyb_num.txt @@ -17,7 +17,12 @@ Page keyb_num page page_id.val } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "keyb_num",0 + printh 00 + printh FF FF FF Variable (int32) page_id Attributes diff --git a/hmi/dev/nspanel_us_land_code/light.txt b/hmi/dev/nspanel_us_land_code/light.txt index 734b183..b68ce46 100644 --- a/hmi/dev/nspanel_us_land_code/light.txt +++ b/hmi/dev/nspanel_us_land_code/light.txt @@ -37,7 +37,12 @@ Page light vis color_button,0 } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "light",0 + printh 00 + printh FF FF FF Variable (int32) rgb565 Attributes diff --git a/hmi/dev/nspanel_us_land_code/media_player.txt b/hmi/dev/nspanel_us_land_code/media_player.txt index dcf2a2f..7ed7ad7 100644 --- a/hmi/dev/nspanel_us_land_code/media_player.txt +++ b/hmi/dev/nspanel_us_land_code/media_player.txt @@ -17,7 +17,12 @@ Page media_player page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "media_player",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_land_code/notification.txt b/hmi/dev/nspanel_us_land_code/notification.txt index b6a6951..34e38af 100644 --- a/hmi/dev/nspanel_us_land_code/notification.txt +++ b/hmi/dev/nspanel_us_land_code/notification.txt @@ -17,7 +17,12 @@ Page notification page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "notification",0 + printh 00 + printh FF FF FF Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_us_land_code/qrcode.txt b/hmi/dev/nspanel_us_land_code/qrcode.txt index 6e55366..55fef89 100644 --- a/hmi/dev/nspanel_us_land_code/qrcode.txt +++ b/hmi/dev/nspanel_us_land_code/qrcode.txt @@ -13,7 +13,12 @@ Page qrcode Events Preinitialize Event vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "qrcode",0 + printh 00 + printh FF FF FF Text qrcode_label Attributes diff --git a/hmi/dev/nspanel_us_land_code/screensaver.txt b/hmi/dev/nspanel_us_land_code/screensaver.txt index 6f8da50..e74eae1 100644 --- a/hmi/dev/nspanel_us_land_code/screensaver.txt +++ b/hmi/dev/nspanel_us_land_code/screensaver.txt @@ -15,7 +15,12 @@ Page screensaver vis text,0 dim=brightness_sleep vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "screensaver",0 + printh 00 + printh FF FF FF Touch Release Event page back_page_id diff --git a/hmi/dev/nspanel_us_land_code/settings.txt b/hmi/dev/nspanel_us_land_code/settings.txt index 1881ea9..0fbcd17 100644 --- a/hmi/dev/nspanel_us_land_code/settings.txt +++ b/hmi/dev/nspanel_us_land_code/settings.txt @@ -19,7 +19,12 @@ Page settings vis lbl_sleep,0 vis bt_sleep,0 vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "settings",0 + printh 00 + printh FF FF FF Text bright_text Attributes diff --git a/hmi/dev/nspanel_us_land_code/utilities.txt b/hmi/dev/nspanel_us_land_code/utilities.txt index 540eab7..dd54019 100644 --- a/hmi/dev/nspanel_us_land_code/utilities.txt +++ b/hmi/dev/nspanel_us_land_code/utilities.txt @@ -20,7 +20,12 @@ Page utilities vis title_icon,1 vis title,1 vis button_back,1 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "utilities",0 + printh 00 + printh FF FF FF Variable (int32) line_main_d Attributes diff --git a/hmi/dev/nspanel_us_land_code/weather01.txt b/hmi/dev/nspanel_us_land_code/weather01.txt index 878553e..05e71ba 100644 --- a/hmi/dev/nspanel_us_land_code/weather01.txt +++ b/hmi/dev/nspanel_us_land_code/weather01.txt @@ -17,7 +17,12 @@ Page weather01 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather01",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_us_land_code/weather02.txt b/hmi/dev/nspanel_us_land_code/weather02.txt index 9dbf735..a6453cf 100644 --- a/hmi/dev/nspanel_us_land_code/weather02.txt +++ b/hmi/dev/nspanel_us_land_code/weather02.txt @@ -17,7 +17,12 @@ Page weather02 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather02",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_us_land_code/weather03.txt b/hmi/dev/nspanel_us_land_code/weather03.txt index d0d38c9..25cb106 100644 --- a/hmi/dev/nspanel_us_land_code/weather03.txt +++ b/hmi/dev/nspanel_us_land_code/weather03.txt @@ -17,7 +17,12 @@ Page weather03 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather03",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_us_land_code/weather04.txt b/hmi/dev/nspanel_us_land_code/weather04.txt index 208299d..883dfe8 100644 --- a/hmi/dev/nspanel_us_land_code/weather04.txt +++ b/hmi/dev/nspanel_us_land_code/weather04.txt @@ -17,7 +17,12 @@ Page weather04 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather04",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/dev/nspanel_us_land_code/weather05.txt b/hmi/dev/nspanel_us_land_code/weather05.txt index 73bd1b8..594d52a 100644 --- a/hmi/dev/nspanel_us_land_code/weather05.txt +++ b/hmi/dev/nspanel_us_land_code/weather05.txt @@ -17,7 +17,12 @@ Page weather05 page home } vis unavailable,0 - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "weather05",0 + printh 00 + printh FF FF FF Text day Attributes diff --git a/hmi/nspanel_blank.HMI b/hmi/nspanel_blank.HMI index d53e119..191cd9e 100644 Binary files a/hmi/nspanel_blank.HMI and b/hmi/nspanel_blank.HMI differ diff --git a/hmi/nspanel_blank.tft b/hmi/nspanel_blank.tft index 286468e..d73bd55 100644 Binary files a/hmi/nspanel_blank.tft and b/hmi/nspanel_blank.tft differ diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index ec8b1bd..1a2f6e7 100644 Binary files a/hmi/nspanel_eu.HMI and b/hmi/nspanel_eu.HMI differ diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft index bc87dbe..7d82971 100644 Binary files a/hmi/nspanel_eu.tft and b/hmi/nspanel_eu.tft differ diff --git a/hmi/nspanel_us.HMI b/hmi/nspanel_us.HMI index 3371082..38d6890 100644 Binary files a/hmi/nspanel_us.HMI and b/hmi/nspanel_us.HMI differ diff --git a/hmi/nspanel_us.tft b/hmi/nspanel_us.tft index 48f160f..d1398a0 100644 Binary files a/hmi/nspanel_us.tft and b/hmi/nspanel_us.tft differ diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI index 964566c..ee76bbe 100644 Binary files a/hmi/nspanel_us_land.HMI and b/hmi/nspanel_us_land.HMI differ diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft index 63ff376..56aef7f 100644 Binary files a/hmi/nspanel_us_land.tft and b/hmi/nspanel_us_land.tft differ