From d5f668c5374fb5dc2c7bc7b8c86671f6a608f62c Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Thu, 31 Mar 2022 18:53:37 +0000
Subject: [PATCH] Merge branch 'main' of
 https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

---
 HMI/US/landscape/diff-eu-version.txt          | 1058 +++++++++--------
 HMI/US/landscape/n2t-out-visual/cardAlarm.txt |   72 +-
 .../landscape/n2t-out-visual/cardEntities.txt |    7 +-
 HMI/US/landscape/n2t-out-visual/cardGrid.txt  |  330 ++++-
 HMI/US/landscape/n2t-out-visual/cardMedia.txt |   56 +-
 .../landscape/n2t-out-visual/cardThermo.txt   |  292 ++---
 .../n2t-out-visual/nspanel_US_L_Stats.txt     |   36 +-
 HMI/US/landscape/n2t-out/cardAlarm.txt        |   72 +-
 HMI/US/landscape/n2t-out/cardEntities.txt     |    7 +-
 HMI/US/landscape/n2t-out/cardGrid.txt         |  330 ++++-
 HMI/US/landscape/n2t-out/cardMedia.txt        |   56 +-
 HMI/US/landscape/n2t-out/cardThermo.txt       |  292 ++---
 HMI/US/portrait/diff-eu-version.txt           |   28 +-
 13 files changed, 1634 insertions(+), 1002 deletions(-)

diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt
index 3d77eaf8..10e78e7e 100644
--- a/HMI/US/landscape/diff-eu-version.txt
+++ b/HMI/US/landscape/diff-eu-version.txt
@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
---- HMI/n2t-out/cardAlarm.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/landscape/n2t-out/cardAlarm.txt	2022-03-31 18:39:21.711985254 +0000
+--- HMI/n2t-out/cardAlarm.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/landscape/n2t-out/cardAlarm.txt	2022-03-31 18:53:36.717579522 +0000
 @@ -17,6 +17,7 @@
              vis tInstruction,0
              vis tTmp,0
@@ -9,150 +9,10 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
              vis arm1,0
              vis arm2,0
              vis arm3,0
