h3n3/NSPanel_HA_Blueprint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align swipe engine with entity pages

Browse Source 
Solves #1994
This commit is contained in:
Edward Firmo
2024-04-03 10:36:15 +02:00
parent 58c158a426
commit bf2ce54279
13 changed files with 57 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
hmi/dev/nspanel_eu_code/buttonpage04.txt
View File

@@ -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

6
hmi/dev/nspanel_eu_code/entitypage01.txt
View File

@@ -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

6
hmi/dev/nspanel_eu_code/entitypage02.txt
View File

@@ -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)

6
hmi/dev/nspanel_eu_code/entitypage03.txt
View File

@@ -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)

6
hmi/dev/nspanel_eu_code/entitypage04.txt
View File

@@ -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