diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml index 325b1c5..d9c1a92 100644 --- a/esphome/nspanel_esphome_core.yaml +++ b/esphome/nspanel_esphome_core.yaml @@ -16,7 +16,7 @@ substitutions: temp_units: "°C" invalid_cooldown: "100ms" ##### DON'T CHANGE THIS ###### - version: "4.3.2d1" + version: "4.3.2b1" ############################## ##### External components ##### diff --git a/hmi/dev/nspanel_CJK_eu_code/boot.txt b/hmi/dev/nspanel_CJK_eu_code/boot.txt index 3312be9..adbdae0 100644 --- a/hmi/dev/nspanel_CJK_eu_code/boot.txt +++ b/hmi/dev/nspanel_CJK_eu_code/boot.txt @@ -96,7 +96,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.2d1 + Text : 4.3.2b1 Max. Text Size : 9 Text esph_version diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt index 7bf6975..7e8bc5c 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -840,7 +844,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Assume starting from buttonpage01 and aiming to navigate two pages ahead based on active pages. diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt index 7234ead..1af8c03 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -846,7 +850,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_buttonpage03==1&&is_buttonpage04==1) diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt index bb10da9..1ea3229 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -842,7 +846,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt index 10773be..7f5c3a0 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -798,15 +802,15 @@ TouchCap swipe if(swipec>swipedx) { // Navigate back based on active status - if(is_entitypage03==1) + if(is_buttonpage03==1) { - page entitypage03 - }else if(is_entitypage02==1) + page buttonpage03 + }else if(is_buttonpage02==1) { - page entitypage02 - }else if(is_entitypage01==1) + page buttonpage02 + }else if(is_buttonpage01==1) { - page entitypage01 + page buttonpage01 }else { page home @@ -826,14 +830,14 @@ TouchCap swipe // From Up to Down if(swipec>100) { - if(is_entitypage03==1&&is_entitypage02==1) + if(is_buttonpage03==1&&is_buttonpage02==1) { - page entitypage02 - }else if(is_entitypage03==1||is_entitypage02==1) + page buttonpage02 + }else if(is_buttonpage03==1||is_buttonpage02==1) { - if(is_entitypage01==1) + if(is_buttonpage01==1) { - page entitypage01 + page buttonpage01 }else { page home @@ -844,19 +848,19 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status - if(is_entitypage01==1) + if(is_buttonpage01==1) { - page entitypage01 - }else if(is_entitypage02==1) + page buttonpage01 + }else if(is_buttonpage02==1) { - page entitypage02 - }else if(is_entitypage03==1) + page buttonpage02 + }else if(is_buttonpage03==1) { - page entitypage03 + page buttonpage03 }else { page home diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt index 3944cd8..2285229 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -425,7 +429,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_entitypage02==1) // Check if entitypage02 is active diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt index acaea22..f2f9e31 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -431,7 +435,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_entitypage03==1&&is_entitypage04==1) diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt index 428e485..28798f2 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -425,7 +429,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_entitypage04==1) diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt index d40e216..2a33fe9 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -429,7 +433,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status diff --git a/hmi/dev/nspanel_CJK_eu_code/home.txt b/hmi/dev/nspanel_CJK_eu_code/home.txt index 5c995de..4991116 100644 --- a/hmi/dev/nspanel_CJK_eu_code/home.txt +++ b/hmi/dev/nspanel_CJK_eu_code/home.txt @@ -83,15 +83,6 @@ Text indr_temp Text : Max. Text Size : 8 - Events - Touch Release Event - printh 92 - prints "localevent",0 - printh 00 - prints "{\"page\": \"home\", \"component\": \"climate\", \"event\": \"click\"}",0 - printh 00 - printh FF FF FF - Text outdoor_temp Attributes ID : 5 @@ -326,15 +317,6 @@ Text indr_temp_icon Text : Max. Text Size : 3 - Events - Touch Release Event - printh 92 - prints "localevent",0 - printh 00 - prints "{\"page\": \"home\", \"component\": \"climate\", \"event\": \"click\"}",0 - printh 00 - printh FF FF FF - Text bt_notific Attributes ID : 28 @@ -751,6 +733,10 @@ TouchCap swipe wakeup_timer.en=1 // Set brightness to saved value (from HA) Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -772,9 +758,6 @@ TouchCap swipe }else if(is_buttonpage01==1) { page buttonpage01 - }else - { - // Do nothing } } // Right to Left swipe now navigates to home, looping back to the start. @@ -794,9 +777,6 @@ TouchCap swipe }else if(is_buttonpage04==1) { page buttonpage04 - }else - { - // Do nothing } } } @@ -825,13 +805,10 @@ TouchCap swipe }else if(is_buttonpage02==1&&is_buttonpage01==1) { page buttonpage01 - }else - { - // Do nothing } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status @@ -853,9 +830,6 @@ TouchCap swipe }else if(is_buttonpage03==1&&is_buttonpage04==1) { page buttonpage04 - }else - { - // Do nothing } } } diff --git a/hmi/dev/nspanel_CJK_eu_code/light.txt b/hmi/dev/nspanel_CJK_eu_code/light.txt index b68ce46..98b790a 100644 --- a/hmi/dev/nspanel_CJK_eu_code/light.txt +++ b/hmi/dev/nspanel_CJK_eu_code/light.txt @@ -383,7 +383,7 @@ Picture colorwheel covx b,va3.txt,0,0 lightsetting.txt="{\"page\": \"light\", \"component\": \"rgb_color\", \"value\": ["+va1.txt+", "+va2.txt+", "+va3.txt+"]}" printh 92 - prints "nspanelevent",0 + prints "localevent",0 printh 00 prints lightsetting.txt,0 printh 00 diff --git a/hmi/dev/nspanel_CJK_eu_code/utilities.txt b/hmi/dev/nspanel_CJK_eu_code/utilities.txt index dd54019..8ab0cd6 100644 --- a/hmi/dev/nspanel_CJK_eu_code/utilities.txt +++ b/hmi/dev/nspanel_CJK_eu_code/utilities.txt @@ -27,7 +27,7 @@ Page utilities printh 00 printh FF FF FF -Variable (int32) line_main_d +Variable (int32) home_line_d Attributes ID : 46 Scope: local @@ -419,7 +419,7 @@ Text group06b Text : Max. Text Size : 10 -Slider line_main +Slider home_line Attributes ID : 10 Scope : local @@ -530,19 +530,19 @@ Timer tm_movement Attributes ID : 45 Scope : local - Period (ms): 50 + Period (ms): 150 Enabled : yes Events Timer Event - //line_main - line_main.val+=line_main_d.val - if(line_main.val>=line_main.maxval) + //home_line + home_line.val+=home_line_d.val + if(home_line.val>=home_line.maxval) { - line_main.val=line_main.minval - }else if(line_main.val<=line_main.minval) + home_line.val=home_line.minval + }else if(home_line.val<=home_line.minval) { - line_main.val=line_main.maxval + home_line.val=home_line.maxval } //group01_line group01_line.val+=group01_line_d.val diff --git a/hmi/dev/nspanel_CJK_us_code/boot.txt b/hmi/dev/nspanel_CJK_us_code/boot.txt index d6ab739..08adc20 100644 --- a/hmi/dev/nspanel_CJK_us_code/boot.txt +++ b/hmi/dev/nspanel_CJK_us_code/boot.txt @@ -96,7 +96,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.2d1 + Text : 4.3.2b1 Max. Text Size : 9 Events diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt index 7bf6975..7e8bc5c 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage01.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -840,7 +844,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Assume starting from buttonpage01 and aiming to navigate two pages ahead based on active pages. diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt index 7234ead..1af8c03 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -846,7 +850,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_buttonpage03==1&&is_buttonpage04==1) diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt index bb10da9..1ea3229 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -842,7 +846,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt index 76ba7d4..bae0ea1 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -844,7 +848,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage01.txt b/hmi/dev/nspanel_CJK_us_code/entitypage01.txt index 3944cd8..2285229 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage01.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -425,7 +429,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_entitypage02==1) // Check if entitypage02 is active diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage02.txt b/hmi/dev/nspanel_CJK_us_code/entitypage02.txt index acaea22..f2f9e31 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage02.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -431,7 +435,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_entitypage03==1&&is_entitypage04==1) diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage03.txt b/hmi/dev/nspanel_CJK_us_code/entitypage03.txt index f2a403d..f2e3c17 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage03.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -425,7 +429,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_entitypage04==1) diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage04.txt b/hmi/dev/nspanel_CJK_us_code/entitypage04.txt index d40e216..2a33fe9 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage04.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -429,7 +433,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status diff --git a/hmi/dev/nspanel_CJK_us_code/home.txt b/hmi/dev/nspanel_CJK_us_code/home.txt index 1a2f2cc..48bab1e 100644 --- a/hmi/dev/nspanel_CJK_us_code/home.txt +++ b/hmi/dev/nspanel_CJK_us_code/home.txt @@ -83,15 +83,6 @@ Text indr_temp Text : Max. Text Size : 8 - Events - Touch Release Event - printh 92 - prints "localevent",0 - printh 00 - prints "{\"page\": \"home\", \"component\": \"climate\", \"event\": \"click\"}",0 - printh 00 - printh FF FF FF - Text outdoor_temp Attributes ID : 5 @@ -326,15 +317,6 @@ Text indr_temp_icon Text : Max. Text Size : 3 - Events - Touch Release Event - printh 92 - prints "localevent",0 - printh 00 - prints "{\"page\": \"home\", \"component\": \"climate\", \"event\": \"click\"}",0 - printh 00 - printh FF FF FF - Text bt_notific Attributes ID : 28 @@ -751,6 +733,11 @@ TouchCap swipe wakeup_timer.en=1 // Set brightness to saved value (from HA) Touch Release Event + //New swipe + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -772,9 +759,6 @@ TouchCap swipe }else if(is_buttonpage01==1) { page buttonpage01 - }else - { - // Do nothing } } // Right to Left swipe now navigates to home, looping back to the start. @@ -794,9 +778,6 @@ TouchCap swipe }else if(is_buttonpage04==1) { page buttonpage04 - }else - { - // Do nothing } } } @@ -825,13 +806,10 @@ TouchCap swipe }else if(is_buttonpage02==1&&is_buttonpage01==1) { page buttonpage01 - }else - { - // Do nothing } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status @@ -853,9 +831,6 @@ TouchCap swipe }else if(is_buttonpage03==1&&is_buttonpage04==1) { page buttonpage04 - }else - { - // Do nothing } } } diff --git a/hmi/dev/nspanel_CJK_us_code/light.txt b/hmi/dev/nspanel_CJK_us_code/light.txt index 337e204..9733d08 100644 --- a/hmi/dev/nspanel_CJK_us_code/light.txt +++ b/hmi/dev/nspanel_CJK_us_code/light.txt @@ -383,7 +383,7 @@ Picture colorwheel covx b,va3.txt,0,0 lightsetting.txt="{\"page\": \"light\", \"component\": \"rgb_color\", \"value\": ["+va1.txt+", "+va2.txt+", "+va3.txt+"]}" printh 92 - prints "nspanelevent",0 + prints "localevent",0 printh 00 prints lightsetting.txt,0 printh 00 diff --git a/hmi/dev/nspanel_CJK_us_code/utilities.txt b/hmi/dev/nspanel_CJK_us_code/utilities.txt index b1386de..9f028a1 100644 --- a/hmi/dev/nspanel_CJK_us_code/utilities.txt +++ b/hmi/dev/nspanel_CJK_us_code/utilities.txt @@ -27,7 +27,7 @@ Page utilities printh 00 printh FF FF FF -Variable (int32) line_main_d +Variable (int32) home_line_d Attributes ID : 46 Scope: local @@ -419,7 +419,7 @@ Text group06b Text : Max. Text Size : 10 -Slider line_main +Slider home_line Attributes ID : 10 Scope : local @@ -530,19 +530,19 @@ Timer tm_movement Attributes ID : 45 Scope : local - Period (ms): 50 + Period (ms): 150 Enabled : yes Events Timer Event //line_main - line_main.val+=line_main_d.val - if(line_main.val>=line_main.maxval) + home_line.val+=home_line_d.val + if(home_line.val>=home_line.maxval) { - line_main.val=line_main.minval - }else if(line_main.val<=line_main.minval) + home_line.val=home_line.minval + }else if(home_line.val<=home_line.minval) { - line_main.val=line_main.maxval + home_line.val=home_line.maxval } //group01_line group01_line.val+=group01_line_d.val diff --git a/hmi/dev/nspanel_CJK_us_land_code/boot.txt b/hmi/dev/nspanel_CJK_us_land_code/boot.txt index 3312be9..adbdae0 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/boot.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/boot.txt @@ -96,7 +96,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.2d1 + Text : 4.3.2b1 Max. Text Size : 9 Text esph_version diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt index 7bf6975..7e8bc5c 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage01.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -840,7 +844,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Assume starting from buttonpage01 and aiming to navigate two pages ahead based on active pages. diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt index 7234ead..1af8c03 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -846,7 +850,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_buttonpage03==1&&is_buttonpage04==1) diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt index bb10da9..1ea3229 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -842,7 +846,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt index 10773be..7f5c3a0 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt @@ -789,6 +789,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -798,15 +802,15 @@ TouchCap swipe if(swipec>swipedx) { // Navigate back based on active status - if(is_entitypage03==1) + if(is_buttonpage03==1) { - page entitypage03 - }else if(is_entitypage02==1) + page buttonpage03 + }else if(is_buttonpage02==1) { - page entitypage02 - }else if(is_entitypage01==1) + page buttonpage02 + }else if(is_buttonpage01==1) { - page entitypage01 + page buttonpage01 }else { page home @@ -826,14 +830,14 @@ TouchCap swipe // From Up to Down if(swipec>100) { - if(is_entitypage03==1&&is_entitypage02==1) + if(is_buttonpage03==1&&is_buttonpage02==1) { - page entitypage02 - }else if(is_entitypage03==1||is_entitypage02==1) + page buttonpage02 + }else if(is_buttonpage03==1||is_buttonpage02==1) { - if(is_entitypage01==1) + if(is_buttonpage01==1) { - page entitypage01 + page buttonpage01 }else { page home @@ -844,19 +848,19 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status - if(is_entitypage01==1) + if(is_buttonpage01==1) { - page entitypage01 - }else if(is_entitypage02==1) + page buttonpage01 + }else if(is_buttonpage02==1) { - page entitypage02 - }else if(is_entitypage03==1) + page buttonpage02 + }else if(is_buttonpage03==1) { - page entitypage03 + page buttonpage03 }else { page home diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt index 3944cd8..2285229 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -425,7 +429,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_entitypage02==1) // Check if entitypage02 is active diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt index acaea22..f2f9e31 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -431,7 +435,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_entitypage03==1&&is_entitypage04==1) diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt index 428e485..28798f2 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -425,7 +429,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { if(is_entitypage04==1) diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt index d40e216..2a33fe9 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt @@ -374,6 +374,10 @@ TouchCap swipe swipestore.en=1 // Start swipestore timer Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -429,7 +433,7 @@ TouchCap swipe } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status diff --git a/hmi/dev/nspanel_CJK_us_land_code/home.txt b/hmi/dev/nspanel_CJK_us_land_code/home.txt index 5c995de..4991116 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/home.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/home.txt @@ -83,15 +83,6 @@ Text indr_temp Text : Max. Text Size : 8 - Events - Touch Release Event - printh 92 - prints "localevent",0 - printh 00 - prints "{\"page\": \"home\", \"component\": \"climate\", \"event\": \"click\"}",0 - printh 00 - printh FF FF FF - Text outdoor_temp Attributes ID : 5 @@ -326,15 +317,6 @@ Text indr_temp_icon Text : Max. Text Size : 3 - Events - Touch Release Event - printh 92 - prints "localevent",0 - printh 00 - prints "{\"page\": \"home\", \"component\": \"climate\", \"event\": \"click\"}",0 - printh 00 - printh FF FF FF - Text bt_notific Attributes ID : 28 @@ -751,6 +733,10 @@ TouchCap swipe wakeup_timer.en=1 // Set brightness to saved value (from HA) Touch Release Event + if(api==0) + { + page home + } swipestore.en=0 // Touch has ended, x if(tch0==0) @@ -772,9 +758,6 @@ TouchCap swipe }else if(is_buttonpage01==1) { page buttonpage01 - }else - { - // Do nothing } } // Right to Left swipe now navigates to home, looping back to the start. @@ -794,9 +777,6 @@ TouchCap swipe }else if(is_buttonpage04==1) { page buttonpage04 - }else - { - // Do nothing } } } @@ -825,13 +805,10 @@ TouchCap swipe }else if(is_buttonpage02==1&&is_buttonpage01==1) { page buttonpage01 - }else - { - // Do nothing } } // Down to Up - swipec=0-swipedy + swipec2=0-swipedy if(swipec<-100) { // Navigate back up the sequence based on active status @@ -853,9 +830,6 @@ TouchCap swipe }else if(is_buttonpage03==1&&is_buttonpage04==1) { page buttonpage04 - }else - { - // Do nothing } } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/light.txt b/hmi/dev/nspanel_CJK_us_land_code/light.txt index b68ce46..98b790a 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/light.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/light.txt @@ -383,7 +383,7 @@ Picture colorwheel covx b,va3.txt,0,0 lightsetting.txt="{\"page\": \"light\", \"component\": \"rgb_color\", \"value\": ["+va1.txt+", "+va2.txt+", "+va3.txt+"]}" printh 92 - prints "nspanelevent",0 + prints "localevent",0 printh 00 prints lightsetting.txt,0 printh 00 diff --git a/hmi/dev/nspanel_CJK_us_land_code/utilities.txt b/hmi/dev/nspanel_CJK_us_land_code/utilities.txt index dd54019..8ab0cd6 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/utilities.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/utilities.txt @@ -27,7 +27,7 @@ Page utilities printh 00 printh FF FF FF -Variable (int32) line_main_d +Variable (int32) home_line_d Attributes ID : 46 Scope: local @@ -419,7 +419,7 @@ Text group06b Text : Max. Text Size : 10 -Slider line_main +Slider home_line Attributes ID : 10 Scope : local @@ -530,19 +530,19 @@ Timer tm_movement Attributes ID : 45 Scope : local - Period (ms): 50 + Period (ms): 150 Enabled : yes Events Timer Event - //line_main - line_main.val+=line_main_d.val - if(line_main.val>=line_main.maxval) + //home_line + home_line.val+=home_line_d.val + if(home_line.val>=home_line.maxval) { - line_main.val=line_main.minval - }else if(line_main.val<=line_main.minval) + home_line.val=home_line.minval + }else if(home_line.val<=home_line.minval) { - line_main.val=line_main.maxval + home_line.val=home_line.maxval } //group01_line group01_line.val+=group01_line_d.val diff --git a/hmi/dev/nspanel_eu_code/boot.txt b/hmi/dev/nspanel_eu_code/boot.txt index 3312be9..adbdae0 100644 --- a/hmi/dev/nspanel_eu_code/boot.txt +++ b/hmi/dev/nspanel_eu_code/boot.txt @@ -96,7 +96,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.2d1 + Text : 4.3.2b1 Max. Text Size : 9 Text esph_version diff --git a/hmi/dev/nspanel_us_code/boot.txt b/hmi/dev/nspanel_us_code/boot.txt index d6ab739..08adc20 100644 --- a/hmi/dev/nspanel_us_code/boot.txt +++ b/hmi/dev/nspanel_us_code/boot.txt @@ -96,7 +96,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.2d1 + Text : 4.3.2b1 Max. Text Size : 9 Events diff --git a/hmi/dev/nspanel_us_land_code/boot.txt b/hmi/dev/nspanel_us_land_code/boot.txt index 3312be9..adbdae0 100644 --- a/hmi/dev/nspanel_us_land_code/boot.txt +++ b/hmi/dev/nspanel_us_land_code/boot.txt @@ -96,7 +96,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.2d1 + Text : 4.3.2b1 Max. Text Size : 9 Text esph_version diff --git a/hmi/nspanel_CJK_eu.HMI b/hmi/nspanel_CJK_eu.HMI index b8fb678..e9290e7 100644 Binary files a/hmi/nspanel_CJK_eu.HMI and b/hmi/nspanel_CJK_eu.HMI differ diff --git a/hmi/nspanel_CJK_eu.tft b/hmi/nspanel_CJK_eu.tft index 78bdf8a..7b39e3f 100644 Binary files a/hmi/nspanel_CJK_eu.tft and b/hmi/nspanel_CJK_eu.tft differ diff --git a/hmi/nspanel_CJK_us.HMI b/hmi/nspanel_CJK_us.HMI index 8c941e7..bd728fc 100644 Binary files a/hmi/nspanel_CJK_us.HMI and b/hmi/nspanel_CJK_us.HMI differ diff --git a/hmi/nspanel_CJK_us.tft b/hmi/nspanel_CJK_us.tft index cfbd531..ecfbd59 100644 Binary files a/hmi/nspanel_CJK_us.tft and b/hmi/nspanel_CJK_us.tft differ diff --git a/hmi/nspanel_CJK_us_land.HMI b/hmi/nspanel_CJK_us_land.HMI index da317cf..9893253 100644 Binary files a/hmi/nspanel_CJK_us_land.HMI and b/hmi/nspanel_CJK_us_land.HMI differ diff --git a/hmi/nspanel_CJK_us_land.tft b/hmi/nspanel_CJK_us_land.tft index 0178864..51809cf 100644 Binary files a/hmi/nspanel_CJK_us_land.tft and b/hmi/nspanel_CJK_us_land.tft differ diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index 123256c..0a7a224 100644 Binary files a/hmi/nspanel_eu.HMI and b/hmi/nspanel_eu.HMI differ diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft index 0909be7..592433a 100644 Binary files a/hmi/nspanel_eu.tft and b/hmi/nspanel_eu.tft differ diff --git a/hmi/nspanel_us.HMI b/hmi/nspanel_us.HMI index 8e7a02b..3a39731 100644 Binary files a/hmi/nspanel_us.HMI and b/hmi/nspanel_us.HMI differ diff --git a/hmi/nspanel_us.tft b/hmi/nspanel_us.tft index 6fb615e..41578ca 100644 Binary files a/hmi/nspanel_us.tft and b/hmi/nspanel_us.tft differ diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI index 858724e..95e95db 100644 Binary files a/hmi/nspanel_us_land.HMI and b/hmi/nspanel_us_land.HMI differ diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft index a07d9a1..30a46fc 100644 Binary files a/hmi/nspanel_us_land.tft and b/hmi/nspanel_us_land.tft differ diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 21a6f2b..160c044 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -10,7 +10,7 @@ blueprint: description: > # NSPanel Configuration via Blueprint: Complete UI-Based Setup - **Version**: v4.3.2d1 + **Version**: v4.3.2b1 This project enables comprehensive configuration of your NSPanel through a Blueprint featuring a user interface. @@ -4209,7 +4209,7 @@ condition: action: - variables: ##### GENERAL ##### - blueprint_version: '4.3.2d1' + blueprint_version: '4.3.2b1' nspanel_name: > {{ trigger.event.data.device_name