From 3a056e770e0777f1880dfb66120cfbca54b09791 Mon Sep 17 00:00:00 2001
From: joBr99 <joBr99@users.noreply.github.com>
Date: Sat, 14 Jan 2023 14:44:36 +0000
Subject: [PATCH] fix flicker on speed 0 (add nextion2text)

---
 HMI/US/landscape/diff-eu-version.txt | 143 ++++++++++++++++++++++++++-
 HMI/US/portrait/diff-eu-version.txt  | 143 ++++++++++++++++++++++++++-
 HMI/US/portrait/diff-filtered.txt    | 143 ++++++++++++++++++++++++++-
 HMI/n2t-out-visual/cardPower.txt     | 114 ++++++++++++---------
 HMI/n2t-out-visual/nspanel_Stats.txt |  12 +--
 HMI/n2t-out/cardPower.txt            | 114 ++++++++++++---------
 6 files changed, 564 insertions(+), 105 deletions(-)

diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt
index 46efd622..eecd3374 100644
--- a/HMI/US/landscape/diff-eu-version.txt
+++ b/HMI/US/landscape/diff-eu-version.txt
@@ -586,7 +586,148 @@
 │          Disable release event after dragging: 0
 │          Send Component ID                   : disabled
 │      
-│ @@ -618,141 +588,131 @@
+│ @@ -463,92 +433,74 @@
+│      Attributes
+│          Scope      : local
+│          Period (ms): 100
+│          Enabled    : yes
+│      
+│      Events
+│          Timer Event
+│ -            if(t0Speed.val!=0)
+│ +            sys0=h0.val+t0Speed.val
+│ +            if(sys0>h0.maxval)
+│              {
+│ -                sys0=h0.val+t0Speed.val
+│ -                if(sys0>h0.maxval)
+│ -                {
+│ -                    h0.val=h0.minval
+│ -                }
+│ -                if(sys0<h0.minval)
+│ -                {
+│ -                    h0.val=h0.maxval
+│ -                }
+│ -                h0.val+=t0Speed.val
+│ +                h0.val=h0.minval
+│              }
+│ -            if(t1Speed.val!=0)
+│ +            if(sys0<h0.minval)
+│              {
+│ -                sys0=h1.val+t1Speed.val
+│ -                if(sys0>h1.maxval)
+│ -                {
+│ -                    h1.val=h1.minval
+│ -                }
+│ -                if(sys0<h1.minval)
+│ -                {
+│ -                    h1.val=h1.maxval
+│ -                }
+│ -                h1.val+=t1Speed.val
+│ +                h0.val=h0.maxval
+│              }
+│ -            if(t2Speed.val!=0)
+│ +            h0.val+=t0Speed.val
+│ +            sys0=h1.val+t1Speed.val
+│ +            if(sys0>h1.maxval)
+│              {
+│ -                sys0=h2.val+t2Speed.val
+│ -                if(sys0>h2.maxval)
+│ -                {
+│ -                    h2.val=h2.minval
+│ -                }
+│ -                if(sys0<h2.minval)
+│ -                {
+│ -                    h2.val=h2.maxval
+│ -                }
+│ -                h2.val+=t2Speed.val
+│ +                h1.val=h1.minval
+│              }
+│ -            if(t3Speed.val!=0)
+│ +            if(sys0<h1.minval)
+│              {
+│ -                sys0=h3.val+t3Speed.val
+│ -                if(sys0>h3.maxval)
+│ -                {
+│ -                    h3.val=h3.minval
+│ -                }
+│ -                if(sys0<h3.minval)
+│ -                {
+│ -                    h3.val=h3.maxval
+│ -                }
+│ -                h3.val+=t3Speed.val
+│ +                h1.val=h1.maxval
+│              }
+│ -            if(t4Speed.val!=0)
+│ +            h1.val+=t1Speed.val
+│ +            sys0=h2.val+t2Speed.val
+│ +            if(sys0>h2.maxval)
+│              {
+│ -                sys0=h4.val+t4Speed.val
+│ -                if(sys0>h4.maxval)
+│ -                {
+│ -                    h4.val=h4.minval
+│ -                }
+│ -                if(sys0<h4.minval)
+│ -                {
+│ -                    h4.val=h4.maxval
+│ -                }
+│ -                h4.val+=t4Speed.val
+│ +                h2.val=h2.minval
+│              }
+│ -            if(t5Speed.val!=0)
+│ +            if(sys0<h2.minval)
+│              {
+│ -                sys0=h5.val+t5Speed.val
+│ -                if(sys0>h5.maxval)
+│ -                {
+│ -                    h5.val=h5.minval
+│ -                }
+│ -                if(sys0<h5.minval)
+│ -                {
+│ -                    h5.val=h5.maxval
+│ -                }
+│ -                h5.val+=t5Speed.val
+│ +                h2.val=h2.maxval
+│ +            }
+│ +            h2.val+=t2Speed.val
+│ +            sys0=h3.val+t3Speed.val
+│ +            if(sys0>h3.maxval)
+│ +            {
+│ +                h3.val=h3.minval
+│ +            }
+│ +            if(sys0<h3.minval)
+│ +            {
+│ +                h3.val=h3.maxval
+│ +            }
+│ +            h3.val+=t3Speed.val
+│ +            sys0=h4.val+t4Speed.val
+│ +            if(sys0>h4.maxval)
+│ +            {
+│ +                h4.val=h4.minval
+│ +            }
+│ +            if(sys0<h4.minval)
+│ +            {
+│ +                h4.val=h4.maxval
+│ +            }
+│ +            h4.val+=t4Speed.val
+│ +            sys0=h5.val+t5Speed.val
+│ +            if(sys0>h5.maxval)
+│ +            {
+│ +                h5.val=h5.minval
+│ +            }
+│ +            if(sys0<h5.minval)
+│ +            {
+│ +                h5.val=h5.maxval
+│              }
+│ +            h5.val+=t5Speed.val
+│          
+│  Timer tmSerial
+│      Attributes
+│          Scope      : local
+│          Period (ms): 50
+│          Enabled    : yes
+│      
+│ @@ -636,141 +588,131 @@
 │                                              vis bNext,1
 │                                          }
 │                                          // icon color home
diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt
index e79726d5..cb0e0e38 100644
--- a/HMI/US/portrait/diff-eu-version.txt
+++ b/HMI/US/portrait/diff-eu-version.txt
@@ -1601,7 +1601,148 @@
 │          Disable release event after dragging: 0
 │          Send Component ID                   : disabled
 │      
-│ @@ -618,141 +588,131 @@
+│ @@ -463,92 +433,74 @@
+│      Attributes
+│          Scope      : local
+│          Period (ms): 100
+│          Enabled    : yes
+│      
+│      Events
+│          Timer Event
+│ -            if(t0Speed.val!=0)
+│ +            sys0=h0.val+t0Speed.val
+│ +            if(sys0>h0.maxval)
+│              {
+│ -                sys0=h0.val+t0Speed.val
+│ -                if(sys0>h0.maxval)
+│ -                {
+│ -                    h0.val=h0.minval
+│ -                }
+│ -                if(sys0<h0.minval)
+│ -                {
+│ -                    h0.val=h0.maxval
+│ -                }
+│ -                h0.val+=t0Speed.val
+│ +                h0.val=h0.minval
+│              }
+│ -            if(t1Speed.val!=0)
+│ +            if(sys0<h0.minval)
+│              {
+│ -                sys0=h1.val+t1Speed.val
+│ -                if(sys0>h1.maxval)
+│ -                {
+│ -                    h1.val=h1.minval
+│ -                }
+│ -                if(sys0<h1.minval)
+│ -                {
+│ -                    h1.val=h1.maxval
+│ -                }
+│ -                h1.val+=t1Speed.val
+│ +                h0.val=h0.maxval
+│              }
+│ -            if(t2Speed.val!=0)
+│ +            h0.val+=t0Speed.val
+│ +            sys0=h1.val+t1Speed.val
+│ +            if(sys0>h1.maxval)
+│              {
+│ -                sys0=h2.val+t2Speed.val
+│ -                if(sys0>h2.maxval)
+│ -                {
+│ -                    h2.val=h2.minval
+│ -                }
+│ -                if(sys0<h2.minval)
+│ -                {
+│ -                    h2.val=h2.maxval
+│ -                }
+│ -                h2.val+=t2Speed.val
+│ +                h1.val=h1.minval
+│              }
+│ -            if(t3Speed.val!=0)
+│ +            if(sys0<h1.minval)
+│              {
+│ -                sys0=h3.val+t3Speed.val
+│ -                if(sys0>h3.maxval)
+│ -                {
+│ -                    h3.val=h3.minval
+│ -                }
+│ -                if(sys0<h3.minval)
+│ -                {
+│ -                    h3.val=h3.maxval
+│ -                }
+│ -                h3.val+=t3Speed.val
+│ +                h1.val=h1.maxval
+│              }
+│ -            if(t4Speed.val!=0)
+│ +            h1.val+=t1Speed.val
+│ +            sys0=h2.val+t2Speed.val
+│ +            if(sys0>h2.maxval)
+│              {
+│ -                sys0=h4.val+t4Speed.val
+│ -                if(sys0>h4.maxval)
+│ -                {
+│ -                    h4.val=h4.minval
+│ -                }
+│ -                if(sys0<h4.minval)
+│ -                {
+│ -                    h4.val=h4.maxval
+│ -                }
+│ -                h4.val+=t4Speed.val
+│ +                h2.val=h2.minval
+│              }
+│ -            if(t5Speed.val!=0)
+│ +            if(sys0<h2.minval)
+│              {
+│ -                sys0=h5.val+t5Speed.val
+│ -                if(sys0>h5.maxval)
+│ -                {
+│ -                    h5.val=h5.minval
+│ -                }
+│ -                if(sys0<h5.minval)
+│ -                {
+│ -                    h5.val=h5.maxval
+│ -                }
+│ -                h5.val+=t5Speed.val
+│ +                h2.val=h2.maxval
+│ +            }
+│ +            h2.val+=t2Speed.val
+│ +            sys0=h3.val+t3Speed.val
+│ +            if(sys0>h3.maxval)
+│ +            {
+│ +                h3.val=h3.minval
+│ +            }
+│ +            if(sys0<h3.minval)
+│ +            {
+│ +                h3.val=h3.maxval
+│ +            }
+│ +            h3.val+=t3Speed.val
+│ +            sys0=h4.val+t4Speed.val
+│ +            if(sys0>h4.maxval)
+│ +            {
+│ +                h4.val=h4.minval
+│ +            }
+│ +            if(sys0<h4.minval)
+│ +            {
+│ +                h4.val=h4.maxval
+│ +            }
+│ +            h4.val+=t4Speed.val
+│ +            sys0=h5.val+t5Speed.val
+│ +            if(sys0>h5.maxval)
+│ +            {
+│ +                h5.val=h5.minval
+│ +            }
+│ +            if(sys0<h5.minval)
+│ +            {
+│ +                h5.val=h5.maxval
+│              }
+│ +            h5.val+=t5Speed.val
+│          
+│  Timer tmSerial
+│      Attributes
+│          Scope      : local
+│          Period (ms): 50
+│          Enabled    : yes
+│      
+│ @@ -636,141 +588,131 @@
 │                                              vis bNext,1
 │                                          }
 │                                          // icon color home
diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt
index 60953fc5..b202c5ce 100644
--- a/HMI/US/portrait/diff-filtered.txt
+++ b/HMI/US/portrait/diff-filtered.txt
@@ -1,4 +1,4 @@
-+++ /dev/fd/62	2023-01-14 13:50:48.538380619 +0000
++++ /dev/fd/62	2023-01-14 14:44:28.229131210 +0000
 +le list
 + +1,12 @@
 +.s.txt
@@ -1020,6 +1020,147 @@
 + Disable release event after dragging: 0
 + Send Component ID                   : disabled
 +
++92 +433,74 @@
++ributes
++ Scope      : local
++ Period (ms): 100
++ Enabled    : yes
++
++nts
++ Timer Event
++     if(t0Speed.val!=0)
++     sys0=h0.val+t0Speed.val
++     if(sys0>h0.maxval)
++     {
++         sys0=h0.val+t0Speed.val
++         if(sys0>h0.maxval)
++         {
++             h0.val=h0.minval
++         }
++         if(sys0<h0.minval)
++         {
++             h0.val=h0.maxval
++         }
++         h0.val+=t0Speed.val
++         h0.val=h0.minval
++     }
++     if(t1Speed.val!=0)
++     if(sys0<h0.minval)
++     {
++         sys0=h1.val+t1Speed.val
++         if(sys0>h1.maxval)
++         {
++             h1.val=h1.minval
++         }
++         if(sys0<h1.minval)
++         {
++             h1.val=h1.maxval
++         }
++         h1.val+=t1Speed.val
++         h0.val=h0.maxval
++     }
++     if(t2Speed.val!=0)
++     h0.val+=t0Speed.val
++     sys0=h1.val+t1Speed.val
++     if(sys0>h1.maxval)
++     {
++         sys0=h2.val+t2Speed.val
++         if(sys0>h2.maxval)
++         {
++             h2.val=h2.minval
++         }
++         if(sys0<h2.minval)
++         {
++             h2.val=h2.maxval
++         }
++         h2.val+=t2Speed.val
++         h1.val=h1.minval
++     }
++     if(t3Speed.val!=0)
++     if(sys0<h1.minval)
++     {
++         sys0=h3.val+t3Speed.val
++         if(sys0>h3.maxval)
++         {
++             h3.val=h3.minval
++         }
++         if(sys0<h3.minval)
++         {
++             h3.val=h3.maxval
++         }
++         h3.val+=t3Speed.val
++         h1.val=h1.maxval
++     }
++     if(t4Speed.val!=0)
++     h1.val+=t1Speed.val
++     sys0=h2.val+t2Speed.val
++     if(sys0>h2.maxval)
++     {
++         sys0=h4.val+t4Speed.val
++         if(sys0>h4.maxval)
++         {
++             h4.val=h4.minval
++         }
++         if(sys0<h4.minval)
++         {
++             h4.val=h4.maxval
++         }
++         h4.val+=t4Speed.val
++         h2.val=h2.minval
++     }
++     if(t5Speed.val!=0)
++     if(sys0<h2.minval)
++     {
++         sys0=h5.val+t5Speed.val
++         if(sys0>h5.maxval)
++         {
++             h5.val=h5.minval
++         }
++         if(sys0<h5.minval)
++         {
++             h5.val=h5.maxval
++         }
++         h5.val+=t5Speed.val
++         h2.val=h2.maxval
++     }
++     h2.val+=t2Speed.val
++     sys0=h3.val+t3Speed.val
++     if(sys0>h3.maxval)
++     {
++         h3.val=h3.minval
++     }
++     if(sys0<h3.minval)
++     {
++         h3.val=h3.maxval
++     }
++     h3.val+=t3Speed.val
++     sys0=h4.val+t4Speed.val
++     if(sys0>h4.maxval)
++     {
++         h4.val=h4.minval
++     }
++     if(sys0<h4.minval)
++     {
++         h4.val=h4.maxval
++     }
++     h4.val+=t4Speed.val
++     sys0=h5.val+t5Speed.val
++     if(sys0>h5.maxval)
++     {
++         h5.val=h5.minval
++     }
++     if(sys0<h5.minval)
++     {
++         h5.val=h5.maxval
++     }
++     h5.val+=t5Speed.val
++ 
++mSerial
++ributes
++ Scope      : local
++ Period (ms): 50
++ Enabled    : yes
++
 +141 +588,131 @@
 +                                     vis bNext,1
 +                                 }
diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt
index 86ad615c..3dbb2e8d 100644
--- a/HMI/n2t-out-visual/cardPower.txt
+++ b/HMI/n2t-out-visual/cardPower.txt
@@ -1034,66 +1034,84 @@ Timer tm0
     
     Events
         Timer Event
-            sys0=h0.val+t0Speed.val
-            if(sys0>h0.maxval)
+            if(t0Speed.val!=0)
             {
-                h0.val=h0.minval
+                sys0=h0.val+t0Speed.val
+                if(sys0>h0.maxval)
+                {
+                    h0.val=h0.minval
+                }
+                if(sys0<h0.minval)
+                {
+                    h0.val=h0.maxval
+                }
+                h0.val+=t0Speed.val
             }
-            if(sys0<h0.minval)
+            if(t1Speed.val!=0)
             {
-                h0.val=h0.maxval
+                sys0=h1.val+t1Speed.val
+                if(sys0>h1.maxval)
+                {
+                    h1.val=h1.minval
+                }
+                if(sys0<h1.minval)
+                {
+                    h1.val=h1.maxval
+                }
+                h1.val+=t1Speed.val
             }
-            h0.val+=t0Speed.val
-            sys0=h1.val+t1Speed.val
-            if(sys0>h1.maxval)
+            if(t2Speed.val!=0)
             {
-                h1.val=h1.minval
+                sys0=h2.val+t2Speed.val
+                if(sys0>h2.maxval)
+                {
+                    h2.val=h2.minval
+                }
+                if(sys0<h2.minval)
+                {
+                    h2.val=h2.maxval
+                }
+                h2.val+=t2Speed.val
             }
