diff --git a/advanced/hmi/nspanel_blank_code/blank.txt b/advanced/hmi/nspanel_blank_code/blank.txt index 9a8214a..186766a 100644 --- a/advanced/hmi/nspanel_blank_code/blank.txt +++ b/advanced/hmi/nspanel_blank_code/blank.txt @@ -80,15 +80,6 @@ Text baud_rate Touch Release Event dim=100 tm0.en=1 - if(baud==115200) - { - bauds=921600 - }else - { - bauds=115200 - } - covx baud,baud_rate.txt,0,0 - baud_rate.txt+=" bps" Text tft_version Attributes @@ -97,7 +88,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : TFT: v2023.11.2 + Text : TFT: v2023.11.0 Max. Text Size : 20 Events @@ -198,21 +189,15 @@ Timer tm_esphome Events Timer Event - if(framework.txt=="") + if(baud==115200) { - if(baud==115200) - { - bauds=921600 - }else - { - bauds=115200 - } - covx baud,baud_rate.txt,0,0 - baud_rate.txt+=" bps" + bauds=921600 }else { - tm_esphome.en=0 + bauds=115200 } + covx baud,baud_rate.txt,0,0 + baud_rate.txt+=" bps" Timer tm_pageid Attributes diff --git a/advanced/hmi/nspanel_eu_code/buttonpage01.txt b/advanced/hmi/nspanel_eu_code/buttonpage01.txt index 2d3651a..6b8793a 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage01.txt @@ -17,16 +17,7 @@ Page buttonpage01 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage01.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage01",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage01.txt vis 255,0 vis button_back,1 vis page_index,1 diff --git a/advanced/hmi/nspanel_eu_code/buttonpage02.txt b/advanced/hmi/nspanel_eu_code/buttonpage02.txt index eaae948..b089538 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage02.txt @@ -17,16 +17,7 @@ Page buttonpage02 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage02.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage02",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage02.txt vis 255,0 vis button_back,1 vis page_index,1 diff --git a/advanced/hmi/nspanel_eu_code/buttonpage03.txt b/advanced/hmi/nspanel_eu_code/buttonpage03.txt index a9ef7a0..553e3cf 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage03.txt @@ -17,16 +17,7 @@ Page buttonpage03 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage03.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage03",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage03.txt vis 255,0 vis button_back,1 vis page_index,1 diff --git a/advanced/hmi/nspanel_eu_code/buttonpage04.txt b/advanced/hmi/nspanel_eu_code/buttonpage04.txt index 18dc9ba..b64eabd 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage04.txt @@ -17,16 +17,7 @@ Page buttonpage04 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage04.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage04",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage04.txt vis 255,0 vis button_back,1 vis page_index,1 diff --git a/advanced/hmi/nspanel_eu_code/confirm.txt b/advanced/hmi/nspanel_eu_code/confirm.txt index 9564989..75191ec 100644 --- a/advanced/hmi/nspanel_eu_code/confirm.txt +++ b/advanced/hmi/nspanel_eu_code/confirm.txt @@ -104,7 +104,7 @@ Text body Send Component ID : disabled Associated Keyboard: none Text : Please confirm - Max. Text Size : 254 + Max. Text Size : 22 Events Touch Press Event diff --git a/advanced/hmi/nspanel_eu_code/entitypage01.txt b/advanced/hmi/nspanel_eu_code/entitypage01.txt index b05c1a1..ba23709 100644 --- a/advanced/hmi/nspanel_eu_code/entitypage01.txt +++ b/advanced/hmi/nspanel_eu_code/entitypage01.txt @@ -17,16 +17,7 @@ Page entitypage01 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage01.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage01",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage01.txt } Touch Press Event diff --git a/advanced/hmi/nspanel_eu_code/entitypage02.txt b/advanced/hmi/nspanel_eu_code/entitypage02.txt index 11d00ac..6efb8b4 100644 --- a/advanced/hmi/nspanel_eu_code/entitypage02.txt +++ b/advanced/hmi/nspanel_eu_code/entitypage02.txt @@ -17,16 +17,7 @@ Page entitypage02 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage02.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage02",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage02.txt } Touch Press Event diff --git a/advanced/hmi/nspanel_eu_code/entitypage03.txt b/advanced/hmi/nspanel_eu_code/entitypage03.txt index 05fe3ef..9527653 100644 --- a/advanced/hmi/nspanel_eu_code/entitypage03.txt +++ b/advanced/hmi/nspanel_eu_code/entitypage03.txt @@ -17,16 +17,7 @@ Page entitypage03 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage03.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage03",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage03.txt } Touch Press Event diff --git a/advanced/hmi/nspanel_eu_code/entitypage04.txt b/advanced/hmi/nspanel_eu_code/entitypage04.txt index 1808355..34f378d 100644 --- a/advanced/hmi/nspanel_eu_code/entitypage04.txt +++ b/advanced/hmi/nspanel_eu_code/entitypage04.txt @@ -17,16 +17,7 @@ Page entitypage04 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage04.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage04",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage04.txt } Touch Press Event diff --git a/advanced/hmi/nspanel_eu_code/home.txt b/advanced/hmi/nspanel_eu_code/home.txt index 678182b..d4e3776 100644 --- a/advanced/hmi/nspanel_eu_code/home.txt +++ b/advanced/hmi/nspanel_eu_code/home.txt @@ -12,16 +12,7 @@ Page home Events Preinitialize Event -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/home.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "home",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/home.txt vis bt_notific,is_notification vis bt_qrcode,is_qrcode vis bt_entities,is_entities diff --git a/advanced/hmi/nspanel_eu_code/settings.txt b/advanced/hmi/nspanel_eu_code/settings.txt index b7432f2..5690a1d 100644 --- a/advanced/hmi/nspanel_eu_code/settings.txt +++ b/advanced/hmi/nspanel_eu_code/settings.txt @@ -12,16 +12,7 @@ Page settings Events Preinitialize Event -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/settings.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "settings",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/settings.txt covx brightslider.val,bright_text.txt,0,0 bright_text.txt+="%" covx dimslider.val,dim_text.txt,0,0 diff --git a/advanced/hmi/nspanel_eu_code/weather01.txt b/advanced/hmi/nspanel_eu_code/weather01.txt index 788b7c0..a515d5e 100644 --- a/advanced/hmi/nspanel_eu_code/weather01.txt +++ b/advanced/hmi/nspanel_eu_code/weather01.txt @@ -17,16 +17,7 @@ Page weather01 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather01.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "weather01",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather01.txt } Touch Press Event diff --git a/advanced/hmi/nspanel_eu_code/weather02.txt b/advanced/hmi/nspanel_eu_code/weather02.txt index 6b3caa5..3da14ff 100644 --- a/advanced/hmi/nspanel_eu_code/weather02.txt +++ b/advanced/hmi/nspanel_eu_code/weather02.txt @@ -17,16 +17,7 @@ Page weather02 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather02.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "weather02",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather02.txt } Touch Press Event diff --git a/advanced/hmi/nspanel_eu_code/weather03.txt b/advanced/hmi/nspanel_eu_code/weather03.txt index 5bc006b..c51bd6b 100644 --- a/advanced/hmi/nspanel_eu_code/weather03.txt +++ b/advanced/hmi/nspanel_eu_code/weather03.txt @@ -17,16 +17,7 @@ Page weather03 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather03.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "weather03",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather03.txt } Touch Press Event diff --git a/advanced/hmi/nspanel_eu_code/weather04.txt b/advanced/hmi/nspanel_eu_code/weather04.txt index 82c8f8a..0549fcd 100644 --- a/advanced/hmi/nspanel_eu_code/weather04.txt +++ b/advanced/hmi/nspanel_eu_code/weather04.txt @@ -17,16 +17,7 @@ Page weather04 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather04.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "weather04",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather04.txt } Touch Press Event diff --git a/advanced/hmi/nspanel_eu_code/weather05.txt b/advanced/hmi/nspanel_eu_code/weather05.txt index 7a1959a..26bf06f 100644 --- a/advanced/hmi/nspanel_eu_code/weather05.txt +++ b/advanced/hmi/nspanel_eu_code/weather05.txt @@ -17,16 +17,7 @@ Page weather05 page home }else { -<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather05.txt - printh 92 - prints "currentpage",0 - printh 00 - prints "weather05",0 - printh 00 - printh FF FF FF -======== sendme ->>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather05.txt } Touch Press Event diff --git a/advanced/hmi/nspanel_us_code/confirm.txt b/advanced/hmi/nspanel_us_code/confirm.txt index c9dd3ce..8aa5cb8 100644 --- a/advanced/hmi/nspanel_us_code/confirm.txt +++ b/advanced/hmi/nspanel_us_code/confirm.txt @@ -104,7 +104,7 @@ Text body Send Component ID : disabled Associated Keyboard: none Text : Please confirm - Max. Text Size : 254 + Max. Text Size : 22 Events Touch Press Event diff --git a/advanced/hmi/nspanel_us_land_code/confirm.txt b/advanced/hmi/nspanel_us_land_code/confirm.txt index 9564989..75191ec 100644 --- a/advanced/hmi/nspanel_us_land_code/confirm.txt +++ b/advanced/hmi/nspanel_us_land_code/confirm.txt @@ -104,7 +104,7 @@ Text body Send Component ID : disabled Associated Keyboard: none Text : Please confirm - Max. Text Size : 254 + Max. Text Size : 22 Events Touch Press Event