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

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

@@ -16,7 +16,6 @@ Page cardAlarm
             vis p0,0
             vis tSend,0
             vis tInstruction,0
-            vis nPageDisp,0
             vis tTmp,0
             vis tId,0
             //vis nPageDisp,0
@@ -39,63 +38,53 @@ Page cardAlarm
         
 Variable (string) strCommand
     Attributes
-        ID            : 7
+        ID            : 6
         Scope         : local
         Text          : 
         Max. Text Size: 200
     
 Variable (string) entn
     Attributes
-        ID            : 10
+        ID            : 9
         Scope         : local
         Text          : 
         Max. Text Size: 50
     
 Variable (string) tSend
     Attributes
-        ID            : 26
+        ID            : 25
         Scope         : local
         Text          : 
         Max. Text Size: 100
     
 Variable (string) va1
     Attributes
-        ID            : 31
+        ID            : 30
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
 Variable (string) va2
     Attributes
-        ID            : 32
+        ID            : 31
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
 Variable (string) va3
     Attributes
-        ID            : 33
+        ID            : 32
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
 Variable (string) va4
     Attributes
-        ID            : 34
+        ID            : 33
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
-Number nPageDisp
-    Attributes
-        ID                                  : 5
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
 Text tTmp
     Attributes
         ID                                  : 2
@@ -109,7 +98,7 @@ Text tTmp
     
 Text tInstruction
     Attributes
-        ID                                  : 8
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -120,7 +109,7 @@ Text tInstruction
     
 Text tId
     Attributes
-        ID                                  : 9
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -131,7 +120,7 @@ Text tId
     
 Text tCode
     Attributes
-        ID                                  : 24
+        ID                                  : 23
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -142,13 +131,13 @@ Text tCode
     
 Text tIcon
     Attributes
-        ID                                  : 27
+        ID                                  : 26
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
     
 Picture p0
@@ -172,14 +161,7 @@ Button bNext
     
     Events
         Touch Press Event
-            nPage=nPage+1
+            tSend.txt="event,buttonPress2,cardAlarm,bNext"
-            nPageDisp.val=nPage
-            //page open event
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -205,14 +187,7 @@ Button bPrev
     
     Events
         Touch Press Event
-            nPage=nPage-1
+            tSend.txt="event,buttonPress2,cardAlarm,bPrev"
-            nPageDisp.val=nPage
-            //page open event
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -227,7 +202,7 @@ Button bPrev
         
 Button b0
     Attributes
-        ID                                  : 13
+        ID                                  : 12
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -242,7 +217,7 @@ Button b0
         
 Button b1
     Attributes
-        ID                                  : 14
+        ID                                  : 13
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -257,7 +232,7 @@ Button b1
         
 Button b2
     Attributes
-        ID                                  : 15
+        ID                                  : 14
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -272,7 +247,7 @@ Button b2
         
 Button b3
     Attributes
-        ID                                  : 16
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -287,7 +262,7 @@ Button b3
         
 Button b4
     Attributes
-        ID                                  : 17
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -302,7 +277,7 @@ Button b4
         
 Button b5
     Attributes
-        ID                                  : 18
+        ID                                  : 17
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -317,7 +292,7 @@ Button b5
         
 Button b6
     Attributes
-        ID                                  : 19
+        ID                                  : 18
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -332,7 +307,7 @@ Button b6
         
 Button b7
     Attributes
-        ID                                  : 20
+        ID                                  : 19
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -347,7 +322,7 @@ Button b7
         
 Button b8
     Attributes
-        ID                                  : 21
+        ID                                  : 20
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -362,7 +337,7 @@ Button b8
         
 Button b9
     Attributes
-        ID                                  : 22
+        ID                                  : 21
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -377,13 +352,13 @@ Button b9
         
 Button b10
     Attributes
-        ID                                  : 23
+        ID                                  : 22
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         State                               : unpressed
-        Text                                : CLEAR
+        Text                                : CLR
         Max. Text Size                      : 10
     
     Events
@@ -392,14 +367,14 @@ Button b10
         
 Button arm1
     Attributes
-        ID                                  : 25
+        ID                                  : 24
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         State                               : unpressed
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 40
     
     Events
         Touch Press Event
@@ -423,14 +398,14 @@ Button arm1
         
 Button arm3
     Attributes
-        ID                                  : 28
+        ID                                  : 27
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         State                               : unpressed
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 40
     
     Events
         Touch Press Event
@@ -454,14 +429,14 @@ Button arm3
         
 Button arm2
     Attributes
-        ID                                  : 29
+        ID                                  : 28
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         State                               : unpressed
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 40
     
     Events
         Touch Press Event
@@ -485,14 +460,14 @@ Button arm2
         
 Button arm4
     Attributes
-        ID                                  : 30
+        ID                                  : 29
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         State                               : unpressed
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 40
     
     Events
         Touch Press Event
@@ -516,7 +491,7 @@ Button arm4
         
 Timer tmSerial
     Attributes
-        ID         : 6
+        ID         : 5
         Scope      : local
         Period (ms): 50
         Enabled    : yes
@@ -716,7 +691,7 @@ Timer tmSerial
         
 Timer tmSleep
     Attributes
-        ID         : 11
+        ID         : 10
         Scope      : local
         Period (ms): 1000
         Enabled    : yes
@@ -734,9 +709,28 @@ Timer tmSleep
                 }
             }
         
+Timer tmFlash
+    Attributes
+        ID         : 34
+        Scope      : local
+        Period (ms): 600
+        Enabled    : no
+    
+    Events
+        Timer Event
+            if(tIcon.isbr==1)
+            {
+                tIcon.isbr=0
+                vis tIcon,0
+            }else
+            {
+                tIcon.isbr=1
+                vis tIcon,1
+            }
+        
 TouchCap tc0
     Attributes
-        ID   : 12
+        ID   : 11
         Scope: local
         Value: 0
     

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

@@ -346,6 +346,72 @@ Picture p0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
     
