bump version

Fix HW Button pages

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+* @joBr99
+/ioBroker @britzelpuf

.github/auto_assign.yml

@@ -0,0 +1,6 @@
+addReviewers: true
+addAssignees: true
+
+# A list of keywords to be skipped the process that add reviewers if pull requests include it 
+skipKeywords:
+  - wip

.github/workflows/nextion2text.yml

@@ -5,6 +5,7 @@ on:
     paths:
       - HMI/nspanel.HMI
       - HMI/US/portrait/nspanel_US_P.HMI
+      - HMI/US/portrait/diff-ignore/cardEntities.txt
       - HMI/US/landscape/nspanel_US_L.HMI
       - .github/workflows/nextion2text.yml
   push:
@@ -13,6 +14,7 @@ on:
     paths:
       - HMI/nspanel.HMI
       - HMI/US/portrait/nspanel_US_P.HMI
+      - HMI/US/portrait/diff-ignore/cardEntities.txt
       - HMI/US/landscape/nspanel_US_L.HMI
       - .github/workflows/nextion2text.yml
 
@@ -50,19 +52,25 @@ 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 P DIFF DIFF
+      continue-on-error: true
+      run: |
+        diff -u HMI/US/portrait/diff-eu-version-known-good.txt HMI/US/portrait/diff-eu-version.txt | grep -E "^\+" > HMI/US/portrait/diff-filtered.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 
       continue-on-error: true
       run: |      

.gitignore

@@ -1,2 +1,3 @@
+__pycache__/
 # don't add nextion2text
 HMI/Nextion2Text.py

HMI/README.md

@@ -1,7 +1,7 @@
 # NSPanel Lovelance UI
 
 The general idea is that the Nextion Display cycles though a page counter and the esp32 tells the display what to do.
-If you are changeing the page the nextion display will send and event to the esp32 and it has to answer with the messages, that will update the current page with it's desired components. This enables easy changes, without touching the HMI Project.
+If you are changeing the page the nextion display will send and event to the esp32 and it has to answer with the messages~ that will update the current page with it's desired components. This enables easy changes~ without touching the HMI Project.
 
 # Message Flow
 
@@ -25,7 +25,7 @@ This protocol does not try to implement broken JSON Commands with a specified ty
 Instead the commands are plain text commands with parameters.
 
 ## Example for valid Message
-This message has to be generated for the Message "1337" (1337 is not a valid command, this is just an example)
+This message has to be generated for the Message "1337" (1337 is not a valid command~ this is just an example)
 ```
 55 BB  04 00  31 33 33 37  5F 5B
 ```
@@ -39,95 +39,97 @@ wake screen:
 
 set brightness of screensaver:
 
-`dimmode,0 - (screen off)`
+`dimmode~0 - (screen off)`
 
-`dimmode,100 - (screen on with full brightness)`
+`dimmode~100 - (screen on with full brightness)`
 
 set current time:
 
-`time,22 : 26`
+`time~22 : 26`
 
 set current date:
 
-`date,?Di 24. Februar`
+`date~Di 24. Februar`
 
-set screensaver timeout (set time in sec, max 65):
+set screensaver timeout (set time in sec~ max 65):
 
-`timeout,15 - timeout after 15 seconds`
+`timeout~15 - timeout after 15 seconds`
 
-`timeout,0 - disable screensaver`
+`timeout~0 - disable screensaver`
 
 change the page type:
 
-`pageType,pageStartup`
+`pageType~pageStartup`
 
-`pageType,cardEntities`
+`pageType~cardEntities`
 
-`pageType,cardThermo`
+`pageType~cardThermo`
 
-`pageType,cardMedia`
+`pageType~cardMedia`
 
-`pageType,popupLight,Schreibtischlampe,light.schreibtischlampe`
+`pageType~popupLight~Schreibtischlampe~light.schreibtischlampe`
 
-`pageType,popupNotify`
+`pageType~popupNotify`
 
-`pageType,screensaver`
+`pageType~screensaver`
 
 ### screensaver page
 
-`weatherUpdate,? tMainIcon? tMainText? tMRIcon? tMR? tForecast1? tF1Icon? tForecast1Val? tForecast2? tF2Icon? tForecast2Val?tForecast3? tF3Icon? tForecast3Val?tForecast4? tF4Icon? tForecast4Val`
+`weatherUpdate~tMainIcon~tMainText~tForecast1~tF1Icon~tForecast1Val~tForecast2~tF2Icon~tForecast2Val~tForecast3~tF3Icon~tForecast3Val~tForecast4~tF4Icon~tForecast4Val~optionalLayoutIcon~optionalLayoutText`
+
+`color~background~time~timeAMPM~date~tMainIcon~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tF1Icon~tF2Icon~tF3Icon~tF4Icon~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMainIconAlt~tMainTextAlt~tMRIcon~tMR`
 
 ### cardEntities Page
 
 The following message can be used to update the content on the cardEntities Page
 
-`entityUpd,heading,navigation,[,*type*,*internalNameEntity*,*iconId*,*iconColor*,*displayNameEntity*,*optionalValue*]x4`
+`entityUpd~heading~navigation~[~*type*~*internalNameEntity*~*iconId*~*iconColor*~*displayNameEntity*~*optionalValue*]x4`
 
-`,light,light.entityName,1,17299,Light1,0`
+`~light~light.entityName~1~17299~Light1~0`
 
-`,shutter,cover.entityName,0,17299,Shutter2,`
+`~shutter~cover.entityName~0~17299~Shutter2~`
 
-`,delete,,,,,`
+`~delete~~~~~`
 
-`,text,sensor.entityName,3,17299,Temperature,content`
+`~text~sensor.entityName~3~17299~Temperature~content`
 
-`,button,button.entityName,3,17299,bt-name,bt-text`
+`~button~button.entityName~3~17299~bt-name~bt-text`
 
-`,switch,switch.entityName,4,17299,Switch1,0`
+`~switch~switch.entityName~4~17299~Switch1~0`
 
 ### popupLight Page
 
-`entityUpdateDetail,*iconId*,*iconColor*,*buttonState*,*sliderBrightnessPos*,*sliderColorTempPos*,*colorMode*`
+`entityUpdateDetail~*iconId*~*iconColor*~*buttonState*~*sliderBrightnessPos*~*sliderColorTempPos*~*colorMode*`
 
-`entityUpdateDetail,1,17299,1,100,78,enable`
+`entityUpdateDetail~1~17299~1~100~78~enable`
 
-`entityUpdateDetail,1,17299,1,100,disable`
+`entityUpdateDetail~1~17299~1~100~disable`
 
 ### popupShutter Page
 
-`entityUpdateDetail,*ignored*,*sliderPos*`
+`entityUpdateDetail~*ignored*~*sliderPos*`
 
-`entityUpdateDetail,1,77`
+`entityUpdateDetail~1~77`
 
 ### popupNotify Page
 
-`entityUpdateDetail,*internalName*,*tHeading*,*tHeadingColor*,*b1*,*tB1Color*,*b2*,*tB2Color*,*tText*,*tTextColor*,*sleepTimeout*`
+`entityUpdateDetail~*internalName*~*tHeading*~*tHeadingColor*~*b1*~*tB1Color*~*b2*~*tB2Color*~*tText*~*tTextColor*~*sleepTimeout*`
 
 `exitPopup`
 
 ### cardThermo Page
 
-`entityUpd,*internalNameEntiy*,*heading*,*currentTemp*,*destTemp*,*status*,*minTemp*,*maxTemp*,*stepTemp*[[,*iconId*,*activeColor*,*state*,*hvac_action*]]`
+`entityUpd~*heading*~*navigation*~*internalNameEntiy*~*currentTemp*~*destTemp*~*status*~*minTemp*~*maxTemp*~*stepTemp*[[~*iconId*~*activeColor*~*state*~*hvac_action*]]`
 
-`[[]]` are not part of the command, this part repeats 9 times for the buttons
+`[[]]` are not part of the command~ this part repeats 9 times for the buttons
 
 ### cardMedia Page
 
-`entityUpd,|*internalNameEntiy*|*heading*|*icon*|*title*|*author*|*volume*|*playpauseicon*|currentSpeaker|speakerList-seperated-by-?`
+`entityUpd~*heading*~*navigation*~*internalNameEntiy*~*icon*~*title*~*author*~*volume*~*playpauseicon*~currentSpeaker~speakerList-seperated-by-?`
 
 ### cardAlarm Page
 
-`entityUpd,*internalNameEntity*,*arm1*,*arm1ActionName*,*arm2*,*arm2ActionName*,*arm3*,*arm3ActionName*,*arm4*,*arm4ActionName*,*icon*,*iconcolor*,*numpadStatus*,*flashing*`
+`entityUpd~*internalNameEntity*~*navigation*~*arm1*~*arm1ActionName*~*arm2*~*arm2ActionName*~*arm3*~*arm3ActionName*~*arm4*~*arm4ActionName*~*icon*~*iconcolor*~*numpadStatus*~*flashing*`
 
 
 ## Messages from Nextion Display
@@ -138,6 +140,9 @@ The following message can be used to update the content on the cardEntities Page
 
 `event,buttonPress2,pageName,bExit,number_of_taps`
 
+`event,buttonPress2,pageName,sleepReached`
+
+
 ### startup page
 
 `event,startup,version,model`

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

@@ -1,18 +1,18 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-03-30 09:17:12.762388734 +0000
-+++ HMI/US/landscape/n2t-out/Program.s.txt	2022-03-30 09:17:13.638390126 +0000
-@@ -10,6 +10,6 @@
-     int sleepValue=0
+--- HMI/n2t-out/Program.s.txt	2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/landscape/n2t-out/Program.s.txt	2022-04-13 20:21:35.478242275 +0000
+@@ -11,6 +11,6 @@
      // dim value
      int dimValue=40
+     int dimValueNormal=100
 -    // fix touch offset
 -    lcd_dev fffb 0002 0000 0020
 +    // fix touch offset (Removed for US version)
 +    //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-03-30 09:17:12.762388734 +0000
-+++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-03-30 09:17:13.638390126 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-04-13 20:21:35.478242275 +0000
 @@ -177,7 +177,7 @@
              recmod=1
              bauds=115200
@@ -22,3 +22,105 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
              //send calc crc
              btlen tSend.txt,sys0
              crcrest 1,0xffff // reset CRC
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt	2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/landscape/n2t-out/popupLight.txt	2022-04-13 20:21:35.478242275 +0000
+@@ -570,43 +570,25 @@
+                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
+                                         udelete payloadLength-1
+                                         bufferPos=0
+-                                        if(tId.txt=="pageStartup")
+-                                        {
+-                                            page pageStartup
+-                                        }
+-                                        if(tId.txt=="screensaver")
+-                                        {
+-                                            page screensaver
+-                                        }
+                                         if(tId.txt=="cardEntities")
+                                         {
+                                             page cardEntities
+                                         }
+-                                        if(tId.txt=="cardGrid")
+-                                        {
+-                                            page cardGrid
+-                                        }
+-                                        if(tId.txt=="popupLight")
++                                        if(tId.txt=="cardMedia")
+                                         {
+-                                            pageIcons.tTmp1.txt=tTmp.txt
+-                                            page popupLight
++                                            page cardMedia
+                                         }
+-                                        if(tId.txt=="popupShutter")
++                                        if(tId.txt=="pageStartup")
+                                         {
+-                                            pageIcons.tTmp1.txt=tTmp.txt
+-                                            page popupShutter
++                                            page pageStartup
+                                         }
+                                         if(tId.txt=="popupNotify")
+                                         {
+                                             page popupNotify
+                                         }
+-                                        if(tId.txt=="cardThermo")
+-                                        {
+-                                            page cardThermo
+-                                        }
+-                                        if(tId.txt=="cardMedia")
++                                        if(tId.txt=="cardGrid")
+                                         {
+-                                            page cardMedia
++                                            page cardGrid
+                                         }
+                                         if(tId.txt=="cardAlarm")
+                                         {
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt	2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/landscape/n2t-out/screensaver.txt	2022-04-13 20:21:35.478242275 +0000
+@@ -48,18 +48,6 @@
+         Scope: local
+         Value: 0
+     
+-Variable (string) tInstruction
+-    Attributes
+-        Scope         : local
+-        Text          : 
+-        Max. Text Size: 50
+-    
+-Variable (string) tTmp
+-    Attributes
+-        Scope         : local
+-        Text          : 
+-        Max. Text Size: 50
+-    
+ Text tTime
+     Attributes
+         Scope                               : local
+@@ -290,6 +278,26 @@
+         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/landscape/n2t-out-visual/Program.s.txt

@@ -10,6 +10,7 @@ Program.s
     int sleepValue=0
     // dim value
     int dimValue=40
+    int dimValueNormal=100
     // fix touch offset (Removed for US version)
     //lcd_dev fffb 0002 0000 0020
     page pageStartup

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

@@ -25,7 +25,6 @@ Page cardAlarm
             vis tInstruction,0
             vis tTmp,0
             vis tId,0
-            //vis nPageDisp,0
             vis arm1,0
             vis arm2,0
             vis arm3,0
@@ -200,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
@@ -230,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
@@ -276,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
@@ -323,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
@@ -340,7 +339,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardAlarm,bPrev"
+            tSend.txt="event,buttonPress2,cardAlarm,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -372,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
@@ -410,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
@@ -448,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
@@ -486,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
@@ -524,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
@@ -562,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
@@ -600,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
@@ -638,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
@@ -676,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
@@ -714,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
@@ -752,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
@@ -1038,53 +1044,78 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         //entn
-                                        spstr strCommand.txt,entn.txt,",",1
+                                        spstr strCommand.txt,entn.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         //text arm1
-                                        spstr strCommand.txt,arm1.txt,",",2
+                                        spstr strCommand.txt,arm1.txt,"~",3
                                         if(arm1.txt!="")
                                         {
                                             vis arm1,1
                                         }
                                         //id arm1
-                                        spstr strCommand.txt,va1.txt,",",3
+                                        spstr strCommand.txt,va1.txt,"~",4
                                         //text arm2
-                                        spstr strCommand.txt,arm2.txt,",",4
+                                        spstr strCommand.txt,arm2.txt,"~",5
                                         if(arm2.txt!="")
                                         {
                                             vis arm2,1
                                         }
                                         //id arm2
-                                        spstr strCommand.txt,va2.txt,",",5
+                                        spstr strCommand.txt,va2.txt,"~",6
                                         //text arm3
-                                        spstr strCommand.txt,arm3.txt,",",6
+                                        spstr strCommand.txt,arm3.txt,"~",7
                                         if(arm3.txt!="")
                                         {
                                             vis arm3,1
                                         }
                                         //id arm3
-                                        spstr strCommand.txt,va3.txt,",",7
+                                        spstr strCommand.txt,va3.txt,"~",8
                                         //text arm4
-                                        spstr strCommand.txt,arm4.txt,",",8
+                                        spstr strCommand.txt,arm4.txt,"~",9
                                         if(arm4.txt!="")
                                         {
                                             vis arm4,1
                                         }
                                         //id arm4
-                                        spstr strCommand.txt,va4.txt,",",9
+                                        spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,",",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                         //icon color
-                                        spstr strCommand.txt,tTmp.txt,",",11
+                                        spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0
                                         tIcon.pco=sys0
                                         //numpad status
-                                        spstr strCommand.txt,tTmp.txt,",",12
+                                        spstr strCommand.txt,tTmp.txt,"~",13
                                         if(tTmp.txt!="disable")
                                         {
                                             vis b0,1
@@ -1099,9 +1130,23 @@ Timer tmSerial
                                             vis b9,1
                                             vis b10,1
                                             vis tCode,1
+                                        }else
+                                        {
+                                            vis b0,0
+                                            vis b1,0
+                                            vis b2,0
+                                            vis b3,0
+                                            vis b4,0
+                                            vis b5,0
+                                            vis b6,0
+                                            vis b7,0
+                                            vis b8,0
+                                            vis b9,0
+                                            vis b10,0
+                                            vis tCode,0
                                         }
                                         //flashing status
-                                        spstr strCommand.txt,tTmp.txt,",",13
+                                        spstr strCommand.txt,tTmp.txt,"~",14
                                         if(tTmp.txt=="enable")
                                         {
                                             tmFlash.en=1
@@ -1113,67 +1158,80 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
                                         }
                                         if(tId.txt=="cardMedia")
                                         {
                                             page cardMedia
                                         }
+                                        if(tId.txt=="cardAlarm")
+                                        {
+                                            page cardAlarm
+                                        }
                                     }
                                     // end of user code
                                     udelete payloadLength-1
@@ -1196,14 +1254,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardAlarm"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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
@@ -429,7 +429,7 @@ Text tIcon1
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -459,7 +459,7 @@ Text tIcon2
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -489,7 +489,7 @@ Text tIcon3
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -519,7 +519,7 @@ Text tIcon4
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -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
@@ -1431,7 +1431,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardEntities,bPrev"
+            tSend.txt="event,buttonPress2,cardEntities,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1461,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
@@ -2060,15 +2067,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
-                                        spstr strCommand.txt,tHeading.txt,",",1
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis bUp1,0
@@ -2083,16 +2117,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
                                             vis tIcon1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             tIcon1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         if(type1.txt=="shutter")
@@ -2115,7 +2147,7 @@ Timer tmSerial
                                             vis hSlider1,0
                                             vis nNum1,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",8
+                                            spstr strCommand.txt,tTmp.txt,"~",8
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff1.val=sys0
                                         }
@@ -2129,7 +2161,7 @@ Timer tmSerial
                                             vis hSlider1,0
                                             vis nNum1,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",8
+                                            spstr strCommand.txt,tTmp.txt,"~",8
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff1.val=sys0
                                         }
@@ -2146,7 +2178,7 @@ Timer tmSerial
                                             bText1.pco=65535
                                             bText1.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                         }
                                         if(type1.txt=="button")
                                         {
@@ -2161,7 +2193,7 @@ Timer tmSerial
                                             bText1.pco=1374
                                             bText1.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                         }
                                         if(type1.txt=="number")
                                         {
@@ -2174,7 +2206,7 @@ Timer tmSerial
                                             vis hSlider1,1
                                             vis nNum1,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                             //first value is current value
                                             spstr bText1.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -2190,9 +2222,9 @@ Timer tmSerial
                                             hSlider1.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis bUp2,0
@@ -2207,16 +2239,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
                                             vis tIcon2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             tIcon2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         if(type2.txt=="shutter")
@@ -2239,7 +2269,7 @@ Timer tmSerial
                                             vis hSlider2,0
                                             vis nNum2,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",14
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff2.val=sys0
                                         }
@@ -2253,7 +2283,7 @@ Timer tmSerial
                                             vis hSlider2,0
                                             vis nNum2,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",14
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff2.val=sys0
                                         }
@@ -2270,7 +2300,7 @@ Timer tmSerial
                                             bText2.pco=65535
                                             bText2.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                         }
                                         if(type2.txt=="button")
                                         {
@@ -2285,7 +2315,7 @@ Timer tmSerial
                                             bText2.pco=1374
                                             bText2.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                         }
                                         if(type2.txt=="number")
                                         {
@@ -2298,7 +2328,7 @@ Timer tmSerial
                                             vis hSlider2,1
                                             vis nNum2,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                             //first value is current value
                                             spstr bText2.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -2314,9 +2344,9 @@ Timer tmSerial
                                             hSlider2.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis bUp3,0
@@ -2331,16 +2361,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
                                             vis tIcon3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             tIcon3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         if(type3.txt=="shutter")
@@ -2363,7 +2391,7 @@ Timer tmSerial
                                             vis hSlider3,0
                                             vis nNum3,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",20
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff3.val=sys0
                                         }
@@ -2377,7 +2405,7 @@ Timer tmSerial
                                             vis hSlider3,0
                                             vis nNum3,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",20
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff3.val=sys0
                                         }
@@ -2394,7 +2422,7 @@ Timer tmSerial
                                             bText3.pco=65535
                                             bText3.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                         }
                                         if(type3.txt=="button")
                                         {
@@ -2409,7 +2437,7 @@ Timer tmSerial
                                             bText3.pco=1374
                                             bText3.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                         }
                                         if(type3.txt=="number")
                                         {
@@ -2422,7 +2450,7 @@ Timer tmSerial
                                             vis hSlider3,1
                                             vis nNum3,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                             //first value is current value
                                             spstr bText3.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -2438,9 +2466,9 @@ Timer tmSerial
                                             hSlider3.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis bUp4,0
@@ -2455,16 +2483,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
                                             vis tIcon4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             tIcon4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         if(type4.txt=="shutter")
@@ -2487,7 +2513,7 @@ Timer tmSerial
                                             vis hSlider4,0
                                             vis nNum4,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",26
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff4.val=sys0
                                         }
@@ -2501,7 +2527,7 @@ Timer tmSerial
                                             vis hSlider4,0
                                             vis nNum4,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",26
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff4.val=sys0
                                         }
@@ -2518,7 +2544,7 @@ Timer tmSerial
                                             bText4.pco=65535
                                             bText4.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                         }
                                         if(type4.txt=="button")
                                         {
@@ -2533,7 +2559,7 @@ Timer tmSerial
                                             bText4.pco=1374
                                             bText4.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                         }
                                         if(type4.txt=="number")
                                         {
@@ -2546,7 +2572,7 @@ Timer tmSerial
                                             vis hSlider4,1
                                             vis nNum4,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                             //first value is current value
                                             spstr bText4.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -2566,11 +2592,11 @@ Timer tmSerial
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -2620,23 +2646,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -2660,14 +2686,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardEntities"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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
@@ -515,7 +515,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardGrid,bPrev"
+            tSend.txt="event,buttonPress2,cardGrid,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -545,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
@@ -592,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
@@ -650,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
@@ -708,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
@@ -766,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
@@ -824,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
@@ -882,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
@@ -1000,15 +1007,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     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 icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis tEntity1,0
@@ -1016,22 +1050,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                             vis bEntity1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             bEntity1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis tEntity2,0
@@ -1039,22 +1071,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                             vis bEntity2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             bEntity2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis tEntity3,0
@@ -1062,22 +1092,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                             vis bEntity3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             bEntity3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis tEntity4,0
@@ -1085,22 +1113,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                             vis bEntity4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             bEntity4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type5.txt,",",27
+                                        spstr strCommand.txt,type5.txt,"~",27
                                         // get internal name
-                                        spstr strCommand.txt,entn5.txt,",",28
+                                        spstr strCommand.txt,entn5.txt,"~",28
                                         if(type5.txt=="delete"||type5.txt=="")
                                         {
                                             vis tEntity5,0
@@ -1108,22 +1134,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                             vis bEntity5,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",30
                                             covx tTmp.txt,sys0,0,0
                                             bEntity5.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            spstr strCommand.txt,tEntity5.txt,"~",31
                                             vis tEntity5,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type6.txt,",",33
+                                        spstr strCommand.txt,type6.txt,"~",33
                                         // get internal name
-                                        spstr strCommand.txt,entn6.txt,",",34
+                                        spstr strCommand.txt,entn6.txt,"~",34
                                         if(type6.txt=="delete"||type6.txt=="")
                                         {
                                             vis tEntity6,0
@@ -1131,16 +1155,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                             vis bEntity6,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",36
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,sys0,0,0
                                             bEntity6.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity6.txt,",",37
+                                            spstr strCommand.txt,tEntity6.txt,"~",37
                                             vis tEntity6,1
                                         }
                                     }
@@ -1148,11 +1170,11 @@ Timer tmSerial
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -1202,23 +1224,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -1242,14 +1264,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardGrid"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

HMI/US/landscape/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                        : 21
-        y coordinate                        : 147
+        x coordinate                        : 29
+        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                        : 51
-        y coordinate                        : 167
+        x coordinate                        : 64
+        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
@@ -856,7 +856,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardMedia,bPrev"
+            tSend.txt="event,buttonPress2,cardMedia,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -920,31 +927,54 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,"|",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",3
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                         //title
-                                        spstr strCommand.txt,tTitle.txt,"|",4
+                                        spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
-                                        spstr strCommand.txt,tAuthor.txt,"|",5
+                                        spstr strCommand.txt,tAuthor.txt,"~",6
                                         //volume
-                                        spstr strCommand.txt,tTmp.txt,"|",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                         //speaker current
-                                        spstr strCommand.txt,tSpeaker.txt,"|",8
+                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")
                                         {
                                             tSpeaker.pco=1374
@@ -953,14 +983,14 @@ Timer tmSerial
                                             tSpeaker.pco=65535
                                         }
                                         //speaker list
-                                        spstr strCommand.txt,vaSpeakerList.txt,"|",9
+                                        spstr strCommand.txt,vaSpeakerList.txt,"~",10
                                         if(vaSpeakerList.txt=="")
                                         {
                                             vis t6,0
                                         }
                                         vaSpeakerPos.val=0
                                         // on off button
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",11
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t5,0
@@ -973,62 +1003,75 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
@@ -1065,14 +1108,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardMedia"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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
@@ -683,7 +683,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardThermo,bPrev"
+            tSend.txt="event,buttonPress2,cardThermo,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1188,29 +1195,56 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,",",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,",",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //currentTemp
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        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,",",5
+                                        spstr strCommand.txt,tStatus.txt,"~",6
                                         //minTemp
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,xTempMin.val,0,0
                                         //maxTemp
-                                        spstr strCommand.txt,tTmp.txt,",",7
+                                        spstr strCommand.txt,tTmp.txt,"~",8
                                         covx tTmp.txt,xTempMax.val,0,0
                                         //tempStep
-                                        spstr strCommand.txt,tTmp.txt,",",8
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,xTempStep.val,0,0
                                         // disable all buttons
                                         vis bt0,0
@@ -1223,232 +1257,218 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,",",9
-                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt0.txt,"~",10
+                                        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,",",10
+                                            spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",11
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,bt0.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va0.txt,",",12
+                                            spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
                                         }
                                         //bt1
-                                        spstr strCommand.txt,tTmp.txt,",",13
-                                        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,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",15
+                                            spstr strCommand.txt,tTmp.txt,"~",16
                                             covx tTmp.txt,bt1.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va1.txt,",",16
+                                            spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
                                         }
                                         //bt2
-                                        spstr strCommand.txt,tTmp.txt,",",17
-                                        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,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",19
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,bt2.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va2.txt,",",20
+                                            spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
                                         }
                                         //bt3
-                                        spstr strCommand.txt,tTmp.txt,",",21
-                                        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,",",22
+                                            spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",23
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,bt3.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va3.txt,",",24
+                                            spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
                                         }
                                         //bt4
-                                        spstr strCommand.txt,tTmp.txt,",",25
-                                        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,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",27
+                                            spstr strCommand.txt,tTmp.txt,"~",28
                                             covx tTmp.txt,bt4.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va4.txt,",",28
+                                            spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
                                         }
                                         //bt5
-                                        spstr strCommand.txt,tTmp.txt,",",29
-                                        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,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",31
+                                            spstr strCommand.txt,tTmp.txt,"~",32
                                             covx tTmp.txt,bt5.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va5.txt,",",32
+                                            spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
                                         }
                                         //bt6
-                                        spstr strCommand.txt,tTmp.txt,",",33
-                                        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,",",34
+                                            spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",35
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,bt6.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va6.txt,",",36
+                                            spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
                                         }
                                         //bt7
-                                        spstr strCommand.txt,tTmp.txt,",",37
-                                        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,",",38
+                                            spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",39
+                                            spstr strCommand.txt,tTmp.txt,"~",40
                                             covx tTmp.txt,bt7.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va7.txt,",",40
+                                            spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
                                         }
                                         //bt8
-                                        spstr strCommand.txt,tTmp.txt,",",41
-                                        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,",",42
+                                            spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",43
+                                            spstr strCommand.txt,tTmp.txt,"~",44
                                             covx tTmp.txt,bt8.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va8.txt,",",44
+                                            spstr strCommand.txt,va8.txt,"~",45
                                             //enable
                                             vis bt8,1
                                         }
                                     }
-                                    if(tInstruction.txt=="time")
-                                    {
-                                        // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
-                                    }
-                                    if(tInstruction.txt=="date")
-                                    {
-                                        // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
-                                    }
-                                    if(tInstruction.txt=="dimmode")
-                                    {
-                                        // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,dimValue,0,0
-                                    }
-                                    if(tInstruction.txt=="timeout")
-                                    {
-                                        //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sleepTimeout,0,0
-                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
                                             page cardAlarm
                                         }
                                     }
+                                    if(tInstruction.txt=="time")
+                                    {
+                                        // get set time to global variable
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="date")
+                                    {
+                                        // get set date to global variable
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="dimmode")
+                                    {
+                                        // get value
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,dimValue,0,0
+                                    }
+                                    if(tInstruction.txt=="timeout")
+                                    {
+                                        //set timeout to global var
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,sleepTimeout,0,0
+                                    }
                                     // end of user code
                                     udelete payloadLength-1
                                     bufferPos=0
@@ -1470,14 +1490,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardThermo"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -1,62 +1,58 @@
 Program.s
 	0    Component(s)
-	9    Line(s) of event code
-	9    Unique line(s) of event code
+	10   Line(s) of event code
+	10   Unique line(s) of event code
 pageIcons
-	5    Component(s)
+	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
+cardMedia
+	30   Component(s)
+	329  Line(s) of event code
+	169  Unique line(s) of event code
 popupNotify
 	17   Component(s)
-	179  Line(s) of event code
-	118  Unique line(s) of event code
-popupShutter
-	19   Component(s)
-	179  Line(s) of event code
-	102  Unique line(s) of event code
-screensaver
-	31   Component(s)
-	183  Line(s) of event code
-	133  Unique line(s) of event code
-popupLight
-	27   Component(s)
-	323  Line(s) of event code
-	174  Unique line(s) of event code
+	196  Line(s) of event code
+	123  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
 cardAlarm
 	35   Component(s)
