diff --git a/hmi/dev/nspanel_CJK_eu_code/Program.s.txt b/hmi/dev/nspanel_CJK_eu_code/Program.s.txt index cda6c3a..78c19db 100644 --- a/hmi/dev/nspanel_CJK_eu_code/Program.s.txt +++ b/hmi/dev/nspanel_CJK_eu_code/Program.s.txt @@ -6,7 +6,7 @@ Program.s int p=0,q=0,t=0,f=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 back_page_id=0 + int back_page_id=1 int dimdelta=0 int api=0 // 0 = disconnected from HA, 1 = connected to HA int is_utilities=0 @@ -20,4 +20,4 @@ Program.s { lcd_dev fffb 0002 0000 0020// Fix touch offset for EU Version } - page 8//Power on start page boot + page 0//Power on start page boot diff --git a/hmi/dev/nspanel_CJK_eu_code/alarm.txt b/hmi/dev/nspanel_CJK_eu_code/alarm.txt index 9bb1c6a..f7bdd14 100644 --- a/hmi/dev/nspanel_CJK_eu_code/alarm.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/boot.txt b/hmi/dev/nspanel_CJK_eu_code/boot.txt index fa2a4ca..37c7d7c 100644 --- a/hmi/dev/nspanel_CJK_eu_code/boot.txt +++ b/hmi/dev/nspanel_CJK_eu_code/boot.txt @@ -12,11 +12,16 @@ Page boot Events Preinitialize Event + printh 92 + prints "current_page",0 + printh 00 + prints "boot",0 + printh 00 + printh FF FF FF dim=100 covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" vis unavailable,0 - sendme Page Exit Event dim=0 @@ -27,13 +32,6 @@ Variable (int32) counter Scope: local Value: 0 -Variable (string) aux1 - Attributes - ID : 12 - Scope : local - Text : - Max. Text Size: 10 - Text ip_addr Attributes ID : 1 @@ -101,7 +99,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.0 + Text : 4.3.1b1 Max. Text Size : 9 Text esph_version @@ -111,8 +109,8 @@ Text esph_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 9 + Text : Waiting... + Max. Text Size : 10 Text bluep_version Attributes @@ -121,12 +119,12 @@ Text bluep_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 9 + Text : Waiting... + Max. Text Size : 10 Text baud_rate Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : on press and release @@ -136,7 +134,7 @@ Text baud_rate Text framework Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Send Component ID : on press and release @@ -146,7 +144,7 @@ Text framework Text unavailable Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -154,6 +152,14 @@ Text unavailable Text : Max. Text Size : 1 +Progress Bar progress + Attributes + ID : 16 + Scope : global + Dragging : 0 + Send Component ID: disabled + Value : 0 + Dual-state Button bt_reboot Attributes ID : 4 @@ -173,19 +179,28 @@ Dual-state Button bt_reboot Timer tm_esphome Attributes - ID : 13 + ID : 12 Scope : local - Period (ms): 10000 + Period (ms): 1000 Enabled : yes Events Timer Event + if(tm_esphome.tim!=10000) + { + tm_esphome.tim=10000 + } counter.val++ if(counter.val>30) { 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 @@ -197,13 +212,11 @@ Timer tm_esphome prints charset,0 printh FF FF FF printh 92 - prints "tft_version",0 + prints "boot.tft_version",0 printh 00 prints tft_version.txt,0 printh 00 printh FF FF FF - covx counter.val,aux1.txt,0,0 - esph_version.txt="Retry #"+aux1.txt sys0=counter.val%10 if(sys0==0) { diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt index 0b5acd8..7bf6975 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt @@ -20,22 +20,31 @@ Page buttonpage01 vis 255,0 vis button_back,1 vis page_label,1 - page_index.txt+="●" - if(is_buttonpage02==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + page_index.txt+="●" + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - 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_CJK_eu_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt index eed659f..7234ead 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt @@ -20,22 +20,31 @@ Page buttonpage02 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - page_index.txt+="●" - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - 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_CJK_eu_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt index 17f7232..bb10da9 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt @@ -20,22 +20,31 @@ Page buttonpage03 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - if(is_buttonpage02==1) - { - page_index.txt+="○" - } - page_index.txt+="●" - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - 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_CJK_eu_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt index 3268c4d..10773be 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt @@ -20,22 +20,31 @@ Page buttonpage04 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + vis page_index,1 } - if(is_buttonpage02==1) - { - page_index.txt+="○" - } - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - page_index.txt+="●" - 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_CJK_eu_code/climate.txt b/hmi/dev/nspanel_CJK_eu_code/climate.txt index e016bb6..85f8cae 100644 --- a/hmi/dev/nspanel_CJK_eu_code/climate.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/confirm.txt b/hmi/dev/nspanel_CJK_eu_code/confirm.txt index 38da546..9675795 100644 --- a/hmi/dev/nspanel_CJK_eu_code/confirm.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/cover.txt b/hmi/dev/nspanel_CJK_eu_code/cover.txt index 6b74670..55f323e 100644 --- a/hmi/dev/nspanel_CJK_eu_code/cover.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/entitypage01.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt index e4cf268..3944cd8 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt @@ -17,20 +17,32 @@ Page entitypage01 page home } vis unavailable,0 - page_index.txt+="●" - if(is_entitypage02==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage03==1) + page_index.txt+="●" + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" + vis page_index,0 } - if(is_entitypage04==1) - { - page_index.txt+="○" - } - 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_CJK_eu_code/entitypage02.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt index 624506d..acaea22 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt @@ -17,20 +17,32 @@ Page entitypage02 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - page_index.txt+="●" - if(is_entitypage03==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" + vis page_index,0 } - if(is_entitypage04==1) - { - page_index.txt+="○" - } - 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_CJK_eu_code/entitypage03.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt index b2b9ed3..428e485 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt @@ -17,20 +17,32 @@ Page entitypage03 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage02==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" + vis page_index,0 } - page_index.txt+="●" - if(is_entitypage04==1) - { - page_index.txt+="○" - } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage03",0 + printh 00 + printh FF FF FF Text value01_label Attributes @@ -122,7 +134,7 @@ Text value08_label Text : Max. Text Size : 60 -Text value01_pic +Text value01_icon Attributes ID : 12 Scope : local diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt index 5ae4454..d40e216 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt @@ -17,20 +17,32 @@ Page entitypage04 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage02==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + }else { - page_index.txt+="○" + vis page_index,0 } - if(is_entitypage03==1) - { - page_index.txt+="○" - } - page_index.txt+="●" - 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_CJK_eu_code/fan.txt b/hmi/dev/nspanel_CJK_eu_code/fan.txt index 95478b5..7b6a37d 100644 --- a/hmi/dev/nspanel_CJK_eu_code/fan.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/home.txt b/hmi/dev/nspanel_CJK_eu_code/home.txt index 47e8ec6..e72affa 100644 --- a/hmi/dev/nspanel_CJK_eu_code/home.txt +++ b/hmi/dev/nspanel_CJK_eu_code/home.txt @@ -12,6 +12,16 @@ Page home Events Preinitialize Event + if(boot.progress.val<100) + { + page boot + } + 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 +41,6 @@ Page home vis right_bt_text,0 } vis unavailable,0 - sendme Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_CJK_eu_code/keyb_num.txt b/hmi/dev/nspanel_CJK_eu_code/keyb_num.txt index 3c62216..02430bb 100644 --- a/hmi/dev/nspanel_CJK_eu_code/keyb_num.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/light.txt b/hmi/dev/nspanel_CJK_eu_code/light.txt index 734b183..b68ce46 100644 --- a/hmi/dev/nspanel_CJK_eu_code/light.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/media_player.txt b/hmi/dev/nspanel_CJK_eu_code/media_player.txt index dcf2a2f..7ed7ad7 100644 --- a/hmi/dev/nspanel_CJK_eu_code/media_player.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/notification.txt b/hmi/dev/nspanel_CJK_eu_code/notification.txt index b6a6951..34e38af 100644 --- a/hmi/dev/nspanel_CJK_eu_code/notification.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/qrcode.txt b/hmi/dev/nspanel_CJK_eu_code/qrcode.txt index 6e55366..55fef89 100644 --- a/hmi/dev/nspanel_CJK_eu_code/qrcode.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/screensaver.txt b/hmi/dev/nspanel_CJK_eu_code/screensaver.txt index 6f8da50..e74eae1 100644 --- a/hmi/dev/nspanel_CJK_eu_code/screensaver.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/settings.txt b/hmi/dev/nspanel_CJK_eu_code/settings.txt index 1881ea9..0fbcd17 100644 --- a/hmi/dev/nspanel_CJK_eu_code/settings.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/utilities.txt b/hmi/dev/nspanel_CJK_eu_code/utilities.txt index 30c6040..dd54019 100644 --- a/hmi/dev/nspanel_CJK_eu_code/utilities.txt +++ b/hmi/dev/nspanel_CJK_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 @@ -111,7 +116,7 @@ Text home_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Home + Text : Max. Text Size : 10 Text home @@ -151,7 +156,7 @@ Text grid_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Grid + Text : Max. Text Size : 10 Text grid @@ -191,7 +196,7 @@ Text group01_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group01 @@ -231,7 +236,7 @@ Text group02_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group02 @@ -271,7 +276,7 @@ Text group03_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group03 @@ -311,7 +316,7 @@ Text group04_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group04 @@ -351,7 +356,7 @@ Text group05_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group05 @@ -391,7 +396,7 @@ Text group06_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group06 diff --git a/hmi/dev/nspanel_CJK_eu_code/weather01.txt b/hmi/dev/nspanel_CJK_eu_code/weather01.txt index 878553e..05e71ba 100644 --- a/hmi/dev/nspanel_CJK_eu_code/weather01.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/weather02.txt b/hmi/dev/nspanel_CJK_eu_code/weather02.txt index 9dbf735..a6453cf 100644 --- a/hmi/dev/nspanel_CJK_eu_code/weather02.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/weather03.txt b/hmi/dev/nspanel_CJK_eu_code/weather03.txt index d0d38c9..25cb106 100644 --- a/hmi/dev/nspanel_CJK_eu_code/weather03.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/weather04.txt b/hmi/dev/nspanel_CJK_eu_code/weather04.txt index 208299d..883dfe8 100644 --- a/hmi/dev/nspanel_CJK_eu_code/weather04.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu_code/weather05.txt b/hmi/dev/nspanel_CJK_eu_code/weather05.txt index 73bd1b8..594d52a 100644 --- a/hmi/dev/nspanel_CJK_eu_code/weather05.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/Program.s.txt b/hmi/dev/nspanel_CJK_us_code/Program.s.txt index e47d21b..a3709c5 100644 --- a/hmi/dev/nspanel_CJK_us_code/Program.s.txt +++ b/hmi/dev/nspanel_CJK_us_code/Program.s.txt @@ -6,7 +6,7 @@ Program.s int p=0,q=0,t=0,f=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 back_page_id=0 + int back_page_id=1 int dimdelta=0 int api=0 // 0 = disconnected from HA, 1 = connected to HA int is_utilities=0 @@ -20,4 +20,4 @@ Program.s { lcd_dev fffb 0002 0000 0020// Fix touch offset for EU Version } - page 8//Power on start page boot + page 0//Power on start page boot diff --git a/hmi/dev/nspanel_CJK_us_code/alarm.txt b/hmi/dev/nspanel_CJK_us_code/alarm.txt index a2a65cf..1028126 100644 --- a/hmi/dev/nspanel_CJK_us_code/alarm.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/boot.txt b/hmi/dev/nspanel_CJK_us_code/boot.txt index efcbc7e..a7382ea 100644 --- a/hmi/dev/nspanel_CJK_us_code/boot.txt +++ b/hmi/dev/nspanel_CJK_us_code/boot.txt @@ -12,11 +12,16 @@ Page boot Events Preinitialize Event + printh 92 + prints "current_page",0 + printh 00 + prints "boot",0 + printh 00 + printh FF FF FF dim=100 covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" vis unavailable,0 - sendme Page Exit Event dim=0 @@ -27,13 +32,6 @@ Variable (int32) counter Scope: local Value: 0 -Variable (string) aux1 - Attributes - ID : 12 - Scope : local - Text : - Max. Text Size: 10 - Text ip_addr Attributes ID : 1 @@ -101,7 +99,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.0 + Text : 4.3.1b1 Max. Text Size : 9 Events @@ -118,8 +116,8 @@ Text esph_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 9 + Text : Waiting... + Max. Text Size : 10 Text bluep_version Attributes @@ -128,12 +126,12 @@ Text bluep_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 9 + Text : Waiting... + Max. Text Size : 10 Text baud_rate Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : on press and release @@ -143,7 +141,7 @@ Text baud_rate Text framework Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Send Component ID : on press and release @@ -153,7 +151,7 @@ Text framework Text unavailable Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -161,6 +159,14 @@ Text unavailable Text : Max. Text Size : 1 +Progress Bar progress + Attributes + ID : 16 + Scope : global + Dragging : 0 + Send Component ID: disabled + Value : 0 + Dual-state Button bt_reboot Attributes ID : 4 @@ -180,19 +186,28 @@ Dual-state Button bt_reboot Timer tm_esphome Attributes - ID : 13 + ID : 12 Scope : local - Period (ms): 10000 + Period (ms): 1000 Enabled : yes Events Timer Event + if(tm_esphome.tim!=10000) + { + tm_esphome.tim=10000 + } counter.val++ if(counter.val>30) { 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 @@ -204,13 +219,11 @@ Timer tm_esphome prints charset,0 printh FF FF FF printh 92 - prints "tft_version",0 + prints "boot.tft_version",0 printh 00 prints tft_version.txt,0 printh 00 printh FF FF FF - covx counter.val,aux1.txt,0,0 - esph_version.txt="Retry #"+aux1.txt sys0=counter.val%10 if(sys0==0) { diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt index 0b5acd8..7bf6975 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt @@ -20,22 +20,31 @@ Page buttonpage01 vis 255,0 vis button_back,1 vis page_label,1 - page_index.txt+="●" - if(is_buttonpage02==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + page_index.txt+="●" + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt index eed659f..7234ead 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt @@ -20,22 +20,31 @@ Page buttonpage02 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - page_index.txt+="●" - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt index 17f7232..bb10da9 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt @@ -20,22 +20,31 @@ Page buttonpage03 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - if(is_buttonpage02==1) - { - page_index.txt+="○" - } - page_index.txt+="●" - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt index 6199075..76ba7d4 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt @@ -19,10 +19,32 @@ Page buttonpage04 { vis 255,0 vis button_back,1 - vis page_index,1 vis page_label,1 + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) + { + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + 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_CJK_us_code/climate.txt b/hmi/dev/nspanel_CJK_us_code/climate.txt index 3ba81b3..d948bf6 100644 --- a/hmi/dev/nspanel_CJK_us_code/climate.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/confirm.txt b/hmi/dev/nspanel_CJK_us_code/confirm.txt index 38da546..9675795 100644 --- a/hmi/dev/nspanel_CJK_us_code/confirm.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/cover.txt b/hmi/dev/nspanel_CJK_us_code/cover.txt index a103257..b356399 100644 --- a/hmi/dev/nspanel_CJK_us_code/cover.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/entitypage01.txt b/hmi/dev/nspanel_CJK_us_code/entitypage01.txt index e4cf268..3944cd8 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage01.txt @@ -17,20 +17,32 @@ Page entitypage01 page home } vis unavailable,0 - page_index.txt+="●" - if(is_entitypage02==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage03==1) + page_index.txt+="●" + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" + vis page_index,0 } - if(is_entitypage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_code/entitypage02.txt b/hmi/dev/nspanel_CJK_us_code/entitypage02.txt index 624506d..acaea22 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage02.txt @@ -17,20 +17,32 @@ Page entitypage02 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - page_index.txt+="●" - if(is_entitypage03==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" + vis page_index,0 } - if(is_entitypage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_code/entitypage03.txt b/hmi/dev/nspanel_CJK_us_code/entitypage03.txt index 6112d73..f2a403d 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage03.txt @@ -17,20 +17,32 @@ Page entitypage03 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage02==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" + vis page_index,0 } - page_index.txt+="●" - if(is_entitypage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_code/entitypage04.txt b/hmi/dev/nspanel_CJK_us_code/entitypage04.txt index 5ae4454..d40e216 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage04.txt @@ -17,20 +17,32 @@ Page entitypage04 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage02==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + }else { - page_index.txt+="○" + vis page_index,0 } - if(is_entitypage03==1) - { - page_index.txt+="○" - } - page_index.txt+="●" - 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_CJK_us_code/fan.txt b/hmi/dev/nspanel_CJK_us_code/fan.txt index 95478b5..7b6a37d 100644 --- a/hmi/dev/nspanel_CJK_us_code/fan.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/home.txt b/hmi/dev/nspanel_CJK_us_code/home.txt index 99bd032..17e6b8d 100644 --- a/hmi/dev/nspanel_CJK_us_code/home.txt +++ b/hmi/dev/nspanel_CJK_us_code/home.txt @@ -12,6 +12,16 @@ Page home Events Preinitialize Event + if(boot.progress.val<100) + { + page boot + } + 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 +41,6 @@ Page home vis right_bt_text,0 } vis unavailable,0 - sendme Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_CJK_us_code/keyb_num.txt b/hmi/dev/nspanel_CJK_us_code/keyb_num.txt index adcc655..ccd096f 100644 --- a/hmi/dev/nspanel_CJK_us_code/keyb_num.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/light.txt b/hmi/dev/nspanel_CJK_us_code/light.txt index 54e4869..337e204 100644 --- a/hmi/dev/nspanel_CJK_us_code/light.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/media_player.txt b/hmi/dev/nspanel_CJK_us_code/media_player.txt index 4050fd7..94bf532 100644 --- a/hmi/dev/nspanel_CJK_us_code/media_player.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/notification.txt b/hmi/dev/nspanel_CJK_us_code/notification.txt index 731f0d7..570f9f6 100644 --- a/hmi/dev/nspanel_CJK_us_code/notification.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/qrcode.txt b/hmi/dev/nspanel_CJK_us_code/qrcode.txt index 6e55366..55fef89 100644 --- a/hmi/dev/nspanel_CJK_us_code/qrcode.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/screensaver.txt b/hmi/dev/nspanel_CJK_us_code/screensaver.txt index 6f8da50..e74eae1 100644 --- a/hmi/dev/nspanel_CJK_us_code/screensaver.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/settings.txt b/hmi/dev/nspanel_CJK_us_code/settings.txt index 7d51a3e..60098e1 100644 --- a/hmi/dev/nspanel_CJK_us_code/settings.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/utilities.txt b/hmi/dev/nspanel_CJK_us_code/utilities.txt index a664959..b1386de 100644 --- a/hmi/dev/nspanel_CJK_us_code/utilities.txt +++ b/hmi/dev/nspanel_CJK_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 @@ -111,7 +116,7 @@ Text home_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Home + Text : Max. Text Size : 10 Text home @@ -151,7 +156,7 @@ Text grid_label Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : Grid + Text : Max. Text Size : 10 Text grid @@ -191,7 +196,7 @@ Text group01_label Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group01 @@ -231,7 +236,7 @@ Text group02_label Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group02 @@ -271,7 +276,7 @@ Text group03_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group03 @@ -311,7 +316,7 @@ Text group04_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group04 @@ -351,7 +356,7 @@ Text group05_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group05 @@ -391,7 +396,7 @@ Text group06_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group06 diff --git a/hmi/dev/nspanel_CJK_us_code/weather01.txt b/hmi/dev/nspanel_CJK_us_code/weather01.txt index 878553e..05e71ba 100644 --- a/hmi/dev/nspanel_CJK_us_code/weather01.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/weather02.txt b/hmi/dev/nspanel_CJK_us_code/weather02.txt index 9dbf735..a6453cf 100644 --- a/hmi/dev/nspanel_CJK_us_code/weather02.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/weather03.txt b/hmi/dev/nspanel_CJK_us_code/weather03.txt index d0d38c9..25cb106 100644 --- a/hmi/dev/nspanel_CJK_us_code/weather03.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/weather04.txt b/hmi/dev/nspanel_CJK_us_code/weather04.txt index 208299d..883dfe8 100644 --- a/hmi/dev/nspanel_CJK_us_code/weather04.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_code/weather05.txt b/hmi/dev/nspanel_CJK_us_code/weather05.txt index 73bd1b8..594d52a 100644 --- a/hmi/dev/nspanel_CJK_us_code/weather05.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/Program.s.txt b/hmi/dev/nspanel_CJK_us_land_code/Program.s.txt index 1ea8b81..1480d12 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/Program.s.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/Program.s.txt @@ -6,7 +6,7 @@ Program.s int p=0,q=0,t=0,f=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 back_page_id=0 + int back_page_id=1 int dimdelta=0 int api=0 // 0 = disconnected from HA, 1 = connected to HA int is_utilities=0 @@ -20,4 +20,4 @@ Program.s { lcd_dev fffb 0002 0000 0020// Fix touch offset for EU Version } - page 8//Power on start page boot + page 0//Power on start page boot diff --git a/hmi/dev/nspanel_CJK_us_land_code/alarm.txt b/hmi/dev/nspanel_CJK_us_land_code/alarm.txt index 9bb1c6a..f7bdd14 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/alarm.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/boot.txt b/hmi/dev/nspanel_CJK_us_land_code/boot.txt index fa2a4ca..37c7d7c 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/boot.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/boot.txt @@ -12,11 +12,16 @@ Page boot Events Preinitialize Event + printh 92 + prints "current_page",0 + printh 00 + prints "boot",0 + printh 00 + printh FF FF FF dim=100 covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" vis unavailable,0 - sendme Page Exit Event dim=0 @@ -27,13 +32,6 @@ Variable (int32) counter Scope: local Value: 0 -Variable (string) aux1 - Attributes - ID : 12 - Scope : local - Text : - Max. Text Size: 10 - Text ip_addr Attributes ID : 1 @@ -101,7 +99,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.0 + Text : 4.3.1b1 Max. Text Size : 9 Text esph_version @@ -111,8 +109,8 @@ Text esph_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 9 + Text : Waiting... + Max. Text Size : 10 Text bluep_version Attributes @@ -121,12 +119,12 @@ Text bluep_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : - Max. Text Size : 9 + Text : Waiting... + Max. Text Size : 10 Text baud_rate Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : on press and release @@ -136,7 +134,7 @@ Text baud_rate Text framework Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Send Component ID : on press and release @@ -146,7 +144,7 @@ Text framework Text unavailable Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -154,6 +152,14 @@ Text unavailable Text : Max. Text Size : 1 +Progress Bar progress + Attributes + ID : 16 + Scope : global + Dragging : 0 + Send Component ID: disabled + Value : 0 + Dual-state Button bt_reboot Attributes ID : 4 @@ -173,19 +179,28 @@ Dual-state Button bt_reboot Timer tm_esphome Attributes - ID : 13 + ID : 12 Scope : local - Period (ms): 10000 + Period (ms): 1000 Enabled : yes Events Timer Event + if(tm_esphome.tim!=10000) + { + tm_esphome.tim=10000 + } counter.val++ if(counter.val>30) { 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 @@ -197,13 +212,11 @@ Timer tm_esphome prints charset,0 printh FF FF FF printh 92 - prints "tft_version",0 + prints "boot.tft_version",0 printh 00 prints tft_version.txt,0 printh 00 printh FF FF FF - covx counter.val,aux1.txt,0,0 - esph_version.txt="Retry #"+aux1.txt sys0=counter.val%10 if(sys0==0) { diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt index 0b5acd8..7bf6975 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt @@ -20,22 +20,31 @@ Page buttonpage01 vis 255,0 vis button_back,1 vis page_label,1 - page_index.txt+="●" - if(is_buttonpage02==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + page_index.txt+="●" + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_land_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt index eed659f..7234ead 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt @@ -20,22 +20,31 @@ Page buttonpage02 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - page_index.txt+="●" - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_land_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt index 17f7232..bb10da9 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt @@ -20,22 +20,31 @@ Page buttonpage03 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - if(is_buttonpage02==1) - { - page_index.txt+="○" - } - page_index.txt+="●" - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_land_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt index 3268c4d..10773be 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt @@ -20,22 +20,31 @@ Page buttonpage04 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + vis page_index,1 } - if(is_buttonpage02==1) - { - page_index.txt+="○" - } - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - page_index.txt+="●" - 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_CJK_us_land_code/climate.txt b/hmi/dev/nspanel_CJK_us_land_code/climate.txt index e016bb6..85f8cae 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/climate.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/confirm.txt b/hmi/dev/nspanel_CJK_us_land_code/confirm.txt index 38da546..9675795 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/confirm.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/cover.txt b/hmi/dev/nspanel_CJK_us_land_code/cover.txt index 6b74670..55f323e 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/cover.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/entitypage01.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt index e4cf268..3944cd8 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt @@ -17,20 +17,32 @@ Page entitypage01 page home } vis unavailable,0 - page_index.txt+="●" - if(is_entitypage02==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage03==1) + page_index.txt+="●" + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" + vis page_index,0 } - if(is_entitypage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_land_code/entitypage02.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt index 624506d..acaea22 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt @@ -17,20 +17,32 @@ Page entitypage02 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - page_index.txt+="●" - if(is_entitypage03==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" + vis page_index,0 } - if(is_entitypage04==1) - { - page_index.txt+="○" - } - 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_CJK_us_land_code/entitypage03.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt index b2b9ed3..428e485 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt @@ -17,20 +17,32 @@ Page entitypage03 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage02==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" + vis page_index,0 } - page_index.txt+="●" - if(is_entitypage04==1) - { - page_index.txt+="○" - } - sendme + printh 92 + prints "current_page",0 + printh 00 + prints "entitypage03",0 + printh 00 + printh FF FF FF Text value01_label Attributes @@ -122,7 +134,7 @@ Text value08_label Text : Max. Text Size : 60 -Text value01_pic +Text value01_icon Attributes ID : 12 Scope : local diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt index 5ae4454..d40e216 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt @@ -17,20 +17,32 @@ Page entitypage04 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage02==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + }else { - page_index.txt+="○" + vis page_index,0 } - if(is_entitypage03==1) - { - page_index.txt+="○" - } - page_index.txt+="●" - 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_CJK_us_land_code/fan.txt b/hmi/dev/nspanel_CJK_us_land_code/fan.txt index 95478b5..7b6a37d 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/fan.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/home.txt b/hmi/dev/nspanel_CJK_us_land_code/home.txt index 47e8ec6..e72affa 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/home.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/home.txt @@ -12,6 +12,16 @@ Page home Events Preinitialize Event + if(boot.progress.val<100) + { + page boot + } + 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 +41,6 @@ Page home vis right_bt_text,0 } vis unavailable,0 - sendme Variable (string) lastclick Attributes diff --git a/hmi/dev/nspanel_CJK_us_land_code/keyb_num.txt b/hmi/dev/nspanel_CJK_us_land_code/keyb_num.txt index 3c62216..02430bb 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/keyb_num.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/light.txt b/hmi/dev/nspanel_CJK_us_land_code/light.txt index 734b183..b68ce46 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/light.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/media_player.txt b/hmi/dev/nspanel_CJK_us_land_code/media_player.txt index dcf2a2f..7ed7ad7 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/media_player.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/notification.txt b/hmi/dev/nspanel_CJK_us_land_code/notification.txt index b6a6951..34e38af 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/notification.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/qrcode.txt b/hmi/dev/nspanel_CJK_us_land_code/qrcode.txt index 6e55366..55fef89 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/qrcode.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/screensaver.txt b/hmi/dev/nspanel_CJK_us_land_code/screensaver.txt index 6f8da50..e74eae1 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/screensaver.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/settings.txt b/hmi/dev/nspanel_CJK_us_land_code/settings.txt index 1881ea9..0fbcd17 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/settings.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/utilities.txt b/hmi/dev/nspanel_CJK_us_land_code/utilities.txt index 30c6040..dd54019 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/utilities.txt +++ b/hmi/dev/nspanel_CJK_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 @@ -111,7 +116,7 @@ Text home_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Home + Text : Max. Text Size : 10 Text home @@ -151,7 +156,7 @@ Text grid_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Grid + Text : Max. Text Size : 10 Text grid @@ -191,7 +196,7 @@ Text group01_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group01 @@ -231,7 +236,7 @@ Text group02_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group02 @@ -271,7 +276,7 @@ Text group03_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group03 @@ -311,7 +316,7 @@ Text group04_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group04 @@ -351,7 +356,7 @@ Text group05_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group05 @@ -391,7 +396,7 @@ Text group06_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group06 diff --git a/hmi/dev/nspanel_CJK_us_land_code/weather01.txt b/hmi/dev/nspanel_CJK_us_land_code/weather01.txt index 878553e..05e71ba 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/weather01.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/weather02.txt b/hmi/dev/nspanel_CJK_us_land_code/weather02.txt index 9dbf735..a6453cf 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/weather02.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/weather03.txt b/hmi/dev/nspanel_CJK_us_land_code/weather03.txt index d0d38c9..25cb106 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/weather03.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/weather04.txt b/hmi/dev/nspanel_CJK_us_land_code/weather04.txt index 208299d..883dfe8 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/weather04.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_us_land_code/weather05.txt b/hmi/dev/nspanel_CJK_us_land_code/weather05.txt index 73bd1b8..594d52a 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/weather05.txt +++ b/hmi/dev/nspanel_CJK_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_CJK_eu.HMI b/hmi/nspanel_CJK_eu.HMI index 75162ec..cd9b785 100644 Binary files a/hmi/nspanel_CJK_eu.HMI and b/hmi/nspanel_CJK_eu.HMI differ diff --git a/hmi/nspanel_CJK_eu.tft b/hmi/nspanel_CJK_eu.tft index bdcf395..64fecf6 100644 Binary files a/hmi/nspanel_CJK_eu.tft and b/hmi/nspanel_CJK_eu.tft differ diff --git a/hmi/nspanel_CJK_us.HMI b/hmi/nspanel_CJK_us.HMI index 3bef1eb..fbe0ede 100644 Binary files a/hmi/nspanel_CJK_us.HMI and b/hmi/nspanel_CJK_us.HMI differ diff --git a/hmi/nspanel_CJK_us.tft b/hmi/nspanel_CJK_us.tft index 6e65b15..c9e24a8 100644 Binary files a/hmi/nspanel_CJK_us.tft and b/hmi/nspanel_CJK_us.tft differ diff --git a/hmi/nspanel_CJK_us_land.HMI b/hmi/nspanel_CJK_us_land.HMI index 8df4ae4..c61fc02 100644 Binary files a/hmi/nspanel_CJK_us_land.HMI and b/hmi/nspanel_CJK_us_land.HMI differ diff --git a/hmi/nspanel_CJK_us_land.tft b/hmi/nspanel_CJK_us_land.tft index 4c41ca4..ead9f54 100644 Binary files a/hmi/nspanel_CJK_us_land.tft and b/hmi/nspanel_CJK_us_land.tft differ diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index b77a3a5..e16acf5 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 cfcc0f6..24b2fc1 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 4b6ab7e..2b13a60 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 98c3ac1..69d9319 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 27869d7..1d78c93 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 9b08771..bceb486 100644 Binary files a/hmi/nspanel_us_land.tft and b/hmi/nspanel_us_land.tft differ