-@@ -170,12 +171,7 @@
-     
-     Events
-         Touch Press Event
--            tSend.txt="event,buttonPress2,cardAlarm,"
--            if(bPrev.txt=="")
--            {
--                tSend.txt+="bUp"
--            }
--            tSend.txt+="bPrev"
-+            tSend.txt="event,buttonPress2,cardAlarm,bPrev"
-             //send calc crc
-             btlen tSend.txt,sys0
-             crcrest 1,0xffff // reset CRC
-@@ -517,75 +513,48 @@
-                                     {
-                                         //entn
-                                         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 bPrev,1
--                                            bNext.txt=""
--                                        }
-                                         //text arm1
--                                        spstr strCommand.txt,arm1.txt,",",3
-+                                        spstr strCommand.txt,arm1.txt,",",2
-                                         if(arm1.txt!="")
-                                         {
-                                             vis arm1,1
-                                         }
-                                         //id arm1
--                                        spstr strCommand.txt,va1.txt,",",4
-+                                        spstr strCommand.txt,va1.txt,",",3
-                                         //text arm2
--                                        spstr strCommand.txt,arm2.txt,",",5
-+                                        spstr strCommand.txt,arm2.txt,",",4
-                                         if(arm2.txt!="")
-                                         {
-                                             vis arm2,1
-                                         }
-                                         //id arm2
--                                        spstr strCommand.txt,va2.txt,",",6
-+                                        spstr strCommand.txt,va2.txt,",",5
-                                         //text arm3
--                                        spstr strCommand.txt,arm3.txt,",",7
-+                                        spstr strCommand.txt,arm3.txt,",",6
-                                         if(arm3.txt!="")
-                                         {
-                                             vis arm3,1
-                                         }
-                                         //id arm3
--                                        spstr strCommand.txt,va3.txt,",",8
-+                                        spstr strCommand.txt,va3.txt,",",7
-                                         //text arm4
--                                        spstr strCommand.txt,arm4.txt,",",9
-+                                        spstr strCommand.txt,arm4.txt,",",8
-                                         if(arm4.txt!="")
-                                         {
-                                             vis arm4,1
-                                         }
-                                         //id arm4
--                                        spstr strCommand.txt,va4.txt,",",10
-+                                        spstr strCommand.txt,va4.txt,",",9
-                                         //icon
--                                        spstr strCommand.txt,tTmp.txt,",",11
-+                                        spstr strCommand.txt,tTmp.txt,",",10
-                                         covx tTmp.txt,sys0,0,0
-                                         substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
-                                         //icon color
--                                        spstr strCommand.txt,tTmp.txt,",",12
-+                                        spstr strCommand.txt,tTmp.txt,",",11
-                                         covx tTmp.txt,sys0,0,0
-                                         tIcon.pco=sys0
-                                         //numpad status
--                                        spstr strCommand.txt,tTmp.txt,",",13
-+                                        spstr strCommand.txt,tTmp.txt,",",12
-                                         if(tTmp.txt!="disable")
-                                         {
-                                             vis b0,1
-@@ -600,23 +569,9 @@
-                                             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,",",14
-+                                        spstr strCommand.txt,tTmp.txt,",",13
-                                         if(tTmp.txt=="enable")
-                                         {
-                                             tmFlash.en=1
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/landscape/n2t-out/cardEntities.txt	2022-03-31 18:39:21.711985254 +0000
-@@ -714,12 +714,7 @@
-     
-     Events
-         Touch Press Event
--            tSend.txt="event,buttonPress2,cardEntities,"
--            if(bPrev.txt=="")
--            {
--                tSend.txt+="bUp"
--            }
--            tSend.txt+="bPrev"
-+            tSend.txt="event,buttonPress2,cardEntities,bPrev"
-             //send calc crc
-             btlen tSend.txt,sys0
-             crcrest 1,0xffff // reset CRC
-@@ -1125,33 +1120,6 @@
+--- HMI/n2t-out/cardEntities.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/landscape/n2t-out/cardEntities.txt	2022-03-31 18:53:36.717579522 +0000
+@@ -1125,33 +1125,6 @@
                                      {
                                          // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
                                          spstr strCommand.txt,tHeading.txt,",",1
@@ -187,23 +47,333 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
                                          spstr strCommand.txt,type1.txt,",",3
                                          // get internal name
 diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
---- HMI/n2t-out/cardGrid.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/landscape/n2t-out/cardGrid.txt	2022-03-31 18:39:21.711985254 +0000
-@@ -242,12 +242,7 @@
+--- HMI/n2t-out/cardGrid.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/landscape/n2t-out/cardGrid.txt	2022-03-31 18:53:36.717579522 +0000
+@@ -12,28 +12,307 @@
      
      Events
-         Touch Press Event
--            tSend.txt="event,buttonPress2,cardGrid,"
--            if(bPrev.txt=="")
--            {
--                tSend.txt+="bUp"
--            }
--            tSend.txt+="bPrev"
-+            tSend.txt="event,buttonPress2,cardGrid,bPrev"
-             //send calc crc
-             btlen tSend.txt,sys0
-             crcrest 1,0xffff // reset CRC
-@@ -573,33 +568,6 @@
+         Preinitialize Event
+-            //wup=cardEntities
+-            //remove background & activate reparse mode
+-            vis p0,0
+-            recmod=1
+-            bauds=115200
+-            //debug stuff
+-            vis tTmp,0
+-            vis tSend,0
+-            vis tInstruction,0
+-            vis tId,0
+-            vis bEntity1,0
+-            vis bEntity2,0
+-            vis bEntity3,0
+-            vis bEntity4,0
+-            vis bEntity5,0
+-            vis bEntity6,0
++            // 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
++                        }
++                        //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
++                            ucopy payloadLength,2,2,0
++                            // 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)
++                            {
++                                // calculate crc
++                                crcrest 1,0xFFFF
++                                // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
++                                //crcputu 3,u[2]
++                                // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
++                                crcputu 0,payloadLength-1
++                                // get recived crc to be able to compare it
++                                ucopy recvCrc,payloadLength-1,2,0
++                                // compare crc with recived value
++                                if(crcval==recvCrc)
++                                {
++                                    // crc is okay
++                                    // here is the location where acual code should be
++                                    // 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
++                                    if(tInstruction.txt=="entityUpd")
++                                    {
++                                        // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
++                                        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 bPrev,1
++                                            bNext.txt=""
++                                        }
++                                        // get Type
++                                        spstr strCommand.txt,type1.txt,",",3
++                                        // get internal name
++                                        spstr strCommand.txt,entn1.txt,",",4
++                                        if(type1.txt=="delete"||type1.txt=="")
++                                        {
+             vis tEntity1,0
++                                            vis bEntity1,0
++                                        }else
++                                        {
++                                            // change icon
++                                            spstr strCommand.txt,tTmp.txt,",",5
++                                            covx tTmp.txt,sys0,0,0
++                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
++                                            vis bEntity1,1
++                                            // change icon color
++                                            spstr strCommand.txt,tTmp.txt,",",6
++                                            covx tTmp.txt,sys0,0,0
++                                            bEntity1.pco=sys0
++                                            // set name
++                                            spstr strCommand.txt,tEntity1.txt,",",7
++                                            vis tEntity1,1
++                                        }
++                                        // get Type
++                                        spstr strCommand.txt,type2.txt,",",9
++                                        // get internal name
++                                        spstr strCommand.txt,entn2.txt,",",10
++                                        if(type2.txt=="delete"||type2.txt=="")
++                                        {
+             vis tEntity2,0
++                                            vis bEntity2,0
++                                        }else
++                                        {
++                                            // change icon
++                                            spstr strCommand.txt,tTmp.txt,",",11
++                                            covx tTmp.txt,sys0,0,0
++                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
++                                            vis bEntity2,1
++                                            // change icon color
++                                            spstr strCommand.txt,tTmp.txt,",",12
++                                            covx tTmp.txt,sys0,0,0
++                                            bEntity2.pco=sys0
++                                            // set name
++                                            spstr strCommand.txt,tEntity2.txt,",",13
++                                            vis tEntity2,1
++                                        }
++                                        // get Type
++                                        spstr strCommand.txt,type3.txt,",",15
++                                        // get internal name
++                                        spstr strCommand.txt,entn3.txt,",",16
++                                        if(type3.txt=="delete"||type3.txt=="")
++                                        {
+             vis tEntity3,0
++                                            vis bEntity3,0
++                                        }else
++                                        {
++                                            // change icon
++                                            spstr strCommand.txt,tTmp.txt,",",17
++                                            covx tTmp.txt,sys0,0,0
++                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
++                                            vis bEntity3,1
++                                            // change icon color
++                                            spstr strCommand.txt,tTmp.txt,",",18
++                                            covx tTmp.txt,sys0,0,0
++                                            bEntity3.pco=sys0
++                                            // set name
++                                            spstr strCommand.txt,tEntity3.txt,",",19
++                                            vis tEntity3,1
++                                        }
++                                        // get Type
++                                        spstr strCommand.txt,type4.txt,",",21
++                                        // get internal name
++                                        spstr strCommand.txt,entn4.txt,",",22
++                                        if(type4.txt=="delete"||type4.txt=="")
++                                        {
+             vis tEntity4,0
++                                            vis bEntity4,0
++                                        }else
++                                        {
++                                            // change icon
++                                            spstr strCommand.txt,tTmp.txt,",",23
++                                            covx tTmp.txt,sys0,0,0
++                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
++                                            vis bEntity4,1
++                                            // change icon color
++                                            spstr strCommand.txt,tTmp.txt,",",24
++                                            covx tTmp.txt,sys0,0,0
++                                            bEntity4.pco=sys0
++                                            // set name
++                                            spstr strCommand.txt,tEntity4.txt,",",25
++                                            vis tEntity4,1
++                                        }
++                                        // get Type
++                                        spstr strCommand.txt,type5.txt,",",27
++                                        // get internal name
++                                        spstr strCommand.txt,entn5.txt,",",28
++                                        if(type5.txt=="delete"||type5.txt=="")
++                                        {
+             vis tEntity5,0
++                                            vis bEntity5,0
++                                        }else
++                                        {
++                                            // change icon
++                                            spstr strCommand.txt,tTmp.txt,",",29
++                                            covx tTmp.txt,sys0,0,0
++                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
++                                            vis bEntity5,1
++                                            // change icon color
++                                            spstr strCommand.txt,tTmp.txt,",",30
++                                            covx tTmp.txt,sys0,0,0
++                                            bEntity5.pco=sys0
++                                            // set name
++                                            spstr strCommand.txt,tEntity5.txt,",",31
++                                            vis tEntity5,1
++                                        }
++                                        // get Type
++                                        spstr strCommand.txt,type6.txt,",",33
++                                        // get internal name
++                                        spstr strCommand.txt,entn6.txt,",",34
++                                        if(type6.txt=="delete"||type6.txt=="")
++                                        {
+             vis tEntity6,0
++                                            vis bEntity6,0
++                                        }else
++                                        {
++                                            // change icon
++                                            spstr strCommand.txt,tTmp.txt,",",35
++                                            covx tTmp.txt,sys0,0,0
++                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
++                                            vis bEntity6,1
++                                            // change icon color
++                                            spstr strCommand.txt,tTmp.txt,",",36
++                                            covx tTmp.txt,sys0,0,0
++                                            bEntity6.pco=sys0
++                                            // set name
++                                            spstr strCommand.txt,tEntity6.txt,",",37
++                                            vis tEntity6,1
++                                        }
++                                    }
++                                    if(tInstruction.txt=="pageType")
++                                    {
++                                        //command format pageType,specialPageName
++                                        //write name of speical page to tId
++                                        spstr strCommand.txt,tId.txt,",",1
++                                        //save second arg if there's one
++                                        spstr strCommand.txt,tTmp.txt,",",2
++                                        //save third arg if there's one
++                                        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=="cardGrid")
++                                        {
++                                            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=="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
++                                }
++                            }
++                        }
++                    }
++                    // next character
++                    bufferPos++
++                }
++            }
+         
+ Variable (string) strCommand
+     Attributes
+@@ -573,33 +852,6 @@
                                      {
                                          // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
                                          spstr strCommand.txt,tHeading.txt,",",1
@@ -237,421 +407,305 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
                                          // get Type
                                          spstr strCommand.txt,type1.txt,",",3
                                          // get internal name
-diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
---- HMI/n2t-out/cardMedia.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/landscape/n2t-out/cardMedia.txt	2022-03-31 18:39:21.711985254 +0000
-@@ -435,12 +435,7 @@
-     
-     Events
-         Touch Press Event
--            tSend.txt="event,buttonPress2,cardMedia,"
--            if(bPrev.txt=="")
--            {
--                tSend.txt+="bUp"
--            }
--            tSend.txt+="bPrev"
-+            tSend.txt="event,buttonPress2,cardMedia,bPrev"
-             //send calc crc
-             btlen tSend.txt,sys0
-             crcrest 1,0xffff // reset CRC
-@@ -506,55 +501,28 @@
-                                     spstr strCommand.txt,tInstruction.txt,",",0
-                                     if(tInstruction.txt=="entityUpd")
-                                     {
--                                        //heading
--                                        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 bPrev,1
--                                            bNext.txt=""
--                                        }
-                                         //entity name
--                                        spstr strCommand.txt,entn.txt,"|",3
-+                                        spstr strCommand.txt,entn.txt,"|",1
-+                                        //heading
-+                                        spstr strCommand.txt,tHeading.txt,"|",2
-                                         //icon
--                                        spstr strCommand.txt,tTmp.txt,"|",4
-+                                        spstr strCommand.txt,tTmp.txt,"|",3
-                                         covx tTmp.txt,sys0,0,0
-                                         substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
-                                         //title
--                                        spstr strCommand.txt,tTitle.txt,"|",5
-+                                        spstr strCommand.txt,tTitle.txt,"|",4
-                                         //author
--                                        spstr strCommand.txt,tAuthor.txt,"|",6
-+                                        spstr strCommand.txt,tAuthor.txt,"|",5
-                                         //volume
--                                        spstr strCommand.txt,tTmp.txt,"|",7
-+                                        spstr strCommand.txt,tTmp.txt,"|",6
-                                         covx tTmp.txt,sys0,0,0
-                                         hVolume.val=sys0
-                                         //icon
--                                        spstr strCommand.txt,tTmp.txt,"|",8
-+                                        spstr strCommand.txt,tTmp.txt,"|",7
-                                         covx tTmp.txt,sys0,0,0
-                                         substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
-                                         //speaker current
--                                        spstr strCommand.txt,tSpeaker.txt,"|",9
-+                                        spstr strCommand.txt,tSpeaker.txt,"|",8
-                                         if(tSpeaker.txt!="")
-                                         {
-                                             tSpeaker.pco=1374
-@@ -563,14 +531,14 @@
-                                             tSpeaker.pco=65535
-                                         }
-                                         //speaker list
--                                        spstr strCommand.txt,vaSpeakerList.txt,"|",10
-+                                        spstr strCommand.txt,vaSpeakerList.txt,"|",9
-                                         if(vaSpeakerList.txt=="")
-                                         {
-                                             vis t6,0
-                                         }
-                                         vaSpeakerPos.val=0
-                                         // on off button
--                                        spstr strCommand.txt,tTmp.txt,"|",11
-+                                        spstr strCommand.txt,tTmp.txt,"|",10
-                                         if(tTmp.txt=="disable")
-                                         {
-                                             vis t5,0
 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
---- HMI/n2t-out/cardThermo.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/landscape/n2t-out/cardThermo.txt	2022-03-31 18:39:21.711985254 +0000
-@@ -329,12 +329,7 @@
-     
-     Events
-         Touch Press Event
--            tSend.txt="event,buttonPress2,cardThermo,"
--            if(bPrev.txt=="")
--            {
--                tSend.txt+="bUp"
--            }
--            tSend.txt+="bPrev"
-+            tSend.txt="event,buttonPress2,cardThermo,bPrev"
-             //send calc crc
-             btlen tSend.txt,sys0
-             crcrest 1,0xffff // reset CRC
-@@ -643,53 +638,26 @@
+--- HMI/n2t-out/cardThermo.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/landscape/n2t-out/cardThermo.txt	2022-03-31 18:53:36.717579522 +0000
+@@ -643,8 +643,8 @@
                                      spstr strCommand.txt,tInstruction.txt,",",0
                                      if(tInstruction.txt=="entityUpd")
                                      {
 -                                        //heading
 -                                        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 bPrev,1
--                                            bNext.txt=""
--                                        }
-                                         //entity name
--                                        spstr strCommand.txt,entn.txt,",",3
++                                        //entn
 +                                        spstr strCommand.txt,entn.txt,",",1
-+                                        //heading
-+                                        spstr strCommand.txt,tHeading.txt,",",2
-                                         //currentTemp
+                                         // navigation icons
+                                         spstr strCommand.txt,tId.txt,",",2
+                                         spstr tId.txt,tTmp.txt,"|",0
+@@ -672,189 +672,109 @@
+                                             vis bPrev,1
+                                             bNext.txt=""
+                                         }
+-                                        //entity name
+-                                        spstr strCommand.txt,entn.txt,",",3
+-                                        //currentTemp
 -                                        spstr strCommand.txt,tTmp.txt,",",4
-+                                        spstr strCommand.txt,tTmp.txt,",",3
-                                         covx tTmp.txt,xTempCurr.val,0,0
-                                         //dstTemp
+-                                        covx tTmp.txt,xTempCurr.val,0,0
+-                                        //dstTemp
 -                                        spstr strCommand.txt,tTmp.txt,",",5
-+                                        spstr strCommand.txt,tTmp.txt,",",4
-                                         covx tTmp.txt,xTempDest.val,0,0
-                                         //status
+-                                        covx tTmp.txt,xTempDest.val,0,0
+-                                        //status
 -                                        spstr strCommand.txt,tStatus.txt,",",6
-+                                        spstr strCommand.txt,tStatus.txt,",",5
-                                         //minTemp
+-                                        //minTemp
 -                                        spstr strCommand.txt,tTmp.txt,",",7
-+                                        spstr strCommand.txt,tTmp.txt,",",6
-                                         covx tTmp.txt,xTempMin.val,0,0
-                                         //maxTemp
+-                                        covx tTmp.txt,xTempMin.val,0,0
+-                                        //maxTemp
 -                                        spstr strCommand.txt,tTmp.txt,",",8
-+                                        spstr strCommand.txt,tTmp.txt,",",7
-                                         covx tTmp.txt,xTempMax.val,0,0
-                                         //tempStep
+-                                        covx tTmp.txt,xTempMax.val,0,0
+-                                        //tempStep
 -                                        spstr strCommand.txt,tTmp.txt,",",9
-+                                        spstr strCommand.txt,tTmp.txt,",",8
-                                         covx tTmp.txt,xTempStep.val,0,0
-                                         // disable all buttons
-                                         vis bt0,0
-@@ -702,160 +670,190 @@
-                                         vis bt7,0
-                                         vis bt8,0
-                                         //bt0
+-                                        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
+-                                        //bt0
 -                                        spstr strCommand.txt,tTmp.txt,",",10
-+                                        spstr strCommand.txt,tTmp.txt,",",9
-                                         if(tTmp.txt!="")
-                                         {
-                                             // set icon
-                                             covx tTmp.txt,sys0,0,0
-                                             substr pageIcons.tIcons.txt,bt0.txt,sys0,1
-                                             // set text color on active state
--                                            spstr strCommand.txt,tTmp.txt,",",11
-+                                            spstr strCommand.txt,tTmp.txt,",",10
-                                             covx tTmp.txt,bt0.pco2,0,0
-                                             // set state
+-                                        if(tTmp.txt!="")
+-                                        {
+-                                            // set icon
+-                                            covx tTmp.txt,sys0,0,0
+-                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
+-                                            // set text color on active state
++                                        //text arm1
++                                        spstr strCommand.txt,arm1.txt,",",3
++                                        if(arm1.txt!="")
++                                        {
++                                            vis arm1,1
++                                        }
++                                        //id arm1
++                                        spstr strCommand.txt,va1.txt,",",4
++                                        //text arm2
++                                        spstr strCommand.txt,arm2.txt,",",5
++                                        if(arm2.txt!="")
++                                        {
++                                            vis arm2,1
++                                        }
++                                        //id arm2
++                                        spstr strCommand.txt,va2.txt,",",6
++                                        //text arm3
++                                        spstr strCommand.txt,arm3.txt,",",7
++                                        if(arm3.txt!="")
++                                        {
++                                            vis arm3,1
++                                        }
++                                        //id arm3
++                                        spstr strCommand.txt,va3.txt,",",8
++                                        //text arm4
++                                        spstr strCommand.txt,arm4.txt,",",9
++                                        if(arm4.txt!="")
++                                        {
++                                            vis arm4,1
++                                        }
++                                        //id arm4
++                                        spstr strCommand.txt,va4.txt,",",10
++                                        //icon
+                                             spstr strCommand.txt,tTmp.txt,",",11
+-                                            covx tTmp.txt,bt0.pco2,0,0
+-                                            // set state
 -                                            spstr strCommand.txt,tTmp.txt,",",12
-+                                            spstr strCommand.txt,tTmp.txt,",",11
-                                             covx tTmp.txt,bt0.val,0,0
-                                             // save action
+-                                            covx tTmp.txt,bt0.val,0,0
+-                                            // save action
 -                                            spstr strCommand.txt,va0.txt,",",13
-+                                            spstr strCommand.txt,va0.txt,",",12
-                                             //enable
-                                             vis bt0,1
+-                                            //enable
+-                                            vis bt0,1
 -                                            }              //bt1
 -                                            spstr strCommand.txt,tTmp.txt,",",14
-+                                        }
-+                                        //bt1
-+                                        spstr strCommand.txt,tTmp.txt,",",13
-                                             if(tTmp.txt!="")
-                                             {
-                                                 // set icon
-                                                 covx tTmp.txt,sys0,0,0
-                                                 substr pageIcons.tIcons.txt,bt1.txt,sys0,1
-                                                 // set text color on active state
+-                                            if(tTmp.txt!="")
+-                                            {
+-                                                // set icon
+-                                                covx tTmp.txt,sys0,0,0
+-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
+-                                                // set text color on active state
 -                                                spstr strCommand.txt,tTmp.txt,",",15
-+                                            spstr strCommand.txt,tTmp.txt,",",14
-                                                 covx tTmp.txt,bt1.pco2,0,0
-                                                 // set state
+-                                                covx tTmp.txt,bt1.pco2,0,0
+-                                                // set state
 -                                                spstr strCommand.txt,tTmp.txt,",",16
-+                                            spstr strCommand.txt,tTmp.txt,",",15
-                                                 covx tTmp.txt,bt1.val,0,0
-                                                 // save action
+-                                                covx tTmp.txt,bt1.val,0,0
+-                                                // save action
 -                                                spstr strCommand.txt,va1.txt,",",17
-+                                            spstr strCommand.txt,va1.txt,",",16
-                                                 //enable
-                                                 vis bt1,1
+-                                                //enable
+-                                                vis bt1,1
 -                                                }              //bt2
 -                                                spstr strCommand.txt,tTmp.txt,",",18
-+                                        }
-+                                        //bt2
-+                                        spstr strCommand.txt,tTmp.txt,",",17
-                                                 if(tTmp.txt!="")
-                                                 {
-                                                     // set icon
+-                                                if(tTmp.txt!="")
+-                                                {
+-                                                    // set icon
                                                      covx tTmp.txt,sys0,0,0
-                                                     substr pageIcons.tIcons.txt,bt2.txt,sys0,1
-                                                     // set text color on active state
+-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
+-                                                    // set text color on active state
 -                                                    spstr strCommand.txt,tTmp.txt,",",19
-+                                            spstr strCommand.txt,tTmp.txt,",",18
-                                                     covx tTmp.txt,bt2.pco2,0,0
-                                                     // set state
+-                                                    covx tTmp.txt,bt2.pco2,0,0
+-                                                    // set state
 -                                                    spstr strCommand.txt,tTmp.txt,",",20
-+                                            spstr strCommand.txt,tTmp.txt,",",19
-                                                     covx tTmp.txt,bt2.val,0,0
-                                                     // save action
+-                                                    covx tTmp.txt,bt2.val,0,0
+-                                                    // save action
 -                                                    spstr strCommand.txt,va2.txt,",",21
-+                                            spstr strCommand.txt,va2.txt,",",20
-                                                     //enable
-                                                     vis bt2,1
+-                                                    //enable
+-                                                    vis bt2,1
 -                                                    }              //bt3
 -                                                    spstr strCommand.txt,tTmp.txt,",",22
-+                                        }
-+                                        //bt3
-+                                        spstr strCommand.txt,tTmp.txt,",",21
-                                                     if(tTmp.txt!="")
-                                                     {
-                                                         // set icon
+-                                                    if(tTmp.txt!="")
+-                                                    {
+-                                                        // set icon
++                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
++                                        //icon color
++                                        spstr strCommand.txt,tTmp.txt,",",12
                                                          covx tTmp.txt,sys0,0,0
-                                                         substr pageIcons.tIcons.txt,bt3.txt,sys0,1
-                                                         // set text color on active state
+-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
+-                                                        // set text color on active state
 -                                                        spstr strCommand.txt,tTmp.txt,",",23
-+                                            spstr strCommand.txt,tTmp.txt,",",22
-                                                         covx tTmp.txt,bt3.pco2,0,0
-                                                         // set state
+-                                                        covx tTmp.txt,bt3.pco2,0,0
+-                                                        // set state
 -                                                        spstr strCommand.txt,tTmp.txt,",",24
-+                                            spstr strCommand.txt,tTmp.txt,",",23
-                                                         covx tTmp.txt,bt3.val,0,0
-                                                         // save action
+-                                                        covx tTmp.txt,bt3.val,0,0
+-                                                        // save action
 -                                                        spstr strCommand.txt,va3.txt,",",25
-+                                            spstr strCommand.txt,va3.txt,",",24
-                                                         //enable
-                                                         vis bt3,1
+-                                                        //enable
+-                                                        vis bt3,1
 -                                                        }              //bt4
 -                                                        spstr strCommand.txt,tTmp.txt,",",26
+-                                                        if(tTmp.txt!="")
++                                        tIcon.pco=sys0
++                                        //numpad status
++                                        spstr strCommand.txt,tTmp.txt,",",13
++                                        if(tTmp.txt!="disable")
++                                        {
++                                            vis b0,1
++                                            vis b1,1
++                                            vis b2,1
++                                            vis b3,1
++                                            vis b4,1
++                                            vis b5,1
++                                            vis b6,1
++                                            vis b7,1
++                                            vis b8,1
++                                            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
 +                                        }
-+                                        //bt4
-+                                        spstr strCommand.txt,tTmp.txt,",",25
-                                                         if(tTmp.txt!="")
++                                        //flashing status
++                                        spstr strCommand.txt,tTmp.txt,",",14
++                                        if(tTmp.txt=="enable")
                                                          {
-                                                             // set icon
-                                                             covx tTmp.txt,sys0,0,0
-                                                             substr pageIcons.tIcons.txt,bt4.txt,sys0,1
-                                                             // set text color on active state
+-                                                            // set icon
+-                                                            covx tTmp.txt,sys0,0,0
+-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
+-                                                            // set text color on active state
 -                                                            spstr strCommand.txt,tTmp.txt,",",27
-+                                            spstr strCommand.txt,tTmp.txt,",",26
-                                                             covx tTmp.txt,bt4.pco2,0,0
-                                                             // set state
+-                                                            covx tTmp.txt,bt4.pco2,0,0
+-                                                            // set state
 -                                                            spstr strCommand.txt,tTmp.txt,",",28
-+                                            spstr strCommand.txt,tTmp.txt,",",27
-                                                             covx tTmp.txt,bt4.val,0,0
-                                                             // save action
+-                                                            covx tTmp.txt,bt4.val,0,0
+-                                                            // save action
 -                                                            spstr strCommand.txt,va4.txt,",",29
-+                                            spstr strCommand.txt,va4.txt,",",28
-                                                             //enable
-                                                             vis bt4,1
+-                                                            //enable
+-                                                            vis bt4,1
 -                                                            }              //bt5
 -                                                            spstr strCommand.txt,tTmp.txt,",",30
-+                                        }
-+                                        //bt5
-+                                        spstr strCommand.txt,tTmp.txt,",",29
-                                                             if(tTmp.txt!="")
+-                                                            if(tTmp.txt!="")
++                                            tmFlash.en=1
++                                        }else
                                                              {
-                                                                 // set icon
-                                                                 covx tTmp.txt,sys0,0,0
-                                                                 substr pageIcons.tIcons.txt,bt5.txt,sys0,1
-                                                                 // set text color on active state
+-                                                                // set icon
+-                                                                covx tTmp.txt,sys0,0,0
+-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
+-                                                                // set text color on active state
 -                                                                spstr strCommand.txt,tTmp.txt,",",31
-+                                            spstr strCommand.txt,tTmp.txt,",",30
-                                                                 covx tTmp.txt,bt5.pco2,0,0
-                                                                 // set state
+-                                                                covx tTmp.txt,bt5.pco2,0,0
+-                                                                // set state
 -                                                                spstr strCommand.txt,tTmp.txt,",",32
-+                                            spstr strCommand.txt,tTmp.txt,",",31
-                                                                 covx tTmp.txt,bt5.val,0,0
-                                                                 // save action
+-                                                                covx tTmp.txt,bt5.val,0,0
+-                                                                // save action
 -                                                                spstr strCommand.txt,va5.txt,",",33
-+                                            spstr strCommand.txt,va5.txt,",",32
-                                                                 //enable
-                                                                 vis bt5,1
+-                                                                //enable
+-                                                                vis bt5,1
 -                                                                }              //bt6
 -                                                                spstr strCommand.txt,tTmp.txt,",",34
