From a9ffbff2ed64741a9321aa9add5ec24d7081d119 Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Wed, 11 Jan 2023 21:44:58 +0000
Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui
 (add nextion2text)

---
 HMI/US/landscape/diff-eu-version.txt | 44 ++++++++++++++++++++++++--
 HMI/US/portrait/diff-eu-version.txt  | 46 +++++++++++++++++++++++++---
 HMI/US/portrait/diff-filtered.txt    | 42 +++++++++++++++++++++++--
 HMI/n2t-out-visual/nspanel_Stats.txt | 26 ++++++++--------
 HMI/n2t-out-visual/pageStartup.txt   |  9 +++++-
 HMI/n2t-out-visual/pageTest.txt      | 37 ++++++++++++++++++++++
 HMI/n2t-out-visual/screensaver.txt   |  2 +-
 HMI/n2t-out/pageStartup.txt          |  8 ++++-
 HMI/n2t-out/pageTest.txt             | 16 ++++++++++
 HMI/n2t-out/screensaver.txt          |  2 +-
 10 files changed, 206 insertions(+), 26 deletions(-)

diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt
index 2505c1d9..8f6dd242 100644
--- a/HMI/US/landscape/diff-eu-version.txt
+++ b/HMI/US/landscape/diff-eu-version.txt
@@ -198,7 +198,45 @@
 │                                      if(tInstruction.txt=="date")
 │   --- HMI/n2t-out/pageStartup.txt
 ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
-│ @@ -173,15 +173,15 @@
+│ @@ -35,20 +35,14 @@
+│          
+│  Variable (string) strCommand
+│      Attributes
+│          Scope         : local
+│          Text          : 
+│          Max. Text Size: 50
+│      
+│ -Variable (string) strTmp
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 2
+│ -    
+│  Number frame_ptr
+│      Attributes
+│          Scope                               : local
+│          Dragging                            : 0
+│          Disable release event after dragging: 0
+│          Send Component ID                   : disabled
+│          Associated Keyboard                 : none
+│ @@ -145,15 +139,15 @@
+│      Attributes
+│          Scope                               : local
+│          Dragging                            : 0
+│          Disable release event after dragging: 0
+│          Send Component ID                   : disabled
+│          Associated Keyboard                 : none
+│          Text                                : 
+│ -        Max. Text Size                      : 30
+│ +        Max. Text Size                      : 10
+│      
+│  Text tVersion
+│      Attributes
+│          Scope                               : local
+│          Dragging                            : 0
+│          Disable release event after dragging: 0
+│          Send Component ID                   : disabled
+│ @@ -179,15 +173,15 @@
 │          Max. Text Size                      : 10
 │      
 │      Events
@@ -215,7 +253,7 @@
 │              crcputs sys0,2
 │              crcputs tSend.txt,0
 │              //send cmd
-│ @@ -360,18 +360,14 @@
+│ @@ -366,18 +360,14 @@
 │                                          {
 │                                              page cardPower
 │                                          }
@@ -280,7 +318,7 @@
 │ -            for(sys0=0;sys0<sys1;sys0++)
 │ -            {
 │ -                substr tTmp.txt,strTmp.txt,sys0,1
-│ -                xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
+│ -                xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
 │ -            }
 │ -        
 │  Text t10
diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt
index 8b95cdf9..5f70ef3e 100644
--- a/HMI/US/portrait/diff-eu-version.txt
+++ b/HMI/US/portrait/diff-eu-version.txt
@@ -1227,7 +1227,28 @@
 │                                      if(tInstruction.txt=="date")
 │   --- HMI/n2t-out/pageStartup.txt
 ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
-│ @@ -118,15 +118,15 @@
+│ @@ -35,20 +35,14 @@
+│          
+│  Variable (string) strCommand
+│      Attributes
+│          Scope         : local
+│          Text          : 
+│          Max. Text Size: 50
+│      
+│ -Variable (string) strTmp
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 2
+│ -    
+│  Number frame_ptr
+│      Attributes
+│          Scope                               : local
+│          Dragging                            : 0
+│          Disable release event after dragging: 0
+│          Send Component ID                   : disabled
+│          Associated Keyboard                 : none
+│ @@ -124,15 +118,15 @@
 │  Text tMsg3
 │      Attributes
 │          Scope                               : local