-	276  Line(s) of event code
-	172  Unique line(s) of event code
-cardMedia
-	30   Component(s)
-	278  Line(s) of event code
-	139  Unique line(s) of event code
-cardThermo
-	41   Component(s)
-	405  Line(s) of event code
-	217  Unique line(s) of event code
+	343  Line(s) of event code
+	214  Unique line(s) of event code
+popupShutter
+	19   Component(s)
+	191  Line(s) of event code
+	107  Unique line(s) of event code
 cardGrid
 	39   Component(s)
-	388  Line(s) of event code
-	224  Unique line(s) of event code
+	418  Line(s) of event code
+	244  Unique line(s) of event code
+cardThermo
+	41   Component(s)
+	442  Line(s) of event code
+	247  Unique line(s) of event code
 cardEntities
 	62   Component(s)
-	930  Line(s) of event code
-	388  Unique line(s) of event code
+	964  Line(s) of event code
+	410  Unique line(s) of event code
+popupLight
+	27   Component(s)
+	320  Line(s) of event code
+	173  Unique line(s) of event code
+screensaver
+	33   Component(s)
+	266  Line(s) of event code
+	218  Unique line(s) of event code
 
 Total
-	13   Page(s)
-	351  Component(s)
-	3361 Line(s) of event code
-	908  Unique line(s) of event code
+	12   Page(s)
+	341  Component(s)
+	3642 Line(s) of event code
+	1001 Unique line(s) of event code

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

@@ -18,39 +18,23 @@ Page pageIcons
         Fill                                : solid color
         Back. Color                         : 65535
     
-Text tIcons
+Variable (string) vaTime
     Attributes
-        ID                                  : 2
+        ID            : 4
         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                      : 150
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
+        Text          : 
+        Max. Text Size: 15
+    
+Variable (string) vaDate
+    Attributes
+        ID            : 5
+        Scope         : global
+        Text          : 
+        Max. Text Size: 35
     
 Text tTmp1
     Attributes
-        ID                                  : 3
+        ID                                  : 2
         Scope                               : global
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -80,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                        : 42
+        x coordinate                        : 52
         y coordinate                        : 223
         Width                               : 375
         Height                              : 30
@@ -326,9 +326,9 @@ Text tMsg2
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 25
+        x coordinate                        : 35
         y coordinate                        : 256
-        Width                               : 423
+        Width                               : 408
         Height                              : 25
         Effect                              : load
         Effect Priority                     : 0
@@ -356,9 +356,9 @@ Text tMsg3
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 25
+        x coordinate                        : 35
         y coordinate                        : 278
-        Width                               : 423
+        Width                               : 408
         Height                              : 25
         Effect                              : load
         Effect Priority                     : 0
@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 23
+        Text                                : 31
         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                        : 169
+        x coordinate                        : 164
         y coordinate                        : 49
         Width                               : 140
         Height                              : 140
@@ -552,27 +552,27 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
@@ -580,11 +580,11 @@ Timer tmSerial
                                         dim=100
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0

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
-        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
+        y coordinate                        : 184
         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

@@ -727,7 +727,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -785,24 +784,22 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                         vis tIcon1,1
                                         // change icon color
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         covx tTmp.txt,sys0,0,0
                                         tIcon1.pco=sys0
                                         // get Button State
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        spstr strCommand.txt,tTmp.txt,"~",3
                                         covx tTmp.txt,sys0,0,0
                                         btOnOff1.val=sys0
                                         // get Brightness value
-                                        spstr strCommand.txt,tTmp.txt,",",4
+                                        spstr strCommand.txt,tTmp.txt,"~",4
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t1,0
@@ -820,7 +817,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get ColorTemp value
-                                        spstr strCommand.txt,tTmp.txt,",",5
+                                        spstr strCommand.txt,tTmp.txt,"~",5
                                         if(tTmp.txt=="disable")
                                         {
                                             vis hTempSlider,0
@@ -864,7 +861,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get Color value
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",6
                                         // disable -> isn't supported
                                         if(tTmp.txt=="disable")
                                         {
@@ -888,34 +885,34 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0

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
@@ -403,7 +403,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -461,70 +460,70 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // get entn
-                                        spstr strCommand.txt,entn.txt,"|",1
+                                        spstr strCommand.txt,entn.txt,"~",1
                                         // get Heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",2
                                         // heading color
-                                        spstr strCommand.txt,tTmp.txt,"|",3
+                                        spstr strCommand.txt,tTmp.txt,"~",3
                                         covx tTmp.txt,sys0,0,0
                                         tHeading.pco=sys0
                                         // get b1
-                                        spstr strCommand.txt,b1.txt,"|",4
+                                        spstr strCommand.txt,b1.txt,"~",4
                                         if(b1.txt!="")
                                         {
                                             vis b1,1
                                         }
                                         // b1 color
-                                        spstr strCommand.txt,tTmp.txt,"|",5
+                                        spstr strCommand.txt,tTmp.txt,"~",5
                                         covx tTmp.txt,sys0,0,0
                                         b1.pco=sys0
                                         // get b2
-                                        spstr strCommand.txt,b2.txt,"|",6
+                                        spstr strCommand.txt,b2.txt,"~",6
                                         if(b2.txt!="")
                                         {
                                             vis b2,1
                                         }
                                         // b2 color
-                                        spstr strCommand.txt,tTmp.txt,"|",7
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         b2.pco=sys0
                                         // get tText
-                                        spstr strCommand.txt,tText.txt,"|",8
+                                        spstr strCommand.txt,tText.txt,"~",8
                                         // tText color
-                                        spstr strCommand.txt,tTmp.txt,"|",9
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,sys0,0,0
                                         tText.pco=sys0
                                         //preserve old sleepTimeout
                                         vaOldSleepT.val=sleepTimeout
                                         // sleep timeout
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",10
                                         covx tTmp.txt,sys0,0,0
                                         sleepTimeout=sys0
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="exitPopup")
@@ -536,11 +535,11 @@ Timer tmSerial
                                         sleepTimeout=vaOldSleepT.val
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -549,25 +548,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -532,7 +532,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -590,72 +589,85 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // get Position value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -22,171 +22,46 @@ Page screensaver
         Preinitialize Event
             recmod=1
             bauds=115200
-            vis originPage,0
             vis tInstruction,0
             vis tTmp,0
             vis p0,0
             //load gloabl time string from pageIcons
             //tTime.txt=vaTime.txt
-            spstr vaTime.txt,tTime.txt,"?",0
-            spstr vaTime.txt,tAMPM.txt,"?",1
+            spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+            spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
             if(tAMPM.txt=="")
             {
                 vis tAMPM,0
             }
-            tDate.txt=vaDate.txt
+            tDate.txt=pageIcons.vaDate.txt
             dim=dimValue
             vis tSend,0
             //page open event
             // clear weather elements, to keep example content in HMI
-            tMainIcon.txt=""
-            tMainText.txt=""
-            tForecast1.txt=""
-            tF1Icon.txt=""
-            tForecast1Val.txt=""
-            tForecast2.txt=""
-            tF2Icon.txt=""
-            tForecast2Val.txt=""
-            tSend.txt="event,screensaverOpen"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
         
 Variable (string) strCommand
     Attributes
-        ID            : 5
+        ID            : 4
         Scope         : local
         Text          : 
         Max. Text Size: 200
     
-Variable (string) vaTime
-    Attributes
-        ID            : 10
-        Scope         : global
-        Text          : 
-        Max. Text Size: 15
-    
-Variable (string) vaDate
-    Attributes
-        ID            : 11
-        Scope         : global
-        Text          : 
-        Max. Text Size: 30
-    
 Variable (string) tId
     Attributes
-        ID            : 22
+        ID            : 17
         Scope         : local
         Text          : 
         Max. Text Size: 25
     
 Variable (int32) vaTap
     Attributes
-        ID   : 30
+        ID   : 25
         Scope: local
         Value: 0
     
-Number originPage
-    Attributes
-        ID                                  : 3
-        Scope                               : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 452
-        y coordinate                        : 267
-        Width                               : 24
-        Height                              : 49
-        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 tInstruction
-    Attributes
-        ID                                  : 6
-        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                                  : 7
-        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                                  : 8
+        ID                                  : 5
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -216,7 +91,7 @@ Text tTime
     
 Text tDate
     Attributes
-        ID                                  : 9
+        ID                                  : 6
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -232,28 +107,28 @@ 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
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Tuesday, 08. March 2022
-        Max. Text Size                      : 30
+        Max. Text Size                      : 35
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
 Text tSend
     Attributes
-        ID                                  : 12
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 451
-        y coordinate                        : 9
+        x coordinate                        : 405
+        y coordinate                        : 2
         Width                               : 29
         Height                              : 30
         Effect                              : load
@@ -276,7 +151,7 @@ Text tSend
     
 Text tMainIcon
     Attributes
-        ID                                  : 13
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -292,13 +167,13 @@ 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
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -306,7 +181,7 @@ Text tMainIcon
     
 Text tMainText
     Attributes
-        ID                                  : 14
+        ID                                  : 9
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -322,13 +197,13 @@ 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
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 2,3 °C
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -336,7 +211,7 @@ Text tMainText
     
 Text tForecast1
     Attributes
-        ID                                  : 15
+        ID                                  : 10
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -358,7 +233,7 @@ Text tForecast1
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : Mi
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -366,16 +241,16 @@ Text tForecast1
     
 Text tForecast1Val
     Attributes
-        ID                                  : 16
+        ID                                  : 11
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 141
-        y coordinate                        : 277
-        Width                               : 72
-        Height                              : 26
+        x coordinate                        : 140
+        y coordinate                        : 276
+        Width                               : 71
+        Height                              : 25
         Effect                              : load
         Effect Priority                     : 0
         Effect Time                         : 300
@@ -388,7 +263,7 @@ Text tForecast1Val
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 9,3 °C
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -396,7 +271,7 @@ Text tForecast1Val
     
 Text tF1Icon
     Attributes
-        ID                                  : 17
+        ID                                  : 12
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -418,7 +293,7 @@ Text tF1Icon
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -426,7 +301,7 @@ Text tF1Icon
     
 Text tForecast2
     Attributes
-        ID                                  : 18
+        ID                                  : 13
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -448,7 +323,7 @@ Text tForecast2
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : Do
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -456,7 +331,7 @@ Text tForecast2
     
 Text tF2Icon
     Attributes
-        ID                                  : 19
+        ID                                  : 14
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -478,7 +353,7 @@ Text tF2Icon
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -486,7 +361,7 @@ Text tF2Icon
     
 Text tForecast2Val
     Attributes
-        ID                                  : 20
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -508,7 +383,7 @@ Text tForecast2Val
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 11,9 °C
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -516,13 +391,13 @@ Text tForecast2Val
     
 Text t10
     Attributes
-        ID                                  : 21
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 46
+        x coordinate                        : 61
         y coordinate                        : 195
         Width                               : 360
         Height                              : 2
@@ -546,7 +421,7 @@ Text t10
     
 Text tAMPM
     Attributes
-        ID                                  : 23
+        ID                                  : 18
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -562,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
@@ -576,7 +451,7 @@ Text tAMPM
     
 Text tForecast3Val
     Attributes
-        ID                                  : 24
+        ID                                  : 19
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -606,7 +481,7 @@ Text tForecast3Val
     
 Text tF3Icon
     Attributes
-        ID                                  : 25
+        ID                                  : 20
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -636,7 +511,7 @@ Text tF3Icon
     
 Text tForecast3
     Attributes
-        ID                                  : 26
+        ID                                  : 21
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -666,7 +541,7 @@ Text tForecast3
     
 Text tForecast4
     Attributes
-        ID                                  : 27
+        ID                                  : 22
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -696,7 +571,7 @@ Text tForecast4
     
 Text tF4Icon
     Attributes
-        ID                                  : 28
+        ID                                  : 23
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -719,14 +594,14 @@ Text tF4Icon
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
 Text tForecast4Val
     Attributes
-        ID                                  : 29
+        ID                                  : 24
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -754,6 +629,186 @@ Text tForecast4Val
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tMainTextAlt
+    Attributes
+        ID                                  : 27
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 119
+        y coordinate                        : 210
+        Width                               : 106
+        Height                              : 42
+        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
+        Horizontal Alignment                : left
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 10
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+Text tMainIconAlt
+    Attributes
+        ID                                  : 28
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 15
+        y coordinate                        : 221
+        Width                               : 100
+        Height                              : 66
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        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 tMRIcon
+    Attributes
+        ID                                  : 29
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 116
+        y coordinate                        : 266
+        Width                               : 40
+        Height                              : 35
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 1
+        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 tMR
+    Attributes
+        ID                                  : 30
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 159
+        y coordinate                        : 270
+        Width                               : 62
+        Height                              : 21
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 0
+        Back. Color                         : 0
+        Font Color                          : 65535
+        Horizontal Alignment                : left
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 10
+        Word wrap                           : disabled
+        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
@@ -773,7 +828,7 @@ Picture p0
     
 Timer tmSerial
     Attributes
-        ID         : 4
+        ID         : 3
         Scope      : local
         Period (ms): 50
         Enabled    : yes
@@ -822,7 +877,7 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="wake")
                                     {
                                         //dim=100
@@ -831,16 +886,16 @@ Timer tmSerial
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         //get set time to global variable
-                                        spstr strCommand.txt,vaTime.txt,",",1
-                                        spstr vaTime.txt,tTime.txt,"?",0
-                                        spstr vaTime.txt,tAMPM.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                        spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+                                        spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
                                         if(tAMPM.txt=="")
                                         {
                                             vis tAMPM,0
@@ -849,66 +904,163 @@ Timer tmSerial
                                     if(tInstruction.txt=="date")
                                     {
                                         //get set date to global variable
-                                        spstr strCommand.txt,vaDate.txt,"?",1
-                                        tDate.txt=vaDate.txt
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                        tDate.txt=pageIcons.vaDate.txt
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="weatherUpdate")
                                     {
+                                        vis tMainIcon,1
+                                        vis tMainIconAlt,0
+                                        vis tMainText,1
+                                        vis tMainTextAlt,0
+                                        vis tMRIcon,0
+                                        vis tMR,0
                                         //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"?",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
+                                        tMainIconAlt.txt=tMainIcon.txt
                                         //tMainText
-                                        spstr strCommand.txt,tMainText.txt,"?",2
+                                        spstr strCommand.txt,tMainText.txt,"~",2
+                                        tMainTextAlt.txt=tMainText.txt
                                         //tForecast1
-                                        spstr strCommand.txt,tForecast1.txt,"?",3
+                                        spstr strCommand.txt,tForecast1.txt,"~",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
                                         //tForecast1Val
-                                        spstr strCommand.txt,tForecast1Val.txt,"?",5
+                                        spstr strCommand.txt,tForecast1Val.txt,"~",5
                                         //tForecast2
-                                        spstr strCommand.txt,tForecast2.txt,"?",6
+                                        spstr strCommand.txt,tForecast2.txt,"~",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
                                         //tForecast2Val
-                                        spstr strCommand.txt,tForecast2Val.txt,"?",8
+                                        spstr strCommand.txt,tForecast2Val.txt,"~",8
                                         //tForecast3
-                                        spstr strCommand.txt,tForecast3.txt,"?",9
+                                        spstr strCommand.txt,tForecast3.txt,"~",9
                                         //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
                                         //tForecast3Val
-                                        spstr strCommand.txt,tForecast3Val.txt,"?",11
+                                        spstr strCommand.txt,tForecast3Val.txt,"~",11
                                         //tForecast4
-                                        spstr strCommand.txt,tForecast4.txt,"?",12
+                                        spstr strCommand.txt,tForecast4.txt,"~",12
                                         //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",13
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
                                         //tForecast4Val
-                                        spstr strCommand.txt,tForecast4Val.txt,"?",14
+                                        spstr strCommand.txt,tForecast4Val.txt,"~",14
+                                        //alternative layout
+                                        //tMRIcon
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
+                                        if(tMRIcon.txt!="")
+                                        {
+                                            //value for tMRIcon, activate alternative layout
+                                            vis tMainIcon,0
+                                            vis tMainText,0
+                                            vis tMainTextAlt,1
+                                            vis tMainIconAlt,1
+                                            vis tMRIcon,1
+                                            vis tMR,1
+                                            vis tForecast1,0
+                                            vis tF1Icon,0
+                                            vis tForecast1Val,0
+                                            //move forecast values to the right
+                                            tForecast4.txt=tForecast3.txt
+                                            tForecast3.txt=tForecast2.txt
+                                            tForecast2.txt=tForecast1.txt
+                                            tForecast4Val.txt=tForecast3Val.txt
+                                            tForecast3Val.txt=tForecast2Val.txt
+                                            tForecast2Val.txt=tForecast1Val.txt
+                                            tF4Icon.txt=tF3Icon.txt
+                                            tF3Icon.txt=tF2Icon.txt
+                                            tF2Icon.txt=tF1Icon.txt
+                                        }
+                                        //tMR
+                                        spstr strCommand.txt,tMR.txt,"~",16
+                                    }
+                                    if(tInstruction.txt=="color")
+                                    {
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,tTime.bco,0,0
+                                        screensaver.bco=tTime.bco
+                                        tAMPM.bco=tTime.bco
+                                        tDate.bco=tTime.bco
+                                        tMainIcon.bco=tTime.bco
+                                        tMainText.bco=tTime.bco
+                                        tMainIconAlt.bco=tTime.bco
+                                        tMainTextAlt.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tMR.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tForecast1.bco=tTime.bco
+                                        tForecast1Val.bco=tTime.bco
+                                        tF1Icon.bco=tTime.bco
+                                        tForecast2.bco=tTime.bco
+                                        tForecast2Val.bco=tTime.bco
+                                        tF2Icon.bco=tTime.bco
+                                        tForecast3.bco=tTime.bco
+                                        tForecast3Val.bco=tTime.bco
+                                        tF3Icon.bco=tTime.bco
+                                        tForecast4.bco=tTime.bco
+                                        tForecast4Val.bco=tTime.bco
+                                        tF4Icon.bco=tTime.bco
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        covx tTmp.txt,tTime.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",3
+                                        covx tTmp.txt,tAMPM.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        covx tTmp.txt,tDate.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        covx tTmp.txt,tMainIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",6
+                                        covx tTmp.txt,tMainText.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        covx tTmp.txt,tForecast1.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        covx tTmp.txt,tForecast2.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        covx tTmp.txt,tForecast3.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        covx tTmp.txt,tForecast4.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        covx tTmp.txt,tF1Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",12
+                                        covx tTmp.txt,tF2Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        covx tTmp.txt,tF3Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",14
+                                        covx tTmp.txt,tF4Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        covx tTmp.txt,tForecast1Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",16
+                                        covx tTmp.txt,tForecast2Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",17
+                                        covx tTmp.txt,tForecast3Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",18
+                                        covx tTmp.txt,tForecast4Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",19
+                                        covx tTmp.txt,t10.bco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",20
+                                        covx tTmp.txt,tMainIconAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",21
+                                        covx tTmp.txt,tMainTextAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",22
+                                        covx tTmp.txt,tMRIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                        covx tTmp.txt,tMR.pco,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         dim=100
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete u[2]+3
                                         bufferPos=0
@@ -962,6 +1114,26 @@ Timer tmSerial
                 }
             }
         
+Timer tmSleep
+    Attributes
+        ID         : 26
+        Scope      : local
+        Period (ms): 1000
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(sleepTimeout!=0&&dimValue!=dim)
+            {
+                sleepValue+=1
+                if(sleepTimeout<=sleepValue)
+                {
+                    sleepValue=0
+                    dim=dimValue
+                    vaTap.val=0
+                }
+            }
+        
 TouchCap tc0
     Attributes
         ID   : 2
@@ -970,7 +1142,7 @@ TouchCap tc0
     
     Events
         Touch Press Event
-            dim=100
+            dim=dimValueNormal
             vaTap.val+=1
             covx vaTap.val,tTmp.txt,0,0
             tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
@@ -985,6 +1157,4 @@ TouchCap tc0
             prints sys0,2
             prints tSend.txt,0
             prints crcval,2
-            //dim=100
-            //page originPage.val
         

HMI/US/landscape/n2t-out/Program.s.txt

@@ -10,6 +10,7 @@ Program.s
     int sleepValue=0
     // dim value
     int dimValue=40
+    int dimValueNormal=100
     // fix touch offset (Removed for US version)
     //lcd_dev fffb 0002 0000 0020
     page pageStartup

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

@@ -17,7 +17,6 @@ Page cardAlarm
             vis tInstruction,0
             vis tTmp,0
             vis tId,0
-            //vis nPageDisp,0
             vis arm1,0
             vis arm2,0
             vis arm3,0
@@ -171,7 +170,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardAlarm,bPrev"
+            tSend.txt="event,buttonPress2,cardAlarm,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -508,53 +514,78 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         //entn
-                                        spstr strCommand.txt,entn.txt,",",1
+                                        spstr strCommand.txt,entn.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         //text arm1
-                                        spstr strCommand.txt,arm1.txt,",",2
+                                        spstr strCommand.txt,arm1.txt,"~",3
                                         if(arm1.txt!="")
                                         {
                                             vis arm1,1
                                         }
                                         //id arm1
-                                        spstr strCommand.txt,va1.txt,",",3
+                                        spstr strCommand.txt,va1.txt,"~",4
                                         //text arm2
-                                        spstr strCommand.txt,arm2.txt,",",4
+                                        spstr strCommand.txt,arm2.txt,"~",5
                                         if(arm2.txt!="")
                                         {
                                             vis arm2,1
                                         }
                                         //id arm2
-                                        spstr strCommand.txt,va2.txt,",",5
+                                        spstr strCommand.txt,va2.txt,"~",6
                                         //text arm3
-                                        spstr strCommand.txt,arm3.txt,",",6
+                                        spstr strCommand.txt,arm3.txt,"~",7
                                         if(arm3.txt!="")
                                         {
                                             vis arm3,1
                                         }
                                         //id arm3
-                                        spstr strCommand.txt,va3.txt,",",7
+                                        spstr strCommand.txt,va3.txt,"~",8
                                         //text arm4
-                                        spstr strCommand.txt,arm4.txt,",",8
+                                        spstr strCommand.txt,arm4.txt,"~",9
                                         if(arm4.txt!="")
                                         {
                                             vis arm4,1
                                         }
                                         //id arm4
-                                        spstr strCommand.txt,va4.txt,",",9
+                                        spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,",",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                         //icon color
-                                        spstr strCommand.txt,tTmp.txt,",",11
+                                        spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0
                                         tIcon.pco=sys0
                                         //numpad status
-                                        spstr strCommand.txt,tTmp.txt,",",12
+                                        spstr strCommand.txt,tTmp.txt,"~",13
                                         if(tTmp.txt!="disable")
                                         {
                                             vis b0,1
@@ -569,9 +600,23 @@ Timer tmSerial
                                             vis b9,1
                                             vis b10,1
                                             vis tCode,1
+                                        }else
+                                        {
+                                            vis b0,0
+                                            vis b1,0
+                                            vis b2,0
+                                            vis b3,0
+                                            vis b4,0
+                                            vis b5,0
+                                            vis b6,0
+                                            vis b7,0
+                                            vis b8,0
+                                            vis b9,0
+                                            vis b10,0
+                                            vis tCode,0
                                         }
                                         //flashing status
-                                        spstr strCommand.txt,tTmp.txt,",",13
+                                        spstr strCommand.txt,tTmp.txt,"~",14
                                         if(tTmp.txt=="enable")
                                         {
                                             tmFlash.en=1
@@ -583,67 +628,80 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
                                         }
                                         if(tId.txt=="cardMedia")
                                         {
                                             page cardMedia
                                         }
+                                        if(tId.txt=="cardAlarm")
+                                        {
+                                            page cardAlarm
+                                        }
                                     }
                                     // end of user code
                                     udelete payloadLength-1
@@ -665,14 +723,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardAlarm"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -211,7 +211,7 @@ Text tIcon1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
     
 Text tIcon2
     Attributes
@@ -221,7 +221,7 @@ Text tIcon2
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
     
 Text tIcon3
     Attributes
@@ -231,7 +231,7 @@ Text tIcon3
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
     
 Text tIcon4
     Attributes
@@ -241,7 +241,7 @@ Text tIcon4
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
     
 Text tSend
     Attributes
@@ -714,7 +714,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardEntities,bPrev"
+            tSend.txt="event,buttonPress2,cardEntities,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1115,15 +1122,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
-                                        spstr strCommand.txt,tHeading.txt,",",1
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis bUp1,0
@@ -1138,16 +1172,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
                                             vis tIcon1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             tIcon1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         if(type1.txt=="shutter")
@@ -1170,7 +1202,7 @@ Timer tmSerial
                                             vis hSlider1,0
                                             vis nNum1,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",8
+                                            spstr strCommand.txt,tTmp.txt,"~",8
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff1.val=sys0
                                         }
@@ -1184,7 +1216,7 @@ Timer tmSerial
                                             vis hSlider1,0
                                             vis nNum1,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",8
+                                            spstr strCommand.txt,tTmp.txt,"~",8
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff1.val=sys0
                                         }
@@ -1201,7 +1233,7 @@ Timer tmSerial
                                             bText1.pco=65535
                                             bText1.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                         }
                                         if(type1.txt=="button")
                                         {
@@ -1216,7 +1248,7 @@ Timer tmSerial
                                             bText1.pco=1374
                                             bText1.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                         }
                                         if(type1.txt=="number")
                                         {
@@ -1229,7 +1261,7 @@ Timer tmSerial
                                             vis hSlider1,1
                                             vis nNum1,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                             //first value is current value
                                             spstr bText1.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1245,9 +1277,9 @@ Timer tmSerial
                                             hSlider1.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis bUp2,0
@@ -1262,16 +1294,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
                                             vis tIcon2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             tIcon2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         if(type2.txt=="shutter")
@@ -1294,7 +1324,7 @@ Timer tmSerial
                                             vis hSlider2,0
                                             vis nNum2,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",14
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff2.val=sys0
                                         }
@@ -1308,7 +1338,7 @@ Timer tmSerial
                                             vis hSlider2,0
                                             vis nNum2,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",14
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff2.val=sys0
                                         }
@@ -1325,7 +1355,7 @@ Timer tmSerial
                                             bText2.pco=65535
                                             bText2.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                         }
                                         if(type2.txt=="button")
                                         {
@@ -1340,7 +1370,7 @@ Timer tmSerial
                                             bText2.pco=1374
                                             bText2.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                         }
                                         if(type2.txt=="number")
                                         {
@@ -1353,7 +1383,7 @@ Timer tmSerial
                                             vis hSlider2,1
                                             vis nNum2,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                             //first value is current value
                                             spstr bText2.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1369,9 +1399,9 @@ Timer tmSerial
                                             hSlider2.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis bUp3,0
@@ -1386,16 +1416,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
                                             vis tIcon3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             tIcon3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         if(type3.txt=="shutter")
@@ -1418,7 +1446,7 @@ Timer tmSerial
                                             vis hSlider3,0
                                             vis nNum3,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",20
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff3.val=sys0
                                         }
@@ -1432,7 +1460,7 @@ Timer tmSerial
                                             vis hSlider3,0
                                             vis nNum3,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",20
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff3.val=sys0
                                         }
@@ -1449,7 +1477,7 @@ Timer tmSerial
                                             bText3.pco=65535
                                             bText3.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                         }
                                         if(type3.txt=="button")
                                         {
@@ -1464,7 +1492,7 @@ Timer tmSerial
                                             bText3.pco=1374
                                             bText3.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                         }
                                         if(type3.txt=="number")
                                         {
@@ -1477,7 +1505,7 @@ Timer tmSerial
                                             vis hSlider3,1
                                             vis nNum3,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                             //first value is current value
                                             spstr bText3.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1493,9 +1521,9 @@ Timer tmSerial
                                             hSlider3.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis bUp4,0
@@ -1510,16 +1538,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
                                             vis tIcon4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             tIcon4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         if(type4.txt=="shutter")
@@ -1542,7 +1568,7 @@ Timer tmSerial
                                             vis hSlider4,0
                                             vis nNum4,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",26
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff4.val=sys0
                                         }
@@ -1556,7 +1582,7 @@ Timer tmSerial
                                             vis hSlider4,0
                                             vis nNum4,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",26
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff4.val=sys0
                                         }
