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

HMI/US/landscape/diff-eu-version.txt

@@ -13,25 +13,6 @@
 │ -    // fix touch offset
 │ -    lcd_dev fffb 0002 0000 0020
 │ -    page pageStartup
-│   --- HMI/n2t-out/cardAlarm.txt
-├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt
-│ @@ -39,15 +39,15 @@
-│              vis bNext,0
-│              cardAlarm.bco=defaultBcoColor
-│              for(sys0=0;sys0<40;sys0++)
-│              {
-│                  if(b[sys0].type==98||b[sys0].type==116)
-│                  {
-│                      b[sys0].bco=defaultBcoColor
-│ -                    //b[sys0].pco=defaultFontColor
-│ +                    b[sys0].pco=defaultFontColor
-│                  }
-│              }
-│              if(defaultBcoColor==0)
-│              {
-│                  tCode.bco=6371
-│                  tCode.pco=40179
-│              }
 │   --- HMI/n2t-out/pageStartup.txt
 ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
 │ @@ -173,15 +173,15 @@

HMI/US/landscape/n2t-out-visual/cardAlarm.txt

@@ -51,7 +51,7 @@ Page cardAlarm
                 if(b[sys0].type==98||b[sys0].type==116)
                 {
                     b[sys0].bco=defaultBcoColor
-                    b[sys0].pco=defaultFontColor
+                    //b[sys0].pco=defaultFontColor
                 }
             }
             if(defaultBcoColor==0)

HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt

@@ -54,14 +54,14 @@ screensaver
 	45   Component(s)
 	410  Line(s) of event code
 	298  Unique line(s) of event code
+cardAlarm
+	40   Component(s)
+	442  Line(s) of event code
+	262  Unique line(s) of event code
 cardPower
 	43   Component(s)
 	439  Line(s) of event code
 	299  Unique line(s) of event code
-cardAlarm
-	40   Component(s)
-	443  Line(s) of event code
-	263  Unique line(s) of event code
 popupThermo
 	44   Component(s)
 	519  Line(s) of event code
@@ -82,5 +82,5 @@ cardThermo
 Total
 	19   Page(s)
 	670  Component(s)
-	8376 Line(s) of event code
+	8375 Line(s) of event code
 	2116 Unique line(s) of event code

HMI/US/landscape/n2t-out/cardAlarm.txt

@@ -43,7 +43,7 @@ Page cardAlarm
                 if(b[sys0].type==98||b[sys0].type==116)
                 {
                     b[sys0].bco=defaultBcoColor
-                    b[sys0].pco=defaultFontColor
+                    //b[sys0].pco=defaultFontColor
                 }
             }
             if(defaultBcoColor==0)

HMI/US/portrait/n2t-out-visual/cardChart.txt

@@ -252,7 +252,7 @@ Button bNext
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
-        Send Component ID                   : disabled
+        Send Component ID                   : on press
         Opacity                             : 127
         x coordinate                        : 262
         y coordinate                        : 16
@@ -280,7 +280,7 @@ Button bNext
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardPower,"
+            tSend.txt="event,buttonPress2,cardChart,"
             if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
@@ -334,7 +334,7 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardAlarm,"
+            tSend.txt="event,buttonPress2,cardChart,"
             if(bPrev.txt=="")
             {
                 tSend.txt+="bUp"
@@ -445,26 +445,6 @@ Hotspot m0
                 vaLast.val=-1
             }
         
-Hotspot m1
-    Attributes
-        ID                                  : 30
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 0
-        y coordinate                        : 5
-        Width                               : 9
-        Height                              : 310
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-    
-    Events
-        Touch Press Event
-            click bPrev,1
-        
 Hotspot mSwipeNext
     Attributes
         ID                                  : 29
@@ -507,7 +487,7 @@ Hotspot mSwipePrev
         
 Hotspot mSwipeUp
     Attributes
-        ID                                  : 31
+        ID                                  : 30
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0

HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt

@@ -23,17 +23,13 @@ popupFan
 	351  Line(s) of event code
 	204  Unique line(s) of event code
 cardChart
-	32   Component(s)
+	31   Component(s)
-	453  Line(s) of event code
+	452  Line(s) of event code
-	297  Unique line(s) of event code
+	296  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	181  Line(s) of event code
 	129  Unique line(s) of event code
-cardPower
-	43   Component(s)
-	439  Line(s) of event code
-	299  Unique line(s) of event code
 popupShutter
 	25   Component(s)
 	398  Line(s) of event code
@@ -42,6 +38,10 @@ popupThermo
 	44   Component(s)
 	519  Line(s) of event code
 	274  Unique line(s) of event code
+cardPower
+	43   Component(s)
+	439  Line(s) of event code
+	299  Unique line(s) of event code
 cardGrid
 	42   Component(s)
 	518  Line(s) of event code
@@ -76,11 +76,11 @@ cardAlarm
 	262  Unique line(s) of event code
 cardEntities
 	89   Component(s)
-	2583 Line(s) of event code
+	1636 Line(s) of event code
-	692  Unique line(s) of event code
+	701  Unique line(s) of event code
 
 Total
 	19   Page(s)
-	694  Component(s)
+	693  Component(s)
-	9754 Line(s) of event code
+	8806 Line(s) of event code
-	2255 Unique line(s) of event code
+	2252 Unique line(s) of event code

HMI/US/portrait/n2t-out/cardChart.txt

@@ -172,14 +172,14 @@ Button bNext
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
-        Send Component ID                   : disabled
+        Send Component ID                   : on press
         State                               : unpressed
         Text                                : 
         Max. Text Size                      : 10
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardPower,"
+            tSend.txt="event,buttonPress2,cardChart,"
             if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
@@ -211,7 +211,7 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardAlarm,"
+            tSend.txt="event,buttonPress2,cardChart,"
             if(bPrev.txt=="")
             {
                 tSend.txt+="bUp"
@@ -313,17 +313,6 @@ Hotspot m0
                 vaLast.val=-1
             }
         
-Hotspot m1
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-    
-    Events
-        Touch Press Event
-            click bPrev,1
-        
 Hotspot mSwipeNext
     Attributes
         Scope                               : local