+Slider hSlider1
+    Attributes
+        ID                                  : 74
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Position                            : 50
+        Upper range limit                   : 100
+        Lower range limit                   : 0
+    
+Slider hSlider2
+    Attributes
+        ID                                  : 75
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Position                            : 50
+        Upper range limit                   : 100
+        Lower range limit                   : 0
+    
+Slider hSlider3
+    Attributes
+        ID                                  : 76
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Position                            : 50
+        Upper range limit                   : 100
+        Lower range limit                   : 0
+    
+Slider hSlider4
+    Attributes
+        ID                                  : 77
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Position                            : 50
+        Upper range limit                   : 100
+        Lower range limit                   : 0
+    
+Slider hSlider5
+    Attributes
+        ID                                  : 78
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Position                            : 50
+        Upper range limit                   : 100
+        Lower range limit                   : 0
+    
+Slider hSlider6
+    Attributes
+        ID                                  : 79
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Position                            : 50
+        Upper range limit                   : 100
+        Lower range limit                   : 0
+    
 Button bDown1
     Attributes
         ID                                  : 11
@@ -671,13 +737,7 @@ Button bPrev
     
     Events
         Touch Press Event
-            nPage=nPage-1
+            tSend.txt="event,buttonPress2,cardEntities,bPrev"
-            //page open event
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -703,13 +763,7 @@ Button bNext
     
     Events
         Touch Press Event
-            nPage=nPage+1
+            tSend.txt="event,buttonPress2,cardEntities,bNext"
-            //page open event
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1878,6 +1932,238 @@ Timer tmSerial
                                             covx tTmp.txt,sys0,0,0
                                             hSlider4.maxval=sys0
                                         }