+-                                                                if(tTmp.txt!="")
++                                            tmFlash.en=0
 +                                        }
-+                                        //bt6
-+                                        spstr strCommand.txt,tTmp.txt,",",33
-                                                                 if(tTmp.txt!="")
++                                    }
++                                    if(tInstruction.txt=="time")
                                                                  {
-                                                                     // set icon
-                                                                     covx tTmp.txt,sys0,0,0
-                                                                     substr pageIcons.tIcons.txt,bt6.txt,sys0,1
-                                                                     // set text color on active state
+-                                                                    // set icon
+-                                                                    covx tTmp.txt,sys0,0,0
+-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
+-                                                                    // set text color on active state
 -                                                                    spstr strCommand.txt,tTmp.txt,",",35
-+                                            spstr strCommand.txt,tTmp.txt,",",34
-                                                                     covx tTmp.txt,bt6.pco2,0,0
-                                                                     // set state
+-                                                                    covx tTmp.txt,bt6.pco2,0,0
+-                                                                    // set state
 -                                                                    spstr strCommand.txt,tTmp.txt,",",36
-+                                            spstr strCommand.txt,tTmp.txt,",",35
-                                                                     covx tTmp.txt,bt6.val,0,0
-                                                                     // save action
+-                                                                    covx tTmp.txt,bt6.val,0,0
+-                                                                    // save action
 -                                                                    spstr strCommand.txt,va6.txt,",",37
-+                                            spstr strCommand.txt,va6.txt,",",36
-                                                                     //enable
-                                                                     vis bt6,1
+-                                                                    //enable
+-                                                                    vis bt6,1
 -                                                                    }              //bt7
 -                                                                    spstr strCommand.txt,tTmp.txt,",",38
