From bf2ce5427997bdc42d5ca23d7921a44eb5d52250 Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:36:15 +0200 Subject: [PATCH] Align swipe engine with entity pages Solves #1994 --- hmi/dev/nspanel_eu_code/buttonpage04.txt | 34 +++++++++++------------ hmi/dev/nspanel_eu_code/entitypage01.txt | 6 +++- hmi/dev/nspanel_eu_code/entitypage02.txt | 6 +++- hmi/dev/nspanel_eu_code/entitypage03.txt | 6 +++- hmi/dev/nspanel_eu_code/entitypage04.txt | 6 +++- hmi/dev/nspanel_us_code/entitypage01.txt | 6 +++- hmi/dev/nspanel_us_code/entitypage02.txt | 6 +++- hmi/dev/nspanel_us_code/entitypage03.txt | 6 +++- hmi/dev/nspanel_us_code/entitypage04.txt | 6 +++- hmi/nspanel_eu.HMI | Bin 15035545 -> 15035545 bytes hmi/nspanel_eu.tft | Bin 7497392 -> 7497524 bytes hmi/nspanel_us.HMI | Bin 15048136 -> 15048136 bytes hmi/nspanel_us.tft | Bin 7501984 -> 7502116 bytes 13 files changed, 57 insertions(+), 25 deletions(-) diff --git a/hmi/dev/nspanel_eu_code/buttonpage04.txt b/hmi/dev/nspanel_eu_code/buttonpage04.txt index f4c9577..7f5c3a0 100644 --- a/hmi/dev/nspanel_eu_code/buttonpage04.txt +++ b/hmi/dev/nspanel_eu_code/buttonpage04.txt @@ -802,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 @@ -830,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 @@ -852,15 +852,15 @@ TouchCap swipe 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_eu_code/entitypage01.txt b/hmi/dev/nspanel_eu_code/entitypage01.txt index 3944cd8..2285229 100644 --- a/hmi/dev/nspanel_eu_code/entitypage01.txt +++ b/hmi/dev/nspanel_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_eu_code/entitypage02.txt b/hmi/dev/nspanel_eu_code/entitypage02.txt index acaea22..f2f9e31 100644 --- a/hmi/dev/nspanel_eu_code/entitypage02.txt +++ b/hmi/dev/nspanel_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_eu_code/entitypage03.txt b/hmi/dev/nspanel_eu_code/entitypage03.txt index 428e485..28798f2 100644 --- a/hmi/dev/nspanel_eu_code/entitypage03.txt +++ b/hmi/dev/nspanel_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_eu_code/entitypage04.txt b/hmi/dev/nspanel_eu_code/entitypage04.txt index d40e216..2a33fe9 100644 --- a/hmi/dev/nspanel_eu_code/entitypage04.txt +++ b/hmi/dev/nspanel_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_us_code/entitypage01.txt b/hmi/dev/nspanel_us_code/entitypage01.txt index 3944cd8..2285229 100644 --- a/hmi/dev/nspanel_us_code/entitypage01.txt +++ b/hmi/dev/nspanel_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_us_code/entitypage02.txt b/hmi/dev/nspanel_us_code/entitypage02.txt index acaea22..f2f9e31 100644 --- a/hmi/dev/nspanel_us_code/entitypage02.txt +++ b/hmi/dev/nspanel_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_us_code/entitypage03.txt b/hmi/dev/nspanel_us_code/entitypage03.txt index f2a403d..f2e3c17 100644 --- a/hmi/dev/nspanel_us_code/entitypage03.txt +++ b/hmi/dev/nspanel_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_us_code/entitypage04.txt b/hmi/dev/nspanel_us_code/entitypage04.txt index d40e216..2a33fe9 100644 --- a/hmi/dev/nspanel_us_code/entitypage04.txt +++ b/hmi/dev/nspanel_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/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index 2df94857bd16c668beb94c2e6a0986a1eef5a5d1..bc7ff127b2ce8f9822c5cd9adb517283e5e27844 100644 GIT binary patch delta 3350 zcmeH}|5wd-9LL{ReQwnB#rK8^OY<#-m4x!8Xo^xwDZ95cHHyB-M7y?L)4m9;^mm8VLdcWo|^7CH!Oshf0j685rcpmofJQ_9w?Di^%6V;2`Tor?c4~l zy=@igJ=t@$+_D6J?2buowdtW58kzPBxDJ zi36$(PV!io41O>L{9!6ggXs_efiMGR!Yr5#K@bdcU@nBfyD$$zAq?ij0tkl)SO}32 z1&bgWVqh`ELL4lCcu0Vy@E*uO4vCNi%ODxvhvkq0sqg`;fR&I2>97h`Lk46*7G%R3 z$bq%+A*_R3SPvT@4?Y3~Y=n>D6UYaEPhk@jz-RC|d;wp=W+;R$uobpJ5qt&3@HLdc zcA&5WN?|9I!8foAzCBUCt57=TPfuGRn~r(CZYcFJsN5AVdm1euG6zC>N=!M$k&rwq zQ-0W&<-~z3KX{Ynco&wNh7po$UK{Do=8bQ&95%KqE6C;XglsS`2%gBY#)swUQ&>Jd zjb)!1EFZ_Wm*qU3b6KvKN61?9`G+lFdB?)eyxeq`4$*AKrdXCc;#tm?vHUoR@4;@7{ys>|=) z^=JukVmYrL%k5l^YX`IWbF9%)UHWh~f6UdGGOBB?AP=!e%OjV2v3!rKG1iyOZ*nz8 zOlR|}T#X??Y+jEwTB@5G%5s&l#uU@tkB($Jc5^ijievMw2`o$HEaxp_cihI+SdTSY zs!L0w>SwA1(MytBB1n9xx<)^O2D)n~9a7Y4-@U|-soObyC=H*lbmltDd!ecpWxaCy zNQ_O=&4S*z&aU&AVd8z;+<;^{qb=KCbaSh1oK~0CEti zKn@{?kxJwUauoRiIffiZs*n@NNu(MPkyA(wavC{rOvdDFolWSsl=iDq;1t-_A7`9*sCzr!gHs8d_)q!$Z-V0ao ze3n10pp{InCuX^1bCe|lm2YdkL|sJnBpM&8^E0|6qD%QbOx{d6sUBz4O2k*gmSj=7 zIBP0?LX&Edb4VScMl{HIOa$W7!H zavS*#X+rKGcadh~9&#UfAR3Zd&WA{SFMD}NGfm%@TNP?|#b0KR z+58aa(eN;)LaEUs^Y_IuitQ-iJbJ}>w1)HO56+{cWag1~D)Z#h-K9+ zlWas;joLejX7o|)FOa!ukycUWrfYW*Hs#zc3Z_LT^e*D9%9gXe=+?P9XX=%qRnxkj zxg)5ThX$x~m~Jm!FjiwnD|eRnqb+N+p|p2dxg$L~Qe#g8PPaHxMQOPm-KfzEbX`en zBDH(18elp>UAVF@Z5X4;q>iH6o;Ix38js7M<+XZO`b5x=5~IU)2M*FBfjLqt3(#4M UPh+y8dKA2Rp%Y)d(3fTY4O1+y#sB~S delta 3711 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

r@ybEIq!0C)fKoV%^54WU2|=k| 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 BCoKQ~ diff --git a/hmi/nspanel_us.HMI b/hmi/nspanel_us.HMI index 95fd045fc5d034a97ce0361b8cb68adbdb1cc2e7..8e7a02b7c1e50ee7955d069dde64ad480db4d910 100644 GIT binary patch delta 3115 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 dBfcfB6WArSxo diff --git a/hmi/nspanel_us.tft b/hmi/nspanel_us.tft index 0bc7c17292efbc230ed447682bd25da364f8e3d2..6fb615e84f695a04fa4aa098115224023d936faa 100644 GIT binary patch delta 9852 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