+                                        // get Type
+                                        spstr strCommand.txt,type5.txt,",",27
+                                        // get internal name
+                                        spstr strCommand.txt,entn5.txt,",",28
+                                        if(type5.txt=="delete"||type5.txt=="")
+                                        {
+                                            vis bUp5,0
+                                            vis bStop5,0
+                                            vis bDown5,0
+                                            vis btOnOff5,0
+                                            vis tEntity5,0
+                                            vis tIcon5,0
+                                            vis bText5,0
+                                            vis hSlider5,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",29
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
+                                            vis tIcon5,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            covx tTmp.txt,sys0,0,0
+                                            tIcon5.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            vis tEntity5,1
+                                        }
+                                        if(type5.txt=="shutter")
+                                        {
+                                            vis bUp5,1
+                                            vis bStop5,1
+                                            vis bDown5,1
+                                            vis btOnOff5,0
+                                            vis bText5,0
+                                            vis hSlider5,0
+                                        }
+                                        if(type5.txt=="light")
+                                        {
+                                            vis bUp5,0
+                                            vis bStop5,0
+                                            vis bDown5,0
+                                            vis btOnOff5,1
+                                            vis bText5,0
+                                            vis hSlider5,0
+                                            // get Button State (optional Value)
+                                            spstr strCommand.txt,tTmp.txt,",",32
+                                            covx tTmp.txt,sys0,0,0
+                                            btOnOff5.val=sys0
+                                        }
+                                        if(type5.txt=="switch")
+                                        {
+                                            vis bUp5,0
+                                            vis bStop5,0
+                                            vis bDown5,0
+                                            vis btOnOff5,1
+                                            vis bText5,0
+                                            vis hSlider5,0
+                                            // get Button State (optional Value)
+                                            spstr strCommand.txt,tTmp.txt,",",32
+                                            covx tTmp.txt,sys0,0,0
+                                            btOnOff5.val=sys0
+                                        }
+                                        if(type5.txt=="text")
+                                        {
+                                            vis bUp5,0
+                                            vis bStop5,0
+                                            vis bDown5,0
+                                            vis btOnOff5,0
+                                            vis bText5,1
+                                            tsw bText5,0
+                                            vis hSlider5,0
+                                            bText5.pco=65535
+                                            bText5.pco2=65535
+                                            // get Text (optional Value)
+                                            spstr strCommand.txt,bText5.txt,",",32
+                                        }
+                                        if(type5.txt=="button")
+                                        {
+                                            vis bUp5,0
+                                            vis bStop5,0
+                                            vis bDown5,0
+                                            vis btOnOff5,0
+                                            vis bText5,1
+                                            tsw bText5,1
+                                            vis hSlider5,0
+                                            bText5.pco=1374
+                                            bText5.pco2=1374
+                                            // get Text (optional Value)
+                                            spstr strCommand.txt,bText5.txt,",",32
+                                        }
+                                        if(type5.txt=="number")
+                                        {
+                                            vis bUp5,0
+                                            vis bStop5,0
+                                            vis bDown5,0
+                                            vis btOnOff5,0
+                                            vis bText5,0
+                                            tsw bText5,0
+                                            vis hSlider5,1
+                                            // get config (optional Value) (use bText as variable)
+                                            spstr strCommand.txt,bText5.txt,",",32
+                                            //first value is current value
+                                            spstr bText5.txt,tTmp.txt,"|",1
+                                            covx tTmp.txt,sys0,0,0
+                                            hSlider5.val=sys0
+                                            //second value is min value
+                                            spstr bText5.txt,tTmp.txt,"|",2
+                                            covx tTmp.txt,sys0,0,0
+                                            hSlider5.minval=sys0
+                                            //third value is max value
+                                            spstr bText5.txt,tTmp.txt,"|",3
+                                            covx tTmp.txt,sys0,0,0
+                                            hSlider5.maxval=sys0
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type6.txt,",",33
+                                        // get internal name
+                                        spstr strCommand.txt,entn6.txt,",",34
+                                        if(type6.txt=="delete"||type6.txt=="")
+                                        {
+                                            vis bUp6,0
+                                            vis bStop6,0
+                                            vis bDown6,0
+                                            vis btOnOff6,0
+                                            vis tEntity6,0
+                                            vis tIcon6,0
+                                            vis bText6,0
+                                            vis hSlider6,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",35
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
+                                            vis tIcon6,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",36
+                                            covx tTmp.txt,sys0,0,0
+                                            tIcon6.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity6.txt,",",37
+                                            vis tEntity6,1
+                                        }
+                                        if(type6.txt=="shutter")
+                                        {
+                                            vis bUp6,1
+                                            vis bStop6,1
+                                            vis bDown6,1
+                                            vis btOnOff6,0
+                                            vis bText6,0
+                                            vis hSlider6,0
+                                        }
+                                        if(type6.txt=="light")
+                                        {
+                                            vis bUp6,0
+                                            vis bStop6,0
+                                            vis bDown6,0
+                                            vis btOnOff6,1
+                                            vis bText6,0
+                                            vis hSlider6,0
+                                            // get Button State (optional Value)
+                                            spstr strCommand.txt,tTmp.txt,",",38
+                                            covx tTmp.txt,sys0,0,0
+                                            btOnOff6.val=sys0
+                                        }
+                                        if(type6.txt=="switch")
+                                        {
+                                            vis bUp6,0
+                                            vis bStop6,0
+                                            vis bDown6,0
+                                            vis btOnOff6,1
+                                            vis bText6,0
+                                            vis hSlider6,0
+                                            // get Button State (optional Value)
+                                            spstr strCommand.txt,tTmp.txt,",",38
+                                            covx tTmp.txt,sys0,0,0
+                                            btOnOff6.val=sys0
+                                        }
+                                        if(type6.txt=="text")
+                                        {
+                                            vis bUp6,0
+                                            vis bStop6,0
+                                            vis bDown6,0
+                                            vis btOnOff6,0
+                                            vis bText6,1
+                                            tsw bText6,0
+                                            vis hSlider6,0
+                                            bText6.pco=65535
+                                            bText6.pco2=65535
+                                            // get Text (optional Value)
+                                            spstr strCommand.txt,bText6.txt,",",38
+                                        }
+                                        if(type6.txt=="button")
+                                        {
+                                            vis bUp6,0
+                                            vis bStop6,0
+                                            vis bDown6,0
+                                            vis btOnOff6,0
+                                            vis bText6,1
+                                            tsw bText6,1
+                                            vis hSlider6,0
+                                            bText6.pco=1374
+                                            bText6.pco2=1374
+                                            // get Text (optional Value)
+                                            spstr strCommand.txt,bText6.txt,",",38
+                                        }
+                                        if(type6.txt=="number")
+                                        {
+                                            vis bUp6,0
+                                            vis bStop6,0
+                                            vis bDown6,0
+                                            vis btOnOff6,0
+                                            vis bText6,0
+                                            tsw bText6,0
+                                            vis hSlider6,1
+                                            // get config (optional Value) (use bText as variable)
+                                            spstr strCommand.txt,bText6.txt,",",38
+                                            //first value is current value
+                                            spstr bText6.txt,tTmp.txt,"|",1
+                                            covx tTmp.txt,sys0,0,0
+                                            hSlider6.val=sys0
+                                            //second value is min value
+                                            spstr bText6.txt,tTmp.txt,"|",2
+                                            covx tTmp.txt,sys0,0,0
+                                            hSlider6.minval=sys0
+                                            //third value is max value
+                                            spstr bText6.txt,tTmp.txt,"|",3
+                                            covx tTmp.txt,sys0,0,0
+                                            hSlider6.maxval=sys0
+                                        }
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {

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

@@ -269,13 +269,7 @@ Button bPrev
     
     Events
         Touch Press Event
-            nPage=nPage-1
+            tSend.txt="event,buttonPress2,cardGrid,bPrev"
-            //page open event
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -301,13 +295,7 @@ Button bNext
     
     Events
         Touch Press Event
-            nPage=nPage+1
+            tSend.txt="event,buttonPress2,cardGrid,bNext"
-            //page open event
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC

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

@@ -16,34 +16,37 @@ Page cardMedia
             vis p0,0
             vis tSend,0
             vis tInstruction,0
-            vis nPageDisp,0
             vis tTmp,0
             vis tId,0
+            vis t5,0
             //vis nPageDisp,0
         
 Variable (string) strCommand
     Attributes
-        ID            : 8
+        ID            : 7
         Scope         : local
         Text          : 
-        Max. Text Size: 200
+        Max. Text Size: 500
     
 Variable (string) entn
     Attributes
-        ID            : 19
+        ID            : 17
         Scope         : local
         Text          : 
         Max. Text Size: 50
     
-Number nPageDisp
+Variable (string) vaSpeakerList
     Attributes
-        ID                                  : 6
+        ID            : 26
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 200
-        Send Component ID                   : disabled
+    
-        Associated Keyboard                 : none
+Variable (int32) vaSpeakerPos
-        Value                               : 0
+    Attributes
+        ID   : 27
+        Scope: local
+        Value: 0
     
 Text tSend
     Attributes
@@ -53,8 +56,8 @@ Text tSend
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : newtxt
+        Text                                : 
-        Max. Text Size                      : 100
+        Max. Text Size                      : 200
     
 Text tTmp
     Attributes
@@ -69,7 +72,7 @@ Text tTmp
     
 Text tInstruction
     Attributes
-        ID                                  : 9
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -80,7 +83,7 @@ Text tInstruction
     
 Text tId
     Attributes
-        ID                                  : 10
+        ID                                  : 9
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -91,7 +94,7 @@ Text tId
     
 Text tHeading
     Attributes
-        ID                                  : 11
+        ID                                  : 10
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -102,7 +105,7 @@ Text tHeading
     
 Text tTitle
     Attributes
-        ID                                  : 12
+        ID                                  : 11
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -113,7 +116,7 @@ Text tTitle
     
 Text tAuthor
     Attributes
-        ID                                  : 13
+        ID                                  : 12
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -124,7 +127,7 @@ Text tAuthor
     
 Text t2
     Attributes
-        ID                                  : 14
+        ID                                  : 13
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -154,7 +157,7 @@ Text t2
         
 Text tPlayPause
     Attributes
-        ID                                  : 15
+        ID                                  : 14
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -184,7 +187,7 @@ Text tPlayPause
         
 Text t0
     Attributes
-        ID                                  : 16
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -214,7 +217,7 @@ Text t0
         
 Text tIcon
     Attributes
-        ID                                  : 18
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -223,6 +226,162 @@ Text tIcon
         Text                                : 
         Max. Text Size                      : 10
     
+Text t1
+    Attributes
+        ID                                  : 21
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+    Events
+        Touch Press Event
+            hVolume.val=hVolume.val-5
+            // event,buttonPress2,internalNameEntity,volumeSlider,50
+            //craft command
+            tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
+            covx hVolume.val,tTmp.txt,0,0
+            tSend.txt+=tTmp.txt
+            //send calc crc
+            btlen tSend.txt,sys0
+            crcrest 1,0xffff // reset CRC
+            crcputh 55 bb
+            crcputs sys0,1
+            crcputs tSend.txt,0
+            //send cmd
+            printh 55 bb
+            prints sys0,2
+            prints tSend.txt,0
+            prints crcval,2
+        
+Text t3
+    Attributes
+        ID                                  : 22
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+    Events
+        Touch Press Event
+            hVolume.val=hVolume.val+5
+            // event,buttonPress2,internalNameEntity,volumeSlider,50
+            //craft command
+            tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
+            covx hVolume.val,tTmp.txt,0,0
+            tSend.txt+=tTmp.txt
+            //send calc crc
+            btlen tSend.txt,sys0
+            crcrest 1,0xffff // reset CRC
+            crcputh 55 bb
+            crcputs sys0,1
+            crcputs tSend.txt,0
+            //send cmd
+            printh 55 bb
+            prints sys0,2
+            prints tSend.txt,0
+            prints crcval,2
+        
+Text t4
+    Attributes
+        ID                                  : 23
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tSpeaker
+    Attributes
+        ID                                  : 24
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 50
+    
+    Events
+        Touch Press Event
+            // event,buttonPress2,entn,media-next
+            //craft command
+            tSend.txt="event,buttonPress2,"
+            tSend.txt+=entn.txt+","
+            tSend.txt+="speaker-sel,"+tSpeaker.txt
+            //send calc crc
+            btlen tSend.txt,sys0
+            crcrest 1,0xffff // reset CRC
+            crcputh 55 bb
+            crcputs sys0,1
+            crcputs tSend.txt,0
+            //send cmd
+            printh 55 bb
+            prints sys0,2
+            prints tSend.txt,0
+            prints crcval,2
+        
+Text t6
+    Attributes
+        ID                                  : 25
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+    Events
+        Touch Press Event
+            //speaker
+            tSpeaker.pco=65535
+            spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val
+            vaSpeakerPos.val+=1
+            if(tSpeaker.txt=="")
+            {
+                vaSpeakerPos.val=0
+                spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val
+            }
+        
+Text t5
+    Attributes
+        ID                                  : 28
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+    Events
+        Touch Press Event
+            // event,buttonPress2,entn,media-next
+            //craft command
+            tSend.txt="event,buttonPress2,"
+            tSend.txt+=entn.txt+","
+            tSend.txt+="media-OnOff"
+            //send calc crc
+            btlen tSend.txt,sys0
+            crcrest 1,0xffff // reset CRC
+            crcputh 55 bb
+            crcputs sys0,1
+            crcputs tSend.txt,0
+            //send cmd
+            printh 55 bb
+            prints sys0,2
+            prints tSend.txt,0
+            prints crcval,2
+        
 Picture p0
     Attributes
         ID                                  : 1
@@ -233,7 +392,7 @@ Picture p0
     
 Slider hVolume
     Attributes
-        ID                                  : 17
+        ID                                  : 29
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -244,6 +403,8 @@ Slider hVolume
     
     Events
         Touch Release Event
+            tmCooldown.en=1
+            tmCooldown.tim=800
             // event,buttonPress2,internalNameEntity,volumeSlider,50
             //craft command
             tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
@@ -274,14 +435,7 @@ Button bNext
     
     Events
         Touch Press Event
-            nPage=nPage+1
+            tSend.txt="event,buttonPress2,cardMedia,bNext"
-            nPageDisp.val=nPage
-            //page open event
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -307,14 +461,7 @@ Button bPrev
     
     Events
         Touch Press Event
-            nPage=nPage-1
+            tSend.txt="event,buttonPress2,cardMedia,bPrev"
-            nPageDisp.val=nPage
-            //page open event
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -329,7 +476,7 @@ Button bPrev
         
 Timer tmSerial
     Attributes
-        ID         : 7
+        ID         : 6
         Scope      : local
         Period (ms): 50
         Enabled    : yes
@@ -401,6 +548,32 @@ Timer tmSerial
                                         spstr strCommand.txt,tTmp.txt,"|",7
                                         covx tTmp.txt,sys0,0,0
                                         substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
+                                        //speaker current
+                                        spstr strCommand.txt,tSpeaker.txt,"|",8
+                                        if(tSpeaker.txt!="")
+                                        {
+                                            tSpeaker.pco=1374
+                                        }else
+                                        {
+                                            tSpeaker.pco=65535
+                                        }
+                                        //speaker list
+                                        spstr strCommand.txt,vaSpeakerList.txt,"|",9
+                                        if(vaSpeakerList.txt=="")
+                                        {
+                                            vis t6,0
+                                        }
+                                        vaSpeakerPos.val=0
+                                        // on off button
+                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        if(tTmp.txt=="disable")
+                                        {
+                                            vis t5,0
+                                        }else
+                                        {
+                                            vis t5,1
+                                            covx tTmp.txt,t5.pco,0,0
+                                        }
                                     }
                                     if(tInstruction.txt=="time")
                                     {
@@ -490,7 +663,7 @@ Timer tmSerial
         
 Timer tmSleep
     Attributes
-        ID         : 20
+        ID         : 18
         Scope      : local
         Period (ms): 1000
         Enabled    : yes
@@ -508,9 +681,20 @@ Timer tmSleep
                 }
             }
         