-+                                        }
-+                                        //bt7
-+                                        spstr strCommand.txt,tTmp.txt,",",37
-                                                                     if(tTmp.txt!="")
-                                                                     {
-                                                                         // set icon
-                                                                         covx tTmp.txt,sys0,0,0
-                                                                         substr pageIcons.tIcons.txt,bt7.txt,sys0,1
-                                                                         // set text color on active state
--                                                                        spstr strCommand.txt,tTmp.txt,",",39
-+                                            spstr strCommand.txt,tTmp.txt,",",38
-                                                                         covx tTmp.txt,bt7.pco2,0,0
-                                                                         // set state
--                                                                        spstr strCommand.txt,tTmp.txt,",",40
-+                                            spstr strCommand.txt,tTmp.txt,",",39
-                                                                         covx tTmp.txt,bt7.val,0,0
-                                                                         // save action
--                                                                        spstr strCommand.txt,va7.txt,",",41
-+                                            spstr strCommand.txt,va7.txt,",",40
-                                                                         //enable
-                                                                         vis bt7,1
--                                                                        }              //bt8
--                                                                        spstr strCommand.txt,tTmp.txt,",",42
-+                                        }
-+                                        //bt8
-+                                        spstr strCommand.txt,tTmp.txt,",",41
-                                                                         if(tTmp.txt!="")
-                                                                         {
-                                                                             // set icon
-                                                                             covx tTmp.txt,sys0,0,0
-                                                                             substr pageIcons.tIcons.txt,bt8.txt,sys0,1
-                                                                             // set text color on active state
--                                                                            spstr strCommand.txt,tTmp.txt,",",43
-+                                            spstr strCommand.txt,tTmp.txt,",",42
-                                                                             covx tTmp.txt,bt8.pco2,0,0
-                                                                             // set state
--                                                                            spstr strCommand.txt,tTmp.txt,",",44
-+                                            spstr strCommand.txt,tTmp.txt,",",43
-                                                                             covx tTmp.txt,bt8.val,0,0
-                                                                             // save action
--                                                                            spstr strCommand.txt,va8.txt,",",45
-+                                            spstr strCommand.txt,va8.txt,",",44
-                                                                             //enable
-                                                                             vis bt8,1
-                                                                         }
-                                                                     }
-+                                    if(tInstruction.txt=="time")
-+                                    {
+-                                                                    if(tTmp.txt!="")
 +                                        // get set time to global variable
 +                                        spstr strCommand.txt,pageIcons.vaTime.txt,",",1
 +                                    }
 +                                    if(tInstruction.txt=="date")