@@ -1244,7 +1265,24 @@
 │          Scope                               : local
 │          Dragging                            : 0
 │          Disable release event after dragging: 0
-│ @@ -173,15 +173,15 @@
+│ @@ -145,15 +139,15 @@
+│      Attributes
+│          Scope                               : local
+│          Dragging                            : 0
+│          Disable release event after dragging: 0
+│          Send Component ID                   : disabled
+│          Associated Keyboard                 : none
+│          Text                                : 
+│ -        Max. Text Size                      : 30
+│ +        Max. Text Size                      : 10
+│      
+│  Text tVersion
+│      Attributes
+│          Scope                               : local
+│          Dragging                            : 0
+│          Disable release event after dragging: 0
+│          Send Component ID                   : disabled
+│ @@ -179,15 +173,15 @@
 │          Max. Text Size                      : 10
 │      
 │      Events
@@ -1261,7 +1299,7 @@
 │              crcputs sys0,2
 │              crcputs tSend.txt,0
 │              //send cmd
-│ @@ -360,18 +360,14 @@
+│ @@ -366,18 +360,14 @@
 │                                          {
 │                                              page cardPower
 │                                          }
@@ -1338,7 +1376,7 @@
 │ -            for(sys0=0;sys0<sys1;sys0++)
 │ -            {
 │ -                substr tTmp.txt,strTmp.txt,sys0,1
-│ -                xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
+│ -                xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
 │ -            }
 │ -        
 │  Text t10
diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt
index daade771..2b3276d3 100644
--- a/HMI/US/portrait/diff-filtered.txt
+++ b/HMI/US/portrait/diff-filtered.txt
@@ -1,4 +1,4 @@
-+++ /dev/fd/62	2023-01-11 20:23:01.977591134 +0000
++++ /dev/fd/62	2023-01-11 21:44:49.861477938 +0000
 +le list
 + +1,12 @@
 +.s.txt
@@ -646,6 +646,44 @@
 +                             if(tInstruction.txt=="date")
 +I/n2t-out/pageStartup.txt
 ++ HMI/US/portrait/n2t-out/pageStartup.txt