-            if(sys0<h1.minval)
+            if(t3Speed.val!=0)
             {
-                h1.val=h1.maxval
+                sys0=h3.val+t3Speed.val
+                if(sys0>h3.maxval)
+                {
+                    h3.val=h3.minval
+                }
+                if(sys0<h3.minval)
+                {
+                    h3.val=h3.maxval
+                }
+                h3.val+=t3Speed.val
             }
-            h1.val+=t1Speed.val
-            sys0=h2.val+t2Speed.val
-            if(sys0>h2.maxval)
+            if(t4Speed.val!=0)
             {
-                h2.val=h2.minval
+                sys0=h4.val+t4Speed.val
+                if(sys0>h4.maxval)
+                {
+                    h4.val=h4.minval
+                }
+                if(sys0<h4.minval)
+                {
+                    h4.val=h4.maxval
+                }
+                h4.val+=t4Speed.val
             }
-            if(sys0<h2.minval)
+            if(t5Speed.val!=0)
             {
-                h2.val=h2.maxval
+                sys0=h5.val+t5Speed.val
+                if(sys0>h5.maxval)
+                {
+                    h5.val=h5.minval
+                }
+                if(sys0<h5.minval)
+                {
+                    h5.val=h5.maxval
+                }
+                h5.val+=t5Speed.val
             }
-            h2.val+=t2Speed.val
-            sys0=h3.val+t3Speed.val
-            if(sys0>h3.maxval)
-            {
-                h3.val=h3.minval
-            }
-            if(sys0<h3.minval)
-            {
-                h3.val=h3.maxval
-            }
-            h3.val+=t3Speed.val
-            sys0=h4.val+t4Speed.val
-            if(sys0>h4.maxval)
-            {
-                h4.val=h4.minval
-            }
-            if(sys0<h4.minval)
-            {
-                h4.val=h4.maxval
-            }
-            h4.val+=t4Speed.val
-            sys0=h5.val+t5Speed.val
-            if(sys0>h5.maxval)
-            {
-                h5.val=h5.minval
-            }
-            if(sys0<h5.minval)
-            {
-                h5.val=h5.maxval
-            }
-            h5.val+=t5Speed.val
         
 Timer tmSerial
     Attributes
diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt
index b81bf015..a5239b08 100644
--- a/HMI/n2t-out-visual/nspanel_Stats.txt
+++ b/HMI/n2t-out-visual/nspanel_Stats.txt
@@ -46,10 +46,6 @@ screensaver
 	47   Component(s)
 	443  Line(s) of event code
 	311  Unique line(s) of event code
-cardPower
-	48   Component(s)
-	417  Line(s) of event code
-	294  Unique line(s) of event code
 popupInSel
 	34   Component(s)
 	617  Line(s) of event code
@@ -62,6 +58,10 @@ popupShutter
 	25   Component(s)
 	398  Line(s) of event code
 	218  Unique line(s) of event code
+cardPower
+	48   Component(s)
+	435  Line(s) of event code
+	300  Unique line(s) of event code
 cardMedia
 	59   Component(s)
 	641  Line(s) of event code