+Timer tmCooldown
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : no
+    
+    Events
+        Timer Event
+            tmCooldown.en=0
+        
 TouchCap tc0
     Attributes
-        ID   : 21
+        ID   : 19
         Scope: local
         Value: 0
     

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

@@ -269,14 +269,7 @@ Button bNext
     
     Events
         Touch Press Event
-            nPage=nPage+1
+            tSend.txt="event,buttonPress2,cardThermo,bNext"
-            nPageDisp.val=nPage
-            //page open event
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -376,14 +369,7 @@ Button bPrev
     
     Events
         Touch Press Event
-            nPage=nPage-1
+            tSend.txt="event,buttonPress2,cardThermo,bPrev"
-            nPageDisp.val=nPage
-            //page open event
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC

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

@@ -2,10 +2,6 @@ Program.s
 	0    Component(s)
 	9    Line(s) of event code
 	9    Unique line(s) of event code
-popupNotify
-	17   Component(s)
-	180  Line(s) of event code
-	119  Unique line(s) of event code
 pageIcons
 	6    Component(s)
 	0    Line(s) of event code
@@ -14,49 +10,53 @@ pageSerialTest
 	13   Component(s)
 	48   Line(s) of event code
 	43   Unique line(s) of event code
+popupLight
+	26   Component(s)
+	306  Line(s) of event code
+	167  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	146  Line(s) of event code
 	111  Unique line(s) of event code
