Merge branch 'joBr99:main' into main

HMI/n2t-out/nspanel_Stats.txt

@@ -15,9 +15,9 @@ cardMedia
 	210  Line(s) of event code
 	116  Unique line(s) of event code
 popupNotify
-	16   Component(s)
-	167  Line(s) of event code
-	111  Unique line(s) of event code
+	17   Component(s)
+	171  Line(s) of event code
+	113  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	146  Line(s) of event code
@@ -26,14 +26,14 @@ pageSwipeTest
 	18   Component(s)
 	62   Line(s) of event code
 	44   Unique line(s) of event code
-popupShutter
-	19   Component(s)
-	195  Line(s) of event code
-	107  Unique line(s) of event code
 pageTest
 	14   Component(s)
 	14   Line(s) of event code
 	14   Unique line(s) of event code
+popupShutter
+	19   Component(s)
+	194  Line(s) of event code
+	106  Unique line(s) of event code
 screensaver
 	25   Component(s)
 	173  Line(s) of event code
@@ -56,11 +56,11 @@ cardGrid
 	224  Unique line(s) of event code
 popupLight
 	27   Component(s)
-	339  Line(s) of event code
-	171  Unique line(s) of event code
+	338  Line(s) of event code
+	170  Unique line(s) of event code
 
 Total
 	14   Page(s)
-	342  Component(s)
-	3170 Line(s) of event code
-	787  Unique line(s) of event code
+	343  Component(s)
+	3172 Line(s) of event code
+	789  Unique line(s) of event code

HMI/n2t-out/pageStartup.txt

@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 6
+        Text                                : 11
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -605,7 +605,7 @@ Timer tmSerial
                                         {
                                             page pageStartup
                                         }
-                                        if(tId.txt=="pageNotify")
+                                        if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }

HMI/n2t-out/popupLight.txt

@@ -942,7 +942,6 @@ Timer tmSerial
                                         // get value
                                         spstr strCommand.txt,tTmp.txt,",",1
                                         covx tTmp.txt,dimValue,0,0
-                                        dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {

HMI/n2t-out/popupNotify.txt

@@ -31,7 +31,7 @@ Variable (string) strCommand
         ID            : 8
         Scope         : local
         Text          : 
-        Max. Text Size: 600
+        Max. Text Size: 1000
     
 Variable (string) entn
     Attributes
@@ -40,6 +40,12 @@ Variable (string) entn
         Text          : 
         Max. Text Size: 30
     
+Variable (int32) vaOldSleepT
+    Attributes
+        ID   : 16
+        Scope: local
+        Value: 0
+    
 Text tSend
     Attributes
         ID                                  : 3
@@ -271,6 +277,7 @@ Button b0
     
     Events
         Touch Press Event
+            sleepTimeout=vaOldSleepT.val
             //page open event
             // event,pageOpen,cardEntities,pageNumber
             // craft command
@@ -323,6 +330,7 @@ Button b2
     
     Events
         Touch Press Event
+            sleepTimeout=vaOldSleepT.val
             //craft command
             tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,yes"
             //send calc crc
@@ -371,6 +379,7 @@ Button b1
     
     Events
         Touch Press Event
+            sleepTimeout=vaOldSleepT.val
             //craft command
             tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,no"
             //send calc crc
@@ -493,6 +502,8 @@ Timer tmSerial
                                         spstr strCommand.txt,tTmp.txt,"|",9
                                         covx tTmp.txt,sys0,0,0
                                         tText.pco=sys0
+                                        //preserve old sleepTimeout
+                                        vaOldSleepT.val=sleepTimeout
                                         // sleep timeout
                                         spstr strCommand.txt,tTmp.txt,"|",9
                                         covx tTmp.txt,sys0,0,0
@@ -513,7 +524,6 @@ Timer tmSerial
                                         // get value
                                         spstr strCommand.txt,tTmp.txt,",",1
                                         covx tTmp.txt,dimValue,0,0
-                                        dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
@@ -523,6 +533,7 @@ Timer tmSerial
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
+                                        sleepTimeout=vaOldSleepT.val
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
                                         spstr strCommand.txt,tId.txt,",",1

HMI/n2t-out/popupShutter.txt

@@ -631,7 +631,6 @@ Timer tmSerial
                                         // get value
                                         spstr strCommand.txt,tTmp.txt,",",1
                                         covx tTmp.txt,dimValue,0,0
-                                        dim=dimValue
                                     }
                                     if(tInstruction.txt=="time")
                                     {