@@ -86,5 +86,5 @@ cardEntities
 Total
 	20   Page(s)
 	737  Component(s)
-	8736 Line(s) of event code
-	2241 Unique line(s) of event code
+	8754 Line(s) of event code
+	2247 Unique line(s) of event code
diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt
index a34570da..d6adc5e0 100644
--- a/HMI/n2t-out/cardPower.txt
+++ b/HMI/n2t-out/cardPower.txt
@@ -467,66 +467,84 @@ Timer tm0
     
     Events
         Timer Event
-            sys0=h0.val+t0Speed.val
-            if(sys0>h0.maxval)
+            if(t0Speed.val!=0)
             {
-                h0.val=h0.minval
+                sys0=h0.val+t0Speed.val
+                if(sys0>h0.maxval)
+                {
+                    h0.val=h0.minval
+                }
+                if(sys0<h0.minval)
+                {
+                    h0.val=h0.maxval
+                }
+                h0.val+=t0Speed.val
             }
-            if(sys0<h0.minval)
+            if(t1Speed.val!=0)
             {
-                h0.val=h0.maxval
+                sys0=h1.val+t1Speed.val
+                if(sys0>h1.maxval)
+                {
+                    h1.val=h1.minval
+                }
+                if(sys0<h1.minval)
+                {
+                    h1.val=h1.maxval
+                }
+                h1.val+=t1Speed.val
             }
-            h0.val+=t0Speed.val
-            sys0=h1.val+t1Speed.val
-            if(sys0>h1.maxval)
+            if(t2Speed.val!=0)
             {
-                h1.val=h1.minval
+                sys0=h2.val+t2Speed.val
+                if(sys0>h2.maxval)
+                {
+                    h2.val=h2.minval
+                }
+                if(sys0<h2.minval)
+                {
+                    h2.val=h2.maxval
+                }
+                h2.val+=t2Speed.val
             }
-            if(sys0<h1.minval)
+            if(t3Speed.val!=0)
             {
-                h1.val=h1.maxval
+                sys0=h3.val+t3Speed.val
+                if(sys0>h3.maxval)
+                {
+                    h3.val=h3.minval
+                }
+                if(sys0<h3.minval)
+                {
+                    h3.val=h3.maxval
+                }
+                h3.val+=t3Speed.val
             }
-            h1.val+=t1Speed.val
-            sys0=h2.val+t2Speed.val
-            if(sys0>h2.maxval)
+            if(t4Speed.val!=0)
             {
-                h2.val=h2.minval
+                sys0=h4.val+t4Speed.val
+                if(sys0>h4.maxval)
+                {
+                    h4.val=h4.minval
+                }
+                if(sys0<h4.minval)
+                {
+                    h4.val=h4.maxval
+                }
+                h4.val+=t4Speed.val
             }
-            if(sys0<h2.minval)
+            if(t5Speed.val!=0)
             {
-                h2.val=h2.maxval
+                sys0=h5.val+t5Speed.val
+                if(sys0>h5.maxval)
+                {
+                    h5.val=h5.minval
+                }
+                if(sys0<h5.minval)
+                {
+                    h5.val=h5.maxval
+                }
+                h5.val+=t5Speed.val
             }
-            h2.val+=t2Speed.val
-            sys0=h3.val+t3Speed.val
-            if(sys0>h3.maxval)
-            {
-                h3.val=h3.minval
-            }
-            if(sys0<h3.minval)
-            {
-                h3.val=h3.maxval
-            }
-            h3.val+=t3Speed.val
-            sys0=h4.val+t4Speed.val
-            if(sys0>h4.maxval)
-            {
-                h4.val=h4.minval
-            }
-            if(sys0<h4.minval)
-            {
-                h4.val=h4.maxval
-            }
-            h4.val+=t4Speed.val
-            sys0=h5.val+t5Speed.val
-            if(sys0>h5.maxval)
-            {
-                h5.val=h5.minval
-            }
-            if(sys0<h5.minval)
-            {
-                h5.val=h5.maxval
-            }
-            h5.val+=t5Speed.val
         
 Timer tmSerial
     Attributes