diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index 3a0a32f..8ea6a49 100644 Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index a71d5f1..a2eeec1 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 90afe5d..8617a97 100644 --- a/nspanel_eu_code/alarm.txt +++ b/nspanel_eu_code/alarm.txt @@ -277,8 +277,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/buttonpage01.txt b/nspanel_eu_code/buttonpage01.txt index fbcfcb2..cba5b81 100644 --- a/nspanel_eu_code/buttonpage01.txt +++ b/nspanel_eu_code/buttonpage01.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/buttonpage02.txt b/nspanel_eu_code/buttonpage02.txt index 93dfaa0..e681569 100644 --- a/nspanel_eu_code/buttonpage02.txt +++ b/nspanel_eu_code/buttonpage02.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/buttonpage03.txt b/nspanel_eu_code/buttonpage03.txt index 67d14ae..4b36f81 100644 --- a/nspanel_eu_code/buttonpage03.txt +++ b/nspanel_eu_code/buttonpage03.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/buttonpage04.txt b/nspanel_eu_code/buttonpage04.txt index b9f6bb3..14fc68e 100644 --- a/nspanel_eu_code/buttonpage04.txt +++ b/nspanel_eu_code/buttonpage04.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/climate.txt b/nspanel_eu_code/climate.txt index fe93b64..cfb0956 100644 --- a/nspanel_eu_code/climate.txt +++ b/nspanel_eu_code/climate.txt @@ -75,65 +75,65 @@ Page climate Variable (string) va1 Attributes - ID : 26 + ID : 25 Scope : local Text : Max. Text Size: 10 Variable (string) climatesetting Attributes - ID : 27 + ID : 26 Scope : local Text : Max. Text Size: 255 Variable (string) lastclick Attributes - ID : 35 + ID : 34 Scope : local Text : Max. Text Size: 255 Variable (int32) temp_offset Attributes - ID : 37 + ID : 36 Scope: local Value: 0 Variable (int32) temp_step Attributes - ID : 38 + ID : 37 Scope: local Value: 0 Variable (int32) temp_number Attributes - ID : 44 + ID : 43 Scope: local Value: 0 Variable (int32) va0 Attributes - ID : 45 + ID : 44 Scope: local Value: 0 Variable (string) back_page Attributes - ID : 46 + ID : 45 Scope : local Text : home Max. Text Size: 15 Variable (int32) embedded Attributes - ID : 47 + ID : 46 Scope: local Value: 0 Variable (string) va2 Attributes - ID : 48 + ID : 47 Scope : local Text : Max. Text Size: 10 @@ -150,7 +150,7 @@ Text current_temp Text page_label Attributes - ID : 7 + ID : 6 Scope : local Dragging : 0 Send Component ID : disabled @@ -160,7 +160,7 @@ Text page_label Text current_icon Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Send Component ID : disabled @@ -170,7 +170,7 @@ Text current_icon Text target_icon Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Send Component ID : disabled @@ -180,7 +180,7 @@ Text target_icon Text value01_icon Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Send Component ID : disabled @@ -190,7 +190,7 @@ Text value01_icon Text value01 Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Send Component ID : disabled @@ -200,7 +200,7 @@ Text value01 Text value02_icon Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled @@ -210,7 +210,7 @@ Text value02_icon Text value02 Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : disabled @@ -220,7 +220,7 @@ Text value02 Text value03_icon Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Send Component ID : disabled @@ -230,7 +230,7 @@ Text value03_icon Text value03 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -240,7 +240,7 @@ Text value03 Text value04_icon Attributes - ID : 17 + ID : 16 Scope : local Dragging : 0 Send Component ID : disabled @@ -250,7 +250,7 @@ Text value04_icon Text value04 Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Send Component ID : disabled @@ -260,7 +260,7 @@ Text value04 Text button01_icon Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Send Component ID : disabled @@ -270,7 +270,7 @@ Text button01_icon Text button02_icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled @@ -280,7 +280,7 @@ Text button02_icon Text button03_icon Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Send Component ID : disabled @@ -290,7 +290,7 @@ Text button03_icon Text button04_icon Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled @@ -300,7 +300,7 @@ Text button04_icon Text button05_icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Send Component ID : disabled @@ -310,7 +310,7 @@ Text button05_icon Text button06_icon Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Send Component ID : disabled @@ -320,7 +320,7 @@ Text button06_icon Text button07_icon Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Send Component ID : disabled @@ -330,7 +330,7 @@ Text button07_icon Text button08_icon Attributes - ID : 39 + ID : 38 Scope : local Dragging : 0 Send Component ID : disabled @@ -340,7 +340,7 @@ Text button08_icon Text button09_icon Attributes - ID : 41 + ID : 40 Scope : local Dragging : 0 Send Component ID : disabled @@ -350,7 +350,7 @@ Text button09_icon Text target_temp Attributes - ID : 43 + ID : 42 Scope : local Dragging : 0 Send Component ID : disabled @@ -360,7 +360,7 @@ Text target_temp Slider climateslider Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Send Component ID: disabled @@ -379,6 +379,35 @@ Slider climateslider target_temp.txt+="."+va1.txt timer01.en=1 +Button button_back + Attributes + ID : 48 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + if(back_page.txt=="buttonpage01") + { + page buttonpage01 + }else if(back_page.txt=="buttonpage02") + { + page buttonpage02 + }else if(back_page.txt=="buttonpage03") + { + page buttonpage03 + }else if(back_page.txt=="buttonpage04") + { + page buttonpage04 + }else + { + page home + } + Hotspot decrease_temp Attributes ID : 4 @@ -427,35 +456,9 @@ Hotspot increase_temp Touch Release Event timer01.en=1 -Hotspot climate_back - Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled - - Events - Touch Press Event - if(back_page.txt=="buttonpage01") - { - page buttonpage01 - }else if(back_page.txt=="buttonpage02") - { - page buttonpage02 - }else if(back_page.txt=="buttonpage03") - { - page buttonpage03 - }else if(back_page.txt=="buttonpage04") - { - page buttonpage04 - }else - { - page home - } - Hotspot button01 Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Send Component ID: disabled @@ -473,7 +476,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Send Component ID: disabled @@ -491,7 +494,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Send Component ID: disabled @@ -509,7 +512,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Send Component ID: disabled @@ -527,7 +530,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Send Component ID: disabled @@ -545,7 +548,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Send Component ID: disabled @@ -563,7 +566,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Send Component ID: disabled @@ -581,7 +584,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 40 + ID : 39 Scope : local Dragging : 0 Send Component ID: disabled @@ -607,7 +610,7 @@ Hotspot button08 Hotspot button09 Attributes - ID : 42 + ID : 41 Scope : local Dragging : 0 Send Component ID: disabled @@ -645,7 +648,7 @@ Timer swipestore Timer timer01 Attributes - ID : 36 + ID : 35 Scope : local Period (ms): 1000 Enabled : no diff --git a/nspanel_eu_code/cover.txt b/nspanel_eu_code/cover.txt index 014c58a..bfb2b25 100644 --- a/nspanel_eu_code/cover.txt +++ b/nspanel_eu_code/cover.txt @@ -209,8 +209,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/entitypage01.txt b/nspanel_eu_code/entitypage01.txt index e9638e6..e7e9ea3 100644 --- a/nspanel_eu_code/entitypage01.txt +++ b/nspanel_eu_code/entitypage01.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/entitypage02.txt b/nspanel_eu_code/entitypage02.txt index 5b99793..e66ba1d 100644 --- a/nspanel_eu_code/entitypage02.txt +++ b/nspanel_eu_code/entitypage02.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/entitypage03.txt b/nspanel_eu_code/entitypage03.txt index 556e2a2..01a4cb1 100644 --- a/nspanel_eu_code/entitypage03.txt +++ b/nspanel_eu_code/entitypage03.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/entitypage04.txt b/nspanel_eu_code/entitypage04.txt index 29448f9..92eed65 100644 --- a/nspanel_eu_code/entitypage04.txt +++ b/nspanel_eu_code/entitypage04.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/fan.txt b/nspanel_eu_code/fan.txt index 1dc9c52..27327a3 100644 --- a/nspanel_eu_code/fan.txt +++ b/nspanel_eu_code/fan.txt @@ -303,8 +303,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/keyb_num.txt b/nspanel_eu_code/keyb_num.txt index e57f52e..54fefee 100644 --- a/nspanel_eu_code/keyb_num.txt +++ b/nspanel_eu_code/keyb_num.txt @@ -137,7 +137,7 @@ Button bclose Dragging : 0 Send Component ID: disabled State : unpressed - Text : X + Text :  Max. Text Size : 10 Events diff --git a/nspanel_eu_code/light.txt b/nspanel_eu_code/light.txt index 1c0c96e..766b785 100644 --- a/nspanel_eu_code/light.txt +++ b/nspanel_eu_code/light.txt @@ -451,8 +451,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/notification.txt b/nspanel_eu_code/notification.txt index 6b3f274..5abee5f 100644 --- a/nspanel_eu_code/notification.txt +++ b/nspanel_eu_code/notification.txt @@ -44,7 +44,7 @@ Page notification Variable (string) lastclick Attributes - ID : 9 + ID : 5 Scope : local Text : Max. Text Size: 100 @@ -69,54 +69,29 @@ Text notifi_label Text : Max. Text Size : 30 -Picture accept_pic - Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture clear_pic - Attributes - ID : 4 - Scope : local - Dragging : 0 - Send Component ID: disabled - Button button_back - Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled - State : unpressed - Text : x - Max. Text Size : 1 - - Events - Touch Press Event - page home - -Hotspot accept - Attributes - ID : 5 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Hotspot clear Attributes ID : 6 Scope : local Dragging : 0 Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 -Hotspot accept_hotspot + Events + Touch Press Event + page home + +Button bt_accept Attributes - ID : 10 + ID : 7 Scope : local Dragging : 0 Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -128,12 +103,15 @@ Hotspot accept_hotspot printh 00 printh FF FF FF -Hotspot clear_hotspot +Button bt_clear Attributes - ID : 11 + ID : 8 Scope : local Dragging : 0 Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 10 Events Touch Release Event @@ -147,7 +125,7 @@ Hotspot clear_hotspot Timer swipestore Attributes - ID : 8 + ID : 4 Scope : local Period (ms): 50 Enabled : no @@ -159,7 +137,7 @@ Timer swipestore TouchCap swipe Attributes - ID : 7 + ID : 3 Scope: local Value: 0 diff --git a/nspanel_eu_code/pics/124.png b/nspanel_eu_code/pics/124.png index 9ccee9d..ea7832f 100644 Binary files a/nspanel_eu_code/pics/124.png and b/nspanel_eu_code/pics/124.png differ diff --git a/nspanel_eu_code/qrcode.txt b/nspanel_eu_code/qrcode.txt index c9d31d6..74019a6 100644 --- a/nspanel_eu_code/qrcode.txt +++ b/nspanel_eu_code/qrcode.txt @@ -62,8 +62,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/settings.txt b/nspanel_eu_code/settings.txt index 02ff5e9..3cfbf9f 100644 --- a/nspanel_eu_code/settings.txt +++ b/nspanel_eu_code/settings.txt @@ -96,13 +96,6 @@ Text a09 Text : Dimming Max. Text Size : 7 -Picture settings_exit - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID: disabled - Slider brightslider Attributes ID : 3 @@ -139,11 +132,25 @@ Slider dimslider prints dimslider.val,0 printh FF FF FF -Dual-state Button bt0 +Button button_back Attributes ID : 13 Scope : local Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + page home + +Dual-state Button bt0 + Attributes + ID : 11 + Scope : local + Dragging : 0 Send Component ID: on press and release State : unpressed Text : @@ -151,7 +158,7 @@ Dual-state Button bt0 Dual-state Button bt1 Attributes - ID : 14 + ID : 12 Scope : global Dragging : 0 Send Component ID: on press and release @@ -159,17 +166,6 @@ Dual-state Button bt1 Text : Max. Text Size : 0 -Hotspot setings_back - Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled - - Events - Touch Press Event - page home - Timer swipestore Attributes ID : 2 diff --git a/nspanel_eu_code/weather01.txt b/nspanel_eu_code/weather01.txt index 4fd37da..a9af4ea 100644 --- a/nspanel_eu_code/weather01.txt +++ b/nspanel_eu_code/weather01.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/weather02.txt b/nspanel_eu_code/weather02.txt index 97f95d0..0987b66 100644 --- a/nspanel_eu_code/weather02.txt +++ b/nspanel_eu_code/weather02.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/weather03.txt b/nspanel_eu_code/weather03.txt index 9f3a0e0..078875c 100644 --- a/nspanel_eu_code/weather03.txt +++ b/nspanel_eu_code/weather03.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/weather04.txt b/nspanel_eu_code/weather04.txt index 667829a..1d4973a 100644 --- a/nspanel_eu_code/weather04.txt +++ b/nspanel_eu_code/weather04.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_eu_code/weather05.txt b/nspanel_eu_code/weather05.txt index b0e4bce..5c4d139 100644 --- a/nspanel_eu_code/weather05.txt +++ b/nspanel_eu_code/weather05.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 55cce6c..af1129d 100644 Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 269134c..67ab426 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 90afe5d..8617a97 100644 --- a/nspanel_us_code/alarm.txt +++ b/nspanel_us_code/alarm.txt @@ -277,8 +277,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/buttonpage01.txt b/nspanel_us_code/buttonpage01.txt index fbcfcb2..cba5b81 100644 --- a/nspanel_us_code/buttonpage01.txt +++ b/nspanel_us_code/buttonpage01.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/buttonpage02.txt b/nspanel_us_code/buttonpage02.txt index 93dfaa0..e681569 100644 --- a/nspanel_us_code/buttonpage02.txt +++ b/nspanel_us_code/buttonpage02.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/buttonpage03.txt b/nspanel_us_code/buttonpage03.txt index 67d14ae..4b36f81 100644 --- a/nspanel_us_code/buttonpage03.txt +++ b/nspanel_us_code/buttonpage03.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/buttonpage04.txt b/nspanel_us_code/buttonpage04.txt index b9f6bb3..14fc68e 100644 --- a/nspanel_us_code/buttonpage04.txt +++ b/nspanel_us_code/buttonpage04.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/climate.txt b/nspanel_us_code/climate.txt index d7ced3d..0203747 100644 --- a/nspanel_us_code/climate.txt +++ b/nspanel_us_code/climate.txt @@ -75,65 +75,65 @@ Page climate Variable (string) va1 Attributes - ID : 26 + ID : 25 Scope : local Text : Max. Text Size: 10 Variable (string) climatesetting Attributes - ID : 27 + ID : 26 Scope : local Text : Max. Text Size: 255 Variable (string) lastclick Attributes - ID : 35 + ID : 34 Scope : local Text : Max. Text Size: 255 Variable (int32) temp_offset Attributes - ID : 37 + ID : 36 Scope: local Value: 0 Variable (int32) temp_step Attributes - ID : 38 + ID : 37 Scope: local Value: 1 Variable (int32) temp_number Attributes - ID : 44 + ID : 43 Scope: local Value: 0 Variable (int32) va0 Attributes - ID : 45 + ID : 44 Scope: local Value: 0 Variable (string) back_page Attributes - ID : 46 + ID : 45 Scope : local Text : home Max. Text Size: 15 Variable (int32) embedded Attributes - ID : 47 + ID : 46 Scope: local Value: 0 Variable (string) va2 Attributes - ID : 48 + ID : 47 Scope : local Text : Max. Text Size: 10 @@ -150,7 +150,7 @@ Text current_temp Text page_label Attributes - ID : 7 + ID : 6 Scope : local Dragging : 0 Send Component ID : disabled @@ -160,7 +160,7 @@ Text page_label Text current_icon Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Send Component ID : disabled @@ -170,7 +170,7 @@ Text current_icon Text target_icon Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Send Component ID : disabled @@ -180,7 +180,7 @@ Text target_icon Text value01_icon Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Send Component ID : disabled @@ -190,7 +190,7 @@ Text value01_icon Text value01 Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Send Component ID : disabled @@ -200,7 +200,7 @@ Text value01 Text value02_icon Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled @@ -210,7 +210,7 @@ Text value02_icon Text value02 Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : disabled @@ -220,7 +220,7 @@ Text value02 Text value03_icon Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Send Component ID : disabled @@ -230,7 +230,7 @@ Text value03_icon Text value03 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -240,7 +240,7 @@ Text value03 Text value04_icon Attributes - ID : 17 + ID : 16 Scope : local Dragging : 0 Send Component ID : disabled @@ -250,7 +250,7 @@ Text value04_icon Text value04 Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Send Component ID : disabled @@ -260,7 +260,7 @@ Text value04 Text button01_icon Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Send Component ID : disabled @@ -270,7 +270,7 @@ Text button01_icon Text button02_icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled @@ -280,7 +280,7 @@ Text button02_icon Text button03_icon Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Send Component ID : disabled @@ -290,7 +290,7 @@ Text button03_icon Text button04_icon Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled @@ -300,7 +300,7 @@ Text button04_icon Text button05_icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Send Component ID : disabled @@ -310,7 +310,7 @@ Text button05_icon Text button06_icon Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Send Component ID : disabled @@ -320,7 +320,7 @@ Text button06_icon Text button07_icon Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Send Component ID : disabled @@ -330,7 +330,7 @@ Text button07_icon Text button08_icon Attributes - ID : 39 + ID : 38 Scope : local Dragging : 0 Send Component ID : disabled @@ -340,7 +340,7 @@ Text button08_icon Text button09_icon Attributes - ID : 41 + ID : 40 Scope : local Dragging : 0 Send Component ID : disabled @@ -350,7 +350,7 @@ Text button09_icon Text target_temp Attributes - ID : 43 + ID : 42 Scope : local Dragging : 0 Send Component ID : disabled @@ -360,7 +360,7 @@ Text target_temp Slider climateslider Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Send Component ID: disabled @@ -379,6 +379,35 @@ Slider climateslider target_temp.txt+="."+va1.txt timer01.en=1 +Button button_back + Attributes + ID : 48 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + if(back_page.txt=="buttonpage01") + { + page buttonpage01 + }else if(back_page.txt=="buttonpage02") + { + page buttonpage02 + }else if(back_page.txt=="buttonpage03") + { + page buttonpage03 + }else if(back_page.txt=="buttonpage04") + { + page buttonpage04 + }else + { + page home + } + Hotspot decrease_temp Attributes ID : 4 @@ -427,35 +456,9 @@ Hotspot increase_temp Touch Release Event timer01.en=1 -Hotspot climate_back - Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled - - Events - Touch Press Event - if(back_page.txt=="buttonpage01") - { - page buttonpage01 - }else if(back_page.txt=="buttonpage02") - { - page buttonpage02 - }else if(back_page.txt=="buttonpage03") - { - page buttonpage03 - }else if(back_page.txt=="buttonpage04") - { - page buttonpage04 - }else - { - page home - } - Hotspot button01 Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Send Component ID: disabled @@ -473,7 +476,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Send Component ID: disabled @@ -491,7 +494,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Send Component ID: disabled @@ -509,7 +512,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Send Component ID: disabled @@ -527,7 +530,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Send Component ID: disabled @@ -545,7 +548,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Send Component ID: disabled @@ -563,7 +566,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Send Component ID: disabled @@ -581,7 +584,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 40 + ID : 39 Scope : local Dragging : 0 Send Component ID: disabled @@ -607,7 +610,7 @@ Hotspot button08 Hotspot button09 Attributes - ID : 42 + ID : 41 Scope : local Dragging : 0 Send Component ID: disabled @@ -645,7 +648,7 @@ Timer swipestore Timer timer01 Attributes - ID : 36 + ID : 35 Scope : local Period (ms): 1000 Enabled : no diff --git a/nspanel_us_code/cover.txt b/nspanel_us_code/cover.txt index 014c58a..bfb2b25 100644 --- a/nspanel_us_code/cover.txt +++ b/nspanel_us_code/cover.txt @@ -209,8 +209,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/entitypage01.txt b/nspanel_us_code/entitypage01.txt index e9638e6..e7e9ea3 100644 --- a/nspanel_us_code/entitypage01.txt +++ b/nspanel_us_code/entitypage01.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/entitypage02.txt b/nspanel_us_code/entitypage02.txt index 5b99793..e66ba1d 100644 --- a/nspanel_us_code/entitypage02.txt +++ b/nspanel_us_code/entitypage02.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/entitypage03.txt b/nspanel_us_code/entitypage03.txt index 6892ecd..0260674 100644 --- a/nspanel_us_code/entitypage03.txt +++ b/nspanel_us_code/entitypage03.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/entitypage04.txt b/nspanel_us_code/entitypage04.txt index 29448f9..92eed65 100644 --- a/nspanel_us_code/entitypage04.txt +++ b/nspanel_us_code/entitypage04.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/fan.txt b/nspanel_us_code/fan.txt index 1dc9c52..27327a3 100644 --- a/nspanel_us_code/fan.txt +++ b/nspanel_us_code/fan.txt @@ -303,8 +303,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/keyb_num.txt b/nspanel_us_code/keyb_num.txt index e57f52e..d911ac8 100644 --- a/nspanel_us_code/keyb_num.txt +++ b/nspanel_us_code/keyb_num.txt @@ -137,8 +137,8 @@ Button bclose Dragging : 0 Send Component ID: disabled State : unpressed - Text : X - Max. Text Size : 10 + Text :  + Max. Text Size : 3 Events Touch Release Event diff --git a/nspanel_us_code/light.txt b/nspanel_us_code/light.txt index 1c0c96e..766b785 100644 --- a/nspanel_us_code/light.txt +++ b/nspanel_us_code/light.txt @@ -451,8 +451,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/notification.txt b/nspanel_us_code/notification.txt index 98b52a7..7a4d767 100644 --- a/nspanel_us_code/notification.txt +++ b/nspanel_us_code/notification.txt @@ -44,7 +44,7 @@ Page notification Variable (string) lastclick Attributes - ID : 10 + ID : 6 Scope : local Text : Max. Text Size: 100 @@ -71,7 +71,7 @@ Text notifi_label Text loading Attributes - ID : 9 + ID : 5 Scope : local Dragging : 0 Send Component ID : disabled @@ -79,54 +79,29 @@ Text loading Text : Max. Text Size : 1 -Picture accept_pic - Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture clear_pic - Attributes - ID : 4 - Scope : local - Dragging : 0 - Send Component ID: disabled - Button button_back Attributes - ID : 13 + ID : 7 Scope : local Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event page home -Hotspot accept +Button bt_accept Attributes - ID : 5 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Hotspot clear - Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Hotspot accept_hotspot - Attributes - ID : 11 + ID : 8 Scope : local Dragging : 0 Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -138,12 +113,15 @@ Hotspot accept_hotspot printh 00 printh FF FF FF -Hotspot clear_hotspot +Button bt_clear Attributes - ID : 12 + ID : 9 Scope : local Dragging : 0 Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -157,7 +135,7 @@ Hotspot clear_hotspot Timer swipestore Attributes - ID : 8 + ID : 4 Scope : local Period (ms): 50 Enabled : no @@ -169,7 +147,7 @@ Timer swipestore TouchCap swipe Attributes - ID : 7 + ID : 3 Scope: local Value: 0 diff --git a/nspanel_us_code/pics/127.png b/nspanel_us_code/pics/127.png new file mode 100644 index 0000000..57184a6 Binary files /dev/null and b/nspanel_us_code/pics/127.png differ diff --git a/nspanel_us_code/qrcode.txt b/nspanel_us_code/qrcode.txt index c9d31d6..74019a6 100644 --- a/nspanel_us_code/qrcode.txt +++ b/nspanel_us_code/qrcode.txt @@ -62,8 +62,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/settings.txt b/nspanel_us_code/settings.txt index 65d5af8..3262a5d 100644 --- a/nspanel_us_code/settings.txt +++ b/nspanel_us_code/settings.txt @@ -96,13 +96,6 @@ Text a09 Text : Dimming Max. Text Size : 7 -Picture settings_exit - Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled - Slider brightslider Attributes ID : 1 @@ -139,11 +132,25 @@ Slider dimslider prints dimslider.val,0 printh FF FF FF -Dual-state Button bt0 +Button button_back Attributes ID : 13 Scope : local Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + page home + +Dual-state Button bt0 + Attributes + ID : 11 + Scope : local + Dragging : 0 Send Component ID: on press and release State : unpressed Text : @@ -151,7 +158,7 @@ Dual-state Button bt0 Dual-state Button bt1 Attributes - ID : 14 + ID : 12 Scope : global Dragging : 0 Send Component ID: on press and release @@ -159,20 +166,9 @@ Dual-state Button bt1 Text : Max. Text Size : 0 -Hotspot setings_back - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID: disabled - - Events - Touch Press Event - page home - Timer swipestore Attributes - ID : 11 + ID : 9 Scope : local Period (ms): 50 Enabled : no @@ -184,7 +180,7 @@ Timer swipestore TouchCap swipe Attributes - ID : 12 + ID : 10 Scope: local Value: 0 diff --git a/nspanel_us_code/weather01.txt b/nspanel_us_code/weather01.txt index 6773833..0aa74b9 100644 --- a/nspanel_us_code/weather01.txt +++ b/nspanel_us_code/weather01.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/weather02.txt b/nspanel_us_code/weather02.txt index 97f95d0..0987b66 100644 --- a/nspanel_us_code/weather02.txt +++ b/nspanel_us_code/weather02.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/weather03.txt b/nspanel_us_code/weather03.txt index 9f3a0e0..078875c 100644 --- a/nspanel_us_code/weather03.txt +++ b/nspanel_us_code/weather03.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/weather04.txt b/nspanel_us_code/weather04.txt index 667829a..1d4973a 100644 --- a/nspanel_us_code/weather04.txt +++ b/nspanel_us_code/weather04.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_code/weather05.txt b/nspanel_us_code/weather05.txt index b0e4bce..5c4d139 100644 --- a/nspanel_us_code/weather05.txt +++ b/nspanel_us_code/weather05.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index 34a85f9..9563e2b 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 741c5c6..41fa5bd 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 90afe5d..8617a97 100644 --- a/nspanel_us_land_code/alarm.txt +++ b/nspanel_us_land_code/alarm.txt @@ -277,8 +277,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/buttonpage01.txt b/nspanel_us_land_code/buttonpage01.txt index e74827e..0fa3c17 100644 --- a/nspanel_us_land_code/buttonpage01.txt +++ b/nspanel_us_land_code/buttonpage01.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/buttonpage02.txt b/nspanel_us_land_code/buttonpage02.txt index 28e45d7..a775cc7 100644 --- a/nspanel_us_land_code/buttonpage02.txt +++ b/nspanel_us_land_code/buttonpage02.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/buttonpage03.txt b/nspanel_us_land_code/buttonpage03.txt index fbd00fb..77aa898 100644 --- a/nspanel_us_land_code/buttonpage03.txt +++ b/nspanel_us_land_code/buttonpage03.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/buttonpage04.txt b/nspanel_us_land_code/buttonpage04.txt index 575780e..1609fa8 100644 --- a/nspanel_us_land_code/buttonpage04.txt +++ b/nspanel_us_land_code/buttonpage04.txt @@ -375,8 +375,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/climate.txt b/nspanel_us_land_code/climate.txt index fe93b64..cfb0956 100644 --- a/nspanel_us_land_code/climate.txt +++ b/nspanel_us_land_code/climate.txt @@ -75,65 +75,65 @@ Page climate Variable (string) va1 Attributes - ID : 26 + ID : 25 Scope : local Text : Max. Text Size: 10 Variable (string) climatesetting Attributes - ID : 27 + ID : 26 Scope : local Text : Max. Text Size: 255 Variable (string) lastclick Attributes - ID : 35 + ID : 34 Scope : local Text : Max. Text Size: 255 Variable (int32) temp_offset Attributes - ID : 37 + ID : 36 Scope: local Value: 0 Variable (int32) temp_step Attributes - ID : 38 + ID : 37 Scope: local Value: 0 Variable (int32) temp_number Attributes - ID : 44 + ID : 43 Scope: local Value: 0 Variable (int32) va0 Attributes - ID : 45 + ID : 44 Scope: local Value: 0 Variable (string) back_page Attributes - ID : 46 + ID : 45 Scope : local Text : home Max. Text Size: 15 Variable (int32) embedded Attributes - ID : 47 + ID : 46 Scope: local Value: 0 Variable (string) va2 Attributes - ID : 48 + ID : 47 Scope : local Text : Max. Text Size: 10 @@ -150,7 +150,7 @@ Text current_temp Text page_label Attributes - ID : 7 + ID : 6 Scope : local Dragging : 0 Send Component ID : disabled @@ -160,7 +160,7 @@ Text page_label Text current_icon Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Send Component ID : disabled @@ -170,7 +170,7 @@ Text current_icon Text target_icon Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Send Component ID : disabled @@ -180,7 +180,7 @@ Text target_icon Text value01_icon Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Send Component ID : disabled @@ -190,7 +190,7 @@ Text value01_icon Text value01 Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Send Component ID : disabled @@ -200,7 +200,7 @@ Text value01 Text value02_icon Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled @@ -210,7 +210,7 @@ Text value02_icon Text value02 Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : disabled @@ -220,7 +220,7 @@ Text value02 Text value03_icon Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Send Component ID : disabled @@ -230,7 +230,7 @@ Text value03_icon Text value03 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -240,7 +240,7 @@ Text value03 Text value04_icon Attributes - ID : 17 + ID : 16 Scope : local Dragging : 0 Send Component ID : disabled @@ -250,7 +250,7 @@ Text value04_icon Text value04 Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Send Component ID : disabled @@ -260,7 +260,7 @@ Text value04 Text button01_icon Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Send Component ID : disabled @@ -270,7 +270,7 @@ Text button01_icon Text button02_icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled @@ -280,7 +280,7 @@ Text button02_icon Text button03_icon Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Send Component ID : disabled @@ -290,7 +290,7 @@ Text button03_icon Text button04_icon Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled @@ -300,7 +300,7 @@ Text button04_icon Text button05_icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Send Component ID : disabled @@ -310,7 +310,7 @@ Text button05_icon Text button06_icon Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Send Component ID : disabled @@ -320,7 +320,7 @@ Text button06_icon Text button07_icon Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Send Component ID : disabled @@ -330,7 +330,7 @@ Text button07_icon Text button08_icon Attributes - ID : 39 + ID : 38 Scope : local Dragging : 0 Send Component ID : disabled @@ -340,7 +340,7 @@ Text button08_icon Text button09_icon Attributes - ID : 41 + ID : 40 Scope : local Dragging : 0 Send Component ID : disabled @@ -350,7 +350,7 @@ Text button09_icon Text target_temp Attributes - ID : 43 + ID : 42 Scope : local Dragging : 0 Send Component ID : disabled @@ -360,7 +360,7 @@ Text target_temp Slider climateslider Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Send Component ID: disabled @@ -379,6 +379,35 @@ Slider climateslider target_temp.txt+="."+va1.txt timer01.en=1 +Button button_back + Attributes + ID : 48 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + if(back_page.txt=="buttonpage01") + { + page buttonpage01 + }else if(back_page.txt=="buttonpage02") + { + page buttonpage02 + }else if(back_page.txt=="buttonpage03") + { + page buttonpage03 + }else if(back_page.txt=="buttonpage04") + { + page buttonpage04 + }else + { + page home + } + Hotspot decrease_temp Attributes ID : 4 @@ -427,35 +456,9 @@ Hotspot increase_temp Touch Release Event timer01.en=1 -Hotspot climate_back - Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled - - Events - Touch Press Event - if(back_page.txt=="buttonpage01") - { - page buttonpage01 - }else if(back_page.txt=="buttonpage02") - { - page buttonpage02 - }else if(back_page.txt=="buttonpage03") - { - page buttonpage03 - }else if(back_page.txt=="buttonpage04") - { - page buttonpage04 - }else - { - page home - } - Hotspot button01 Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Send Component ID: disabled @@ -473,7 +476,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Send Component ID: disabled @@ -491,7 +494,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Send Component ID: disabled @@ -509,7 +512,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Send Component ID: disabled @@ -527,7 +530,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Send Component ID: disabled @@ -545,7 +548,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Send Component ID: disabled @@ -563,7 +566,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Send Component ID: disabled @@ -581,7 +584,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 40 + ID : 39 Scope : local Dragging : 0 Send Component ID: disabled @@ -607,7 +610,7 @@ Hotspot button08 Hotspot button09 Attributes - ID : 42 + ID : 41 Scope : local Dragging : 0 Send Component ID: disabled @@ -645,7 +648,7 @@ Timer swipestore Timer timer01 Attributes - ID : 36 + ID : 35 Scope : local Period (ms): 1000 Enabled : no diff --git a/nspanel_us_land_code/cover.txt b/nspanel_us_land_code/cover.txt index 014c58a..bfb2b25 100644 --- a/nspanel_us_land_code/cover.txt +++ b/nspanel_us_land_code/cover.txt @@ -209,8 +209,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/entitypage01.txt b/nspanel_us_land_code/entitypage01.txt index 86ebbcc..a3879a0 100644 --- a/nspanel_us_land_code/entitypage01.txt +++ b/nspanel_us_land_code/entitypage01.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/entitypage02.txt b/nspanel_us_land_code/entitypage02.txt index e289e87..0a9367f 100644 --- a/nspanel_us_land_code/entitypage02.txt +++ b/nspanel_us_land_code/entitypage02.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/entitypage03.txt b/nspanel_us_land_code/entitypage03.txt index 9efd572..ec40ef7 100644 --- a/nspanel_us_land_code/entitypage03.txt +++ b/nspanel_us_land_code/entitypage03.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/entitypage04.txt b/nspanel_us_land_code/entitypage04.txt index ec4356e..49dc4e3 100644 --- a/nspanel_us_land_code/entitypage04.txt +++ b/nspanel_us_land_code/entitypage04.txt @@ -309,8 +309,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/fan.txt b/nspanel_us_land_code/fan.txt index 1dc9c52..27327a3 100644 --- a/nspanel_us_land_code/fan.txt +++ b/nspanel_us_land_code/fan.txt @@ -303,8 +303,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/keyb_num.txt b/nspanel_us_land_code/keyb_num.txt index e57f52e..54fefee 100644 --- a/nspanel_us_land_code/keyb_num.txt +++ b/nspanel_us_land_code/keyb_num.txt @@ -137,7 +137,7 @@ Button bclose Dragging : 0 Send Component ID: disabled State : unpressed - Text : X + Text :  Max. Text Size : 10 Events diff --git a/nspanel_us_land_code/light.txt b/nspanel_us_land_code/light.txt index 1c0c96e..766b785 100644 --- a/nspanel_us_land_code/light.txt +++ b/nspanel_us_land_code/light.txt @@ -451,8 +451,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/notification.txt b/nspanel_us_land_code/notification.txt index 6b3f274..5abee5f 100644 --- a/nspanel_us_land_code/notification.txt +++ b/nspanel_us_land_code/notification.txt @@ -44,7 +44,7 @@ Page notification Variable (string) lastclick Attributes - ID : 9 + ID : 5 Scope : local Text : Max. Text Size: 100 @@ -69,54 +69,29 @@ Text notifi_label Text : Max. Text Size : 30 -Picture accept_pic - Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture clear_pic - Attributes - ID : 4 - Scope : local - Dragging : 0 - Send Component ID: disabled - Button button_back - Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled - State : unpressed - Text : x - Max. Text Size : 1 - - Events - Touch Press Event - page home - -Hotspot accept - Attributes - ID : 5 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Hotspot clear Attributes ID : 6 Scope : local Dragging : 0 Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 -Hotspot accept_hotspot + Events + Touch Press Event + page home + +Button bt_accept Attributes - ID : 10 + ID : 7 Scope : local Dragging : 0 Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 Events Touch Release Event @@ -128,12 +103,15 @@ Hotspot accept_hotspot printh 00 printh FF FF FF -Hotspot clear_hotspot +Button bt_clear Attributes - ID : 11 + ID : 8 Scope : local Dragging : 0 Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 10 Events Touch Release Event @@ -147,7 +125,7 @@ Hotspot clear_hotspot Timer swipestore Attributes - ID : 8 + ID : 4 Scope : local Period (ms): 50 Enabled : no @@ -159,7 +137,7 @@ Timer swipestore TouchCap swipe Attributes - ID : 7 + ID : 3 Scope: local Value: 0 diff --git a/nspanel_us_land_code/qrcode.txt b/nspanel_us_land_code/qrcode.txt index c9d31d6..74019a6 100644 --- a/nspanel_us_land_code/qrcode.txt +++ b/nspanel_us_land_code/qrcode.txt @@ -62,8 +62,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/settings.txt b/nspanel_us_land_code/settings.txt index 750602f..3993462 100644 --- a/nspanel_us_land_code/settings.txt +++ b/nspanel_us_land_code/settings.txt @@ -96,13 +96,6 @@ Text a09 Text : Dimming Max. Text Size : 7 -Picture settings_exit - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID: disabled - Slider brightslider Attributes ID : 3 @@ -139,11 +132,25 @@ Slider dimslider prints dimslider.val,0 printh FF FF FF -Dual-state Button bt0 +Button button_back Attributes ID : 13 Scope : local Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + page home + +Dual-state Button bt0 + Attributes + ID : 11 + Scope : local + Dragging : 0 Send Component ID: on press and release State : unpressed Text : @@ -151,7 +158,7 @@ Dual-state Button bt0 Dual-state Button bt1 Attributes - ID : 14 + ID : 12 Scope : global Dragging : 0 Send Component ID: on press and release @@ -159,17 +166,6 @@ Dual-state Button bt1 Text : Max. Text Size : 0 -Hotspot setings_back - Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled - - Events - Touch Press Event - page home - Timer swipestore Attributes ID : 2 diff --git a/nspanel_us_land_code/weather01.txt b/nspanel_us_land_code/weather01.txt index 3a7097a..3091b90 100644 --- a/nspanel_us_land_code/weather01.txt +++ b/nspanel_us_land_code/weather01.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/weather02.txt b/nspanel_us_land_code/weather02.txt index 0bf3738..af1574b 100644 --- a/nspanel_us_land_code/weather02.txt +++ b/nspanel_us_land_code/weather02.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/weather03.txt b/nspanel_us_land_code/weather03.txt index f1c3ddf..393b593 100644 --- a/nspanel_us_land_code/weather03.txt +++ b/nspanel_us_land_code/weather03.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/weather04.txt b/nspanel_us_land_code/weather04.txt index 92d318d..0739b91 100644 --- a/nspanel_us_land_code/weather04.txt +++ b/nspanel_us_land_code/weather04.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event diff --git a/nspanel_us_land_code/weather05.txt b/nspanel_us_land_code/weather05.txt index b7b53c2..9730873 100644 --- a/nspanel_us_land_code/weather05.txt +++ b/nspanel_us_land_code/weather05.txt @@ -206,8 +206,8 @@ Button button_back Dragging : 0 Send Component ID: disabled State : unpressed - Text : x - Max. Text Size : 1 + Text :  + Max. Text Size : 3 Events Touch Press Event