@@ -1573,7 +1599,7 @@ Timer tmSerial
                                             bText4.pco=65535
                                             bText4.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                         }
                                         if(type4.txt=="button")
                                         {
@@ -1588,7 +1614,7 @@ Timer tmSerial
                                             bText4.pco=1374
                                             bText4.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                         }
                                         if(type4.txt=="number")
                                         {
@@ -1601,7 +1627,7 @@ Timer tmSerial
                                             vis hSlider4,1
                                             vis nNum4,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                             //first value is current value
                                             spstr bText4.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1621,11 +1647,11 @@ Timer tmSerial
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -1675,23 +1701,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -1714,14 +1740,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardEntities"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -242,7 +242,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardGrid,bPrev"
+            tSend.txt="event,buttonPress2,cardGrid,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -563,15 +570,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     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 icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis tEntity1,0
@@ -579,22 +613,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                             vis bEntity1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             bEntity1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis tEntity2,0
@@ -602,22 +634,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                             vis bEntity2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             bEntity2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis tEntity3,0
@@ -625,22 +655,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                             vis bEntity3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             bEntity3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis tEntity4,0
@@ -648,22 +676,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                             vis bEntity4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             bEntity4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type5.txt,",",27
+                                        spstr strCommand.txt,type5.txt,"~",27
                                         // get internal name
-                                        spstr strCommand.txt,entn5.txt,",",28
+                                        spstr strCommand.txt,entn5.txt,"~",28
                                         if(type5.txt=="delete"||type5.txt=="")
                                         {
                                             vis tEntity5,0
@@ -671,22 +697,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                             vis bEntity5,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",30
                                             covx tTmp.txt,sys0,0,0
                                             bEntity5.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            spstr strCommand.txt,tEntity5.txt,"~",31
                                             vis tEntity5,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type6.txt,",",33
+                                        spstr strCommand.txt,type6.txt,"~",33
                                         // get internal name
-                                        spstr strCommand.txt,entn6.txt,",",34
+                                        spstr strCommand.txt,entn6.txt,"~",34
                                         if(type6.txt=="delete"||type6.txt=="")
                                         {
                                             vis tEntity6,0
@@ -694,16 +718,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                             vis bEntity6,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",36
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,sys0,0,0
                                             bEntity6.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity6.txt,",",37
+                                            spstr strCommand.txt,tEntity6.txt,"~",37
                                             vis tEntity6,1
                                         }
                                     }
@@ -711,11 +733,11 @@ Timer tmSerial
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -765,23 +787,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -804,14 +826,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardGrid"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -435,7 +435,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardMedia,bPrev"
+            tSend.txt="event,buttonPress2,cardMedia,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -498,31 +505,54 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,"|",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",3
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                         //title
-                                        spstr strCommand.txt,tTitle.txt,"|",4
+                                        spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
-                                        spstr strCommand.txt,tAuthor.txt,"|",5
+                                        spstr strCommand.txt,tAuthor.txt,"~",6
                                         //volume
-                                        spstr strCommand.txt,tTmp.txt,"|",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                         //speaker current
-                                        spstr strCommand.txt,tSpeaker.txt,"|",8
+                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")
                                         {
                                             tSpeaker.pco=1374
@@ -531,14 +561,14 @@ Timer tmSerial
                                             tSpeaker.pco=65535
                                         }
                                         //speaker list
-                                        spstr strCommand.txt,vaSpeakerList.txt,"|",9
+                                        spstr strCommand.txt,vaSpeakerList.txt,"~",10
                                         if(vaSpeakerList.txt=="")
                                         {
                                             vis t6,0
                                         }
                                         vaSpeakerPos.val=0
                                         // on off button
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",11
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t5,0
@@ -551,62 +581,75 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
@@ -642,14 +685,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardMedia"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -329,7 +329,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardThermo,bPrev"
+            tSend.txt="event,buttonPress2,cardThermo,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -635,29 +642,56 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,",",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,",",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //currentTemp
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        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,",",5
+                                        spstr strCommand.txt,tStatus.txt,"~",6
                                         //minTemp
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,xTempMin.val,0,0
                                         //maxTemp
-                                        spstr strCommand.txt,tTmp.txt,",",7
+                                        spstr strCommand.txt,tTmp.txt,"~",8
                                         covx tTmp.txt,xTempMax.val,0,0
                                         //tempStep
-                                        spstr strCommand.txt,tTmp.txt,",",8
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,xTempStep.val,0,0
                                         // disable all buttons
                                         vis bt0,0
@@ -670,232 +704,218 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,",",9
-                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt0.txt,"~",10
+                                        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,",",10
+                                            spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",11
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,bt0.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va0.txt,",",12
+                                            spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
                                         }
                                         //bt1
-                                        spstr strCommand.txt,tTmp.txt,",",13
-                                        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,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",15
+                                            spstr strCommand.txt,tTmp.txt,"~",16
                                             covx tTmp.txt,bt1.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va1.txt,",",16
+                                            spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
                                         }
                                         //bt2
-                                        spstr strCommand.txt,tTmp.txt,",",17
-                                        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,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",19
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,bt2.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va2.txt,",",20
+                                            spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
                                         }
                                         //bt3
-                                        spstr strCommand.txt,tTmp.txt,",",21
-                                        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,",",22
+                                            spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",23
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,bt3.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va3.txt,",",24
+                                            spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
                                         }
                                         //bt4
-                                        spstr strCommand.txt,tTmp.txt,",",25
-                                        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,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",27
+                                            spstr strCommand.txt,tTmp.txt,"~",28
                                             covx tTmp.txt,bt4.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va4.txt,",",28
+                                            spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
                                         }
                                         //bt5
-                                        spstr strCommand.txt,tTmp.txt,",",29
-                                        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,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",31
+                                            spstr strCommand.txt,tTmp.txt,"~",32
                                             covx tTmp.txt,bt5.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va5.txt,",",32
+                                            spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
                                         }
                                         //bt6
-                                        spstr strCommand.txt,tTmp.txt,",",33
-                                        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,",",34
+                                            spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",35
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,bt6.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va6.txt,",",36
+                                            spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
                                         }
                                         //bt7
-                                        spstr strCommand.txt,tTmp.txt,",",37
-                                        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,",",38
+                                            spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",39
+                                            spstr strCommand.txt,tTmp.txt,"~",40
                                             covx tTmp.txt,bt7.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va7.txt,",",40
+                                            spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
                                         }
                                         //bt8
-                                        spstr strCommand.txt,tTmp.txt,",",41
-                                        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,",",42
+                                            spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",43
+                                            spstr strCommand.txt,tTmp.txt,"~",44
                                             covx tTmp.txt,bt8.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va8.txt,",",44
+                                            spstr strCommand.txt,va8.txt,"~",45
                                             //enable
                                             vis bt8,1
                                         }
                                     }
-                                    if(tInstruction.txt=="time")
-                                    {
-                                        // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
-                                    }
-                                    if(tInstruction.txt=="date")
-                                    {
-                                        // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
-                                    }
-                                    if(tInstruction.txt=="dimmode")
-                                    {
-                                        // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,dimValue,0,0
-                                    }
-                                    if(tInstruction.txt=="timeout")
-                                    {
-                                        //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sleepTimeout,0,0
-                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
                                             page cardAlarm
                                         }
                                     }
+                                    if(tInstruction.txt=="time")
+                                    {
+                                        // get set time to global variable
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="date")
+                                    {
+                                        // get set date to global variable
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="dimmode")
+                                    {
+                                        // get value
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,dimValue,0,0
+                                    }
+                                    if(tInstruction.txt=="timeout")
+                                    {
+                                        //set timeout to global var
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,sleepTimeout,0,0
+                                    }
                                     // end of user code
                                     udelete payloadLength-1
                                     bufferPos=0
@@ -916,14 +936,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardThermo"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -10,15 +10,17 @@ Page pageIcons
         Swide left page ID                  : disabled
         Swide right page ID                 : disabled
     
-Text tIcons
+Variable (string) vaTime
     Attributes
         Scope         : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 150
+        Text          : 
+        Max. Text Size: 15
+    
+Variable (string) vaDate
+    Attributes
+        Scope         : global
+        Text          : 
+        Max. Text Size: 35
     
 Text tTmp1
     Attributes

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                                : 23
+        Text                                : 31
         Max. Text Size                      : 10
     
 Picture p0
@@ -257,27 +257,27 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
@@ -285,11 +285,11 @@ Timer tmSerial
                                         dim=100
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0

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

@@ -382,7 +382,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -439,24 +438,22 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                         vis tIcon1,1
                                         // change icon color
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         covx tTmp.txt,sys0,0,0
                                         tIcon1.pco=sys0
                                         // get Button State
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        spstr strCommand.txt,tTmp.txt,"~",3
                                         covx tTmp.txt,sys0,0,0
                                         btOnOff1.val=sys0
                                         // get Brightness value
-                                        spstr strCommand.txt,tTmp.txt,",",4
+                                        spstr strCommand.txt,tTmp.txt,"~",4
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t1,0
@@ -474,7 +471,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get ColorTemp value
-                                        spstr strCommand.txt,tTmp.txt,",",5
+                                        spstr strCommand.txt,tTmp.txt,"~",5
                                         if(tTmp.txt=="disable")
                                         {
                                             vis hTempSlider,0
@@ -518,7 +515,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get Color value
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",6
                                         // disable -> isn't supported
                                         if(tTmp.txt=="disable")
                                         {
@@ -542,34 +539,34 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0

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

@@ -195,7 +195,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -252,70 +251,70 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // get entn
-                                        spstr strCommand.txt,entn.txt,"|",1
+                                        spstr strCommand.txt,entn.txt,"~",1
                                         // get Heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",2
                                         // heading color
-                                        spstr strCommand.txt,tTmp.txt,"|",3
+                                        spstr strCommand.txt,tTmp.txt,"~",3
                                         covx tTmp.txt,sys0,0,0
                                         tHeading.pco=sys0
                                         // get b1
-                                        spstr strCommand.txt,b1.txt,"|",4
+                                        spstr strCommand.txt,b1.txt,"~",4
                                         if(b1.txt!="")
                                         {
                                             vis b1,1
                                         }
                                         // b1 color
-                                        spstr strCommand.txt,tTmp.txt,"|",5
+                                        spstr strCommand.txt,tTmp.txt,"~",5
                                         covx tTmp.txt,sys0,0,0
                                         b1.pco=sys0
                                         // get b2
-                                        spstr strCommand.txt,b2.txt,"|",6
+                                        spstr strCommand.txt,b2.txt,"~",6
                                         if(b2.txt!="")
                                         {
                                             vis b2,1
                                         }
                                         // b2 color
-                                        spstr strCommand.txt,tTmp.txt,"|",7
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         b2.pco=sys0
                                         // get tText
-                                        spstr strCommand.txt,tText.txt,"|",8
+                                        spstr strCommand.txt,tText.txt,"~",8
                                         // tText color
-                                        spstr strCommand.txt,tTmp.txt,"|",9
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,sys0,0,0
                                         tText.pco=sys0
                                         //preserve old sleepTimeout
                                         vaOldSleepT.val=sleepTimeout
                                         // sleep timeout
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",10
                                         covx tTmp.txt,sys0,0,0
                                         sleepTimeout=sys0
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="exitPopup")
@@ -327,11 +326,11 @@ Timer tmSerial
                                         sleepTimeout=vaOldSleepT.val
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -340,25 +339,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -268,7 +268,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -325,72 +324,85 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // get Position value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -14,43 +14,22 @@ Page screensaver
         Preinitialize Event
             recmod=1
             bauds=115200
-            vis originPage,0
             vis tInstruction,0
             vis tTmp,0
             vis p0,0
             //load gloabl time string from pageIcons
             //tTime.txt=vaTime.txt
-            spstr vaTime.txt,tTime.txt,"?",0
-            spstr vaTime.txt,tAMPM.txt,"?",1
+            spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+            spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
             if(tAMPM.txt=="")
             {
                 vis tAMPM,0
             }
-            tDate.txt=vaDate.txt
+            tDate.txt=pageIcons.vaDate.txt
             dim=dimValue
             vis tSend,0
             //page open event
             // clear weather elements, to keep example content in HMI
-            tMainIcon.txt=""
-            tMainText.txt=""
-            tForecast1.txt=""
-            tF1Icon.txt=""
-            tForecast1Val.txt=""
-            tForecast2.txt=""
-            tF2Icon.txt=""
-            tForecast2Val.txt=""
-            tSend.txt="event,screensaverOpen"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
         
 Variable (string) strCommand
     Attributes
@@ -58,18 +37,6 @@ Variable (string) strCommand
         Text          : 
         Max. Text Size: 200
     
-Variable (string) vaTime
-    Attributes
-        Scope         : global
-        Text          : 
-        Max. Text Size: 15
-    
-Variable (string) vaDate
-    Attributes
-        Scope         : global
-        Text          : 
-        Max. Text Size: 30
-    
 Variable (string) tId
     Attributes
         Scope         : local
@@ -81,35 +48,6 @@ Variable (int32) vaTap
         Scope: local
         Value: 0
     
-Number originPage
-    Attributes
-        Scope                               : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        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
@@ -128,7 +66,7 @@ Text tDate
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Tuesday, 08. March 2022
-        Max. Text Size                      : 30
+        Max. Text Size                      : 35
     
 Text tSend
     Attributes
@@ -147,7 +85,7 @@ Text tMainIcon
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tMainText
@@ -157,7 +95,7 @@ Text tMainText
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 2,3 °C
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tForecast1
@@ -167,7 +105,7 @@ Text tForecast1
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : Mi
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tForecast1Val
@@ -177,7 +115,7 @@ Text tForecast1Val
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 9,3 °C
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tF1Icon
@@ -187,7 +125,7 @@ Text tF1Icon
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tForecast2
@@ -197,7 +135,7 @@ Text tForecast2
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : Do
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tF2Icon
@@ -207,7 +145,7 @@ Text tF2Icon
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tForecast2Val
@@ -217,7 +155,7 @@ Text tForecast2Val
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 11,9 °C
+        Text                                : 
         Max. Text Size                      : 10
     
 Text t10
@@ -288,7 +226,7 @@ Text tF4Icon
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
     
 Text tForecast4Val
     Attributes
@@ -300,6 +238,66 @@ Text tForecast4Val
         Text                                : 
         Max. Text Size                      : 10
     
+Text tMainTextAlt
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tMainIconAlt
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tMRIcon
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tMR
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        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
@@ -357,7 +355,7 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="wake")
                                     {
                                         //dim=100
@@ -366,16 +364,16 @@ Timer tmSerial
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         //get set time to global variable
-                                        spstr strCommand.txt,vaTime.txt,",",1
-                                        spstr vaTime.txt,tTime.txt,"?",0
-                                        spstr vaTime.txt,tAMPM.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                        spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+                                        spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
                                         if(tAMPM.txt=="")
                                         {
                                             vis tAMPM,0
@@ -384,66 +382,163 @@ Timer tmSerial
                                     if(tInstruction.txt=="date")
                                     {
                                         //get set date to global variable
-                                        spstr strCommand.txt,vaDate.txt,"?",1
-                                        tDate.txt=vaDate.txt
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                        tDate.txt=pageIcons.vaDate.txt
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="weatherUpdate")
                                     {
+                                        vis tMainIcon,1
+                                        vis tMainIconAlt,0
+                                        vis tMainText,1
+                                        vis tMainTextAlt,0
+                                        vis tMRIcon,0
+                                        vis tMR,0
                                         //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"?",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
+                                        tMainIconAlt.txt=tMainIcon.txt
                                         //tMainText
-                                        spstr strCommand.txt,tMainText.txt,"?",2
+                                        spstr strCommand.txt,tMainText.txt,"~",2
+                                        tMainTextAlt.txt=tMainText.txt
                                         //tForecast1
-                                        spstr strCommand.txt,tForecast1.txt,"?",3
+                                        spstr strCommand.txt,tForecast1.txt,"~",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
                                         //tForecast1Val
-                                        spstr strCommand.txt,tForecast1Val.txt,"?",5
+                                        spstr strCommand.txt,tForecast1Val.txt,"~",5
                                         //tForecast2
-                                        spstr strCommand.txt,tForecast2.txt,"?",6
+                                        spstr strCommand.txt,tForecast2.txt,"~",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
                                         //tForecast2Val
-                                        spstr strCommand.txt,tForecast2Val.txt,"?",8
+                                        spstr strCommand.txt,tForecast2Val.txt,"~",8
                                         //tForecast3
-                                        spstr strCommand.txt,tForecast3.txt,"?",9
+                                        spstr strCommand.txt,tForecast3.txt,"~",9
                                         //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
                                         //tForecast3Val
-                                        spstr strCommand.txt,tForecast3Val.txt,"?",11
+                                        spstr strCommand.txt,tForecast3Val.txt,"~",11
                                         //tForecast4
-                                        spstr strCommand.txt,tForecast4.txt,"?",12
+                                        spstr strCommand.txt,tForecast4.txt,"~",12
                                         //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",13
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
                                         //tForecast4Val
-                                        spstr strCommand.txt,tForecast4Val.txt,"?",14
+                                        spstr strCommand.txt,tForecast4Val.txt,"~",14
+                                        //alternative layout
+                                        //tMRIcon
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
+                                        if(tMRIcon.txt!="")
+                                        {
+                                            //value for tMRIcon, activate alternative layout
+                                            vis tMainIcon,0
+                                            vis tMainText,0
+                                            vis tMainTextAlt,1
+                                            vis tMainIconAlt,1
+                                            vis tMRIcon,1
+                                            vis tMR,1
+                                            vis tForecast1,0
+                                            vis tF1Icon,0
+                                            vis tForecast1Val,0
+                                            //move forecast values to the right
+                                            tForecast4.txt=tForecast3.txt
+                                            tForecast3.txt=tForecast2.txt
+                                            tForecast2.txt=tForecast1.txt
+                                            tForecast4Val.txt=tForecast3Val.txt
+                                            tForecast3Val.txt=tForecast2Val.txt
+                                            tForecast2Val.txt=tForecast1Val.txt
+                                            tF4Icon.txt=tF3Icon.txt
+                                            tF3Icon.txt=tF2Icon.txt
+                                            tF2Icon.txt=tF1Icon.txt
+                                        }
+                                        //tMR
+                                        spstr strCommand.txt,tMR.txt,"~",16
+                                    }
+                                    if(tInstruction.txt=="color")
+                                    {
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,tTime.bco,0,0
+                                        screensaver.bco=tTime.bco
+                                        tAMPM.bco=tTime.bco
+                                        tDate.bco=tTime.bco
+                                        tMainIcon.bco=tTime.bco
+                                        tMainText.bco=tTime.bco
+                                        tMainIconAlt.bco=tTime.bco
+                                        tMainTextAlt.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tMR.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tForecast1.bco=tTime.bco
+                                        tForecast1Val.bco=tTime.bco
+                                        tF1Icon.bco=tTime.bco
+                                        tForecast2.bco=tTime.bco
+                                        tForecast2Val.bco=tTime.bco
+                                        tF2Icon.bco=tTime.bco
+                                        tForecast3.bco=tTime.bco
+                                        tForecast3Val.bco=tTime.bco
+                                        tF3Icon.bco=tTime.bco
+                                        tForecast4.bco=tTime.bco
+                                        tForecast4Val.bco=tTime.bco
+                                        tF4Icon.bco=tTime.bco
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        covx tTmp.txt,tTime.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",3
+                                        covx tTmp.txt,tAMPM.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        covx tTmp.txt,tDate.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        covx tTmp.txt,tMainIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",6
+                                        covx tTmp.txt,tMainText.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        covx tTmp.txt,tForecast1.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        covx tTmp.txt,tForecast2.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        covx tTmp.txt,tForecast3.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        covx tTmp.txt,tForecast4.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        covx tTmp.txt,tF1Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",12
+                                        covx tTmp.txt,tF2Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        covx tTmp.txt,tF3Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",14
+                                        covx tTmp.txt,tF4Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        covx tTmp.txt,tForecast1Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",16
+                                        covx tTmp.txt,tForecast2Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",17
+                                        covx tTmp.txt,tForecast3Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",18
+                                        covx tTmp.txt,tForecast4Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",19
+                                        covx tTmp.txt,t10.bco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",20
+                                        covx tTmp.txt,tMainIconAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",21
+                                        covx tTmp.txt,tMainTextAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",22
+                                        covx tTmp.txt,tMRIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                        covx tTmp.txt,tMR.pco,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         dim=100
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete u[2]+3
                                         bufferPos=0
@@ -497,6 +592,25 @@ Timer tmSerial
                 }
             }
         
+Timer tmSleep
+    Attributes
+        Scope      : local
+        Period (ms): 1000
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(sleepTimeout!=0&&dimValue!=dim)
+            {
+                sleepValue+=1
+                if(sleepTimeout<=sleepValue)
+                {
+                    sleepValue=0
+                    dim=dimValue
+                    vaTap.val=0
+                }
+            }
+        
 TouchCap tc0
     Attributes
         Scope: local
@@ -504,7 +618,7 @@ TouchCap tc0
     
     Events
         Touch Press Event
-            dim=100
+            dim=dimValueNormal
             vaTap.val+=1
             covx vaTap.val,tTmp.txt,0,0
             tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
@@ -519,6 +633,4 @@ TouchCap tc0
             prints sys0,2
             prints tSend.txt,0
             prints crcval,2
-            //dim=100
-            //page originPage.val
         

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

@@ -0,0 +1,455 @@
+diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+--- HMI/n2t-out/Program.s.txt	2022-04-01 04:54:12.884151859 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-01 04:54:13.372185922 +0000
+@@ -11,6 +11,6 @@
+     // dim value
+     int dimValue=40
+     int dimValueNormal=100
+-    // fix touch offset
+-    lcd_dev fffb 0002 0000 0020
++    // fix touch offset (Removed for US version)
++    //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-01 04:54:12.888152138 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-01 04:54:13.372185922 +0000
+@@ -62,6 +62,26 @@
+             vis bText4,0
+             vis hSlider4,0
+             vis nNum4,0
++            //ui e5
++            vis btOnOff5,0
++            vis bUp5,0
++            vis bStop5,0
++            vis bDown5,0
++            vis tIcon5,0
++            vis tEntity5,0
++            vis bText5,0
++            vis hSlider5,0
++            vis nNum5,0
+
+         
+ Variable (string) strCommand
+     Attributes
+@@ -117,6 +137,30 @@
+         Text          : 
+         Max. Text Size: 70
+     
++Variable (string) entn5
++    Attributes
++        Scope         : local
++        Text          : 
++        Max. Text Size: 70
++    
++    
++Variable (string) type5
++    Attributes
++        Scope         : local
++        Text          : 
++        Max. Text Size: 10
++    
+ Number nNum1
+     Attributes
+         Scope                               : local
+@@ -153,6 +197,24 @@
+         Associated Keyboard                 : none
+         Value                               : 0
+     
++Number nNum5
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        Associated Keyboard                 : none
++        Value                               : 0
++    
+ 
+ Text tHeading
+     Attributes
+         Scope                               : local
+@@ -283,6 +345,46 @@
+         Text                                : 
+         Max. Text Size                      : 50
+     
++Text tEntity5
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        Associated Keyboard                 : none
++        Text                                : tEntity5
++        Max. Text Size                      : 30
++    
++Text tIcon5
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        Associated Keyboard                 : none
++        Text                                : 
++        Max. Text Size                      : 5
++    
+  
+ Picture p0
+     Attributes
+         Scope                               : local
+@@ -402,6 +504,62 @@
+             prints tSend.txt,0
+             prints crcval,2
+         
++Slider hSlider5
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        Position                            : 50
++        Upper range limit                   : 100
++        Lower range limit                   : 0
++    
++    Events
++        Touch Release Event
++            nNum5.val=hSlider5.val
++            tSend.txt="event,buttonPress2,"+entn5.txt+",number-set,"
++            covx nNum5.val,tTmp.txt,0,0
++            tSend.txt+=tTmp.txt
++            //send calc crc
++            btlen tSend.txt,sys0
++            crcrest 1,0xffff // reset CRC
++            crcputh 55 bb
++            crcputs sys0,1
++            crcputs tSend.txt,0
++            //send cmd
++            printh 55 bb
++            prints sys0,2
++            prints tSend.txt,0
++            prints crcval,2
++        
+        
+ Button bDown1
+     Attributes
+         Scope                               : local
+@@ -857,6 +1015,206 @@
+             prints tSend.txt,0
+             prints crcval,2
+         
++Button bStop5
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        State                               : unpressed
++        Text                                : 
++        Max. Text Size                      : 10
++    
++    Events
++        Touch Press Event
++            tSend.txt="event,buttonPress2,"+entn5.txt+",stop"
++            //send calc crc
++            btlen tSend.txt,sys0
++            crcrest 1,0xffff // reset CRC
++            crcputh 55 bb
++            crcputs sys0,1
++            crcputs tSend.txt,0
++            //send cmd
++            printh 55 bb
++            prints sys0,2
++            prints tSend.txt,0
++            prints crcval,2
++        
++Button bDown5
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        State                               : unpressed
++        Text                                : 
++        Max. Text Size                      : 10
++    
++    Events
++        Touch Press Event
++            tSend.txt="event,buttonPress2,"+entn5.txt+",down"
++            //send calc crc
++            btlen tSend.txt,sys0
++            crcrest 1,0xffff // reset CRC
++            crcputh 55 bb
++            crcputs sys0,1
++            crcputs tSend.txt,0
++            //send cmd
++            printh 55 bb
++            prints sys0,2
++            prints tSend.txt,0
++            prints crcval,2
++        
++Button bUp5
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        State                               : unpressed
++        Text                                : 
++        Max. Text Size                      : 10
++    
++    Events
++        Touch Press Event
++            tSend.txt="event,buttonPress2,"+entn5.txt+",up"
++            //send calc crc
++            btlen tSend.txt,sys0
++            crcrest 1,0xffff // reset CRC
++            crcputh 55 bb
++            crcputs sys0,1
++            crcputs tSend.txt,0
++            //send cmd
++            printh 55 bb
++            prints sys0,2
++            prints tSend.txt,0
++            prints crcval,2
++        
++Button bText5
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        State                               : unpressed
++        Text                                : newtxt
++        Max. Text Size                      : 10
++    
++    Events
++        Touch Press Event
++            tSend.txt="event,buttonPress2,"+entn5.txt+",button"
++            //send calc crc
++            btlen tSend.txt,sys0
++            crcrest 1,0xffff // reset CRC
++            crcputh 55 bb
++            crcputs sys0,1
++            crcputs tSend.txt,0
++            //send cmd
++            printh 55 bb
++            prints sys0,2
++            prints tSend.txt,0
++            prints crcval,2
++        
+       
+ Dual-state Button btOnOff1
+     Attributes
+         Scope                               : local
+@@ -965,6 +1323,60 @@
+             prints tSend.txt,0
+             prints crcval,2
+         
++Dual-state Button btOnOff5
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++        State                               : unpressed
++        Text                                : 
++        Max. Text Size                      : 10
++    
++    Events
++        Touch Press Event
++            tSend.txt="event,buttonPress2,"+entn5.txt+",OnOff,"
++            covx btOnOff5.val,tTmp.txt,0,0
++            tSend.txt+=tTmp.txt
++            //send calc crc
++            btlen tSend.txt,sys0
++            crcrest 1,0xffff // reset CRC
++            crcputh 55 bb
++            crcputs sys0,1
++            crcputs tSend.txt,0
++            //send cmd
++            printh 55 bb
++            prints sys0,2
++            prints tSend.txt,0
++            prints crcval,2
++        
+
+ Hotspot mSpecial
+     Attributes
+         Scope                               : local
+@@ -1070,6 +1482,50 @@
+                 page popupLight
+             }
+         
++Hotspot m4
++    Attributes
++        Scope                               : local
++        Dragging                            : 0
++        Disable release event after dragging: 0
++        Send Component ID                   : disabled
++    
++    Events
++        Touch Press Event
++            pageIcons.tTmp1.txt=tEntity5.txt
++            pageIcons.tTmp2.txt=entn5.txt
++            if(type5.txt=="shutter")
++            {
++                //popupShutter.tHeading.txt=tEntity5.txt
++                page popupShutter
++            }
++            if(type5.txt=="light")
++            {
++                //popupLight.tEntity.txt=tEntity5.txt
++                page popupLight
++            }
++        
+
+ Timer tmSerial
+     Attributes
+         Scope      : local
+@@ -1642,6 +2098,250 @@
+                                             covx tTmp.txt,sys0,0,0
+                                             hSlider4.maxval=sys0
+                                         }
++                                        // get Type
++                                        spstr strCommand.txt,type5.txt,"~",27
++                                        // get internal name
++                                        spstr strCommand.txt,entn5.txt,"~",28
++                                        if(type5.txt=="delete"||type5.txt=="")
++                                        {
++                                            vis bUp5,0
++                                            vis bStop5,0
++                                            vis bDown5,0
++                                            vis btOnOff5,0
++                                            vis tEntity5,0
++                                            vis tIcon5,0
++                                            vis bText5,0
++                                            vis hSlider5,0
++                                            vis nNum5,0
++                                        }else
++                                        {
++                                            // change icon
++                                            spstr strCommand.txt,tIcon5.txt,"~",29
++                                            vis tIcon5,1
++                                            // change icon color
++                                            spstr strCommand.txt,tTmp.txt,"~",30
++                                            covx tTmp.txt,sys0,0,0
++                                            tIcon5.pco=sys0
++                                            // set name
++                                            spstr strCommand.txt,tEntity5.txt,"~",31
++                                            vis tEntity5,1
++                                        }
++                                        if(type5.txt=="shutter")
++                                        {
++                                            vis bUp5,1
++                                            vis bStop5,1
++                                            vis bDown5,1
++                                            vis btOnOff5,0
++                                            vis bText5,0
++                                            vis hSlider5,0
++                                            vis nNum5,0
++                                        }
++                                        if(type5.txt=="light")
++                                        {
++                                            vis bUp5,0
++                                            vis bStop5,0
++                                            vis bDown5,0
++                                            vis btOnOff5,1
++                                            vis bText5,0
++                                            vis hSlider5,0
++                                            vis nNum5,0
++                                            // get Button State (optional Value)
++                                            spstr strCommand.txt,tTmp.txt,"~",32
++                                            covx tTmp.txt,sys0,0,0
++                                            btOnOff5.val=sys0
++                                        }
++                                        if(type5.txt=="switch")
++                                        {
++                                            vis bUp5,0
++                                            vis bStop5,0
++                                            vis bDown5,0
++                                            vis btOnOff5,1
++                                            vis bText5,0
++                                            vis hSlider5,0
++                                            vis nNum5,0
++                                            // get Button State (optional Value)
++                                            spstr strCommand.txt,tTmp.txt,"~",32
++                                            covx tTmp.txt,sys0,0,0
++                                            btOnOff5.val=sys0
++                                        }
++                                        if(type5.txt=="text")
++                                        {
++                                            vis bUp5,0
++                                            vis bStop5,0
++                                            vis bDown5,0
++                                            vis btOnOff5,0
++                                            vis bText5,1
++                                            tsw bText5,0
++                                            vis hSlider5,0
++                                            vis nNum5,0
++                                            bText5.pco=65535
++                                            bText5.pco2=65535
++                                            // get Text (optional Value)
++                                            spstr strCommand.txt,bText5.txt,"~",32
++                                        }
++                                        if(type5.txt=="button")
++                                        {
++                                            vis bUp5,0
++                                            vis bStop5,0
++                                            vis bDown5,0
++                                            vis btOnOff5,0
++                                            vis bText5,1
++                                            tsw bText5,1
++                                            vis hSlider5,0
++                                            vis nNum5,0
++                                            bText5.pco=1374
++                                            bText5.pco2=1374
++                                            // get Text (optional Value)
++                                            spstr strCommand.txt,bText5.txt,"~",32
++                                        }
++                                        if(type5.txt=="number")
++                                        {
++                                            vis bUp5,0
++                                            vis bStop5,0
++                                            vis bDown5,0
++                                            vis btOnOff5,0
++                                            vis bText5,0
++                                            tsw bText5,0
++                                            vis hSlider5,1
++                                            vis nNum5,1
++                                            // get config (optional Value) (use bText as variable)
++                                            spstr strCommand.txt,bText5.txt,"~",32
++                                            //first value is current value
++                                            spstr bText5.txt,tTmp.txt,"|",0
++                                            covx tTmp.txt,sys0,0,0
++                                            hSlider5.val=sys0
++                                            nNum5.val=sys0
++                                            //second value is min value
++                                            spstr bText5.txt,tTmp.txt,"|",1
++                                            covx tTmp.txt,sys0,0,0
++                                            hSlider5.minval=sys0
++                                            //third value is max value
++                                            spstr bText5.txt,tTmp.txt,"|",2
++                                            covx tTmp.txt,sys0,0,0
++                                            hSlider5.maxval=sys0
++                                        }
+
+diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
+--- HMI/n2t-out/pageStartup.txt	2022-04-01 04:54:12.884151859 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-01 04:54:13.372185922 +0000
+@@ -142,7 +142,7 @@
+         Disable release event after dragging: 0
+         Send Component ID                   : disabled
+         Associated Keyboard                 : none
+-        Text                                : please check your backend configuration
++        Text                                : pls check your backend configuration
+         Max. Text Size                      : 100
+     
+ Text tVersion
+@@ -177,7 +177,7 @@
+             recmod=1
+             bauds=115200
+             // startup event
+-            tSend.txt="event,startup,"+tVersion.txt+",eu"
++            tSend.txt="event,startup,"+tVersion.txt+",us-p"
+             //send calc crc
+             btlen tSend.txt,sys0
+             crcrest 1,0xffff // reset CRC

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