-popupShutter
+popupNotify
-	19   Component(s)
+	17   Component(s)
-	180  Line(s) of event code
+	179  Line(s) of event code
-	103  Unique line(s) of event code
+	118  Unique line(s) of event code
 pageTest
 	13   Component(s)
 	13   Line(s) of event code
 	13   Unique line(s) of event code
-cardMedia
-	22   Component(s)
-	200  Line(s) of event code
-	115  Unique line(s) of event code
-cardThermo
-	42   Component(s)
-	412  Line(s) of event code
-	221  Unique line(s) of event code
-screensaver
-	25   Component(s)
-	173  Line(s) of event code
-	124  Unique line(s) of event code
 cardAlarm
 	35   Component(s)
-	274  Line(s) of event code
+	276  Line(s) of event code
-	170  Unique line(s) of event code
+	172  Unique line(s) of event code
-popupLight
+popupShutter
-	26   Component(s)
+	19   Component(s)
-	307  Line(s) of event code
+	179  Line(s) of event code
-	168  Unique line(s) of event code
+	102  Unique line(s) of event code
+cardThermo
+	42   Component(s)
+	406  Line(s) of event code
+	218  Unique line(s) of event code
+screensaver
+	31   Component(s)
+	183  Line(s) of event code
+	133  Unique line(s) of event code
 cardGrid
 	39   Component(s)
-	392  Line(s) of event code
+	388  Line(s) of event code
-	226  Unique line(s) of event code
+	224  Unique line(s) of event code
 cardEntities
-	74   Component(s)
+	80   Component(s)
-	970  Line(s) of event code
+	1172 Line(s) of event code
-	380  Unique line(s) of event code
+	468  Unique line(s) of event code
+cardMedia
+	30   Component(s)
+	278  Line(s) of event code
+	139  Unique line(s) of event code
 
 Total
 	13   Page(s)
-	350  Component(s)
+	370  Component(s)
-	3304 Line(s) of event code
+	3583 Line(s) of event code
-	838  Unique line(s) of event code
+	959  Unique line(s) of event code

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

@@ -310,12 +310,7 @@ Button b0
     
     Events
         Touch Press Event
-            //page open event
+            tSend.txt="event,buttonPress2,popupLight,bExit"
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC

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

@@ -127,12 +127,7 @@ Button b0
     Events
         Touch Press Event
             sleepTimeout=vaOldSleepT.val
-            //page open event
+            tSend.txt="event,buttonPress2,popupNotify,bExit"
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC

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

@@ -180,12 +180,7 @@ Button b0
     
     Events
         Touch Press Event
-            //page open event
+            tSend.txt="event,buttonPress2,popupShutter,bExit"
-            // event,pageOpen,cardEntities,pageNumber
-            // craft command
-            // convert pageNumber and write to tTmp
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC

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

@@ -20,12 +20,26 @@ Page screensaver
             vis tTmp,0
             vis p0,0
             //load gloabl time string from pageIcons
-            tTime.txt=vaTime.txt
+            //tTime.txt=vaTime.txt
+            spstr vaTime.txt,tTime.txt,"?",0
+            spstr vaTime.txt,tAMPM.txt,"?",1
+            if(tAMPM.txt=="")
+            {
+                vis tAMPM,0
+            }
             tDate.txt=vaDate.txt
             dim=dimValue
             vis tSend,0
             //page open event
-            // craft command
+            // clear weather elements, to keep example content in HMI
+            tMainIcon.txt=""
+            tMainText.txt=""
+            tForecast1.txt=""
+            tF1Icon.txt=""
+            tForecast1Val.txt=""
+            tForecast2.txt=""
+            tF2Icon.txt=""
+            tForecast2Val.txt=""
             tSend.txt="event,screensaverOpen"
             //send calc crc
             btlen tSend.txt,sys0
@@ -38,31 +52,20 @@ Page screensaver
             prints sys0,2
             prints tSend.txt,0
             prints crcval,2
-            // clear weather elements, to keep example content in HMI
-            tMainIcon.txt=""
-            tMainText.txt=""
-            tMRIcon.txt=""
-            tMR.txt=""
-            tForecast1.txt=""
-            tF1Icon.txt=""
-            tForecast1Val.txt=""
-            tForecast2.txt=""
-            tF2Icon.txt=""
-            tForecast2Val.txt=""
         
 Variable (string) strCommand
     Attributes
         ID            : 5
         Scope         : local
         Text          : 
-        Max. Text Size: 100
+        Max. Text Size: 200
     
 Variable (string) vaTime
     Attributes
         ID            : 10
         Scope         : global
         Text          : 
-        Max. Text Size: 10
+        Max. Text Size: 15
     
 Variable (string) vaDate
     Attributes
