Do not show page index when only 1 page

Solves #1883
2024-03-13 08:53:26 +01:00
parent bfe27f0693
commit b02f3c080a
22 changed files with 268 additions and 167 deletions
--- a/hmi/dev/nspanel_eu_code/boot.txt
+++ b/hmi/dev/nspanel_eu_code/boot.txt
@@ -101,7 +101,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.3.0
+        Text               : 4.3.1d1
        Max. Text Size     : 9
    
 Text esph_version
--- a/hmi/dev/nspanel_eu_code/buttonpage01.txt
+++ b/hmi/dev/nspanel_eu_code/buttonpage01.txt
@@ -20,6 +20,9 @@ Page buttonpage01
                vis 255,0
                vis button_back,1
                vis page_label,1
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
+                {
                    page_index.txt+="â—"
                    if(is_buttonpage02==1)
                    {
@@ -35,6 +38,7 @@ Page buttonpage01
                    }
                    vis page_index,1
                }
+            }
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_eu_code/buttonpage02.txt
+++ b/hmi/dev/nspanel_eu_code/buttonpage02.txt
@@ -20,6 +20,9 @@ Page buttonpage02
                vis 255,0
                vis button_back,1
                vis page_label,1
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
+                {
                    if(is_buttonpage01==1)
                    {
                        page_index.txt+="â—‹"
@@ -35,6 +38,7 @@ Page buttonpage02
                    }
                    vis page_index,1
                }
+            }
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_eu_code/buttonpage03.txt
+++ b/hmi/dev/nspanel_eu_code/buttonpage03.txt
@@ -20,6 +20,9 @@ Page buttonpage03
                vis 255,0
                vis button_back,1
                vis page_label,1
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
+                {
                    if(is_buttonpage01==1)
                    {
                        page_index.txt+="â—‹"
@@ -35,6 +38,7 @@ Page buttonpage03
                    }
                    vis page_index,1
                }
+            }
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_eu_code/buttonpage04.txt
+++ b/hmi/dev/nspanel_eu_code/buttonpage04.txt
@@ -20,6 +20,9 @@ Page buttonpage04
                vis 255,0
                vis button_back,1
                vis page_label,1
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
+                {
                    if(is_buttonpage01==1)
                    {
                        page_index.txt+="â—‹"
@@ -35,6 +38,7 @@ Page buttonpage04
                    page_index.txt+="â—"
                    vis page_index,1
                }
+            }
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_eu_code/entitypage01.txt
+++ b/hmi/dev/nspanel_eu_code/entitypage01.txt
@@ -17,6 +17,9 @@ Page entitypage01
                page home
            }
            vis unavailable,0
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
+            {
                page_index.txt+="â—"
                if(is_entitypage02==1)
                {
@@ -30,6 +33,10 @@ Page entitypage01
                {
                    page_index.txt+="â—‹"
                }
+            }else
+            {
+                vis page_index,0
+            }
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_eu_code/entitypage02.txt
+++ b/hmi/dev/nspanel_eu_code/entitypage02.txt
@@ -17,6 +17,9 @@ Page entitypage02
                page home
            }
            vis unavailable,0
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
+            {
                if(is_entitypage01==1)
                {
                    page_index.txt+="â—‹"
@@ -30,6 +33,10 @@ Page entitypage02
                {
                    page_index.txt+="â—‹"
                }
+            }else
+            {
+                vis page_index,0
+            }
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_eu_code/entitypage03.txt
+++ b/hmi/dev/nspanel_eu_code/entitypage03.txt
@@ -17,6 +17,9 @@ Page entitypage03
                page home
            }
            vis unavailable,0
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
+            {
                if(is_entitypage01==1)
                {
                    page_index.txt+="â—‹"
@@ -30,6 +33,10 @@ Page entitypage03
                {
                    page_index.txt+="â—‹"
                }
+            }else
+            {
+                vis page_index,0
+            }
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_eu_code/entitypage04.txt
+++ b/hmi/dev/nspanel_eu_code/entitypage04.txt
@@ -17,6 +17,9 @@ Page entitypage04
                page home
            }
            vis unavailable,0
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
+            {
                if(is_entitypage01==1)
                {
                    page_index.txt+="â—‹"
@@ -30,6 +33,10 @@ Page entitypage04
                    page_index.txt+="â—‹"
                }
                page_index.txt+="â—"
+            }else
+            {
+                vis page_index,0
+            }
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_us_code/boot.txt
+++ b/hmi/dev/nspanel_us_code/boot.txt
@@ -101,7 +101,7 @@ Text tft_version
        Dragging           : 0
        Send Component ID  : on press and release
        Associated Keyboard: none