@@ -1,19 +1,19 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-03-30 09:17:12.762388734 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-03-30 09:17:13.206389440 +0000
-@@ -10,6 +10,6 @@
-     int sleepValue=0
+--- HMI/n2t-out/Program.s.txt	2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-13 20:21:35.070233972 +0000
+@@ -11,6 +11,6 @@
      // dim value
      int dimValue=40
+     int dimValueNormal=100
 -    // fix touch offset
 -    lcd_dev fffb 0002 0000 0020
 +    // fix touch offset (Removed for US version)
 +    //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-03-30 09:17:12.766388740 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-03-30 09:17:13.206389440 +0000
-@@ -62,6 +62,26 @@
+--- HMI/n2t-out/cardEntities.txt	2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-13 20:21:35.070233972 +0000
+@@ -62,6 +62,16 @@
              vis bText4,0
              vis hSlider4,0
              vis nNum4,0
@@ -27,20 +27,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            vis bText5,0
 +            vis hSlider5,0
 +            vis nNum5,0
-+            //ui e6
-+            vis btOnOff6,0
-+            vis bUp6,0
-+            vis bStop6,0
-+            vis bDown6,0
-+            vis tIcon6,0
-+            vis tEntity6,0
-+            vis bText6,0
-+            vis hSlider6,0
-+            vis nNum6,0
          
  Variable (string) strCommand
      Attributes
-@@ -117,6 +137,30 @@
+@@ -117,6 +127,18 @@
          Text          : 
          Max. Text Size: 70
      
@@ -50,28 +40,16 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Text          : 
 +        Max. Text Size: 70
 +    
-+Variable (string) entn6
-+    Attributes
-+        Scope         : local
-+        Text          : 
-+        Max. Text Size: 70
-+    
 +Variable (string) type5
 +    Attributes
 +        Scope         : local
 +        Text          : 
 +        Max. Text Size: 10
-+    
-+Variable (string) type6
-+    Attributes
-+        Scope         : local
-+        Text          :  
-+        Max. Text Size: 10
 +    
  Number nNum1
      Attributes
          Scope                               : local
-@@ -153,6 +197,24 @@
+@@ -153,6 +175,15 @@
          Associated Keyboard                 : none
          Value                               : 0
      
@@ -83,20 +61,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Value                               : 0
-+    
-+Number nNum6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Value                               : 0
 +    
  Text tHeading
      Attributes
          Scope                               : local
-@@ -283,6 +345,46 @@
+@@ -283,6 +314,26 @@
          Text                                : 
          Max. Text Size                      : 50
      
@@ -118,32 +87,12 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Text                                : 
-+        Max. Text Size                      : 30
-+    
-+Text tEntity6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Text                                : tEntity6
-+        Max. Text Size                      : 30
-+    
-+Text tIcon6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Text                                : 
-+        Max. Text Size                      : 30
++        Max. Text Size                      : 5
 +    
  Picture p0
      Attributes
          Scope                               : local
-@@ -402,6 +504,62 @@
+@@ -402,6 +453,34 @@
              prints tSend.txt,0
              prints crcval,2
          
@@ -174,39 +123,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
-+        
-+Slider hSlider6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Position                            : 50
-+        Upper range limit                   : 100
-+        Lower range limit                   : 0
-+    
-+    Events
-+        Touch Release Event
-+            nNum6.val=hSlider6.val
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
-+            covx nNum6.val,tTmp.txt,0,0
-+            tSend.txt+=tTmp.txt
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
 +        
  Button bDown1
      Attributes
          Scope                               : local
-@@ -852,6 +1010,206 @@
+@@ -859,6 +938,106 @@
              prints tSend.txt,0
              prints crcval,2
          
@@ -247,7 +168,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +    
 +    Events
 +        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn4.txt+",down"
++            tSend.txt="event,buttonPress2,"+entn5.txt+",down"
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
@@ -309,111 +230,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
-+        
-+Button bStop6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",stop"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bDown6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn4.txt+",down"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bUp6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",up"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bText6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : newtxt
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
 +        
  Dual-state Button btOnOff1
      Attributes
          Scope                               : local
-@@ -960,6 +1318,60 @@
+@@ -967,6 +1146,33 @@
              prints tSend.txt,0
              prints crcval,2
          
@@ -443,38 +264,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
-+        
-+Dual-state Button btOnOff6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
-+            covx btOnOff6.val,tTmp.txt,0,0
-+            tSend.txt+=tTmp.txt
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
 +        
  Hotspot mSpecial
      Attributes
          Scope                               : local
-@@ -1065,6 +1477,50 @@
+@@ -1072,6 +1278,28 @@
                  page popupLight
              }
          
@@ -499,40 +293,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                //popupLight.tEntity.txt=tEntity5.txt
 +                page popupLight
 +            }
-+        
-+Hotspot m5
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+    
-+    Events
-+        Touch Press Event
-+            pageIcons.tTmp1.txt=tEntity6.txt
-+            pageIcons.tTmp2.txt=entn6.txt
-+            if(type6.txt=="shutter")
-+            {
-+                //popupShutter.tHeading.txt=tEntity6.txt
-+                page popupShutter
-+            }
-+            if(type6.txt=="light")
-+            {
-+                //popupLight.tEntity.txt=tEntity6.txt
-+                page popupLight
-+            }
 +        
  Timer tmSerial
      Attributes
          Scope      : local
-@@ -1616,6 +2072,254 @@
+@@ -1642,6 +1870,128 @@
                                              covx tTmp.txt,sys0,0,0
                                              hSlider4.maxval=sys0
                                          }
 +                                        // get Type
-+                                        spstr strCommand.txt,type5.txt,",",27
++                                        spstr strCommand.txt,type5.txt,"~",27
 +                                        // get internal name
-+                                        spstr strCommand.txt,entn5.txt,",",28
++                                        spstr strCommand.txt,entn5.txt,"~",28
 +                                        if(type5.txt=="delete"||type5.txt=="")
 +                                        {
 +                                            vis bUp5,0
@@ -547,16 +319,14 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                        }else
 +                                        {
 +                                            // change icon
-+                                            spstr strCommand.txt,tTmp.txt,",",29
-+                                            covx tTmp.txt,sys0,0,0
-+                                            substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
++                                            spstr strCommand.txt,tIcon5.txt,"~",29
 +                                            vis tIcon5,1
 +                                            // change icon color
-+                                            spstr strCommand.txt,tTmp.txt,",",30
++                                            spstr strCommand.txt,tTmp.txt,"~",30
 +                                            covx tTmp.txt,sys0,0,0
 +                                            tIcon5.pco=sys0
 +                                            // set name
-+                                            spstr strCommand.txt,tEntity5.txt,",",31
++                                            spstr strCommand.txt,tEntity5.txt,"~",31
 +                                            vis tEntity5,1
 +                                        }
 +                                        if(type5.txt=="shutter")
@@ -579,7 +349,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            vis hSlider5,0
 +                                            vis nNum5,0
 +                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,",",32
++                                            spstr strCommand.txt,tTmp.txt,"~",32
 +                                            covx tTmp.txt,sys0,0,0
 +                                            btOnOff5.val=sys0
 +                                        }
@@ -593,7 +363,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            vis hSlider5,0
 +                                            vis nNum5,0
 +                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,",",32
++                                            spstr strCommand.txt,tTmp.txt,"~",32
 +                                            covx tTmp.txt,sys0,0,0
 +                                            btOnOff5.val=sys0
 +                                        }
@@ -610,7 +380,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            bText5.pco=65535
 +                                            bText5.pco2=65535
 +                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText5.txt,",",32
++                                            spstr strCommand.txt,bText5.txt,"~",32
 +                                        }
 +                                        if(type5.txt=="button")
 +                                        {
@@ -625,7 +395,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            bText5.pco=1374
 +                                            bText5.pco2=1374
 +                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText5.txt,",",32
++                                            spstr strCommand.txt,bText5.txt,"~",32
 +                                        }
 +                                        if(type5.txt=="number")
 +                                        {
@@ -638,7 +408,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            vis hSlider5,1
 +                                            vis nNum5,1
 +                                            // get config (optional Value) (use bText as variable)
-+                                            spstr strCommand.txt,bText5.txt,",",32
++                                            spstr strCommand.txt,bText5.txt,"~",32
 +                                            //first value is current value
 +                                            spstr bText5.txt,tTmp.txt,"|",0
 +                                            covx tTmp.txt,sys0,0,0
@@ -652,164 +422,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            spstr bText5.txt,tTmp.txt,"|",2
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider5.maxval=sys0
-+                                        }
-+                                        // get Type
-+                                        spstr strCommand.txt,type6.txt,",",33
-+                                        // get internal name
-+                                        spstr strCommand.txt,entn6.txt,",",34
-+                                        if(type6.txt=="delete"||type6.txt=="")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis tEntity6,0
-+                                            vis tIcon6,0
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                        }else
-+                                        {
-+                                            // change icon
-+                                            spstr strCommand.txt,tTmp.txt,",",35
-+                                            covx tTmp.txt,sys0,0,0
-+                                            substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
-+                                            vis tIcon6,1
-+                                            // change icon color
-+                                            spstr strCommand.txt,tTmp.txt,",",36
-+                                            covx tTmp.txt,sys0,0,0
-+                                            tIcon6.pco=sys0
-+                                            // set name
-+                                            spstr strCommand.txt,tEntity6.txt,",",37
-+                                            vis tEntity6,1
-+                                        }
-+                                        if(type6.txt=="shutter")
-+                                        {
-+                                            vis bUp6,1
-+                                            vis bStop6,1
-+                                            vis bDown6,1
-+                                            vis btOnOff6,0
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                        }
-+                                        if(type6.txt=="light")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,1
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,",",38
-+                                            covx tTmp.txt,sys0,0,0
-+                                            btOnOff6.val=sys0
-+                                        }
-+                                        if(type6.txt=="switch")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,1
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,",",38
-+                                            covx tTmp.txt,sys0,0,0
-+                                            btOnOff6.val=sys0
-+                                        }
-+                                        if(type6.txt=="text")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis bText6,1
-+                                            tsw bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            bText6.pco=65535
-+                                            bText6.pco2=65535
-+                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText6.txt,",",38
-+                                        }
-+                                        if(type6.txt=="button")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis bText6,1
-+                                            tsw bText6,1
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            bText6.pco=1374
-+                                            bText6.pco2=1374
-+                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText6.txt,",",38
-+                                        }
-+                                        if(type6.txt=="number")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis bText6,0
-+                                            tsw bText6,0
-+                                            vis hSlider6,1
-+                                            vis nNum6,1
-+                                            // get config (optional Value) (use bText as variable)
-+                                            spstr strCommand.txt,bText6.txt,",",38
-+                                            //first value is current value
-+                                            spstr bText6.txt,tTmp.txt,"|",0
-+                                            covx tTmp.txt,sys0,0,0
-+                                            hSlider6.val=sys0
-+                                            nNum6.val=sys0
-+                                            //second value is min value
-+                                            spstr bText6.txt,tTmp.txt,"|",1
-+                                            covx tTmp.txt,sys0,0,0
-+                                            hSlider6.minval=sys0
-+                                            //third value is max value
-+                                            spstr bText6.txt,tTmp.txt,"|",2
-+                                            covx tTmp.txt,sys0,0,0
-+                                            hSlider6.maxval=sys0
 +                                        }
                                      }
                                      if(tInstruction.txt=="pageType")
                                      {
-diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
---- HMI/n2t-out/cardThermo.txt	2022-03-30 09:17:12.766388740 +0000
-+++ HMI/US/portrait/n2t-out/cardThermo.txt	2022-03-30 09:17:13.206389440 +0000
-@@ -17,6 +17,7 @@
-             vis tInstruction,0
-             vis tTmp,0
-             vis tId,0
-+            vis nPageDisp,0
-             vis xTempMin,0
-             vis xTempMax,0
-             vis xTempStep,0
-@@ -98,6 +99,15 @@
-         Text          : 
-         Max. Text Size: 10
-     
-+Number nPageDisp
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Value                               : 0
-+    
- XFloat xTempCurr
-     Attributes
-         Scope                               : local
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-03-30 09:17:12.762388734 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-03-30 09:17:13.206389440 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-13 20:21:35.070233972 +0000
 @@ -142,7 +142,7 @@
          Disable release event after dragging: 0
          Send Component ID                   : disabled

HMI/US/portrait/diff-filtered.txt

@@ -0,0 +1,19 @@
++++ HMI/US/portrait/diff-eu-version.txt	2022-04-13 20:21:35.094234461 +0000
++--- HMI/n2t-out/Program.s.txt	2022-04-13 20:21:34.698226402 +0000
+++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-13 20:21:35.070233972 +0000
++--- HMI/n2t-out/cardEntities.txt	2022-04-13 20:21:34.698226402 +0000
+++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-13 20:21:35.070233972 +0000
++@@ -62,6 +62,16 @@
++@@ -117,6 +127,18 @@
++@@ -153,6 +175,15 @@
++@@ -283,6 +314,26 @@
++@@ -402,6 +453,34 @@
++@@ -859,6 +938,106 @@
++@@ -967,6 +1146,33 @@
++@@ -1072,6 +1278,28 @@
++@@ -1642,6 +1870,128 @@
++                                     }
++                                     if(tInstruction.txt=="pageType")
++                                     {
++--- HMI/n2t-out/pageStartup.txt	2022-04-13 20:21:34.698226402 +0000
+++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-13 20:21:35.070233972 +0000

HMI/US/portrait/n2t-out-visual/Program.s.txt

@@ -10,6 +10,7 @@ Program.s
     int sleepValue=0
     // dim value
     int dimValue=40
+    int dimValueNormal=100
     // fix touch offset (Removed for US version)
     //lcd_dev fffb 0002 0000 0020
     page pageStartup

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

@@ -25,7 +25,6 @@ Page cardAlarm
             vis tInstruction,0
             vis tTmp,0
             vis tId,0
-            //vis nPageDisp,0
             vis arm1,0
             vis arm2,0
             vis arm3,0
@@ -200,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
@@ -230,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
@@ -276,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
@@ -323,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
@@ -340,7 +339,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardAlarm,bPrev"
+            tSend.txt="event,buttonPress2,cardAlarm,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1038,53 +1044,78 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         //entn
-                                        spstr strCommand.txt,entn.txt,",",1
+                                        spstr strCommand.txt,entn.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         //text arm1
-                                        spstr strCommand.txt,arm1.txt,",",2
+                                        spstr strCommand.txt,arm1.txt,"~",3
                                         if(arm1.txt!="")
                                         {
                                             vis arm1,1
                                         }
                                         //id arm1
-                                        spstr strCommand.txt,va1.txt,",",3
+                                        spstr strCommand.txt,va1.txt,"~",4
                                         //text arm2
-                                        spstr strCommand.txt,arm2.txt,",",4
+                                        spstr strCommand.txt,arm2.txt,"~",5
                                         if(arm2.txt!="")
                                         {
                                             vis arm2,1
                                         }
                                         //id arm2
-                                        spstr strCommand.txt,va2.txt,",",5
+                                        spstr strCommand.txt,va2.txt,"~",6
                                         //text arm3
-                                        spstr strCommand.txt,arm3.txt,",",6
+                                        spstr strCommand.txt,arm3.txt,"~",7
                                         if(arm3.txt!="")
                                         {
                                             vis arm3,1
                                         }
                                         //id arm3
-                                        spstr strCommand.txt,va3.txt,",",7
+                                        spstr strCommand.txt,va3.txt,"~",8
                                         //text arm4
-                                        spstr strCommand.txt,arm4.txt,",",8
+                                        spstr strCommand.txt,arm4.txt,"~",9
                                         if(arm4.txt!="")
                                         {
                                             vis arm4,1
                                         }
                                         //id arm4
-                                        spstr strCommand.txt,va4.txt,",",9
+                                        spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,",",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                         //icon color
-                                        spstr strCommand.txt,tTmp.txt,",",11
+                                        spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0
                                         tIcon.pco=sys0
                                         //numpad status
-                                        spstr strCommand.txt,tTmp.txt,",",12
+                                        spstr strCommand.txt,tTmp.txt,"~",13
                                         if(tTmp.txt!="disable")
                                         {
                                             vis b0,1
@@ -1099,9 +1130,23 @@ Timer tmSerial
                                             vis b9,1
                                             vis b10,1
                                             vis tCode,1
+                                        }else
+                                        {
+                                            vis b0,0
+                                            vis b1,0
+                                            vis b2,0
+                                            vis b3,0
+                                            vis b4,0
+                                            vis b5,0
+                                            vis b6,0
+                                            vis b7,0
+                                            vis b8,0
+                                            vis b9,0
+                                            vis b10,0
+                                            vis tCode,0
                                         }
                                         //flashing status
-                                        spstr strCommand.txt,tTmp.txt,",",13
+                                        spstr strCommand.txt,tTmp.txt,"~",14
                                         if(tTmp.txt=="enable")
                                         {
                                             tmFlash.en=1
@@ -1113,67 +1158,80 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
                                         }
                                         if(tId.txt=="cardMedia")
                                         {
                                             page cardMedia
                                         }
+                                        if(tId.txt=="cardAlarm")
+                                        {
+                                            page cardAlarm
+                                        }
                                     }
                                     // end of user code
                                     udelete payloadLength-1
@@ -1196,14 +1254,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardAlarm"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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
@@ -515,7 +515,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardGrid,bPrev"
+            tSend.txt="event,buttonPress2,cardGrid,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -545,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
@@ -592,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
@@ -650,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
@@ -708,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
@@ -766,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
@@ -824,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
@@ -882,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
@@ -1000,15 +1007,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     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 icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis tEntity1,0
@@ -1016,22 +1050,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                             vis bEntity1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             bEntity1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis tEntity2,0
@@ -1039,22 +1071,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                             vis bEntity2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             bEntity2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis tEntity3,0
@@ -1062,22 +1092,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                             vis bEntity3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             bEntity3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis tEntity4,0
@@ -1085,22 +1113,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                             vis bEntity4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             bEntity4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type5.txt,",",27
+                                        spstr strCommand.txt,type5.txt,"~",27
                                         // get internal name
-                                        spstr strCommand.txt,entn5.txt,",",28
+                                        spstr strCommand.txt,entn5.txt,"~",28
                                         if(type5.txt=="delete"||type5.txt=="")
                                         {
                                             vis tEntity5,0
@@ -1108,22 +1134,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                             vis bEntity5,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",30
                                             covx tTmp.txt,sys0,0,0
                                             bEntity5.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            spstr strCommand.txt,tEntity5.txt,"~",31
                                             vis tEntity5,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type6.txt,",",33
+                                        spstr strCommand.txt,type6.txt,"~",33
                                         // get internal name
-                                        spstr strCommand.txt,entn6.txt,",",34
+                                        spstr strCommand.txt,entn6.txt,"~",34
                                         if(type6.txt=="delete"||type6.txt=="")
                                         {
                                             vis tEntity6,0
@@ -1131,16 +1155,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                             vis bEntity6,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",36
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,sys0,0,0
                                             bEntity6.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity6.txt,",",37
+                                            spstr strCommand.txt,tEntity6.txt,"~",37
                                             vis tEntity6,1
                                         }
                                     }
@@ -1148,11 +1170,11 @@ Timer tmSerial
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -1202,23 +1224,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -1242,14 +1264,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardGrid"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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
@@ -856,7 +856,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardMedia,bPrev"
+            tSend.txt="event,buttonPress2,cardMedia,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -920,31 +927,54 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,"|",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",3
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                         //title
-                                        spstr strCommand.txt,tTitle.txt,"|",4
+                                        spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
-                                        spstr strCommand.txt,tAuthor.txt,"|",5
+                                        spstr strCommand.txt,tAuthor.txt,"~",6
                                         //volume
-                                        spstr strCommand.txt,tTmp.txt,"|",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                         //speaker current
-                                        spstr strCommand.txt,tSpeaker.txt,"|",8
+                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")
                                         {
                                             tSpeaker.pco=1374
@@ -953,14 +983,14 @@ Timer tmSerial
                                             tSpeaker.pco=65535
                                         }
                                         //speaker list
-                                        spstr strCommand.txt,vaSpeakerList.txt,"|",9
+                                        spstr strCommand.txt,vaSpeakerList.txt,"~",10
                                         if(vaSpeakerList.txt=="")
                                         {
                                             vis t6,0
                                         }
                                         vaSpeakerPos.val=0
                                         // on off button
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",11
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t5,0
@@ -973,62 +1003,75 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
@@ -1065,14 +1108,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardMedia"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -25,7 +25,6 @@ Page cardThermo
             vis tInstruction,0
             vis tTmp,0
             vis tId,0
-            vis nPageDisp,0
             vis xTempMin,0
             vis xTempMax,0
             vis xTempStep,0
@@ -43,114 +42,84 @@ Page cardThermo
         
 Variable (string) strCommand
     Attributes
-        ID            : 7
+        ID            : 6
         Scope         : local
         Text          : 
         Max. Text Size: 250
     
 Variable (string) entn
     Attributes
-        ID            : 22
+        ID            : 21
         Scope         : local
         Text          : 
         Max. Text Size: 50
     
 Variable (string) va0
     Attributes
-        ID            : 33
+        ID            : 32
         Scope         : local
         Text          : 
         Max. Text Size: 10
     
 Variable (string) va1
     Attributes
-        ID            : 34
+        ID            : 33
         Scope         : local
         Text          : 
         Max. Text Size: 10
     
 Variable (string) va2
     Attributes
-        ID            : 35
+        ID            : 34
         Scope         : local
         Text          : 
         Max. Text Size: 10
     
 Variable (string) va3
     Attributes
-        ID            : 36
+        ID            : 35
         Scope         : local
         Text          : 
         Max. Text Size: 10
     
 Variable (string) va4
     Attributes
-        ID            : 37
+        ID            : 36
         Scope         : local
         Text          : 
         Max. Text Size: 10
     
 Variable (string) va5
     Attributes
-        ID            : 38
+        ID            : 37
         Scope         : local
         Text          : 
         Max. Text Size: 10
     
 Variable (string) va6
     Attributes
-        ID            : 39
+        ID            : 38
         Scope         : local
         Text          : 
         Max. Text Size: 10
     
 Variable (string) va7
     Attributes
-        ID            : 40
+        ID            : 39
         Scope         : local
         Text          : 
         Max. Text Size: 10
     
 Variable (string) va8
     Attributes
-        ID            : 41
+        ID            : 40
         Scope         : local
         Text          : 
         Max. Text Size: 10
     
-Number nPageDisp
-    Attributes
-        ID                                  : 5
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 275
-        y coordinate                        : 1
-        Width                               : 42
-        Height                              : 24
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 0
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Value                               : 0
-        Significant digits shown            : all
-        Format                              : decimal
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
-    
 XFloat xTempCurr
     Attributes
-        ID                                  : 14
+        ID                                  : 13
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -166,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
@@ -180,7 +149,7 @@ XFloat xTempCurr
     
 XFloat xTempDest
     Attributes
-        ID                                  : 16
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -210,7 +179,7 @@ XFloat xTempDest
     
 XFloat xTempMin
     Attributes
-        ID                                  : 17
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -240,7 +209,7 @@ XFloat xTempMin
     
 XFloat xTempMax
     Attributes
-        ID                                  : 18
+        ID                                  : 17
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -270,7 +239,7 @@ XFloat xTempMax
     
 XFloat xTempStep
     Attributes
-        ID                                  : 19
+        ID                                  : 18
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -360,7 +329,7 @@ Text tTmp
     
 Text tInstruction
     Attributes
-        ID                                  : 8
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -390,7 +359,7 @@ Text tInstruction
     
 Text tId
     Attributes
-        ID                                  : 9
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -420,7 +389,7 @@ Text tId
     
 Text tHeading
     Attributes
-        ID                                  : 10
+        ID                                  : 9
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -436,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
@@ -450,7 +419,7 @@ Text tHeading
     
 Text tStatus
     Attributes
-        ID                                  : 11
+        ID                                  : 10
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -480,7 +449,7 @@ Text tStatus
     
 Text t2
     Attributes
-        ID                                  : 15
+        ID                                  : 14
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -542,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
@@ -574,7 +543,7 @@ Button bNext
         
 Button bDown
     Attributes
-        ID                                  : 12
+        ID                                  : 11
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -628,7 +597,7 @@ Button bDown
         
 Button bUp
     Attributes
-        ID                                  : 13
+        ID                                  : 12
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -682,7 +651,7 @@ Button bUp
         
 Button bPrev
     Attributes
-        ID                                  : 23
+        ID                                  : 22
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -697,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
@@ -714,7 +683,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardThermo,bPrev"
+            tSend.txt="event,buttonPress2,cardThermo,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -729,7 +705,7 @@ Button bPrev
         
 Dual-state Button bt0
     Attributes
-        ID                                  : 24
+        ID                                  : 23
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -778,7 +754,7 @@ Dual-state Button bt0
         
 Dual-state Button bt1
     Attributes
-        ID                                  : 25
+        ID                                  : 24
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -827,7 +803,7 @@ Dual-state Button bt1
         
 Dual-state Button bt2
     Attributes
-        ID                                  : 26
+        ID                                  : 25
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -876,7 +852,7 @@ Dual-state Button bt2
         
 Dual-state Button bt3
     Attributes
-        ID                                  : 27
+        ID                                  : 26
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -925,7 +901,7 @@ Dual-state Button bt3
         
 Dual-state Button bt4
     Attributes
-        ID                                  : 28
+        ID                                  : 27
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -974,7 +950,7 @@ Dual-state Button bt4
         
 Dual-state Button bt5
     Attributes
-        ID                                  : 29
+        ID                                  : 28
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -1023,7 +999,7 @@ Dual-state Button bt5
         
 Dual-state Button bt6
     Attributes
-        ID                                  : 30
+        ID                                  : 29
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -1072,7 +1048,7 @@ Dual-state Button bt6
         
 Dual-state Button bt7
     Attributes
-        ID                                  : 31
+        ID                                  : 30
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -1121,7 +1097,7 @@ Dual-state Button bt7
         
 Dual-state Button bt8
     Attributes
-        ID                                  : 32
+        ID                                  : 31
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -1170,7 +1146,7 @@ Dual-state Button bt8
         
 Timer tmSerial
     Attributes
-        ID         : 6
+        ID         : 5
         Scope      : local
         Period (ms): 50
         Enabled    : yes
@@ -1219,29 +1195,56 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,",",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,",",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //currentTemp
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        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,",",5
+                                        spstr strCommand.txt,tStatus.txt,"~",6
                                         //minTemp
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,xTempMin.val,0,0
                                         //maxTemp
-                                        spstr strCommand.txt,tTmp.txt,",",7
+                                        spstr strCommand.txt,tTmp.txt,"~",8
                                         covx tTmp.txt,xTempMax.val,0,0
                                         //tempStep
-                                        spstr strCommand.txt,tTmp.txt,",",8
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,xTempStep.val,0,0
                                         // disable all buttons
                                         vis bt0,0
@@ -1254,232 +1257,218 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,",",9
-                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt0.txt,"~",10
+                                        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,",",10
+                                            spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",11
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,bt0.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va0.txt,",",12
+                                            spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
                                         }
                                         //bt1
-                                        spstr strCommand.txt,tTmp.txt,",",13
-                                        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,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",15
+                                            spstr strCommand.txt,tTmp.txt,"~",16
                                             covx tTmp.txt,bt1.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va1.txt,",",16
+                                            spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
                                         }
                                         //bt2
-                                        spstr strCommand.txt,tTmp.txt,",",17
-                                        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,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",19
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,bt2.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va2.txt,",",20
+                                            spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
                                         }
                                         //bt3
-                                        spstr strCommand.txt,tTmp.txt,",",21
-                                        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,",",22
+                                            spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",23
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,bt3.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va3.txt,",",24
+                                            spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
                                         }
                                         //bt4
-                                        spstr strCommand.txt,tTmp.txt,",",25
-                                        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,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",27
+                                            spstr strCommand.txt,tTmp.txt,"~",28
                                             covx tTmp.txt,bt4.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va4.txt,",",28
