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

2026-01-06 06:35:48 +01:00 · 2022-11-15 18:15:03 +00:00
parent 668b8dad56
commit dce117f378
47 changed files with 170 additions and 120 deletions
--- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt
@@ -1015,7 +1015,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardAlarm,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt
@@ -1056,7 +1056,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardEntities,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt
@@ -858,7 +858,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardGrid,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt
@@ -829,7 +829,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardMedia,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out-visual/cardPower.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardPower.txt
@@ -802,7 +802,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardPower,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out-visual/cardQR.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt
@@ -339,7 +339,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardQR,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt
@@ -635,7 +635,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardThermo,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
+++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
@@ -6,18 +6,18 @@ pageIcons
 	7    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
+cardQR
+	32   Component(s)
+	421  Line(s) of event code
+	242  Unique line(s) of event code
 popupNotify
 	19   Component(s)
 	253  Line(s) of event code
 	164  Unique line(s) of event code
-cardMedia
-	34   Component(s)
-	406  Line(s) of event code
-	216  Unique line(s) of event code
-cardPower
-	43   Component(s)
-	435  Line(s) of event code
-	297  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
@@ -34,34 +34,26 @@ pageTest
 	14   Component(s)
 	14   Line(s) of event code
 	14   Unique line(s) of event code
-cardQR
-	32   Component(s)
-	421  Line(s) of event code
-	242  Unique line(s) of event code
 popupLight
 	28   Component(s)
 	404  Line(s) of event code
 	223  Unique line(s) of event code
-cardThermo
-	53   Component(s)
-	608  Line(s) of event code
-	316  Unique line(s) of event code
-cardAlarm
-	40   Component(s)
-	439  Line(s) of event code
-	261  Unique line(s) of event code
-cardEntities
-	65   Component(s)
-	1165 Line(s) of event code
-	530  Unique line(s) of event code
-popupThermo
-	44   Component(s)
-	515  Line(s) of event code
-	272  Unique line(s) of event code
 cardGrid
 	42   Component(s)
 	490  Line(s) of event code
 	286  Unique line(s) of event code
+cardPower
+	43   Component(s)
+	435  Line(s) of event code
+	297  Unique line(s) of event code
+cardMedia
+	34   Component(s)
+	406  Line(s) of event code
+	216  Unique line(s) of event code
+popupThermo
+	44   Component(s)
+	515  Line(s) of event code
+	272  Unique line(s) of event code
 screensaver
 	45   Component(s)
 	389  Line(s) of event code
@@ -70,6 +62,14 @@ popupInSel
 	34   Component(s)
 	529  Line(s) of event code
 	257  Unique line(s) of event code
+cardThermo
+	53   Component(s)
+	608  Line(s) of event code
+	316  Unique line(s) of event code
+cardEntities
+	65   Component(s)
+	1165 Line(s) of event code
+	530  Unique line(s) of event code

 Total
 	17   Page(s)
--- a/HMI/US/landscape/n2t-out/cardAlarm.txt
+++ b/HMI/US/landscape/n2t-out/cardAlarm.txt
@@ -483,7 +483,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardAlarm,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out/cardEntities.txt
+++ b/HMI/US/landscape/n2t-out/cardEntities.txt
@@ -534,7 +534,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardEntities,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out/cardGrid.txt
+++ b/HMI/US/landscape/n2t-out/cardGrid.txt
@@ -472,7 +472,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardGrid,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out/cardMedia.txt
+++ b/HMI/US/landscape/n2t-out/cardMedia.txt
@@ -448,7 +448,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardMedia,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out/cardPower.txt
+++ b/HMI/US/landscape/n2t-out/cardPower.txt
@@ -347,7 +347,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardPower,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out/cardQR.txt
+++ b/HMI/US/landscape/n2t-out/cardQR.txt
@@ -188,7 +188,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardQR,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/landscape/n2t-out/cardThermo.txt
+++ b/HMI/US/landscape/n2t-out/cardThermo.txt
@@ -295,7 +295,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardThermo,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt
@@ -1015,7 +1015,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardAlarm,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt
@@ -1260,7 +1260,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardEntities,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt
@@ -858,7 +858,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardGrid,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt
@@ -829,7 +829,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardMedia,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out-visual/cardPower.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardPower.txt
@@ -802,7 +802,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardPower,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out-visual/cardQR.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt
@@ -339,7 +339,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardQR,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt
@@ -635,7 +635,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardThermo,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- 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,14 +10,14 @@ pageTest
 	14   Component(s)
 	14   Line(s) of event code
 	14   Unique line(s) of event code