-        Text               : 4.3.0
+        Text               : 4.3.1d1
        Max. Text Size     : 9
    
    Events
--- a/hmi/dev/nspanel_us_code/buttonpage01.txt
+++ b/hmi/dev/nspanel_us_code/buttonpage01.txt
@@ -20,6 +20,9 @@ Page buttonpage01
                vis 255,0
                vis button_back,1
                vis page_label,1
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
+                {
                    page_index.txt+="â—"
                    if(is_buttonpage02==1)
                    {
@@ -35,6 +38,7 @@ Page buttonpage01
                    }
                    vis page_index,1
                }
+            }
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_us_code/buttonpage02.txt
+++ b/hmi/dev/nspanel_us_code/buttonpage02.txt
@@ -20,6 +20,9 @@ Page buttonpage02
                vis 255,0
                vis button_back,1
                vis page_label,1
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
+                {
                    if(is_buttonpage01==1)
                    {
                        page_index.txt+="â—‹"
@@ -35,6 +38,7 @@ Page buttonpage02
                    }
                    vis page_index,1
                }
+            }
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_us_code/buttonpage03.txt
+++ b/hmi/dev/nspanel_us_code/buttonpage03.txt
@@ -20,6 +20,9 @@ Page buttonpage03
                vis 255,0
                vis button_back,1
                vis page_label,1
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
+                {
                    if(is_buttonpage01==1)
                    {
                        page_index.txt+="â—‹"
@@ -35,6 +38,7 @@ Page buttonpage03
                    }
                    vis page_index,1
                }
+            }
            sendme
        
 Variable (string) lastclick
--- a/hmi/dev/nspanel_us_code/buttonpage04.txt
+++ b/hmi/dev/nspanel_us_code/buttonpage04.txt
@@ -19,8 +19,25 @@ Page buttonpage04
            {
                vis 255,0
                vis button_back,1
-                vis page_index,1
                vis page_label,1
+                sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04
+                if(sys0>1)
+                {
+                    if(is_buttonpage01==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage02==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    if(is_buttonpage03==1)
+                    {
+                        page_index.txt+="â—‹"
+                    }
+                    page_index.txt+="â—"
+                    vis page_index,1
+                }
            }
            sendme
        
--- a/hmi/dev/nspanel_us_code/entitypage01.txt
+++ b/hmi/dev/nspanel_us_code/entitypage01.txt
@@ -17,6 +17,9 @@ Page entitypage01
                page home
            }
            vis unavailable,0
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
+            {
                page_index.txt+="â—"
                if(is_entitypage02==1)
                {
@@ -30,6 +33,10 @@ Page entitypage01
                {
                    page_index.txt+="â—‹"
                }
+            }else
+            {
+                vis page_index,0
+            }
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_us_code/entitypage02.txt
+++ b/hmi/dev/nspanel_us_code/entitypage02.txt
@@ -17,6 +17,9 @@ Page entitypage02
                page home
            }
            vis unavailable,0
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
+            {
                if(is_entitypage01==1)
                {
                    page_index.txt+="â—‹"
@@ -30,6 +33,10 @@ Page entitypage02
                {
                    page_index.txt+="â—‹"
                }
+            }else
+            {
+                vis page_index,0
+            }
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_us_code/entitypage03.txt
+++ b/hmi/dev/nspanel_us_code/entitypage03.txt
@@ -17,6 +17,9 @@ Page entitypage03
                page home
            }
            vis unavailable,0
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
+            {
                if(is_entitypage01==1)
                {
                    page_index.txt+="â—‹"
@@ -30,6 +33,10 @@ Page entitypage03
                {
                    page_index.txt+="â—‹"
                }
+            }else
+            {
+                vis page_index,0
+            }
            sendme
        
 Text value01_label
--- a/hmi/dev/nspanel_us_code/entitypage04.txt
+++ b/hmi/dev/nspanel_us_code/entitypage04.txt
@@ -17,6 +17,9 @@ Page entitypage04
                page home
            }
            vis unavailable,0
+            sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04
+            if(sys0>1)
+            {
                if(is_entitypage01==1)
                {
                    page_index.txt+="â—‹"
@@ -30,6 +33,10 @@ Page entitypage04
                    page_index.txt+="â—‹"
                }
                page_index.txt+="â—"
+            }else
+            {
+                vis page_index,0
+            }
            sendme
        
 Text value01_label
--- a/hmi/nspanel_eu.HMI
+++ b/hmi/nspanel_eu.HMI
--- a/hmi/nspanel_eu.tft
+++ b/hmi/nspanel_eu.tft
--- a/hmi/nspanel_us.HMI
+++ b/hmi/nspanel_us.HMI
--- a/hmi/nspanel_us.tft
+++ b/hmi/nspanel_us.tft