+                                            spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
                                         }
                                         //bt5
-                                        spstr strCommand.txt,tTmp.txt,",",29
-                                        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,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",31
+                                            spstr strCommand.txt,tTmp.txt,"~",32
                                             covx tTmp.txt,bt5.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va5.txt,",",32
+                                            spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
                                         }
                                         //bt6
-                                        spstr strCommand.txt,tTmp.txt,",",33
-                                        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,",",34
+                                            spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",35
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,bt6.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va6.txt,",",36
+                                            spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
                                         }
                                         //bt7
-                                        spstr strCommand.txt,tTmp.txt,",",37
-                                        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,",",38
+                                            spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",39
+                                            spstr strCommand.txt,tTmp.txt,"~",40
                                             covx tTmp.txt,bt7.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va7.txt,",",40
+                                            spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
                                         }
                                         //bt8
-                                        spstr strCommand.txt,tTmp.txt,",",41
-                                        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,",",42
+                                            spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",43
+                                            spstr strCommand.txt,tTmp.txt,"~",44
                                             covx tTmp.txt,bt8.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va8.txt,",",44
+                                            spstr strCommand.txt,va8.txt,"~",45
                                             //enable
                                             vis bt8,1
                                         }
                                     }
-                                    if(tInstruction.txt=="time")
-                                    {
-                                        // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
-                                    }
-                                    if(tInstruction.txt=="date")
-                                    {
-                                        // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
-                                    }
-                                    if(tInstruction.txt=="dimmode")
-                                    {
-                                        // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,dimValue,0,0
-                                    }
-                                    if(tInstruction.txt=="timeout")
-                                    {
-                                        //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sleepTimeout,0,0
-                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
                                             page cardAlarm
                                         }
                                     }
+                                    if(tInstruction.txt=="time")
+                                    {
+                                        // get set time to global variable
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="date")
+                                    {
+                                        // get set date to global variable
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="dimmode")
+                                    {
+                                        // get value
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,dimValue,0,0
+                                    }
+                                    if(tInstruction.txt=="timeout")
+                                    {
+                                        //set timeout to global var
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,sleepTimeout,0,0
+                                    }
                                     // end of user code
                                     udelete payloadLength-1
                                     bufferPos=0
@@ -1494,27 +1483,38 @@ Timer tmSerial
         
 Timer tmSleep
     Attributes
-        ID         : 20
+        ID         : 19
         Scope      : local
         Period (ms): 1000
         Enabled    : yes
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardThermo"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         
 TouchCap tc0
     Attributes
-        ID   : 21
+        ID   : 20
         Scope: local
         Value: 0
     

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

@@ -1,62 +1,58 @@
 Program.s
 	0    Component(s)
-	9    Line(s) of event code
-	9    Unique line(s) of event code
-pageSerialTest
-	13   Component(s)
-	48   Line(s) of event code
-	43   Unique line(s) of event code
-popupShutter
-	19   Component(s)
-	179  Line(s) of event code
-	102  Unique line(s) of event code
-popupNotify
-	17   Component(s)
-	179  Line(s) of event code
-	118  Unique line(s) of event code
+	10   Line(s) of event code
+	10   Unique line(s) of event code
 pageTest
 	13   Component(s)
 	13   Line(s) of event code
 	13   Unique line(s) of event code
-cardAlarm
-	35   Component(s)
-	276  Line(s) of event code
-	172  Unique line(s) of event code
-popupLight
-	27   Component(s)
-	323  Line(s) of event code
-	174  Unique line(s) of event code
-cardThermo
-	42   Component(s)
-	406  Line(s) of event code
-	218  Unique line(s) of event code
-screensaver
-	31   Component(s)
-	183  Line(s) of event code
-	133  Unique line(s) of event code
-cardGrid
-	39   Component(s)
-	388  Line(s) of event code
-	224  Unique line(s) of event code
-cardMedia
-	30   Component(s)
-	278  Line(s) of event code
-	139  Unique line(s) of event code
 pageIcons
-	5    Component(s)
+	6    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
+popupNotify
+	17   Component(s)
+	196  Line(s) of event code
+	123  Unique line(s) of event code
+popupShutter
+	19   Component(s)
+	191  Line(s) of event code
+	107  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
+popupLight
+	27   Component(s)
+	338  Line(s) of event code
+	182  Unique line(s) of event code
+screensaver
+	33   Component(s)
+	266  Line(s) of event code
+	218  Unique line(s) of event code
+cardMedia
+	30   Component(s)
+	329  Line(s) of event code
+	169  Unique line(s) of event code
+cardAlarm
+	35   Component(s)
+	343  Line(s) of event code
+	214  Unique line(s) of event code
+cardGrid
+	39   Component(s)
+	418  Line(s) of event code
+	244  Unique line(s) of event code
+cardThermo
+	41   Component(s)
+	442  Line(s) of event code
+	247  Unique line(s) of event code
 cardEntities
-	86   Component(s)
-	1320 Line(s) of event code
-	526  Unique line(s) of event code
+	74   Component(s)
+	1157 Line(s) of event code
+	479  Unique line(s) of event code
 
 Total
-	13   Page(s)
-	376  Component(s)
-	3752 Line(s) of event code
-	1020 Unique line(s) of event code
+	12   Page(s)
+	353  Component(s)
+	3853 Line(s) of event code
+	1057 Unique line(s) of event code

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

@@ -18,39 +18,23 @@ Page pageIcons
         Fill                                : solid color
         Back. Color                         : 65535
     
-Text tIcons
+Variable (string) vaTime
     Attributes
-        ID                                  : 2
+        ID            : 4
         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                      : 150
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
+        Text          : 
+        Max. Text Size: 15
+    
+Variable (string) vaDate
+    Attributes
+        ID            : 5
+        Scope         : global
+        Text          :  
+        Max. Text Size: 35
     
 Text tTmp1
     Attributes
-        ID                                  : 3
+        ID                                  : 2
         Scope                               : global
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -80,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                                : 23
+        Text                                : 31
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -552,27 +552,27 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
@@ -580,11 +580,11 @@ Timer tmSerial
                                         dim=100
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=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
-        y coordinate                        : 380
+        x coordinate                        : 39
+        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
-        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
+        Font ID                             : 3
         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

@@ -727,7 +727,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -785,24 +784,22 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                         vis tIcon1,1
                                         // change icon color
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         covx tTmp.txt,sys0,0,0
                                         tIcon1.pco=sys0
                                         // get Button State
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        spstr strCommand.txt,tTmp.txt,"~",3
                                         covx tTmp.txt,sys0,0,0
                                         btOnOff1.val=sys0
                                         // get Brightness value
-                                        spstr strCommand.txt,tTmp.txt,",",4
+                                        spstr strCommand.txt,tTmp.txt,"~",4
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t1,0
@@ -820,7 +817,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get ColorTemp value
-                                        spstr strCommand.txt,tTmp.txt,",",5
+                                        spstr strCommand.txt,tTmp.txt,"~",5
                                         if(tTmp.txt=="disable")
                                         {
                                             vis hTempSlider,0
@@ -864,7 +861,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get Color value
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",6
                                         // disable -> isn't supported
                                         if(tTmp.txt=="disable")
                                         {
@@ -888,56 +885,74 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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
@@ -403,7 +403,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -461,70 +460,70 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // get entn
-                                        spstr strCommand.txt,entn.txt,"|",1
+                                        spstr strCommand.txt,entn.txt,"~",1
                                         // get Heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",2
                                         // heading color
-                                        spstr strCommand.txt,tTmp.txt,"|",3
+                                        spstr strCommand.txt,tTmp.txt,"~",3
                                         covx tTmp.txt,sys0,0,0
                                         tHeading.pco=sys0
                                         // get b1
-                                        spstr strCommand.txt,b1.txt,"|",4
+                                        spstr strCommand.txt,b1.txt,"~",4
                                         if(b1.txt!="")
                                         {
                                             vis b1,1
                                         }
                                         // b1 color
-                                        spstr strCommand.txt,tTmp.txt,"|",5
+                                        spstr strCommand.txt,tTmp.txt,"~",5
                                         covx tTmp.txt,sys0,0,0
                                         b1.pco=sys0
                                         // get b2
-                                        spstr strCommand.txt,b2.txt,"|",6
+                                        spstr strCommand.txt,b2.txt,"~",6
                                         if(b2.txt!="")
                                         {
                                             vis b2,1
                                         }
                                         // b2 color
-                                        spstr strCommand.txt,tTmp.txt,"|",7
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         b2.pco=sys0
                                         // get tText
-                                        spstr strCommand.txt,tText.txt,"|",8
+                                        spstr strCommand.txt,tText.txt,"~",8
                                         // tText color
-                                        spstr strCommand.txt,tTmp.txt,"|",9
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,sys0,0,0
                                         tText.pco=sys0
                                         //preserve old sleepTimeout
                                         vaOldSleepT.val=sleepTimeout
                                         // sleep timeout
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",10
                                         covx tTmp.txt,sys0,0,0
                                         sleepTimeout=sys0
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="exitPopup")
@@ -536,11 +535,11 @@ Timer tmSerial
                                         sleepTimeout=vaOldSleepT.val
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -549,25 +548,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -532,7 +532,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -590,72 +589,85 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // get Position value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

HMI/US/portrait/n2t-out/Program.s.txt

@@ -10,6 +10,7 @@ Program.s
     int sleepValue=0
     // dim value
     int dimValue=40
+    int dimValueNormal=100
     // fix touch offset (Removed for US version)
     //lcd_dev fffb 0002 0000 0020
     page pageStartup

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

@@ -17,7 +17,6 @@ Page cardAlarm
             vis tInstruction,0
             vis tTmp,0
             vis tId,0
-            //vis nPageDisp,0
             vis arm1,0
             vis arm2,0
             vis arm3,0
@@ -171,7 +170,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardAlarm,bPrev"
+            tSend.txt="event,buttonPress2,cardAlarm,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -508,53 +514,78 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         //entn
-                                        spstr strCommand.txt,entn.txt,",",1
+                                        spstr strCommand.txt,entn.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         //text arm1
-                                        spstr strCommand.txt,arm1.txt,",",2
+                                        spstr strCommand.txt,arm1.txt,"~",3
                                         if(arm1.txt!="")
                                         {
                                             vis arm1,1
                                         }
                                         //id arm1
-                                        spstr strCommand.txt,va1.txt,",",3
+                                        spstr strCommand.txt,va1.txt,"~",4
                                         //text arm2
-                                        spstr strCommand.txt,arm2.txt,",",4
+                                        spstr strCommand.txt,arm2.txt,"~",5
                                         if(arm2.txt!="")
                                         {
                                             vis arm2,1
                                         }
                                         //id arm2
-                                        spstr strCommand.txt,va2.txt,",",5
+                                        spstr strCommand.txt,va2.txt,"~",6
                                         //text arm3
-                                        spstr strCommand.txt,arm3.txt,",",6
+                                        spstr strCommand.txt,arm3.txt,"~",7
                                         if(arm3.txt!="")
                                         {
                                             vis arm3,1
                                         }
                                         //id arm3
-                                        spstr strCommand.txt,va3.txt,",",7
+                                        spstr strCommand.txt,va3.txt,"~",8
                                         //text arm4
-                                        spstr strCommand.txt,arm4.txt,",",8
+                                        spstr strCommand.txt,arm4.txt,"~",9
                                         if(arm4.txt!="")
                                         {
                                             vis arm4,1
                                         }
                                         //id arm4
-                                        spstr strCommand.txt,va4.txt,",",9
+                                        spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,",",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                         //icon color
-                                        spstr strCommand.txt,tTmp.txt,",",11
+                                        spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0
                                         tIcon.pco=sys0
                                         //numpad status
-                                        spstr strCommand.txt,tTmp.txt,",",12
+                                        spstr strCommand.txt,tTmp.txt,"~",13
                                         if(tTmp.txt!="disable")
                                         {
                                             vis b0,1
@@ -569,9 +600,23 @@ Timer tmSerial
                                             vis b9,1
                                             vis b10,1
                                             vis tCode,1
+                                        }else
+                                        {
+                                            vis b0,0
+                                            vis b1,0
+                                            vis b2,0
+                                            vis b3,0
+                                            vis b4,0
+                                            vis b5,0
+                                            vis b6,0
+                                            vis b7,0
+                                            vis b8,0
+                                            vis b9,0
+                                            vis b10,0
+                                            vis tCode,0
                                         }
                                         //flashing status
-                                        spstr strCommand.txt,tTmp.txt,",",13
+                                        spstr strCommand.txt,tTmp.txt,"~",14
                                         if(tTmp.txt=="enable")
                                         {
                                             tmFlash.en=1
@@ -583,67 +628,80 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
                                         }
                                         if(tId.txt=="cardMedia")
                                         {
                                             page cardMedia
                                         }
+                                        if(tId.txt=="cardAlarm")
+                                        {
+                                            page cardAlarm
+                                        }
                                     }
                                     // end of user code
                                     udelete payloadLength-1
@@ -665,14 +723,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardAlarm"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -72,16 +72,6 @@ Page cardEntities
             vis bText5,0
             vis hSlider5,0
             vis nNum5,0
-            //ui e6
-            vis btOnOff6,0
-            vis bUp6,0
-            vis bStop6,0
-            vis bDown6,0
-            vis tIcon6,0
-            vis tEntity6,0
-            vis bText6,0
-            vis hSlider6,0
-            vis nNum6,0
         
 Variable (string) strCommand
     Attributes
@@ -143,24 +133,12 @@ Variable (string) entn5
         Text          : 
         Max. Text Size: 70
     
-Variable (string) entn6
-    Attributes
-        Scope         : local
-        Text          : 
-        Max. Text Size: 70
-    
 Variable (string) type5
     Attributes
         Scope         : local
         Text          : 
         Max. Text Size: 10
     
-Variable (string) type6
-    Attributes
-        Scope         : local
-        Text          :  
-        Max. Text Size: 10
-    
 Number nNum1
     Attributes
         Scope                               : local
@@ -206,15 +184,6 @@ Number nNum5
         Associated Keyboard                 : none
         Value                               : 0
     
-Number nNum6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
 Text tHeading
     Attributes
         Scope                               : local
@@ -273,7 +242,7 @@ Text tIcon1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
     
 Text tIcon2
     Attributes
@@ -283,7 +252,7 @@ Text tIcon2
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
     
 Text tIcon3
     Attributes
@@ -293,7 +262,7 @@ Text tIcon3
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
     
 Text tIcon4
     Attributes
@@ -303,7 +272,7 @@ Text tIcon4
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
     
 Text tSend
     Attributes
@@ -363,27 +332,7 @@ Text tIcon5
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 30
-    
-Text tEntity6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : tEntity6
-        Max. Text Size                      : 30
-    
-Text tIcon6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
     
 Picture p0
     Attributes
@@ -532,34 +481,6 @@ Slider hSlider5
             prints tSend.txt,0
             prints crcval,2
         
-Slider hSlider6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Position                            : 50
-        Upper range limit                   : 100
-        Lower range limit                   : 0
-    
-    Events
-        Touch Release Event
-            nNum6.val=hSlider6.val
-            tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
-            covx nNum6.val,tTmp.txt,0,0
-            tSend.txt+=tTmp.txt
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
 Button bDown1
     Attributes
         Scope                               : local
@@ -872,7 +793,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardEntities,bPrev"
+            tSend.txt="event,buttonPress2,cardEntities,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1047,7 +975,7 @@ Button bDown5
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn4.txt+",down"
+            tSend.txt="event,buttonPress2,"+entn5.txt+",down"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1110,106 +1038,6 @@ Button bText5
             prints tSend.txt,0
             prints crcval,2
         
-Button bStop6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : 
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn6.txt+",stop"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
-Button bDown6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : 
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn4.txt+",down"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
-Button bUp6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : 
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn6.txt+",up"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
-Button bText6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : newtxt
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
 Dual-state Button btOnOff1
     Attributes
         Scope                               : local
@@ -1345,33 +1173,6 @@ Dual-state Button btOnOff5
             prints tSend.txt,0
             prints crcval,2
         
-Dual-state Button btOnOff6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : 
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
-            covx btOnOff6.val,tTmp.txt,0,0
-            tSend.txt+=tTmp.txt
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
 Hotspot mSpecial
     Attributes
         Scope                               : local
@@ -1499,28 +1300,6 @@ Hotspot m4
                 page popupLight
             }
         
-Hotspot m5
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-    
-    Events
-        Touch Press Event
-            pageIcons.tTmp1.txt=tEntity6.txt
-            pageIcons.tTmp2.txt=entn6.txt
-            if(type6.txt=="shutter")
-            {
-                //popupShutter.tHeading.txt=tEntity6.txt
-                page popupShutter
-            }
-            if(type6.txt=="light")
-            {
-                //popupLight.tEntity.txt=tEntity6.txt
-                page popupLight
-            }
-        
 Timer tmSerial
     Attributes
         Scope      : local
@@ -1571,15 +1350,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
-                                        spstr strCommand.txt,tHeading.txt,",",1
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis bUp1,0
@@ -1594,16 +1400,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
                                             vis tIcon1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             tIcon1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         if(type1.txt=="shutter")
@@ -1626,7 +1430,7 @@ Timer tmSerial
                                             vis hSlider1,0
                                             vis nNum1,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",8
+                                            spstr strCommand.txt,tTmp.txt,"~",8
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff1.val=sys0
                                         }
@@ -1640,7 +1444,7 @@ Timer tmSerial
                                             vis hSlider1,0
                                             vis nNum1,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",8
+                                            spstr strCommand.txt,tTmp.txt,"~",8
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff1.val=sys0
                                         }
@@ -1657,7 +1461,7 @@ Timer tmSerial
                                             bText1.pco=65535
                                             bText1.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                         }
                                         if(type1.txt=="button")
                                         {
@@ -1672,7 +1476,7 @@ Timer tmSerial
                                             bText1.pco=1374
                                             bText1.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                         }
                                         if(type1.txt=="number")
                                         {
@@ -1685,7 +1489,7 @@ Timer tmSerial
                                             vis hSlider1,1
                                             vis nNum1,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                             //first value is current value
                                             spstr bText1.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1701,9 +1505,9 @@ Timer tmSerial
                                             hSlider1.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis bUp2,0
@@ -1718,16 +1522,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
                                             vis tIcon2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             tIcon2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         if(type2.txt=="shutter")
@@ -1750,7 +1552,7 @@ Timer tmSerial
                                             vis hSlider2,0
                                             vis nNum2,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",14
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff2.val=sys0
                                         }
@@ -1764,7 +1566,7 @@ Timer tmSerial
                                             vis hSlider2,0
                                             vis nNum2,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",14
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff2.val=sys0
                                         }
@@ -1781,7 +1583,7 @@ Timer tmSerial
                                             bText2.pco=65535
                                             bText2.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                         }
                                         if(type2.txt=="button")
                                         {
@@ -1796,7 +1598,7 @@ Timer tmSerial
                                             bText2.pco=1374
                                             bText2.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                         }
                                         if(type2.txt=="number")
                                         {
@@ -1809,7 +1611,7 @@ Timer tmSerial
                                             vis hSlider2,1
                                             vis nNum2,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                             //first value is current value
                                             spstr bText2.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1825,9 +1627,9 @@ Timer tmSerial
                                             hSlider2.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis bUp3,0
@@ -1842,16 +1644,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
                                             vis tIcon3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             tIcon3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         if(type3.txt=="shutter")
@@ -1874,7 +1674,7 @@ Timer tmSerial
                                             vis hSlider3,0
                                             vis nNum3,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",20
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff3.val=sys0
                                         }
@@ -1888,7 +1688,7 @@ Timer tmSerial
                                             vis hSlider3,0
                                             vis nNum3,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",20
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff3.val=sys0
                                         }
@@ -1905,7 +1705,7 @@ Timer tmSerial
                                             bText3.pco=65535
                                             bText3.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                         }
                                         if(type3.txt=="button")
                                         {
@@ -1920,7 +1720,7 @@ Timer tmSerial
                                             bText3.pco=1374
                                             bText3.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                         }
                                         if(type3.txt=="number")
                                         {
@@ -1933,7 +1733,7 @@ Timer tmSerial
                                             vis hSlider3,1
                                             vis nNum3,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                             //first value is current value
                                             spstr bText3.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1949,9 +1749,9 @@ Timer tmSerial
                                             hSlider3.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis bUp4,0
@@ -1966,16 +1766,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
                                             vis tIcon4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             tIcon4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         if(type4.txt=="shutter")
@@ -1998,7 +1796,7 @@ Timer tmSerial
                                             vis hSlider4,0
                                             vis nNum4,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",26
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff4.val=sys0
                                         }
@@ -2012,7 +1810,7 @@ Timer tmSerial
                                             vis hSlider4,0
                                             vis nNum4,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",26
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff4.val=sys0
                                         }
@@ -2029,7 +1827,7 @@ Timer tmSerial
                                             bText4.pco=65535
                                             bText4.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                         }
                                         if(type4.txt=="button")
                                         {
@@ -2044,7 +1842,7 @@ Timer tmSerial
                                             bText4.pco=1374
                                             bText4.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                         }
                                         if(type4.txt=="number")
                                         {
@@ -2057,7 +1855,7 @@ Timer tmSerial
                                             vis hSlider4,1
                                             vis nNum4,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                             //first value is current value
                                             spstr bText4.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -2073,9 +1871,9 @@ Timer tmSerial
                                             hSlider4.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type5.txt,",",27
+                                        spstr strCommand.txt,type5.txt,"~",27
                                         // get internal name
-                                        spstr strCommand.txt,entn5.txt,",",28
+                                        spstr strCommand.txt,entn5.txt,"~",28
                                         if(type5.txt=="delete"||type5.txt=="")
                                         {
                                             vis bUp5,0
@@ -2090,16 +1888,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
+                                            spstr strCommand.txt,tIcon5.txt,"~",29
                                             vis tIcon5,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",30
                                             covx tTmp.txt,sys0,0,0
                                             tIcon5.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            spstr strCommand.txt,tEntity5.txt,"~",31
                                             vis tEntity5,1
                                         }
                                         if(type5.txt=="shutter")
@@ -2122,7 +1918,7 @@ Timer tmSerial
                                             vis hSlider5,0
                                             vis nNum5,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",32
+                                            spstr strCommand.txt,tTmp.txt,"~",32
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff5.val=sys0
                                         }
@@ -2136,7 +1932,7 @@ Timer tmSerial
                                             vis hSlider5,0
                                             vis nNum5,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",32
+                                            spstr strCommand.txt,tTmp.txt,"~",32
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff5.val=sys0
                                         }
@@ -2153,7 +1949,7 @@ Timer tmSerial
                                             bText5.pco=65535
                                             bText5.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText5.txt,",",32
+                                            spstr strCommand.txt,bText5.txt,"~",32
                                         }
                                         if(type5.txt=="button")
                                         {
@@ -2168,7 +1964,7 @@ Timer tmSerial
                                             bText5.pco=1374
                                             bText5.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText5.txt,",",32
+                                            spstr strCommand.txt,bText5.txt,"~",32
                                         }
                                         if(type5.txt=="number")
                                         {
@@ -2181,7 +1977,7 @@ Timer tmSerial
                                             vis hSlider5,1
                                             vis nNum5,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText5.txt,",",32
+                                            spstr strCommand.txt,bText5.txt,"~",32
                                             //first value is current value
                                             spstr bText5.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -2196,140 +1992,16 @@ Timer tmSerial
                                             covx tTmp.txt,sys0,0,0
                                             hSlider5.maxval=sys0
                                         }
-                                        // get Type
-                                        spstr strCommand.txt,type6.txt,",",33
-                                        // get internal name
-                                        spstr strCommand.txt,entn6.txt,",",34
-                                        if(type6.txt=="delete"||type6.txt=="")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,0
-                                            vis tEntity6,0
-                                            vis tIcon6,0
-                                            vis bText6,0
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                        }else
-                                        {
-                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
-                                            vis tIcon6,1
-                                            // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",36
-                                            covx tTmp.txt,sys0,0,0
-                                            tIcon6.pco=sys0
-                                            // set name
-                                            spstr strCommand.txt,tEntity6.txt,",",37
-                                            vis tEntity6,1
-                                        }
-                                        if(type6.txt=="shutter")
-                                        {
-                                            vis bUp6,1
-                                            vis bStop6,1
-                                            vis bDown6,1
-                                            vis btOnOff6,0
-                                            vis bText6,0
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                        }
-                                        if(type6.txt=="light")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,1
-                                            vis bText6,0
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                            // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",38
-                                            covx tTmp.txt,sys0,0,0
-                                            btOnOff6.val=sys0
-                                        }
-                                        if(type6.txt=="switch")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,1
-                                            vis bText6,0
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                            // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",38
-                                            covx tTmp.txt,sys0,0,0
-                                            btOnOff6.val=sys0
-                                        }
-                                        if(type6.txt=="text")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,0
-                                            vis bText6,1
-                                            tsw bText6,0
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                            bText6.pco=65535
-                                            bText6.pco2=65535
-                                            // get Text (optional Value)
-                                            spstr strCommand.txt,bText6.txt,",",38
-                                        }
-                                        if(type6.txt=="button")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,0
-                                            vis bText6,1
-                                            tsw bText6,1
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                            bText6.pco=1374
-                                            bText6.pco2=1374
-                                            // get Text (optional Value)
-                                            spstr strCommand.txt,bText6.txt,",",38
-                                        }
-                                        if(type6.txt=="number")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,0
-                                            vis bText6,0
-                                            tsw bText6,0
-                                            vis hSlider6,1
-                                            vis nNum6,1
-                                            // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText6.txt,",",38
-                                            //first value is current value
-                                            spstr bText6.txt,tTmp.txt,"|",0
-                                            covx tTmp.txt,sys0,0,0
-                                            hSlider6.val=sys0
-                                            nNum6.val=sys0
-                                            //second value is min value
-                                            spstr bText6.txt,tTmp.txt,"|",1
-                                            covx tTmp.txt,sys0,0,0
-                                            hSlider6.minval=sys0
-                                            //third value is max value
-                                            spstr bText6.txt,tTmp.txt,"|",2
-                                            covx tTmp.txt,sys0,0,0
-                                            hSlider6.maxval=sys0
-                                        }
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -2379,23 +2051,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -2418,14 +2090,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardEntities"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -242,7 +242,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardGrid,bPrev"
+            tSend.txt="event,buttonPress2,cardGrid,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -563,15 +570,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     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 icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis tEntity1,0
@@ -579,22 +613,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                             vis bEntity1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             bEntity1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis tEntity2,0
@@ -602,22 +634,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                             vis bEntity2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             bEntity2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis tEntity3,0
@@ -625,22 +655,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                             vis bEntity3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             bEntity3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis tEntity4,0
@@ -648,22 +676,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                             vis bEntity4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             bEntity4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type5.txt,",",27
+                                        spstr strCommand.txt,type5.txt,"~",27
                                         // get internal name
-                                        spstr strCommand.txt,entn5.txt,",",28
+                                        spstr strCommand.txt,entn5.txt,"~",28
                                         if(type5.txt=="delete"||type5.txt=="")
                                         {
                                             vis tEntity5,0
@@ -671,22 +697,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                             vis bEntity5,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",30
                                             covx tTmp.txt,sys0,0,0
                                             bEntity5.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            spstr strCommand.txt,tEntity5.txt,"~",31
                                             vis tEntity5,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type6.txt,",",33
+                                        spstr strCommand.txt,type6.txt,"~",33
                                         // get internal name
-                                        spstr strCommand.txt,entn6.txt,",",34
+                                        spstr strCommand.txt,entn6.txt,"~",34
                                         if(type6.txt=="delete"||type6.txt=="")
                                         {
                                             vis tEntity6,0
@@ -694,16 +718,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                             vis bEntity6,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",36
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,sys0,0,0
                                             bEntity6.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity6.txt,",",37
+                                            spstr strCommand.txt,tEntity6.txt,"~",37
                                             vis tEntity6,1
                                         }
                                     }
@@ -711,11 +733,11 @@ Timer tmSerial
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -765,23 +787,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -804,14 +826,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardGrid"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -435,7 +435,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardMedia,bPrev"
+            tSend.txt="event,buttonPress2,cardMedia,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -498,31 +505,54 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,"|",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",3
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                         //title
-                                        spstr strCommand.txt,tTitle.txt,"|",4
+                                        spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
-                                        spstr strCommand.txt,tAuthor.txt,"|",5
+                                        spstr strCommand.txt,tAuthor.txt,"~",6
                                         //volume
-                                        spstr strCommand.txt,tTmp.txt,"|",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                         //speaker current
-                                        spstr strCommand.txt,tSpeaker.txt,"|",8
+                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")
                                         {
                                             tSpeaker.pco=1374
@@ -531,14 +561,14 @@ Timer tmSerial
                                             tSpeaker.pco=65535
                                         }
                                         //speaker list
-                                        spstr strCommand.txt,vaSpeakerList.txt,"|",9
+                                        spstr strCommand.txt,vaSpeakerList.txt,"~",10
                                         if(vaSpeakerList.txt=="")
                                         {
                                             vis t6,0
                                         }
                                         vaSpeakerPos.val=0
                                         // on off button
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",11
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t5,0
@@ -551,62 +581,75 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
@@ -642,14 +685,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardMedia"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -17,7 +17,6 @@ Page cardThermo
             vis tInstruction,0
             vis tTmp,0
             vis tId,0
-            vis nPageDisp,0
             vis xTempMin,0
             vis xTempMax,0
             vis xTempStep,0
@@ -99,15 +98,6 @@ Variable (string) va8
         Text          : 
         Max. Text Size: 10
     
-Number nPageDisp
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
 XFloat xTempCurr
     Attributes
         Scope                               : local
