Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

2025-12-19 22:24:15 +01:00 · 2022-11-22 17:23:20 +00:00
parent 3740a1cb7a
commit c8e1a96410
12 changed files with 24 additions and 24 deletions
--- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
+++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
@@ -14,14 +14,14 @@ popupNotify
 	19   Component(s)
 	253  Line(s) of event code
 	164  Unique line(s) of event code
-cardAlarm
-	40   Component(s)
-	439  Line(s) of event code
-	261  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	172  Line(s) of event code
 	125  Unique line(s) of event code
+cardAlarm
+	40   Component(s)
+	439  Line(s) of event code
+	261  Unique line(s) of event code
 popupShutter
 	25   Component(s)
 	394  Line(s) of event code
--- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt
+++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt
@@ -402,7 +402,7 @@ Text tVersion
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
-        Text                                : 44
+        Text                                : 45
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
--- a/HMI/US/landscape/n2t-out/pageStartup.txt
+++ b/HMI/US/landscape/n2t-out/pageStartup.txt
@@ -152,7 +152,7 @@ Text tVersion
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
-        Text                                : 44
+        Text                                : 45
        Max. Text Size                      : 10
    
 Picture p0
--- a/HMI/US/portrait/diff-filtered.txt
+++ b/HMI/US/portrait/diff-filtered.txt
@@ -1,4 +1,4 @@
-+++ /dev/fd/62	2022-11-19 22:44:23.979739346 +0000
+++ /dev/fd/62	2022-11-22 17:23:14.264877564 +0000
 +52 +306,47 @@
 +                                 spstr strCommand.txt,tTmp.txt,"~",2
 +                                 //save third arg if there's one
--- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
+++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
@@ -10,6 +10,10 @@ pageTest
 	14   Component(s)
 	14   Line(s) of event code
 	14   Unique line(s) of event code
+pageStartup
+	19   Component(s)
+	172  Line(s) of event code
+	125  Unique line(s) of event code
 cardGrid
 	42   Component(s)
 	490  Line(s) of event code
@@ -18,10 +22,6 @@ popupShutter
 	25   Component(s)
 	394  Line(s) of event code
 	216  Unique line(s) of event code
-pageStartup
-	19   Component(s)
-	172  Line(s) of event code
-	125  Unique line(s) of event code
 popupThermo
 	44   Component(s)
 	515  Line(s) of event code
--- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt
+++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt
@@ -402,7 +402,7 @@ Text tVersion
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
-        Text                                : 44
+        Text                                : 45
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
--- a/HMI/US/portrait/n2t-out/pageStartup.txt
+++ b/HMI/US/portrait/n2t-out/pageStartup.txt
@@ -152,7 +152,7 @@ Text tVersion
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
-        Text                                : 44
+        Text                                : 45
        Max. Text Size                      : 10
    
 Picture p0
--- a/HMI/n2t-out-visual/nspanel_Stats.txt
+++ b/HMI/n2t-out-visual/nspanel_Stats.txt
@@ -14,18 +14,14 @@ popupLight
 	28   Component(s)
 	404  Line(s) of event code
 	223  Unique line(s) of event code
-popupNotify
-	19   Component(s)
-	253  Line(s) of event code
-	164  Unique line(s) of event code
 pageTest
 	21   Component(s)
 	66   Line(s) of event code
 	63   Unique line(s) of event code
-pageStartup
+popupNotify
 	19   Component(s)
-	177  Line(s) of event code
-	127  Unique line(s) of event code
+	253  Line(s) of event code
+	164  Unique line(s) of event code
 cardQR
 	32   Component(s)
 	421  Line(s) of event code
@@ -42,6 +38,10 @@ cardMedia
 	34   Component(s)
 	421  Line(s) of event code
 	222  Unique line(s) of event code
+pageStartup
+	19   Component(s)
+	177  Line(s) of event code
+	127  Unique line(s) of event code
 cardThermo
 	53   Component(s)
 	608  Line(s) of event code
--- a/HMI/n2t-out-visual/pageStartup.txt
+++ b/HMI/n2t-out-visual/pageStartup.txt
@@ -402,7 +402,7 @@ Text tVersion
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
-        Text                                : 44
+        Text                                : 45
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
--- a/HMI/n2t-out-visual/pageTest.txt
+++ b/HMI/n2t-out-visual/pageTest.txt
@@ -306,7 +306,7 @@ Button b13
    
    Events
        Touch Press Event
-            page popupInSel
+            page popupThermo
        
 Button b2
    Attributes
--- a/HMI/n2t-out/pageStartup.txt
+++ b/HMI/n2t-out/pageStartup.txt
@@ -152,7 +152,7 @@ Text tVersion
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
-        Text                                : 44
+        Text                                : 45
        Max. Text Size                      : 10
    
 Picture p0
--- a/HMI/n2t-out/pageTest.txt
+++ b/HMI/n2t-out/pageTest.txt
@@ -133,7 +133,7 @@ Button b13
    
    Events
        Touch Press Event
-            page popupInSel
+            page popupThermo
        
 Button b2
    Attributes