-+                                    {
+                                                                     {
+-                                                                        // set icon
+-                                                                        covx tTmp.txt,sys0,0,0
+-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
+-                                                                        // set text color on active state
+-                                                                        spstr strCommand.txt,tTmp.txt,",",39
+-                                                                        covx tTmp.txt,bt7.pco2,0,0
+-                                                                        // set state
+-                                                                        spstr strCommand.txt,tTmp.txt,",",40
+-                                                                        covx tTmp.txt,bt7.val,0,0
+-                                                                        // save action
+-                                                                        spstr strCommand.txt,va7.txt,",",41
+-                                                                        //enable
+-                                                                        vis bt7,1
+-                                                                        }              //bt8
+-                                                                        spstr strCommand.txt,tTmp.txt,",",42
+-                                                                        if(tTmp.txt!="")
 +                                        // get set date to global variable
 +                                        spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
 +                                    }
 +                                    if(tInstruction.txt=="dimmode")
-+                                    {
+                                                                         {
+-                                                                            // set icon
+-                                                                            covx tTmp.txt,sys0,0,0
+-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
+-                                                                            // set text color on active state
+-                                                                            spstr strCommand.txt,tTmp.txt,",",43
+-                                                                            covx tTmp.txt,bt8.pco2,0,0
+-                                                                            // set state
+-                                                                            spstr strCommand.txt,tTmp.txt,",",44
+-                                                                            covx tTmp.txt,bt8.val,0,0
+-                                                                            // save action
+-                                                                            spstr strCommand.txt,va8.txt,",",45
+-                                                                            //enable
+-                                                                            vis bt8,1
 +                                        // get value
 +                                        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
 +                                        covx tTmp.txt,sleepTimeout,0,0
-+                                    }
+                                                                     }
                                                                      if(tInstruction.txt=="pageType")
                                                                      {
-                                                                         //command format pageType,specialPageName
-@@ -911,28 +909,6 @@
+@@ -911,28 +831,6 @@
                                                                              page cardAlarm
                                                                          }
                                                                      }
diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt
index 75f1d653..5dd71f23 100644
--- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt
@@ -340,7 +340,12 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardAlarm,bPrev"
+            tSend.txt="event,buttonPress2,cardAlarm,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }
+            tSend.txt+="bPrev"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1043,48 +1048,75 @@ Timer tmSerial
                                     {
                                         //entn
                                         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 bPrev,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
+                                        spstr strCommand.txt,tTmp.txt,",",11
                                         covx tTmp.txt,sys0,0,0
                                         substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //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 +1131,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
diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt
index 5bd45807..3d67bd4b 100644
--- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt
@@ -1431,7 +1431,12 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardEntities,bPrev"
+            tSend.txt="event,buttonPress2,cardEntities,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }
+            tSend.txt+="bPrev"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt
index 46b726c9..dedd15e8 100644
--- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt
@@ -20,28 +20,307 @@ Page cardGrid
     
     Events
         Preinitialize Event
-            //wup=cardEntities
-            //remove background & activate reparse mode
-            vis p0,0
-            recmod=1
-            bauds=115200
-            //debug stuff
-            vis tTmp,0
-            vis tSend,0
-            vis tInstruction,0
-            vis tId,0
-            vis bEntity1,0
-            vis bEntity2,0
-            vis bEntity3,0
-            vis bEntity4,0
-            vis bEntity5,0
-            vis bEntity6,0
-            vis tEntity1,0
-            vis tEntity2,0
-            vis tEntity3,0
-            vis tEntity4,0
-            vis tEntity5,0
-            vis tEntity6,0
+            // 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
+                        }
+                        //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
+                            ucopy payloadLength,2,2,0
+                            // 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)
+                            {
+                                // calculate crc
+                                crcrest 1,0xFFFF
+                                // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
+                                //crcputu 3,u[2]
+                                // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
+                                crcputu 0,payloadLength-1
+                                // get recived crc to be able to compare it
+                                ucopy recvCrc,payloadLength-1,2,0
+                                // compare crc with recived value
+                                if(crcval==recvCrc)
+                                {
+                                    // crc is okay
+                                    // here is the location where acual code should be
+                                    // 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
+                                    if(tInstruction.txt=="entityUpd")
+                                    {
+                                        // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
+                                        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 bPrev,1
+                                            bNext.txt=""
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type1.txt,",",3
+                                        // get internal name
+                                        spstr strCommand.txt,entn1.txt,",",4
+                                        if(type1.txt=="delete"||type1.txt=="")
+                                        {
+                                            vis tEntity1,0
+                                            vis bEntity1,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",5
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
+                                            vis bEntity1,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity1.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            vis tEntity1,1
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type2.txt,",",9
+                                        // get internal name
+                                        spstr strCommand.txt,entn2.txt,",",10
+                                        if(type2.txt=="delete"||type2.txt=="")
+                                        {
+                                            vis tEntity2,0
+                                            vis bEntity2,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",11
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
+                                            vis bEntity2,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity2.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            vis tEntity2,1
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type3.txt,",",15
+                                        // get internal name
+                                        spstr strCommand.txt,entn3.txt,",",16
+                                        if(type3.txt=="delete"||type3.txt=="")
+                                        {
+                                            vis tEntity3,0
+                                            vis bEntity3,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",17
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
+                                            vis bEntity3,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity3.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            vis tEntity3,1
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type4.txt,",",21
+                                        // get internal name
+                                        spstr strCommand.txt,entn4.txt,",",22
+                                        if(type4.txt=="delete"||type4.txt=="")
+                                        {
+                                            vis tEntity4,0
+                                            vis bEntity4,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",23
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
+                                            vis bEntity4,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity4.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            vis tEntity4,1
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type5.txt,",",27
+                                        // get internal name
+                                        spstr strCommand.txt,entn5.txt,",",28
+                                        if(type5.txt=="delete"||type5.txt=="")
+                                        {
+                                            vis tEntity5,0
+                                            vis bEntity5,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",29
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
+                                            vis bEntity5,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity5.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            vis tEntity5,1
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type6.txt,",",33
+                                        // get internal name
+                                        spstr strCommand.txt,entn6.txt,",",34
+                                        if(type6.txt=="delete"||type6.txt=="")
+                                        {
+                                            vis tEntity6,0
+                                            vis bEntity6,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",35
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
+                                            vis bEntity6,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",36
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity6.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity6.txt,",",37
+                                            vis tEntity6,1
+                                        }
+                                    }
+                                    if(tInstruction.txt=="pageType")
+                                    {
+                                        //command format pageType,specialPageName
+                                        //write name of speical page to tId
+                                        spstr strCommand.txt,tId.txt,",",1
+                                        //save second arg if there's one
+                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        //save third arg if there's one
+                                        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=="cardGrid")
+                                        {
+                                            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=="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
+                                }
+                            }
+                        }
+                    }
+                    // next character
+                    bufferPos++
+                }
+            }
         
 Variable (string) strCommand
     Attributes
@@ -515,7 +794,12 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardGrid,bPrev"
+            tSend.txt="event,buttonPress2,cardGrid,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }
+            tSend.txt+="bPrev"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt
index 84afc066..982fbf9a 100644
--- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt
@@ -856,7 +856,12 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardMedia,bPrev"
+            tSend.txt="event,buttonPress2,cardMedia,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }
+            tSend.txt+="bPrev"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -923,28 +928,55 @@ Timer tmSerial
                                     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 bPrev,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"|",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",3
+                                        spstr strCommand.txt,tTmp.txt,"|",4
                                         covx tTmp.txt,sys0,0,0
                                         substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //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
+                                        spstr strCommand.txt,tTmp.txt,"|",8
                                         covx tTmp.txt,sys0,0,0
                                         substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                         //speaker current
-                                        spstr strCommand.txt,tSpeaker.txt,"|",8
+                                        spstr strCommand.txt,tSpeaker.txt,"|",9
                                         if(tSpeaker.txt!="")
                                         {
                                             tSpeaker.pco=1374
@@ -953,14 +985,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
diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt
index 66ed5c4d..e5939324 100644
--- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt
@@ -683,7 +683,12 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardThermo,bPrev"
+            tSend.txt="event,buttonPress2,cardThermo,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }
+            tSend.txt+="bPrev"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1191,198 +1196,114 @@ Timer tmSerial
                                     spstr strCommand.txt,tInstruction.txt,",",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
+                                        //entn
                                         spstr strCommand.txt,entn.txt,",",1
-                                        //heading
-                                        spstr strCommand.txt,tHeading.txt,",",2
-                                        //currentTemp
-                                        spstr strCommand.txt,tTmp.txt,",",3
-                                        covx tTmp.txt,xTempCurr.val,0,0
-                                        //dstTemp
-                                        spstr strCommand.txt,tTmp.txt,",",4
-                                        covx tTmp.txt,xTempDest.val,0,0
-                                        //status
-                                        spstr strCommand.txt,tStatus.txt,",",5
-                                        //minTemp
-                                        spstr strCommand.txt,tTmp.txt,",",6
-                                        covx tTmp.txt,xTempMin.val,0,0
-                                        //maxTemp
-                                        spstr strCommand.txt,tTmp.txt,",",7
-                                        covx tTmp.txt,xTempMax.val,0,0
-                                        //tempStep
-                                        spstr strCommand.txt,tTmp.txt,",",8
-                                        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
-                                        //bt0
-                                        spstr strCommand.txt,tTmp.txt,",",9
-                                        if(tTmp.txt!="")
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,",",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
                                         {
-                                            // 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
-                                            covx tTmp.txt,bt0.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,bt0.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va0.txt,",",12
-                                            //enable
-                                            vis bt0,1
+                                            vis bPrev,0
                                         }
-                                        //bt1
+                                        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 bPrev,1
+                                            bNext.txt=""
+                                        }
+                                        //text arm1
+                                        spstr strCommand.txt,arm1.txt,",",3
+                                        if(arm1.txt!="")
+                                        {
+                                            vis arm1,1
+                                        }
+                                        //id arm1
+                                        spstr strCommand.txt,va1.txt,",",4
+                                        //text arm2
+                                        spstr strCommand.txt,arm2.txt,",",5
+                                        if(arm2.txt!="")
+                                        {
+                                            vis arm2,1
+                                        }
+                                        //id arm2
+                                        spstr strCommand.txt,va2.txt,",",6
+                                        //text arm3
+                                        spstr strCommand.txt,arm3.txt,",",7
+                                        if(arm3.txt!="")
+                                        {
+                                            vis arm3,1
+                                        }
+                                        //id arm3
+                                        spstr strCommand.txt,va3.txt,",",8
+                                        //text arm4
+                                        spstr strCommand.txt,arm4.txt,",",9
+                                        if(arm4.txt!="")
+                                        {
+                                            vis arm4,1
+                                        }
+                                        //id arm4
+                                        spstr strCommand.txt,va4.txt,",",10
+                                        //icon
+                                        spstr strCommand.txt,tTmp.txt,",",11
+                                        covx tTmp.txt,sys0,0,0
+                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        //icon color
+                                        spstr strCommand.txt,tTmp.txt,",",12
+                                        covx tTmp.txt,sys0,0,0
+                                        tIcon.pco=sys0
+                                        //numpad status
                                         spstr strCommand.txt,tTmp.txt,",",13
-                                        if(tTmp.txt!="")
+                                        if(tTmp.txt!="disable")
                                         {
-                                            // 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
-                                            covx tTmp.txt,bt1.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",15
-                                            covx tTmp.txt,bt1.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va1.txt,",",16
-                                            //enable
-                                            vis bt1,1
+                                            vis b0,1
+                                            vis b1,1
+                                            vis b2,1
+                                            vis b3,1
+                                            vis b4,1
+                                            vis b5,1
+                                            vis b6,1
+                                            vis b7,1
+                                            vis b8,1
+                                            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
                                         }
-                                        //bt2
-                                        spstr strCommand.txt,tTmp.txt,",",17
-                                        if(tTmp.txt!="")
+                                        //flashing status
+                                        spstr strCommand.txt,tTmp.txt,",",14
+                                        if(tTmp.txt=="enable")
                                         {
-                                            // 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
-                                            covx tTmp.txt,bt2.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",19
-                                            covx tTmp.txt,bt2.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va2.txt,",",20
-                                            //enable
-                                            vis bt2,1
-                                        }
-                                        //bt3
-                                        spstr strCommand.txt,tTmp.txt,",",21
-                                        if(tTmp.txt!="")
+                                            tmFlash.en=1
+                                        }else
                                         {
-                                            // 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
-                                            covx tTmp.txt,bt3.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,bt3.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va3.txt,",",24
-                                            //enable
-                                            vis bt3,1
-                                        }
-                                        //bt4
-                                        spstr strCommand.txt,tTmp.txt,",",25
-                                        if(tTmp.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
-                                            covx tTmp.txt,bt4.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",27
-                                            covx tTmp.txt,bt4.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va4.txt,",",28
-                                            //enable
-                                            vis bt4,1
-                                        }
-                                        //bt5
-                                        spstr strCommand.txt,tTmp.txt,",",29
-                                        if(tTmp.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
-                                            covx tTmp.txt,bt5.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",31
-                                            covx tTmp.txt,bt5.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va5.txt,",",32
-                                            //enable
-                                            vis bt5,1
-                                        }
-                                        //bt6
-                                        spstr strCommand.txt,tTmp.txt,",",33
-                                        if(tTmp.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
-                                            covx tTmp.txt,bt6.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",35
-                                            covx tTmp.txt,bt6.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va6.txt,",",36
-                                            //enable
-                                            vis bt6,1
-                                        }
-                                        //bt7
-                                        spstr strCommand.txt,tTmp.txt,",",37
-                                        if(tTmp.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
-                                            covx tTmp.txt,bt7.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",39
-                                            covx tTmp.txt,bt7.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va7.txt,",",40
-                                            //enable
-                                            vis bt7,1
-                                        }
-                                        //bt8
-                                        spstr strCommand.txt,tTmp.txt,",",41
-                                        if(tTmp.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
-                                            covx tTmp.txt,bt8.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",43
-                                            covx tTmp.txt,bt8.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va8.txt,",",44
-                                            //enable
-                                            vis bt8,1
+                                            tmFlash.en=0
                                         }
                                     }
                                     if(tInstruction.txt=="time")
@@ -1400,6 +1321,7 @@ Timer tmSerial
                                         // get value
                                         spstr strCommand.txt,tTmp.txt,",",1
                                         covx tTmp.txt,dimValue,0,0
+                                        dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
index 51d12bd6..e19876c8 100644
--- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
+++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
@@ -22,10 +22,6 @@ pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
-cardMedia
-	30   Component(s)
-	300  Line(s) of event code
-	154  Unique line(s) of event code
 screensaver
 	29   Component(s)
 	182  Line(s) of event code
@@ -34,29 +30,33 @@ popupShutter
 	19   Component(s)
 	178  Line(s) of event code
 	101  Unique line(s) of event code
+cardMedia
+	30   Component(s)
+	331  Line(s) of event code
+	169  Unique line(s) of event code
 cardAlarm
 	35   Component(s)
-	298  Line(s) of event code
-	187  Unique line(s) of event code
-cardGrid
-	39   Component(s)
-	397  Line(s) of event code
-	233  Unique line(s) of event code
+	343  Line(s) of event code
+	214  Unique line(s) of event code
 popupLight
 	27   Component(s)
 	322  Line(s) of event code
 	173  Unique line(s) of event code
-cardEntities
-	62   Component(s)
-	939  Line(s) of event code
-	397  Unique line(s) of event code
 cardThermo
 	41   Component(s)
-	427  Line(s) of event code
-	232  Unique line(s) of event code
+	398  Line(s) of event code
+	205  Unique line(s) of event code
+cardEntities
+	62   Component(s)
+	944  Line(s) of event code
+	400  Unique line(s) of event code
+cardGrid
+	39   Component(s)
+	623  Line(s) of event code
+	229  Unique line(s) of event code
 
 Total
 	13   Page(s)
 	351  Component(s)
