From 2b00485249a0e7666f7f49c05f43d76026090035 Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:38:36 +0200 Subject: [PATCH] Update US Land Solves #1994 --- hmi/dev/nspanel_us_land_code/buttonpage04.txt | 34 +++++++++--------- hmi/dev/nspanel_us_land_code/entitypage01.txt | 6 +++- hmi/dev/nspanel_us_land_code/entitypage02.txt | 6 +++- hmi/dev/nspanel_us_land_code/entitypage03.txt | 6 +++- hmi/dev/nspanel_us_land_code/entitypage04.txt | 6 +++- hmi/nspanel_eu.HMI | Bin 15035545 -> 15035545 bytes hmi/nspanel_us_land.HMI | Bin 14881290 -> 14741809 bytes hmi/nspanel_us_land.tft | Bin 7497456 -> 7497588 bytes 8 files changed, 37 insertions(+), 21 deletions(-) diff --git a/hmi/dev/nspanel_us_land_code/buttonpage04.txt b/hmi/dev/nspanel_us_land_code/buttonpage04.txt index f4c9577..7f5c3a0 100644 --- a/hmi/dev/nspanel_us_land_code/buttonpage04.txt +++ b/hmi/dev/nspanel_us_land_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_us_land_code/entitypage01.txt b/hmi/dev/nspanel_us_land_code/entitypage01.txt index 3944cd8..2285229 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage01.txt +++ b/hmi/dev/nspanel_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_us_land_code/entitypage02.txt b/hmi/dev/nspanel_us_land_code/entitypage02.txt index acaea22..f2f9e31 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage02.txt +++ b/hmi/dev/nspanel_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_us_land_code/entitypage03.txt b/hmi/dev/nspanel_us_land_code/entitypage03.txt index 428e485..28798f2 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage03.txt +++ b/hmi/dev/nspanel_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_us_land_code/entitypage04.txt b/hmi/dev/nspanel_us_land_code/entitypage04.txt index d40e216..2a33fe9 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage04.txt +++ b/hmi/dev/nspanel_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/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index bc7ff127b2ce8f9822c5cd9adb517283e5e27844..123256c56f3921f6c38133a71e3501a7d9b59c47 100644 GIT binary patch delta 695 zcmd7LM{|t<7>3~!5@#%onX|F7vNy8ReNhuc@6n=%Buey7E<$t>MDM+Xgy^DoQ4$ip zE;GX~h;QL1Sa@fy-8;`+R8tr&3KdtzH;trcWH(PvO^N)yw8lA+UkQ;&TqvvHcYKq$ zNJ+zlW{u*57S;K=iLt!ISX`)HsD3Culn`oAmKcjx)RxuNMXUbxXl@Y83&Ls;R)eq_ zgw-Id24OXbMaygdhli3NmXxNYR$6PLt#;b$AdsY^PCDzNt8S8|=&pyJQuWeXAAR-H z-v9#*GT0D94U=ZL5k?wiv~**PHO_bwOf*S`$)?DZCEHZfOgBT0nP!=7j=AQUZ-Ipt zS!{`=mRT+rE3A}fmDTdCvDP~4ZLrZMn-$oi&{o@QS7e8scG+!@z4qDffP)S>?1-a| zIqrm$PC4z2vx=Q_UWrl{TvXbDgo delta 695 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 Dn=Q4z delta 6927 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 NDMu}LxT_W4|6eweRFD7w