@@ -73,11 +76,17 @@ Variable (string) vaDate
     
 Variable (string) tId
     Attributes
-        ID            : 24
+        ID            : 22
         Scope         : local
         Text          : 
         Max. Text Size: 25
     
+Variable (int32) vaTap
+    Attributes
+        ID   : 30
+        Scope: local
+        Value: 0
+    
 Number originPage
     Attributes
         ID                                  : 3
@@ -97,7 +106,7 @@ Text tInstruction
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 20
+        Max. Text Size                      : 50
     
 Text tTmp
     Attributes
@@ -108,7 +117,7 @@ Text tTmp
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 20
+        Max. Text Size                      : 50
     
 Text tTime
     Attributes
@@ -119,7 +128,7 @@ Text tTime
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 21:32   
-        Max. Text Size                      : 10
+        Max. Text Size                      : 15
     
 Text tDate
     Attributes
@@ -141,7 +150,7 @@ Text tSend
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 25
+        Max. Text Size                      : 50
     
 Text tMainIcon
     Attributes
@@ -165,31 +174,9 @@ Text tMainText
         Text                                : 2,3 °C
         Max. Text Size                      : 10
     
-Text tMRIcon
-    Attributes
-        ID                                  : 15
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 10
-    
-Text tMR
-    Attributes
-        ID                                  : 16
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 0 mm
-        Max. Text Size                      : 10
-    
 Text tForecast1
     Attributes
-        ID                                  : 17
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -200,7 +187,7 @@ Text tForecast1
     
 Text tForecast1Val
     Attributes
-        ID                                  : 18
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -211,7 +198,7 @@ Text tForecast1Val
     
 Text tF1Icon
     Attributes
-        ID                                  : 19
+        ID                                  : 17
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -222,7 +209,7 @@ Text tF1Icon
     
 Text tForecast2
     Attributes
-        ID                                  : 20
+        ID                                  : 18
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -233,7 +220,7 @@ Text tForecast2
     
 Text tF2Icon
     Attributes
-        ID                                  : 21
+        ID                                  : 19
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -244,7 +231,7 @@ Text tF2Icon
     
 Text tForecast2Val
     Attributes
-        ID                                  : 22
+        ID                                  : 20
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -255,7 +242,7 @@ Text tForecast2Val
     
 Text t10
     Attributes
-        ID                                  : 23
+        ID                                  : 21
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -264,6 +251,83 @@ Text t10
         Text                                : |
         Max. Text Size                      : 10
     
+Text tAMPM
+    Attributes
+        ID                                  : 23
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : PM
+        Max. Text Size                      : 10
+    
+Text tForecast3Val
+    Attributes
+        ID                                  : 24
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tF3Icon
+    Attributes
+        ID                                  : 25
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tForecast3
+    Attributes
+        ID                                  : 26
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tForecast4
+    Attributes
+        ID                                  : 27
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tF4Icon
+    Attributes
+        ID                                  : 28
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tForecast4Val
+    Attributes
+        ID                                  : 29
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
 Picture p0
     Attributes
         ID                                  : 1