-	3443 Line(s) of event code
-	922  Unique line(s) of event code
+	3721 Line(s) of event code
+	862  Unique line(s) of event code
diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt
index 8d9e263f..78570b5d 100644
--- a/HMI/US/landscape/n2t-out/cardAlarm.txt
+++ b/HMI/US/landscape/n2t-out/cardAlarm.txt
@@ -171,7 +171,12 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardAlarm,bPrev"
+            tSend.txt="event,buttonPress2,cardAlarm,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }
+            tSend.txt+="bPrev"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -513,48 +518,75 @@ Timer tmSerial
                                     {
                                         //entn
                                         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 bPrev,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
+                                        spstr strCommand.txt,tTmp.txt,",",11
                                         covx tTmp.txt,sys0,0,0
                                         substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //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 +601,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
diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt
index 5c442b47..663a3a14 100644
--- a/HMI/US/landscape/n2t-out/cardEntities.txt
+++ b/HMI/US/landscape/n2t-out/cardEntities.txt
@@ -714,7 +714,12 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardEntities,bPrev"
+            tSend.txt="event,buttonPress2,cardEntities,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }
+            tSend.txt+="bPrev"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt
index 736e5972..742991f5 100644
--- a/HMI/US/landscape/n2t-out/cardGrid.txt
+++ b/HMI/US/landscape/n2t-out/cardGrid.txt
@@ -12,28 +12,307 @@ Page cardGrid
     
     Events
         Preinitialize Event
-            //wup=cardEntities
-            //remove background & activate reparse mode
-            vis p0,0
-            recmod=1
-            bauds=115200
-            //debug stuff
-            vis tTmp,0
-            vis tSend,0
-            vis tInstruction,0
-            vis tId,0
-            vis bEntity1,0
-            vis bEntity2,0
-            vis bEntity3,0
-            vis bEntity4,0
-            vis bEntity5,0
-            vis bEntity6,0
-            vis tEntity1,0
-            vis tEntity2,0
-            vis tEntity3,0
-            vis tEntity4,0
-            vis tEntity5,0
-            vis tEntity6,0
+            // 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
+                        }
+                        //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
+                            ucopy payloadLength,2,2,0
+                            // 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)
+                            {
+                                // calculate crc
+                                crcrest 1,0xFFFF
+                                // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
+                                //crcputu 3,u[2]
+                                // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
+                                crcputu 0,payloadLength-1
+                                // get recived crc to be able to compare it
+                                ucopy recvCrc,payloadLength-1,2,0
+                                // compare crc with recived value
+                                if(crcval==recvCrc)
+                                {
+                                    // crc is okay
+                                    // here is the location where acual code should be
+                                    // 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
+                                    if(tInstruction.txt=="entityUpd")
+                                    {
+                                        // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
+                                        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 bPrev,1
+                                            bNext.txt=""
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type1.txt,",",3
+                                        // get internal name
+                                        spstr strCommand.txt,entn1.txt,",",4
+                                        if(type1.txt=="delete"||type1.txt=="")
+                                        {
+                                            vis tEntity1,0
+                                            vis bEntity1,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",5
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
+                                            vis bEntity1,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",6
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity1.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity1.txt,",",7
+                                            vis tEntity1,1
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type2.txt,",",9
+                                        // get internal name
+                                        spstr strCommand.txt,entn2.txt,",",10
+                                        if(type2.txt=="delete"||type2.txt=="")
+                                        {
+                                            vis tEntity2,0
+                                            vis bEntity2,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",11
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
+                                            vis bEntity2,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",12
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity2.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity2.txt,",",13
+                                            vis tEntity2,1
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type3.txt,",",15
+                                        // get internal name
+                                        spstr strCommand.txt,entn3.txt,",",16
+                                        if(type3.txt=="delete"||type3.txt=="")
+                                        {
+                                            vis tEntity3,0
+                                            vis bEntity3,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",17
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
+                                            vis bEntity3,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",18
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity3.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity3.txt,",",19
+                                            vis tEntity3,1
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type4.txt,",",21
+                                        // get internal name
+                                        spstr strCommand.txt,entn4.txt,",",22
+                                        if(type4.txt=="delete"||type4.txt=="")
+                                        {
+                                            vis tEntity4,0
+                                            vis bEntity4,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",23
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
+                                            vis bEntity4,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",24
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity4.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity4.txt,",",25
+                                            vis tEntity4,1
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type5.txt,",",27
+                                        // get internal name
+                                        spstr strCommand.txt,entn5.txt,",",28
+                                        if(type5.txt=="delete"||type5.txt=="")
+                                        {
+                                            vis tEntity5,0
+                                            vis bEntity5,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",29
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
+                                            vis bEntity5,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity5.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            vis tEntity5,1
+                                        }
+                                        // get Type
+                                        spstr strCommand.txt,type6.txt,",",33
+                                        // get internal name
+                                        spstr strCommand.txt,entn6.txt,",",34
+                                        if(type6.txt=="delete"||type6.txt=="")
+                                        {
+                                            vis tEntity6,0
+                                            vis bEntity6,0
+                                        }else
+                                        {
+                                            // change icon
+                                            spstr strCommand.txt,tTmp.txt,",",35
+                                            covx tTmp.txt,sys0,0,0
+                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
+                                            vis bEntity6,1
+                                            // change icon color
+                                            spstr strCommand.txt,tTmp.txt,",",36
+                                            covx tTmp.txt,sys0,0,0
+                                            bEntity6.pco=sys0
+                                            // set name
+                                            spstr strCommand.txt,tEntity6.txt,",",37
+                                            vis tEntity6,1
+                                        }
+                                    }
+                                    if(tInstruction.txt=="pageType")
+                                    {
+                                        //command format pageType,specialPageName
+                                        //write name of speical page to tId
+                                        spstr strCommand.txt,tId.txt,",",1
+                                        //save second arg if there's one
+                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        //save third arg if there's one
+                                        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=="cardGrid")
+                                        {
+                                            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=="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
+                                }
+                            }
+                        }
+                    }
+                    // next character
+                    bufferPos++
+                }
+            }
         
 Variable (string) strCommand
     Attributes
@@ -242,7 +521,12 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardGrid,bPrev"
+            tSend.txt="event,buttonPress2,cardGrid,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }
+            tSend.txt+="bPrev"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt
index ba1ea1b7..91e9970b 100644
--- a/HMI/US/landscape/n2t-out/cardMedia.txt
+++ b/HMI/US/landscape/n2t-out/cardMedia.txt
@@ -435,7 +435,12 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardMedia,bPrev"
+            tSend.txt="event,buttonPress2,cardMedia,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }
+            tSend.txt+="bPrev"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -501,28 +506,55 @@ Timer tmSerial
                                     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 bPrev,1
+                                            bNext.txt=""
+                                        }
+                                        //entity name
+                                        spstr strCommand.txt,entn.txt,"|",3
                                         //icon
-                                        spstr strCommand.txt,tTmp.txt,"|",3
+                                        spstr strCommand.txt,tTmp.txt,"|",4
                                         covx tTmp.txt,sys0,0,0
                                         substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                         //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
+                                        spstr strCommand.txt,tTmp.txt,"|",8
                                         covx tTmp.txt,sys0,0,0
                                         substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                         //speaker current
