diff --git a/nspanel_esphome_core.yaml b/nspanel_esphome_core.yaml index 1cdbb7d..8a25c18 100644 --- a/nspanel_esphome_core.yaml +++ b/nspanel_esphome_core.yaml @@ -741,11 +741,14 @@ display: platform: nextion uart_id: tf_uart start_up_page: 8 - on_page: # This requires `sendme` to be executed on Nextion side + on_page: lambda: |- static const char *const TAG = "display.disp1.on_page"; ESP_LOGD(TAG, "Nextion page changed"); ESP_LOGD(TAG, "New page: %s (%i)" , id(page_names)[x].c_str(), x); + current_page->publish_state(id(page_names)[x].c_str()); + page_changed->execute(id(page_names)[x].c_str()); + on_setup: - script.execute: boot_sequence @@ -1392,25 +1395,25 @@ text_sensor: ##### Current page name ##### - name: ${device_name} Current page id: current_page - #platform: template - platform: nextion - nextion_id: disp1 - component_name: currentpage + platform: template + #platform: nextion + #nextion_id: disp1 + #component_name: currentpage icon: mdi:tablet-dashboard internal: false disabled_by_default: false - filters: - - lambda: |- - x = x.c_str(); - x.shrink_to_fit(); - return x; - on_value: - then: - - lambda: |- - static const char *const TAG = "text_sensor.current_page"; - // Construct new page - ESP_LOGV(TAG, "Construct new page"); - page_changed->execute(x.c_str()); + #filters: + # - lambda: |- + # x = x.c_str(); + # x.shrink_to_fit(); + # return x; + #on_value: + # then: + # - lambda: |- + # static const char *const TAG = "text_sensor.current_page"; + # // Construct new page + # ESP_LOGV(TAG, "Construct new page"); + # page_changed->execute(x.c_str()); - name: ${device_name} Notification Label platform: template diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index c6bb6ce..201e11a 100644 Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index bae77b6..c2f65cc 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_eu_code/alarm.txt b/nspanel_eu_code/alarm.txt index e04f9c1..f8fbcda 100644 --- a/nspanel_eu_code/alarm.txt +++ b/nspanel_eu_code/alarm.txt @@ -17,12 +17,7 @@ Page alarm page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "alarm",0 - printh 00 - printh FF FF FF + sendme vis bt_home,0 vis bt_away,0 vis bt_night,0 diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt index b66ec4e..5213736 100644 --- a/nspanel_eu_code/boot.txt +++ b/nspanel_eu_code/boot.txt @@ -12,12 +12,7 @@ Page boot Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "boot",0 - printh 00 - printh FF FF FF + sendme dim=0 vis bt_reboot,0 covx baud,baud_rate.txt,0,0 @@ -142,7 +137,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 4.1.2 + Text : 4.2dev Max. Text Size : 9 Text esph_version diff --git a/nspanel_eu_code/buttonpage01.txt b/nspanel_eu_code/buttonpage01.txt index 485f67f..b97439d 100644 --- a/nspanel_eu_code/buttonpage01.txt +++ b/nspanel_eu_code/buttonpage01.txt @@ -17,12 +17,7 @@ Page buttonpage01 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage01",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_eu_code/buttonpage02.txt b/nspanel_eu_code/buttonpage02.txt index 68fa710..e5810c6 100644 --- a/nspanel_eu_code/buttonpage02.txt +++ b/nspanel_eu_code/buttonpage02.txt @@ -17,12 +17,7 @@ Page buttonpage02 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage02",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_eu_code/buttonpage03.txt b/nspanel_eu_code/buttonpage03.txt index 63c0cac..1c2f8bb 100644 --- a/nspanel_eu_code/buttonpage03.txt +++ b/nspanel_eu_code/buttonpage03.txt @@ -17,12 +17,7 @@ Page buttonpage03 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage03",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_eu_code/buttonpage04.txt b/nspanel_eu_code/buttonpage04.txt index 83a6204..84c3af7 100644 --- a/nspanel_eu_code/buttonpage04.txt +++ b/nspanel_eu_code/buttonpage04.txt @@ -17,12 +17,7 @@ Page buttonpage04 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage04",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_eu_code/climate.txt b/nspanel_eu_code/climate.txt index 3af8119..0310f84 100644 --- a/nspanel_eu_code/climate.txt +++ b/nspanel_eu_code/climate.txt @@ -14,12 +14,7 @@ Page climate Preinitialize Event if(api==1||embedded.val==1) { - printh 92 - prints "currentpage",0 - printh 00 - prints "climate",0 - printh 00 - printh FF FF FF + sendme vis target_icon,0 vis target_temp,0 vis current_temp,0 diff --git a/nspanel_eu_code/confirm.txt b/nspanel_eu_code/confirm.txt index a56d23c..75191ec 100644 --- a/nspanel_eu_code/confirm.txt +++ b/nspanel_eu_code/confirm.txt @@ -17,12 +17,7 @@ Page confirm page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "confirm",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/cover.txt b/nspanel_eu_code/cover.txt index de7bbf2..461625b 100644 --- a/nspanel_eu_code/cover.txt +++ b/nspanel_eu_code/cover.txt @@ -17,12 +17,7 @@ Page cover page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "cover",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/entitypage01.txt b/nspanel_eu_code/entitypage01.txt index 403e6da..fc04b65 100644 --- a/nspanel_eu_code/entitypage01.txt +++ b/nspanel_eu_code/entitypage01.txt @@ -17,12 +17,7 @@ Page entitypage01 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage01",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/entitypage02.txt b/nspanel_eu_code/entitypage02.txt index 6c9bd51..01a658d 100644 --- a/nspanel_eu_code/entitypage02.txt +++ b/nspanel_eu_code/entitypage02.txt @@ -17,12 +17,7 @@ Page entitypage02 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage02",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/entitypage03.txt b/nspanel_eu_code/entitypage03.txt index 067b5f2..7bf9195 100644 --- a/nspanel_eu_code/entitypage03.txt +++ b/nspanel_eu_code/entitypage03.txt @@ -17,12 +17,7 @@ Page entitypage03 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage03",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/entitypage04.txt b/nspanel_eu_code/entitypage04.txt index f97110f..5b19f8a 100644 --- a/nspanel_eu_code/entitypage04.txt +++ b/nspanel_eu_code/entitypage04.txt @@ -17,12 +17,7 @@ Page entitypage04 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage04",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/fan.txt b/nspanel_eu_code/fan.txt index d2e7ba1..3675007 100644 --- a/nspanel_eu_code/fan.txt +++ b/nspanel_eu_code/fan.txt @@ -17,12 +17,7 @@ Page fan page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "fan",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/home.txt b/nspanel_eu_code/home.txt index 5ffceed..ccff3da 100644 --- a/nspanel_eu_code/home.txt +++ b/nspanel_eu_code/home.txt @@ -12,12 +12,7 @@ Page home Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "home",0 - printh 00 - printh FF FF FF + sendme vis bt_notific,is_notification vis bt_qrcode,is_qrcode vis bt_entities,is_entities diff --git a/nspanel_eu_code/keyb_num.txt b/nspanel_eu_code/keyb_num.txt index 26a81e8..89c756b 100644 --- a/nspanel_eu_code/keyb_num.txt +++ b/nspanel_eu_code/keyb_num.txt @@ -17,12 +17,7 @@ Page keyb_num page page_id.val }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "keyb_num",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/light.txt b/nspanel_eu_code/light.txt index b655c90..11c235f 100644 --- a/nspanel_eu_code/light.txt +++ b/nspanel_eu_code/light.txt @@ -17,12 +17,7 @@ Page light page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "light",0 - printh 00 - printh FF FF FF + sendme vis light_b_press,1 vis lightslider,1 vis light_value,1 diff --git a/nspanel_eu_code/media_player.txt b/nspanel_eu_code/media_player.txt index c83aed5..5dcbd3e 100644 --- a/nspanel_eu_code/media_player.txt +++ b/nspanel_eu_code/media_player.txt @@ -17,12 +17,7 @@ Page media_player page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "media_player",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/notification.txt b/nspanel_eu_code/notification.txt index 300ce12..85d00df 100644 --- a/nspanel_eu_code/notification.txt +++ b/nspanel_eu_code/notification.txt @@ -17,12 +17,7 @@ Page notification page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "notification",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/qrcode.txt b/nspanel_eu_code/qrcode.txt index 7a0ee3c..46499ea 100644 --- a/nspanel_eu_code/qrcode.txt +++ b/nspanel_eu_code/qrcode.txt @@ -12,12 +12,7 @@ Page qrcode Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "qrcode",0 - printh 00 - printh FF FF FF + sendme Touch Press Event printh 91 diff --git a/nspanel_eu_code/screensaver.txt b/nspanel_eu_code/screensaver.txt index 85dc9a3..62abd11 100644 --- a/nspanel_eu_code/screensaver.txt +++ b/nspanel_eu_code/screensaver.txt @@ -12,12 +12,7 @@ Page screensaver Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "screensaver",0 - printh 00 - printh FF FF FF + sendme dim=0 Touch Release Event diff --git a/nspanel_eu_code/settings.txt b/nspanel_eu_code/settings.txt index c56003c..b1d04e4 100644 --- a/nspanel_eu_code/settings.txt +++ b/nspanel_eu_code/settings.txt @@ -12,12 +12,7 @@ Page settings Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "settings",0 - printh 00 - printh FF FF FF + sendme covx brightslider.val,bright_text.txt,0,0 bright_text.txt+="%" covx dimslider.val,dim_text.txt,0,0 diff --git a/nspanel_eu_code/weather01.txt b/nspanel_eu_code/weather01.txt index a9d4149..254b347 100644 --- a/nspanel_eu_code/weather01.txt +++ b/nspanel_eu_code/weather01.txt @@ -17,12 +17,7 @@ Page weather01 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather01",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/weather02.txt b/nspanel_eu_code/weather02.txt index 46cfb72..8ced5b4 100644 --- a/nspanel_eu_code/weather02.txt +++ b/nspanel_eu_code/weather02.txt @@ -17,12 +17,7 @@ Page weather02 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather02",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/weather03.txt b/nspanel_eu_code/weather03.txt index eea35c2..dcfe440 100644 --- a/nspanel_eu_code/weather03.txt +++ b/nspanel_eu_code/weather03.txt @@ -17,12 +17,7 @@ Page weather03 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather03",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/weather04.txt b/nspanel_eu_code/weather04.txt index b7997bf..2beb330 100644 --- a/nspanel_eu_code/weather04.txt +++ b/nspanel_eu_code/weather04.txt @@ -17,12 +17,7 @@ Page weather04 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather04",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_eu_code/weather05.txt b/nspanel_eu_code/weather05.txt index 6f12899..da5d7f1 100644 --- a/nspanel_eu_code/weather05.txt +++ b/nspanel_eu_code/weather05.txt @@ -17,12 +17,7 @@ Page weather05 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather05",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 54655ef..4646cbd 100644 Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 0686387..060e879 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_code/alarm.txt b/nspanel_us_code/alarm.txt index 05f6d1f..7230653 100644 --- a/nspanel_us_code/alarm.txt +++ b/nspanel_us_code/alarm.txt @@ -17,12 +17,7 @@ Page alarm page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "alarm",0 - printh 00 - printh FF FF FF + sendme vis bt_home,0 vis bt_away,0 vis bt_night,0 diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt index b66ec4e..5213736 100644 --- a/nspanel_us_code/boot.txt +++ b/nspanel_us_code/boot.txt @@ -12,12 +12,7 @@ Page boot Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "boot",0 - printh 00 - printh FF FF FF + sendme dim=0 vis bt_reboot,0 covx baud,baud_rate.txt,0,0 @@ -142,7 +137,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 4.1.2 + Text : 4.2dev Max. Text Size : 9 Text esph_version diff --git a/nspanel_us_code/buttonpage01.txt b/nspanel_us_code/buttonpage01.txt index 485f67f..b97439d 100644 --- a/nspanel_us_code/buttonpage01.txt +++ b/nspanel_us_code/buttonpage01.txt @@ -17,12 +17,7 @@ Page buttonpage01 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage01",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_us_code/buttonpage02.txt b/nspanel_us_code/buttonpage02.txt index f709809..7d158bb 100644 --- a/nspanel_us_code/buttonpage02.txt +++ b/nspanel_us_code/buttonpage02.txt @@ -17,12 +17,7 @@ Page buttonpage02 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage02",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_us_code/buttonpage03.txt b/nspanel_us_code/buttonpage03.txt index 63c0cac..1c2f8bb 100644 --- a/nspanel_us_code/buttonpage03.txt +++ b/nspanel_us_code/buttonpage03.txt @@ -17,12 +17,7 @@ Page buttonpage03 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage03",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_us_code/buttonpage04.txt b/nspanel_us_code/buttonpage04.txt index 9b09428..f6079b5 100644 --- a/nspanel_us_code/buttonpage04.txt +++ b/nspanel_us_code/buttonpage04.txt @@ -17,12 +17,7 @@ Page buttonpage04 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage04",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_us_code/climate.txt b/nspanel_us_code/climate.txt index 6e2a868..07eac92 100644 --- a/nspanel_us_code/climate.txt +++ b/nspanel_us_code/climate.txt @@ -14,12 +14,7 @@ Page climate Preinitialize Event if(api==1||embedded.val==1) { - printh 92 - prints "currentpage",0 - printh 00 - prints "climate",0 - printh 00 - printh FF FF FF + sendme vis target_icon,0 vis target_temp,0 vis current_temp,0 diff --git a/nspanel_us_code/confirm.txt b/nspanel_us_code/confirm.txt index 05a64f0..8aa5cb8 100644 --- a/nspanel_us_code/confirm.txt +++ b/nspanel_us_code/confirm.txt @@ -17,12 +17,7 @@ Page confirm page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "confirm",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/cover.txt b/nspanel_us_code/cover.txt index de7bbf2..461625b 100644 --- a/nspanel_us_code/cover.txt +++ b/nspanel_us_code/cover.txt @@ -17,12 +17,7 @@ Page cover page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "cover",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/entitypage01.txt b/nspanel_us_code/entitypage01.txt index 403e6da..fc04b65 100644 --- a/nspanel_us_code/entitypage01.txt +++ b/nspanel_us_code/entitypage01.txt @@ -17,12 +17,7 @@ Page entitypage01 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage01",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/entitypage02.txt b/nspanel_us_code/entitypage02.txt index 6c9bd51..01a658d 100644 --- a/nspanel_us_code/entitypage02.txt +++ b/nspanel_us_code/entitypage02.txt @@ -17,12 +17,7 @@ Page entitypage02 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage02",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/entitypage03.txt b/nspanel_us_code/entitypage03.txt index c7d9820..ce8d89d 100644 --- a/nspanel_us_code/entitypage03.txt +++ b/nspanel_us_code/entitypage03.txt @@ -17,12 +17,7 @@ Page entitypage03 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage03",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/entitypage04.txt b/nspanel_us_code/entitypage04.txt index f97110f..5b19f8a 100644 --- a/nspanel_us_code/entitypage04.txt +++ b/nspanel_us_code/entitypage04.txt @@ -17,12 +17,7 @@ Page entitypage04 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage04",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/fan.txt b/nspanel_us_code/fan.txt index 2d15fc1..4c9f50a 100644 --- a/nspanel_us_code/fan.txt +++ b/nspanel_us_code/fan.txt @@ -17,12 +17,7 @@ Page fan page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "fan",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/home.txt b/nspanel_us_code/home.txt index 5726f9d..e94e7ea 100644 --- a/nspanel_us_code/home.txt +++ b/nspanel_us_code/home.txt @@ -12,12 +12,7 @@ Page home Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "home",0 - printh 00 - printh FF FF FF + sendme vis bt_notific,is_notification vis bt_qrcode,is_qrcode vis bt_entities,is_entities diff --git a/nspanel_us_code/keyb_num.txt b/nspanel_us_code/keyb_num.txt index 3387379..80c0013 100644 --- a/nspanel_us_code/keyb_num.txt +++ b/nspanel_us_code/keyb_num.txt @@ -17,12 +17,7 @@ Page keyb_num page page_id.val }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "keyb_num",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/light.txt b/nspanel_us_code/light.txt index b655c90..11c235f 100644 --- a/nspanel_us_code/light.txt +++ b/nspanel_us_code/light.txt @@ -17,12 +17,7 @@ Page light page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "light",0 - printh 00 - printh FF FF FF + sendme vis light_b_press,1 vis lightslider,1 vis light_value,1 diff --git a/nspanel_us_code/media_player.txt b/nspanel_us_code/media_player.txt index 84234a0..fe32648 100644 --- a/nspanel_us_code/media_player.txt +++ b/nspanel_us_code/media_player.txt @@ -17,12 +17,7 @@ Page media_player page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "media_player",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/notification.txt b/nspanel_us_code/notification.txt index 7ffcf81..38dd7bc 100644 --- a/nspanel_us_code/notification.txt +++ b/nspanel_us_code/notification.txt @@ -17,12 +17,7 @@ Page notification page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "notification",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/qrcode.txt b/nspanel_us_code/qrcode.txt index 7a0ee3c..46499ea 100644 --- a/nspanel_us_code/qrcode.txt +++ b/nspanel_us_code/qrcode.txt @@ -12,12 +12,7 @@ Page qrcode Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "qrcode",0 - printh 00 - printh FF FF FF + sendme Touch Press Event printh 91 diff --git a/nspanel_us_code/screensaver.txt b/nspanel_us_code/screensaver.txt index 85dc9a3..62abd11 100644 --- a/nspanel_us_code/screensaver.txt +++ b/nspanel_us_code/screensaver.txt @@ -12,12 +12,7 @@ Page screensaver Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "screensaver",0 - printh 00 - printh FF FF FF + sendme dim=0 Touch Release Event diff --git a/nspanel_us_code/settings.txt b/nspanel_us_code/settings.txt index a55915a..f3afb7b 100644 --- a/nspanel_us_code/settings.txt +++ b/nspanel_us_code/settings.txt @@ -12,12 +12,7 @@ Page settings Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "settings",0 - printh 00 - printh FF FF FF + sendme covx brightslider.val,bright_text.txt,0,0 bright_text.txt+="%" covx dimslider.val,dim_text.txt,0,0 diff --git a/nspanel_us_code/weather01.txt b/nspanel_us_code/weather01.txt index bdd99f1..ba51c85 100644 --- a/nspanel_us_code/weather01.txt +++ b/nspanel_us_code/weather01.txt @@ -17,12 +17,7 @@ Page weather01 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather01",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/weather02.txt b/nspanel_us_code/weather02.txt index 46cfb72..8ced5b4 100644 --- a/nspanel_us_code/weather02.txt +++ b/nspanel_us_code/weather02.txt @@ -17,12 +17,7 @@ Page weather02 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather02",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/weather03.txt b/nspanel_us_code/weather03.txt index eea35c2..dcfe440 100644 --- a/nspanel_us_code/weather03.txt +++ b/nspanel_us_code/weather03.txt @@ -17,12 +17,7 @@ Page weather03 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather03",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/weather04.txt b/nspanel_us_code/weather04.txt index b7997bf..2beb330 100644 --- a/nspanel_us_code/weather04.txt +++ b/nspanel_us_code/weather04.txt @@ -17,12 +17,7 @@ Page weather04 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather04",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_code/weather05.txt b/nspanel_us_code/weather05.txt index 6f12899..da5d7f1 100644 --- a/nspanel_us_code/weather05.txt +++ b/nspanel_us_code/weather05.txt @@ -17,12 +17,7 @@ Page weather05 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather05",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index db78de0..1d30ea8 100644 Binary files a/nspanel_us_land.HMI and b/nspanel_us_land.HMI differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index f137e5e..8875fe8 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ diff --git a/nspanel_us_land_code/alarm.txt b/nspanel_us_land_code/alarm.txt index e04f9c1..f8fbcda 100644 --- a/nspanel_us_land_code/alarm.txt +++ b/nspanel_us_land_code/alarm.txt @@ -17,12 +17,7 @@ Page alarm page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "alarm",0 - printh 00 - printh FF FF FF + sendme vis bt_home,0 vis bt_away,0 vis bt_night,0 diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt index b66ec4e..5213736 100644 --- a/nspanel_us_land_code/boot.txt +++ b/nspanel_us_land_code/boot.txt @@ -12,12 +12,7 @@ Page boot Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "boot",0 - printh 00 - printh FF FF FF + sendme dim=0 vis bt_reboot,0 covx baud,baud_rate.txt,0,0 @@ -142,7 +137,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 4.1.2 + Text : 4.2dev Max. Text Size : 9 Text esph_version diff --git a/nspanel_us_land_code/buttonpage01.txt b/nspanel_us_land_code/buttonpage01.txt index 0e40a85..6b8793a 100644 --- a/nspanel_us_land_code/buttonpage01.txt +++ b/nspanel_us_land_code/buttonpage01.txt @@ -17,12 +17,7 @@ Page buttonpage01 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage01",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_us_land_code/buttonpage02.txt b/nspanel_us_land_code/buttonpage02.txt index 3279884..b089538 100644 --- a/nspanel_us_land_code/buttonpage02.txt +++ b/nspanel_us_land_code/buttonpage02.txt @@ -17,12 +17,7 @@ Page buttonpage02 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage02",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_us_land_code/buttonpage03.txt b/nspanel_us_land_code/buttonpage03.txt index 42e1356..553e3cf 100644 --- a/nspanel_us_land_code/buttonpage03.txt +++ b/nspanel_us_land_code/buttonpage03.txt @@ -17,12 +17,7 @@ Page buttonpage03 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage03",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_us_land_code/buttonpage04.txt b/nspanel_us_land_code/buttonpage04.txt index 6632d16..b64eabd 100644 --- a/nspanel_us_land_code/buttonpage04.txt +++ b/nspanel_us_land_code/buttonpage04.txt @@ -17,12 +17,7 @@ Page buttonpage04 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "buttonpage04",0 - printh 00 - printh FF FF FF + sendme vis 255,0 vis button_back,1 vis page_index,1 diff --git a/nspanel_us_land_code/climate.txt b/nspanel_us_land_code/climate.txt index 3af8119..0310f84 100644 --- a/nspanel_us_land_code/climate.txt +++ b/nspanel_us_land_code/climate.txt @@ -14,12 +14,7 @@ Page climate Preinitialize Event if(api==1||embedded.val==1) { - printh 92 - prints "currentpage",0 - printh 00 - prints "climate",0 - printh 00 - printh FF FF FF + sendme vis target_icon,0 vis target_temp,0 vis current_temp,0 diff --git a/nspanel_us_land_code/confirm.txt b/nspanel_us_land_code/confirm.txt index a56d23c..75191ec 100644 --- a/nspanel_us_land_code/confirm.txt +++ b/nspanel_us_land_code/confirm.txt @@ -17,12 +17,7 @@ Page confirm page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "confirm",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/cover.txt b/nspanel_us_land_code/cover.txt index de7bbf2..461625b 100644 --- a/nspanel_us_land_code/cover.txt +++ b/nspanel_us_land_code/cover.txt @@ -17,12 +17,7 @@ Page cover page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "cover",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/entitypage01.txt b/nspanel_us_land_code/entitypage01.txt index d824602..ba23709 100644 --- a/nspanel_us_land_code/entitypage01.txt +++ b/nspanel_us_land_code/entitypage01.txt @@ -17,12 +17,7 @@ Page entitypage01 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage01",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/entitypage02.txt b/nspanel_us_land_code/entitypage02.txt index 56b2ae4..6efb8b4 100644 --- a/nspanel_us_land_code/entitypage02.txt +++ b/nspanel_us_land_code/entitypage02.txt @@ -17,12 +17,7 @@ Page entitypage02 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage02",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/entitypage03.txt b/nspanel_us_land_code/entitypage03.txt index 1e38380..9527653 100644 --- a/nspanel_us_land_code/entitypage03.txt +++ b/nspanel_us_land_code/entitypage03.txt @@ -17,12 +17,7 @@ Page entitypage03 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage03",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/entitypage04.txt b/nspanel_us_land_code/entitypage04.txt index c1fbdd7..34f378d 100644 --- a/nspanel_us_land_code/entitypage04.txt +++ b/nspanel_us_land_code/entitypage04.txt @@ -17,12 +17,7 @@ Page entitypage04 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "entitypage04",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/fan.txt b/nspanel_us_land_code/fan.txt index d2e7ba1..3675007 100644 --- a/nspanel_us_land_code/fan.txt +++ b/nspanel_us_land_code/fan.txt @@ -17,12 +17,7 @@ Page fan page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "fan",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/home.txt b/nspanel_us_land_code/home.txt index 5d45e1f..d4e3776 100644 --- a/nspanel_us_land_code/home.txt +++ b/nspanel_us_land_code/home.txt @@ -12,12 +12,7 @@ Page home Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "home",0 - printh 00 - printh FF FF FF + sendme vis bt_notific,is_notification vis bt_qrcode,is_qrcode vis bt_entities,is_entities diff --git a/nspanel_us_land_code/keyb_num.txt b/nspanel_us_land_code/keyb_num.txt index 26a81e8..89c756b 100644 --- a/nspanel_us_land_code/keyb_num.txt +++ b/nspanel_us_land_code/keyb_num.txt @@ -17,12 +17,7 @@ Page keyb_num page page_id.val }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "keyb_num",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/light.txt b/nspanel_us_land_code/light.txt index b655c90..11c235f 100644 --- a/nspanel_us_land_code/light.txt +++ b/nspanel_us_land_code/light.txt @@ -17,12 +17,7 @@ Page light page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "light",0 - printh 00 - printh FF FF FF + sendme vis light_b_press,1 vis lightslider,1 vis light_value,1 diff --git a/nspanel_us_land_code/media_player.txt b/nspanel_us_land_code/media_player.txt index c83aed5..5dcbd3e 100644 --- a/nspanel_us_land_code/media_player.txt +++ b/nspanel_us_land_code/media_player.txt @@ -17,12 +17,7 @@ Page media_player page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "media_player",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/notification.txt b/nspanel_us_land_code/notification.txt index 300ce12..85d00df 100644 --- a/nspanel_us_land_code/notification.txt +++ b/nspanel_us_land_code/notification.txt @@ -17,12 +17,7 @@ Page notification page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "notification",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/qrcode.txt b/nspanel_us_land_code/qrcode.txt index 7a0ee3c..46499ea 100644 --- a/nspanel_us_land_code/qrcode.txt +++ b/nspanel_us_land_code/qrcode.txt @@ -12,12 +12,7 @@ Page qrcode Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "qrcode",0 - printh 00 - printh FF FF FF + sendme Touch Press Event printh 91 diff --git a/nspanel_us_land_code/screensaver.txt b/nspanel_us_land_code/screensaver.txt index 85dc9a3..62abd11 100644 --- a/nspanel_us_land_code/screensaver.txt +++ b/nspanel_us_land_code/screensaver.txt @@ -12,12 +12,7 @@ Page screensaver Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "screensaver",0 - printh 00 - printh FF FF FF + sendme dim=0 Touch Release Event diff --git a/nspanel_us_land_code/settings.txt b/nspanel_us_land_code/settings.txt index 87d34d8..5690a1d 100644 --- a/nspanel_us_land_code/settings.txt +++ b/nspanel_us_land_code/settings.txt @@ -12,12 +12,7 @@ Page settings Events Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "settings",0 - printh 00 - printh FF FF FF + sendme covx brightslider.val,bright_text.txt,0,0 bright_text.txt+="%" covx dimslider.val,dim_text.txt,0,0 diff --git a/nspanel_us_land_code/weather01.txt b/nspanel_us_land_code/weather01.txt index 55be75d..a515d5e 100644 --- a/nspanel_us_land_code/weather01.txt +++ b/nspanel_us_land_code/weather01.txt @@ -17,12 +17,7 @@ Page weather01 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather01",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/weather02.txt b/nspanel_us_land_code/weather02.txt index 89fcdf8..3da14ff 100644 --- a/nspanel_us_land_code/weather02.txt +++ b/nspanel_us_land_code/weather02.txt @@ -17,12 +17,7 @@ Page weather02 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather02",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/weather03.txt b/nspanel_us_land_code/weather03.txt index 149532d..c51bd6b 100644 --- a/nspanel_us_land_code/weather03.txt +++ b/nspanel_us_land_code/weather03.txt @@ -17,12 +17,7 @@ Page weather03 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather03",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/weather04.txt b/nspanel_us_land_code/weather04.txt index 092c81d..0549fcd 100644 --- a/nspanel_us_land_code/weather04.txt +++ b/nspanel_us_land_code/weather04.txt @@ -17,12 +17,7 @@ Page weather04 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather04",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event diff --git a/nspanel_us_land_code/weather05.txt b/nspanel_us_land_code/weather05.txt index 308041b..26bf06f 100644 --- a/nspanel_us_land_code/weather05.txt +++ b/nspanel_us_land_code/weather05.txt @@ -17,12 +17,7 @@ Page weather05 page home }else { - printh 92 - prints "currentpage",0 - printh 00 - prints "weather05",0 - printh 00 - printh FF FF FF + sendme } Touch Press Event