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

* added utf8 fonts with multi lang charset

* removed icon substring stuff

* synced US-L version

.github/workflows/nextion2text.yml

@@ -52,17 +52,17 @@ jobs:
       continue-on-error: true
       run: |
         echo "YXR0cmlidXRlcyA9IHsKICAgICJpZCI6IHsKICAgICAgICAiaWdub3JlIjogVHJ1ZSwKICAgICAgICAibmFtZSI6ICJJRCIsCiAgICAgICAgInN0cnVjdCI6ICJpIiwKICAgIH0KfQ==" | base64 -d > ignore-id.py
-        python Nextion2Text.py -c ignore-id.py -d -i HMI/nspanel.HMI -o HMI/n2t-out
+        python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/nspanel.HMI -o HMI/n2t-out
         
         echo portrait
-        python Nextion2Text.py -c ignore-id.py -d -i HMI/US/portrait/nspanel_US_P.HMI -o HMI/US/portrait/n2t-out
+        python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/portrait/nspanel_US_P.HMI -o HMI/US/portrait/n2t-out
         diff -bur HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt
   
     - name: Run n2t US L DIFF
       continue-on-error: true
       run: |      
         echo landscape
-        python Nextion2Text.py -c ignore-id.py -d -i HMI/US/landscape/nspanel_US_L.HMI -o HMI/US/landscape/n2t-out
+        python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/landscape/nspanel_US_L.HMI -o HMI/US/landscape/n2t-out
         diff -bur HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt
         
     - name: Display txt files 

HMI/README.md

@@ -132,83 +132,83 @@ The following message can be used to update the content on the cardEntities Page
 
 ## Messages from Nextion Display
 
-`event~buttonPress2~pageName~bNext`
+`event,buttonPress2,pageName,bNext`
 
-`event~buttonPress2~pageName~bPrev`
+`event,buttonPress2,pageName,bPrev`
 
-`event~buttonPress2~pageName~bExit~number_of_taps`
+`event,buttonPress2,pageName,bExit,number_of_taps`
 
-`event~buttonPress2~pageName~sleepReached`
+`event,buttonPress2,pageName,sleepReached`
 
 
 ### startup page
 
-`event~startup~version~model`
+`event,startup,version,model`
 
 ### screensaver page
 
-`event~buttonPress2~screensaver~exit` - Touch Event on Screensaver
+`event,buttonPress2,screensaver,exit` - Touch Event on Screensaver
 
-`event~screensaverOpen` - Screensaver has opened
+`event,screensaverOpen` - Screensaver has opened
 
 
 ### cardEntities Page
 
-`event~*eventName*~*entityName*~*actionName*~*optionalValue*`
+`event,*eventName*,*entityName*,*actionName*,*optionalValue*`
 
-`event~buttonPress2~internalNameEntity~up`
+`event,buttonPress2,internalNameEntity,up`
 
-`event~buttonPress2~internalNameEntity~down`
+`event,buttonPress2,internalNameEntity,down`
 
-`event~buttonPress2~internalNameEntity~stop`
+`event,buttonPress2,internalNameEntity,stop`
 
-`event~buttonPress2~internalNameEntity~OnOff~1`
+`event,buttonPress2,internalNameEntity,OnOff,1`
 
-`event~buttonPress2~internalNameEntity~button`
+`event,buttonPress2,internalNameEntity,button`
 
 ### popupLight Page
 
-`event~pageOpenDetail~popupLight~internalNameEntity`
+`event,pageOpenDetail,popupLight,internalNameEntity`
 
-`event~buttonPress2~internalNameEntity~OnOff~1`
+`event,buttonPress2,internalNameEntity,OnOff,1`
 
-`event~buttonPress2~internalNameEntity~brightnessSlider~50`
+`event,buttonPress2,internalNameEntity,brightnessSlider,50`
 
-`event~buttonPress2~internalNameEntity~colorTempSlider~50`
+`event,buttonPress2,internalNameEntity,colorTempSlider,50`
 
-`event~buttonPress2~internalNameEntity~colorWheel~x|y`
+`event,buttonPress2,internalNameEntity,colorWheel,x|y`
 
 ### popupShutter Page
 
-`event~pageOpenDetail~popupShutter~internalNameEntity`
+`event,pageOpenDetail,popupShutter,internalNameEntity`
 
-`event~buttonPress2~internalNameEntity~positionSlider~50`
+`event,buttonPress2,internalNameEntity,positionSlider,50`
 
 ### popupNotify Page
 
-`event~buttonPress2~*internalName*~notifyAction~yes`
+`event,buttonPress2,*internalName*,notifyAction,yes`
 
-`event~buttonPress2~*internalName*~notifyAction~no`
+`event,buttonPress2,*internalName*,notifyAction,no`
 
 ### cardThermo Page
 
-`event~buttonPress2~*entityName*~tempUpd~*temperature*`
+`event,buttonPress2,*entityName*,tempUpd,*temperature*`
 
-`event~buttonPress2~*entityName*~hvac_action~*hvac_action*`
+`event,buttonPress2,*entityName*,hvac_action,*hvac_action*`
 
 ### cardMedia Page
 
-`event~buttonPress2~internalNameEntity~media-back`
+`event,buttonPress2,internalNameEntity,media-back`
 
-`event~buttonPress2~internalNameEntity~media-pause`
+`event,buttonPress2,internalNameEntity,media-pause`
 
-`event~buttonPress2~internalNameEntity~media-next`
+`event,buttonPress2,internalNameEntity,media-next`
 
-`event~buttonPress2~internalNameEntity~volumeSlider~75`
+`event,buttonPress2,internalNameEntity,volumeSlider,75`
 
 ### cardAlarm Page
 
-`event~buttonPress2~internalNameEntity~actionName~code`
+`event,buttonPress2,internalNameEntity,actionName,code`
 
 
 # Icons IDs
@@ -218,7 +218,7 @@ Please see Icon's int the [icons.md file](icons.md)
 # Design Guidelines for Nextion HMI Project
 
 Background Color is 