-                                        spstr strCommand.txt,tSpeaker.txt,"|",8
+                                        spstr strCommand.txt,tSpeaker.txt,"|",9
                                         if(tSpeaker.txt!="")
                                         {
                                             tSpeaker.pco=1374
@@ -531,14 +563,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
diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt
index 1a64d489..782726ad 100644
--- a/HMI/US/landscape/n2t-out/cardThermo.txt
+++ b/HMI/US/landscape/n2t-out/cardThermo.txt
@@ -329,7 +329,12 @@ Button bPrev
     
     Events
         Touch Press Event
-            tSend.txt="event,buttonPress2,cardThermo,bPrev"
+            tSend.txt="event,buttonPress2,cardThermo,"
+            if(bPrev.txt=="")
+            {
+                tSend.txt+="bUp"
+            }
+            tSend.txt+="bPrev"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -638,198 +643,114 @@ Timer tmSerial
                                     spstr strCommand.txt,tInstruction.txt,",",0
                                     if(tInstruction.txt=="entityUpd")
                                     {
-                                        //entity name
+                                        //entn
                                         spstr strCommand.txt,entn.txt,",",1
-                                        //heading
-                                        spstr strCommand.txt,tHeading.txt,",",2
-                                        //currentTemp
-                                        spstr strCommand.txt,tTmp.txt,",",3
-                                        covx tTmp.txt,xTempCurr.val,0,0
-                                        //dstTemp
-                                        spstr strCommand.txt,tTmp.txt,",",4
-                                        covx tTmp.txt,xTempDest.val,0,0
-                                        //status
-                                        spstr strCommand.txt,tStatus.txt,",",5
-                                        //minTemp
-                                        spstr strCommand.txt,tTmp.txt,",",6
-                                        covx tTmp.txt,xTempMin.val,0,0
-                                        //maxTemp
-                                        spstr strCommand.txt,tTmp.txt,",",7
-                                        covx tTmp.txt,xTempMax.val,0,0
-                                        //tempStep
-                                        spstr strCommand.txt,tTmp.txt,",",8
-                                        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
-                                        //bt0
-                                        spstr strCommand.txt,tTmp.txt,",",9
-                                        if(tTmp.txt!="")
+                                        // navigation icons
+                                        spstr strCommand.txt,tId.txt,",",2
+                                        spstr tId.txt,tTmp.txt,"|",0
+                                        if(tTmp.txt=="0")
                                         {
-                                            // 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
-                                            covx tTmp.txt,bt0.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",11
-                                            covx tTmp.txt,bt0.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va0.txt,",",12
-                                            //enable
-                                            vis bt0,1
+                                            vis bPrev,0
                                         }
-                                        //bt1
+                                        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 bPrev,1
+                                            bNext.txt=""
+                                        }
+                                        //text arm1
+                                        spstr strCommand.txt,arm1.txt,",",3
+                                        if(arm1.txt!="")
+                                        {
+                                            vis arm1,1
+                                        }
+                                        //id arm1
+                                        spstr strCommand.txt,va1.txt,",",4
+                                        //text arm2
+                                        spstr strCommand.txt,arm2.txt,",",5
+                                        if(arm2.txt!="")
+                                        {
+                                            vis arm2,1
+                                        }
+                                        //id arm2
+                                        spstr strCommand.txt,va2.txt,",",6
+                                        //text arm3
+                                        spstr strCommand.txt,arm3.txt,",",7
+                                        if(arm3.txt!="")
+                                        {
+                                            vis arm3,1
+                                        }
+                                        //id arm3
+                                        spstr strCommand.txt,va3.txt,",",8
+                                        //text arm4
+                                        spstr strCommand.txt,arm4.txt,",",9
+                                        if(arm4.txt!="")
+                                        {
+                                            vis arm4,1
+                                        }
+                                        //id arm4
+                                        spstr strCommand.txt,va4.txt,",",10
+                                        //icon
+                                        spstr strCommand.txt,tTmp.txt,",",11
+                                        covx tTmp.txt,sys0,0,0
+                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+                                        //icon color
+                                        spstr strCommand.txt,tTmp.txt,",",12
+                                        covx tTmp.txt,sys0,0,0
+                                        tIcon.pco=sys0
+                                        //numpad status
                                         spstr strCommand.txt,tTmp.txt,",",13
-                                        if(tTmp.txt!="")
+                                        if(tTmp.txt!="disable")
                                         {
-                                            // 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
-                                            covx tTmp.txt,bt1.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",15
-                                            covx tTmp.txt,bt1.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va1.txt,",",16
-                                            //enable
-                                            vis bt1,1
+                                            vis b0,1
+                                            vis b1,1
+                                            vis b2,1
+                                            vis b3,1
+                                            vis b4,1
+                                            vis b5,1
+                                            vis b6,1
+                                            vis b7,1
+                                            vis b8,1
+                                            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
                                         }
-                                        //bt2
-                                        spstr strCommand.txt,tTmp.txt,",",17
-                                        if(tTmp.txt!="")
+                                        //flashing status
+                                        spstr strCommand.txt,tTmp.txt,",",14
+                                        if(tTmp.txt=="enable")
                                         {
-                                            // 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
-                                            covx tTmp.txt,bt2.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",19
-                                            covx tTmp.txt,bt2.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va2.txt,",",20
-                                            //enable
-                                            vis bt2,1
-                                        }
-                                        //bt3
-                                        spstr strCommand.txt,tTmp.txt,",",21
-                                        if(tTmp.txt!="")
+                                            tmFlash.en=1
+                                        }else
                                         {
-                                            // 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
-                                            covx tTmp.txt,bt3.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",23
-                                            covx tTmp.txt,bt3.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va3.txt,",",24
-                                            //enable
-                                            vis bt3,1
-                                        }
-                                        //bt4
-                                        spstr strCommand.txt,tTmp.txt,",",25
-                                        if(tTmp.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
-                                            covx tTmp.txt,bt4.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",27
-                                            covx tTmp.txt,bt4.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va4.txt,",",28
-                                            //enable
-                                            vis bt4,1
-                                        }
-                                        //bt5
-                                        spstr strCommand.txt,tTmp.txt,",",29
-                                        if(tTmp.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
-                                            covx tTmp.txt,bt5.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",31
-                                            covx tTmp.txt,bt5.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va5.txt,",",32
-                                            //enable
-                                            vis bt5,1
-                                        }
-                                        //bt6
-                                        spstr strCommand.txt,tTmp.txt,",",33
-                                        if(tTmp.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
-                                            covx tTmp.txt,bt6.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",35
-                                            covx tTmp.txt,bt6.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va6.txt,",",36
-                                            //enable
-                                            vis bt6,1
-                                        }
-                                        //bt7
-                                        spstr strCommand.txt,tTmp.txt,",",37
-                                        if(tTmp.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
-                                            covx tTmp.txt,bt7.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",39
-                                            covx tTmp.txt,bt7.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va7.txt,",",40
-                                            //enable
-                                            vis bt7,1
-                                        }
-                                        //bt8
-                                        spstr strCommand.txt,tTmp.txt,",",41
-                                        if(tTmp.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
-                                            covx tTmp.txt,bt8.pco2,0,0
-                                            // set state
-                                            spstr strCommand.txt,tTmp.txt,",",43
-                                            covx tTmp.txt,bt8.val,0,0
-                                            // save action
-                                            spstr strCommand.txt,va8.txt,",",44
-                                            //enable
-                                            vis bt8,1
+                                            tmFlash.en=0
                                         }
                                     }
                                     if(tInstruction.txt=="time")
@@ -847,6 +768,7 @@ Timer tmSerial
                                         // get value
                                         spstr strCommand.txt,tTmp.txt,",",1
                                         covx tTmp.txt,dimValue,0,0
+                                        dim=dimValue
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {
diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt
index cb87b73e..7f2dcd21 100644
--- a/HMI/US/portrait/diff-eu-version.txt
+++ b/HMI/US/portrait/diff-eu-version.txt
@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-03-31 18:39:21.243969492 +0000
+--- HMI/n2t-out/Program.s.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-03-31 18:53:36.313575206 +0000
 @@ -11,6 +11,6 @@
      // dim value
      int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
 +    //lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
---- HMI/n2t-out/cardAlarm.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/portrait/n2t-out/cardAlarm.txt	2022-03-31 18:39:21.243969492 +0000
+--- HMI/n2t-out/cardAlarm.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt	2022-03-31 18:53:36.313575206 +0000
 @@ -17,6 +17,7 @@
              vis tInstruction,0
              vis tTmp,0
@@ -148,8 +148,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
                                          {
                                              tmFlash.en=1
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-03-31 18:39:21.243969492 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-03-31 18:53:36.313575206 +0000
 @@ -62,6 +62,26 @@
              vis bText4,0
              vis hSlider4,0
@@ -966,8 +966,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
                                      if(tInstruction.txt=="pageType")
                                      {
 diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
---- HMI/n2t-out/cardGrid.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/portrait/n2t-out/cardGrid.txt	2022-03-31 18:39:21.243969492 +0000
+--- HMI/n2t-out/cardGrid.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt	2022-03-31 18:53:36.313575206 +0000
 @@ -242,12 +242,7 @@
      
      Events
@@ -1017,8 +1017,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
                                          spstr strCommand.txt,type1.txt,",",3
                                          // get internal name
 diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
---- HMI/n2t-out/cardMedia.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/portrait/n2t-out/cardMedia.txt	2022-03-31 18:39:21.243969492 +0000
+--- HMI/n2t-out/cardMedia.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt	2022-03-31 18:53:36.313575206 +0000
 @@ -435,12 +435,7 @@
      
      Events
@@ -1116,8 +1116,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
                                          {
                                              vis t5,0
 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
---- HMI/n2t-out/cardThermo.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/portrait/n2t-out/cardThermo.txt	2022-03-31 18:39:21.243969492 +0000
+--- HMI/n2t-out/cardThermo.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt	2022-03-31 18:53:36.313575206 +0000
 @@ -329,12 +329,7 @@
      
      Events
@@ -1460,8 +1460,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
                                                                      udelete payloadLength-1
                                                                      bufferPos=0
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-03-31 18:39:20.775930111 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-03-31 18:39:21.243969492 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-03-31 18:53:35.913570934 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-03-31 18:53:36.313575206 +0000
 @@ -142,7 +142,7 @@
          Disable release event after dragging: 0
          Send Component ID                   : disabled