@@ -339,7 +329,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardThermo,bPrev"
+            tSend.txt="event,buttonPress2,cardThermo,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -645,29 +642,56 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,",",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,",",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //currentTemp
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        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,",",5
+                                        spstr strCommand.txt,tStatus.txt,"~",6
                                         //minTemp
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,xTempMin.val,0,0
                                         //maxTemp
-                                        spstr strCommand.txt,tTmp.txt,",",7
+                                        spstr strCommand.txt,tTmp.txt,"~",8
                                         covx tTmp.txt,xTempMax.val,0,0
                                         //tempStep
-                                        spstr strCommand.txt,tTmp.txt,",",8
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,xTempStep.val,0,0
                                         // disable all buttons
                                         vis bt0,0
@@ -680,232 +704,218 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,",",9
-                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt0.txt,"~",10
+                                        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,",",10
+                                            spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",11
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,bt0.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va0.txt,",",12
+                                            spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
                                         }
                                         //bt1
-                                        spstr strCommand.txt,tTmp.txt,",",13
-                                        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,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",15
+                                            spstr strCommand.txt,tTmp.txt,"~",16
                                             covx tTmp.txt,bt1.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va1.txt,",",16
+                                            spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
                                         }
                                         //bt2
-                                        spstr strCommand.txt,tTmp.txt,",",17
-                                        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,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",19
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,bt2.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va2.txt,",",20
+                                            spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
                                         }
                                         //bt3
-                                        spstr strCommand.txt,tTmp.txt,",",21
-                                        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,",",22
+                                            spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",23
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,bt3.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va3.txt,",",24
+                                            spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
                                         }
                                         //bt4
-                                        spstr strCommand.txt,tTmp.txt,",",25
-                                        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,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",27
+                                            spstr strCommand.txt,tTmp.txt,"~",28
                                             covx tTmp.txt,bt4.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va4.txt,",",28
+                                            spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
                                         }
                                         //bt5
-                                        spstr strCommand.txt,tTmp.txt,",",29
-                                        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,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",31
+                                            spstr strCommand.txt,tTmp.txt,"~",32
                                             covx tTmp.txt,bt5.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va5.txt,",",32
+                                            spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
                                         }
                                         //bt6
-                                        spstr strCommand.txt,tTmp.txt,",",33
-                                        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,",",34
+                                            spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",35
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,bt6.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va6.txt,",",36
+                                            spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
                                         }
                                         //bt7
-                                        spstr strCommand.txt,tTmp.txt,",",37
-                                        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,",",38
+                                            spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",39
+                                            spstr strCommand.txt,tTmp.txt,"~",40
                                             covx tTmp.txt,bt7.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va7.txt,",",40
+                                            spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
                                         }
                                         //bt8
-                                        spstr strCommand.txt,tTmp.txt,",",41
-                                        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,",",42
+                                            spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",43
+                                            spstr strCommand.txt,tTmp.txt,"~",44
                                             covx tTmp.txt,bt8.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va8.txt,",",44
+                                            spstr strCommand.txt,va8.txt,"~",45
                                             //enable
                                             vis bt8,1
                                         }
                                     }
-                                    if(tInstruction.txt=="time")
-                                    {
-                                        // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
-                                    }
-                                    if(tInstruction.txt=="date")
-                                    {
-                                        // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
-                                    }
-                                    if(tInstruction.txt=="dimmode")
-                                    {
-                                        // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,dimValue,0,0
-                                    }
-                                    if(tInstruction.txt=="timeout")
-                                    {
-                                        //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sleepTimeout,0,0
-                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
                                             page cardAlarm
                                         }
                                     }
+                                    if(tInstruction.txt=="time")
+                                    {
+                                        // get set time to global variable
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="date")
+                                    {
+                                        // get set date to global variable
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="dimmode")
+                                    {
+                                        // get value
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,dimValue,0,0
+                                    }
+                                    if(tInstruction.txt=="timeout")
+                                    {
+                                        //set timeout to global var
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,sleepTimeout,0,0
+                                    }
                                     // end of user code
                                     udelete payloadLength-1
                                     bufferPos=0
@@ -926,14 +936,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardThermo"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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

@@ -10,15 +10,17 @@ Page pageIcons
         Swide left page ID                  : disabled
         Swide right page ID                 : disabled
     
-Text tIcons
+Variable (string) vaTime
     Attributes
         Scope         : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 150
+        Text          : 
+        Max. Text Size: 15
+    
+Variable (string) vaDate
+    Attributes
+        Scope         : global
+        Text          :  
+        Max. Text Size: 35
     
 Text tTmp1
     Attributes

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                                : 23
+        Text                                : 31
         Max. Text Size                      : 10
     
 Picture p0
@@ -257,27 +257,27 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
@@ -285,11 +285,11 @@ Timer tmSerial
                                         dim=100
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0

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

@@ -382,7 +382,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -439,24 +438,22 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                         vis tIcon1,1
                                         // change icon color
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         covx tTmp.txt,sys0,0,0
                                         tIcon1.pco=sys0
                                         // get Button State
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        spstr strCommand.txt,tTmp.txt,"~",3
                                         covx tTmp.txt,sys0,0,0
                                         btOnOff1.val=sys0
                                         // get Brightness value
-                                        spstr strCommand.txt,tTmp.txt,",",4
+                                        spstr strCommand.txt,tTmp.txt,"~",4
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t1,0
@@ -474,7 +471,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get ColorTemp value
-                                        spstr strCommand.txt,tTmp.txt,",",5
+                                        spstr strCommand.txt,tTmp.txt,"~",5
                                         if(tTmp.txt=="disable")
                                         {
                                             vis hTempSlider,0
@@ -518,7 +515,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get Color value
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",6
                                         // disable -> isn't supported
                                         if(tTmp.txt=="disable")
                                         {
@@ -542,56 +539,74 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -195,7 +195,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -252,70 +251,70 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // get entn
-                                        spstr strCommand.txt,entn.txt,"|",1
+                                        spstr strCommand.txt,entn.txt,"~",1
                                         // get Heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",2
                                         // heading color
-                                        spstr strCommand.txt,tTmp.txt,"|",3
+                                        spstr strCommand.txt,tTmp.txt,"~",3
                                         covx tTmp.txt,sys0,0,0
                                         tHeading.pco=sys0
                                         // get b1
-                                        spstr strCommand.txt,b1.txt,"|",4
+                                        spstr strCommand.txt,b1.txt,"~",4
                                         if(b1.txt!="")
                                         {
                                             vis b1,1
                                         }
                                         // b1 color
-                                        spstr strCommand.txt,tTmp.txt,"|",5
+                                        spstr strCommand.txt,tTmp.txt,"~",5
                                         covx tTmp.txt,sys0,0,0
                                         b1.pco=sys0
                                         // get b2
-                                        spstr strCommand.txt,b2.txt,"|",6
+                                        spstr strCommand.txt,b2.txt,"~",6
                                         if(b2.txt!="")
                                         {
                                             vis b2,1
                                         }
                                         // b2 color
-                                        spstr strCommand.txt,tTmp.txt,"|",7
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         b2.pco=sys0
                                         // get tText
-                                        spstr strCommand.txt,tText.txt,"|",8
+                                        spstr strCommand.txt,tText.txt,"~",8
                                         // tText color
-                                        spstr strCommand.txt,tTmp.txt,"|",9
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,sys0,0,0
                                         tText.pco=sys0
                                         //preserve old sleepTimeout
                                         vaOldSleepT.val=sleepTimeout
                                         // sleep timeout
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",10
                                         covx tTmp.txt,sys0,0,0
                                         sleepTimeout=sys0
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="exitPopup")
@@ -327,11 +326,11 @@ Timer tmSerial
                                         sleepTimeout=vaOldSleepT.val
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -340,25 +339,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -268,7 +268,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -325,72 +324,85 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // get Position value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -14,43 +14,22 @@ Page screensaver
         Preinitialize Event
             recmod=1
             bauds=115200
-            vis originPage,0
             vis tInstruction,0
             vis tTmp,0
             vis p0,0
             //load gloabl time string from pageIcons
             //tTime.txt=vaTime.txt
-            spstr vaTime.txt,tTime.txt,"?",0
-            spstr vaTime.txt,tAMPM.txt,"?",1
+            spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+            spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
             if(tAMPM.txt=="")
             {
                 vis tAMPM,0
             }
-            tDate.txt=vaDate.txt
+            tDate.txt=pageIcons.vaDate.txt
             dim=dimValue
             vis tSend,0
             //page open event
             // clear weather elements, to keep example content in HMI
-            tMainIcon.txt=""
-            tMainText.txt=""
-            tForecast1.txt=""
-            tF1Icon.txt=""
-            tForecast1Val.txt=""
-            tForecast2.txt=""
-            tF2Icon.txt=""
-            tForecast2Val.txt=""
-            tSend.txt="event,screensaverOpen"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
         
 Variable (string) strCommand
     Attributes
@@ -58,18 +37,6 @@ Variable (string) strCommand
         Text          : 
         Max. Text Size: 200
     
-Variable (string) vaTime
-    Attributes
-        Scope         : global
-        Text          : 
-        Max. Text Size: 15
-    
-Variable (string) vaDate
-    Attributes
-        Scope         : global
-        Text          : 
-        Max. Text Size: 30
-    
 Variable (string) tId
     Attributes
         Scope         : local
@@ -81,34 +48,17 @@ Variable (int32) vaTap
         Scope: local
         Value: 0
     
-Number originPage
-    Attributes
-        Scope                               : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
-Text tInstruction
+Variable (string) tInstruction
     Attributes
         Scope         : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
         Text          : 
-        Max. Text Size                      : 50
+        Max. Text Size: 50
     
-Text tTmp
+Variable (string) tTmp
     Attributes
         Scope         : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
         Text          : 
-        Max. Text Size                      : 50
+        Max. Text Size: 50
     
 Text tTime
     Attributes
@@ -128,7 +78,7 @@ Text tDate
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Tuesday, 08. March 2022
-        Max. Text Size                      : 30
+        Max. Text Size                      : 35
     
 Text tSend
     Attributes
@@ -147,7 +97,7 @@ Text tMainIcon
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tMainText
@@ -157,7 +107,7 @@ Text tMainText
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 2,3 °C
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tForecast1
@@ -167,7 +117,7 @@ Text tForecast1
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : Mi
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tForecast1Val
@@ -177,7 +127,7 @@ Text tForecast1Val
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 9,3 °C
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tF1Icon
@@ -187,7 +137,7 @@ Text tF1Icon
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tForecast2
@@ -197,7 +147,7 @@ Text tForecast2
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : Do
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tF2Icon
@@ -207,7 +157,7 @@ Text tF2Icon
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
     
 Text tForecast2Val
@@ -217,7 +167,7 @@ Text tForecast2Val
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 11,9 °C
+        Text                                : 
         Max. Text Size                      : 10
     
 Text t10
@@ -288,7 +238,7 @@ Text tF4Icon
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
     
 Text tForecast4Val
     Attributes
@@ -300,6 +250,46 @@ Text tForecast4Val
         Text                                : 
         Max. Text Size                      : 10
     
+Text tMainTextAlt
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tMainIconAlt
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tMRIcon
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
+Text tMR
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
 Picture p0
     Attributes
         Scope                               : local
@@ -357,7 +347,7 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="wake")
                                     {
                                         //dim=100
@@ -366,16 +356,16 @@ Timer tmSerial
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         //get set time to global variable
-                                        spstr strCommand.txt,vaTime.txt,",",1
-                                        spstr vaTime.txt,tTime.txt,"?",0
-                                        spstr vaTime.txt,tAMPM.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                        spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+                                        spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
                                         if(tAMPM.txt=="")
                                         {
                                             vis tAMPM,0
@@ -384,66 +374,163 @@ Timer tmSerial
                                     if(tInstruction.txt=="date")
                                     {
                                         //get set date to global variable
-                                        spstr strCommand.txt,vaDate.txt,"?",1
-                                        tDate.txt=vaDate.txt
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                        tDate.txt=pageIcons.vaDate.txt
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="weatherUpdate")
                                     {
+                                        vis tMainIcon,1
+                                        vis tMainIconAlt,0
+                                        vis tMainText,1
+                                        vis tMainTextAlt,0
+                                        vis tMRIcon,0
+                                        vis tMR,0
                                         //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"?",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
+                                        tMainIconAlt.txt=tMainIcon.txt
                                         //tMainText
-                                        spstr strCommand.txt,tMainText.txt,"?",2
+                                        spstr strCommand.txt,tMainText.txt,"~",2
+                                        tMainTextAlt.txt=tMainText.txt
                                         //tForecast1
-                                        spstr strCommand.txt,tForecast1.txt,"?",3
+                                        spstr strCommand.txt,tForecast1.txt,"~",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
                                         //tForecast1Val
-                                        spstr strCommand.txt,tForecast1Val.txt,"?",5
+                                        spstr strCommand.txt,tForecast1Val.txt,"~",5
                                         //tForecast2
-                                        spstr strCommand.txt,tForecast2.txt,"?",6
+                                        spstr strCommand.txt,tForecast2.txt,"~",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
                                         //tForecast2Val
-                                        spstr strCommand.txt,tForecast2Val.txt,"?",8
+                                        spstr strCommand.txt,tForecast2Val.txt,"~",8
                                         //tForecast3
-                                        spstr strCommand.txt,tForecast3.txt,"?",9
+                                        spstr strCommand.txt,tForecast3.txt,"~",9
                                         //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
                                         //tForecast3Val
-                                        spstr strCommand.txt,tForecast3Val.txt,"?",11
+                                        spstr strCommand.txt,tForecast3Val.txt,"~",11
                                         //tForecast4
-                                        spstr strCommand.txt,tForecast4.txt,"?",12
+                                        spstr strCommand.txt,tForecast4.txt,"~",12
                                         //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",13
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
                                         //tForecast4Val
-                                        spstr strCommand.txt,tForecast4Val.txt,"?",14
+                                        spstr strCommand.txt,tForecast4Val.txt,"~",14
+                                        //alternative layout
+                                        //tMRIcon
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
+                                        if(tMRIcon.txt!="")
+                                        {
+                                            //value for tMRIcon, activate alternative layout
+                                            vis tMainIcon,0
+                                            vis tMainText,0
+                                            vis tMainTextAlt,1
+                                            vis tMainIconAlt,1
+                                            vis tMRIcon,1
+                                            vis tMR,1
+                                            vis tForecast1,0
+                                            vis tF1Icon,0
+                                            vis tForecast1Val,0
+                                            //move forecast values to the right
+                                            tForecast4.txt=tForecast3.txt
+                                            tForecast3.txt=tForecast2.txt
+                                            tForecast2.txt=tForecast1.txt
+                                            tForecast4Val.txt=tForecast3Val.txt
+                                            tForecast3Val.txt=tForecast2Val.txt
+                                            tForecast2Val.txt=tForecast1Val.txt
+                                            tF4Icon.txt=tF3Icon.txt
+                                            tF3Icon.txt=tF2Icon.txt
+                                            tF2Icon.txt=tF1Icon.txt
+                                        }
+                                        //tMR
+                                        spstr strCommand.txt,tMR.txt,"~",16
+                                    }
+                                    if(tInstruction.txt=="color")
+                                    {
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,tTime.bco,0,0
+                                        screensaver.bco=tTime.bco
+                                        tAMPM.bco=tTime.bco
+                                        tDate.bco=tTime.bco
+                                        tMainIcon.bco=tTime.bco
+                                        tMainText.bco=tTime.bco
+                                        tMainIconAlt.bco=tTime.bco
+                                        tMainTextAlt.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tMR.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tForecast1.bco=tTime.bco
+                                        tForecast1Val.bco=tTime.bco
+                                        tF1Icon.bco=tTime.bco
+                                        tForecast2.bco=tTime.bco
+                                        tForecast2Val.bco=tTime.bco
+                                        tF2Icon.bco=tTime.bco
+                                        tForecast3.bco=tTime.bco
+                                        tForecast3Val.bco=tTime.bco
+                                        tF3Icon.bco=tTime.bco
+                                        tForecast4.bco=tTime.bco
+                                        tForecast4Val.bco=tTime.bco
+                                        tF4Icon.bco=tTime.bco
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        covx tTmp.txt,tTime.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",3
+                                        covx tTmp.txt,tAMPM.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        covx tTmp.txt,tDate.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        covx tTmp.txt,tMainIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",6
+                                        covx tTmp.txt,tMainText.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        covx tTmp.txt,tForecast1.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        covx tTmp.txt,tForecast2.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        covx tTmp.txt,tForecast3.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        covx tTmp.txt,tForecast4.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        covx tTmp.txt,tF1Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",12
+                                        covx tTmp.txt,tF2Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        covx tTmp.txt,tF3Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",14
+                                        covx tTmp.txt,tF4Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        covx tTmp.txt,tForecast1Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",16
+                                        covx tTmp.txt,tForecast2Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",17
+                                        covx tTmp.txt,tForecast3Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",18
+                                        covx tTmp.txt,tForecast4Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",19
+                                        covx tTmp.txt,t10.bco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",20
+                                        covx tTmp.txt,tMainIconAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",21
+                                        covx tTmp.txt,tMainTextAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",22
+                                        covx tTmp.txt,tMRIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                        covx tTmp.txt,tMR.pco,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         dim=100
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete u[2]+3
                                         bufferPos=0
@@ -497,6 +584,25 @@ Timer tmSerial
                 }
             }
         
+Timer tmSleep
+    Attributes
+        Scope      : local
+        Period (ms): 1000
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(sleepTimeout!=0&&dimValue!=dim)
+            {
+                sleepValue+=1
+                if(sleepTimeout<=sleepValue)
+                {
+                    sleepValue=0
+                    dim=dimValue
+                    vaTap.val=0
+                }
+            }
+        
 TouchCap tc0
     Attributes
         Scope: local
@@ -504,7 +610,7 @@ TouchCap tc0
     
     Events
         Touch Press Event
-            dim=100
+            dim=dimValueNormal
             vaTap.val+=1
             covx vaTap.val,tTmp.txt,0,0
             tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
@@ -519,6 +625,4 @@ TouchCap tc0
             prints sys0,2
             prints tSend.txt,0
             prints crcval,2
-            //dim=100
-            //page originPage.val
         

HMI/code_gen/icons/icons.py

@@ -1,104 +1,62 @@
 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"
-]
-
-
 __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):
