From 43d21a4b6b1f8585c67e443d613805d217995eb8 Mon Sep 17 00:00:00 2001
From: joBr99 <joBr99@users.noreply.github.com>
Date: Tue, 8 Aug 2023 19:45:40 +0000
Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui
 (add nextion2text)

---
 HMI/US/landscape/diff-eu-version.txt | 17 +++++++++++++++++
 HMI/US/portrait/diff-eu-version.txt  | 17 +++++++++++++++++
 HMI/US/portrait/diff-filtered.txt    | 19 ++++++++++++++++++-
 HMI/n2t-out-visual/nspanel_Stats.txt | 16 ++++++++--------
 HMI/n2t-out-visual/pageStartup.txt   |  2 +-
 HMI/n2t-out/pageStartup.txt          |  2 +-
 6 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt
index a72bd9e5..faef8e75 100644
--- a/HMI/US/landscape/diff-eu-version.txt
+++ b/HMI/US/landscape/diff-eu-version.txt
@@ -185,6 +185,23 @@
 │                                      if(tInstruction.txt=="date")
 │   --- HMI/n2t-out/pageStartup.txt
 ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
+│ @@ -141,15 +141,15 @@
+│      
+│  Text tVersion
+│      Attributes
+│          Scope              : local
+│          Dragging           : 0
+│          Send Component ID  : disabled
+│          Associated Keyboard: none
+│ -        Text               : 52
+│ +        Text               : 51
+│          Max. Text Size     : 10
+│      
+│  Picture p0
+│      Attributes
+│          Scope            : local
+│          Dragging         : 0
+│          Send Component ID: disabled
 │ @@ -164,15 +164,15 @@
 │          Max. Text Size   : 10
 │      
diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt
index 1a943e21..fd3160f0 100644
--- a/HMI/US/portrait/diff-eu-version.txt
+++ b/HMI/US/portrait/diff-eu-version.txt
@@ -1688,6 +1688,23 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
+│ @@ -141,15 +135,15 @@
+│      
+│  Text tVersion
+│      Attributes
+│          Scope              : local
+│          Dragging           : 0
+│          Send Component ID  : disabled
+│          Associated Keyboard: none
+│ -        Text               : 52
+│ +        Text               : 51
+│          Max. Text Size     : 10
+│      
+│  Picture p0
+│      Attributes
+│          Scope            : local
+│          Dragging         : 0
+│          Send Component ID: disabled
 │ @@ -164,15 +158,15 @@
 │          Max. Text Size   : 10
 │      
diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt
index 711db0e9..b0b6c997 100644
--- a/HMI/US/portrait/diff-filtered.txt
+++ b/HMI/US/portrait/diff-filtered.txt
@@ -1,4 +1,4 @@
-+++ /dev/fd/62	2023-08-06 20:32:34.816279572 +0000
++++ /dev/fd/62	2023-08-08 19:45:29.806219470 +0000
 +I/n2t-out/Program.s.txt
 ++ HMI/US/portrait/n2t-out/Program.s.txt
 +1 +12,11 @@
@@ -1245,6 +1245,23 @@
 + Scope              : local
 + Dragging           : 0
 + Send Component ID  : disabled
++15 +135,15 @@
++
++ersion
++ributes
++ Scope              : local
++ Dragging           : 0
++ Send Component ID  : disabled
++ Associated Keyboard: none
++ Text               : 52
++ Text               : 51
++ Max. Text Size     : 10
++
++ p0
++ributes
++ Scope            : local
++ Dragging         : 0
++ Send Component ID: disabled
 +15 +158,15 @@
 + Max. Text Size   : 10
 +20 +269,14 @@
diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt
index 2880cbc1..0554644f 100644
--- a/HMI/n2t-out-visual/nspanel_Stats.txt
+++ b/HMI/n2t-out-visual/nspanel_Stats.txt
@@ -18,10 +18,10 @@ popupFan
 	27   Component(s)
 	355  Line(s) of event code
 	206  Unique line(s) of event code
-pageStartup
-	20   Component(s)
-	198  Line(s) of event code
-	137  Unique line(s) of event code
+popupNotify
+	19   Component(s)
+	267  Line(s) of event code
+	172  Unique line(s) of event code
 popupShutter
 	25   Component(s)
 	402  Line(s) of event code
@@ -34,14 +34,14 @@ popupLight
 	28   Component(s)
 	408  Line(s) of event code
 	225  Unique line(s) of event code
-popupNotify
-	19   Component(s)
-	267  Line(s) of event code
-	172  Unique line(s) of event code
 cardGrid
 	44   Component(s)
 	529  Line(s) of event code
 	298  Unique line(s) of event code
+pageStartup
+	20   Component(s)
+	198  Line(s) of event code
+	137  Unique line(s) of event code
 cardQR
 	34   Component(s)
 	410  Line(s) of event code
diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt
index ed129d3c..2660b6d2 100644
--- a/HMI/n2t-out-visual/pageStartup.txt
+++ b/HMI/n2t-out-visual/pageStartup.txt
@@ -396,7 +396,7 @@ Text tVersion
         Horizontal Alignment: center
         Vertical Alignment  : center
         Input Type          : character
-        Text                : 51
+        Text                : 52
         Max. Text Size      : 10
         Word wrap           : disabled
         Horizontal Spacing  : 0
diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt
index bbfd90ec..aa546999 100644
--- a/HMI/n2t-out/pageStartup.txt
+++ b/HMI/n2t-out/pageStartup.txt
@@ -145,7 +145,7 @@ Text tVersion
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
-        Text               : 51
+        Text               : 52
         Max. Text Size     : 10
     
 Picture p0