++0 +35,14 @@
++ 
++e (string) strCommand
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 50
++
++e (string) strTmp
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 2
++
++frame_ptr
++ributes
++ Scope                               : local
++ Dragging                            : 0
++ Disable release event after dragging: 0
++ Send Component ID                   : disabled
++ Associated Keyboard                 : none
++15 +139,15 @@
++ributes
++ Scope                               : local
++ Dragging                            : 0
++ Disable release event after dragging: 0
++ Send Component ID                   : disabled
++ Associated Keyboard                 : none
++ Text                                : 
++ Max. Text Size                      : 30
++ Max. Text Size                      : 10
++
++ersion
++ributes
++ Scope                               : local
++ Dragging                            : 0
++ Disable release event after dragging: 0
++ Send Component ID                   : disabled
 +18 +360,14 @@
 +                                 {
 +                                     page cardPower
@@ -723,7 +761,7 @@
 +     for(sys0=0;sys0<sys1;sys0++)
 +     {
 +         substr tTmp.txt,strTmp.txt,sys0,1
-+         xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
++         xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
 +     }
 + 
 +0
diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt
index a5804044..41953250 100644
--- a/HMI/n2t-out-visual/nspanel_Stats.txt
+++ b/HMI/n2t-out-visual/nspanel_Stats.txt
@@ -26,18 +26,22 @@ cardLChart
 	33   Component(s)
 	408  Line(s) of event code
 	268  Unique line(s) of event code
-screensaver
-	47   Component(s)
-	443  Line(s) of event code
-	311  Unique line(s) of event code
-pageStartup
-	19   Component(s)
-	185  Line(s) of event code
-	131  Unique line(s) of event code
+pageTest
+	26   Component(s)
+	68   Line(s) of event code
+	66   Unique line(s) of event code
 popupFan
 	27   Component(s)
 	351  Line(s) of event code
 	204  Unique line(s) of event code
+pageStartup
+	20   Component(s)
+	185  Line(s) of event code
+	131  Unique line(s) of event code
+screensaver
+	47   Component(s)
+	443  Line(s) of event code
+	311  Unique line(s) of event code
 popupInSel
 	34   Component(s)
 	617  Line(s) of event code
@@ -62,10 +66,6 @@ cardAlarm
 	42   Component(s)
 	419  Line(s) of event code
 	255  Unique line(s) of event code
-pageTest
-	24   Component(s)
-	68   Line(s) of event code
-	66   Unique line(s) of event code
 popupTimer
 	42   Component(s)
 	512  Line(s) of event code
@@ -85,6 +85,6 @@ cardEntities
 
 Total
 	20   Page(s)
-	730  Component(s)
+	733  Component(s)
 	8695 Line(s) of event code
 	2223 Unique line(s) of event code
diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt
index 11214d4b..ce3f62c4 100644
--- a/HMI/n2t-out-visual/pageStartup.txt
+++ b/HMI/n2t-out-visual/pageStartup.txt
@@ -48,6 +48,13 @@ Variable (string) strCommand
         Text          : 
         Max. Text Size: 50
     
+Variable (string) strTmp
+    Attributes
+        ID            : 19
+        Scope         : local
+        Text          : 
+        Max. Text Size: 2
+    
 Number frame_ptr
     Attributes
         ID                                  : 10
@@ -373,7 +380,7 @@ Text tTmp
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 30
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
diff --git a/HMI/n2t-out-visual/pageTest.txt b/HMI/n2t-out-visual/pageTest.txt
index 581ffe0e..6015e7a5 100644
--- a/HMI/n2t-out-visual/pageTest.txt
+++ b/HMI/n2t-out-visual/pageTest.txt
@@ -31,6 +31,13 @@ Variable (string) strCommand
         Text          : 
         Max. Text Size: 20
     
+Variable (string) strTmp
+    Attributes
+        ID            : 25
+        Scope         : local
+        Text          : 
+        Max. Text Size: 2
+    
 Variable (string) tInstruction
     Attributes
         ID            : 16
@@ -75,6 +82,36 @@ Text tBench
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tTmp
+    Attributes
+        ID                                  : 24
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 49
+        y coordinate                        : 48
+        Width                               : 257
+        Height                              : 30
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 0
+        Back. Color                         : 65535
+        Font Color                          : 0
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : test123test123
+        Max. Text Size                      : 30
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt
index b1aa4bc7..1aabed81 100644
--- a/HMI/n2t-out-visual/screensaver.txt
+++ b/HMI/n2t-out-visual/screensaver.txt
@@ -166,7 +166,7 @@ Text m0
             for(sys0=0;sys0<sys1;sys0++)
             {
                 substr tTmp.txt,strTmp.txt,sys0,1
-                xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
+                xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
             }
         
 Text t10
diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt
index 06997ba3..1dce1447 100644
--- a/HMI/n2t-out/pageStartup.txt
+++ b/HMI/n2t-out/pageStartup.txt
@@ -39,6 +39,12 @@ Variable (string) strCommand
         Text          : 
         Max. Text Size: 50
     
+Variable (string) strTmp
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 2
+    
 Number frame_ptr
     Attributes
         Scope                               : local
@@ -143,7 +149,7 @@ Text tTmp
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 30
     
 Text tVersion
     Attributes
diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt
index 90e2a92b..b8b1c0c0 100644
--- a/HMI/n2t-out/pageTest.txt
+++ b/HMI/n2t-out/pageTest.txt
@@ -22,6 +22,12 @@ Variable (string) strCommand
         Text          : 
         Max. Text Size: 20
     
+Variable (string) strTmp
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 2
+    
 Variable (string) tInstruction
     Attributes
         Scope         : local
@@ -44,6 +50,16 @@ Text tBench
         Text                                : 
         Max. Text Size                      : 20
     
+Text tTmp
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : test123test123
+        Max. Text Size                      : 30
+    
 Picture p0
     Attributes
         Scope                               : local
diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt
index eafce248..81211731 100644
--- a/HMI/n2t-out/screensaver.txt
+++ b/HMI/n2t-out/screensaver.txt
@@ -125,7 +125,7 @@ Text m0
             for(sys0=0;sys0<sys1;sys0++)
             {
                 substr tTmp.txt,strTmp.txt,sys0,1
-                xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
+                xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
             }
         
 Text t10