-        f.write(f"    '{val}': {idx},\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("""
 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
-with open(os.path.join(__location__, "../..","icons.md"), 'w') as f:
+# write mapping lib for typescript
+with open(os.path.join(__location__, "../../../iobroker", "icon_mapping.ts"), 'w') as f:
     f.write("""
-# Icons IDs
-This file contains the Icons IDs included in the display firmware, addressable via serial.
-
-ID | MD Icon Name | Icon
--- | ------------ | ----
+export class IconsSelector {
+    iconMap = new Map<string, string>([
 """)
-    for idx, val in enumerate(icon_name_list):
-        f.write(f"{idx} | {val} | ![{val}](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/{val}.svg)\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("""
+    GetIcon(ma_name:string):string{
+        if(this.iconMap.has(ma_name)){
+            return this.iconMap.get(ma_name)!;
+        }
+        return ""; 
+    }
+}
 
+""");
 
-print("=== STRING for HMI Project ===")
-print("=== Put the following string into the txt field in nextion ===")
-print(icon_nextion_string)
+# write documentation file
+#with open(os.path.join(__location__, "../..","icons.md"), 'w') as f:
+#    f.write("""
+## Icons IDs
+#This file contains the Icons IDs included in the display firmware, addressable via serial.
+#
+#MD Icon Name | Icon
+#------------ | ----
+#""")
+#    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

@@ -3,17 +3,17 @@ head = sharedhead + """
             if(tInstruction.txt=="entityUpd")
             {
             // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
-            spstr strCommand.txt,tHeading.txt,",",1
-"""
+            spstr strCommand.txt,tHeading.txt,"~",1
+""" + navigation
 print(head)
 start = 3
-for i in range(1,7):
+for i in range(1,6):
     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 bUp{i},0
@@ -28,16 +28,14 @@ for i in range(1,7):
               }}else
               {{
                 // change icon
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+2}
-                covx tTmp.txt,sys0,0,0
-                substr pageIcons.tIcons.txt,tIcon{i}.txt,sys0,1
+                spstr strCommand.txt,tIcon{i}.txt,"~",{idxstart+2}
                 vis tIcon{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
                 tIcon{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
               }}
 
@@ -61,7 +59,7 @@ for i in range(1,7):
                 vis hSlider{i},0
                 vis nNum{i},0
                 // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+5}
+                spstr strCommand.txt,tTmp.txt,"~",{idxstart+5}
                 covx tTmp.txt,sys0,0,0
                 btOnOff{i}.val=sys0
               }}
@@ -75,7 +73,7 @@ for i in range(1,7):
                 vis hSlider{i},0
                 vis nNum{i},0
                 // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+5}
+                spstr strCommand.txt,tTmp.txt,"~",{idxstart+5}
                 covx tTmp.txt,sys0,0,0
                 btOnOff{i}.val=sys0
               }}
@@ -92,7 +90,7 @@ for i in range(1,7):
                 bText{i}.pco=65535
                 bText{i}.pco2=65535
                 // get Text (optional Value)
-                spstr strCommand.txt,bText{i}.txt,",",{idxstart+5}
+                spstr strCommand.txt,bText{i}.txt,"~",{idxstart+5}
               }}
               if(type{i}.txt=="button")
               {{
@@ -107,7 +105,7 @@ for i in range(1,7):
                 bText{i}.pco=1374
                 bText{i}.pco2=1374
                 // get Text (optional Value)
-                spstr strCommand.txt,bText{i}.txt,",",{idxstart+5}
+                spstr strCommand.txt,bText{i}.txt,"~",{idxstart+5}
               }}
               if(type{i}.txt=="number")
               {{
@@ -120,7 +118,7 @@ for i in range(1,7):
                 vis hSlider{i},1
                 vis nNum{i},1
                 // get config (optional Value) (use bText as variable)
-                spstr strCommand.txt,bText{i}.txt,",",{idxstart+5}
+                spstr strCommand.txt,bText{i}.txt,"~",{idxstart+5}
                 //first value is current value
                 spstr bText{i}.txt,tTmp.txt,"|",0
                 covx tTmp.txt,sys0,0,0

HMI/code_gen/pages/cardGridSerial.py

@@ -3,17 +3,17 @@ 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
 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}
-                covx tTmp.txt,sys0,0,0
-                substr pageIcons.tIcons.txt,bEntity{i}.txt,sys0,1
+                spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
                 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

@@ -0,0 +1,65 @@
+from shared import *
+text = sharedhead + """
+            if(tInstruction.txt=="entityUpd")
+            {
+              //heading
+              spstr strCommand.txt,tHeading.txt,"~",1
+""" + navigation
+
+text += """
+              //entity name
+              spstr strCommand.txt,entn.txt,"~",3
+              //currentTemp
+              spstr strCommand.txt,tTmp.txt,"~",4
+              covx tTmp.txt,xTempCurr.val,0,0
+              //dstTemp
+              spstr strCommand.txt,tTmp.txt,"~",5
+              covx tTmp.txt,xTempDest.val,0,0
+              //status
+              spstr strCommand.txt,tStatus.txt,"~",6
+              //minTemp
+              spstr strCommand.txt,tTmp.txt,"~",7
+              covx tTmp.txt,xTempMin.val,0,0
+              //maxTemp
+              spstr strCommand.txt,tTmp.txt,"~",8
+              covx tTmp.txt,xTempMax.val,0,0
+              //tempStep
+              spstr strCommand.txt,tTmp.txt,"~",9
+              covx tTmp.txt,xTempStep.val,0,0
+              // disable all buttons
+              vis bt0,0
+              vis bt1,0
+              vis bt2,0
+              vis bt3,0
+              vis bt4,0
+              vis bt5,0
+              vis bt6,0
+              vis bt7,0
+              vis bt8,0
+"""
+
+start = 10
+for i in range(0,9):
+    idxstart = start + i*4
+    text += f"""
+              //bt{i}
+              spstr strCommand.txt,bt{i}.txt,"~",{idxstart}
+              if(bt{i}.txt!="")
+              {{
+                // set text color on active state
+                spstr strCommand.txt,tTmp.txt,"~",{idxstart+1}
+                covx tTmp.txt,bt{i}.pco2,0,0
+                // set state
+                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}
+                //enable
+                vis bt{i},1
+              }}"""
+
+text += """
+            }
+""" + sharedfoot
+print(text)
+

HMI/code_gen/pages/shared.py

@@ -41,7 +41,7 @@ if(usize>1)
             // write command to variable strCommand
             ucopy strCommand.txt,4,payloadLength-5,0
             // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-            spstr strCommand.txt,tInstruction.txt,",",0
+            spstr strCommand.txt,tInstruction.txt,"~",0
 """
 
 sharedfoot = """
@@ -49,11 +49,11 @@ sharedfoot = """
             {
               //command format pageType,specialPageName
               //write name of speical page to tId
-              spstr strCommand.txt,tId.txt,",",1
+              spstr strCommand.txt,tId.txt,"~",1
               //save second arg if there's one
-              spstr strCommand.txt,tTmp.txt,",",2
+              spstr strCommand.txt,tTmp.txt,"~",2
               //save third arg if there's one
-              spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+              spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
               //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
               udelete payloadLength-1
               bufferPos=0
@@ -103,23 +103,23 @@ sharedfoot = """
             if(tInstruction.txt=="time")
             {
               // get set time to global variable
-              spstr strCommand.txt,screensaver.vaTime.txt,",",1
+              spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
             }
             if(tInstruction.txt=="date")
             {
               // get set date to global variable
-              spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+              spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
             }
             if(tInstruction.txt=="dimmode")
             {
               // get value
-              spstr strCommand.txt,tTmp.txt,",",1
+              spstr strCommand.txt,tTmp.txt,"~",1
               covx tTmp.txt,dimValue,0,0
             }
             if(tInstruction.txt=="timeout")
             {
               //set timeout to global var
-              spstr strCommand.txt,tTmp.txt,",",1
+              spstr strCommand.txt,tTmp.txt,"~",1
               covx tTmp.txt,sleepTimeout,0,0
             }
             // end of user code
@@ -134,3 +134,33 @@ sharedfoot = """
   }
 }
 """
+
+navigation = """
+              // navigation icons
+              spstr strCommand.txt,tId.txt,"~",2
+              spstr tId.txt,tTmp.txt,"|",0
+              if(tTmp.txt=="0")
+              {
+                vis bPrev,0
+              }
+              if(tTmp.txt=="1")
+              {
+                vis bPrev,1
+                bPrev.txt=""
+              }
+              if(tTmp.txt=="2")
+              {
+                vis bPrev,1
+                bPrev.txt=""
+              }       
+              spstr tId.txt,tTmp.txt,"|",1
+              if(tTmp.txt=="0")
+              {
+                vis bNext,0
+              }
+              if(tTmp.txt=="1")
+              {
+                vis bNext,1
+                bNext.txt=""
+              }
+"""

HMI/icons.md

@@ -1,52 +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)

HMI/n2t-out-visual/Program.s.txt

@@ -10,6 +10,7 @@ Program.s
     int sleepValue=0
     // dim value
     int dimValue=40
+    int dimValueNormal=100
     // fix touch offset
     lcd_dev fffb 0002 0000 0020
     page pageStartup

HMI/n2t-out-visual/cardAlarm.txt

@@ -25,7 +25,6 @@ Page cardAlarm
             vis tInstruction,0
             vis tTmp,0
             vis tId,0
-            //vis nPageDisp,0
             vis arm1,0
             vis arm2,0
             vis arm3,0
@@ -200,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
@@ -230,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
@@ -276,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
@@ -323,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
@@ -340,7 +339,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardAlarm,bPrev"
+            tSend.txt="event,buttonPress2,cardAlarm,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -372,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
@@ -410,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
@@ -448,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
@@ -486,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
@@ -524,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
@@ -562,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
@@ -600,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
@@ -638,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
@@ -676,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
@@ -714,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
@@ -752,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
@@ -1038,53 +1044,78 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         //entn
-                                        spstr strCommand.txt,entn.txt,",",1
+                                        spstr strCommand.txt,entn.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         //text arm1
-                                        spstr strCommand.txt,arm1.txt,",",2
+                                        spstr strCommand.txt,arm1.txt,"~",3
                                         if(arm1.txt!="")
                                         {
                                             vis arm1,1
                                         }
                                         //id arm1
-                                        spstr strCommand.txt,va1.txt,",",3
+                                        spstr strCommand.txt,va1.txt,"~",4
                                         //text arm2
-                                        spstr strCommand.txt,arm2.txt,",",4
+                                        spstr strCommand.txt,arm2.txt,"~",5
                                         if(arm2.txt!="")
                                         {
                                             vis arm2,1
                                         }
                                         //id arm2
-                                        spstr strCommand.txt,va2.txt,",",5
+                                        spstr strCommand.txt,va2.txt,"~",6
                                         //text arm3
-                                        spstr strCommand.txt,arm3.txt,",",6
+                                        spstr strCommand.txt,arm3.txt,"~",7
                                         if(arm3.txt!="")
                                         {
                                             vis arm3,1
                                         }
                                         //id arm3
-                                        spstr strCommand.txt,va3.txt,",",7
+                                        spstr strCommand.txt,va3.txt,"~",8
                                         //text arm4
-                                        spstr strCommand.txt,arm4.txt,",",8
+                                        spstr strCommand.txt,arm4.txt,"~",9
                                         if(arm4.txt!="")
                                         {
                                             vis arm4,1
                                         }
                                         //id arm4
-                                        spstr strCommand.txt,va4.txt,",",9
+                                        spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,",",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                         //icon color
-                                        spstr strCommand.txt,tTmp.txt,",",11
+                                        spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0
                                         tIcon.pco=sys0
                                         //numpad status
-                                        spstr strCommand.txt,tTmp.txt,",",12
+                                        spstr strCommand.txt,tTmp.txt,"~",13
                                         if(tTmp.txt!="disable")
                                         {
                                             vis b0,1
@@ -1099,9 +1130,23 @@ Timer tmSerial
                                             vis b9,1
                                             vis b10,1
                                             vis tCode,1
+                                        }else
+                                        {
+                                            vis b0,0
+                                            vis b1,0
+                                            vis b2,0
+                                            vis b3,0
+                                            vis b4,0
+                                            vis b5,0
+                                            vis b6,0
+                                            vis b7,0
+                                            vis b8,0
+                                            vis b9,0
+                                            vis b10,0
+                                            vis tCode,0
                                         }
                                         //flashing status
-                                        spstr strCommand.txt,tTmp.txt,",",13
+                                        spstr strCommand.txt,tTmp.txt,"~",14
                                         if(tTmp.txt=="enable")
                                         {
                                             tmFlash.en=1
@@ -1113,67 +1158,80 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
                                         }
                                         if(tId.txt=="cardMedia")
                                         {
                                             page cardMedia
                                         }
+                                        if(tId.txt=="cardAlarm")
+                                        {
+                                            page cardAlarm
+                                        }
                                     }
                                     // end of user code
                                     udelete payloadLength-1
@@ -1196,14 +1254,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardAlarm"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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
@@ -429,7 +429,7 @@ Text tIcon1
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -459,7 +459,7 @@ Text tIcon2
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -489,7 +489,7 @@ Text tIcon3
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -519,7 +519,7 @@ Text tIcon4
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -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
@@ -1431,7 +1431,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardEntities,bPrev"
+            tSend.txt="event,buttonPress2,cardEntities,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1461,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
@@ -2060,15 +2067,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
-                                        spstr strCommand.txt,tHeading.txt,",",1
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis bUp1,0
@@ -2083,16 +2117,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
                                             vis tIcon1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             tIcon1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         if(type1.txt=="shutter")
@@ -2115,7 +2147,7 @@ Timer tmSerial
                                             vis hSlider1,0
                                             vis nNum1,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",8
+                                            spstr strCommand.txt,tTmp.txt,"~",8
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff1.val=sys0
                                         }
@@ -2129,7 +2161,7 @@ Timer tmSerial
                                             vis hSlider1,0
                                             vis nNum1,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",8
+                                            spstr strCommand.txt,tTmp.txt,"~",8
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff1.val=sys0
                                         }
@@ -2146,7 +2178,7 @@ Timer tmSerial
                                             bText1.pco=65535
                                             bText1.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                         }
                                         if(type1.txt=="button")
                                         {
@@ -2161,7 +2193,7 @@ Timer tmSerial
                                             bText1.pco=1374
                                             bText1.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                         }
                                         if(type1.txt=="number")
                                         {
@@ -2174,7 +2206,7 @@ Timer tmSerial
                                             vis hSlider1,1
                                             vis nNum1,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                             //first value is current value
                                             spstr bText1.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -2190,9 +2222,9 @@ Timer tmSerial
                                             hSlider1.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis bUp2,0
@@ -2207,16 +2239,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
                                             vis tIcon2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             tIcon2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         if(type2.txt=="shutter")
@@ -2239,7 +2269,7 @@ Timer tmSerial
                                             vis hSlider2,0
                                             vis nNum2,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",14
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff2.val=sys0
                                         }
@@ -2253,7 +2283,7 @@ Timer tmSerial
                                             vis hSlider2,0
                                             vis nNum2,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",14
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff2.val=sys0
                                         }
@@ -2270,7 +2300,7 @@ Timer tmSerial
                                             bText2.pco=65535
                                             bText2.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                         }
                                         if(type2.txt=="button")
                                         {
@@ -2285,7 +2315,7 @@ Timer tmSerial
                                             bText2.pco=1374
                                             bText2.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                         }
                                         if(type2.txt=="number")
                                         {
@@ -2298,7 +2328,7 @@ Timer tmSerial
                                             vis hSlider2,1
                                             vis nNum2,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                             //first value is current value
                                             spstr bText2.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -2314,9 +2344,9 @@ Timer tmSerial
                                             hSlider2.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis bUp3,0
@@ -2331,16 +2361,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
                                             vis tIcon3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             tIcon3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         if(type3.txt=="shutter")
@@ -2363,7 +2391,7 @@ Timer tmSerial
                                             vis hSlider3,0
                                             vis nNum3,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",20
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff3.val=sys0
                                         }
@@ -2377,7 +2405,7 @@ Timer tmSerial
                                             vis hSlider3,0
                                             vis nNum3,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",20
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff3.val=sys0
                                         }
@@ -2394,7 +2422,7 @@ Timer tmSerial
                                             bText3.pco=65535
                                             bText3.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                         }
                                         if(type3.txt=="button")
                                         {
@@ -2409,7 +2437,7 @@ Timer tmSerial
                                             bText3.pco=1374
                                             bText3.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                         }
                                         if(type3.txt=="number")
                                         {
@@ -2422,7 +2450,7 @@ Timer tmSerial
                                             vis hSlider3,1
                                             vis nNum3,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                             //first value is current value
                                             spstr bText3.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -2438,9 +2466,9 @@ Timer tmSerial
                                             hSlider3.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis bUp4,0
@@ -2455,16 +2483,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
                                             vis tIcon4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             tIcon4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         if(type4.txt=="shutter")
@@ -2487,7 +2513,7 @@ Timer tmSerial
                                             vis hSlider4,0
                                             vis nNum4,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",26
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff4.val=sys0
                                         }
@@ -2501,7 +2527,7 @@ Timer tmSerial
                                             vis hSlider4,0
                                             vis nNum4,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",26
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff4.val=sys0
                                         }
@@ -2518,7 +2544,7 @@ Timer tmSerial
                                             bText4.pco=65535
                                             bText4.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                         }
                                         if(type4.txt=="button")
                                         {
@@ -2533,7 +2559,7 @@ Timer tmSerial
                                             bText4.pco=1374
                                             bText4.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                         }
                                         if(type4.txt=="number")
                                         {
@@ -2546,7 +2572,7 @@ Timer tmSerial
                                             vis hSlider4,1
                                             vis nNum4,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                             //first value is current value
                                             spstr bText4.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -2566,11 +2592,11 @@ Timer tmSerial
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -2620,23 +2646,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -2660,14 +2686,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardEntities"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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
@@ -515,7 +515,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardGrid,bPrev"
+            tSend.txt="event,buttonPress2,cardGrid,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -545,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
@@ -592,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
@@ -650,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
@@ -708,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
@@ -766,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
@@ -824,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
@@ -882,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
@@ -1000,15 +1007,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     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 icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis tEntity1,0
@@ -1016,22 +1050,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                             vis bEntity1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             bEntity1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis tEntity2,0
@@ -1039,22 +1071,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                             vis bEntity2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             bEntity2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis tEntity3,0
@@ -1062,22 +1092,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                             vis bEntity3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             bEntity3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis tEntity4,0
@@ -1085,22 +1113,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                             vis bEntity4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             bEntity4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type5.txt,",",27
+                                        spstr strCommand.txt,type5.txt,"~",27
                                         // get internal name
-                                        spstr strCommand.txt,entn5.txt,",",28
+                                        spstr strCommand.txt,entn5.txt,"~",28
                                         if(type5.txt=="delete"||type5.txt=="")
                                         {
                                             vis tEntity5,0
@@ -1108,22 +1134,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                             vis bEntity5,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",30
                                             covx tTmp.txt,sys0,0,0
                                             bEntity5.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            spstr strCommand.txt,tEntity5.txt,"~",31
                                             vis tEntity5,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type6.txt,",",33
+                                        spstr strCommand.txt,type6.txt,"~",33
                                         // get internal name
-                                        spstr strCommand.txt,entn6.txt,",",34
+                                        spstr strCommand.txt,entn6.txt,"~",34
                                         if(type6.txt=="delete"||type6.txt=="")
                                         {
                                             vis tEntity6,0
@@ -1131,16 +1155,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                             vis bEntity6,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",36
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,sys0,0,0
                                             bEntity6.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity6.txt,",",37
+                                            spstr strCommand.txt,tEntity6.txt,"~",37
                                             vis tEntity6,1
                                         }
                                     }
@@ -1148,11 +1170,11 @@ Timer tmSerial
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -1202,23 +1224,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -1242,14 +1264,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardGrid"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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
-        y coordinate                        : 145
+        x coordinate                        : 14
+        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
-        y coordinate                        : 187
+        x coordinate                        : 49
+        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
@@ -856,7 +856,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardMedia,bPrev"
+            tSend.txt="event,buttonPress2,cardMedia,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -920,31 +927,54 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,"|",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",3
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                         //title
-                                        spstr strCommand.txt,tTitle.txt,"|",4
+                                        spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
-                                        spstr strCommand.txt,tAuthor.txt,"|",5
+                                        spstr strCommand.txt,tAuthor.txt,"~",6
                                         //volume
-                                        spstr strCommand.txt,tTmp.txt,"|",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                         //speaker current
-                                        spstr strCommand.txt,tSpeaker.txt,"|",8
+                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")
                                         {
                                             tSpeaker.pco=1374
@@ -953,14 +983,14 @@ Timer tmSerial
                                             tSpeaker.pco=65535
                                         }
                                         //speaker list
-                                        spstr strCommand.txt,vaSpeakerList.txt,"|",9
+                                        spstr strCommand.txt,vaSpeakerList.txt,"~",10
                                         if(vaSpeakerList.txt=="")
                                         {
                                             vis t6,0
                                         }
                                         vaSpeakerPos.val=0
                                         // on off button
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",11
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t5,0
@@ -973,62 +1003,75 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
@@ -1065,14 +1108,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardMedia"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

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
@@ -683,7 +683,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardThermo,bPrev"
+            tSend.txt="event,buttonPress2,cardThermo,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1188,29 +1195,56 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,",",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,",",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //currentTemp
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        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,",",5
+                                        spstr strCommand.txt,tStatus.txt,"~",6
                                         //minTemp
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,xTempMin.val,0,0
                                         //maxTemp
-                                        spstr strCommand.txt,tTmp.txt,",",7
+                                        spstr strCommand.txt,tTmp.txt,"~",8
                                         covx tTmp.txt,xTempMax.val,0,0
                                         //tempStep
-                                        spstr strCommand.txt,tTmp.txt,",",8
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,xTempStep.val,0,0
                                         // disable all buttons
                                         vis bt0,0
@@ -1223,232 +1257,218 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,",",9
-                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt0.txt,"~",10
+                                        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,",",10
+                                            spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",11
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,bt0.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va0.txt,",",12
+                                            spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
                                         }
                                         //bt1
-                                        spstr strCommand.txt,tTmp.txt,",",13
-                                        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,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",15
+                                            spstr strCommand.txt,tTmp.txt,"~",16
                                             covx tTmp.txt,bt1.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va1.txt,",",16
+                                            spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
                                         }
                                         //bt2
-                                        spstr strCommand.txt,tTmp.txt,",",17
-                                        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,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",19
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,bt2.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va2.txt,",",20
+                                            spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
                                         }
                                         //bt3
-                                        spstr strCommand.txt,tTmp.txt,",",21
-                                        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,",",22
+                                            spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",23
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,bt3.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va3.txt,",",24
+                                            spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
                                         }
                                         //bt4
-                                        spstr strCommand.txt,tTmp.txt,",",25
-                                        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,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",27
+                                            spstr strCommand.txt,tTmp.txt,"~",28
                                             covx tTmp.txt,bt4.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va4.txt,",",28
+                                            spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
                                         }
                                         //bt5
-                                        spstr strCommand.txt,tTmp.txt,",",29
-                                        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,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",31
+                                            spstr strCommand.txt,tTmp.txt,"~",32
                                             covx tTmp.txt,bt5.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va5.txt,",",32
+                                            spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
                                         }
                                         //bt6
-                                        spstr strCommand.txt,tTmp.txt,",",33
-                                        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,",",34
+                                            spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",35
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,bt6.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va6.txt,",",36
+                                            spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
                                         }
                                         //bt7
-                                        spstr strCommand.txt,tTmp.txt,",",37
-                                        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,",",38
+                                            spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",39
+                                            spstr strCommand.txt,tTmp.txt,"~",40
                                             covx tTmp.txt,bt7.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va7.txt,",",40
+                                            spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
                                         }
                                         //bt8
-                                        spstr strCommand.txt,tTmp.txt,",",41
-                                        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,",",42
+                                            spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",43
+                                            spstr strCommand.txt,tTmp.txt,"~",44
                                             covx tTmp.txt,bt8.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va8.txt,",",44
+                                            spstr strCommand.txt,va8.txt,"~",45
                                             //enable
                                             vis bt8,1
                                         }
                                     }
-                                    if(tInstruction.txt=="time")
-                                    {
-                                        // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
-                                    }
-                                    if(tInstruction.txt=="date")
-                                    {
-                                        // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
-                                    }
-                                    if(tInstruction.txt=="dimmode")
-                                    {
-                                        // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,dimValue,0,0
-                                    }
-                                    if(tInstruction.txt=="timeout")
-                                    {
-                                        //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sleepTimeout,0,0
-                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
                                             page cardAlarm
                                         }
                                     }
+                                    if(tInstruction.txt=="time")
+                                    {
+                                        // get set time to global variable
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="date")
+                                    {
+                                        // get set date to global variable
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="dimmode")
+                                    {
+                                        // get value
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,dimValue,0,0
+                                    }
+                                    if(tInstruction.txt=="timeout")
+                                    {
+                                        //set timeout to global var
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,sleepTimeout,0,0
+                                    }
                                     // end of user code
                                     udelete payloadLength-1
                                     bufferPos=0
@@ -1470,14 +1490,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardThermo"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

HMI/n2t-out-visual/nspanel_Stats.txt

@@ -1,62 +1,58 @@
 Program.s
 	0    Component(s)
-	10   Line(s) of event code
-	10   Unique line(s) of event code
+	11   Line(s) of event code
+	11   Unique line(s) of event code
 pageIcons
-	5    Component(s)
+	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
-popupShutter
-	19   Component(s)
-	179  Line(s) of event code
-	102  Unique line(s) of event code
-popupNotify
-	17   Component(s)
-	179  Line(s) of event code
-	118  Unique line(s) of event code
-cardGrid
-	39   Component(s)
-	388  Line(s) of event code
-	224  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
-cardMedia
-	30   Component(s)
-	278  Line(s) of event code
-	139  Unique line(s) of event code
-cardAlarm
-	35   Component(s)
-	276  Line(s) of event code
-	172  Unique line(s) of event code
 popupLight
 	27   Component(s)
-	323  Line(s) of event code
-	174  Unique line(s) of event code
-screensaver
-	31   Component(s)
-	183  Line(s) of event code
-	133  Unique line(s) of event code
+	338  Line(s) of event code
+	182  Unique line(s) of event code
+popupShutter
+	19   Component(s)
+	191  Line(s) of event code
+	107  Unique line(s) of event code
+popupNotify
+	17   Component(s)
+	196  Line(s) of event code
+	123  Unique line(s) of event code
+cardMedia
+	30   Component(s)
+	329  Line(s) of event code
+	169  Unique line(s) of event code
 cardThermo
 	41   Component(s)
-	405  Line(s) of event code
-	217  Unique line(s) of event code
+	442  Line(s) of event code
+	247  Unique line(s) of event code
+cardGrid
+	39   Component(s)
+	418  Line(s) of event code
+	244  Unique line(s) of event code
+screensaver
+	33   Component(s)
+	266  Line(s) of event code
+	218  Unique line(s) of event code
+cardAlarm
+	35   Component(s)
+	343  Line(s) of event code
+	214  Unique line(s) of event code
 cardEntities
 	62   Component(s)
-	930  Line(s) of event code
-	388  Unique line(s) of event code
+	964  Line(s) of event code
+	410  Unique line(s) of event code
 
 Total
-	13   Page(s)
-	351  Component(s)
-	3362 Line(s) of event code
-	909  Unique line(s) of event code
+	12   Page(s)
+	341  Component(s)
+	3661 Line(s) of event code
+	1002 Unique line(s) of event code

HMI/n2t-out-visual/pageIcons.txt

@@ -18,39 +18,23 @@ Page pageIcons
         Fill                                : solid color
         Back. Color                         : 65535
     
-Text tIcons
+Variable (string) vaTime
     Attributes
-        ID                                  : 2
+        ID            : 4
         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                      : 150
-        Word wrap                           : enabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
+        Text          : 
+        Max. Text Size: 15
+    
+Variable (string) vaDate
+    Attributes
+        ID            : 5
+        Scope         : global
+        Text          : 
+        Max. Text Size: 35
     
 Text tTmp1
     Attributes
-        ID                                  : 3
+        ID                                  : 2
         Scope                               : global
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -80,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                                : 23
+        Text                                : 31
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -552,27 +552,27 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
@@ -580,11 +580,11 @@ Timer tmSerial
                                         dim=100
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=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
-        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
+        y coordinate                        : 184
         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

@@ -727,7 +727,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -785,24 +784,22 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // change icon
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                         vis tIcon1,1
                                         // change icon color
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         covx tTmp.txt,sys0,0,0
                                         tIcon1.pco=sys0
                                         // get Button State
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        spstr strCommand.txt,tTmp.txt,"~",3
                                         covx tTmp.txt,sys0,0,0
                                         btOnOff1.val=sys0
                                         // get Brightness value
-                                        spstr strCommand.txt,tTmp.txt,",",4
+                                        spstr strCommand.txt,tTmp.txt,"~",4
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t1,0
@@ -820,7 +817,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get ColorTemp value
-                                        spstr strCommand.txt,tTmp.txt,",",5
+                                        spstr strCommand.txt,tTmp.txt,"~",5
                                         if(tTmp.txt=="disable")
                                         {
                                             vis hTempSlider,0
@@ -864,7 +861,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get Color value
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",6
                                         // disable -> isn't supported
                                         if(tTmp.txt=="disable")
                                         {
@@ -888,56 +885,74 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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
@@ -403,7 +403,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -461,70 +460,70 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // get entn
-                                        spstr strCommand.txt,entn.txt,"|",1
+                                        spstr strCommand.txt,entn.txt,"~",1
                                         // get Heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",2
                                         // heading color
-                                        spstr strCommand.txt,tTmp.txt,"|",3
+                                        spstr strCommand.txt,tTmp.txt,"~",3
                                         covx tTmp.txt,sys0,0,0
                                         tHeading.pco=sys0
                                         // get b1
-                                        spstr strCommand.txt,b1.txt,"|",4
+                                        spstr strCommand.txt,b1.txt,"~",4
                                         if(b1.txt!="")
                                         {
                                             vis b1,1
                                         }
                                         // b1 color
-                                        spstr strCommand.txt,tTmp.txt,"|",5
+                                        spstr strCommand.txt,tTmp.txt,"~",5
                                         covx tTmp.txt,sys0,0,0
                                         b1.pco=sys0
                                         // get b2
-                                        spstr strCommand.txt,b2.txt,"|",6
+                                        spstr strCommand.txt,b2.txt,"~",6
                                         if(b2.txt!="")
                                         {
                                             vis b2,1
                                         }
                                         // b2 color
-                                        spstr strCommand.txt,tTmp.txt,"|",7
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         b2.pco=sys0
                                         // get tText
-                                        spstr strCommand.txt,tText.txt,"|",8
+                                        spstr strCommand.txt,tText.txt,"~",8
                                         // tText color
-                                        spstr strCommand.txt,tTmp.txt,"|",9
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,sys0,0,0
                                         tText.pco=sys0
                                         //preserve old sleepTimeout
                                         vaOldSleepT.val=sleepTimeout
                                         // sleep timeout
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",10
                                         covx tTmp.txt,sys0,0,0
                                         sleepTimeout=sys0
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="exitPopup")
@@ -536,11 +535,11 @@ Timer tmSerial
                                         sleepTimeout=vaOldSleepT.val
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -549,25 +548,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

HMI/n2t-out-visual/popupShutter.txt

@@ -532,7 +532,6 @@ Timer tmSleep
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
                     click b0,0
@@ -590,72 +589,85 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
                                         // get Position value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

HMI/n2t-out-visual/screensaver.txt

@@ -22,171 +22,60 @@ Page screensaver
         Preinitialize Event
             recmod=1
             bauds=115200
-            vis originPage,0
             vis tInstruction,0
             vis tTmp,0
             vis p0,0
             //load gloabl time string from pageIcons
             //tTime.txt=vaTime.txt
-            spstr vaTime.txt,tTime.txt,"?",0
-            spstr vaTime.txt,tAMPM.txt,"?",1
+            spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+            spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
             if(tAMPM.txt=="")
             {
                 vis tAMPM,0
             }
-            tDate.txt=vaDate.txt
+            tDate.txt=pageIcons.vaDate.txt
             dim=dimValue
             vis tSend,0
             //page open event
             // clear weather elements, to keep example content in HMI
-            tMainIcon.txt=""
-            tMainText.txt=""
-            tForecast1.txt=""
-            tF1Icon.txt=""
-            tForecast1Val.txt=""
-            tForecast2.txt=""
-            tF2Icon.txt=""
-            tForecast2Val.txt=""
-            tSend.txt="event,screensaverOpen"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
         
 Variable (string) strCommand
     Attributes
-        ID            : 5
+        ID            : 4
         Scope         : local
         Text          : 
         Max. Text Size: 200
     
-Variable (string) vaTime
-    Attributes
-        ID            : 10
-        Scope         : global
-        Text          : 
-        Max. Text Size: 15
-    
-Variable (string) vaDate
-    Attributes
-        ID            : 11
-        Scope         : global
-        Text          : 
-        Max. Text Size: 30
-    
 Variable (string) tId
     Attributes
-        ID            : 22
+        ID            : 17
         Scope         : local
         Text          : 
         Max. Text Size: 25
     
 Variable (int32) vaTap
     Attributes
-        ID   : 30
+        ID   : 25
         Scope: local
         Value: 0
     
-Number originPage
+Variable (string) tInstruction
     Attributes
-        ID                                  : 3
-        Scope                               : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 452
-        y coordinate                        : 267
-        Width                               : 24
-        Height                              : 49
-        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 tInstruction
-    Attributes
-        ID                                  : 6
+        ID            : 31
         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
+        Max. Text Size: 50
     
-Text tTmp
+Variable (string) tTmp
     Attributes
-        ID                                  : 7
+        ID            : 32
         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
+        Max. Text Size: 50
     
 Text tTime
     Attributes
-        ID                                  : 8
+        ID                                  : 5
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -216,7 +105,7 @@ Text tTime
     
 Text tDate
     Attributes
-        ID                                  : 9
+        ID                                  : 6
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -232,28 +121,28 @@ 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
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Tuesday, 08. March 2022
-        Max. Text Size                      : 30
+        Max. Text Size                      : 35
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
 Text tSend
     Attributes
-        ID                                  : 12
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 451
-        y coordinate                        : 9
+        x coordinate                        : 405
+        y coordinate                        : 2
         Width                               : 29
         Height                              : 30
         Effect                              : load
@@ -276,7 +165,7 @@ Text tSend
     
 Text tMainIcon
     Attributes
-        ID                                  : 13
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -292,13 +181,13 @@ 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
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -306,7 +195,7 @@ Text tMainIcon
     
 Text tMainText
     Attributes
-        ID                                  : 14
+        ID                                  : 9
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -322,13 +211,13 @@ 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
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 2,3 °C
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -336,7 +225,7 @@ Text tMainText
     
 Text tForecast1
     Attributes
-        ID                                  : 15
+        ID                                  : 10
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -358,7 +247,7 @@ Text tForecast1
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : Mi
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -366,16 +255,16 @@ Text tForecast1
     
 Text tForecast1Val
     Attributes
-        ID                                  : 16
+        ID                                  : 11
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 126
-        y coordinate                        : 277
-        Width                               : 72
-        Height                              : 26
+        x coordinate                        : 125
+        y coordinate                        : 276
+        Width                               : 71
+        Height                              : 25
         Effect                              : load
         Effect Priority                     : 0
         Effect Time                         : 300
@@ -388,7 +277,7 @@ Text tForecast1Val
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 9,3 °C
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -396,7 +285,7 @@ Text tForecast1Val
     
 Text tF1Icon
     Attributes
-        ID                                  : 17
+        ID                                  : 12
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -418,7 +307,7 @@ Text tF1Icon
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -426,7 +315,7 @@ Text tF1Icon
     
 Text tForecast2
     Attributes
-        ID                                  : 18
+        ID                                  : 13
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -448,7 +337,7 @@ Text tForecast2
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : Do
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -456,7 +345,7 @@ Text tForecast2
     
 Text tF2Icon
     Attributes
-        ID                                  : 19
+        ID                                  : 14
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -478,7 +367,7 @@ Text tF2Icon
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -486,7 +375,7 @@ Text tF2Icon
     
 Text tForecast2Val
     Attributes
-        ID                                  : 20
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -508,7 +397,7 @@ Text tForecast2Val
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 11,9 °C
+        Text                                : 
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -516,7 +405,7 @@ Text tForecast2Val
     
 Text t10
     Attributes
-        ID                                  : 21
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -546,7 +435,7 @@ Text t10
     
 Text tAMPM
     Attributes
-        ID                                  : 23
+        ID                                  : 18
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -562,7 +451,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
@@ -576,7 +465,7 @@ Text tAMPM
     
 Text tForecast3Val
     Attributes
-        ID                                  : 24
+        ID                                  : 19
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -606,7 +495,7 @@ Text tForecast3Val
     
 Text tF3Icon
     Attributes
-        ID                                  : 25
+        ID                                  : 20
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -636,7 +525,7 @@ Text tF3Icon
     
 Text tForecast3
     Attributes
-        ID                                  : 26
+        ID                                  : 21
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -666,7 +555,7 @@ Text tForecast3
     
 Text tForecast4
     Attributes
-        ID                                  : 27
+        ID                                  : 22
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -696,7 +585,7 @@ Text tForecast4
     
 Text tF4Icon
     Attributes
-        ID                                  : 28
+        ID                                  : 23
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -719,14 +608,14 @@ Text tF4Icon
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
 Text tForecast4Val
     Attributes
-        ID                                  : 29
+        ID                                  : 24
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -754,6 +643,126 @@ Text tForecast4Val
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tMainTextAlt
+    Attributes
+        ID                                  : 27
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 104
+        y coordinate                        : 210
+        Width                               : 106
+        Height                              : 42
+        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
+        Horizontal Alignment                : left
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 10
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+Text tMainIconAlt
+    Attributes
+        ID                                  : 28
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 0
+        y coordinate                        : 221
+        Width                               : 100
+        Height                              : 66
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        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 tMRIcon
+    Attributes
+        ID                                  : 29
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 101
+        y coordinate                        : 266
+        Width                               : 40
+        Height                              : 35
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 1
+        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 tMR
+    Attributes
+        ID                                  : 30
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 144
+        y coordinate                        : 270
+        Width                               : 62
+        Height                              : 21
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 0
+        Back. Color                         : 0
+        Font Color                          : 65535
+        Horizontal Alignment                : left
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 10
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
@@ -773,7 +782,7 @@ Picture p0
     
 Timer tmSerial
     Attributes
-        ID         : 4
+        ID         : 3
         Scope      : local
         Period (ms): 50
         Enabled    : yes
@@ -822,7 +831,7 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="wake")
                                     {
                                         //dim=100
@@ -831,16 +840,16 @@ Timer tmSerial
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="time")
                                     {
                                         //get set time to global variable
-                                        spstr strCommand.txt,vaTime.txt,",",1
-                                        spstr vaTime.txt,tTime.txt,"?",0
-                                        spstr vaTime.txt,tAMPM.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                        spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+                                        spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
                                         if(tAMPM.txt=="")
                                         {
                                             vis tAMPM,0
@@ -849,66 +858,163 @@ Timer tmSerial
                                     if(tInstruction.txt=="date")
                                     {
                                         //get set date to global variable
-                                        spstr strCommand.txt,vaDate.txt,"?",1
-                                        tDate.txt=vaDate.txt
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                        tDate.txt=pageIcons.vaDate.txt
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="weatherUpdate")
                                     {
+                                        vis tMainIcon,1
+                                        vis tMainIconAlt,0
+                                        vis tMainText,1
+                                        vis tMainTextAlt,0
+                                        vis tMRIcon,0
+                                        vis tMR,0
                                         //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"?",1
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
+                                        tMainIconAlt.txt=tMainIcon.txt
                                         //tMainText
-                                        spstr strCommand.txt,tMainText.txt,"?",2
+                                        spstr strCommand.txt,tMainText.txt,"~",2
+                                        tMainTextAlt.txt=tMainText.txt
                                         //tForecast1
-                                        spstr strCommand.txt,tForecast1.txt,"?",3
+                                        spstr strCommand.txt,tForecast1.txt,"~",3
                                         //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",4
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
                                         //tForecast1Val
-                                        spstr strCommand.txt,tForecast1Val.txt,"?",5
+                                        spstr strCommand.txt,tForecast1Val.txt,"~",5
                                         //tForecast2
-                                        spstr strCommand.txt,tForecast2.txt,"?",6
+                                        spstr strCommand.txt,tForecast2.txt,"~",6
                                         //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
                                         //tForecast2Val
-                                        spstr strCommand.txt,tForecast2Val.txt,"?",8
+                                        spstr strCommand.txt,tForecast2Val.txt,"~",8
                                         //tForecast3
-                                        spstr strCommand.txt,tForecast3.txt,"?",9
+                                        spstr strCommand.txt,tForecast3.txt,"~",9
                                         //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
                                         //tForecast3Val
-                                        spstr strCommand.txt,tForecast3Val.txt,"?",11
+                                        spstr strCommand.txt,tForecast3Val.txt,"~",11
                                         //tForecast4
-                                        spstr strCommand.txt,tForecast4.txt,"?",12
+                                        spstr strCommand.txt,tForecast4.txt,"~",12
                                         //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"?",13
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
                                         //tForecast4Val
-                                        spstr strCommand.txt,tForecast4Val.txt,"?",14
+                                        spstr strCommand.txt,tForecast4Val.txt,"~",14
+                                        //alternative layout
+                                        //tMRIcon
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
+                                        if(tMRIcon.txt!="")
+                                        {
+                                            //value for tMRIcon, activate alternative layout
+                                            vis tMainIcon,0
+                                            vis tMainText,0
+                                            vis tMainTextAlt,1
+                                            vis tMainIconAlt,1
+                                            vis tMRIcon,1
+                                            vis tMR,1
+                                            vis tForecast1,0
+                                            vis tF1Icon,0
+                                            vis tForecast1Val,0
+                                            //move forecast values to the right
+                                            tForecast4.txt=tForecast3.txt
+                                            tForecast3.txt=tForecast2.txt
+                                            tForecast2.txt=tForecast1.txt
+                                            tForecast4Val.txt=tForecast3Val.txt
+                                            tForecast3Val.txt=tForecast2Val.txt
+                                            tForecast2Val.txt=tForecast1Val.txt
+                                            tF4Icon.txt=tF3Icon.txt
+                                            tF3Icon.txt=tF2Icon.txt
+                                            tF2Icon.txt=tF1Icon.txt
+                                        }
+                                        //tMR
+                                        spstr strCommand.txt,tMR.txt,"~",16
+                                    }
+                                    if(tInstruction.txt=="color")
+                                    {
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,tTime.bco,0,0
+                                        screensaver.bco=tTime.bco
+                                        tAMPM.bco=tTime.bco
+                                        tDate.bco=tTime.bco
+                                        tMainIcon.bco=tTime.bco
+                                        tMainText.bco=tTime.bco
+                                        tMainIconAlt.bco=tTime.bco
+                                        tMainTextAlt.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tMR.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tForecast1.bco=tTime.bco
+                                        tForecast1Val.bco=tTime.bco
+                                        tF1Icon.bco=tTime.bco
+                                        tForecast2.bco=tTime.bco
+                                        tForecast2Val.bco=tTime.bco
+                                        tF2Icon.bco=tTime.bco
+                                        tForecast3.bco=tTime.bco
+                                        tForecast3Val.bco=tTime.bco
+                                        tF3Icon.bco=tTime.bco
+                                        tForecast4.bco=tTime.bco
+                                        tForecast4Val.bco=tTime.bco
+                                        tF4Icon.bco=tTime.bco
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        covx tTmp.txt,tTime.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",3
+                                        covx tTmp.txt,tAMPM.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        covx tTmp.txt,tDate.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        covx tTmp.txt,tMainIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",6
+                                        covx tTmp.txt,tMainText.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        covx tTmp.txt,tForecast1.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        covx tTmp.txt,tForecast2.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        covx tTmp.txt,tForecast3.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        covx tTmp.txt,tForecast4.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        covx tTmp.txt,tF1Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",12
+                                        covx tTmp.txt,tF2Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        covx tTmp.txt,tF3Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",14
+                                        covx tTmp.txt,tF4Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        covx tTmp.txt,tForecast1Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",16
+                                        covx tTmp.txt,tForecast2Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",17
+                                        covx tTmp.txt,tForecast3Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",18
+                                        covx tTmp.txt,tForecast4Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",19
+                                        covx tTmp.txt,t10.bco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",20
+                                        covx tTmp.txt,tMainIconAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",21
+                                        covx tTmp.txt,tMainTextAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",22
+                                        covx tTmp.txt,tMRIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                        covx tTmp.txt,tMR.pco,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         dim=100
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete u[2]+3
                                         bufferPos=0
@@ -962,6 +1068,26 @@ Timer tmSerial
                 }
             }
         
+Timer tmSleep
+    Attributes
+        ID         : 26
+        Scope      : local
+        Period (ms): 1000
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(sleepTimeout!=0&&dimValue!=dim)
+            {
+                sleepValue+=1
+                if(sleepTimeout<=sleepValue)
+                {
+                    sleepValue=0
+                    dim=dimValue
+                    vaTap.val=0
+                }
+            }
+        
 TouchCap tc0
     Attributes
         ID   : 2
@@ -970,7 +1096,7 @@ TouchCap tc0
     
     Events
         Touch Press Event
-            dim=100
+            dim=dimValueNormal
             vaTap.val+=1
             covx vaTap.val,tTmp.txt,0,0
             tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
@@ -985,6 +1111,4 @@ TouchCap tc0
             prints sys0,2
             prints tSend.txt,0
             prints crcval,2
-            //dim=100
-            //page originPage.val
         

HMI/n2t-out/Program.s.txt

@@ -10,6 +10,7 @@ Program.s
     int sleepValue=0
     // dim value
     int dimValue=40
+    int dimValueNormal=100
     // fix touch offset
     lcd_dev fffb 0002 0000 0020
     page pageStartup

HMI/n2t-out/cardAlarm.txt

@@ -17,7 +17,6 @@ Page cardAlarm
             vis tInstruction,0
             vis tTmp,0
             vis tId,0
-            //vis nPageDisp,0
             vis arm1,0
             vis arm2,0
             vis arm3,0
@@ -171,7 +170,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardAlarm,bPrev"
+            tSend.txt="event,buttonPress2,cardAlarm,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -508,53 +514,78 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         //entn
-                                        spstr strCommand.txt,entn.txt,",",1
+                                        spstr strCommand.txt,entn.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         //text arm1
-                                        spstr strCommand.txt,arm1.txt,",",2
+                                        spstr strCommand.txt,arm1.txt,"~",3
                                         if(arm1.txt!="")
                                         {
                                             vis arm1,1
                                         }
                                         //id arm1
-                                        spstr strCommand.txt,va1.txt,",",3
+                                        spstr strCommand.txt,va1.txt,"~",4
                                         //text arm2
-                                        spstr strCommand.txt,arm2.txt,",",4
+                                        spstr strCommand.txt,arm2.txt,"~",5
                                         if(arm2.txt!="")
                                         {
                                             vis arm2,1
                                         }
                                         //id arm2
-                                        spstr strCommand.txt,va2.txt,",",5
+                                        spstr strCommand.txt,va2.txt,"~",6
                                         //text arm3
-                                        spstr strCommand.txt,arm3.txt,",",6
+                                        spstr strCommand.txt,arm3.txt,"~",7
                                         if(arm3.txt!="")
                                         {
                                             vis arm3,1
                                         }
                                         //id arm3
-                                        spstr strCommand.txt,va3.txt,",",7
+                                        spstr strCommand.txt,va3.txt,"~",8
                                         //text arm4
-                                        spstr strCommand.txt,arm4.txt,",",8
+                                        spstr strCommand.txt,arm4.txt,"~",9
                                         if(arm4.txt!="")
                                         {
                                             vis arm4,1
                                         }
                                         //id arm4
-                                        spstr strCommand.txt,va4.txt,",",9
+                                        spstr strCommand.txt,va4.txt,"~",10
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,",",10
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                         //icon color
-                                        spstr strCommand.txt,tTmp.txt,",",11
+                                        spstr strCommand.txt,tTmp.txt,"~",12
                                         covx tTmp.txt,sys0,0,0
                                         tIcon.pco=sys0
                                         //numpad status
-                                        spstr strCommand.txt,tTmp.txt,",",12
+                                        spstr strCommand.txt,tTmp.txt,"~",13
                                         if(tTmp.txt!="disable")
                                         {
                                             vis b0,1
@@ -569,9 +600,23 @@ Timer tmSerial
                                             vis b9,1
                                             vis b10,1
                                             vis tCode,1
+                                        }else
+                                        {
+                                            vis b0,0
+                                            vis b1,0
+                                            vis b2,0
+                                            vis b3,0
+                                            vis b4,0
+                                            vis b5,0
+                                            vis b6,0
+                                            vis b7,0
+                                            vis b8,0
+                                            vis b9,0
+                                            vis b10,0
+                                            vis tCode,0
                                         }
                                         //flashing status
-                                        spstr strCommand.txt,tTmp.txt,",",13
+                                        spstr strCommand.txt,tTmp.txt,"~",14
                                         if(tTmp.txt=="enable")
                                         {
                                             tmFlash.en=1
@@ -583,67 +628,80 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
                                         }
                                         if(tId.txt=="cardMedia")
                                         {
                                             page cardMedia
                                         }
+                                        if(tId.txt=="cardAlarm")
+                                        {
+                                            page cardAlarm
+                                        }
                                     }
                                     // end of user code
                                     udelete payloadLength-1
@@ -665,14 +723,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardAlarm"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

HMI/n2t-out/cardEntities.txt

@@ -211,7 +211,7 @@ Text tIcon1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
     
 Text tIcon2
     Attributes
@@ -221,7 +221,7 @@ Text tIcon2
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
     
 Text tIcon3
     Attributes
@@ -231,7 +231,7 @@ Text tIcon3
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 10
+        Max. Text Size                      : 5
     
 Text tIcon4
     Attributes
@@ -241,7 +241,7 @@ Text tIcon4
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 30
+        Max. Text Size                      : 5
     
 Text tSend
     Attributes
@@ -714,7 +714,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardEntities,bPrev"
+            tSend.txt="event,buttonPress2,cardEntities,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1115,15 +1122,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
                                         // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
-                                        spstr strCommand.txt,tHeading.txt,",",1
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis bUp1,0
@@ -1138,16 +1172,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
                                             vis tIcon1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             tIcon1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         if(type1.txt=="shutter")
@@ -1170,7 +1202,7 @@ Timer tmSerial
                                             vis hSlider1,0
                                             vis nNum1,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",8
+                                            spstr strCommand.txt,tTmp.txt,"~",8
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff1.val=sys0
                                         }
@@ -1184,7 +1216,7 @@ Timer tmSerial
                                             vis hSlider1,0
                                             vis nNum1,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",8
+                                            spstr strCommand.txt,tTmp.txt,"~",8
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff1.val=sys0
                                         }
@@ -1201,7 +1233,7 @@ Timer tmSerial
                                             bText1.pco=65535
                                             bText1.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                         }
                                         if(type1.txt=="button")
                                         {
@@ -1216,7 +1248,7 @@ Timer tmSerial
                                             bText1.pco=1374
                                             bText1.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                         }
                                         if(type1.txt=="number")
                                         {
@@ -1229,7 +1261,7 @@ Timer tmSerial
                                             vis hSlider1,1
                                             vis nNum1,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText1.txt,",",8
+                                            spstr strCommand.txt,bText1.txt,"~",8
                                             //first value is current value
                                             spstr bText1.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1245,9 +1277,9 @@ Timer tmSerial
                                             hSlider1.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis bUp2,0
@@ -1262,16 +1294,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
                                             vis tIcon2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             tIcon2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         if(type2.txt=="shutter")
@@ -1294,7 +1324,7 @@ Timer tmSerial
                                             vis hSlider2,0
                                             vis nNum2,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",14
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff2.val=sys0
                                         }
@@ -1308,7 +1338,7 @@ Timer tmSerial
                                             vis hSlider2,0
                                             vis nNum2,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",14
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff2.val=sys0
                                         }
@@ -1325,7 +1355,7 @@ Timer tmSerial
                                             bText2.pco=65535
                                             bText2.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                         }
                                         if(type2.txt=="button")
                                         {
@@ -1340,7 +1370,7 @@ Timer tmSerial
                                             bText2.pco=1374
                                             bText2.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                         }
                                         if(type2.txt=="number")
                                         {
@@ -1353,7 +1383,7 @@ Timer tmSerial
                                             vis hSlider2,1
                                             vis nNum2,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText2.txt,",",14
+                                            spstr strCommand.txt,bText2.txt,"~",14
                                             //first value is current value
                                             spstr bText2.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1369,9 +1399,9 @@ Timer tmSerial
                                             hSlider2.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis bUp3,0
@@ -1386,16 +1416,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
                                             vis tIcon3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             tIcon3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         if(type3.txt=="shutter")
@@ -1418,7 +1446,7 @@ Timer tmSerial
                                             vis hSlider3,0
                                             vis nNum3,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",20
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff3.val=sys0
                                         }
@@ -1432,7 +1460,7 @@ Timer tmSerial
                                             vis hSlider3,0
                                             vis nNum3,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",20
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff3.val=sys0
                                         }
@@ -1449,7 +1477,7 @@ Timer tmSerial
                                             bText3.pco=65535
                                             bText3.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                         }
                                         if(type3.txt=="button")
                                         {
@@ -1464,7 +1492,7 @@ Timer tmSerial
                                             bText3.pco=1374
                                             bText3.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                         }
                                         if(type3.txt=="number")
                                         {
@@ -1477,7 +1505,7 @@ Timer tmSerial
                                             vis hSlider3,1
                                             vis nNum3,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText3.txt,",",20
+                                            spstr strCommand.txt,bText3.txt,"~",20
                                             //first value is current value
                                             spstr bText3.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1493,9 +1521,9 @@ Timer tmSerial
                                             hSlider3.maxval=sys0
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis bUp4,0
@@ -1510,16 +1538,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
                                             vis tIcon4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             tIcon4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         if(type4.txt=="shutter")
@@ -1542,7 +1568,7 @@ Timer tmSerial
                                             vis hSlider4,0
                                             vis nNum4,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",26
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff4.val=sys0
                                         }
@@ -1556,7 +1582,7 @@ Timer tmSerial
                                             vis hSlider4,0
                                             vis nNum4,0
                                             // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",26
                                             covx tTmp.txt,sys0,0,0
                                             btOnOff4.val=sys0
                                         }
@@ -1573,7 +1599,7 @@ Timer tmSerial
                                             bText4.pco=65535
                                             bText4.pco2=65535
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                         }
                                         if(type4.txt=="button")
                                         {
@@ -1588,7 +1614,7 @@ Timer tmSerial
                                             bText4.pco=1374
                                             bText4.pco2=1374
                                             // get Text (optional Value)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                         }
                                         if(type4.txt=="number")
                                         {
@@ -1601,7 +1627,7 @@ Timer tmSerial
                                             vis hSlider4,1
                                             vis nNum4,1
                                             // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText4.txt,",",26
+                                            spstr strCommand.txt,bText4.txt,"~",26
                                             //first value is current value
                                             spstr bText4.txt,tTmp.txt,"|",0
                                             covx tTmp.txt,sys0,0,0
@@ -1621,11 +1647,11 @@ Timer tmSerial
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -1675,23 +1701,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -1714,14 +1740,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardEntities"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

HMI/n2t-out/cardGrid.txt

@@ -242,7 +242,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardGrid,bPrev"
+            tSend.txt="event,buttonPress2,cardGrid,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -563,15 +570,42 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     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 icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
                                         // get Type
-                                        spstr strCommand.txt,type1.txt,",",3
+                                        spstr strCommand.txt,type1.txt,"~",3
                                         // get internal name
-                                        spstr strCommand.txt,entn1.txt,",",4
+                                        spstr strCommand.txt,entn1.txt,"~",4
                                         if(type1.txt=="delete"||type1.txt=="")
                                         {
                                             vis tEntity1,0
@@ -579,22 +613,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",5
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                             vis bEntity1,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            spstr strCommand.txt,tTmp.txt,"~",6
                                             covx tTmp.txt,sys0,0,0
                                             bEntity1.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            spstr strCommand.txt,tEntity1.txt,"~",7
                                             vis tEntity1,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type2.txt,",",9
+                                        spstr strCommand.txt,type2.txt,"~",9
                                         // get internal name
-                                        spstr strCommand.txt,entn2.txt,",",10
+                                        spstr strCommand.txt,entn2.txt,"~",10
                                         if(type2.txt=="delete"||type2.txt=="")
                                         {
                                             vis tEntity2,0
@@ -602,22 +634,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                             vis bEntity2,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,sys0,0,0
                                             bEntity2.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            spstr strCommand.txt,tEntity2.txt,"~",13
                                             vis tEntity2,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type3.txt,",",15
+                                        spstr strCommand.txt,type3.txt,"~",15
                                         // get internal name
-                                        spstr strCommand.txt,entn3.txt,",",16
+                                        spstr strCommand.txt,entn3.txt,"~",16
                                         if(type3.txt=="delete"||type3.txt=="")
                                         {
                                             vis tEntity3,0
@@ -625,22 +655,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",17
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                             vis bEntity3,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",18
                                             covx tTmp.txt,sys0,0,0
                                             bEntity3.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            spstr strCommand.txt,tEntity3.txt,"~",19
                                             vis tEntity3,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type4.txt,",",21
+                                        spstr strCommand.txt,type4.txt,"~",21
                                         // get internal name
-                                        spstr strCommand.txt,entn4.txt,",",22
+                                        spstr strCommand.txt,entn4.txt,"~",22
                                         if(type4.txt=="delete"||type4.txt=="")
                                         {
                                             vis tEntity4,0
@@ -648,22 +676,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                             vis bEntity4,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,sys0,0,0
                                             bEntity4.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            spstr strCommand.txt,tEntity4.txt,"~",25
                                             vis tEntity4,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type5.txt,",",27
+                                        spstr strCommand.txt,type5.txt,"~",27
                                         // get internal name
-                                        spstr strCommand.txt,entn5.txt,",",28
+                                        spstr strCommand.txt,entn5.txt,"~",28
                                         if(type5.txt=="delete"||type5.txt=="")
                                         {
                                             vis tEntity5,0
@@ -671,22 +697,20 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",29
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                             vis bEntity5,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",30
                                             covx tTmp.txt,sys0,0,0
                                             bEntity5.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            spstr strCommand.txt,tEntity5.txt,"~",31
                                             vis tEntity5,1
                                         }
                                         // get Type
-                                        spstr strCommand.txt,type6.txt,",",33
+                                        spstr strCommand.txt,type6.txt,"~",33
                                         // get internal name
-                                        spstr strCommand.txt,entn6.txt,",",34
+                                        spstr strCommand.txt,entn6.txt,"~",34
                                         if(type6.txt=="delete"||type6.txt=="")
                                         {
                                             vis tEntity6,0
@@ -694,16 +718,14 @@ Timer tmSerial
                                         }else
                                         {
                                             // change icon
-                                            spstr strCommand.txt,tTmp.txt,",",35
-                                            covx tTmp.txt,sys0,0,0
-                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                             vis bEntity6,1
                                             // change icon color
-                                            spstr strCommand.txt,tTmp.txt,",",36
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,sys0,0,0
                                             bEntity6.pco=sys0
                                             // set name
-                                            spstr strCommand.txt,tEntity6.txt,",",37
+                                            spstr strCommand.txt,tEntity6.txt,"~",37
                                             vis tEntity6,1
                                         }
                                     }
@@ -711,11 +733,11 @@ Timer tmSerial
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
@@ -765,23 +787,23 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     // end of user code
@@ -804,14 +826,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardGrid"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

HMI/n2t-out/cardMedia.txt

@@ -435,7 +435,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardMedia,bPrev"
+            tSend.txt="event,buttonPress2,cardMedia,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -498,31 +505,54 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,"|",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,"|",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",3
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                         //title
-                                        spstr strCommand.txt,tTitle.txt,"|",4
+                                        spstr strCommand.txt,tTitle.txt,"~",5
                                         //author
-                                        spstr strCommand.txt,tAuthor.txt,"|",5
+                                        spstr strCommand.txt,tAuthor.txt,"~",6
                                         //volume
-                                        spstr strCommand.txt,tTmp.txt,"|",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",7
-                                        covx tTmp.txt,sys0,0,0
-                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                         //speaker current
-                                        spstr strCommand.txt,tSpeaker.txt,"|",8
+                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                         if(tSpeaker.txt!="")
                                         {
                                             tSpeaker.pco=1374
@@ -531,14 +561,14 @@ Timer tmSerial
                                             tSpeaker.pco=65535
                                         }
                                         //speaker list
-                                        spstr strCommand.txt,vaSpeakerList.txt,"|",9
+                                        spstr strCommand.txt,vaSpeakerList.txt,"~",10
                                         if(vaSpeakerList.txt=="")
                                         {
                                             vis t6,0
                                         }
                                         vaSpeakerPos.val=0
                                         // on off button
-                                        spstr strCommand.txt,tTmp.txt,"|",10
+                                        spstr strCommand.txt,tTmp.txt,"~",11
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t5,0
@@ -551,62 +581,75 @@ Timer tmSerial
                                     if(tInstruction.txt=="time")
                                     {
                                         // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
                                     }
                                     if(tInstruction.txt=="date")
                                     {
                                         // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
                                         // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,dimValue,0,0
                                         dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
                                         //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sleepTimeout,0,0
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardThermo")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardThermo
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
@@ -642,14 +685,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardMedia"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

HMI/n2t-out/cardThermo.txt

@@ -329,7 +329,14 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardThermo,bPrev"
+            tSend.txt="event,buttonPress2,cardThermo,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }else
+            {
+                tSend.txt+="bPrev"
+            }
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -635,29 +642,56 @@ Timer tmSerial
                                     // write command to variable strCommand
                                     ucopy strCommand.txt,4,payloadLength-5,0
                                     // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-                                    spstr strCommand.txt,tInstruction.txt,",",0
+                                    spstr strCommand.txt,tInstruction.txt,"~",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
-                                        spstr strCommand.txt,entn.txt,",",1
                                         //heading
-                                        spstr strCommand.txt,tHeading.txt,",",2
+                                        spstr strCommand.txt,tHeading.txt,"~",1
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,"~",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bPrev,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        if(tTmp.txt=="2")
+                                        {
+                                            vis bPrev,1
+                                            bPrev.txt=""
+                                        }
+                                        spstr tId.txt,tTmp.txt,"|",1
+                                        if(tTmp.txt=="0")
+                                        {
+                                            vis bNext,0
+                                        }
+                                        if(tTmp.txt=="1")
+                                        {
+                                            vis bNext,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"~",3
                                         //currentTemp
-                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        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,",",5
+                                        spstr strCommand.txt,tStatus.txt,"~",6
                                         //minTemp
-                                        spstr strCommand.txt,tTmp.txt,",",6
+                                        spstr strCommand.txt,tTmp.txt,"~",7
                                         covx tTmp.txt,xTempMin.val,0,0
                                         //maxTemp
-                                        spstr strCommand.txt,tTmp.txt,",",7
+                                        spstr strCommand.txt,tTmp.txt,"~",8
                                         covx tTmp.txt,xTempMax.val,0,0
                                         //tempStep
-                                        spstr strCommand.txt,tTmp.txt,",",8
+                                        spstr strCommand.txt,tTmp.txt,"~",9
                                         covx tTmp.txt,xTempStep.val,0,0
                                         // disable all buttons
                                         vis bt0,0
@@ -670,232 +704,218 @@ Timer tmSerial
                                         vis bt7,0
                                         vis bt8,0
                                         //bt0
-                                        spstr strCommand.txt,tTmp.txt,",",9
-                                        if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt0.txt,"~",10
+                                        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,",",10
+                                            spstr strCommand.txt,tTmp.txt,"~",11
                                             covx tTmp.txt,bt0.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",11
+                                            spstr strCommand.txt,tTmp.txt,"~",12
                                             covx tTmp.txt,bt0.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va0.txt,",",12
+                                            spstr strCommand.txt,va0.txt,"~",13
                                             //enable
                                             vis bt0,1
                                         }
                                         //bt1
-                                        spstr strCommand.txt,tTmp.txt,",",13
-                                        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,",",14
+                                            spstr strCommand.txt,tTmp.txt,"~",15
                                             covx tTmp.txt,bt1.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",15
+                                            spstr strCommand.txt,tTmp.txt,"~",16
                                             covx tTmp.txt,bt1.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va1.txt,",",16
+                                            spstr strCommand.txt,va1.txt,"~",17
                                             //enable
                                             vis bt1,1
                                         }
                                         //bt2
-                                        spstr strCommand.txt,tTmp.txt,",",17
-                                        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,",",18
+                                            spstr strCommand.txt,tTmp.txt,"~",19
                                             covx tTmp.txt,bt2.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",19
+                                            spstr strCommand.txt,tTmp.txt,"~",20
                                             covx tTmp.txt,bt2.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va2.txt,",",20
+                                            spstr strCommand.txt,va2.txt,"~",21
                                             //enable
                                             vis bt2,1
                                         }
                                         //bt3
-                                        spstr strCommand.txt,tTmp.txt,",",21
-                                        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,",",22
+                                            spstr strCommand.txt,tTmp.txt,"~",23
                                             covx tTmp.txt,bt3.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",23
+                                            spstr strCommand.txt,tTmp.txt,"~",24
                                             covx tTmp.txt,bt3.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va3.txt,",",24
+                                            spstr strCommand.txt,va3.txt,"~",25
                                             //enable
                                             vis bt3,1
                                         }
                                         //bt4
-                                        spstr strCommand.txt,tTmp.txt,",",25
-                                        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,",",26
+                                            spstr strCommand.txt,tTmp.txt,"~",27
                                             covx tTmp.txt,bt4.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",27
+                                            spstr strCommand.txt,tTmp.txt,"~",28
                                             covx tTmp.txt,bt4.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va4.txt,",",28
+                                            spstr strCommand.txt,va4.txt,"~",29
                                             //enable
                                             vis bt4,1
                                         }
                                         //bt5
-                                        spstr strCommand.txt,tTmp.txt,",",29
-                                        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,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",31
                                             covx tTmp.txt,bt5.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",31
+                                            spstr strCommand.txt,tTmp.txt,"~",32
                                             covx tTmp.txt,bt5.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va5.txt,",",32
+                                            spstr strCommand.txt,va5.txt,"~",33
                                             //enable
                                             vis bt5,1
                                         }
                                         //bt6
-                                        spstr strCommand.txt,tTmp.txt,",",33
-                                        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,",",34
+                                            spstr strCommand.txt,tTmp.txt,"~",35
                                             covx tTmp.txt,bt6.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",35
+                                            spstr strCommand.txt,tTmp.txt,"~",36
                                             covx tTmp.txt,bt6.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va6.txt,",",36
+                                            spstr strCommand.txt,va6.txt,"~",37
                                             //enable
                                             vis bt6,1
                                         }
                                         //bt7
-                                        spstr strCommand.txt,tTmp.txt,",",37
-                                        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,",",38
+                                            spstr strCommand.txt,tTmp.txt,"~",39
                                             covx tTmp.txt,bt7.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",39
+                                            spstr strCommand.txt,tTmp.txt,"~",40
                                             covx tTmp.txt,bt7.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va7.txt,",",40
+                                            spstr strCommand.txt,va7.txt,"~",41
                                             //enable
                                             vis bt7,1
                                         }
                                         //bt8
-                                        spstr strCommand.txt,tTmp.txt,",",41
-                                        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,",",42
+                                            spstr strCommand.txt,tTmp.txt,"~",43
                                             covx tTmp.txt,bt8.pco2,0,0
                                             // set state
-                                            spstr strCommand.txt,tTmp.txt,",",43
+                                            spstr strCommand.txt,tTmp.txt,"~",44
                                             covx tTmp.txt,bt8.val,0,0
                                             // save action
-                                            spstr strCommand.txt,va8.txt,",",44
+                                            spstr strCommand.txt,va8.txt,"~",45
                                             //enable
                                             vis bt8,1
                                         }
                                     }
-                                    if(tInstruction.txt=="time")
-                                    {
-                                        // get set time to global variable
-                                        spstr strCommand.txt,screensaver.vaTime.txt,",",1
-                                    }
-                                    if(tInstruction.txt=="date")
-                                    {
-                                        // get set date to global variable
-                                        spstr strCommand.txt,screensaver.vaDate.txt,"?",1
-                                    }
-                                    if(tInstruction.txt=="dimmode")
-                                    {
-                                        // get value
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,dimValue,0,0
-                                    }
-                                    if(tInstruction.txt=="timeout")
-                                    {
-                                        //set timeout to global var
-                                        spstr strCommand.txt,tTmp.txt,",",1
-                                        covx tTmp.txt,sleepTimeout,0,0
-                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         //command format pageType,specialPageName
                                         //write name of speical page to tId
-                                        spstr strCommand.txt,tId.txt,",",1
+                                        spstr strCommand.txt,tId.txt,"~",1
                                         //save second arg if there's one
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,"~",2
                                         //save third arg if there's one
-                                        spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
-                                            page popupLight
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
                                             page cardAlarm
                                         }
                                     }
+                                    if(tInstruction.txt=="time")
+                                    {
+                                        // get set time to global variable
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="date")
+                                    {
+                                        // get set date to global variable
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    }
+                                    if(tInstruction.txt=="dimmode")
+                                    {
+                                        // get value
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,dimValue,0,0
+                                    }
+                                    if(tInstruction.txt=="timeout")
+                                    {
+                                        //set timeout to global var
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,sleepTimeout,0,0
+                                    }
                                     // end of user code
                                     udelete payloadLength-1
                                     bufferPos=0
@@ -916,14 +936,25 @@ Timer tmSleep
     
     Events
         Timer Event
-            if(sleepTimeout!=0)
+            if(sleepTimeout!=0&&dimValue!=dim)
             {
                 sleepValue+=1
                 if(sleepTimeout<=sleepValue)
                 {
-                    screensaver.originPage.val=dp
                     sleepValue=0
-                    page screensaver
+                    dim=dimValue
+                    tSend.txt="event,sleepReached,cardThermo"
+                    //send calc crc
+                    btlen tSend.txt,sys0
+                    crcrest 1,0xffff // reset CRC
+                    crcputh 55 bb
+                    crcputs sys0,1
+                    crcputs tSend.txt,0
+                    //send cmd
+                    printh 55 bb
+                    prints sys0,2
+                    prints tSend.txt,0
+                    prints crcval,2
                 }
             }
         

HMI/n2t-out/pageIcons.txt

@@ -10,15 +10,17 @@ Page pageIcons
         Swide left page ID                  : disabled
         Swide right page ID                 : disabled
     
-Text tIcons
+Variable (string) vaTime
     Attributes
         Scope         : global
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 150
+        Text          : 
+        Max. Text Size: 15
+    
+Variable (string) vaDate
+    Attributes
+        Scope         : global
+        Text          : 
+        Max. Text Size: 35
     
 Text tTmp1
     Attributes