-- RGB565: 6371 [18e3] (HEX: #1C1C1C~ RGB: 28~28~28)
+- RGB565: 6371 [18e3] (HEX: #1C1C1C, RGB: 28,28,28)
 
-Source for Icons is the Material Design Font~ used by HASPone
+Source for Icons is the Material Design Font, used by HASPone
 https://github.com/HASwitchPlate/HASPone

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

@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-04-03 07:35:47.898571291 +0000
+--- HMI/n2t-out/Program.s.txt	2022-04-08 20:30:53.290164509 +0000
-+++ HMI/US/landscape/n2t-out/Program.s.txt	2022-04-03 07:35:48.646571620 +0000
++++ HMI/US/landscape/n2t-out/Program.s.txt	2022-04-08 20:30:54.170202708 +0000
 @@ -11,6 +11,6 @@
      // dim value
      int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
 +    //lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-04-03 07:35:47.902571293 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-04-08 20:30:53.290164509 +0000
-+++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-04-03 07:35:48.646571620 +0000
++++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-04-08 20:30:54.174202881 +0000
 @@ -177,7 +177,7 @@
              recmod=1
              bauds=115200

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

@@ -199,7 +199,7 @@ Text tCode
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 10565
         Font Color                          : 40179
         Horizontal Alignment                : center
@@ -229,7 +229,7 @@ Text tIcon
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -275,7 +275,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -322,7 +322,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -378,7 +378,7 @@ Button b0
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -416,7 +416,7 @@ Button b1
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -454,7 +454,7 @@ Button b2
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -492,7 +492,7 @@ Button b3
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -530,7 +530,7 @@ Button b4
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -568,7 +568,7 @@ Button b5
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -606,7 +606,7 @@ Button b6
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -644,7 +644,7 @@ Button b7
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -682,7 +682,7 @@ Button b8
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -720,7 +720,7 @@ Button b9
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -758,7 +758,7 @@ Button b10
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1109,9 +1109,7 @@ Timer tmSerial
                                         //id arm4
                                         spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //icon color
                                         spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0

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

@@ -272,7 +272,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -1414,7 +1414,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1468,7 +1468,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -2117,9 +2117,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                             vis tIcon1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -2241,9 +2239,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                             vis tIcon2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -2365,9 +2361,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                             vis tIcon3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -2489,9 +2483,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                             vis tIcon4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24

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

@@ -152,7 +152,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -232,7 +232,7 @@ Text tTmp
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 439
+        x coordinate                        : 415
         y coordinate                        : 290
         Width                               : 34
         Height                              : 30
@@ -498,7 +498,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -552,7 +552,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -599,7 +599,7 @@ Button bEntity1
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -657,7 +657,7 @@ Button bEntity2
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -715,7 +715,7 @@ Button bEntity3
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -773,7 +773,7 @@ Button bEntity4
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -831,7 +831,7 @@ Button bEntity5
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -889,7 +889,7 @@ Button bEntity6
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1050,9 +1050,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                             vis bEntity1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -1073,9 +1071,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                             vis bEntity2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -1096,9 +1092,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                             vis bEntity3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -1119,9 +1113,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                             vis bEntity4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24
@@ -1142,9 +1134,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                             vis bEntity5,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",30
@@ -1165,9 +1155,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                             vis bEntity6,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",36

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

@@ -94,7 +94,7 @@ Text tTmp
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 29
-        y coordinate                        : 144
+        y coordinate                        : 156
         Width                               : 27
         Height                              : 30
         Effect                              : load
@@ -153,8 +153,8 @@ Text tId
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 57
+        x coordinate                        : 64
-        y coordinate                        : 157
+        y coordinate                        : 159
         Width                               : 30
         Height                              : 30
         Effect                              : load
@@ -193,7 +193,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -283,7 +283,7 @@ Text t2
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -332,7 +332,7 @@ Text tPlayPause
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -381,7 +381,7 @@ Text t0
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -430,7 +430,7 @@ Text tIcon
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -460,7 +460,7 @@ Text t1
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -510,7 +510,7 @@ Text t3
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -560,7 +560,7 @@ Text t4
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -639,7 +639,7 @@ Text t6
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -681,7 +681,7 @@ Text t5
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -792,7 +792,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -839,7 +839,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -962,9 +962,7 @@ Timer tmSerial
                                         //entity name
                                         spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //title
                                         spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
@@ -974,9 +972,7 @@ Timer tmSerial
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                         //speaker current
                                         spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")

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

@@ -135,7 +135,7 @@ XFloat xTempCurr
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -405,7 +405,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -511,7 +511,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -666,7 +666,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1257,12 +1257,9 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                         {
-                                            // set icon
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
@@ -1273,13 +1270,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
+                                        if(bt1.txt!="")
                                         {
-                                                // set icon
-                                                covx tTmp.txt,sys0,0,0
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
@@ -1290,13 +1285,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
-                                                }              //bt2
+                                        }
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        //bt2
-                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt2.txt,"~",18
+                                        if(bt2.txt!="")
                                         {
-                                                    // set icon
-                                                    covx tTmp.txt,sys0,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
@@ -1307,13 +1300,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
-                                                    }              //bt3
+                                        }
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                        //bt3
-                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt3.txt,"~",22
+                                        if(bt3.txt!="")
                                         {
-                                                        // set icon
-                                                        covx tTmp.txt,sys0,0,0
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
@@ -1324,13 +1315,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
-                                                        }              //bt4
+                                        }
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                        //bt4
-                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt4.txt,"~",26
+                                        if(bt4.txt!="")
                                         {
-                                                            // set icon
-                                                            covx tTmp.txt,sys0,0,0
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
@@ -1341,13 +1330,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
-                                                            }              //bt5
+                                        }
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                        //bt5
-                                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt5.txt,"~",30
+                                        if(bt5.txt!="")
                                         {
-                                                                // set icon
-                                                                covx tTmp.txt,sys0,0,0
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
@@ -1358,13 +1345,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
-                                                                }              //bt6
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                        //bt6
-                                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt6.txt,"~",34
+                                        if(bt6.txt!="")
                                         {
-                                                                    // set icon
-                                                                    covx tTmp.txt,sys0,0,0
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
@@ -1375,13 +1360,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
-                                                                    }              //bt7
+                                        }
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                        //bt7
-                                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt7.txt,"~",38
+                                        if(bt7.txt!="")
                                         {
-                                                                        // set icon
-                                                                        covx tTmp.txt,sys0,0,0
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
@@ -1392,13 +1375,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
-                                                                        }              //bt8
+                                        }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        //bt8
-                                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt8.txt,"~",42
+                                        if(bt8.txt!="")
                                         {
-                                                                            // set icon
-                                                                            covx tTmp.txt,sys0,0,0
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0

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

@@ -2,18 +2,22 @@ Program.s
 	0    Component(s)
 	10   Line(s) of event code
 	10   Unique line(s) of event code
+pageIcons
+	6    Component(s)
+	0    Line(s) of event code
+	0    Unique line(s) of event code
 pageTest
 	13   Component(s)
 	13   Line(s) of event code
 	13   Unique line(s) of event code
-pageSerialTest
+screensaver
-	13   Component(s)
+	33   Component(s)
-	48   Line(s) of event code
+	195  Line(s) of event code
-	43   Unique line(s) of event code
+	152  Unique line(s) of event code
-pageIcons
+cardAlarm
-	7    Component(s)
+	35   Component(s)
-	0    Line(s) of event code
+	343  Line(s) of event code
-	0    Unique line(s) of event code
+	213  Unique line(s) of event code
 popupNotify
 	17   Component(s)
 	178  Line(s) of event code
@@ -26,37 +30,29 @@ popupShutter
 	19   Component(s)
 	178  Line(s) of event code
 	101  Unique line(s) of event code
-cardGrid
-	39   Component(s)
-	430  Line(s) of event code
-	249  Unique line(s) of event code
-popupLight
-	27   Component(s)
-	322  Line(s) of event code
-	173  Unique line(s) of event code
-screensaver
-	33   Component(s)
-	207  Line(s) of event code
-	158  Unique line(s) of event code
 cardMedia
 	30   Component(s)
-	333  Line(s) of event code
+	329  Line(s) of event code
-	170  Unique line(s) of event code
+	168  Unique line(s) of event code
-cardAlarm
+popupLight
-	35   Component(s)
+	27   Component(s)
-	345  Line(s) of event code
+	320  Line(s) of event code
-	214  Unique line(s) of event code
+	173  Unique line(s) of event code
+cardGrid
+	39   Component(s)
+	418  Line(s) of event code
+	243  Unique line(s) of event code
 cardThermo
 	41   Component(s)
-	460  Line(s) of event code
+	442  Line(s) of event code
-	284  Unique line(s) of event code
+	246  Unique line(s) of event code
 cardEntities
 	62   Component(s)
-	972  Line(s) of event code
+	964  Line(s) of event code
-	413  Unique line(s) of event code
+	409  Unique line(s) of event code
 
 Total
-	13   Page(s)
+	12   Page(s)
-	355  Component(s)
+	341  Component(s)
-	3646 Line(s) of event code
+	3540 Line(s) of event code
-	1039 Unique line(s) of event code
+	946  Unique line(s) of event code

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

@@ -20,51 +20,21 @@ Page pageIcons
     
 Variable (string) vaTime
     Attributes
-        ID            : 5
+        ID            : 4
         Scope         : global
         Text          : 
         Max. Text Size: 15
     
 Variable (string) vaDate
     Attributes
-        ID            : 6
+        ID            : 5
         Scope         : global
         Text          : 
         Max. Text Size: 35
     
-Text tIcons
-    Attributes
-        ID                                  : 2
-        Scope                               : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 1
-        y coordinate                        : 8
-        Width                               : 298
-        Height                              : 299
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 1
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : left
-        Vertical Alignment                  : top
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 170
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
 Text tTmp1
     Attributes
-        ID                                  : 3
+        ID                                  : 2
         Scope                               : global
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -94,7 +64,7 @@ Text tTmp1
     
 Text tTmp2
     Attributes
-        ID                                  : 4
+        ID                                  : 3
         Scope                               : global
         Dragging                            : 0
         Disable release event after dragging: 0

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

@@ -1,434 +0,0 @@
-Page pageSerialTest
-    Attributes
-        ID                                  : 0
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        Width                               : 480
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Locked                              : no
-        Swide up page ID                    : disabled
-        Swide down page ID                  : disabled
-        Swide left page ID                  : disabled
-        Swide right page ID                 : disabled
-        Fill                                : solid color
-        Back. Color                         : 65535
-    
-    Events
-        Preinitialize Event
-            //vis p0,0
-            //recmod=1
-            //bauds=115200
-        
-Number nCrcRecv
-    Attributes
-        ID                                  : 5
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 160
-        y coordinate                        : 0
-        Width                               : 88
-        Height                              : 29
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Value                               : 0
-        Significant digits shown            : all
-        Format                              : decimal with digit grouping
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Number nCrcCalc
-    Attributes
-        ID                                  : 6
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 159
-        y coordinate                        : 31
-        Width                               : 90
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Value                               : 0
-        Significant digits shown            : all
-        Format                              : decimal with digit grouping
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Number nIt
-    Attributes
-        ID                                  : 11
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 378
-        y coordinate                        : 234
-        Width                               : 52
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        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
-    
-Number nLength
-    Attributes
-        ID                                  : 12
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 15
-        y coordinate                        : 215
-        Width                               : 100
-        Height                              : 30
-        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 tStatus
-    Attributes
-        ID                                  : 3
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 160
-        y coordinate                        : 60
-        Width                               : 271
-        Height                              : 90
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : newtxt
-        Max. Text Size                      : 100
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tCmd
-    Attributes
-        ID                                  : 4
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 160
-        y coordinate                        : 151
-        Width                               : 272
-        Height                              : 80
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : newtxt
-        Max. Text Size                      : 500
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tBuffer
-    Attributes
-        ID                                  : 7
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 7
-        y coordinate                        : 270
-        Width                               : 435
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : newtxt
-        Max. Text Size                      : 100
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tDesc
-    Attributes
-        ID                                  : 8
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 0
-        y coordinate                        : 0
-        Width                               : 159
-        Height                              : 204
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
-        Max. Text Size                      : 60
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Picture p0
-    Attributes
-        ID                                  : 1
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 0
-        y coordinate                        : 0
-        Width                               : 479
-        Height                              : 319
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Picture ID                          : 0
-    
-Button b0
-    Attributes
-        ID                                  : 9
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 334
-        y coordinate                        : 9
-        Width                               : 46
-        Height                              : 46
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : 3D auto
-        Font ID                             : 4
-        Back. Color                         : 50712
-        Back. Picture ID (Pressed)          : 0
-        Back. Color (Pressed)               : 1024
-        Font Color (Unpressed)              : 0
-        Font Color (Pressed)                : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        State                               : unpressed
-        Text                                : bck
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-    Events
-        Touch Press Event
-            recmod=0
-            page pageTest
-        
-Button b1
-    Attributes
-        ID                                  : 10
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 392
-        y coordinate                        : 10
-        Width                               : 48
-        Height                              : 48
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : 3D auto
-        Font ID                             : 4
-        Back. Color                         : 50712
-        Back. Picture ID (Pressed)          : 0
-        Back. Color (Pressed)               : 1024
-        Font Color (Unpressed)              : 0
-        Font Color (Pressed)                : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        State                               : unpressed
-        Text                                : ON
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-    Events
-        Touch Press Event
-            recmod=1
-            bauds=115200
-        
-Timer tmSerial
-    Attributes
-        ID         : 2
-        Scope      : local
-        Period (ms): 400
-        Enabled    : yes
-    
-    Events
-        Timer Event
-            // data available
-            if(usize>1)
-            {
-                bufferPos=0
-                while(bufferPos<usize)
-                {
-                    // check for 0x55 0xBB - Command Init Secuence
-                    if(u[bufferPos]==187&&u[bufferPos-1]==85)
-                    {
-                        //remove garbage at the start of the buffer if there's any to free buffer for command
-                        if(u[bufferPos]!=1)
-                        {
-                            udelete bufferPos-1
-                        }
-                        tStatus.txt="init command detected"
-                        //instruction is now aligned with buffer, because we deleted garbage before instrcution
-                        //get length after init sequence (check if there are more than to bytes in buffer)
-                        if(3<usize)
-                        {
-                            // check if serial buffer has reached the announced length
-                            //payloadLength=u[2]
-                            ucopy payloadLength,2,2,0
-                            nLength.val=payloadLength
-                            // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
-                            payloadLength+=3
-                            // payload length does also not contain crc, so we are adding another 2 bytes for crc
-                            payloadLength+=2
-                            if(payloadLength<usize)
-                            {
-                                tStatus.txt="reached"
-                                // calculate crc
-                                crcrest 1,0xFFFF
-                                // payload length -1 to exclude crc
-                                crcputu 0,payloadLength-1 //u[2]+3
-                                // get recived crc to be able to compare it
-                                ucopy recvCrc,payloadLength-1,2,0
-                                nCrcRecv.val=recvCrc
-                                // compare crc with recived value
-                                if(crcval==recvCrc)
-                                {
-                                    tStatus.txt="crc ok"
-                                    nIt.val=nIt.val+1
-                                    ucopy tCmd.txt,4,payloadLength-5,0
-                                    udelete payloadLength-1
-                                    bufferPos=0
-                                    // here is the location where acual code should be
-                                }
-                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
-                                nCrcRecv.val=recvCrc
-                                nCrcCalc.val=crcval
-                                //ucopy nCrcCalc.val,u[2]+3,3,0
-                            }
-                        }
-                    }
-                    // next character
-                    bufferPos++
-                }
-                if(bufferPos==usize)
-                {
-                    // copy whole buffer to tCmd.txt, for debugging
-                    //ucopy tBuffer.txt,0,usize,0
-                    // ucopy nIt.val,0,usize,0
-                    // clear whole buffer
-                    //code_c
-                    //bufferPos=0
-                }
-            }
-        

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

@@ -296,7 +296,7 @@ Text tMsg1
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 59
+        x coordinate                        : 52
         y coordinate                        : 223
         Width                               : 375
         Height                              : 30
@@ -326,7 +326,7 @@ Text tMsg2
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 42
+        x coordinate                        : 35
         y coordinate                        : 256
         Width                               : 408
         Height                              : 25
@@ -356,7 +356,7 @@ Text tMsg3
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 42
+        x coordinate                        : 35
         y coordinate                        : 278
         Width                               : 408
         Height                              : 25
@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 28
+        Text                                : 30
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -483,7 +483,7 @@ Hotspot mSpinner
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 171
+        x coordinate                        : 164
         y coordinate                        : 49
         Width                               : 140
         Height                              : 140

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

@@ -56,7 +56,7 @@ Button b0
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -75,7 +75,7 @@ Button b0
         Touch Press Event
             page cardEntities
         
-Button b1
+Button b3
     Attributes
         ID                                  : 3
         Scope                               : local
@@ -84,43 +84,7 @@ Button b1
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 347
-        y coordinate                        : 262
+        y coordinate                        : 184
-        Width                               : 100
-        Height                              : 50
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : 3D auto
-        Font ID                             : 4
-        Back. Color                         : 50712
-        Back. Picture ID (Pressed)          : 65535
-        Back. Color (Pressed)               : 1024
-        Font Color (Unpressed)              : 0
-        Font Color (Pressed)                : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        State                               : unpressed
-        Text                                : serial
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-    Events
-        Touch Press Event
-            page pageSerialTest
-        
-Button b3
-    Attributes
-        ID                                  : 4
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 345
-        y coordinate                        : 195
         Width                               : 102
         Height                              : 63
         Effect                              : load
@@ -128,7 +92,7 @@ Button b3
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 0
         Back. Color (Pressed)               : 1024
@@ -149,7 +113,7 @@ Button b3
         
 Button b6
     Attributes
-        ID                                  : 5
+        ID                                  : 4
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -164,7 +128,7 @@ Button b6
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -185,7 +149,7 @@ Button b6
         
 Button b4
     Attributes
-        ID                                  : 6
+        ID                                  : 5
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -200,7 +164,7 @@ Button b4
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -221,7 +185,7 @@ Button b4
         
 Button b5
     Attributes
-        ID                                  : 7
+        ID                                  : 6
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -236,7 +200,7 @@ Button b5
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -257,7 +221,7 @@ Button b5
         
 Button b7
     Attributes
-        ID                                  : 8
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -272,7 +236,7 @@ Button b7
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -293,7 +257,7 @@ Button b7
         
 Button b8
     Attributes
-        ID                                  : 9
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -308,7 +272,7 @@ Button b8
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -330,7 +294,7 @@ Button b8
         
 Button b9
     Attributes
-        ID                                  : 10
+        ID                                  : 9
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -345,7 +309,7 @@ Button b9
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -366,7 +330,7 @@ Button b9
         
 Button b10
     Attributes
-        ID                                  : 11
+        ID                                  : 10
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -381,7 +345,7 @@ Button b10
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -402,7 +366,7 @@ Button b10
         
 Button b11
     Attributes
-        ID                                  : 12
+        ID                                  : 11
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -417,7 +381,7 @@ Button b11
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -436,3 +400,39 @@ Button b11
         Touch Press Event
             page cardGrid
         
+Button b1
+    Attributes
+        ID                                  : 12
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 349
+        y coordinate                        : 252
+        Width                               : 102
+        Height                              : 63
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : 3D auto
+        Font ID                             : 1
+        Back. Color                         : 50712
+        Back. Picture ID (Pressed)          : 0
+        Back. Color (Pressed)               : 1024
+        Font Color (Unpressed)              : 0
+        Font Color (Pressed)                : 65535
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        State                               : unpressed
+        Text                                : bauds=115200
+        Max. Text Size                      : 20
+        Word wrap                           : enabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+    Events
+        Touch Press Event
+            bauds=115200
+        

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

@@ -788,9 +788,7 @@ Timer tmSerial
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                         vis tIcon1,1
                                         // change icon color
                                         spstr strCommand.txt,tTmp.txt,"~",2

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

@@ -184,7 +184,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : left
@@ -308,7 +308,7 @@ Button b2
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 9
         Back. Color (Pressed)               : 1024
@@ -357,7 +357,7 @@ Button b1
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 9
         Back. Color (Pressed)               : 1024

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

@@ -48,80 +48,20 @@ Variable (string) strCommand
     
 Variable (string) tId
     Attributes
-        ID            : 19
+        ID            : 17
         Scope         : local
         Text          : 
         Max. Text Size: 25
     
 Variable (int32) vaTap
     Attributes
-        ID   : 27
+        ID   : 25
         Scope: local
         Value: 0
     
-Text tInstruction
-    Attributes
-        ID                                  : 5
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 450
-        y coordinate                        : 186
-        Width                               : 27
-        Height                              : 30
-        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
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 50
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tTmp
-    Attributes
-        ID                                  : 6
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 451
-        y coordinate                        : 228
-        Width                               : 25
-        Height                              : 30
-        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
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 50
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
 Text tTime
     Attributes
-        ID                                  : 7
+        ID                                  : 5
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -151,7 +91,7 @@ Text tTime
     
 Text tDate
     Attributes
-        ID                                  : 8
+        ID                                  : 6
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -167,7 +107,7 @@ Text tDate
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -181,14 +121,14 @@ Text tDate
     
 Text tSend
     Attributes
-        ID                                  : 9
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 451
+        x coordinate                        : 405
-        y coordinate                        : 9
+        y coordinate                        : 2
         Width                               : 29
         Height                              : 30
         Effect                              : load
@@ -211,7 +151,7 @@ Text tSend
     
 Text tMainIcon
     Attributes
-        ID                                  : 10
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -227,6 +167,36 @@ Text tMainIcon
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
+        Font ID                             : 4
+        Back. Color                         : 0
+        Font Color                          : 65535
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 10
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+Text tMainText
+    Attributes
+        ID                                  : 9
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 22
+        y coordinate                        : 267
+        Width                               : 110
+        Height                              : 43
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
         Font ID                             : 3
         Back. Color                         : 0
         Font Color                          : 65535
@@ -239,39 +209,9 @@ Text tMainIcon
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
-Text tMainText
-    Attributes
-        ID                                  : 11
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 22
-        y coordinate                        : 267
-        Width                               : 110
-        Height                              : 43
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 2
-        Back. Color                         : 0
-        Font Color                          : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
 Text tForecast1
     Attributes
-        ID                                  : 12
+        ID                                  : 10
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -301,7 +241,7 @@ Text tForecast1
     
 Text tForecast1Val
     Attributes
-        ID                                  : 13
+        ID                                  : 11
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -331,7 +271,7 @@ Text tForecast1Val
     
 Text tF1Icon
     Attributes
-        ID                                  : 14
+        ID                                  : 12
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -361,7 +301,7 @@ Text tF1Icon
     
 Text tForecast2
     Attributes
-        ID                                  : 15
+        ID                                  : 13
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -391,7 +331,7 @@ Text tForecast2
     
 Text tF2Icon
     Attributes
-        ID                                  : 16
+        ID                                  : 14
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -421,7 +361,7 @@ Text tF2Icon
     
 Text tForecast2Val
     Attributes
-        ID                                  : 17
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -451,13 +391,13 @@ Text tForecast2Val
     
 Text t10
     Attributes
-        ID                                  : 18
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 62
+        x coordinate                        : 61
         y coordinate                        : 195
         Width                               : 360
         Height                              : 2
@@ -481,7 +421,7 @@ Text t10
     
 Text tAMPM
     Attributes
-        ID                                  : 20
+        ID                                  : 18
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -497,7 +437,7 @@ Text tAMPM
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -511,7 +451,7 @@ Text tAMPM
     
 Text tForecast3Val
     Attributes
-        ID                                  : 21
+        ID                                  : 19
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -541,7 +481,7 @@ Text tForecast3Val
     
 Text tF3Icon
     Attributes
-        ID                                  : 22
+        ID                                  : 20
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -571,7 +511,7 @@ Text tF3Icon
     
 Text tForecast3
     Attributes
-        ID                                  : 23
+        ID                                  : 21
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -601,7 +541,7 @@ Text tForecast3
     
 Text tForecast4
     Attributes
-        ID                                  : 24
+        ID                                  : 22
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -631,7 +571,7 @@ Text tForecast4
     
 Text tF4Icon
     Attributes
-        ID                                  : 25
+        ID                                  : 23
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -661,7 +601,7 @@ Text tF4Icon
     
 Text tForecast4Val
     Attributes
-        ID                                  : 26
+        ID                                  : 24
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -691,7 +631,7 @@ Text tForecast4Val
     
 Text tMainTextAlt
     Attributes
-        ID                                  : 29
+        ID                                  : 27
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -707,7 +647,7 @@ Text tMainTextAlt
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : left
@@ -721,7 +661,7 @@ Text tMainTextAlt
     
 Text tMainIconAlt
     Attributes
-        ID                                  : 30
+        ID                                  : 28
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -737,7 +677,7 @@ Text tMainIconAlt
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -751,7 +691,7 @@ Text tMainIconAlt
     
 Text tMRIcon
     Attributes
-        ID                                  : 31
+        ID                                  : 29
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -781,7 +721,7 @@ Text tMRIcon
     
 Text tMR
     Attributes
-        ID                                  : 32
+        ID                                  : 30
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -809,6 +749,66 @@ Text tMR
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tTmp
+    Attributes
+        ID                                  : 31
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 368
+        y coordinate                        : 0
+        Width                               : 25
+        Height                              : 30
+        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
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 50
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+Text tInstruction
+    Attributes
+        ID                                  : 32
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 335
+        y coordinate                        : 0
+        Width                               : 27
+        Height                              : 30
+        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
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 50
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
@@ -922,9 +922,7 @@ Timer tmSerial
                                         vis tMRIcon,0
                                         vis tMR,0
                                         //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                         tMainIconAlt.txt=tMainIcon.txt
                                         //tMainText
                                         spstr strCommand.txt,tMainText.txt,"~",2
@@ -932,41 +930,31 @@ Timer tmSerial
                                         //tForecast1
                                         spstr strCommand.txt,tForecast1.txt,"~",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                         //tForecast1Val
                                         spstr strCommand.txt,tForecast1Val.txt,"~",5
                                         //tForecast2
                                         spstr strCommand.txt,tForecast2.txt,"~",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                         //tForecast2Val
                                         spstr strCommand.txt,tForecast2Val.txt,"~",8
                                         //tForecast3
                                         spstr strCommand.txt,tForecast3.txt,"~",9
                                         //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                         //tForecast3Val
                                         spstr strCommand.txt,tForecast3Val.txt,"~",11
                                         //tForecast4
                                         spstr strCommand.txt,tForecast4.txt,"~",12
                                         //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                         //tForecast4Val
                                         spstr strCommand.txt,tForecast4Val.txt,"~",14
                                         //alternative layout
                                         //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
-                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
-                                        if(tTmp.txt!="")
                                         {
                                             //value for tMRIcon, activate alternative layout
                                             vis tMainIcon,0
@@ -1057,7 +1045,7 @@ Timer tmSerial
         
 Timer tmSleep
     Attributes
-        ID         : 28
+        ID         : 26
         Scope      : local
         Period (ms): 1000
         Enabled    : yes

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

@@ -579,9 +579,7 @@ Timer tmSerial
                                         //id arm4
                                         spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //icon color
                                         spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0

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

@@ -1172,9 +1172,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                             vis tIcon1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -1296,9 +1294,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                             vis tIcon2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -1420,9 +1416,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                             vis tIcon3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -1544,9 +1538,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                             vis tIcon4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24

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

@@ -613,9 +613,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                             vis bEntity1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -636,9 +634,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                             vis bEntity2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -659,9 +655,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                             vis bEntity3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -682,9 +676,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                             vis bEntity4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24
@@ -705,9 +697,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                             vis bEntity5,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",30
@@ -728,9 +718,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                             vis bEntity6,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",36

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

@@ -540,9 +540,7 @@ Timer tmSerial
                                         //entity name
                                         spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //title
                                         spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
@@ -552,9 +550,7 @@ Timer tmSerial
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                         //speaker current
                                         spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")

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

@@ -704,12 +704,9 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                         {
-                                            // set icon
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
@@ -720,13 +717,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
+                                        if(bt1.txt!="")
                                         {
-                                                // set icon
-                                                covx tTmp.txt,sys0,0,0
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
@@ -737,13 +732,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
-                                                }              //bt2
+                                        }
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        //bt2
-                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt2.txt,"~",18
+                                        if(bt2.txt!="")
                                         {
-                                                    // set icon
-                                                    covx tTmp.txt,sys0,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
@@ -754,13 +747,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
-                                                    }              //bt3
+                                        }
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                        //bt3
-                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt3.txt,"~",22
+                                        if(bt3.txt!="")
                                         {
-                                                        // set icon
-                                                        covx tTmp.txt,sys0,0,0
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
@@ -771,13 +762,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
-                                                        }              //bt4
+                                        }
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                        //bt4
-                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt4.txt,"~",26
+                                        if(bt4.txt!="")
                                         {
-                                                            // set icon
-                                                            covx tTmp.txt,sys0,0,0
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
@@ -788,13 +777,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
-                                                            }              //bt5
+                                        }
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                        //bt5
-                                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt5.txt,"~",30
+                                        if(bt5.txt!="")
                                         {
-                                                                // set icon
-                                                                covx tTmp.txt,sys0,0,0
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
@@ -805,13 +792,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
-                                                                }              //bt6
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                        //bt6
-                                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt6.txt,"~",34
+                                        if(bt6.txt!="")
                                         {
-                                                                    // set icon
-                                                                    covx tTmp.txt,sys0,0,0
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
@@ -822,13 +807,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
-                                                                    }              //bt7
+                                        }
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                        //bt7
-                                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt7.txt,"~",38
+                                        if(bt7.txt!="")
                                         {
-                                                                        // set icon
-                                                                        covx tTmp.txt,sys0,0,0
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
@@ -839,13 +822,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
-                                                                        }              //bt8
+                                        }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        //bt8
-                                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt8.txt,"~",42
+                                        if(bt8.txt!="")
                                         {
-                                                                            // set icon
-                                                                            covx tTmp.txt,sys0,0,0
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0

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

@@ -22,16 +22,6 @@ Variable (string) vaDate
         Text          : 
         Max. Text Size: 35
     
-Text tIcons
-    Attributes
-        Scope                               : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 170
-    
 Text tTmp1
     Attributes
         Scope                               : global

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

@@ -1,207 +0,0 @@
-Page pageSerialTest
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Locked                              : no
-        Swide up page ID                    : disabled
-        Swide down page ID                  : disabled
-        Swide left page ID                  : disabled
-        Swide right page ID                 : disabled
-    
-    Events
-        Preinitialize Event
-            //vis p0,0
-            //recmod=1
-            //bauds=115200
-        
-Number nCrcRecv
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Number nCrcCalc
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Number nIt
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Number nLength
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Text tStatus
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : newtxt
-        Max. Text Size                      : 100
-    
-Text tCmd
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : newtxt
-        Max. Text Size                      : 500
-    
-Text tBuffer
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : newtxt
-        Max. Text Size                      : 100
-    
-Text tDesc
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
-        Max. Text Size                      : 60
-    
-Picture p0
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-    
-Button b0
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : bck
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            recmod=0
-            page pageTest
-        
-Button b1
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : ON
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            recmod=1
-            bauds=115200
-        
-Timer tmSerial
-    Attributes
-        Scope      : local
-        Period (ms): 400
-        Enabled    : yes
-    
-    Events
-        Timer Event
-            // data available
-            if(usize>1)
-            {
-                bufferPos=0
-                while(bufferPos<usize)
-                {
-                    // check for 0x55 0xBB - Command Init Secuence
-                    if(u[bufferPos]==187&&u[bufferPos-1]==85)
-                    {
-                        //remove garbage at the start of the buffer if there's any to free buffer for command
-                        if(u[bufferPos]!=1)
-                        {
-                            udelete bufferPos-1
-                        }
-                        tStatus.txt="init command detected"
-                        //instruction is now aligned with buffer, because we deleted garbage before instrcution
-                        //get length after init sequence (check if there are more than to bytes in buffer)
-                        if(3<usize)
-                        {
-                            // check if serial buffer has reached the announced length
-                            //payloadLength=u[2]
-                            ucopy payloadLength,2,2,0
-                            nLength.val=payloadLength
-                            // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
-                            payloadLength+=3
-                            // payload length does also not contain crc, so we are adding another 2 bytes for crc
-                            payloadLength+=2
-                            if(payloadLength<usize)
-                            {
-                                tStatus.txt="reached"
-                                // calculate crc
-                                crcrest 1,0xFFFF
-                                // payload length -1 to exclude crc
-                                crcputu 0,payloadLength-1 //u[2]+3
-                                // get recived crc to be able to compare it
-                                ucopy recvCrc,payloadLength-1,2,0
-                                nCrcRecv.val=recvCrc
-                                // compare crc with recived value
-                                if(crcval==recvCrc)
-                                {
-                                    tStatus.txt="crc ok"
-                                    nIt.val=nIt.val+1
-                                    ucopy tCmd.txt,4,payloadLength-5,0
-                                    udelete payloadLength-1
-                                    bufferPos=0
-                                    // here is the location where acual code should be
-                                }
-                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
-                                nCrcRecv.val=recvCrc
-                                nCrcCalc.val=crcval
-                                //ucopy nCrcCalc.val,u[2]+3,3,0
-                            }
-                        }
-                    }
-                    // next character
-                    bufferPos++
-                }
-                if(bufferPos==usize)
-                {
-                    // copy whole buffer to tCmd.txt, for debugging
-                    //ucopy tBuffer.txt,0,usize,0
-                    // ucopy nIt.val,0,usize,0
-                    // clear whole buffer
-                    //code_c
-                    //bufferPos=0
-                }
-            }
-        

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

@@ -152,7 +152,7 @@ Text tVersion
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 28
+        Text                                : 30
         Max. Text Size                      : 10
     
 Picture p0

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

@@ -35,20 +35,6 @@ Button b0
         Touch Press Event
             page cardEntities
         
-Button b1
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : serial
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            page pageSerialTest
-        
 Button b3
     Attributes
         Scope                               : local
@@ -176,3 +162,17 @@ Button b11
         Touch Press Event
             page cardGrid
         
+Button b1
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        State                               : unpressed
+        Text                                : bauds=115200
+        Max. Text Size                      : 20
+    
+    Events
+        Touch Press Event
+            bauds=115200
+        

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

@@ -442,9 +442,7 @@ Timer tmSerial
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                         vis tIcon1,1
                                         // change icon color
                                         spstr strCommand.txt,tTmp.txt,"~",2

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

@@ -48,26 +48,6 @@ Variable (int32) vaTap
         Scope: local
         Value: 0
     
-Text tInstruction
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 50
-    
-Text tTmp
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 50
-    
 Text tTime
     Attributes
         Scope                               : local
@@ -298,6 +278,26 @@ Text tMR
         Text                                : 
         Max. Text Size                      : 10
     
+Text tTmp
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 50
+    
+Text tInstruction
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 50
+    
 Picture p0
     Attributes
         Scope                               : local
@@ -400,9 +400,7 @@ Timer tmSerial
                                         vis tMRIcon,0
                                         vis tMR,0
                                         //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                         tMainIconAlt.txt=tMainIcon.txt
                                         //tMainText
                                         spstr strCommand.txt,tMainText.txt,"~",2
@@ -410,41 +408,31 @@ Timer tmSerial
                                         //tForecast1
                                         spstr strCommand.txt,tForecast1.txt,"~",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                         //tForecast1Val
                                         spstr strCommand.txt,tForecast1Val.txt,"~",5
                                         //tForecast2
                                         spstr strCommand.txt,tForecast2.txt,"~",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                         //tForecast2Val
                                         spstr strCommand.txt,tForecast2Val.txt,"~",8
                                         //tForecast3
                                         spstr strCommand.txt,tForecast3.txt,"~",9
                                         //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                         //tForecast3Val
                                         spstr strCommand.txt,tForecast3Val.txt,"~",11
                                         //tForecast4
                                         spstr strCommand.txt,tForecast4.txt,"~",12
                                         //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                         //tForecast4Val
                                         spstr strCommand.txt,tForecast4Val.txt,"~",14
                                         //alternative layout
                                         //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
-                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
-                                        if(tTmp.txt!="")
                                         {
                                             //value for tMRIcon, activate alternative layout
                                             vis tMainIcon,0

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

@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-04-03 07:35:47.898571291 +0000
+--- HMI/n2t-out/Program.s.txt	2022-04-08 20:30:53.290164509 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-03 07:35:48.266571453 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-08 20:30:53.734183782 +0000
 @@ -11,6 +11,6 @@
      // dim value
      int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
 +    //lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt	2022-04-03 07:35:47.902571293 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-04-08 20:30:53.290164509 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-03 07:35:48.266571453 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-08 20:30:53.738183956 +0000
 @@ -62,6 +62,26 @@
              vis bText4,0
              vis hSlider4,0
@@ -525,7 +525,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
  Timer tmSerial
      Attributes
          Scope      : local
-@@ -1650,6 +2106,254 @@
+@@ -1642,6 +2098,250 @@
                                              covx tTmp.txt,sys0,0,0
                                              hSlider4.maxval=sys0
                                          }
@@ -547,9 +547,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                        }else
 +                                        {
 +                                            // change icon
-+                                            spstr strCommand.txt,tTmp.txt,"~",29
++                                            spstr strCommand.txt,tIcon5.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
@@ -671,9 +669,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                        }else
 +                                        {
 +                                            // change icon
-+                                            spstr strCommand.txt,tTmp.txt,"~",35
++                                            spstr strCommand.txt,tIcon6.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
@@ -781,8 +777,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
                                      if(tInstruction.txt=="pageType")
                                      {
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-04-03 07:35:47.902571293 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-04-08 20:30:53.290164509 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-03 07:35:48.266571453 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-08 20:30:53.734183782 +0000
 @@ -142,7 +142,7 @@
          Disable release event after dragging: 0
          Send Component ID                   : disabled
@@ -801,3 +797,60 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
              //send calc crc
              btlen tSend.txt,sys0
              crcrest 1,0xffff // reset CRC
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt	2022-04-08 20:30:53.290164509 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt	2022-04-08 20:30:53.738183956 +0000
+@@ -48,6 +48,26 @@
+         Scope: local
+         Value: 0
+     
++Text tInstruction
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        Associated Keyboard                 : none
++        Text                                : 
++        Max. Text Size                      : 50
++    
++Text tTmp
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        Associated Keyboard                 : none
++        Text                                : 
++        Max. Text Size                      : 50
++    
+ Text tTime
+     Attributes
+         Scope                               : local
+@@ -278,26 +298,6 @@
+         Text                                : 
+         Max. Text Size                      : 10
+     
+-Text tTmp
+-    Attributes
+-        Scope                               : local
+-        Dragging                            : 0
+-        Disable release event after dragging: 0
+-        Send Component ID                   : disabled
+-        Associated Keyboard                 : none
+-        Text                                : 
+-        Max. Text Size                      : 50
+-    
+-Text tInstruction
+-    Attributes
+-        Scope                               : local
+-        Dragging                            : 0
+-        Disable release event after dragging: 0
+-        Send Component ID                   : disabled
+-        Associated Keyboard                 : none
+-        Text                                : 
+-        Max. Text Size                      : 50
+-    
+ Picture p0
+     Attributes
+         Scope                               : local

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

@@ -199,7 +199,7 @@ Text tCode
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 10565
         Font Color                          : 40179
         Horizontal Alignment                : center
@@ -229,7 +229,7 @@ Text tIcon
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -275,7 +275,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -322,7 +322,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1109,9 +1109,7 @@ Timer tmSerial
                                         //id arm4
                                         spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //icon color
                                         spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0

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

@@ -371,7 +371,7 @@ Text tHeading
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 60
-        y coordinate                        : 24
+        y coordinate                        : 22
         Width                               : 200
         Height                              : 30
         Effect                              : load
@@ -380,7 +380,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -1728,7 +1728,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1782,7 +1782,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -2959,9 +2959,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                             vis tIcon1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -3083,9 +3081,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                             vis tIcon2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -3207,9 +3203,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                             vis tIcon3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -3331,9 +3325,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                             vis tIcon4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24
@@ -3455,9 +3447,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,tIcon5.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
@@ -3579,9 +3569,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,tIcon6.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

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

@@ -152,7 +152,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -498,7 +498,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -552,7 +552,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -599,7 +599,7 @@ Button bEntity1
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -657,7 +657,7 @@ Button bEntity2
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -715,7 +715,7 @@ Button bEntity3
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -773,7 +773,7 @@ Button bEntity4
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -831,7 +831,7 @@ Button bEntity5
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -889,7 +889,7 @@ Button bEntity6
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1050,9 +1050,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                             vis bEntity1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -1073,9 +1071,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                             vis bEntity2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -1096,9 +1092,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                             vis bEntity3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -1119,9 +1113,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                             vis bEntity4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24
@@ -1142,9 +1134,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                             vis bEntity5,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",30
@@ -1165,9 +1155,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                             vis bEntity6,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",36

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

@@ -193,7 +193,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -283,7 +283,7 @@ Text t2
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -332,7 +332,7 @@ Text tPlayPause
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -381,7 +381,7 @@ Text t0
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -430,7 +430,7 @@ Text tIcon
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -460,7 +460,7 @@ Text t1
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -510,7 +510,7 @@ Text t3
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -560,7 +560,7 @@ Text t4
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -639,7 +639,7 @@ Text t6
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -681,7 +681,7 @@ Text t5
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -792,7 +792,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -839,7 +839,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -962,9 +962,7 @@ Timer tmSerial
                                         //entity name
                                         spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //title
                                         spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
@@ -974,9 +972,7 @@ Timer tmSerial
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                         //speaker current
                                         spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")

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

@@ -135,7 +135,7 @@ XFloat xTempCurr
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -405,7 +405,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -511,7 +511,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -666,7 +666,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1257,12 +1257,9 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                         {
-                                            // set icon
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
@@ -1273,13 +1270,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
+                                        if(bt1.txt!="")
                                         {
-                                                // set icon
-                                                covx tTmp.txt,sys0,0,0
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
@@ -1290,13 +1285,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
-                                                }              //bt2
+                                        }
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        //bt2
-                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt2.txt,"~",18
+                                        if(bt2.txt!="")
                                         {
-                                                    // set icon
-                                                    covx tTmp.txt,sys0,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
@@ -1307,13 +1300,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
-                                                    }              //bt3
+                                        }
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                        //bt3
-                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt3.txt,"~",22
+                                        if(bt3.txt!="")
                                         {
-                                                        // set icon
-                                                        covx tTmp.txt,sys0,0,0
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
@@ -1324,13 +1315,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
-                                                        }              //bt4
+                                        }
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                        //bt4
-                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt4.txt,"~",26
+                                        if(bt4.txt!="")
                                         {
-                                                            // set icon
-                                                            covx tTmp.txt,sys0,0,0
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
@@ -1341,13 +1330,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
-                                                            }              //bt5
+                                        }
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                        //bt5
-                                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt5.txt,"~",30
+                                        if(bt5.txt!="")
                                         {
-                                                                // set icon
-                                                                covx tTmp.txt,sys0,0,0
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
@@ -1358,13 +1345,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
-                                                                }              //bt6
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                        //bt6
-                                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt6.txt,"~",34
+                                        if(bt6.txt!="")
                                         {
-                                                                    // set icon
-                                                                    covx tTmp.txt,sys0,0,0
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
@@ -1375,13 +1360,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
-                                                                    }              //bt7
+                                        }
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                        //bt7
-                                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt7.txt,"~",38
+                                        if(bt7.txt!="")
                                         {
-                                                                        // set icon
-                                                                        covx tTmp.txt,sys0,0,0
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
@@ -1392,13 +1375,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
-                                                                        }              //bt8
+                                        }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        //bt8
-                                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt8.txt,"~",42
+                                        if(bt8.txt!="")
                                         {
-                                                                            // set icon
-                                                                            covx tTmp.txt,sys0,0,0
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0

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

@@ -2,12 +2,12 @@ Program.s
 	0    Component(s)
 	10   Line(s) of event code
 	10   Unique line(s) of event code
-pageSerialTest
+pageTest
 	13   Component(s)
-	48   Line(s) of event code
+	13   Line(s) of event code
-	43   Unique line(s) of event code
+	13   Unique line(s) of event code
 pageIcons
-	7    Component(s)
+	6    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
 pageStartup
@@ -18,45 +18,41 @@ popupNotify
 	17   Component(s)
 	178  Line(s) of event code
 	117  Unique line(s) of event code
-pageTest
-	13   Component(s)
-	13   Line(s) of event code
-	13   Unique line(s) of event code
-popupLight
-	27   Component(s)
-	322  Line(s) of event code
-	173  Unique line(s) of event code
 screensaver
 	33   Component(s)
-	207  Line(s) of event code
+	195  Line(s) of event code
-	158  Unique line(s) of event code
+	152  Unique line(s) of event code
+cardEntities
+	86   Component(s)
+	1350 Line(s) of event code
+	547  Unique line(s) of event code
 cardMedia
 	30   Component(s)
-	333  Line(s) of event code
+	329  Line(s) of event code
-	170  Unique line(s) of event code
+	168  Unique line(s) of event code
+cardAlarm
+	35   Component(s)
+	343  Line(s) of event code
+	213  Unique line(s) of event code
+cardGrid
+	39   Component(s)
+	418  Line(s) of event code
+	243  Unique line(s) of event code
+cardThermo
+	41   Component(s)
+	442  Line(s) of event code
+	246  Unique line(s) of event code
 popupShutter
 	19   Component(s)
 	178  Line(s) of event code
 	101  Unique line(s) of event code
-cardAlarm
+popupLight
-	35   Component(s)
+	27   Component(s)
-	345  Line(s) of event code
+	320  Line(s) of event code
-	214  Unique line(s) of event code
+	173  Unique line(s) of event code
-cardGrid
-	39   Component(s)
-	430  Line(s) of event code
-	249  Unique line(s) of event code
-cardThermo
-	41   Component(s)
-	460  Line(s) of event code
-	284  Unique line(s) of event code
-cardEntities
-	86   Component(s)
-	1362 Line(s) of event code
-	553  Unique line(s) of event code
 
 Total
-	13   Page(s)
+	12   Page(s)
-	379  Component(s)
+	365  Component(s)
-	4036 Line(s) of event code
+	3926 Line(s) of event code
-	1153 Unique line(s) of event code
+	1059 Unique line(s) of event code

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

@@ -20,51 +20,21 @@ Page pageIcons
     
 Variable (string) vaTime
     Attributes
-        ID            : 5
+        ID            : 4
         Scope         : global
         Text          : 
         Max. Text Size: 15
     
 Variable (string) vaDate
     Attributes
-        ID            : 6
+        ID            : 5
         Scope         : global
         Text          :  
         Max. Text Size: 35
     
-Text tIcons
-    Attributes
-        ID                                  : 2
-        Scope                               : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 15
-        y coordinate                        : 161
-        Width                               : 295
-        Height                              : 285
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 1
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : left
-        Vertical Alignment                  : top
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 170
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
 Text tTmp1
     Attributes
-        ID                                  : 3
+        ID                                  : 2
         Scope                               : global
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -94,7 +64,7 @@ Text tTmp1
     
 Text tTmp2
     Attributes
-        ID                                  : 4
+        ID                                  : 3
         Scope                               : global
         Dragging                            : 0
         Disable release event after dragging: 0

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

@@ -1,434 +0,0 @@
-Page pageSerialTest
-    Attributes
-        ID                                  : 0
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        Width                               : 320
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Locked                              : no
-        Swide up page ID                    : disabled
-        Swide down page ID                  : disabled
-        Swide left page ID                  : disabled
-        Swide right page ID                 : disabled
-        Fill                                : solid color
-        Back. Color                         : 65535
-    
-    Events
-        Preinitialize Event
-            //vis p0,0
-            //recmod=1
-            //bauds=115200
-        
-Number nCrcRecv
-    Attributes
-        ID                                  : 5
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 5
-        y coordinate                        : 205
-        Width                               : 88
-        Height                              : 29
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Value                               : 0
-        Significant digits shown            : all
-        Format                              : decimal with digit grouping
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Number nCrcCalc
-    Attributes
-        ID                                  : 6
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 4
-        y coordinate                        : 236
-        Width                               : 90
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Value                               : 0
-        Significant digits shown            : all
-        Format                              : decimal with digit grouping
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Number nIt
-    Attributes
-        ID                                  : 11
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 181
-        y coordinate                        : 168
-        Width                               : 52
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        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
-    
-Number nLength
-    Attributes
-        ID                                  : 12
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 181
-        y coordinate                        : 78
-        Width                               : 100
-        Height                              : 30
-        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 tStatus
-    Attributes
-        ID                                  : 3
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 5
-        y coordinate                        : 267
-        Width                               : 271
-        Height                              : 90
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : newtxt
-        Max. Text Size                      : 100
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tCmd
-    Attributes
-        ID                                  : 4
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 5
-        y coordinate                        : 358
-        Width                               : 272
-        Height                              : 80
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : newtxt
-        Max. Text Size                      : 500
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tBuffer
-    Attributes
-        ID                                  : 7
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 5
-        y coordinate                        : 443
-        Width                               : 310
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : newtxt
-        Max. Text Size                      : 100
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tDesc
-    Attributes
-        ID                                  : 8
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 0
-        y coordinate                        : 0
-        Width                               : 159
-        Height                              : 204
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
-        Max. Text Size                      : 60
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Picture p0
-    Attributes
-        ID                                  : 1
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 0
-        y coordinate                        : 0
-        Width                               : 319
-        Height                              : 479
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Picture ID                          : 0
-    
-Button b0
-    Attributes
-        ID                                  : 9
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 181
-        y coordinate                        : 9
-        Width                               : 46
-        Height                              : 46
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : 3D auto
-        Font ID                             : 4
-        Back. Color                         : 50712
-        Back. Picture ID (Pressed)          : 0
-        Back. Color (Pressed)               : 1024
-        Font Color (Unpressed)              : 0
-        Font Color (Pressed)                : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        State                               : unpressed
-        Text                                : bck
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-    Events
-        Touch Press Event
-            recmod=0
-            page pageTest
-        
-Button b1
-    Attributes
-        ID                                  : 10
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 249
-        y coordinate                        : 9
-        Width                               : 48
-        Height                              : 48
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : 3D auto
-        Font ID                             : 4
-        Back. Color                         : 50712
-        Back. Picture ID (Pressed)          : 0
-        Back. Color (Pressed)               : 1024
-        Font Color (Unpressed)              : 0
-        Font Color (Pressed)                : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        State                               : unpressed
-        Text                                : ON
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-    Events
-        Touch Press Event
-            recmod=1
-            bauds=115200
-        
-Timer tmSerial
-    Attributes
-        ID         : 2
-        Scope      : local
-        Period (ms): 400
-        Enabled    : yes
-    
-    Events
-        Timer Event
-            // data available
-            if(usize>1)
-            {
-                bufferPos=0
-                while(bufferPos<usize)
-                {
-                    // check for 0x55 0xBB - Command Init Secuence
-                    if(u[bufferPos]==187&&u[bufferPos-1]==85)
-                    {
-                        //remove garbage at the start of the buffer if there's any to free buffer for command
-                        if(u[bufferPos]!=1)
-                        {
-                            udelete bufferPos-1
-                        }
-                        tStatus.txt="init command detected"
-                        //instruction is now aligned with buffer, because we deleted garbage before instrcution
-                        //get length after init sequence (check if there are more than to bytes in buffer)
-                        if(3<usize)
-                        {
-                            // check if serial buffer has reached the announced length
-                            //payloadLength=u[2]
-                            ucopy payloadLength,2,2,0
-                            nLength.val=payloadLength
-                            // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
-                            payloadLength+=3
-                            // payload length does also not contain crc, so we are adding another 2 bytes for crc
-                            payloadLength+=2
-                            if(payloadLength<usize)
-                            {
-                                tStatus.txt="reached"
-                                // calculate crc
-                                crcrest 1,0xFFFF
-                                // payload length -1 to exclude crc
-                                crcputu 0,payloadLength-1 //u[2]+3
-                                // get recived crc to be able to compare it
-                                ucopy recvCrc,payloadLength-1,2,0
-                                nCrcRecv.val=recvCrc
-                                // compare crc with recived value
-                                if(crcval==recvCrc)
-                                {
-                                    tStatus.txt="crc ok"
-                                    nIt.val=nIt.val+1
-                                    ucopy tCmd.txt,4,payloadLength-5,0
-                                    udelete payloadLength-1
-                                    bufferPos=0
-                                    // here is the location where acual code should be
-                                }
-                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
-                                nCrcRecv.val=recvCrc
-                                nCrcCalc.val=crcval
-                                //ucopy nCrcCalc.val,u[2]+3,3,0
-                            }
-                        }
-                    }
-                    // next character
-                    bufferPos++
-                }
-                if(bufferPos==usize)
-                {
-                    // copy whole buffer to tCmd.txt, for debugging
-                    //ucopy tBuffer.txt,0,usize,0
-                    // ucopy nIt.val,0,usize,0
-                    // clear whole buffer
-                    //code_c
-                    //bufferPos=0
-                }
-            }
-        

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

@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 28
+        Text                                : 30
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0

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

@@ -56,7 +56,7 @@ Button b0
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -75,7 +75,7 @@ Button b0
         Touch Press Event
             page cardEntities
         
-Button b1
+Button b3
     Attributes
         ID                                  : 3
         Scope                               : local
@@ -83,8 +83,8 @@ Button b1
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 190
+        x coordinate                        : 39
-        y coordinate                        : 380
+        y coordinate                        : 395
         Width                               : 100
         Height                              : 50
         Effect                              : load
@@ -92,43 +92,7 @@ Button b1
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
-        Back. Color                         : 50712
-        Back. Picture ID (Pressed)          : 65535
-        Back. Color (Pressed)               : 1024
-        Font Color (Unpressed)              : 0
-        Font Color (Pressed)                : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        State                               : unpressed
-        Text                                : serial
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-    Events
-        Touch Press Event
-            page pageSerialTest
-        
-Button b3
-    Attributes
-        ID                                  : 4
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 35
-        y coordinate                        : 380
-        Width                               : 100
-        Height                              : 50
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : 3D auto
-        Font ID                             : 4
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 0
         Back. Color (Pressed)               : 1024
@@ -149,7 +113,7 @@ Button b3
         
 Button b6
     Attributes
-        ID                                  : 5
+        ID                                  : 4
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -164,7 +128,7 @@ Button b6
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -185,7 +149,7 @@ Button b6
         
 Button b4
     Attributes
-        ID                                  : 6
+        ID                                  : 5
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -200,7 +164,7 @@ Button b4
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -221,7 +185,7 @@ Button b4
         
 Button b5
     Attributes
-        ID                                  : 7
+        ID                                  : 6
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -236,7 +200,7 @@ Button b5
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -257,7 +221,7 @@ Button b5
         
 Button b7
     Attributes
-        ID                                  : 8
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -272,7 +236,7 @@ Button b7
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -293,7 +257,7 @@ Button b7
         
 Button b8
     Attributes
-        ID                                  : 9
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -308,7 +272,7 @@ Button b8
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -330,7 +294,7 @@ Button b8
         
 Button b9
     Attributes
-        ID                                  : 10
+        ID                                  : 9
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -345,7 +309,7 @@ Button b9
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -366,7 +330,7 @@ Button b9
         
 Button b10
     Attributes
-        ID                                  : 11
+        ID                                  : 10
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -381,7 +345,7 @@ Button b10
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -402,7 +366,7 @@ Button b10
         
 Button b11
     Attributes
-        ID                                  : 12
+        ID                                  : 11
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -417,7 +381,7 @@ Button b11
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -436,3 +400,39 @@ Button b11
         Touch Press Event
             page cardGrid
         
+Button b1
+    Attributes
+        ID                                  : 12
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 175
+        y coordinate                        : 402
+        Width                               : 100
+        Height                              : 50
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : 3D auto
+        Font ID                             : 3
+        Back. Color                         : 50712
+        Back. Picture ID (Pressed)          : 0
+        Back. Color (Pressed)               : 1024
+        Font Color (Unpressed)              : 0
+        Font Color (Pressed)                : 65535
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        State                               : unpressed
+        Text                                : bauds=115200
+        Max. Text Size                      : 20
+        Word wrap                           : enabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+    Events
+        Touch Press Event
+            bauds=115200
+        

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

@@ -788,9 +788,7 @@ Timer tmSerial
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                         vis tIcon1,1
                                         // change icon color
                                         spstr strCommand.txt,tTmp.txt,"~",2

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

@@ -184,7 +184,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : left
@@ -308,7 +308,7 @@ Button b2
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 9
         Back. Color (Pressed)               : 1024
@@ -357,7 +357,7 @@ Button b1
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 9
         Back. Color (Pressed)               : 1024

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

@@ -227,7 +227,7 @@ Text tMainIcon
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -257,7 +257,7 @@ Text tMainText
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -497,7 +497,7 @@ Text tAMPM
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -707,7 +707,7 @@ Text tMainTextAlt
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : left
@@ -737,7 +737,7 @@ Text tMainIconAlt
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -922,9 +922,7 @@ Timer tmSerial
                                         vis tMRIcon,0
                                         vis tMR,0
                                         //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                         tMainIconAlt.txt=tMainIcon.txt
                                         //tMainText
                                         spstr strCommand.txt,tMainText.txt,"~",2
@@ -932,41 +930,31 @@ Timer tmSerial
                                         //tForecast1
                                         spstr strCommand.txt,tForecast1.txt,"~",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                         //tForecast1Val
                                         spstr strCommand.txt,tForecast1Val.txt,"~",5
                                         //tForecast2
                                         spstr strCommand.txt,tForecast2.txt,"~",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                         //tForecast2Val
                                         spstr strCommand.txt,tForecast2Val.txt,"~",8
                                         //tForecast3
                                         spstr strCommand.txt,tForecast3.txt,"~",9
                                         //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                         //tForecast3Val
                                         spstr strCommand.txt,tForecast3Val.txt,"~",11
                                         //tForecast4
                                         spstr strCommand.txt,tForecast4.txt,"~",12
                                         //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                         //tForecast4Val
                                         spstr strCommand.txt,tForecast4Val.txt,"~",14
                                         //alternative layout
                                         //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
-                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
-                                        if(tTmp.txt!="")
                                         {
                                             //value for tMRIcon, activate alternative layout
                                             vis tMainIcon,0

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

@@ -579,9 +579,7 @@ Timer tmSerial
                                         //id arm4
                                         spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //icon color
                                         spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0

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

@@ -1628,9 +1628,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                             vis tIcon1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -1752,9 +1750,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                             vis tIcon2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -1876,9 +1872,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                             vis tIcon3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -2000,9 +1994,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                             vis tIcon4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24
@@ -2124,9 +2116,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,tIcon5.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
@@ -2248,9 +2238,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,tIcon6.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

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

@@ -613,9 +613,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                             vis bEntity1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -636,9 +634,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                             vis bEntity2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -659,9 +655,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                             vis bEntity3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -682,9 +676,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                             vis bEntity4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24
@@ -705,9 +697,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                             vis bEntity5,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",30
@@ -728,9 +718,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                             vis bEntity6,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",36

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

@@ -540,9 +540,7 @@ Timer tmSerial
                                         //entity name
                                         spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //title
                                         spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
@@ -552,9 +550,7 @@ Timer tmSerial
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                         //speaker current
                                         spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")

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

@@ -704,12 +704,9 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                         {
-                                            // set icon
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
@@ -720,13 +717,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
+                                        if(bt1.txt!="")
                                         {
-                                                // set icon
-                                                covx tTmp.txt,sys0,0,0
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
@@ -737,13 +732,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
-                                                }              //bt2
+                                        }
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        //bt2
-                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt2.txt,"~",18
+                                        if(bt2.txt!="")
                                         {
-                                                    // set icon
-                                                    covx tTmp.txt,sys0,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
@@ -754,13 +747,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
-                                                    }              //bt3
+                                        }
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                        //bt3
-                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt3.txt,"~",22
+                                        if(bt3.txt!="")
                                         {
-                                                        // set icon
-                                                        covx tTmp.txt,sys0,0,0
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
@@ -771,13 +762,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
-                                                        }              //bt4
+                                        }
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                        //bt4
-                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt4.txt,"~",26
+                                        if(bt4.txt!="")
                                         {
-                                                            // set icon
-                                                            covx tTmp.txt,sys0,0,0
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
@@ -788,13 +777,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
-                                                            }              //bt5
+                                        }
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                        //bt5
-                                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt5.txt,"~",30
+                                        if(bt5.txt!="")
                                         {
-                                                                // set icon
-                                                                covx tTmp.txt,sys0,0,0
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
@@ -805,13 +792,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
-                                                                }              //bt6
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                        //bt6
-                                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt6.txt,"~",34
+                                        if(bt6.txt!="")
                                         {
-                                                                    // set icon
-                                                                    covx tTmp.txt,sys0,0,0
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
@@ -822,13 +807,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
-                                                                    }              //bt7
+                                        }
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                        //bt7
-                                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt7.txt,"~",38
+                                        if(bt7.txt!="")
                                         {
-                                                                        // set icon
-                                                                        covx tTmp.txt,sys0,0,0
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
@@ -839,13 +822,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
-                                                                        }              //bt8
+                                        }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        //bt8
-                                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt8.txt,"~",42
+                                        if(bt8.txt!="")
                                         {
-                                                                            // set icon
-                                                                            covx tTmp.txt,sys0,0,0
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0

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

@@ -22,16 +22,6 @@ Variable (string) vaDate
         Text          :  
         Max. Text Size: 35
     
-Text tIcons
-    Attributes
-        Scope                               : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 170
-    
 Text tTmp1
     Attributes
         Scope                               : global

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

@@ -1,207 +0,0 @@
-Page pageSerialTest
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Locked                              : no
-        Swide up page ID                    : disabled
-        Swide down page ID                  : disabled
-        Swide left page ID                  : disabled
-        Swide right page ID                 : disabled
-    
-    Events
-        Preinitialize Event
-            //vis p0,0
-            //recmod=1
-            //bauds=115200
-        
-Number nCrcRecv
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Number nCrcCalc
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Number nIt
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Number nLength
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Text tStatus
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : newtxt
-        Max. Text Size                      : 100
-    
-Text tCmd
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : newtxt
-        Max. Text Size                      : 500
-    
-Text tBuffer
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : newtxt
-        Max. Text Size                      : 100
-    
-Text tDesc
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
-        Max. Text Size                      : 60
-    
-Picture p0
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-    
-Button b0
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : bck
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            recmod=0
-            page pageTest
-        
-Button b1
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : ON
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            recmod=1
-            bauds=115200
-        
-Timer tmSerial
-    Attributes
-        Scope      : local
-        Period (ms): 400
-        Enabled    : yes
-    
-    Events
-        Timer Event
-            // data available
-            if(usize>1)
-            {
-                bufferPos=0
-                while(bufferPos<usize)
-                {
-                    // check for 0x55 0xBB - Command Init Secuence
-                    if(u[bufferPos]==187&&u[bufferPos-1]==85)
-                    {
-                        //remove garbage at the start of the buffer if there's any to free buffer for command
-                        if(u[bufferPos]!=1)
-                        {
-                            udelete bufferPos-1
-                        }
-                        tStatus.txt="init command detected"
-                        //instruction is now aligned with buffer, because we deleted garbage before instrcution
-                        //get length after init sequence (check if there are more than to bytes in buffer)
-                        if(3<usize)
-                        {
-                            // check if serial buffer has reached the announced length
-                            //payloadLength=u[2]
-                            ucopy payloadLength,2,2,0
-                            nLength.val=payloadLength
-                            // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
-                            payloadLength+=3
-                            // payload length does also not contain crc, so we are adding another 2 bytes for crc
-                            payloadLength+=2
-                            if(payloadLength<usize)
-                            {
-                                tStatus.txt="reached"
-                                // calculate crc
-                                crcrest 1,0xFFFF
-                                // payload length -1 to exclude crc
-                                crcputu 0,payloadLength-1 //u[2]+3
-                                // get recived crc to be able to compare it
-                                ucopy recvCrc,payloadLength-1,2,0
-                                nCrcRecv.val=recvCrc
-                                // compare crc with recived value
-                                if(crcval==recvCrc)
-                                {
-                                    tStatus.txt="crc ok"
-                                    nIt.val=nIt.val+1
-                                    ucopy tCmd.txt,4,payloadLength-5,0
-                                    udelete payloadLength-1
-                                    bufferPos=0
-                                    // here is the location where acual code should be
-                                }
-                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
-                                nCrcRecv.val=recvCrc
-                                nCrcCalc.val=crcval
-                                //ucopy nCrcCalc.val,u[2]+3,3,0
-                            }
-                        }
-                    }
-                    // next character
-                    bufferPos++
-                }
-                if(bufferPos==usize)
-                {
-                    // copy whole buffer to tCmd.txt, for debugging
-                    //ucopy tBuffer.txt,0,usize,0
-                    // ucopy nIt.val,0,usize,0
-                    // clear whole buffer
-                    //code_c
-                    //bufferPos=0
-                }
-            }
-        

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

@@ -152,7 +152,7 @@ Text tVersion
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 28
+        Text                                : 30
         Max. Text Size                      : 10
     
 Picture p0

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

@@ -35,20 +35,6 @@ Button b0
         Touch Press Event
             page cardEntities
         
-Button b1
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : serial
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            page pageSerialTest
-        
 Button b3
     Attributes
         Scope                               : local
@@ -176,3 +162,17 @@ Button b11
         Touch Press Event
             page cardGrid
         
+Button b1
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        State                               : unpressed
+        Text                                : bauds=115200
+        Max. Text Size                      : 20
+    
+    Events
+        Touch Press Event
+            bauds=115200
+        

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

@@ -442,9 +442,7 @@ Timer tmSerial
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                         vis tIcon1,1
                                         // change icon color
                                         spstr strCommand.txt,tTmp.txt,"~",2

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

@@ -400,9 +400,7 @@ Timer tmSerial
                                         vis tMRIcon,0
                                         vis tMR,0
                                         //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                         tMainIconAlt.txt=tMainIcon.txt
                                         //tMainText
                                         spstr strCommand.txt,tMainText.txt,"~",2
@@ -410,41 +408,31 @@ Timer tmSerial
                                         //tForecast1
                                         spstr strCommand.txt,tForecast1.txt,"~",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                         //tForecast1Val
                                         spstr strCommand.txt,tForecast1Val.txt,"~",5
                                         //tForecast2
                                         spstr strCommand.txt,tForecast2.txt,"~",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                         //tForecast2Val
                                         spstr strCommand.txt,tForecast2Val.txt,"~",8
                                         //tForecast3
                                         spstr strCommand.txt,tForecast3.txt,"~",9
                                         //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                         //tForecast3Val
                                         spstr strCommand.txt,tForecast3Val.txt,"~",11
                                         //tForecast4
                                         spstr strCommand.txt,tForecast4.txt,"~",12
                                         //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                         //tForecast4Val
                                         spstr strCommand.txt,tForecast4Val.txt,"~",14
                                         //alternative layout
                                         //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
-                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
-                                        if(tTmp.txt!="")
                                         {
                                             //value for tMRIcon, activate alternative layout
                                             vis tMainIcon,0

HMI/code_gen/icons/icons.py

@@ -1,112 +1,57 @@
 import json
 import os
 
-icons = [
-    "alert-circle-outline",
-    "lightbulb",
-    "thermometer",
-    "gesture-tap-button",
-    "flash",
-    "music",
-    "check-circle-outline",
-    "close-circle-outline",
-    "pause",
-    "play",
-    "palette",
-    "window-open",
-    "weather-cloudy",
-    "weather-fog",
-    "weather-hail",
-    "weather-lightning",
-    "weather-lightning-rainy",
-    "weather-night",
-    "weather-partly-cloudy",
-    "weather-pouring",
-    "weather-rainy",
-    "weather-snowy",
-    "weather-snowy-rainy",
-    "weather-sunny",
-    "weather-windy",
-    "weather-windy-variant",
-    "water-percent",
-    "power",
-    "fire",
-    "calendar-sync",
-    "fan",
-    "snowflake",
-    "solar-power",
-    "battery-charging-medium",
-    "battery-medium",
-    "shield-home",
-    "door-open",
-    "door-closed",
-    "window-closed",
-    "shield-off",
-    "shield",
-    "shield-lock",
-    "shield-airplane",
-    "bell-ring",
-    "ray-vertex",
-    "script-text",
-    "home-import-outline",
-    "home-export-outline",
-    "arrow-up-bold",
-    "arrow-down-bold",
-    "cast-audio",
-    "cast",
-    "radio",
-    "fireplace"
-]
-
-
 __location__ = os.path.realpath(
     os.path.join(os.getcwd(), os.path.dirname(__file__)))
 
 with open(os.path.join(__location__, "icons.json"),'r') as f:
     icon_metadata = json.load(f)
 
-icon_nextion_string = ""
-icon_name_list = []
 
-for icon_name in icons:
-    #print(icon_name)
-    icon = next((item for item in icon_metadata if item["name"] == icon_name), None)
-    if icon is None:
-        print(f"WARNING ICON NOT FOUND: {icon_name}")
-    else:
-        hex = icon['hex']
-        s = int(hex, 16)
-        #print(chr(s), end = '')
-        icon_nextion_string += chr(s)
-        icon_name_list.append(icon_name)
 
 # write mapping lib for python
 with open(os.path.join(__location__, "../../../apps/nspanel-lovelace-ui/luibackend", "icon_mapping.py"), 'w') as f:
     f.write("icons = {\n")
-    for idx, val in enumerate(icon_name_list):
+    for icon in icon_metadata:
-        f.write(f"    '{val}': {idx},\n")
+        iconchar = chr(int(icon['hex'], 16))
+        name = icon["name"]
+        f.write(f"    '{name}': '{iconchar}',\n")
     f.write("}\n")
     f.write("""
 def get_icon_id(ma_name):
+    ma_name = ma_name.replace("mdi:","")
     if ma_name in icons:
         return icons[ma_name]
     else:
         return icons["alert-circle-outline"]
     """)
 
-# write documentation file
+# write mapping lib for typescript
-with open(os.path.join(__location__, "../..","icons.md"), 'w') as f:
+with open(os.path.join(__location__, "../../../iobroker", "icon_mapping.ts"), 'w') as f:
+    f.write("let iconMap = new Map<string, string>([\n")
+    for icon in icon_metadata:
+        iconchar = chr(int(icon['hex'], 16))
+        name = icon["name"]
+        f.write(f"    [\"{name}\", \"{iconchar}\"],\n")
+    f.write("]);\n")
     f.write("""
-# Icons IDs
+function get_icon(ma_name:string):string{
-This file contains the Icons IDs included in the display firmware, addressable via serial.
+    if(iconMap.has(ma_name)){
+        return iconMap.get(ma_name);
+    }
+    return iconMap.get("alert-circle-outline");
+}
+""");
 
-ID | MD Icon Name | Icon
+# write documentation file
--- | ------------ | ----
+#with open(os.path.join(__location__, "../..","icons.md"), 'w') as f:
-""")
+#    f.write("""
-    for idx, val in enumerate(icon_name_list):
+## Icons IDs
-        f.write(f"{idx} | {val} | ![{val}](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/{val}.svg)\n")
+#This file contains the Icons IDs included in the display firmware, addressable via serial.
-
+#
-
+#MD Icon Name | Icon
-print("=== STRING for HMI Project ===")
+#------------ | ----
-print("=== Put the following string into the txt field in nextion ===")
+#""")
-print(icon_nextion_string)
+#    for icon in icon_metadata:
+#        val = icon["name"]
+#        f.write(f"mdi:{val} | ![{val}](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/{val}.svg)\n")

HMI/code_gen/pages/cardEntitiesSerial.py

@@ -28,9 +28,7 @@ for i in range(1,7):
               }}else
               {{
                 // change icon
-                spstr strCommand.txt,tTmp.txt,"~",{idxstart+2}
+                spstr strCommand.txt,tIcon{i}.txt,"~",{idxstart+2}
-                covx tTmp.txt,sys0,0,0
-                substr pageIcons.tIcons.txt,tIcon{i}.txt,sys0,1
                 vis tIcon{i},1
                 // change icon color
                 spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}

HMI/code_gen/pages/cardGridSerial.py

@@ -3,7 +3,7 @@ head = sharedhead + """
             if(tInstruction.txt=="entityUpd")
             {
               // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
-              spstr strCommand.txt,tHeading.txt,",",1
+              spstr strCommand.txt,tHeading.txt,"~",1
 """ + navigation
 print(head)
 start = 3
@@ -11,9 +11,9 @@ for i in range(1,7):
     idxstart = start + (i-1)*6
     item = f"""
               // get Type
-              spstr strCommand.txt,type{i}.txt,",",{idxstart}
+              spstr strCommand.txt,type{i}.txt,"~",{idxstart}
               // get internal name
-              spstr strCommand.txt,entn{i}.txt,",",{idxstart+1}
+              spstr strCommand.txt,entn{i}.txt,"~",{idxstart+1}
               if(type{i}.txt=="delete"||type{i}.txt=="")
               {{
                 vis tEntity{i},0
@@ -21,16 +21,14 @@ for i in range(1,7):
               }}else
               {{
                 // change icon
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+2}
+                spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
-                covx tTmp.txt,sys0,0,0
-                substr pageIcons.tIcons.txt,bEntity{i}.txt,sys0,1
                 vis bEntity{i},1
                 // change icon color
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+3}
+                spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
                 covx tTmp.txt,sys0,0,0
                 bEntity{i}.pco=sys0
                 // set name
-                spstr strCommand.txt,tEntity{i}.txt,",",{idxstart+4}
+                spstr strCommand.txt,tEntity{i}.txt,"~",{idxstart+4}
                 vis tEntity{i},1
               }}
 """

HMI/code_gen/pages/cardThermo.py

@@ -3,28 +3,28 @@ text = sharedhead + """
             if(tInstruction.txt=="entityUpd")
             {
               //heading
-              spstr strCommand.txt,tHeading.txt,",",1
+              spstr strCommand.txt,tHeading.txt,"~",1
 """ + navigation
 
 text += """
               //entity name
-              spstr strCommand.txt,entn.txt,",",3
+              spstr strCommand.txt,entn.txt,"~",3
               //currentTemp
-              spstr strCommand.txt,tTmp.txt,",",4
+              spstr strCommand.txt,tTmp.txt,"~",4
               covx tTmp.txt,xTempCurr.val,0,0
               //dstTemp
-              spstr strCommand.txt,tTmp.txt,",",4
+              spstr strCommand.txt,tTmp.txt,"~",5
               covx tTmp.txt,xTempDest.val,0,0
               //status
-              spstr strCommand.txt,tStatus.txt,",",6
+              spstr strCommand.txt,tStatus.txt,"~",6
               //minTemp
-              spstr strCommand.txt,tTmp.txt,",",7
+              spstr strCommand.txt,tTmp.txt,"~",7
               covx tTmp.txt,xTempMin.val,0,0
               //maxTemp
-              spstr strCommand.txt,tTmp.txt,",",8
+              spstr strCommand.txt,tTmp.txt,"~",8
               covx tTmp.txt,xTempMax.val,0,0
               //tempStep
-              spstr strCommand.txt,tTmp.txt,",",9
+              spstr strCommand.txt,tTmp.txt,"~",9
               covx tTmp.txt,xTempStep.val,0,0
               // disable all buttons
               vis bt0,0
@@ -41,21 +41,19 @@ text += """
 start = 10
 for i in range(0,9):
     idxstart = start + i*4
-    text += f"""              //bt{i}
+    text += f"""
-              spstr strCommand.txt,tTmp.txt,",",{idxstart}
+              //bt{i}
-              if(tTmp.txt!="")
+              spstr strCommand.txt,bt{i}.txt,"~",{idxstart}
+              if(bt{i}.txt!="")
               {{
-                // set icon
-                covx tTmp.txt,sys0,0,0
-                substr pageIcons.tIcons.txt,bt{i}.txt,sys0,1
                 // set text color on active state
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+1}
+                spstr strCommand.txt,tTmp.txt,"~",{idxstart+1}
                 covx tTmp.txt,bt{i}.pco2,0,0
                 // set state
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+2}
+                spstr strCommand.txt,tTmp.txt,"~",{idxstart+2}
                 covx tTmp.txt,bt{i}.val,0,0
                 // save action
-                spstr strCommand.txt,va{i}.txt,",",{idxstart+3}
+                spstr strCommand.txt,va{i}.txt,"~",{idxstart+3}
                 //enable
                 vis bt{i},1
               }}"""

HMI/icons.md

@@ -1,60 +0,0 @@
-
-# Icons IDs
-This file contains the Icons IDs included in the display firmware, addressable via serial.
-
-ID | MD Icon Name | Icon
--- | ------------ | ----
-0 | alert-circle-outline | ![alert-circle-outline](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/alert-circle-outline.svg)
-1 | lightbulb | ![lightbulb](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/lightbulb.svg)
-2 | thermometer | ![thermometer](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/thermometer.svg)
-3 | gesture-tap-button | ![gesture-tap-button](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/gesture-tap-button.svg)
-4 | flash | ![flash](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/flash.svg)
-5 | music | ![music](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/music.svg)
-6 | check-circle-outline | ![check-circle-outline](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/check-circle-outline.svg)
-7 | close-circle-outline | ![close-circle-outline](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/close-circle-outline.svg)
-8 | pause | ![pause](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/pause.svg)
-9 | play | ![play](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/play.svg)
-10 | palette | ![palette](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/palette.svg)
-11 | window-open | ![window-open](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/window-open.svg)
-12 | weather-cloudy | ![weather-cloudy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-cloudy.svg)
-13 | weather-fog | ![weather-fog](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-fog.svg)
-14 | weather-hail | ![weather-hail](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-hail.svg)
-15 | weather-lightning | ![weather-lightning](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-lightning.svg)
-16 | weather-lightning-rainy | ![weather-lightning-rainy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-lightning-rainy.svg)
-17 | weather-night | ![weather-night](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-night.svg)
-18 | weather-partly-cloudy | ![weather-partly-cloudy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-partly-cloudy.svg)
-19 | weather-pouring | ![weather-pouring](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-pouring.svg)
-20 | weather-rainy | ![weather-rainy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-rainy.svg)
-21 | weather-snowy | ![weather-snowy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-snowy.svg)
-22 | weather-snowy-rainy | ![weather-snowy-rainy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-snowy-rainy.svg)
-23 | weather-sunny | ![weather-sunny](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-sunny.svg)
-24 | weather-windy | ![weather-windy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-windy.svg)
-25 | weather-windy-variant | ![weather-windy-variant](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-windy-variant.svg)
-26 | water-percent | ![water-percent](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/water-percent.svg)
-27 | power | ![power](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/power.svg)
-28 | fire | ![fire](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/fire.svg)
-29 | calendar-sync | ![calendar-sync](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/calendar-sync.svg)
-30 | fan | ![fan](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/fan.svg)
-31 | snowflake | ![snowflake](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/snowflake.svg)
-32 | solar-power | ![solar-power](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/solar-power.svg)
-33 | battery-charging-medium | ![battery-charging-medium](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/battery-charging-medium.svg)
-34 | battery-medium | ![battery-medium](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/battery-medium.svg)
-35 | shield-home | ![shield-home](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-home.svg)
-36 | door-open | ![door-open](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/door-open.svg)
-37 | door-closed | ![door-closed](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/door-closed.svg)
-38 | window-closed | ![window-closed](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/window-closed.svg)
-39 | shield-off | ![shield-off](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-off.svg)
-40 | shield | ![shield](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield.svg)
-41 | shield-lock | ![shield-lock](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-lock.svg)
-42 | shield-airplane | ![shield-airplane](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-airplane.svg)
-43 | bell-ring | ![bell-ring](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/bell-ring.svg)
-44 | ray-vertex | ![ray-vertex](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/ray-vertex.svg)
-45 | script-text | ![script-text](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/script-text.svg)
-46 | home-import-outline | ![home-import-outline](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/home-import-outline.svg)
-47 | home-export-outline | ![home-export-outline](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/home-export-outline.svg)
-48 | arrow-up-bold | ![arrow-up-bold](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/arrow-up-bold.svg)
-49 | arrow-down-bold | ![arrow-down-bold](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/arrow-down-bold.svg)
-50 | cast-audio | ![cast-audio](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/cast-audio.svg)
-51 | cast | ![cast](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/cast.svg)
-52 | radio | ![radio](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/radio.svg)
-53 | fireplace | ![fireplace](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/fireplace.svg)

HMI/n2t-out-visual/cardAlarm.txt

@@ -199,7 +199,7 @@ Text tCode
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 10565
         Font Color                          : 40179
         Horizontal Alignment                : center
@@ -229,7 +229,7 @@ Text tIcon
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -275,7 +275,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -322,7 +322,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -378,7 +378,7 @@ Button b0
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -416,7 +416,7 @@ Button b1
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -454,7 +454,7 @@ Button b2
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -492,7 +492,7 @@ Button b3
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -530,7 +530,7 @@ Button b4
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -568,7 +568,7 @@ Button b5
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -606,7 +606,7 @@ Button b6
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -644,7 +644,7 @@ Button b7
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -682,7 +682,7 @@ Button b8
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -720,7 +720,7 @@ Button b9
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -758,7 +758,7 @@ Button b10
         Style                               : border
         Border Color                        : 6371
         Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1109,9 +1109,7 @@ Timer tmSerial
                                         //id arm4
                                         spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //icon color
                                         spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0

HMI/n2t-out-visual/cardEntities.txt

@@ -272,7 +272,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -1414,7 +1414,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1468,7 +1468,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -2117,9 +2117,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                             vis tIcon1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -2241,9 +2239,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                             vis tIcon2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -2365,9 +2361,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                             vis tIcon3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -2489,9 +2483,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                             vis tIcon4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24

HMI/n2t-out-visual/cardGrid.txt

@@ -152,7 +152,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -232,7 +232,7 @@ Text tTmp
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 424
+        x coordinate                        : 400
         y coordinate                        : 290
         Width                               : 34
         Height                              : 30
@@ -498,7 +498,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -552,7 +552,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -599,7 +599,7 @@ Button bEntity1
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -657,7 +657,7 @@ Button bEntity2
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -715,7 +715,7 @@ Button bEntity3
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -773,7 +773,7 @@ Button bEntity4
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -831,7 +831,7 @@ Button bEntity5
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -889,7 +889,7 @@ Button bEntity6
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1050,9 +1050,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                             vis bEntity1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -1073,9 +1071,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                             vis bEntity2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -1096,9 +1092,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                             vis bEntity3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -1119,9 +1113,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                             vis bEntity4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24
@@ -1142,9 +1134,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                             vis bEntity5,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",30
@@ -1165,9 +1155,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                             vis bEntity6,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",36

HMI/n2t-out-visual/cardMedia.txt

@@ -93,8 +93,8 @@ Text tTmp
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 450
+        x coordinate                        : 14
-        y coordinate                        : 145
+        y coordinate                        : 156
         Width                               : 27
         Height                              : 30
         Effect                              : load
@@ -153,8 +153,8 @@ Text tId
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 449
+        x coordinate                        : 49
-        y coordinate                        : 187
+        y coordinate                        : 159
         Width                               : 30
         Height                              : 30
         Effect                              : load
@@ -193,7 +193,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -283,7 +283,7 @@ Text t2
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -332,7 +332,7 @@ Text tPlayPause
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -381,7 +381,7 @@ Text t0
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -430,7 +430,7 @@ Text tIcon
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -460,7 +460,7 @@ Text t1
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -510,7 +510,7 @@ Text t3
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -560,7 +560,7 @@ Text t4
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -639,7 +639,7 @@ Text t6
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -681,7 +681,7 @@ Text t5
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Font Color                          : 50712
         Horizontal Alignment                : center
@@ -792,7 +792,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -839,7 +839,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -962,9 +962,7 @@ Timer tmSerial
                                         //entity name
                                         spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //title
                                         spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
@@ -974,9 +972,7 @@ Timer tmSerial
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                         //speaker current
                                         spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")

HMI/n2t-out-visual/cardThermo.txt

@@ -135,7 +135,7 @@ XFloat xTempCurr
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -405,7 +405,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -511,7 +511,7 @@ Button bNext
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -666,7 +666,7 @@ Button bPrev
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 14823
@@ -1257,12 +1257,9 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                         {
-                                            // set icon
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
@@ -1273,13 +1270,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
+                                        if(bt1.txt!="")
                                         {
-                                                // set icon
-                                                covx tTmp.txt,sys0,0,0
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
@@ -1290,13 +1285,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
-                                                }              //bt2
+                                        }
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        //bt2
-                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt2.txt,"~",18
+                                        if(bt2.txt!="")
                                         {
-                                                    // set icon
-                                                    covx tTmp.txt,sys0,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
@@ -1307,13 +1300,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
-                                                    }              //bt3
+                                        }
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                        //bt3
-                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt3.txt,"~",22
+                                        if(bt3.txt!="")
                                         {
-                                                        // set icon
-                                                        covx tTmp.txt,sys0,0,0
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
@@ -1324,13 +1315,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
-                                                        }              //bt4
+                                        }
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                        //bt4
-                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt4.txt,"~",26
+                                        if(bt4.txt!="")
                                         {
-                                                            // set icon
-                                                            covx tTmp.txt,sys0,0,0
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
@@ -1341,13 +1330,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
-                                                            }              //bt5
+                                        }
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                        //bt5
-                                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt5.txt,"~",30
+                                        if(bt5.txt!="")
                                         {
-                                                                // set icon
-                                                                covx tTmp.txt,sys0,0,0
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
@@ -1358,13 +1345,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
-                                                                }              //bt6
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                        //bt6
-                                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt6.txt,"~",34
+                                        if(bt6.txt!="")
                                         {
-                                                                    // set icon
-                                                                    covx tTmp.txt,sys0,0,0
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
@@ -1375,13 +1360,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
-                                                                    }              //bt7
+                                        }
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                        //bt7
-                                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt7.txt,"~",38
+                                        if(bt7.txt!="")
                                         {
-                                                                        // set icon
-                                                                        covx tTmp.txt,sys0,0,0
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
@@ -1392,13 +1375,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
-                                                                        }              //bt8
+                                        }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        //bt8
-                                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt8.txt,"~",42
+                                        if(bt8.txt!="")
                                         {
-                                                                            // set icon
-                                                                            covx tTmp.txt,sys0,0,0
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0

HMI/n2t-out-visual/nspanel_Stats.txt

@@ -2,61 +2,57 @@ Program.s
 	0    Component(s)
 	11   Line(s) of event code
 	11   Unique line(s) of event code
+pageIcons
+	6    Component(s)
+	0    Line(s) of event code
+	0    Unique line(s) of event code
 pageTest
 	13   Component(s)
 	13   Line(s) of event code
 	13   Unique line(s) of event code
-pageSerialTest
-	13   Component(s)
-	48   Line(s) of event code
-	43   Unique line(s) of event code
-pageIcons
-	7    Component(s)
-	0    Line(s) of event code
-	0    Unique line(s) of event code
 popupNotify
 	17   Component(s)
 	178  Line(s) of event code
 	117  Unique line(s) of event code
-popupShutter
-	19   Component(s)
-	178  Line(s) of event code
-	101  Unique line(s) of event code
-popupLight
-	27   Component(s)
-	322  Line(s) of event code
-	173  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
-cardThermo
-	41   Component(s)
-	460  Line(s) of event code
-	284  Unique line(s) of event code
-cardMedia
-	30   Component(s)
-	333  Line(s) of event code
-	170  Unique line(s) of event code
-screensaver
-	33   Component(s)
-	207  Line(s) of event code
-	158  Unique line(s) of event code
-cardAlarm
-	35   Component(s)
-	345  Line(s) of event code
-	214  Unique line(s) of event code
 cardGrid
 	39   Component(s)
-	430  Line(s) of event code
+	418  Line(s) of event code
-	249  Unique line(s) of event code
+	243  Unique line(s) of event code
+popupLight
+	27   Component(s)
+	320  Line(s) of event code
+	173  Unique line(s) of event code
+popupShutter
+	19   Component(s)
+	178  Line(s) of event code
+	101  Unique line(s) of event code
+cardMedia
+	30   Component(s)
+	329  Line(s) of event code
+	168  Unique line(s) of event code
+cardAlarm
+	35   Component(s)
+	343  Line(s) of event code
+	213  Unique line(s) of event code
+cardThermo
+	41   Component(s)
+	442  Line(s) of event code
+	246  Unique line(s) of event code
+screensaver
+	33   Component(s)
+	195  Line(s) of event code
+	152  Unique line(s) of event code
 cardEntities
 	62   Component(s)
-	972  Line(s) of event code
+	964  Line(s) of event code
-	413  Unique line(s) of event code
+	409  Unique line(s) of event code
 
 Total
-	13   Page(s)
+	12   Page(s)
-	355  Component(s)
+	341  Component(s)
-	3647 Line(s) of event code
+	3541 Line(s) of event code
-	1040 Unique line(s) of event code
+	947  Unique line(s) of event code

HMI/n2t-out-visual/pageIcons.txt

@@ -20,51 +20,21 @@ Page pageIcons
     
 Variable (string) vaTime
     Attributes
-        ID            : 5
+        ID            : 4
         Scope         : global
         Text          : 
         Max. Text Size: 15
     
 Variable (string) vaDate
     Attributes
-        ID            : 6
+        ID            : 5
         Scope         : global
         Text          : 
         Max. Text Size: 35
     
-Text tIcons
-    Attributes
-        ID                                  : 2
-        Scope                               : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 1
-        y coordinate                        : 8
-        Width                               : 298
-        Height                              : 299
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 1
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : left
-        Vertical Alignment                  : top
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 170
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
 Text tTmp1
     Attributes
-        ID                                  : 3
+        ID                                  : 2
         Scope                               : global
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -94,7 +64,7 @@ Text tTmp1
     
 Text tTmp2
     Attributes
-        ID                                  : 4
+        ID                                  : 3
         Scope                               : global
         Dragging                            : 0
         Disable release event after dragging: 0

HMI/n2t-out-visual/pageSerialTest.txt

@@ -1,434 +0,0 @@
-Page pageSerialTest
-    Attributes
-        ID                                  : 0
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        Width                               : 480
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Locked                              : no
-        Swide up page ID                    : disabled
-        Swide down page ID                  : disabled
-        Swide left page ID                  : disabled
-        Swide right page ID                 : disabled
-        Fill                                : solid color
-        Back. Color                         : 65535
-    
-    Events
-        Preinitialize Event
-            //vis p0,0
-            //recmod=1
-            //bauds=115200
-        
-Number nCrcRecv
-    Attributes
-        ID                                  : 5
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 160
-        y coordinate                        : 0
-        Width                               : 88
-        Height                              : 29
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Value                               : 0
-        Significant digits shown            : all
-        Format                              : decimal with digit grouping
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Number nCrcCalc
-    Attributes
-        ID                                  : 6
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 159
-        y coordinate                        : 31
-        Width                               : 90
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Value                               : 0
-        Significant digits shown            : all
-        Format                              : decimal with digit grouping
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Number nIt
-    Attributes
-        ID                                  : 11
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 378
-        y coordinate                        : 234
-        Width                               : 52
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        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
-    
-Number nLength
-    Attributes
-        ID                                  : 12
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 15
-        y coordinate                        : 215
-        Width                               : 100
-        Height                              : 30
-        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 tStatus
-    Attributes
-        ID                                  : 3
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 160
-        y coordinate                        : 60
-        Width                               : 271
-        Height                              : 90
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : newtxt
-        Max. Text Size                      : 100
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tCmd
-    Attributes
-        ID                                  : 4
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 160
-        y coordinate                        : 151
-        Width                               : 272
-        Height                              : 80
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : newtxt
-        Max. Text Size                      : 500
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tBuffer
-    Attributes
-        ID                                  : 7
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 7
-        y coordinate                        : 270
-        Width                               : 435
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : newtxt
-        Max. Text Size                      : 100
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tDesc
-    Attributes
-        ID                                  : 8
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 0
-        y coordinate                        : 0
-        Width                               : 159
-        Height                              : 204
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 4
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
-        Max. Text Size                      : 60
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Picture p0
-    Attributes
-        ID                                  : 1
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 0
-        y coordinate                        : 0
-        Width                               : 479
-        Height                              : 319
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Picture ID                          : 0
-    
-Button b0
-    Attributes
-        ID                                  : 9
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 334
-        y coordinate                        : 9
-        Width                               : 46
-        Height                              : 46
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : 3D auto
-        Font ID                             : 4
-        Back. Color                         : 50712
-        Back. Picture ID (Pressed)          : 0
-        Back. Color (Pressed)               : 1024
-        Font Color (Unpressed)              : 0
-        Font Color (Pressed)                : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        State                               : unpressed
-        Text                                : bck
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-    Events
-        Touch Press Event
-            recmod=0
-            page pageTest
-        
-Button b1
-    Attributes
-        ID                                  : 10
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 392
-        y coordinate                        : 10
-        Width                               : 48
-        Height                              : 48
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : 3D auto
-        Font ID                             : 4
-        Back. Color                         : 50712
-        Back. Picture ID (Pressed)          : 0
-        Back. Color (Pressed)               : 1024
-        Font Color (Unpressed)              : 0
-        Font Color (Pressed)                : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        State                               : unpressed
-        Text                                : ON
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-    Events
-        Touch Press Event
-            recmod=1
-            bauds=115200
-        
-Timer tmSerial
-    Attributes
-        ID         : 2
-        Scope      : local
-        Period (ms): 400
-        Enabled    : yes
-    
-    Events
-        Timer Event
-            // data available
-            if(usize>1)
-            {
-                bufferPos=0
-                while(bufferPos<usize)
-                {
-                    // check for 0x55 0xBB - Command Init Secuence
-                    if(u[bufferPos]==187&&u[bufferPos-1]==85)
-                    {
-                        //remove garbage at the start of the buffer if there's any to free buffer for command
-                        if(u[bufferPos]!=1)
-                        {
-                            udelete bufferPos-1
-                        }
-                        tStatus.txt="init command detected"
-                        //instruction is now aligned with buffer, because we deleted garbage before instrcution
-                        //get length after init sequence (check if there are more than to bytes in buffer)
-                        if(3<usize)
-                        {
-                            // check if serial buffer has reached the announced length
-                            //payloadLength=u[2]
-                            ucopy payloadLength,2,2,0
-                            nLength.val=payloadLength
-                            // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
-                            payloadLength+=3
-                            // payload length does also not contain crc, so we are adding another 2 bytes for crc
-                            payloadLength+=2
-                            if(payloadLength<usize)
-                            {
-                                tStatus.txt="reached"
-                                // calculate crc
-                                crcrest 1,0xFFFF
-                                // payload length -1 to exclude crc
-                                crcputu 0,payloadLength-1 //u[2]+3
-                                // get recived crc to be able to compare it
-                                ucopy recvCrc,payloadLength-1,2,0
-                                nCrcRecv.val=recvCrc
-                                // compare crc with recived value
-                                if(crcval==recvCrc)
-                                {
-                                    tStatus.txt="crc ok"
-                                    nIt.val=nIt.val+1
-                                    ucopy tCmd.txt,4,payloadLength-5,0
-                                    udelete payloadLength-1
-                                    bufferPos=0
-                                    // here is the location where acual code should be
-                                }
-                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
-                                nCrcRecv.val=recvCrc
-                                nCrcCalc.val=crcval
-                                //ucopy nCrcCalc.val,u[2]+3,3,0
-                            }
-                        }
-                    }
-                    // next character
-                    bufferPos++
-                }
-                if(bufferPos==usize)
-                {
-                    // copy whole buffer to tCmd.txt, for debugging
-                    //ucopy tBuffer.txt,0,usize,0
-                    // ucopy nIt.val,0,usize,0
-                    // clear whole buffer
-                    //code_c
-                    //bufferPos=0
-                }
-            }
-        

HMI/n2t-out-visual/pageStartup.txt

@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 28
+        Text                                : 30
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0

HMI/n2t-out-visual/pageTest.txt

@@ -56,7 +56,7 @@ Button b0
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -75,7 +75,7 @@ Button b0
         Touch Press Event
             page cardEntities
         
-Button b1
+Button b3
     Attributes
         ID                                  : 3
         Scope                               : local
@@ -84,43 +84,7 @@ Button b1
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 347
-        y coordinate                        : 262
+        y coordinate                        : 184
-        Width                               : 100
-        Height                              : 50
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : 3D auto
-        Font ID                             : 4
-        Back. Color                         : 50712
-        Back. Picture ID (Pressed)          : 65535
-        Back. Color (Pressed)               : 1024
-        Font Color (Unpressed)              : 0
-        Font Color (Pressed)                : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        State                               : unpressed
-        Text                                : serial
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-    Events
-        Touch Press Event
-            page pageSerialTest
-        
-Button b3
-    Attributes
-        ID                                  : 4
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 345
-        y coordinate                        : 195
         Width                               : 102
         Height                              : 63
         Effect                              : load
@@ -128,7 +92,7 @@ Button b3
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 0
         Back. Color (Pressed)               : 1024
@@ -149,7 +113,7 @@ Button b3
         
 Button b6
     Attributes
-        ID                                  : 5
+        ID                                  : 4
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -164,7 +128,7 @@ Button b6
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -185,7 +149,7 @@ Button b6
         
 Button b4
     Attributes
-        ID                                  : 6
+        ID                                  : 5
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -200,7 +164,7 @@ Button b4
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -221,7 +185,7 @@ Button b4
         
 Button b5
     Attributes
-        ID                                  : 7
+        ID                                  : 6
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -236,7 +200,7 @@ Button b5
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -257,7 +221,7 @@ Button b5
         
 Button b7
     Attributes
-        ID                                  : 8
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -272,7 +236,7 @@ Button b7
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -293,7 +257,7 @@ Button b7
         
 Button b8
     Attributes
-        ID                                  : 9
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -308,7 +272,7 @@ Button b8
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -330,7 +294,7 @@ Button b8
         
 Button b9
     Attributes
-        ID                                  : 10
+        ID                                  : 9
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -345,7 +309,7 @@ Button b9
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -366,7 +330,7 @@ Button b9
         
 Button b10
     Attributes
-        ID                                  : 11
+        ID                                  : 10
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -381,7 +345,7 @@ Button b10
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -402,7 +366,7 @@ Button b10
         
 Button b11
     Attributes
-        ID                                  : 12
+        ID                                  : 11
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -417,7 +381,7 @@ Button b11
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
         Back. Color                         : 50712
         Back. Picture ID (Pressed)          : 65535
         Back. Color (Pressed)               : 1024
@@ -436,3 +400,39 @@ Button b11
         Touch Press Event
             page cardGrid
         
+Button b1
+    Attributes
+        ID                                  : 12
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 349
+        y coordinate                        : 252
+        Width                               : 102
+        Height                              : 63
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : 3D auto
+        Font ID                             : 1
+        Back. Color                         : 50712
+        Back. Picture ID (Pressed)          : 0
+        Back. Color (Pressed)               : 1024
+        Font Color (Unpressed)              : 0
+        Font Color (Pressed)                : 65535
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        State                               : unpressed
+        Text                                : bauds=115200
+        Max. Text Size                      : 20
+        Word wrap                           : enabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+    Events
+        Touch Press Event
+            bauds=115200
+        

HMI/n2t-out-visual/popupLight.txt

@@ -788,9 +788,7 @@ Timer tmSerial
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                         vis tIcon1,1
                                         // change icon color
                                         spstr strCommand.txt,tTmp.txt,"~",2

HMI/n2t-out-visual/popupNotify.txt

@@ -184,7 +184,7 @@ Text tHeading
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Font Color                          : 65535
         Horizontal Alignment                : left
@@ -308,7 +308,7 @@ Button b2
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 9
         Back. Color (Pressed)               : 1024
@@ -357,7 +357,7 @@ Button b1
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 6371
         Back. Picture ID (Pressed)          : 9
         Back. Color (Pressed)               : 1024

HMI/n2t-out-visual/screensaver.txt

@@ -48,80 +48,20 @@ Variable (string) strCommand
     
 Variable (string) tId
     Attributes
-        ID            : 19
+        ID            : 17
         Scope         : local
         Text          : 
         Max. Text Size: 25
     
 Variable (int32) vaTap
     Attributes
-        ID   : 27
+        ID   : 25
         Scope: local
         Value: 0
     
-Text tInstruction
-    Attributes
-        ID                                  : 5
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 450
-        y coordinate                        : 186
-        Width                               : 27
-        Height                              : 30
-        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
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 50
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
-Text tTmp
-    Attributes
-        ID                                  : 6
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 451
-        y coordinate                        : 228
-        Width                               : 25
-        Height                              : 30
-        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
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 50
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
 Text tTime
     Attributes
-        ID                                  : 7
+        ID                                  : 5
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -151,7 +91,7 @@ Text tTime
     
 Text tDate
     Attributes
-        ID                                  : 8
+        ID                                  : 6
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -167,7 +107,7 @@ Text tDate
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -181,14 +121,14 @@ Text tDate
     
 Text tSend
     Attributes
-        ID                                  : 9
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 451
+        x coordinate                        : 405
-        y coordinate                        : 9
+        y coordinate                        : 2
         Width                               : 29
         Height                              : 30
         Effect                              : load
@@ -211,7 +151,7 @@ Text tSend
     
 Text tMainIcon
     Attributes
-        ID                                  : 10
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -227,6 +167,36 @@ Text tMainIcon
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
+        Font ID                             : 4
+        Back. Color                         : 0
+        Font Color                          : 65535
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 10
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+Text tMainText
+    Attributes
+        ID                                  : 9
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 7
+        y coordinate                        : 267
+        Width                               : 110
+        Height                              : 43
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
         Font ID                             : 3
         Back. Color                         : 0
         Font Color                          : 65535
@@ -239,39 +209,9 @@ Text tMainIcon
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
-Text tMainText
-    Attributes
-        ID                                  : 11
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 7
-        y coordinate                        : 267
-        Width                               : 110
-        Height                              : 43
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 2
-        Back. Color                         : 0
-        Font Color                          : 65535
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 10
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
 Text tForecast1
     Attributes
-        ID                                  : 12
+        ID                                  : 10
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -301,7 +241,7 @@ Text tForecast1
     
 Text tForecast1Val
     Attributes
-        ID                                  : 13
+        ID                                  : 11
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -331,7 +271,7 @@ Text tForecast1Val
     
 Text tF1Icon
     Attributes
-        ID                                  : 14
+        ID                                  : 12
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -361,7 +301,7 @@ Text tF1Icon
     
 Text tForecast2
     Attributes
-        ID                                  : 15
+        ID                                  : 13
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -391,7 +331,7 @@ Text tForecast2
     
 Text tF2Icon
     Attributes
-        ID                                  : 16
+        ID                                  : 14
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -421,7 +361,7 @@ Text tF2Icon
     
 Text tForecast2Val
     Attributes
-        ID                                  : 17
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -451,7 +391,7 @@ Text tForecast2Val
     
 Text t10
     Attributes
-        ID                                  : 18
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -481,7 +421,7 @@ Text t10
     
 Text tAMPM
     Attributes
-        ID                                  : 20
+        ID                                  : 18
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -497,7 +437,7 @@ Text tAMPM
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -511,7 +451,7 @@ Text tAMPM
     
 Text tForecast3Val
     Attributes
-        ID                                  : 21
+        ID                                  : 19
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -541,7 +481,7 @@ Text tForecast3Val
     
 Text tF3Icon
     Attributes
-        ID                                  : 22
+        ID                                  : 20
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -571,7 +511,7 @@ Text tF3Icon
     
 Text tForecast3
     Attributes
-        ID                                  : 23
+        ID                                  : 21
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -601,7 +541,7 @@ Text tForecast3
     
 Text tForecast4
     Attributes
-        ID                                  : 24
+        ID                                  : 22
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -631,7 +571,7 @@ Text tForecast4
     
 Text tF4Icon
     Attributes
-        ID                                  : 25
+        ID                                  : 23
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -661,7 +601,7 @@ Text tF4Icon
     
 Text tForecast4Val
     Attributes
-        ID                                  : 26
+        ID                                  : 24
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -691,7 +631,7 @@ Text tForecast4Val
     
 Text tMainTextAlt
     Attributes
-        ID                                  : 29
+        ID                                  : 27
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -707,7 +647,7 @@ Text tMainTextAlt
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : left
@@ -721,7 +661,7 @@ Text tMainTextAlt
     
 Text tMainIconAlt
     Attributes
-        ID                                  : 30
+        ID                                  : 28
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -737,7 +677,7 @@ Text tMainIconAlt
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
         Back. Color                         : 0
         Font Color                          : 65535
         Horizontal Alignment                : center
@@ -751,7 +691,7 @@ Text tMainIconAlt
     
 Text tMRIcon
     Attributes
-        ID                                  : 31
+        ID                                  : 29
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -781,7 +721,7 @@ Text tMRIcon
     
 Text tMR
     Attributes
-        ID                                  : 32
+        ID                                  : 30
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -809,6 +749,66 @@ Text tMR
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tTmp
+    Attributes
+        ID                                  : 31
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 368
+        y coordinate                        : 0
+        Width                               : 25
+        Height                              : 30
+        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
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 50
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+Text tInstruction
+    Attributes
+        ID                                  : 32
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 335
+        y coordinate                        : 0
+        Width                               : 27
+        Height                              : 30
+        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
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 50
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
@@ -922,9 +922,7 @@ Timer tmSerial
                                         vis tMRIcon,0
                                         vis tMR,0
                                         //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                         tMainIconAlt.txt=tMainIcon.txt
                                         //tMainText
                                         spstr strCommand.txt,tMainText.txt,"~",2
@@ -932,41 +930,31 @@ Timer tmSerial
                                         //tForecast1
                                         spstr strCommand.txt,tForecast1.txt,"~",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                         //tForecast1Val
                                         spstr strCommand.txt,tForecast1Val.txt,"~",5
                                         //tForecast2
                                         spstr strCommand.txt,tForecast2.txt,"~",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                         //tForecast2Val
                                         spstr strCommand.txt,tForecast2Val.txt,"~",8
                                         //tForecast3
                                         spstr strCommand.txt,tForecast3.txt,"~",9
                                         //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                         //tForecast3Val
                                         spstr strCommand.txt,tForecast3Val.txt,"~",11
                                         //tForecast4
                                         spstr strCommand.txt,tForecast4.txt,"~",12
                                         //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                         //tForecast4Val
                                         spstr strCommand.txt,tForecast4Val.txt,"~",14
                                         //alternative layout
                                         //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
-                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
-                                        if(tTmp.txt!="")
                                         {
                                             //value for tMRIcon, activate alternative layout
                                             vis tMainIcon,0
@@ -1057,7 +1045,7 @@ Timer tmSerial
         
 Timer tmSleep
     Attributes
-        ID         : 28
+        ID         : 26
         Scope      : local
         Period (ms): 1000
         Enabled    : yes

HMI/n2t-out/cardAlarm.txt

@@ -579,9 +579,7 @@ Timer tmSerial
                                         //id arm4
                                         spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //icon color
                                         spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0

HMI/n2t-out/cardEntities.txt

@@ -1172,9 +1172,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                             vis tIcon1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -1296,9 +1294,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                             vis tIcon2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -1420,9 +1416,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                             vis tIcon3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -1544,9 +1538,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                             vis tIcon4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24

HMI/n2t-out/cardGrid.txt

@@ -613,9 +613,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                             vis bEntity1,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",6
@@ -636,9 +634,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                             vis bEntity2,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",12
@@ -659,9 +655,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                             vis bEntity3,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",18
@@ -682,9 +676,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                             vis bEntity4,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",24
@@ -705,9 +697,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                             vis bEntity5,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",30
@@ -728,9 +718,7 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                             vis bEntity6,1
                                             // change icon color
                                             spstr strCommand.txt,tTmp.txt,"~",36

HMI/n2t-out/cardMedia.txt

@@ -540,9 +540,7 @@ Timer tmSerial
                                         //entity name
                                         spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //title
                                         spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
@@ -552,9 +550,7 @@ Timer tmSerial
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                         //speaker current
                                         spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")

HMI/n2t-out/cardThermo.txt

@@ -704,12 +704,9 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                         {
-                                            // set icon
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
@@ -720,13 +717,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
+                                        if(bt1.txt!="")
                                         {
-                                                // set icon
-                                                covx tTmp.txt,sys0,0,0
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
@@ -737,13 +732,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
-                                                }              //bt2
+                                        }
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        //bt2
-                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt2.txt,"~",18
+                                        if(bt2.txt!="")
                                         {
-                                                    // set icon
-                                                    covx tTmp.txt,sys0,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
@@ -754,13 +747,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
-                                                    }              //bt3
+                                        }
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                        //bt3
-                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt3.txt,"~",22
+                                        if(bt3.txt!="")
                                         {
-                                                        // set icon
-                                                        covx tTmp.txt,sys0,0,0
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
@@ -771,13 +762,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
-                                                        }              //bt4
+                                        }
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                        //bt4
-                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt4.txt,"~",26
+                                        if(bt4.txt!="")
                                         {
-                                                            // set icon
-                                                            covx tTmp.txt,sys0,0,0
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
@@ -788,13 +777,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
-                                                            }              //bt5
+                                        }
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                        //bt5
-                                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt5.txt,"~",30
+                                        if(bt5.txt!="")
                                         {
-                                                                // set icon
-                                                                covx tTmp.txt,sys0,0,0
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
@@ -805,13 +792,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
-                                                                }              //bt6
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                        //bt6
-                                                                if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt6.txt,"~",34
+                                        if(bt6.txt!="")
                                         {
-                                                                    // set icon
-                                                                    covx tTmp.txt,sys0,0,0
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
@@ -822,13 +807,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
-                                                                    }              //bt7
+                                        }
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                        //bt7
-                                                                    if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt7.txt,"~",38
+                                        if(bt7.txt!="")
                                         {
-                                                                        // set icon
-                                                                        covx tTmp.txt,sys0,0,0
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
@@ -839,13 +822,11 @@ Timer tmSerial
                                             spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
-                                                                        }              //bt8
+                                        }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        //bt8
-                                                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt8.txt,"~",42
+                                        if(bt8.txt!="")
                                         {
-                                                                            // set icon
-                                                                            covx tTmp.txt,sys0,0,0
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
                                             // set text color on active state
                                             spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0

HMI/n2t-out/pageIcons.txt

@@ -22,16 +22,6 @@ Variable (string) vaDate
         Text          : 
         Max. Text Size: 35
     
-Text tIcons
-    Attributes
-        Scope                               : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 170
-    
 Text tTmp1
     Attributes
         Scope                               : global

HMI/n2t-out/pageSerialTest.txt

@@ -1,207 +0,0 @@
-Page pageSerialTest
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Locked                              : no
-        Swide up page ID                    : disabled
-        Swide down page ID                  : disabled
-        Swide left page ID                  : disabled
-        Swide right page ID                 : disabled
-    
-    Events
-        Preinitialize Event
-            //vis p0,0
-            //recmod=1
-            //bauds=115200
-        
-Number nCrcRecv
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Number nCrcCalc
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Number nIt
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Number nLength
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Text tStatus
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : newtxt
-        Max. Text Size                      : 100
-    
-Text tCmd
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : newtxt
-        Max. Text Size                      : 500
-    
-Text tBuffer
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : newtxt
-        Max. Text Size                      : 100
-    
-Text tDesc
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
-        Max. Text Size                      : 60
-    
-Picture p0
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-    
-Button b0
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : bck
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            recmod=0
-            page pageTest
-        
-Button b1
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : ON
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            recmod=1
-            bauds=115200
-        
-Timer tmSerial
-    Attributes
-        Scope      : local
-        Period (ms): 400
-        Enabled    : yes
-    
-    Events
-        Timer Event
-            // data available
-            if(usize>1)
-            {
-                bufferPos=0
-                while(bufferPos<usize)
-                {
-                    // check for 0x55 0xBB - Command Init Secuence
-                    if(u[bufferPos]==187&&u[bufferPos-1]==85)
-                    {
-                        //remove garbage at the start of the buffer if there's any to free buffer for command
-                        if(u[bufferPos]!=1)
-                        {
-                            udelete bufferPos-1
-                        }
-                        tStatus.txt="init command detected"
-                        //instruction is now aligned with buffer, because we deleted garbage before instrcution
-                        //get length after init sequence (check if there are more than to bytes in buffer)
-                        if(3<usize)
-                        {
-                            // check if serial buffer has reached the announced length
-                            //payloadLength=u[2]
-                            ucopy payloadLength,2,2,0
-                            nLength.val=payloadLength
-                            // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
-                            payloadLength+=3
-                            // payload length does also not contain crc, so we are adding another 2 bytes for crc
-                            payloadLength+=2
-                            if(payloadLength<usize)
-                            {
-                                tStatus.txt="reached"
-                                // calculate crc
-                                crcrest 1,0xFFFF
-                                // payload length -1 to exclude crc
-                                crcputu 0,payloadLength-1 //u[2]+3
-                                // get recived crc to be able to compare it
-                                ucopy recvCrc,payloadLength-1,2,0
-                                nCrcRecv.val=recvCrc
-                                // compare crc with recived value
-                                if(crcval==recvCrc)
-                                {
-                                    tStatus.txt="crc ok"
-                                    nIt.val=nIt.val+1
-                                    ucopy tCmd.txt,4,payloadLength-5,0
-                                    udelete payloadLength-1
-                                    bufferPos=0
-                                    // here is the location where acual code should be
-                                }
-                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
-                                nCrcRecv.val=recvCrc
-                                nCrcCalc.val=crcval
-                                //ucopy nCrcCalc.val,u[2]+3,3,0
-                            }
-                        }
-                    }
-                    // next character
-                    bufferPos++
-                }
-                if(bufferPos==usize)
-                {
-                    // copy whole buffer to tCmd.txt, for debugging
-                    //ucopy tBuffer.txt,0,usize,0
-                    // ucopy nIt.val,0,usize,0
-                    // clear whole buffer
-                    //code_c
-                    //bufferPos=0
-                }
-            }
-        

HMI/n2t-out/pageStartup.txt

@@ -152,7 +152,7 @@ Text tVersion
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 28
+        Text                                : 30
         Max. Text Size                      : 10
     
 Picture p0

HMI/n2t-out/pageTest.txt

@@ -35,20 +35,6 @@ Button b0
         Touch Press Event
             page cardEntities
         
-Button b1
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : serial
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            page pageSerialTest
-        
 Button b3
     Attributes
         Scope                               : local
@@ -176,3 +162,17 @@ Button b11
         Touch Press Event
             page cardGrid
         
+Button b1
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        State                               : unpressed
+        Text                                : bauds=115200
+        Max. Text Size                      : 20
+    
+    Events
+        Touch Press Event
+            bauds=115200
+        

HMI/n2t-out/popupLight.txt

@@ -442,9 +442,7 @@ Timer tmSerial
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                         vis tIcon1,1
                                         // change icon color
                                         spstr strCommand.txt,tTmp.txt,"~",2

HMI/n2t-out/screensaver.txt

@@ -48,26 +48,6 @@ Variable (int32) vaTap
         Scope: local
         Value: 0
     
-Text tInstruction
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 50
-    
-Text tTmp
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 50
-    
 Text tTime
     Attributes
         Scope                               : local
@@ -298,6 +278,26 @@ Text tMR
         Text                                : 
         Max. Text Size                      : 10
     
+Text tTmp
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 50
+    
+Text tInstruction
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 50
+    
 Picture p0
     Attributes
         Scope                               : local
@@ -400,9 +400,7 @@ Timer tmSerial
                                         vis tMRIcon,0
                                         vis tMR,0
                                         //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                         tMainIconAlt.txt=tMainIcon.txt
                                         //tMainText
                                         spstr strCommand.txt,tMainText.txt,"~",2
@@ -410,41 +408,31 @@ Timer tmSerial
                                         //tForecast1
                                         spstr strCommand.txt,tForecast1.txt,"~",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                         //tForecast1Val
                                         spstr strCommand.txt,tForecast1Val.txt,"~",5
                                         //tForecast2
                                         spstr strCommand.txt,tForecast2.txt,"~",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                         //tForecast2Val
                                         spstr strCommand.txt,tForecast2Val.txt,"~",8
                                         //tForecast3
                                         spstr strCommand.txt,tForecast3.txt,"~",9
                                         //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                         //tForecast3Val
                                         spstr strCommand.txt,tForecast3Val.txt,"~",11
                                         //tForecast4
                                         spstr strCommand.txt,tForecast4.txt,"~",12
                                         //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                         //tForecast4Val
                                         spstr strCommand.txt,tForecast4Val.txt,"~",14
                                         //alternative layout
                                         //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
-                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
-                                        if(tTmp.txt!="")
                                         {
                                             //value for tMRIcon, activate alternative layout
                                             vis tMainIcon,0

README.md

@@ -371,6 +371,7 @@ key | optional | type | default | description
 `weatherOverrideForecast4` | True | complex | `None` | sensor entity from home assistant here to override the forth weather forecast item on the screensaver
 `doubleTapToUnlock` | True | boolean | `False` | requires to tap screensaver two times
 `alternativeLayout` | True | boolean | `False` | alternative layout with humidity
+`defaultCard` | True | string | `None` | default page after exiting screensaver; only works with top level cards defined in cards; needs to be a navigation item, see subpages (navigate.type_key)
 `key` | True | string | `None` | Used by navigate items
 
 Example for the weatherOverride config options:
@@ -397,7 +398,7 @@ It is possible to schedule a brightness change for the screen at specific times.
 #### Override Icons or Names
 
 To override Icons or Names of entities you can configure an icon and/or name in your configuration, please see the following example.
-Only the icons listed in the [Icon Table](HMI#icons-ids) are useable.
+Only the icons listed in the [Icon Cheetsheet](https://htmlpreview.github.io/?https://github.com/joBr99/nspanel-lovelace-ui/blob/main/HMI/icon-cheatsheet.html) are useable.
 
 ```yaml
         entities:
@@ -408,7 +409,7 @@ Only the icons listed in the [Icon Table](HMI#icons-ids) are useable.
 
 #### Subpages
 
-You can configure entities with with the prefix `navigate`, that are navigating to cards, in case it's hidden page, the navigation items will change and the arrow is bringing you back to the current page on the top level.
+You can configure entities with with the prefix `navigate`, that are navigating to cards, in case it's hidden card, the navigation items will change and the arrow is bringing you back to the privious page.
 
 ```yaml
           - entity: navigate.cardGrid_testKey
@@ -463,14 +464,6 @@ Since release 1.1 you can update the berry driver directly from the Tasmota Cons
 1. Make sure to use the [tasmota32-nspanel.bin](https://github.com/tasmota/install/raw/main/firmware/unofficial/tasmota32-nspanel.bin) Tasmota build.
 2. Make sure to use HTTP and **not HTTPS**
 
-### My flashing doesn't start at all
-
-Try to send the FlashNextion command a second time.
-
-### My flashing got interrupted and the loading bar does not longer change.
-
-Reboot Tasmota and try to flash it a second time.
-
 ### Waiting for content - This is taking longer than usual on the screen
 
 Please check your MQTT Topics in your apps.yaml and your mqtt configuration on tasmota.

appdaemon/README.md

@@ -0,0 +1,12 @@
+# Example configurations
+
+This folder contains some example configs
+
+## appdaemon.yaml
+
+Example config for appademon itself
+
+## apps.yaml
+
+"Simple" Example Config with all possible entity types
+

apps/nspanel-lovelace-ui/luibackend/config.py

@@ -6,6 +6,12 @@ HA_API = None
 
 class Entity(object):
     def __init__(self, entity_input_config):
+        if type(entity_input_config) is not dict:
+            LOGGER.error("Config error, not a dict check your entity configs")
+            self.entityId = "error"
+            self.nameOverride = None
+            self.iconOverride = None
+        else:
             self.entityId = entity_input_config.get("entity", "unknown")
             self.nameOverride = entity_input_config.get("name")
             self.iconOverride = entity_input_config.get("icon")
@@ -84,7 +90,8 @@ class LuiBackendConfig(object):
             'weatherOverrideForecast3': None,
             'weatherOverrideForecast4': None,
             'doubleTapToUnlock': False,
-            'alternativeLayout': False
+            'alternativeLayout': False,
+            'defaultCard': None
         },
         'hiddenCards': []
     }

apps/nspanel-lovelace-ui/luibackend/controller.py

@@ -15,6 +15,7 @@ class LuiController(object):
 
         # first card (default, after startup)
         self._current_card = self._config.getCard(0)
+        self._previous_cards = []
         
         self._pages_gen = LuiPagesGen(ha_api, config, send_mqtt_msg)
 
@@ -132,9 +133,16 @@ class LuiController(object):
         LOGGER.info(f"Button Press Event; entity_id: {entity_id}; button_type: {button_type}; value: {value} ")
         # internal buttons
         if entity_id == "screensaver" and button_type == "bExit":
-            if self._config.get("doubleTapToUnlock") and int(value) >= 2:
+            # get default card if there is one
+            if self._config.get("screensaver.defaultCard") is not None:
+                dstCard = self._config.searchCard(self._config.get("screensaver.defaultCard"))
+                if dstCard is not None:
+                    self._previous_cards = []
+                    self._current_card = dstCard
+            # check for double tap if configured and render current page
+            if self._config.get("screensaver.doubleTapToUnlock") and int(value) >= 2:
                 self._pages_gen.render_card(self._current_card)
-            elif not self._config.get("doubleTapToUnlock"):
+            elif not self._config.get("screensaver.doubleTapToUnlock"):
                 self._pages_gen.render_card(self._current_card)
             return
             
@@ -145,8 +153,8 @@ class LuiController(object):
         if button_type == "bExit":
             self._pages_gen.render_card(self._current_card)
         if button_type == "bUp":
-            self._current_card = self._previous_card
+            self._current_card = self._previous_cards.pop()
-            self._pages_gen.render_card(self._previous_card)
+            self._pages_gen.render_card(self._current_card)
 
         if button_type == "bNext":
             card = self._config.getCard(self._current_card.pos+1)
@@ -184,7 +192,7 @@ class LuiController(object):
         if button_type == "button":
             if entity_id.startswith('navigate'):
                 # internal for navigation to nested pages
-                self._previous_card = self._current_card
+                self._previous_cards.append(self._current_card)
                 self._current_card = self._config.searchCard(entity_id)
                 self._pages_gen.render_card(self._current_card)
             elif entity_id.startswith('scene'):

apps/nspanel-lovelace-ui/luibackend/localization.py

@@ -1,5 +1,5 @@
 translations = {
-    'af_ZA': {
+        'af': {
             'ACTIVATE': "Aktiveer",
             'aux_heat': "Aanvullende hitte",
             'cooling': "Koel Af",
@@ -16,7 +16,42 @@ translations = {
             'disarm': "Skakel Af",
             'run': "Hardloop",
         },
-    'ca_ES': {
+        'ar': {
+            'ACTIVATE': "تفعيل",
+            'aux_heat': "حرارة Aux",
+            'cooling': "تبريد",
+            'drying': "تجفيف",
+            'fan': "مروحة",
+            'idle': "خامل",
+            'off': "مطفئ",
+            'arm_away': "تفعيل خارج المنزل",
+            'arm_custom_bypass': "تجاوز مخصص",
+            'arm_home': "تفعيل في المنزل",
+            'arm_night': "تفعيل بالليل",
+            'clear_code': "مسح",
+            'code': "الرمز",
+            'disarm': "تعطيل",
+            'run': "تشغيل",
+        },
+        'bg': {
+            'ACTIVATE': "Активирай",
+            'aux_heat': "Помощен нагревател",
+            'cooling': "Охлаждане",
+            'drying': "Изсушаване",
+            'fan': "Вентилатор",
+            'idle': "Неработещ",
+            'off': "Изключен",
+            'arm_away': "Под охрана",
+            'arm_custom_bypass': "Потребителски байпас",
+            'arm_home': "Под охрана - вкъщи",
+            'arm_night': "Под охрана - нощ",
+            'arm_vacation': "Под охрана - ваканция",
+            'clear_code': "Изчистване",
+            'code': "Код",
+            'disarm': "Деактивирaне",
+            'run': "Изпълни",
+        },
+        'ca': {
             'PRESS': "Prem",
             'ACTIVATE': "Activar",
             'aux_heat': "Calefactor auxiliar",
@@ -35,7 +70,7 @@ translations = {
             'disarm': "Desactivar",
             'run': "Executa",
         },
-    'cs_CZ': {
+        'cs': {
             'PRESS': "Stisknutí",
             'ACTIVATE': "Aktivovat",
             'aux_heat': "Pomocné teplo",
@@ -54,14 +89,7 @@ translations = {
             'disarm': "Odbezpečit",
             'run': "Spustit",
         },
-    'cy_GB': {
+        'da': {
-        'ACTIVATE': "Actifadu",
-        'off': "I ffwrdd",
-        'arm_custom_bypass': "Ffordd osgoi personol",
-        'arm_night': "Larwm nos",
-        'code': "Cod dilysu dwy-ffactor",
-    },
-    'da_DK': {
             'PRESS': "Tryk",
             'ACTIVATE': "Aktiver",
             'aux_heat': "Støtte-varme",
@@ -80,7 +108,7 @@ translations = {
             'disarm': "Frakobl",
             'run': "Kør",
         },
-    'de_DE': {
+        'de': {
             'PRESS': "Drücken",
             'ACTIVATE': "Aktivieren",
             'aux_heat': "Hilfswärme",
@@ -99,7 +127,26 @@ translations = {
             'disarm': "Deaktivieren",
             'run': "Ausführen",
         },
-    'en_US': {
+        'el': {
+            'PRESS': "Πατήστε",
+            'ACTIVATE': "Ενεργοποίηση",
+            'aux_heat': "Βοηθητική θέρμανση",
+            'cooling': "Ψύξη",
+            'drying': "Αφύγρανση",
+            'fan': "Ανεμιστήρας",
+            'idle': "Σε αδράνεια",
+            'off': "Μη Ενεργό",
+            'arm_away': "Οπλισμός εκτός",
+            'arm_custom_bypass': "Προσαρμοσμένη παράκαμψη",
+            'arm_home': "Οπλισμός εντός",
+            'arm_night': "Οπλισμός νυκτός",
+            'arm_vacation': "Οπλισμός διακοπών",
+            'clear_code': "Καθαρισμός",
+            'code': "Κωδικός",
+            'disarm': "Αφοπλισμός",
+            'run': "Εκτέλεση",
+        },
+        'en': {
             'PRESS': "Press",
             'ACTIVATE': "Activate",
             'aux_heat': "Aux heat",
@@ -118,7 +165,7 @@ translations = {
             'disarm': "Disarm",
             'run': "Run",
         },
-    'es_ES': {
+        'es': {
             'PRESS': "Pulsa",
             'ACTIVATE': "Activar",
             'aux_heat': "Calor auxiliar",
@@ -137,7 +184,7 @@ translations = {
             'disarm': "Desarmar",
             'run': "Ejecutar",
         },
-    'et_EE': {
+        'et': {
             'PRESS': "Vajuta nuppu",
             'ACTIVATE': "Aktiveeri",
             'aux_heat': "Abiküte",
@@ -156,13 +203,24 @@ translations = {
             'disarm': "Valvest maha",
             'run': "Käivita",
         },
-    'eu_ES': {
+        'fa': {
-        'ACTIVATE': "Aktibatu",
+            'ACTIVATE': "فعال سازی",
-        'off': "Itzalita",
+            'aux_heat': "Aux گرما",
-        'clear_code': "Garbitu",
+            'cooling': "خنک کننده",
-        'code': "Kodea",
+            'drying': "خشك كردن",
+            'fan': "فن",
+            'idle': "بیکار",
+            'off': "خاموش",
+            'arm_away': "حفاظت بیرون",
+            'arm_custom_bypass': "بایگانی سفارشی",
+            'arm_home': "حفاظت خانه",
+            'arm_night': "نوبت شب",
+            'clear_code': "پاک کردن",
+            'code': "کد",
+            'disarm': "دزدگیر خاموش",
+            'run': "اجرا",
         },
-    'fi_FI': {
+        'fi': {
             'PRESS': "Paina",
             'ACTIVATE': "Aktivoi",
             'aux_heat': "Lisälämpö",
@@ -181,7 +239,7 @@ translations = {
             'disarm': "Poista hälytys",
             'run': "Suorita",
         },
-    'fr_FR': {
+        'fr': {
             'PRESS': "Appui",
             'ACTIVATE': "Activer",
             'aux_heat': "Chauffage d'appoint",
@@ -200,14 +258,26 @@ translations = {
             'disarm': "Désarmer",
             'run': "Exécuter",
         },
-    'fy_DE': {
+        'he': {
-        'off': "Út",
+            'PRESS': "לחיצה",
+            'ACTIVATE': "הפעל",
+            'aux_heat': "מסייע חום",
+            'cooling': "קירור",
+            'drying': "מייבש",
+            'fan': "מאוורר",
+            'idle': "כבוי",
+            'off': "מופסק",
+            'arm_away': "דרוך לא בבית",
+            'arm_custom_bypass': "מעקף מותאם אישית",
+            'arm_home': "דרוך בבית",
+            'arm_night': "דריכה לילית",
+            'arm_vacation': "דריכה - חופשה",
+            'clear_code': "נקה",
+            'code': "קוד",
+            'disarm': "לא דרוך",
+            'run': "רוץ",
         },
-    'gl_ES': {
+        'hr': {
-        'off': "Apagado",
-        'run': "Executar",
-    },
-    'hr_HR': {
             'ACTIVATE': "Aktivirati",
             'aux_heat': "Pomoćno grijanje",
             'cooling': "Hlađenje",
@@ -224,7 +294,42 @@ translations = {
             'disarm': "Deaktiviraj",
             'run': "Pokreni",
         },
-    'id_ID': {
+        'hu': {
+            'PRESS': "Gombnyomás",
+            'ACTIVATE': "Aktiválás",
+            'aux_heat': "Külső hőforrás",
+            'cooling': "Hűtés",
+            'drying': "Párátlanítás",
+            'fan': "Ventilátor",
+            'idle': "Tétlen",
+            'off': "Ki",
+            'arm_away': "Élesít (távozás)",
+            'arm_custom_bypass': "Egyéni áthidalás",
+            'arm_home': "Élesít (otthon)",
+            'arm_night': "Élesít (éjszakai)",
+            'arm_vacation': "Élesítés (vakáció)",
+            'clear_code': "Törlés",
+            'code': "Kód",
+            'disarm': "Hatástalanít",
+            'run': "Futtatás",
+        },
+        'hy': {
+            'ACTIVATE': "Ակտիվացնել",
+            'aux_heat': "Aux ջերմությունը",
+            'cooling': "հովացում",
+            'drying': "Չորացում",
+            'fan': "Երկրպագու",
+            'idle': "Պարապ",
+            'off': "Անջատած",
+            'arm_away': "Ձեռք բերեք",
+            'arm_custom_bypass': "Պատվերով շրջանցիկ",
+            'arm_home': "Arm տուն",
+            'arm_night': "Զինել - Գիշերային ռեժիմ",
+            'clear_code': "Մաքրել",
+            'code': "Կոդ",
+            'disarm': "Զինաթափել",
+        },
+        'id': {
             'PRESS': "Tekan",
             'ACTIVATE': "Aktifkan",
             'aux_heat': "Pemanasan tambahan",
@@ -243,7 +348,7 @@ translations = {
             'disarm': "Nonaktifkan",
             'run': "Jalankan",
         },
-    'is_IS': {
+        'is': {
             'PRESS': "Ýttu á",
             'ACTIVATE': "Virkja",
             'cooling': "Kæling",
@@ -261,7 +366,7 @@ translations = {
             'disarm': "Taka af verði",
             'run': "Keyra",
         },
-    'it_IT': {
+        'it': {
             'PRESS': "Premi",
             'ACTIVATE': "Attiva",
             'aux_heat': "Riscaldamento ausiliario",
@@ -280,7 +385,75 @@ translations = {
             'disarm': "Disattiva",
             'run': "Esegui",
         },
-    'nl_NL': {
+        'lb': {
+            'ACTIVATE': "Aktivéieren",
+            'aux_heat': "Zousätzlech Heizung",
+            'cooling': "Ofkillen",
+            'drying': "Dréchnen",
+            'fan': "Ventilator",
+            'idle': "Waart",
+            'off': "Aus",
+            'arm_away': "Aktivéiert Ënnerwee",
+            'arm_custom_bypass': "Personaliséierte Bypass",
+            'arm_home': "Aktivéiert Doheem",
+            'arm_night': "Aktivéiert Nuecht",
+            'clear_code': "Kloer",
+            'code': "Code",
+            'disarm': "Desaktivéieren",
+            'run': "Ausféieren",
+        },
+        'lt': {
+            'ACTIVATE': "Suaktyvinti",
+            'cooling': "Aušinimas",
+            'drying': "Džiovinimas",
+            'fan': "Ventiliatorius",
+            'idle': "Laukimo režimas",
+            'off': "Išjungta",
+            'arm_away': "Išvykęs",
+            'arm_custom_bypass': "Individualizuotas apėjimas",
+            'arm_home': "Namų apsauga",
+            'arm_night': "Naktinė apsauga",
+            'clear_code': "Išvalyti",
+            'code': "Kodas",
+            'disarm': "Atrakinti",
+            'run': "Paleisti",
+        },
+        'lv': {
+            'ACTIVATE': "Aktivizēt",
+            'aux_heat': "Ārējais sildītājs",
+            'cooling': "Dzesēšana",
+            'drying': "Žāvēšana",
+            'fan': "Ventilators",
+            'idle': "Dīkstāve",
+            'off': "Izslēgts",
+            'arm_away': "Prombūtnes režīms",
+            'arm_custom_bypass': "Pielāgots apvedceļš",
+            'arm_home': "Mājās režīms",
+            'arm_night': "Pieslēgta uz nakti",
+            'clear_code': "Notīrīt",
+            'code': "Kods",
+            'disarm': "Atslēgt",
+        },
+        'nb': {
+            'PRESS': "trykk",
+            'ACTIVATE': "Aktiver",
+            'aux_heat': "Aux varme",
+            'cooling': "Kjøling",
+            'drying': "Tørking",
+            'fan': "Vifte",
+            'idle': "Inaktiv",
+            'off': "Av",
+            'arm_away': "Aktiver borte",
+            'arm_custom_bypass': "Tilpasset bypass",
+            'arm_home': "Aktiver hjemme",
+            'arm_night': "Aktiver natt",
+            'arm_vacation': "Aktiver ferie",
+            'clear_code': "Tøm",
+            'code': "Kode",
+            'disarm': "Deaktivere",
+            'run': "Kjør",
+        },
+        'nl': {
             'PRESS': "Klik",
             'ACTIVATE': "Activeren",
             'aux_heat': "Extra warmte",
@@ -299,7 +472,7 @@ translations = {
             'disarm': "Uitschakelen",
             'run': "Uitvoeren",
         },
-    'nn_NO': {
+        'nn': {
             'ACTIVATE': "Aktiver",
             'aux_heat': "Aux-varme",
             'cooling': "Nedkjøling",
@@ -317,7 +490,45 @@ translations = {
             'disarm': "Skru av",
             'run': "Køyr",
         },
-    'pt_PT': {
+        'pl': {
+            'PRESS': "Naciśnij",
+            'ACTIVATE': "Aktywuj",
+            'aux_heat': "Zewnętrznie podłączone źródło",
+            'cooling': "chłodzenie",
+            'drying': "osuszanie",
+            'fan': "wentylator",
+            'idle': "nieaktywny",
+            'off': "wył.",
+            'arm_away': "Uzbrój (poza domem)",
+            'arm_custom_bypass': "Niestandardowy bypass",
+            'arm_home': "Uzbrój (w domu)",
+            'arm_night': "Uzbrój (noc)",
+            'arm_vacation': "Uzbrój (tryb wakacyjny)",
+            'clear_code': "Wyczyść",
+            'code': "Kod",
+            'disarm': "Rozbrój",
+            'run': "Uruchom",
+        },
+        'pt': {
+            'PRESS': "Pressione",
+            'ACTIVATE': "Ativar",
+            'aux_heat': "Aquecedor aux",
+            'cooling': "Resfriando",
+            'drying': "Secando",
+            'fan': "Ventilando",
+            'idle': "Oscioso",
+            'off': "Desligado",
+            'arm_away': "Armar ausente",
+            'arm_custom_bypass': "Bypass personalizado",
+            'arm_home': "Armar em casa",
+            'arm_night': "Acionamento noturno",
+            'arm_vacation': "Armar férias",
+            'clear_code': "Limpar",
+            'code': "Código",
+            'disarm': "Desarmar",
+            'run': "Executar",
+        },
+        'pt': {
             'PRESS': "Pressione",
             'ACTIVATE': "Ativar",
             'aux_heat': "Calor auxiliar",
@@ -335,12 +546,80 @@ translations = {
             'disarm': "Desarmar",
             'run': "Executar",
         },
-    'sr_RS': {
+        'ro': {
-        'PRESS': "Pritisnite taster",
+            'ACTIVATE': "Activați",
-        'ACTIVATE': "Aktiviraj",
+            'aux_heat': "Încălzire auxiliară",
-        'off': "Isključen",
+            'cooling': "Racește",
+            'drying': "Usucă",
+            'fan': "Ventilator",
+            'idle': "Inactiv",
+            'off': "Oprit",
+            'arm_away': "Armat plecat",
+            'arm_custom_bypass': "Bypass personalizat",
+            'arm_home': "Armat acasă",
+            'arm_night': "Armat noaptea",
+            'arm_vacation': "Armat vacanță",
+            'clear_code': "Şterge",
+            'code': "Cod",
+            'disarm': "Dezarmat",
+            'run': "Rulați",
         },
-    'sv_SE': {
+        'ru': {
+            'PRESS': "Нажать",
+            'ACTIVATE': "Активировать",
+            'aux_heat': "Дополнительный нагрев",
+            'cooling': "Охлаждение",
+            'drying': "Осушение",
+            'fan': "Вентиляция",
+            'idle': "Бездействие",
+            'off': "Выключено",
+            'arm_away': "Охрана (не дома)",
+            'arm_custom_bypass': "Охрана с исключениями",
+            'arm_home': "Охрана (дома)",
+            'arm_night': "Охрана (ночь)",
+            'arm_vacation': "Охрана (отпуск)",
+            'clear_code': "Сброс",
+            'code': "Код",
+            'disarm': "Снять с охраны",
+            'run': "Запустить",
+        },
+        'sk': {
+            'ACTIVATE': "Aktivovať",
+            'aux_heat': "Prídavné kúrenie",
+            'cooling': "Chladenie",
+            'drying': "Sušenie",
+            'fan': "Ventilátor",
+            'idle': "Nečinný",
+            'off': "Vypnutý",
+            'arm_away': "Zakódovať odchod",
+            'arm_custom_bypass': "Prispôsobené vylúčenie",
+            'arm_home': "Zakódovať doma",
+            'arm_night': "Zakódovať na noc",
+            'arm_vacation': "Zakódovať dovolenku",
+            'clear_code': "Zrušiť",
+            'code': "Kód",
+            'disarm': "Odkódovať",
+            'run': "Spustiť",
+        },
+        'sl': {
+            'PRESS': "Pritisnite",
+            'ACTIVATE': "Aktiviraj",
+            'aux_heat': "Dodatna toplota",
+            'cooling': "Hlajenje",
+            'drying': "Sušenje",
+            'fan': "Ventilator",
+            'idle': "V pripravljenosti",
+            'off': "Izključen",
+            'arm_away': "Vklopi odsoten",
+            'arm_custom_bypass': "Izjeme po meri",
+            'arm_home': "Vklopi doma",
+            'arm_night': "Vklopi nočni način",
+            'clear_code': "Počisti",
+            'code': "Koda",
+            'disarm': "Izklopi",
+            'run': "Poženi",
+        },
+        'sv': {
             'PRESS': "Tryck",
             'ACTIVATE': "Aktivera",
             'aux_heat': "Underhållsvärme",
@@ -359,10 +638,83 @@ translations = {
             'disarm': "Larma från",
             'run': "Kör",
         },
+        'th': {
+            'PRESS': "กด",
+            'ACTIVATE': "กระตุ้น",
+            'aux_heat': "ความร้อน Aux",
+            'cooling': "โหมดเย็น",
+            'drying': "โหมดแห้ง",
+            'fan': "พัดลม",
+            'idle': "ไม่ได้ใช้งาน",
+            'off': "ปิด",
+            'arm_away': "ล็อคแบบออกข้างนอก",
+            'arm_custom_bypass': "ปล่อยผ่านตามที่กำหนด",
+            'arm_home': "ล็อคแบบอยู่บ้าน",
+            'arm_night': "เฝ้ายามกลางคืน",
+            'clear_code': "ล้าง",
+            'code': "รหัส",
+            'disarm': "ปิดระบบสัญญาณกันขโมย",
+        },
+        'tr': {
+            'PRESS': "Basınız",
+            'ACTIVATE': "Etkinleştir",
+            'aux_heat': "Yardımcı ısı",
+            'cooling': "Soğutma",
+            'drying': "Kurutma",
+            'fan': "Fan",
+            'idle': "Boşta",
+            'off': "Kapalı",
+            'arm_away': "Dışarıda",
+            'arm_custom_bypass': "Özel atlatma",
+            'arm_home': "Evde",
+            'arm_night': "Geceyi etkinleştir",
+            'arm_vacation': "Dışarıda",
+            'clear_code': "Temizle",
+            'code': "Kod",
+            'disarm': "Etkisiz hale getir",
+            'run': "Çalıştır",
+        },
+        'uk': {
+            'PRESS': "Натисніть",
+            'ACTIVATE': "Активувати",
+            'aux_heat': "Додатковий нагрів",
+            'cooling': "Охолодження",
+            'drying': "Осушення",
+            'fan': "Вентилятор",
+            'idle': "Очікування",
+            'off': "Вимкнено",
+            'arm_away': "ARM AWAY",
+            'arm_custom_bypass': "Охорона з винятками",
+            'arm_home': "ARM HOME",
+            'arm_night': "ARM NIGHT",
+            'clear_code': "CLEAR",
+            'code': "Код",
+            'disarm': "DISARM",
+            'run': "Запустити",
+        },
+        'vi': {
+            'ACTIVATE': "Kích hoạt",
+            'aux_heat': "Nhiệt phụ trợ",
+            'cooling': "Làm mát",
+            'drying': "Làm khô",
+            'fan': "Quạt",
+            'idle': "Nhàn rỗi",
+            'off': "Tắt",
+            'arm_away': "Đi vắng",
+            'arm_custom_bypass': "Bỏ qua tùy chỉnh",
+            'arm_home': "Ở nhà",
+            'arm_night': "An ninh ban đêm",
+            'clear_code': "Xóa",
+            'code': "Mã số",
+            'disarm': "Vô hiệu hoá",
+            'run': "Chạy",
+        },
 }
 
 def get_translation(locale, input):
+    locale = locale.split("_")[0]
+    en_fallback_res = translations.get("en").get(input, input)
     if locale in translations:
-        return translations.get(locale).get(input, input)
+        return translations.get(locale).get(input, en_fallback_res)
     else:
-        return translations.get("en_US").get(input, input)
+        return en_fallback_res

apps/nspanel-lovelace-ui/luibackend/pages.py

@@ -1,5 +1,6 @@
 import logging
 import datetime
+import dateutil.parser as dp
 
 from icon_mapping import get_icon_id
 from icons import get_icon_id_ha
@@ -64,12 +65,10 @@ class LuiPagesGen(object):
         we_name = self._config._config_screensaver.entity.entityId
         unit = self._config._config_screensaver.raw_config.get("weatherUnit", "celsius")
 
-        LOGGER.info(f"test123 {we_name}")
-
         if self._ha_api.entity_exists(we_name):
             we = self._ha_api.get_entity(we_name)
         else:
-            LOGGER.error("Skipping Weather Update, entity {we_name} not found")
+            LOGGER.error(f"Skipping Weather Update, entity {we_name} not found")
             return
 
         icon_cur        = get_icon_id_ha("weather", state=we.state)
@@ -80,7 +79,8 @@ class LuiPagesGen(object):
             wOF = self._config._config_screensaver.raw_config.get(f"weatherOverrideForecast{i}")
             if wOF is None:
                 up = we.attributes.forecast[i-1]['datetime']
-                up   = datetime.datetime.fromisoformat(up)
+                #up   = datetime.datetime.fromisoformat(up)
+                up   = dp.parse(up)
                 if babel_spec is not None:
                     up = babel.dates.format_date(up, "E", locale=self._locale)
                 else:
@@ -100,7 +100,7 @@ class LuiPagesGen(object):
 
         altLayout = ""
         if self._config._config_screensaver.raw_config.get("alternativeLayout", False) is True:
-            altLayout = f"~26~{we.attributes.humidity} %"
+            altLayout = f"~{get_icon_id('water-percent')}~{we.attributes.humidity} %"
 
         self._send_mqtt_msg(f"weatherUpdate~{icon_cur}~{text_cur}{weather_res}{altLayout}")
 
@@ -118,7 +118,7 @@ class LuiPagesGen(object):
         if entityType == "navigate":
             page_search_res = self._config.searchCard(entityId)
             if page_search_res is not None:
-                name = page_search_res.title
+                name = name if name is not None else page_search_res.title
                 text = get_translation(self._locale,"PRESS")
                 icon_id = get_icon_id(icon) if icon is not None else get_icon_id("gesture-tap-button")
                 return f"~button~{entityId}~{icon_id}~17299~{name}~{text}"
@@ -167,6 +167,7 @@ class LuiPagesGen(object):
             min_v = entity.attributes.get("min", 0)
             max_v = entity.attributes.get("max", 100)
             return f"~number~{entityId}~{icon_id}~17299~{name}~{entity.state}|{min_v}|{max_v}"
+        return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~error~"
 
     def generate_entities_page(self, navigation, heading, items):
         command = f"entityUpd~{heading}~{navigation}"
@@ -266,7 +267,7 @@ class LuiPagesGen(object):
                     onoffbutton = 1374
                 else:
                     onoffbutton = rgb_dec565([255,255,255])
-            command = f"entityUpd~|{heading}|{navigation}|{item}|{icon}|{title}|{author}|{volume}|{iconplaypause}|{source}|{speakerlist[:200]}|{onoffbutton}"
+            command = f"entityUpd~{heading}~{navigation}~{item}~{icon}~{title}~{author}~{volume}~{iconplaypause}~{source}~{speakerlist[:200]}~{onoffbutton}"
         self._send_mqtt_msg(command)
         
     def generate_alarm_page(self, navigation, entity):
@@ -282,7 +283,6 @@ class LuiPagesGen(object):
             if entity.state == "disarmed":
                 color = rgb_dec565([13,160,53])
                 icon = get_icon_id("shield-off")
-                test = entity.attributes.get("code_arm_required", "false")
                 if not entity.attributes.get("code_arm_required", False):
                     numpad = "disable"
                 bits = entity.attributes.supported_features
@@ -384,7 +384,7 @@ class LuiPagesGen(object):
     
     def generate_shutter_detail_page(self, entity):
         entity = self._ha_api.get_entity(entity)
-        pos = 100-int(entity.attributes.get("current_position", 50))
+        pos = int(entity.attributes.get("current_position", 50))
         self._send_mqtt_msg(f"entityUpdateDetail~{pos}")
 
     def send_message_page(self, id, heading, msg, b1, b2):

apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py

@@ -63,8 +63,8 @@ class NsPanelLovelaceUIManager(hass.Hass):
 
         controller = LuiController(self, cfg, send_mqtt_msg)
         
-        desired_display_firmware_version = 27
+        desired_display_firmware_version = 30
-        version     = "v2.4.6"
+        version     = "v2.6.0"
         
         model       = cfg.get("model")
         if model == "us-l":

nodered/node-red-example-flow.json

@@ -1,12 +1,4 @@
 [
-    {
-        "id": "ba6c8bb20b9aa4cc",
-        "type": "tab",
-        "label": "NSP_Kueche",
-        "disabled": false,
-        "info": "",
-        "env": []
-    },
     {
         "id": "6873c08312276c95",
         "type": "server-state-changed",
@@ -76,7 +68,7 @@
         "type": "function",
         "z": "ba6c8bb20b9aa4cc",
         "name": "wake&display",
-        "func": "var out_msgs = \n[ {payload:\"wake\"}, \n  {payload: \"pageType,popupLight,Kueche,light.kueche_lights\"} \n]\n\n\n\nreturn [out_msgs]",
+        "func": "var out_msgs = \n[\n  {payload: \"pageType~popupLight~Kueche~light.kueche_lights\"} \n]\n\n\n\nreturn [out_msgs]",
         "outputs": 1,
         "noerr": 0,
         "initialize": "if (flow.get(\"ns-currentPage\") === undefined) {\n    flow.set(\"ns-currentPage\", 0)\n}",
@@ -113,7 +105,7 @@
         "type": "function",
         "z": "ba6c8bb20b9aa4cc",
         "name": "send notification",
-        "func": "var out_msgs = \n[ {payload:\"pageType,popupNotify\"}, \n  {payload: \"entityUpdateDetail,|updateBerryNoYes|Notification|65535|No|65535|Yes|65535|\"+msg.payload+\"|65535|4\"} \n]\n\nreturn [out_msgs]",
+        "func": "var out_msgs = \n[ {payload:\"pageType~popupNotify\"}, \n  {payload: \"entityUpdateDetail~updateBerryNoYes~Notification~65535~No~65535~Yes~65535~\"+msg.payload+\"~65535~4\"} \n]\n\nreturn [out_msgs]",
         "outputs": 1,
         "noerr": 0,
         "initialize": "if (flow.get(\"ns-currentPage\") === undefined) {\n    flow.set(\"ns-currentPage\", 0)\n}",

test-msg-gen.py

@@ -5,7 +5,7 @@ import codecs
 print("Calculate NSPanel hex command from JSON payload\n")
 
 #value = input("Enter JSON:\n")
-value = "entityUpdHeading,Heading1234"
+value = "weatherUpdate~1~9.4 C~Wed~2~14.1 C~Thu~3~12.4 C~Fri~4~7.6 C~Sat~5~8.5 C~6~90 %"
 
 def crc16(data:bytes, poly:hex=0xA001) -> str:
     '''
@@ -21,13 +21,13 @@ def crc16(data:bytes, poly:hex=0xA001) -> str:
     return crc
     
 
-payload = bytes(value, 'ascii')
+payload = bytes(value, 'utf-8')
 
 header = binascii.unhexlify('55BB')
 
-print("length:", len(value))
+print("length:", len(payload))
 
-length = len(value).to_bytes(2, 'little')
+length = len(payload).to_bytes(2, 'little')
 
 bytes_payload = header + length + payload