@@ -340,7 +404,12 @@ Timer tmSerial
                                     {
                                         //get set time to global variable
                                         spstr strCommand.txt,vaTime.txt,",",1
-                                        tTime.txt=vaTime.txt
+                                        spstr vaTime.txt,tTime.txt,"?",0
+                                        spstr vaTime.txt,tAMPM.txt,"?",1
+                                        if(tAMPM.txt=="")
+                                        {
+                                            vis tAMPM,0
+                                        }
                                     }
                                     if(tInstruction.txt=="date")
                                     {
@@ -362,36 +431,38 @@ Timer tmSerial
                                         substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                         //tMainText
                                         spstr strCommand.txt,tMainText.txt,"?",2
-                                        //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"?",3
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
-                                        //tMR
-                                        spstr strCommand.txt,tMR.txt,"?",4
                                         //tForecast1
-                                        spstr strCommand.txt,tForecast1.txt,"?",5
+                                        spstr strCommand.txt,tForecast1.txt,"?",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",6
+                                        spstr strCommand.txt,tTmp.txt,"?",4
                                         covx tTmp.txt,sys0,0,0
                                         substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                         //tForecast1Val
-                                        spstr strCommand.txt,tForecast1Val.txt,"?",7
+                                        spstr strCommand.txt,tForecast1Val.txt,"?",5
                                         //tForecast2
-                                        spstr strCommand.txt,tForecast2.txt,"?",8
+                                        spstr strCommand.txt,tForecast2.txt,"?",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",9
+                                        spstr strCommand.txt,tTmp.txt,"?",7
                                         covx tTmp.txt,sys0,0,0
                                         substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                         //tForecast2Val
-                                        spstr strCommand.txt,tForecast2Val.txt,"?",10
+                                        spstr strCommand.txt,tForecast2Val.txt,"?",8
-                                    }
+                                        //tForecast3
-                                    if(tInstruction.txt=="page")
+                                        spstr strCommand.txt,tForecast3.txt,"?",9
-                                    {
+                                        //tF3Icon
-                                        //pagenumber
+                                        spstr strCommand.txt,tTmp.txt,"?",10
-                                        spstr strCommand.txt,tTmp.txt,",",1
                                         covx tTmp.txt,sys0,0,0
-                                        nPage=sys0
+                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
-                                        //don't send current page number, wake will do
+                                        //tForecast3Val
+                                        spstr strCommand.txt,tForecast3Val.txt,"?",11
+                                        //tForecast4
+                                        spstr strCommand.txt,tForecast4.txt,"?",12
+                                        //tF4Icon
+                                        spstr strCommand.txt,tTmp.txt,"?",13
+                                        covx tTmp.txt,sys0,0,0
+                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
+                                        //tForecast4Val
+                                        spstr strCommand.txt,tForecast4Val.txt,"?",14
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
@@ -464,12 +535,10 @@ TouchCap tc0
     
     Events
         Touch Press Event
-            //page open event
+            dim=100
-            // event,pageOpen,cardEntities,pageNumber
+            vaTap.val+=1
-            // craft command
+            covx vaTap.val,tTmp.txt,0,0
-            // convert pageNumber and write to tTmp
+            tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
-            covx nPage,tTmp.txt,0,0
-            tSend.txt="event,pageOpen,"+tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC

HMI/n2t-out-visual/cardAlarm.txt

@@ -23,7 +23,6 @@ Page cardAlarm
             vis p0,0
             vis tSend,0
             vis tInstruction,0
-            vis nPageDisp,0
             vis tTmp,0
             vis tId,0
             //vis nPageDisp,0
@@ -46,83 +45,53 @@ Page cardAlarm
         
 Variable (string) strCommand
     Attributes
-        ID            : 7
+        ID            : 6
         Scope         : local
         Text          : 
         Max. Text Size: 200
     
 Variable (string) entn
     Attributes
-        ID            : 10
+        ID            : 9
         Scope         : local
         Text          : 
         Max. Text Size: 50
     
 Variable (string) tSend
     Attributes
-        ID            : 26
+        ID            : 25
         Scope         : local
         Text          : 
         Max. Text Size: 100
     
 Variable (string) va1
     Attributes
-        ID            : 31
+        ID            : 30
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
 Variable (string) va2
     Attributes
-        ID            : 32
+        ID            : 31
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
 Variable (string) va3
     Attributes
-        ID            : 33
+        ID            : 32
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
 Variable (string) va4
     Attributes
-        ID            : 34
+        ID            : 33
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
-Number nPageDisp
-    Attributes
-        ID                                  : 5
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 426
-        y coordinate                        : 0
-        Width                               : 42
-        Height                              : 24
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 0
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Value                               : 0
-        Significant digits shown            : all
-        Format                              : decimal
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
 Text tTmp
     Attributes
         ID                                  : 2
@@ -155,7 +124,7 @@ Text tTmp
     
 Text tInstruction
     Attributes
-        ID                                  : 8
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -185,7 +154,7 @@ Text tInstruction
     
 Text tId
     Attributes
-        ID                                  : 9
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -215,7 +184,7 @@ Text tId
     
 Text tCode
     Attributes
-        ID                                  : 24
+        ID                                  : 23
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -245,7 +214,7 @@ Text tCode
     
 Text tIcon
     Attributes
-        ID                                  : 27
+        ID                                  : 26
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -386,7 +355,7 @@ Button bPrev
         
 Button b0
     Attributes
-        ID                                  : 13
+        ID                                  : 12
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -424,7 +393,7 @@ Button b0
         
 Button b1
     Attributes
-        ID                                  : 14
+        ID                                  : 13
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -462,7 +431,7 @@ Button b1
         
 Button b2
     Attributes
-        ID                                  : 15
+        ID                                  : 14
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -500,7 +469,7 @@ Button b2
         
 Button b3
     Attributes
-        ID                                  : 16
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -538,7 +507,7 @@ Button b3
         
 Button b4
     Attributes
-        ID                                  : 17
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -576,7 +545,7 @@ Button b4
         
 Button b5
     Attributes
-        ID                                  : 18
+        ID                                  : 17
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -614,7 +583,7 @@ Button b5
         
 Button b6
     Attributes
-        ID                                  : 19
+        ID                                  : 18
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -652,7 +621,7 @@ Button b6
         
 Button b7
     Attributes
-        ID                                  : 20
+        ID                                  : 19
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -690,7 +659,7 @@ Button b7
         
 Button b8
     Attributes
-        ID                                  : 21
+        ID                                  : 20
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -728,7 +697,7 @@ Button b8
         
 Button b9
     Attributes
-        ID                                  : 22
+        ID                                  : 21
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -766,7 +735,7 @@ Button b9
         
 Button b10
     Attributes
-        ID                                  : 23
+        ID                                  : 22
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -804,7 +773,7 @@ Button b10
         
 Button arm1
     Attributes
-        ID                                  : 25
+        ID                                  : 24
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -858,7 +827,7 @@ Button arm1
         
 Button arm3
     Attributes
-        ID                                  : 28
+        ID                                  : 27
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -912,7 +881,7 @@ Button arm3
         
 Button arm2
     Attributes
-        ID                                  : 29
+        ID                                  : 28
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -966,7 +935,7 @@ Button arm2
         
 Button arm4
     Attributes
-        ID                                  : 30
+        ID                                  : 29
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -1020,7 +989,7 @@ Button arm4
         
 Timer tmSerial
     Attributes
-        ID         : 6
+        ID         : 5
         Scope      : local
         Period (ms): 50
         Enabled    : yes
@@ -1220,7 +1189,7 @@ Timer tmSerial
         
 Timer tmSleep
     Attributes
-        ID         : 11
+        ID         : 10
         Scope      : local
         Period (ms): 1000
         Enabled    : yes
@@ -1240,7 +1209,7 @@ Timer tmSleep
         
 Timer tmFlash
     Attributes
-        ID         : 35
+        ID         : 34
         Scope      : local
         Period (ms): 600
         Enabled    : no
@@ -1259,7 +1228,7 @@ Timer tmFlash
         
 TouchCap tc0
     Attributes
-        ID   : 12
+        ID   : 11
         Scope: local
         Value: 0
     

HMI/n2t-out-visual/nspanel_Stats.txt

@@ -38,6 +38,10 @@ cardThermo
 	42   Component(s)
 	406  Line(s) of event code
 	218  Unique line(s) of event code
+cardAlarm
+	35   Component(s)
+	276  Line(s) of event code
+	172  Unique line(s) of event code
 popupLight
 	27   Component(s)
 	323  Line(s) of event code
@@ -46,10 +50,6 @@ screensaver
 	31   Component(s)
 	183  Line(s) of event code
 	133  Unique line(s) of event code
-cardAlarm
-	36   Component(s)
-	277  Line(s) of event code
-	173  Unique line(s) of event code
 cardEntities
 	58   Component(s)
 	849  Line(s) of event code
@@ -57,6 +57,6 @@ cardEntities
 
 Total
 	13   Page(s)
-	350  Component(s)
+	349  Component(s)
-	3283 Line(s) of event code
+	3282 Line(s) of event code
 	885  Unique line(s) of event code

HMI/n2t-out/cardAlarm.txt

@@ -16,7 +16,6 @@ Page cardAlarm
             vis p0,0
             vis tSend,0
             vis tInstruction,0
-            vis nPageDisp,0
             vis tTmp,0
             vis tId,0
             //vis nPageDisp,0
@@ -39,63 +38,53 @@ Page cardAlarm
         
 Variable (string) strCommand
     Attributes
-        ID            : 7
+        ID            : 6
         Scope         : local
         Text          : 
         Max. Text Size: 200
     
 Variable (string) entn
     Attributes
-        ID            : 10
+        ID            : 9
         Scope         : local
         Text          : 
         Max. Text Size: 50
     
 Variable (string) tSend
     Attributes
-        ID            : 26
+        ID            : 25
         Scope         : local
         Text          : 
         Max. Text Size: 100
     
 Variable (string) va1
     Attributes
-        ID            : 31
+        ID            : 30
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
 Variable (string) va2
     Attributes
-        ID            : 32
+        ID            : 31
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
 Variable (string) va3
     Attributes
-        ID            : 33
+        ID            : 32
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
 Variable (string) va4
     Attributes
-        ID            : 34
+        ID            : 33
         Scope         : local
         Text          : 
         Max. Text Size: 20
     
-Number nPageDisp
-    Attributes
-        ID                                  : 5
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
 Text tTmp
     Attributes
         ID                                  : 2
@@ -109,7 +98,7 @@ Text tTmp
     
 Text tInstruction
     Attributes
-        ID                                  : 8
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -120,7 +109,7 @@ Text tInstruction
     
 Text tId
     Attributes
-        ID                                  : 9
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -131,7 +120,7 @@ Text tId
     
 Text tCode
     Attributes
-        ID                                  : 24
+        ID                                  : 23
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -142,7 +131,7 @@ Text tCode
     
 Text tIcon
     Attributes
-        ID                                  : 27
+        ID                                  : 26
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -213,7 +202,7 @@ Button bPrev
         
 Button b0
     Attributes
-        ID                                  : 13
+        ID                                  : 12
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -228,7 +217,7 @@ Button b0
         
 Button b1
     Attributes
-        ID                                  : 14
+        ID                                  : 13
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -243,7 +232,7 @@ Button b1
         
 Button b2
     Attributes
-        ID                                  : 15
+        ID                                  : 14
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -258,7 +247,7 @@ Button b2
         
 Button b3
     Attributes
-        ID                                  : 16
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -273,7 +262,7 @@ Button b3
         
 Button b4
     Attributes
-        ID                                  : 17
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -288,7 +277,7 @@ Button b4
         
 Button b5
     Attributes
-        ID                                  : 18
+        ID                                  : 17
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -303,7 +292,7 @@ Button b5
         
 Button b6
     Attributes
-        ID                                  : 19
+        ID                                  : 18
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -318,7 +307,7 @@ Button b6
         
 Button b7
     Attributes
-        ID                                  : 20
+        ID                                  : 19
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -333,7 +322,7 @@ Button b7
         
 Button b8
     Attributes
-        ID                                  : 21
+        ID                                  : 20
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -348,7 +337,7 @@ Button b8
         
 Button b9
     Attributes
-        ID                                  : 22
+        ID                                  : 21
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -363,7 +352,7 @@ Button b9
         
 Button b10
     Attributes
-        ID                                  : 23
+        ID                                  : 22
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -378,7 +367,7 @@ Button b10
         
 Button arm1
     Attributes
-        ID                                  : 25
+        ID                                  : 24
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -409,7 +398,7 @@ Button arm1
         
 Button arm3
     Attributes
-        ID                                  : 28
+        ID                                  : 27
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -440,7 +429,7 @@ Button arm3
         
 Button arm2
     Attributes
-        ID                                  : 29
+        ID                                  : 28
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -471,7 +460,7 @@ Button arm2
         
 Button arm4
     Attributes
-        ID                                  : 30
+        ID                                  : 29
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -502,7 +491,7 @@ Button arm4
         
 Timer tmSerial
     Attributes
-        ID         : 6
+        ID         : 5
         Scope      : local
         Period (ms): 50
         Enabled    : yes
@@ -702,7 +691,7 @@ Timer tmSerial
         
 Timer tmSleep
     Attributes
-        ID         : 11
+        ID         : 10
         Scope      : local
         Period (ms): 1000
         Enabled    : yes
@@ -722,7 +711,7 @@ Timer tmSleep
         
 Timer tmFlash
     Attributes
-        ID         : 35
+        ID         : 34
         Scope      : local
         Period (ms): 600
         Enabled    : no
@@ -741,7 +730,7 @@ Timer tmFlash
         
 TouchCap tc0
     Attributes
-        ID   : 12
+        ID   : 11
         Scope: local
         Value: 0
     

HMI/n2t-out/nspanel_Stats.txt

@@ -38,6 +38,10 @@ cardThermo
 	42   Component(s)
 	406  Line(s) of event code
 	218  Unique line(s) of event code
+cardAlarm
+	35   Component(s)
+	276  Line(s) of event code
+	172  Unique line(s) of event code
 popupLight
 	27   Component(s)
 	323  Line(s) of event code
@@ -46,10 +50,6 @@ screensaver
 	31   Component(s)
 	183  Line(s) of event code
 	133  Unique line(s) of event code
-cardAlarm
-	36   Component(s)
-	277  Line(s) of event code
-	173  Unique line(s) of event code
 cardEntities
 	58   Component(s)
 	849  Line(s) of event code
@@ -57,6 +57,6 @@ cardEntities
 
 Total
 	13   Page(s)
-	350  Component(s)
+	349  Component(s)
-	3283 Line(s) of event code
+	3282 Line(s) of event code
 	885  Unique line(s) of event code