Reviewed swipe engine

Solves #1994

hmi/dev/nspanel_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.

hmi/dev/nspanel_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)

hmi/dev/nspanel_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

hmi/dev/nspanel_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)
@@ -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

hmi/dev/nspanel_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.

hmi/dev/nspanel_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)

hmi/dev/nspanel_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

hmi/dev/nspanel_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

hmi/dev/nspanel_us_code/home.txt

@@ -733,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)
@@ -754,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.
@@ -776,9 +778,6 @@ TouchCap swipe
                     }else if(is_buttonpage04==1)
                     {
                         page buttonpage04
-                    }else
-                    {
-                        // Do nothing
                     }
                 }
             }
@@ -807,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
@@ -835,9 +831,6 @@ TouchCap swipe
                     }else if(is_buttonpage03==1&&is_buttonpage04==1)
                     {
                         page buttonpage04
-                    }else
-                    {
-                        // Do nothing
                     }
                 }
             }

hmi/dev/nspanel_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.

hmi/dev/nspanel_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)

hmi/dev/nspanel_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

hmi/dev/nspanel_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)
@@ -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