-cardQR
-	32   Component(s)
-	421  Line(s) of event code
-	242  Unique line(s) of event code
-cardAlarm
-	40   Component(s)
-	439  Line(s) of event code
-	261  Unique line(s) of event code
+cardMedia
+	34   Component(s)
+	406  Line(s) of event code
+	216  Unique line(s) of event code
+cardGrid
+	42   Component(s)
+	490  Line(s) of event code
+	286  Unique line(s) of event code
 popupShutter
 	25   Component(s)
 	394  Line(s) of event code
@@ -34,18 +34,14 @@ popupInSel
 	34   Component(s)
 	529  Line(s) of event code
 	257  Unique line(s) of event code
-cardPower
-	43   Component(s)
-	435  Line(s) of event code
-	297  Unique line(s) of event code
+cardQR
+	32   Component(s)
+	421  Line(s) of event code
+	242  Unique line(s) of event code
 popupNotify
 	19   Component(s)
 	253  Line(s) of event code
 	164  Unique line(s) of event code
-cardMedia
-	34   Component(s)
-	406  Line(s) of event code
-	216  Unique line(s) of event code
 popupLight
 	28   Component(s)
 	404  Line(s) of event code
@@ -54,18 +50,22 @@ popupFan
 	27   Component(s)
 	347  Line(s) of event code
 	202  Unique line(s) of event code
-cardGrid
-	42   Component(s)
-	490  Line(s) of event code
-	286  Unique line(s) of event code
-cardThermo
-	53   Component(s)
-	608  Line(s) of event code
-	316  Unique line(s) of event code
+cardPower
+	43   Component(s)
+	435  Line(s) of event code
+	297  Unique line(s) of event code
 screensaver
 	45   Component(s)
 	389  Line(s) of event code
 	288  Unique line(s) of event code
+cardAlarm
+	40   Component(s)
+	439  Line(s) of event code
+	261  Unique line(s) of event code
+cardThermo
+	53   Component(s)
+	608  Line(s) of event code
+	316  Unique line(s) of event code
 cardEntities
 	77   Component(s)
 	1391 Line(s) of event code
--- a/HMI/US/portrait/n2t-out/cardAlarm.txt
+++ b/HMI/US/portrait/n2t-out/cardAlarm.txt
@@ -483,7 +483,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardAlarm,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out/cardEntities.txt
+++ b/HMI/US/portrait/n2t-out/cardEntities.txt
@@ -638,7 +638,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardEntities,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out/cardGrid.txt
+++ b/HMI/US/portrait/n2t-out/cardGrid.txt
@@ -472,7 +472,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardGrid,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out/cardMedia.txt
+++ b/HMI/US/portrait/n2t-out/cardMedia.txt
@@ -448,7 +448,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardMedia,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out/cardPower.txt
+++ b/HMI/US/portrait/n2t-out/cardPower.txt
@@ -347,7 +347,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardPower,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out/cardQR.txt
+++ b/HMI/US/portrait/n2t-out/cardQR.txt
@@ -188,7 +188,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardQR,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else
--- a/HMI/US/portrait/n2t-out/cardThermo.txt
+++ b/HMI/US/portrait/n2t-out/cardThermo.txt
@@ -295,7 +295,7 @@ Button bNext
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,cardThermo,"
-            if(bPrev.txt=="î")
+            if(bNext.txt=="î")
            {
                tSend.txt+="bHome"
            }else