Update nspanel-lovelace-ui.py

US-P Update

.github/CODEOWNERS

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

.github/auto_assign.yml

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

.github/workflows/nextion2text.yml

@@ -57,13 +57,19 @@ jobs:
         echo portrait
         python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/portrait/nspanel_US_P.HMI -o HMI/US/portrait/n2t-out
         diff -bur HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt
-  
+
+    - name: Run n2t US P DIFF DIFF
+      continue-on-error: true
+      run: |
+        diff -u HMI/US/portrait/diff-eu-version-known-good.txt HMI/US/portrait/diff-eu-version.txt | grep -E "^\+" > HMI/US/portrait/diff-filtered.txt
+
     - name: Run n2t US L DIFF
       continue-on-error: true
       run: |      
         echo landscape
         python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/landscape/nspanel_US_L.HMI -o HMI/US/landscape/n2t-out
         diff -bur HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt
+
         
     - name: Display txt files 
       continue-on-error: true

HMI/README.md

@@ -77,6 +77,10 @@ change the page type:
 
 `weatherUpdate~tMainIcon~tMainText~tForecast1~tF1Icon~tForecast1Val~tForecast2~tF2Icon~tForecast2Val~tForecast3~tF3Icon~tForecast3Val~tForecast4~tF4Icon~tForecast4Val~optionalLayoutIcon~optionalLayoutText`
 
+`color~background~time~timeAMPM~date~tMainIcon~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tF1Icon~tF2Icon~tF3Icon~tF4Icon~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMainIconAlt~tMainTextAlt~tMRIcon~tMR`
+
+`notify~heading~text`
+
 ### cardEntities Page
 
 The following message can be used to update the content on the cardEntities Page
@@ -95,6 +99,8 @@ The following message can be used to update the content on the cardEntities Page
 
 `~switch~switch.entityName~4~17299~Switch1~0`
 
+`~number~input_number.entityName~4~17299~Number123~value|min|max`
+
 ### popupLight Page
 
 `entityUpdateDetail~*iconId*~*iconColor*~*buttonState*~*sliderBrightnessPos*~*sliderColorTempPos*~*colorMode*`
@@ -105,7 +111,7 @@ The following message can be used to update the content on the cardEntities Page
 
 ### popupShutter Page
 
-`entityUpdateDetail~*ignored*~*sliderPos*`
+`entityUpdateDetail~*ignored*~*sliderPos*~2ndrow~textPosition`
 
 `entityUpdateDetail~1~77`
 

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

@@ -1,18 +1,16 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-04-08 20:30:53.290164509 +0000
+--- HMI/n2t-out/Program.s.txt	2022-05-07 15:37:51.728763344 +0000
-+++ HMI/US/landscape/n2t-out/Program.s.txt	2022-04-08 20:30:54.170202708 +0000
++++ HMI/US/landscape/n2t-out/Program.s.txt	2022-05-07 15:37:52.500817194 +0000
-@@ -11,6 +11,6 @@
+@@ -11,6 +11,4 @@
      // dim value
      int dimValue=40
      int dimValueNormal=100
 -    // fix touch offset
 -    lcd_dev fffb 0002 0000 0020
-+    // fix touch offset (Removed for US version)
-+    //lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-04-08 20:30:53.290164509 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-05-07 15:37:51.728763344 +0000
-+++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-04-08 20:30:54.174202881 +0000
++++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-05-07 15:37:52.500817194 +0000
 @@ -177,7 +177,7 @@
              recmod=1
              bauds=115200

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

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

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

@@ -41,6 +41,8 @@ Page cardAlarm
             vis b9,0
             vis b10,0
             vis tCode,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -54,7 +56,7 @@ Variable (string) entn
         ID            : 9
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) tSend
     Attributes
@@ -297,7 +299,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -351,7 +353,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -822,7 +824,7 @@ Button arm1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -876,7 +878,7 @@ Button arm3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -930,7 +932,7 @@ Button arm2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -984,7 +986,7 @@ Button arm4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1073,7 +1075,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //text arm1
@@ -1266,7 +1268,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -70,6 +70,8 @@ Page cardEntities
             vis bText4,0
             vis hSlider4,0
             vis nNum4,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -111,28 +113,28 @@ Variable (string) entn1
         ID            : 49
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         ID            : 50
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         ID            : 51
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         ID            : 52
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Number nNum1
     Attributes
@@ -696,7 +698,7 @@ Slider hSlider1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -739,7 +741,7 @@ Slider hSlider2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -782,7 +784,7 @@ Slider hSlider3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -825,7 +827,7 @@ Slider hSlider4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -872,7 +874,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -919,7 +921,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -966,7 +968,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1013,7 +1015,7 @@ Button bStop2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1060,7 +1062,7 @@ Button bDown2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1107,7 +1109,7 @@ Button bUp2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1154,7 +1156,7 @@ Button bStop3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1201,7 +1203,7 @@ Button bDown3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1248,7 +1250,7 @@ Button bUp3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1295,7 +1297,7 @@ Button bStop4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1342,7 +1344,7 @@ Button bDown4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1389,7 +1391,7 @@ Button bUp4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1443,7 +1445,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1490,7 +1492,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1537,7 +1539,7 @@ Button bText1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1584,7 +1586,7 @@ Button bText2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1631,7 +1633,7 @@ Button bText3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1678,7 +1680,7 @@ Button bText4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1723,7 +1725,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1768,7 +1770,7 @@ Dual-state Button btOnOff2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1813,7 +1815,7 @@ Dual-state Button btOnOff3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1858,7 +1860,7 @@ Dual-state Button btOnOff4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -2096,7 +2098,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -2698,7 +2700,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -42,6 +42,8 @@ Page cardGrid
             vis tEntity4,0
             vis tEntity5,0
             vis tEntity6,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -83,28 +85,28 @@ Variable (string) entn1
         ID            : 18
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         ID            : 19
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         ID            : 20
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         ID            : 21
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) type5
     Attributes
@@ -125,14 +127,14 @@ Variable (string) entn5
         ID            : 36
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) entn6
     Attributes
         ID            : 37
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tHeading
     Attributes
@@ -527,7 +529,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -574,7 +576,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -632,7 +634,7 @@ Button bEntity1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -690,7 +692,7 @@ Button bEntity2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -748,7 +750,7 @@ Button bEntity3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -806,7 +808,7 @@ Button bEntity4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -864,7 +866,7 @@ Button bEntity5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -922,7 +924,7 @@ Button bEntity6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1036,7 +1038,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -1276,7 +1278,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -26,28 +26,29 @@ Page cardMedia
             vis tTmp,0
             vis tId,0
             vis t5,0
-            //vis nPageDisp,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
         ID            : 7
         Scope         : local
         Text          : 
-        Max. Text Size: 500
+        Max. Text Size: 750
     
 Variable (string) entn
     Attributes
         ID            : 18
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) vaSpeakerList
     Attributes
         ID            : 27
         Scope         : local
         Text          : 
-        Max. Text Size: 200
+        Max. Text Size: 400
     
 Variable (int32) vaSpeakerPos
     Attributes
@@ -306,7 +307,7 @@ Text t2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -355,7 +356,7 @@ Text tPlayPause
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -404,7 +405,7 @@ Text t0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -484,7 +485,7 @@ Text t1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -534,7 +535,7 @@ Text t3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -613,7 +614,7 @@ Text tSpeaker
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -704,7 +705,7 @@ Text t5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -767,7 +768,7 @@ Slider hVolume
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -814,7 +815,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -868,7 +869,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -956,7 +957,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -1120,7 +1121,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -39,6 +39,8 @@ Page cardThermo
             vis bt6,0
             vis bt7,0
             vis bt8,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -52,7 +54,7 @@ Variable (string) entn
         ID            : 21
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) va0
     Attributes
@@ -533,7 +535,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -587,7 +589,7 @@ Button bDown
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -641,7 +643,7 @@ Button bUp
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -695,7 +697,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -744,7 +746,7 @@ Dual-state Button bt0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -793,7 +795,7 @@ Dual-state Button bt1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -842,7 +844,7 @@ Dual-state Button bt2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -891,7 +893,7 @@ Dual-state Button bt3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -940,7 +942,7 @@ Dual-state Button bt4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -989,7 +991,7 @@ Dual-state Button bt5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1038,7 +1040,7 @@ Dual-state Button bt6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1087,7 +1089,7 @@ Dual-state Button bt7
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1136,7 +1138,7 @@ Dual-state Button bt8
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1224,7 +1226,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -1502,7 +1504,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -10,49 +10,49 @@ pageTest
 	13   Component(s)
 	13   Line(s) of event code
 	13   Unique line(s) of event code
-screensaver
+popupLight
-	33   Component(s)
+	27   Component(s)
-	195  Line(s) of event code
+	341  Line(s) of event code
-	152  Unique line(s) of event code
+	185  Unique line(s) of event code
-cardAlarm
+popupShutter
-	35   Component(s)
+	20   Component(s)
-	343  Line(s) of event code
+	193  Line(s) of event code
-	213  Unique line(s) of event code
+	109  Unique line(s) of event code
 popupNotify
 	17   Component(s)
-	178  Line(s) of event code
+	196  Line(s) of event code
-	117  Unique line(s) of event code
+	123  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
-popupShutter
-	19   Component(s)
-	178  Line(s) of event code
-	101  Unique line(s) of event code
-cardMedia
-	30   Component(s)
-	329  Line(s) of event code
-	168  Unique line(s) of event code
-popupLight
-	27   Component(s)
-	320  Line(s) of event code
-	173  Unique line(s) of event code
-cardGrid
-	39   Component(s)
-	418  Line(s) of event code
-	243  Unique line(s) of event code
 cardThermo
 	41   Component(s)
-	442  Line(s) of event code
+	444  Line(s) of event code
+	249  Unique line(s) of event code
+cardMedia
+	30   Component(s)
+	331  Line(s) of event code
+	171  Unique line(s) of event code
+cardAlarm
+	35   Component(s)
+	345  Line(s) of event code
+	216  Unique line(s) of event code
+screensaver
+	35   Component(s)
+	292  Line(s) of event code
+	235  Unique line(s) of event code
+cardGrid
+	39   Component(s)
+	420  Line(s) of event code
 	246  Unique line(s) of event code
 cardEntities
 	62   Component(s)
-	964  Line(s) of event code
+	966  Line(s) of event code
-	409  Unique line(s) of event code
+	412  Unique line(s) of event code
 
 Total
 	12   Page(s)
-	341  Component(s)
+	344  Component(s)
-	3540 Line(s) of event code
+	3701 Line(s) of event code
-	946  Unique line(s) of event code
+	1024 Unique line(s) of event code

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

@@ -57,7 +57,7 @@ Text tTmp1
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -87,7 +87,7 @@ Text tTmp2
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0

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

@@ -296,7 +296,7 @@ Text tMsg1
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 52
+        x coordinate                        : 57
         y coordinate                        : 223
         Width                               : 375
         Height                              : 30
@@ -326,7 +326,7 @@ Text tMsg2
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 35
+        x coordinate                        : 40
         y coordinate                        : 256
         Width                               : 408
         Height                              : 25
@@ -356,7 +356,7 @@ Text tMsg3
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 35
+        x coordinate                        : 40
         y coordinate                        : 278
         Width                               : 408
         Height                              : 25
@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 30
+        Text                                : 34
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -418,8 +418,8 @@ Picture p0
         Opacity                             : 127
         x coordinate                        : 0
         y coordinate                        : 0
-        Width                               : 479
+        Width                               : 480
-        Height                              : 319
+        Height                              : 320
         Effect                              : load
         Effect Priority                     : 0
         Effect Time                         : 300
@@ -467,7 +467,7 @@ Button bSendStartup
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -483,7 +483,7 @@ Hotspot mSpinner
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 164
+        x coordinate                        : 169
         y coordinate                        : 49
         Width                               : 140
         Height                              : 140

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

@@ -37,7 +37,7 @@ Page popupLight
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -69,8 +69,8 @@ Variable (string) entn
     Attributes
         ID            : 21
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (int32) mode
     Attributes
@@ -154,7 +154,7 @@ Text t1
         Opacity                             : 127
         x coordinate                        : 25
         y coordinate                        : 226
-        Width                               : 100
+        Width                               : 229
         Height                              : 30
         Effect                              : load
         Effect Priority                     : 0
@@ -165,11 +165,11 @@ Text t1
         Font ID                             : 0
         Back. Color                         : 6371
         Font Color                          : 65535
-        Horizontal Alignment                : center
+        Horizontal Alignment                : left
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Brightness
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -244,7 +244,7 @@ Text t4
         Opacity                             : 127
         x coordinate                        : 24
         y coordinate                        : 143
-        Width                               : 116
+        Width                               : 229
         Height                              : 30
         Effect                              : load
         Effect Priority                     : 0
@@ -255,11 +255,11 @@ Text t4
         Font ID                             : 0
         Back. Color                         : 6371
         Font Color                          : 65535
-        Horizontal Alignment                : center
+        Horizontal Alignment                : left
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Temperature
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -405,11 +405,11 @@ Text t0
         Font ID                             : 0
         Back. Color                         : 6371
         Font Color                          : 65535
-        Horizontal Alignment                : center
+        Horizontal Alignment                : left
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Color
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -465,7 +465,7 @@ Picture pColorWheel
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -510,7 +510,7 @@ Slider hBrightness
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -555,7 +555,7 @@ Slider hTempSlider
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -602,7 +602,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -618,7 +618,7 @@ Button bColor
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 104
+        x coordinate                        : 108
         y coordinate                        : 68
         Width                               : 50
         Height                              : 50
@@ -705,7 +705,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -881,6 +881,12 @@ Timer tmSerial
                                                 vis pColorWheel,1
                                             }
                                         }
+                                        // set t0 Color (Localization)
+                                        spstr strCommand.txt,t0.txt,"~",7
+                                        // set t4 Temperature (Localization)
+                                        spstr strCommand.txt,t4.txt,"~",8
+                                        // set t1 Brightness (Localization)
+                                        spstr strCommand.txt,t1.txt,"~",9
                                     }
                                     if(tInstruction.txt=="time")
                                     {
@@ -916,25 +922,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -283,7 +283,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -332,7 +332,7 @@ Button b2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -381,7 +381,7 @@ Button b1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -548,25 +548,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
+                                            page cardMedia
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -37,7 +37,7 @@ Page popupShutter
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -56,8 +56,8 @@ Variable (string) entn
     Attributes
         ID            : 18
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tEntity
     Attributes
@@ -68,7 +68,7 @@ Text tEntity
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 80
-        y coordinate                        : 108
+        y coordinate                        : 94
         Width                               : 195
         Height                              : 30
         Effect                              : load
@@ -98,7 +98,7 @@ Text tIcon1
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 27
-        y coordinate                        : 109
+        y coordinate                        : 108
         Width                               : 45
         Height                              : 30
         Effect                              : load
@@ -239,7 +239,7 @@ Text tId
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
-Text t1
+Text tPosHeading
     Attributes
         ID                                  : 17
         Scope                               : local
@@ -269,6 +269,36 @@ Text t1
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tInfo1
+    Attributes
+        ID                                  : 19
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 80
+        y coordinate                        : 122
+        Width                               : 195
+        Height                              : 30
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 0
+        Back. Color                         : 6371
+        Font Color                          : 38066
+        Horizontal Alignment                : left
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 40
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
@@ -322,7 +352,7 @@ Slider hPosition
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -369,7 +399,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -416,7 +446,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -463,7 +493,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -510,7 +540,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -596,6 +626,10 @@ Timer tmSerial
                                         spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
+                                        // set tinfo1 text
+                                        spstr strCommand.txt,tInfo1.txt,"~",2
+                                        // set tPosHeading (localization)
+                                        spstr strCommand.txt,tPosHeading.txt,"~",3
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
@@ -631,30 +665,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -25,6 +25,8 @@ Page screensaver
             vis tInstruction,0
             vis tTmp,0
             vis p0,0
+            vis tNotifyHead,0
+            vis tNotifyText,0
             //load gloabl time string from pageIcons
             //tTime.txt=vaTime.txt
             spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -59,6 +61,20 @@ Variable (int32) vaTap
         Scope: local
         Value: 0
     
+Variable (string) tInstruction
+    Attributes
+        ID            : 31
+        Scope         : local
+        Text          : 
+        Max. Text Size: 50
+    
+Variable (string) tTmp
+    Attributes
+        ID            : 32
+        Scope         : local
+        Text          : 
+        Max. Text Size: 50
+    
 Text tTime
     Attributes
         ID                                  : 5
@@ -127,7 +143,7 @@ Text tSend
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 405
+        x coordinate                        : 420
         y coordinate                        : 2
         Width                               : 29
         Height                              : 30
@@ -749,48 +765,48 @@ Text tMR
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
-Text tTmp
+Text tNotifyHead
     Attributes
-        ID                                  : 31
+        ID                                  : 33
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 368
+        x coordinate                        : 15
-        y coordinate                        : 0
+        y coordinate                        : 201
-        Width                               : 25
+        Width                               : 450
-        Height                              : 30
+        Height                              : 58
         Effect                              : load
         Effect Priority                     : 0
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 0
+        Font ID                             : 3
-        Back. Color                         : 65535
+        Back. Color                         : 0
-        Font Color                          : 0
+        Font Color                          : 65535
         Horizontal Alignment                : center
-        Vertical Alignment                  : center
+        Vertical Alignment                  : top
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 35
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
-Text tInstruction
+Text tNotifyText
     Attributes
-        ID                                  : 32
+        ID                                  : 34
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 335
+        x coordinate                        : 15
-        y coordinate                        : 0
+        y coordinate                        : 258
-        Width                               : 27
+        Width                               : 450
-        Height                              : 30
+        Height                              : 47
         Effect                              : load
         Effect Priority                     : 0
         Effect Time                         : 300
@@ -798,13 +814,13 @@ Text tInstruction
         Style                               : flat
         Associated Keyboard                 : none
         Font ID                             : 0
-        Back. Color                         : 65535
+        Back. Color                         : 0
-        Font Color                          : 0
+        Font Color                          : 65535
         Horizontal Alignment                : center
-        Vertical Alignment                  : center
+        Vertical Alignment                  : top
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 35
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -980,6 +996,91 @@ Timer tmSerial
                                         //tMR
                                         spstr strCommand.txt,tMR.txt,"~",16
                                     }
+                                    if(tInstruction.txt=="color")
+                                    {
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,tTime.bco,0,0
+                                        screensaver.bco=tTime.bco
+                                        tAMPM.bco=tTime.bco
+                                        tDate.bco=tTime.bco
+                                        tMainIcon.bco=tTime.bco
+                                        tMainText.bco=tTime.bco
+                                        tMainIconAlt.bco=tTime.bco
+                                        tMainTextAlt.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tMR.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tForecast1.bco=tTime.bco
+                                        tForecast1Val.bco=tTime.bco
+                                        tF1Icon.bco=tTime.bco
+                                        tForecast2.bco=tTime.bco
+                                        tForecast2Val.bco=tTime.bco
+                                        tF2Icon.bco=tTime.bco
+                                        tForecast3.bco=tTime.bco
+                                        tForecast3Val.bco=tTime.bco
+                                        tF3Icon.bco=tTime.bco
+                                        tForecast4.bco=tTime.bco
+                                        tForecast4Val.bco=tTime.bco
+                                        tF4Icon.bco=tTime.bco
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        covx tTmp.txt,tTime.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",3
+                                        covx tTmp.txt,tAMPM.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        covx tTmp.txt,tDate.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        covx tTmp.txt,tMainIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",6
+                                        covx tTmp.txt,tMainText.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        covx tTmp.txt,tForecast1.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        covx tTmp.txt,tForecast2.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        covx tTmp.txt,tForecast3.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        covx tTmp.txt,tForecast4.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        covx tTmp.txt,tF1Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",12
+                                        covx tTmp.txt,tF2Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        covx tTmp.txt,tF3Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",14
+                                        covx tTmp.txt,tF4Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        covx tTmp.txt,tForecast1Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",16
+                                        covx tTmp.txt,tForecast2Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",17
+                                        covx tTmp.txt,tForecast3Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",18
+                                        covx tTmp.txt,tForecast4Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",19
+                                        covx tTmp.txt,t10.bco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",20
+                                        covx tTmp.txt,tMainIconAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",21
+                                        covx tTmp.txt,tMainTextAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",22
+                                        covx tTmp.txt,tMRIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                        covx tTmp.txt,tMR.pco,0,0
+                                    }
+                                    if(tInstruction.txt=="notify")
+                                    {
+                                        spstr strCommand.txt,tNotifyHead.txt,"~",1
+                                        spstr strCommand.txt,tNotifyText.txt,"~",2
+                                        if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+                                        {
+                                            vis tNotifyHead,1
+                                            vis tNotifyText,1
+                                        }else
+                                        {
+                                            vis tNotifyHead,0
+                                            vis tNotifyText,0
+                                        }
+                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         dim=100
@@ -1071,6 +1172,16 @@ TouchCap tc0
     
     Events
         Touch Press Event
+            if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+            {
+                if(dim!=0)
+                {
+                    tNotifyHead.txt=""
+                    tNotifyText.txt=""
+                    vis tNotifyHead,0
+                    vis tNotifyText,0
+                }
+            }
             dim=dimValueNormal
             vaTap.val+=1
             covx vaTap.val,tTmp.txt,0,0
@@ -1079,7 +1190,7 @@ TouchCap tc0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

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

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

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

@@ -33,6 +33,8 @@ Page cardAlarm
             vis b9,0
             vis b10,0
             vis tCode,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -44,7 +46,7 @@ Variable (string) entn
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) tSend
     Attributes
@@ -150,7 +152,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -182,7 +184,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -365,7 +367,7 @@ Button arm1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -395,7 +397,7 @@ Button arm3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -425,7 +427,7 @@ Button arm2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -455,7 +457,7 @@ Button arm4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -543,7 +545,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //text arm1
@@ -735,7 +737,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -62,6 +62,8 @@ Page cardEntities
             vis bText4,0
             vis hSlider4,0
             vis nNum4,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -97,25 +99,25 @@ Variable (string) entn1
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Number nNum1
     Attributes
@@ -310,7 +312,7 @@ Slider hSlider1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -338,7 +340,7 @@ Slider hSlider2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -366,7 +368,7 @@ Slider hSlider3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -394,7 +396,7 @@ Slider hSlider4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -419,7 +421,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -444,7 +446,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -469,7 +471,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -494,7 +496,7 @@ Button bStop2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -519,7 +521,7 @@ Button bDown2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -544,7 +546,7 @@ Button bUp2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -569,7 +571,7 @@ Button bStop3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -594,7 +596,7 @@ Button bDown3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -619,7 +621,7 @@ Button bUp3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -644,7 +646,7 @@ Button bStop4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -669,7 +671,7 @@ Button bDown4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -694,7 +696,7 @@ Button bUp4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -726,7 +728,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -751,7 +753,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -776,7 +778,7 @@ Button bText1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -801,7 +803,7 @@ Button bText2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -826,7 +828,7 @@ Button bText3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -851,7 +853,7 @@ Button bText4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -878,7 +880,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -905,7 +907,7 @@ Dual-state Button btOnOff2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -932,7 +934,7 @@ Dual-state Button btOnOff3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -959,7 +961,7 @@ Dual-state Button btOnOff4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1151,7 +1153,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -1752,7 +1754,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -34,6 +34,8 @@ Page cardGrid
             vis tEntity4,0
             vis tEntity5,0
             vis tEntity6,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -69,25 +71,25 @@ Variable (string) entn1
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) type5
     Attributes
@@ -105,13 +107,13 @@ Variable (string) entn5
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) entn6
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tHeading
     Attributes
@@ -254,7 +256,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -279,7 +281,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -315,7 +317,7 @@ Button bEntity1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -351,7 +353,7 @@ Button bEntity2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -387,7 +389,7 @@ Button bEntity3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -423,7 +425,7 @@ Button bEntity4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -459,7 +461,7 @@ Button bEntity5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -495,7 +497,7 @@ Button bEntity6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -599,7 +601,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -838,7 +840,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -18,25 +18,26 @@ Page cardMedia
             vis tTmp,0
             vis tId,0
             vis t5,0
-            //vis nPageDisp,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 500
+        Max. Text Size: 750
     
 Variable (string) entn
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) vaSpeakerList
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 200
+        Max. Text Size: 400
     
 Variable (int32) vaSpeakerPos
     Attributes
@@ -134,7 +135,7 @@ Text t2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -163,7 +164,7 @@ Text tPlayPause
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -192,7 +193,7 @@ Text t0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -232,7 +233,7 @@ Text t1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -262,7 +263,7 @@ Text t3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -301,7 +302,7 @@ Text tSpeaker
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -352,7 +353,7 @@ Text t5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -390,7 +391,7 @@ Slider hVolume
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -415,7 +416,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -447,7 +448,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -534,7 +535,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -697,7 +698,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -31,6 +31,8 @@ Page cardThermo
             vis bt6,0
             vis bt7,0
             vis bt8,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -42,7 +44,7 @@ Variable (string) entn
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) va0
     Attributes
@@ -237,7 +239,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -273,7 +275,7 @@ Button bDown
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -309,7 +311,7 @@ Button bUp
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -341,7 +343,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -368,7 +370,7 @@ Dual-state Button bt0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -395,7 +397,7 @@ Dual-state Button bt1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -422,7 +424,7 @@ Dual-state Button bt2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -449,7 +451,7 @@ Dual-state Button bt3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -476,7 +478,7 @@ Dual-state Button bt4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -503,7 +505,7 @@ Dual-state Button bt5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -530,7 +532,7 @@ Dual-state Button bt6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -557,7 +559,7 @@ Dual-state Button bt7
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -584,7 +586,7 @@ Dual-state Button bt8
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -671,7 +673,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -948,7 +950,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -30,7 +30,7 @@ Text tTmp1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
     
 Text tTmp2
     Attributes
@@ -40,7 +40,7 @@ Text tTmp2
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
     
 Picture p0
     Attributes

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

@@ -152,7 +152,7 @@ Text tVersion
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 30
+        Text                                : 34
         Max. Text Size                      : 10
     
 Picture p0
@@ -182,7 +182,7 @@ Button bSendStartup
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

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

@@ -29,7 +29,7 @@ Page popupLight
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -59,8 +59,8 @@ Variable (string) strCommand
 Variable (string) entn
     Attributes
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (int32) mode
     Attributes
@@ -100,7 +100,7 @@ Text t1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Brightness
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
     
 Text t2
     Attributes
@@ -130,7 +130,7 @@ Text t4
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Temperature
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
     
 Text tSend
     Attributes
@@ -180,7 +180,7 @@ Text t0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Color
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
     
 Picture p0
     Attributes
@@ -213,7 +213,7 @@ Picture pColorWheel
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -243,7 +243,7 @@ Slider hBrightness
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -273,7 +273,7 @@ Slider hTempSlider
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -298,7 +298,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -361,7 +361,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -535,6 +535,12 @@ Timer tmSerial
                                                 vis pColorWheel,1
                                             }
                                         }
+                                        // set t0 Color (Localization)
+                                        spstr strCommand.txt,t0.txt,"~",7
+                                        // set t4 Temperature (Localization)
+                                        spstr strCommand.txt,t4.txt,"~",8
+                                        // set t1 Brightness (Localization)
+                                        spstr strCommand.txt,t1.txt,"~",9
                                     }
                                     if(tInstruction.txt=="time")
                                     {
@@ -570,25 +576,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -120,7 +120,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -147,7 +147,7 @@ Button b2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -174,7 +174,7 @@ Button b1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -339,25 +339,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
+                                            page cardMedia
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -29,7 +29,7 @@ Page popupShutter
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -46,8 +46,8 @@ Variable (string) strCommand
 Variable (string) entn
     Attributes
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tEntity
     Attributes
@@ -109,7 +109,7 @@ Text tId
         Text                                : 
         Max. Text Size                      : 20
     
-Text t1
+Text tPosHeading
     Attributes
         Scope                               : local
         Dragging                            : 0
@@ -119,6 +119,16 @@ Text t1
         Text                                : Position
         Max. Text Size                      : 15
     
+Text tInfo1
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 40
+    
 Picture p0
     Attributes
         Scope                               : local
@@ -147,7 +157,7 @@ Slider hPosition
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -172,7 +182,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -197,7 +207,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -222,7 +232,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -247,7 +257,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -331,6 +341,10 @@ Timer tmSerial
                                         spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
+                                        // set tinfo1 text
+                                        spstr strCommand.txt,tInfo1.txt,"~",2
+                                        // set tPosHeading (localization)
+                                        spstr strCommand.txt,tPosHeading.txt,"~",3
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
@@ -366,30 +380,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -17,6 +17,8 @@ Page screensaver
             vis tInstruction,0
             vis tTmp,0
             vis p0,0
+            vis tNotifyHead,0
+            vis tNotifyText,0
             //load gloabl time string from pageIcons
             //tTime.txt=vaTime.txt
             spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -48,6 +50,18 @@ Variable (int32) vaTap
         Scope: local
         Value: 0
     
+Variable (string) tInstruction
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 50
+    
+Variable (string) tTmp
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 50
+    
 Text tTime
     Attributes
         Scope                               : local
@@ -278,7 +292,7 @@ Text tMR
         Text                                : 
         Max. Text Size                      : 10
     
-Text tTmp
+Text tNotifyHead
     Attributes
         Scope                               : local
         Dragging                            : 0
@@ -286,9 +300,9 @@ Text tTmp
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 35
     
-Text tInstruction
+Text tNotifyText
     Attributes
         Scope                               : local
         Dragging                            : 0
@@ -296,7 +310,7 @@ Text tInstruction
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 35
     
 Picture p0
     Attributes
@@ -458,6 +472,91 @@ Timer tmSerial
                                         //tMR
                                         spstr strCommand.txt,tMR.txt,"~",16
                                     }
+                                    if(tInstruction.txt=="color")
+                                    {
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,tTime.bco,0,0
+                                        screensaver.bco=tTime.bco
+                                        tAMPM.bco=tTime.bco
+                                        tDate.bco=tTime.bco
+                                        tMainIcon.bco=tTime.bco
+                                        tMainText.bco=tTime.bco
+                                        tMainIconAlt.bco=tTime.bco
+                                        tMainTextAlt.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tMR.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tForecast1.bco=tTime.bco
+                                        tForecast1Val.bco=tTime.bco
+                                        tF1Icon.bco=tTime.bco
+                                        tForecast2.bco=tTime.bco
+                                        tForecast2Val.bco=tTime.bco
+                                        tF2Icon.bco=tTime.bco
+                                        tForecast3.bco=tTime.bco
+                                        tForecast3Val.bco=tTime.bco
+                                        tF3Icon.bco=tTime.bco
+                                        tForecast4.bco=tTime.bco
+                                        tForecast4Val.bco=tTime.bco
+                                        tF4Icon.bco=tTime.bco
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        covx tTmp.txt,tTime.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",3
+                                        covx tTmp.txt,tAMPM.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        covx tTmp.txt,tDate.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        covx tTmp.txt,tMainIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",6
+                                        covx tTmp.txt,tMainText.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        covx tTmp.txt,tForecast1.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        covx tTmp.txt,tForecast2.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        covx tTmp.txt,tForecast3.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        covx tTmp.txt,tForecast4.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        covx tTmp.txt,tF1Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",12
+                                        covx tTmp.txt,tF2Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        covx tTmp.txt,tF3Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",14
+                                        covx tTmp.txt,tF4Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        covx tTmp.txt,tForecast1Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",16
+                                        covx tTmp.txt,tForecast2Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",17
+                                        covx tTmp.txt,tForecast3Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",18
+                                        covx tTmp.txt,tForecast4Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",19
+                                        covx tTmp.txt,t10.bco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",20
+                                        covx tTmp.txt,tMainIconAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",21
+                                        covx tTmp.txt,tMainTextAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",22
+                                        covx tTmp.txt,tMRIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                        covx tTmp.txt,tMR.pco,0,0
+                                    }
+                                    if(tInstruction.txt=="notify")
+                                    {
+                                        spstr strCommand.txt,tNotifyHead.txt,"~",1
+                                        spstr strCommand.txt,tNotifyText.txt,"~",2
+                                        if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+                                        {
+                                            vis tNotifyHead,1
+                                            vis tNotifyText,1
+                                        }else
+                                        {
+                                            vis tNotifyHead,0
+                                            vis tNotifyText,0
+                                        }
+                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         dim=100
@@ -547,6 +646,16 @@ TouchCap tc0
     
     Events
         Touch Press Event
+            if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+            {
+                if(dim!=0)
+                {
+                    tNotifyHead.txt=""
+                    tNotifyText.txt=""
+                    vis tNotifyHead,0
+                    vis tNotifyText,0
+                }
+            }
             dim=dimValueNormal
             vaTap.val+=1
             covx vaTap.val,tTmp.txt,0,0
@@ -555,7 +664,7 @@ TouchCap tc0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

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

@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-04-01 04:54:12.884151859 +0000
+--- HMI/n2t-out/Program.s.txt	2022-05-06 19:28:27.798491086 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-01 04:54:13.372185922 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-05-06 19:28:28.182497193 +0000
 @@ -11,6 +11,6 @@
      // dim value
      int dimValue=40
@@ -11,9 +11,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
 +    //lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt	2022-04-01 04:54:12.888152138 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-05-06 19:28:27.798491086 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-01 04:54:13.372185922 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-05-06 19:28:28.186497256 +0000
-@@ -62,6 +62,26 @@
+@@ -62,6 +62,16 @@
              vis bText4,0
              vis hSlider4,0
              vis nNum4,0
@@ -27,51 +27,29 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            vis bText5,0
 +            vis hSlider5,0
 +            vis nNum5,0
-+            //ui e6
+             vis bPrev,0
-+            vis btOnOff6,0
+             vis bNext,0
-+            vis bUp6,0
-+            vis bStop6,0
-+            vis bDown6,0
-+            vis tIcon6,0
-+            vis tEntity6,0
-+            vis bText6,0
-+            vis hSlider6,0
-+            vis nNum6,0
          
- Variable (string) strCommand
+@@ -119,6 +129,18 @@
-     Attributes
-@@ -117,6 +137,30 @@
          Text          : 
-         Max. Text Size: 70
+         Max. Text Size: 80
      
 +Variable (string) entn5
 +    Attributes
 +        Scope         : local
 +        Text          : 
-+        Max. Text Size: 70
++        Max. Text Size: 80
-+    
-+Variable (string) entn6
-+    Attributes
-+        Scope         : local
-+        Text          : 
-+        Max. Text Size: 70
 +    
 +Variable (string) type5
 +    Attributes
 +        Scope         : local
 +        Text          : 
 +        Max. Text Size: 10
-+    
-+Variable (string) type6
-+    Attributes
-+        Scope         : local
-+        Text          :  
-+        Max. Text Size: 10
 +    
  Number nNum1
      Attributes
          Scope                               : local
-@@ -153,6 +197,24 @@
+@@ -155,6 +177,15 @@
          Associated Keyboard                 : none
          Value                               : 0
      
@@ -83,20 +61,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Value                               : 0
-+    
-+Number nNum6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Value                               : 0
 +    
  Text tHeading
      Attributes
          Scope                               : local
-@@ -283,6 +345,46 @@
+@@ -285,6 +316,26 @@
          Text                                : 
          Max. Text Size                      : 50
      
@@ -119,31 +88,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Associated Keyboard                 : none
 +        Text                                : 
 +        Max. Text Size                      : 5
-+    
-+Text tEntity6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Text                                : tEntity6
-+        Max. Text Size                      : 30
-+    
-+Text tIcon6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Text                                : 
-+        Max. Text Size                      : 5
 +    
  Picture p0
      Attributes
          Scope                               : local
-@@ -402,6 +504,62 @@
+@@ -404,6 +455,34 @@
              prints tSend.txt,0
              prints crcval,2
          
@@ -167,35 +116,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Slider hSlider6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Position                            : 50
-+        Upper range limit                   : 100
-+        Lower range limit                   : 0
-+    
-+    Events
-+        Touch Release Event
-+            nNum6.val=hSlider6.val
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
-+            covx nNum6.val,tTmp.txt,0,0
-+            tSend.txt+=tTmp.txt
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -206,7 +127,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
  Button bDown1
      Attributes
          Scope                               : local
-@@ -857,6 +1015,206 @@
+@@ -861,6 +940,106 @@
              prints tSend.txt,0
              prints crcval,2
          
@@ -227,7 +148,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -252,7 +173,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -277,7 +198,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -302,107 +223,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bStop6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",stop"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bDown6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",down"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bUp6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",up"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bText6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : newtxt
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -413,7 +234,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
  Dual-state Button btOnOff1
      Attributes
          Scope                               : local
-@@ -965,6 +1323,60 @@
+@@ -969,6 +1148,33 @@
              prints tSend.txt,0
              prints crcval,2
          
@@ -436,34 +257,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Dual-state Button btOnOff6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
-+            covx btOnOff6.val,tTmp.txt,0,0
-+            tSend.txt+=tTmp.txt
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -474,7 +268,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
  Hotspot mSpecial
      Attributes
          Scope                               : local
-@@ -1070,6 +1482,50 @@
+@@ -1074,6 +1280,28 @@
                  page popupLight
              }
          
@@ -499,40 +293,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                //popupLight.tEntity.txt=tEntity5.txt
 +                page popupLight
 +            }
-+        
-+Hotspot m5
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+    
-+    Events
-+        Touch Press Event
-+            pageIcons.tTmp1.txt=tEntity6.txt
-+            pageIcons.tTmp2.txt=entn6.txt
-+            if(type6.txt=="shutter")
-+            {
-+                //popupShutter.tHeading.txt=tEntity6.txt
-+                page popupShutter
-+            }
-+            if(type6.txt=="light")
-+            {
-+                //popupLight.tEntity.txt=tEntity6.txt
-+                page popupLight
-+            }
 +        
  Timer tmSerial
      Attributes
          Scope      : local
-@@ -1648,6 +2104,254 @@
+@@ -1644,6 +1872,128 @@
                                              covx tTmp.txt,sys0,0,0
                                              hSlider4.maxval=sys0
                                          }
 +                                        // get Type
-+                                        spstr strCommand.txt,type5.txt,",",27
++                                        spstr strCommand.txt,type5.txt,"~",27
 +                                        // get internal name
-+                                        spstr strCommand.txt,entn5.txt,",",28
++                                        spstr strCommand.txt,entn5.txt,"~",28
 +                                        if(type5.txt=="delete"||type5.txt=="")
 +                                        {
 +                                            vis bUp5,0
@@ -547,16 +319,14 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                        }else
 +                                        {
 +                                            // change icon
-+                                            spstr strCommand.txt,tTmp.txt,",",29
++                                            spstr strCommand.txt,tIcon5.txt,"~",29
-+                                            covx tTmp.txt,sys0,0,0
-+                                            substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
 +                                            vis tIcon5,1
 +                                            // change icon color
-+                                            spstr strCommand.txt,tTmp.txt,",",30
++                                            spstr strCommand.txt,tTmp.txt,"~",30
 +                                            covx tTmp.txt,sys0,0,0
 +                                            tIcon5.pco=sys0
 +                                            // set name
-+                                            spstr strCommand.txt,tEntity5.txt,",",31
++                                            spstr strCommand.txt,tEntity5.txt,"~",31
 +                                            vis tEntity5,1
 +                                        }
 +                                        if(type5.txt=="shutter")
@@ -579,7 +349,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            vis hSlider5,0
 +                                            vis nNum5,0
 +                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,",",32
++                                            spstr strCommand.txt,tTmp.txt,"~",32
 +                                            covx tTmp.txt,sys0,0,0
 +                                            btOnOff5.val=sys0
 +                                        }
@@ -593,7 +363,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            vis hSlider5,0
 +                                            vis nNum5,0
 +                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,",",32
++                                            spstr strCommand.txt,tTmp.txt,"~",32
 +                                            covx tTmp.txt,sys0,0,0
 +                                            btOnOff5.val=sys0
 +                                        }
@@ -610,7 +380,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            bText5.pco=65535
 +                                            bText5.pco2=65535
 +                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText5.txt,",",32
++                                            spstr strCommand.txt,bText5.txt,"~",32
 +                                        }
 +                                        if(type5.txt=="button")
 +                                        {
@@ -625,7 +395,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            bText5.pco=1374
 +                                            bText5.pco2=1374
 +                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText5.txt,",",32
++                                            spstr strCommand.txt,bText5.txt,"~",32
 +                                        }
 +                                        if(type5.txt=="number")
 +                                        {
@@ -638,7 +408,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            vis hSlider5,1
 +                                            vis nNum5,1
 +                                            // get config (optional Value) (use bText as variable)
-+                                            spstr strCommand.txt,bText5.txt,",",32
++                                            spstr strCommand.txt,bText5.txt,"~",32
 +                                            //first value is current value
 +                                            spstr bText5.txt,tTmp.txt,"|",0
 +                                            covx tTmp.txt,sys0,0,0
@@ -652,137 +422,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            spstr bText5.txt,tTmp.txt,"|",2
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider5.maxval=sys0
-+                                        }
-+                                        // get Type
-+                                        spstr strCommand.txt,type6.txt,",",33
-+                                        // get internal name
-+                                        spstr strCommand.txt,entn6.txt,",",34
-+                                        if(type6.txt=="delete"||type6.txt=="")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis tEntity6,0
-+                                            vis tIcon6,0
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                        }else
-+                                        {
-+                                            // change icon
-+                                            spstr strCommand.txt,tTmp.txt,",",35
-+                                            covx tTmp.txt,sys0,0,0
-+                                            substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
-+                                            vis tIcon6,1
-+                                            // change icon color
-+                                            spstr strCommand.txt,tTmp.txt,",",36
-+                                            covx tTmp.txt,sys0,0,0
-+                                            tIcon6.pco=sys0
-+                                            // set name
-+                                            spstr strCommand.txt,tEntity6.txt,",",37
-+                                            vis tEntity6,1
-+                                        }
-+                                        if(type6.txt=="shutter")
-+                                        {
-+                                            vis bUp6,1
-+                                            vis bStop6,1
-+                                            vis bDown6,1
-+                                            vis btOnOff6,0
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                        }
-+                                        if(type6.txt=="light")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,1
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,",",38
-+                                            covx tTmp.txt,sys0,0,0
-+                                            btOnOff6.val=sys0
-+                                        }
-+                                        if(type6.txt=="switch")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,1
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,",",38
-+                                            covx tTmp.txt,sys0,0,0
-+                                            btOnOff6.val=sys0
-+                                        }
-+                                        if(type6.txt=="text")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis bText6,1
-+                                            tsw bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            bText6.pco=65535
-+                                            bText6.pco2=65535
-+                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText6.txt,",",38
-+                                        }
-+                                        if(type6.txt=="button")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis bText6,1
-+                                            tsw bText6,1
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            bText6.pco=1374
-+                                            bText6.pco2=1374
-+                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText6.txt,",",38
-+                                        }
-+                                        if(type6.txt=="number")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis bText6,0
-+                                            tsw bText6,0
-+                                            vis hSlider6,1
-+                                            vis nNum6,1
-+                                            // get config (optional Value) (use bText as variable)
-+                                            spstr strCommand.txt,bText6.txt,",",38
-+                                            //first value is current value
-+                                            spstr bText6.txt,tTmp.txt,"|",0
-+                                            covx tTmp.txt,sys0,0,0
-+                                            hSlider6.val=sys0
-+                                            nNum6.val=sys0
-+                                            //second value is min value
-+                                            spstr bText6.txt,tTmp.txt,"|",1
-+                                            covx tTmp.txt,sys0,0,0
-+                                            hSlider6.minval=sys0
-+                                            //third value is max value
-+                                            spstr bText6.txt,tTmp.txt,"|",2
-+                                            covx tTmp.txt,sys0,0,0
-+                                            hSlider6.maxval=sys0
 +                                        }
                                      }
                                      if(tInstruction.txt=="pageType")
                                      {
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-04-01 04:54:12.884151859 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-05-06 19:28:27.798491086 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-01 04:54:13.372185922 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-05-06 19:28:28.182497193 +0000
 @@ -142,7 +142,7 @@
          Disable release event after dragging: 0
          Send Component ID                   : disabled

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

@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-04-08 20:30:53.290164509 +0000
+--- HMI/n2t-out/Program.s.txt	2022-05-07 15:37:51.728763344 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-08 20:30:53.734183782 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-05-07 15:37:52.104789571 +0000
 @@ -11,6 +11,6 @@
      // dim value
      int dimValue=40
@@ -11,9 +11,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
 +    //lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt	2022-04-08 20:30:53.290164509 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-05-07 15:37:51.728763344 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-08 20:30:53.738183956 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-05-07 15:37:52.104789571 +0000
-@@ -62,6 +62,26 @@
+@@ -62,6 +62,16 @@
              vis bText4,0
              vis hSlider4,0
              vis nNum4,0
@@ -27,51 +27,29 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            vis bText5,0
 +            vis hSlider5,0
 +            vis nNum5,0
-+            //ui e6
+             vis bPrev,0
-+            vis btOnOff6,0
+             vis bNext,0
-+            vis bUp6,0
-+            vis bStop6,0
-+            vis bDown6,0
-+            vis tIcon6,0
-+            vis tEntity6,0
-+            vis bText6,0
-+            vis hSlider6,0
-+            vis nNum6,0
          
- Variable (string) strCommand
+@@ -119,6 +129,18 @@
-     Attributes
-@@ -117,6 +137,30 @@
          Text          : 
-         Max. Text Size: 70
+         Max. Text Size: 80
      
 +Variable (string) entn5
 +    Attributes
 +        Scope         : local
 +        Text          : 
-+        Max. Text Size: 70
++        Max. Text Size: 80
-+    
-+Variable (string) entn6
-+    Attributes
-+        Scope         : local
-+        Text          : 
-+        Max. Text Size: 70
 +    
 +Variable (string) type5
 +    Attributes
 +        Scope         : local
 +        Text          : 
 +        Max. Text Size: 10
-+    
-+Variable (string) type6
-+    Attributes
-+        Scope         : local
-+        Text          :  
-+        Max. Text Size: 10
 +    
  Number nNum1
      Attributes
          Scope                               : local
-@@ -153,6 +197,24 @@
+@@ -155,6 +177,15 @@
          Associated Keyboard                 : none
          Value                               : 0
      
@@ -83,20 +61,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Value                               : 0
-+    
-+Number nNum6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Value                               : 0
 +    
  Text tHeading
      Attributes
          Scope                               : local
-@@ -283,6 +345,46 @@
+@@ -285,6 +316,26 @@
          Text                                : 
          Max. Text Size                      : 50
      
@@ -119,31 +88,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Associated Keyboard                 : none
 +        Text                                : 
 +        Max. Text Size                      : 5
-+    
-+Text tEntity6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Text                                : tEntity6
-+        Max. Text Size                      : 30
-+    
-+Text tIcon6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Text                                : 
-+        Max. Text Size                      : 5
 +    
  Picture p0
      Attributes
          Scope                               : local
-@@ -402,6 +504,62 @@
+@@ -404,6 +455,34 @@
              prints tSend.txt,0
              prints crcval,2
          
@@ -167,35 +116,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Slider hSlider6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Position                            : 50
-+        Upper range limit                   : 100
-+        Lower range limit                   : 0
-+    
-+    Events
-+        Touch Release Event
-+            nNum6.val=hSlider6.val
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
-+            covx nNum6.val,tTmp.txt,0,0
-+            tSend.txt+=tTmp.txt
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -206,7 +127,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
  Button bDown1
      Attributes
          Scope                               : local
-@@ -859,6 +1017,206 @@
+@@ -861,6 +940,106 @@
              prints tSend.txt,0
              prints crcval,2
          
@@ -227,7 +148,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -252,7 +173,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -277,7 +198,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -302,107 +223,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bStop6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",stop"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bDown6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",down"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bUp6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",up"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Button bText6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : newtxt
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -413,7 +234,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
  Dual-state Button btOnOff1
      Attributes
          Scope                               : local
-@@ -967,6 +1325,60 @@
+@@ -969,6 +1148,33 @@
              prints tSend.txt,0
              prints crcval,2
          
@@ -436,34 +257,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
-+            crcputs sys0,1
++            crcputs sys0,2
-+            crcputs tSend.txt,0
-+            //send cmd
-+            printh 55 bb
-+            prints sys0,2
-+            prints tSend.txt,0
-+            prints crcval,2
-+        
-+Dual-state Button btOnOff6
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        State                               : unpressed
-+        Text                                : 
-+        Max. Text Size                      : 10
-+    
-+    Events
-+        Touch Press Event
-+            tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
-+            covx btOnOff6.val,tTmp.txt,0,0
-+            tSend.txt+=tTmp.txt
-+            //send calc crc
-+            btlen tSend.txt,sys0
-+            crcrest 1,0xffff // reset CRC
-+            crcputh 55 bb
-+            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
@@ -474,7 +268,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
  Hotspot mSpecial
      Attributes
          Scope                               : local
-@@ -1072,6 +1484,50 @@
+@@ -1074,6 +1280,28 @@
                  page popupLight
              }
          
@@ -499,33 +293,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                //popupLight.tEntity.txt=tEntity5.txt
 +                page popupLight
 +            }
-+        
-+Hotspot m5
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+    
-+    Events
-+        Touch Press Event
-+            pageIcons.tTmp1.txt=tEntity6.txt
-+            pageIcons.tTmp2.txt=entn6.txt
-+            if(type6.txt=="shutter")
-+            {
-+                //popupShutter.tHeading.txt=tEntity6.txt
-+                page popupShutter
-+            }
-+            if(type6.txt=="light")
-+            {
-+                //popupLight.tEntity.txt=tEntity6.txt
-+                page popupLight
-+            }
 +        
  Timer tmSerial
      Attributes
          Scope      : local
-@@ -1642,6 +2098,250 @@
+@@ -1644,6 +1872,128 @@
                                              covx tTmp.txt,sys0,0,0
                                              hSlider4.maxval=sys0
                                          }
@@ -650,135 +422,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            spstr bText5.txt,tTmp.txt,"|",2
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider5.maxval=sys0
-+                                        }
-+                                        // get Type
-+                                        spstr strCommand.txt,type6.txt,"~",33
-+                                        // get internal name
-+                                        spstr strCommand.txt,entn6.txt,"~",34
-+                                        if(type6.txt=="delete"||type6.txt=="")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis tEntity6,0
-+                                            vis tIcon6,0
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                        }else
-+                                        {
-+                                            // change icon
-+                                            spstr strCommand.txt,tIcon6.txt,"~",35
-+                                            vis tIcon6,1
-+                                            // change icon color
-+                                            spstr strCommand.txt,tTmp.txt,"~",36
-+                                            covx tTmp.txt,sys0,0,0
-+                                            tIcon6.pco=sys0
-+                                            // set name
-+                                            spstr strCommand.txt,tEntity6.txt,"~",37
-+                                            vis tEntity6,1
-+                                        }
-+                                        if(type6.txt=="shutter")
-+                                        {
-+                                            vis bUp6,1
-+                                            vis bStop6,1
-+                                            vis bDown6,1
-+                                            vis btOnOff6,0
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                        }
-+                                        if(type6.txt=="light")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,1
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,"~",38
-+                                            covx tTmp.txt,sys0,0,0
-+                                            btOnOff6.val=sys0
-+                                        }
-+                                        if(type6.txt=="switch")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,1
-+                                            vis bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,"~",38
-+                                            covx tTmp.txt,sys0,0,0
-+                                            btOnOff6.val=sys0
-+                                        }
-+                                        if(type6.txt=="text")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis bText6,1
-+                                            tsw bText6,0
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            bText6.pco=65535
-+                                            bText6.pco2=65535
-+                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText6.txt,"~",38
-+                                        }
-+                                        if(type6.txt=="button")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis bText6,1
-+                                            tsw bText6,1
-+                                            vis hSlider6,0
-+                                            vis nNum6,0
-+                                            bText6.pco=1374
-+                                            bText6.pco2=1374
-+                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText6.txt,"~",38
-+                                        }
-+                                        if(type6.txt=="number")
-+                                        {
-+                                            vis bUp6,0
-+                                            vis bStop6,0
-+                                            vis bDown6,0
-+                                            vis btOnOff6,0
-+                                            vis bText6,0
-+                                            tsw bText6,0
-+                                            vis hSlider6,1
-+                                            vis nNum6,1
-+                                            // get config (optional Value) (use bText as variable)
-+                                            spstr strCommand.txt,bText6.txt,"~",38
-+                                            //first value is current value
-+                                            spstr bText6.txt,tTmp.txt,"|",0
-+                                            covx tTmp.txt,sys0,0,0
-+                                            hSlider6.val=sys0
-+                                            nNum6.val=sys0
-+                                            //second value is min value
-+                                            spstr bText6.txt,tTmp.txt,"|",1
-+                                            covx tTmp.txt,sys0,0,0
-+                                            hSlider6.minval=sys0
-+                                            //third value is max value
-+                                            spstr bText6.txt,tTmp.txt,"|",2
-+                                            covx tTmp.txt,sys0,0,0
-+                                            hSlider6.maxval=sys0
 +                                        }
                                      }
                                      if(tInstruction.txt=="pageType")
                                      {
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-04-08 20:30:53.290164509 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-05-07 15:37:51.728763344 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-08 20:30:53.734183782 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-05-07 15:37:52.104789571 +0000
 @@ -142,7 +142,7 @@
          Disable release event after dragging: 0
          Send Component ID                   : disabled
@@ -797,60 +447,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
              //send calc crc
              btlen tSend.txt,sys0
              crcrest 1,0xffff // reset CRC
-diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
---- HMI/n2t-out/screensaver.txt	2022-04-08 20:30:53.290164509 +0000
-+++ HMI/US/portrait/n2t-out/screensaver.txt	2022-04-08 20:30:53.738183956 +0000
-@@ -48,6 +48,26 @@
-         Scope: local
-         Value: 0
-     
-+Text tInstruction
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Text                                : 
-+        Max. Text Size                      : 50
-+    
-+Text tTmp
-+    Attributes
-+        Scope                               : local
-+        Dragging                            : 0
-+        Disable release event after dragging: 0
-+        Send Component ID                   : disabled
-+        Associated Keyboard                 : none
-+        Text                                : 
-+        Max. Text Size                      : 50
-+    
- Text tTime
-     Attributes
-         Scope                               : local
-@@ -278,26 +298,6 @@
-         Text                                : 
-         Max. Text Size                      : 10
-     
--Text tTmp
--    Attributes
--        Scope                               : local
--        Dragging                            : 0
--        Disable release event after dragging: 0
--        Send Component ID                   : disabled
--        Associated Keyboard                 : none
--        Text                                : 
--        Max. Text Size                      : 50
--    
--Text tInstruction
--    Attributes
--        Scope                               : local
--        Dragging                            : 0
--        Disable release event after dragging: 0
--        Send Component ID                   : disabled
--        Associated Keyboard                 : none
--        Text                                : 
--        Max. Text Size                      : 50
--    
- Picture p0
-     Attributes
-         Scope                               : local

HMI/US/portrait/diff-filtered.txt

@@ -0,0 +1,7 @@
++++ HMI/US/portrait/diff-eu-version.txt	2022-05-07 15:37:52.120790687 +0000
++--- HMI/n2t-out/Program.s.txt	2022-05-07 15:37:51.728763344 +0000
+++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-05-07 15:37:52.104789571 +0000
++--- HMI/n2t-out/cardEntities.txt	2022-05-07 15:37:51.728763344 +0000
+++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-05-07 15:37:52.104789571 +0000
++--- HMI/n2t-out/pageStartup.txt	2022-05-07 15:37:51.728763344 +0000
+++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-05-07 15:37:52.104789571 +0000

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

@@ -41,6 +41,8 @@ Page cardAlarm
             vis b9,0
             vis b10,0
             vis tCode,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -54,7 +56,7 @@ Variable (string) entn
         ID            : 9
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) tSend
     Attributes
@@ -297,7 +299,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -351,7 +353,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -822,7 +824,7 @@ Button arm1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -876,7 +878,7 @@ Button arm3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -930,7 +932,7 @@ Button arm2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -984,7 +986,7 @@ Button arm4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1073,7 +1075,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //text arm1
@@ -1266,7 +1268,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -42,6 +42,8 @@ Page cardGrid
             vis tEntity4,0
             vis tEntity5,0
             vis tEntity6,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -83,28 +85,28 @@ Variable (string) entn1
         ID            : 18
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         ID            : 19
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         ID            : 20
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         ID            : 21
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) type5
     Attributes
@@ -125,14 +127,14 @@ Variable (string) entn5
         ID            : 36
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) entn6
     Attributes
         ID            : 37
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tHeading
     Attributes
@@ -527,7 +529,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -574,7 +576,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -632,7 +634,7 @@ Button bEntity1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -690,7 +692,7 @@ Button bEntity2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -748,7 +750,7 @@ Button bEntity3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -806,7 +808,7 @@ Button bEntity4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -864,7 +866,7 @@ Button bEntity5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -922,7 +924,7 @@ Button bEntity6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1036,7 +1038,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -1276,7 +1278,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -26,28 +26,29 @@ Page cardMedia
             vis tTmp,0
             vis tId,0
             vis t5,0
-            //vis nPageDisp,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
         ID            : 7
         Scope         : local
         Text          : 
-        Max. Text Size: 500
+        Max. Text Size: 750
     
 Variable (string) entn
     Attributes
         ID            : 17
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) vaSpeakerList
     Attributes
         ID            : 26
         Scope         : local
         Text          : 
-        Max. Text Size: 200
+        Max. Text Size: 400
     
 Variable (int32) vaSpeakerPos
     Attributes
@@ -306,7 +307,7 @@ Text t2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -355,7 +356,7 @@ Text tPlayPause
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -404,7 +405,7 @@ Text t0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -484,7 +485,7 @@ Text t1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -534,7 +535,7 @@ Text t3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -613,7 +614,7 @@ Text tSpeaker
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -704,7 +705,7 @@ Text t5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -767,7 +768,7 @@ Slider hVolume
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -814,7 +815,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -868,7 +869,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -956,7 +957,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -1120,7 +1121,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -39,6 +39,8 @@ Page cardThermo
             vis bt6,0
             vis bt7,0
             vis bt8,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -52,7 +54,7 @@ Variable (string) entn
         ID            : 21
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) va0
     Attributes
@@ -533,7 +535,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -587,7 +589,7 @@ Button bDown
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -641,7 +643,7 @@ Button bUp
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -695,7 +697,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -744,7 +746,7 @@ Dual-state Button bt0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -793,7 +795,7 @@ Dual-state Button bt1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -842,7 +844,7 @@ Dual-state Button bt2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -891,7 +893,7 @@ Dual-state Button bt3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -940,7 +942,7 @@ Dual-state Button bt4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -989,7 +991,7 @@ Dual-state Button bt5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1038,7 +1040,7 @@ Dual-state Button bt6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1087,7 +1089,7 @@ Dual-state Button bt7
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1136,7 +1138,7 @@ Dual-state Button bt8
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1224,7 +1226,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -1502,7 +1504,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -10,49 +10,49 @@ pageIcons
 	6    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
+popupNotify
+	17   Component(s)
+	196  Line(s) of event code
+	123  Unique line(s) of event code
+popupShutter
+	20   Component(s)
+	193  Line(s) of event code
+	109  Unique line(s) of event code
+cardGrid
+	39   Component(s)
+	420  Line(s) of event code
+	246  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
-popupNotify
-	17   Component(s)
-	178  Line(s) of event code
-	117  Unique line(s) of event code
 screensaver
-	33   Component(s)
+	35   Component(s)
-	195  Line(s) of event code
+	292  Line(s) of event code
-	152  Unique line(s) of event code
+	235  Unique line(s) of event code
-cardEntities
-	86   Component(s)
-	1350 Line(s) of event code
-	547  Unique line(s) of event code
 cardMedia
 	30   Component(s)
-	329  Line(s) of event code
+	331  Line(s) of event code
-	168  Unique line(s) of event code
+	171  Unique line(s) of event code
 cardAlarm
 	35   Component(s)
-	343  Line(s) of event code
+	345  Line(s) of event code
-	213  Unique line(s) of event code
+	216  Unique line(s) of event code
-cardGrid
-	39   Component(s)
-	418  Line(s) of event code
-	243  Unique line(s) of event code
-cardThermo
-	41   Component(s)
-	442  Line(s) of event code
-	246  Unique line(s) of event code
-popupShutter
-	19   Component(s)
-	178  Line(s) of event code
-	101  Unique line(s) of event code
 popupLight
 	27   Component(s)
-	320  Line(s) of event code
+	341  Line(s) of event code
-	173  Unique line(s) of event code
+	185  Unique line(s) of event code
+cardThermo
+	41   Component(s)
+	444  Line(s) of event code
+	249  Unique line(s) of event code
+cardEntities
+	74   Component(s)
+	1159 Line(s) of event code
+	481  Unique line(s) of event code
 
 Total
 	12   Page(s)
-	365  Component(s)
+	356  Component(s)
-	3926 Line(s) of event code
+	3894 Line(s) of event code
-	1059 Unique line(s) of event code
+	1080 Unique line(s) of event code

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

@@ -57,7 +57,7 @@ Text tTmp1
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -87,7 +87,7 @@ Text tTmp2
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0

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

@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 30
+        Text                                : 34
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -467,7 +467,7 @@ Button bSendStartup
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

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

@@ -37,7 +37,7 @@ Page popupLight
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -69,8 +69,8 @@ Variable (string) entn
     Attributes
         ID            : 21
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (int32) mode
     Attributes
@@ -154,7 +154,7 @@ Text t1
         Opacity                             : 127
         x coordinate                        : 10
         y coordinate                        : 319
-        Width                               : 100
+        Width                               : 240
         Height                              : 30
         Effect                              : load
         Effect Priority                     : 0
@@ -165,11 +165,11 @@ Text t1
         Font ID                             : 0
         Back. Color                         : 6371
         Font Color                          : 65535
-        Horizontal Alignment                : center
+        Horizontal Alignment                : left
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Brightness
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -244,7 +244,7 @@ Text t4
         Opacity                             : 127
         x coordinate                        : 9
         y coordinate                        : 234
-        Width                               : 116
+        Width                               : 242
         Height                              : 30
         Effect                              : load
         Effect Priority                     : 0
@@ -255,11 +255,11 @@ Text t4
         Font ID                             : 0
         Back. Color                         : 6371
         Font Color                          : 65535
-        Horizontal Alignment                : center
+        Horizontal Alignment                : left
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Temperature
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -394,7 +394,7 @@ Text t0
         Opacity                             : 127
         x coordinate                        : 12
         y coordinate                        : 57
-        Width                               : 64
+        Width                               : 141
         Height                              : 30
         Effect                              : load
         Effect Priority                     : 0
@@ -405,11 +405,11 @@ Text t0
         Font ID                             : 0
         Back. Color                         : 6371
         Font Color                          : 65535
-        Horizontal Alignment                : center
+        Horizontal Alignment                : left
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Color
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -465,7 +465,7 @@ Picture pColorWheel
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -510,7 +510,7 @@ Slider hBrightness
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -555,7 +555,7 @@ Slider hTempSlider
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -602,7 +602,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -618,8 +618,8 @@ Button bColor
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 83
+        x coordinate                        : 12
-        y coordinate                        : 57
+        y coordinate                        : 89
         Width                               : 50
         Height                              : 50
         Effect                              : load
@@ -705,7 +705,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -881,6 +881,12 @@ Timer tmSerial
                                                 vis pColorWheel,1
                                             }
                                         }
+                                        // set t0 Color (Localization)
+                                        spstr strCommand.txt,t0.txt,"~",7
+                                        // set t4 Temperature (Localization)
+                                        spstr strCommand.txt,t4.txt,"~",8
+                                        // set t1 Brightness (Localization)
+                                        spstr strCommand.txt,t1.txt,"~",9
                                     }
                                     if(tInstruction.txt=="time")
                                     {
@@ -916,25 +922,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -283,7 +283,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -332,7 +332,7 @@ Button b2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -381,7 +381,7 @@ Button b1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -548,25 +548,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
+                                            page cardMedia
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -37,7 +37,7 @@ Page popupShutter
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -56,8 +56,8 @@ Variable (string) entn
     Attributes
         ID            : 18
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tEntity
     Attributes
@@ -98,7 +98,7 @@ Text tIcon1
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 11
-        y coordinate                        : 21
+        y coordinate                        : 35
         Width                               : 45
         Height                              : 30
         Effect                              : load
@@ -239,7 +239,7 @@ Text tId
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
-Text t1
+Text tPosHeading
     Attributes
         ID                                  : 17
         Scope                               : local
@@ -269,6 +269,36 @@ Text t1
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tInfo1
+    Attributes
+        ID                                  : 19
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 61
+        y coordinate                        : 51
+        Width                               : 195
+        Height                              : 30
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 0
+        Back. Color                         : 6371
+        Font Color                          : 38066
+        Horizontal Alignment                : left
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 40
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
@@ -322,7 +352,7 @@ Slider hPosition
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -369,7 +399,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -416,7 +446,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -463,7 +493,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -510,7 +540,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -596,6 +626,10 @@ Timer tmSerial
                                         spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
+                                        // set tinfo1 text
+                                        spstr strCommand.txt,tInfo1.txt,"~",2
+                                        // set tPosHeading (localization)
+                                        spstr strCommand.txt,tPosHeading.txt,"~",3
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
@@ -631,30 +665,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -25,6 +25,8 @@ Page screensaver
             vis tInstruction,0
             vis tTmp,0
             vis p0,0
+            vis tNotifyHead,0
+            vis tNotifyText,0
             //load gloabl time string from pageIcons
             //tTime.txt=vaTime.txt
             spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -48,80 +50,34 @@ Variable (string) strCommand
     
 Variable (string) tId
     Attributes
-        ID            : 19
+        ID            : 17
         Scope         : local
         Text          : 
         Max. Text Size: 25
     
 Variable (int32) vaTap
     Attributes
-        ID   : 27
+        ID   : 25
         Scope: local
         Value: 0
     
-Text tInstruction
+Variable (string) tInstruction
     Attributes
-        ID                                  : 5
+        ID            : 31
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 260
-        y coordinate                        : 446
-        Width                               : 26
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 0
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 50
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
     
-Text tTmp
+Variable (string) tTmp
     Attributes
-        ID                                  : 6
+        ID            : 32
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
-        Send Component ID                   : disabled
-        Opacity                             : 127
-        x coordinate                        : 293
-        y coordinate                        : 447
-        Width                               : 25
-        Height                              : 30
-        Effect                              : load
-        Effect Priority                     : 0
-        Effect Time                         : 300
-        Fill                                : solid color
-        Style                               : flat
-        Associated Keyboard                 : none
-        Font ID                             : 0
-        Back. Color                         : 65535
-        Font Color                          : 0
-        Horizontal Alignment                : center
-        Vertical Alignment                  : center
-        Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 50
-        Word wrap                           : disabled
-        Horizontal Spacing                  : 0
-        Vertical Spacing                    : 0
     
 Text tTime
     Attributes
-        ID                                  : 7
+        ID                                  : 5
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -151,7 +107,7 @@ Text tTime
     
 Text tDate
     Attributes
-        ID                                  : 8
+        ID                                  : 6
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -181,7 +137,7 @@ Text tDate
     
 Text tSend
     Attributes
-        ID                                  : 9
+        ID                                  : 7
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -211,7 +167,7 @@ Text tSend
     
 Text tMainIcon
     Attributes
-        ID                                  : 10
+        ID                                  : 8
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -241,7 +197,7 @@ Text tMainIcon
     
 Text tMainText
     Attributes
-        ID                                  : 11
+        ID                                  : 9
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -271,7 +227,7 @@ Text tMainText
     
 Text tForecast1
     Attributes
-        ID                                  : 12
+        ID                                  : 10
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -301,7 +257,7 @@ Text tForecast1
     
 Text tForecast1Val
     Attributes
-        ID                                  : 13
+        ID                                  : 11
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -331,7 +287,7 @@ Text tForecast1Val
     
 Text tF1Icon
     Attributes
-        ID                                  : 14
+        ID                                  : 12
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -361,7 +317,7 @@ Text tF1Icon
     
 Text tForecast2
     Attributes
-        ID                                  : 15
+        ID                                  : 13
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -391,7 +347,7 @@ Text tForecast2
     
 Text tF2Icon
     Attributes
-        ID                                  : 16
+        ID                                  : 14
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -421,7 +377,7 @@ Text tF2Icon
     
 Text tForecast2Val
     Attributes
-        ID                                  : 17
+        ID                                  : 15
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -451,7 +407,7 @@ Text tForecast2Val
     
 Text t10
     Attributes
-        ID                                  : 18
+        ID                                  : 16
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -481,7 +437,7 @@ Text t10
     
 Text tAMPM
     Attributes
-        ID                                  : 20
+        ID                                  : 18
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -511,7 +467,7 @@ Text tAMPM
     
 Text tForecast3Val
     Attributes
-        ID                                  : 21
+        ID                                  : 19
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -541,7 +497,7 @@ Text tForecast3Val
     
 Text tF3Icon
     Attributes
-        ID                                  : 22
+        ID                                  : 20
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -571,7 +527,7 @@ Text tF3Icon
     
 Text tForecast3
     Attributes
-        ID                                  : 23
+        ID                                  : 21
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -601,7 +557,7 @@ Text tForecast3
     
 Text tForecast4
     Attributes
-        ID                                  : 24
+        ID                                  : 22
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -631,7 +587,7 @@ Text tForecast4
     
 Text tF4Icon
     Attributes
-        ID                                  : 25
+        ID                                  : 23
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -661,7 +617,7 @@ Text tF4Icon
     
 Text tForecast4Val
     Attributes
-        ID                                  : 26
+        ID                                  : 24
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -691,7 +647,7 @@ Text tForecast4Val
     
 Text tMainTextAlt
     Attributes
-        ID                                  : 29
+        ID                                  : 27
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -721,7 +677,7 @@ Text tMainTextAlt
     
 Text tMainIconAlt
     Attributes
-        ID                                  : 30
+        ID                                  : 28
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -751,7 +707,7 @@ Text tMainIconAlt
     
 Text tMRIcon
     Attributes
-        ID                                  : 31
+        ID                                  : 29
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -781,7 +737,7 @@ Text tMRIcon
     
 Text tMR
     Attributes
-        ID                                  : 32
+        ID                                  : 30
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
@@ -809,6 +765,66 @@ Text tMR
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tNotifyHead
+    Attributes
+        ID                                  : 33
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 0
+        y coordinate                        : 240
+        Width                               : 320
+        Height                              : 58
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 3
+        Back. Color                         : 0
+        Font Color                          : 65535
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 35
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+Text tNotifyText
+    Attributes
+        ID                                  : 34
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 0
+        y coordinate                        : 298
+        Width                               : 320
+        Height                              : 58
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 3
+        Back. Color                         : 0
+        Font Color                          : 65535
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 35
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
@@ -980,6 +996,91 @@ Timer tmSerial
                                         //tMR
                                         spstr strCommand.txt,tMR.txt,"~",16
                                     }
+                                    if(tInstruction.txt=="color")
+                                    {
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,tTime.bco,0,0
+                                        screensaver.bco=tTime.bco
+                                        tAMPM.bco=tTime.bco
+                                        tDate.bco=tTime.bco
+                                        tMainIcon.bco=tTime.bco
+                                        tMainText.bco=tTime.bco
+                                        tMainIconAlt.bco=tTime.bco
+                                        tMainTextAlt.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tMR.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tForecast1.bco=tTime.bco
+                                        tForecast1Val.bco=tTime.bco
+                                        tF1Icon.bco=tTime.bco
+                                        tForecast2.bco=tTime.bco
+                                        tForecast2Val.bco=tTime.bco
+                                        tF2Icon.bco=tTime.bco
+                                        tForecast3.bco=tTime.bco
+                                        tForecast3Val.bco=tTime.bco
+                                        tF3Icon.bco=tTime.bco
+                                        tForecast4.bco=tTime.bco
+                                        tForecast4Val.bco=tTime.bco
+                                        tF4Icon.bco=tTime.bco
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        covx tTmp.txt,tTime.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",3
+                                        covx tTmp.txt,tAMPM.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        covx tTmp.txt,tDate.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        covx tTmp.txt,tMainIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",6
+                                        covx tTmp.txt,tMainText.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        covx tTmp.txt,tForecast1.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        covx tTmp.txt,tForecast2.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        covx tTmp.txt,tForecast3.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        covx tTmp.txt,tForecast4.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        covx tTmp.txt,tF1Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",12
+                                        covx tTmp.txt,tF2Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        covx tTmp.txt,tF3Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",14
+                                        covx tTmp.txt,tF4Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        covx tTmp.txt,tForecast1Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",16
+                                        covx tTmp.txt,tForecast2Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",17
+                                        covx tTmp.txt,tForecast3Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",18
+                                        covx tTmp.txt,tForecast4Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",19
+                                        covx tTmp.txt,t10.bco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",20
+                                        covx tTmp.txt,tMainIconAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",21
+                                        covx tTmp.txt,tMainTextAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",22
+                                        covx tTmp.txt,tMRIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                        covx tTmp.txt,tMR.pco,0,0
+                                    }
+                                    if(tInstruction.txt=="notify")
+                                    {
+                                        spstr strCommand.txt,tNotifyHead.txt,"~",1
+                                        spstr strCommand.txt,tNotifyText.txt,"~",2
+                                        if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+                                        {
+                                            vis tNotifyHead,1
+                                            vis tNotifyText,1
+                                        }else
+                                        {
+                                            vis tNotifyHead,0
+                                            vis tNotifyText,0
+                                        }
+                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         dim=100
@@ -1045,7 +1146,7 @@ Timer tmSerial
         
 Timer tmSleep
     Attributes
-        ID         : 28
+        ID         : 26
         Scope      : local
         Period (ms): 1000
         Enabled    : yes
@@ -1071,6 +1172,16 @@ TouchCap tc0
     
     Events
         Touch Press Event
+            if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+            {
+                if(dim!=0)
+                {
+                    tNotifyHead.txt=""
+                    tNotifyText.txt=""
+                    vis tNotifyHead,0
+                    vis tNotifyText,0
+                }
+            }
             dim=dimValueNormal
             vaTap.val+=1
             covx vaTap.val,tTmp.txt,0,0
@@ -1079,7 +1190,7 @@ TouchCap tc0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

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

@@ -33,6 +33,8 @@ Page cardAlarm
             vis b9,0
             vis b10,0
             vis tCode,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -44,7 +46,7 @@ Variable (string) entn
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) tSend
     Attributes
@@ -150,7 +152,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -182,7 +184,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -365,7 +367,7 @@ Button arm1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -395,7 +397,7 @@ Button arm3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -425,7 +427,7 @@ Button arm2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -455,7 +457,7 @@ Button arm4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -543,7 +545,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //text arm1
@@ -735,7 +737,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -72,16 +72,8 @@ Page cardEntities
             vis bText5,0
             vis hSlider5,0
             vis nNum5,0
-            //ui e6
+            vis bPrev,0
-            vis btOnOff6,0
+            vis bNext,0
-            vis bUp6,0
-            vis bStop6,0
-            vis bDown6,0
-            vis tIcon6,0
-            vis tEntity6,0
-            vis bText6,0
-            vis hSlider6,0
-            vis nNum6,0
         
 Variable (string) strCommand
     Attributes
@@ -117,37 +109,31 @@ Variable (string) entn1
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn5
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
-    
-Variable (string) entn6
-    Attributes
-        Scope         : local
-        Text          : 
-        Max. Text Size: 70
     
 Variable (string) type5
     Attributes
@@ -155,12 +141,6 @@ Variable (string) type5
         Text          : 
         Max. Text Size: 10
     
-Variable (string) type6
-    Attributes
-        Scope         : local
-        Text          :  
-        Max. Text Size: 10
-    
 Number nNum1
     Attributes
         Scope                               : local
@@ -206,15 +186,6 @@ Number nNum5
         Associated Keyboard                 : none
         Value                               : 0
     
-Number nNum6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Value                               : 0
-    
 Text tHeading
     Attributes
         Scope                               : local
@@ -365,26 +336,6 @@ Text tIcon5
         Text                                : 
         Max. Text Size                      : 5
     
-Text tEntity6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : tEntity6
-        Max. Text Size                      : 30
-    
-Text tIcon6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 5
-    
 Picture p0
     Attributes
         Scope                               : local
@@ -412,7 +363,7 @@ Slider hSlider1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -440,7 +391,7 @@ Slider hSlider2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -468,7 +419,7 @@ Slider hSlider3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -496,7 +447,7 @@ Slider hSlider4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -524,35 +475,7 @@ Slider hSlider5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
-Slider hSlider6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        Position                            : 50
-        Upper range limit                   : 100
-        Lower range limit                   : 0
-    
-    Events
-        Touch Release Event
-            nNum6.val=hSlider6.val
-            tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
-            covx nNum6.val,tTmp.txt,0,0
-            tSend.txt+=tTmp.txt
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -577,7 +500,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -602,7 +525,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -627,7 +550,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -652,7 +575,7 @@ Button bStop2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -677,7 +600,7 @@ Button bDown2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -702,7 +625,7 @@ Button bUp2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -727,7 +650,7 @@ Button bStop3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -752,7 +675,7 @@ Button bDown3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -777,7 +700,7 @@ Button bUp3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -802,7 +725,7 @@ Button bStop4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -827,7 +750,7 @@ Button bDown4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -852,7 +775,7 @@ Button bUp4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -884,7 +807,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -909,7 +832,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -934,7 +857,7 @@ Button bText1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -959,7 +882,7 @@ Button bText2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -984,7 +907,7 @@ Button bText3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1009,7 +932,7 @@ Button bText4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1034,7 +957,7 @@ Button bStop5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1059,7 +982,7 @@ Button bDown5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1084,7 +1007,7 @@ Button bUp5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1109,107 +1032,7 @@ Button bText5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
-Button bStop6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : 
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn6.txt+",stop"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
-Button bDown6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : 
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn6.txt+",down"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
-Button bUp6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : 
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn6.txt+",up"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
-Button bText6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : newtxt
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1236,7 +1059,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1263,7 +1086,7 @@ Dual-state Button btOnOff2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1290,7 +1113,7 @@ Dual-state Button btOnOff3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1317,7 +1140,7 @@ Dual-state Button btOnOff4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1344,34 +1167,7 @@ Dual-state Button btOnOff5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
-            crcputs tSend.txt,0
-            //send cmd
-            printh 55 bb
-            prints sys0,2
-            prints tSend.txt,0
-            prints crcval,2
-        
-Dual-state Button btOnOff6
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-        State                               : unpressed
-        Text                                : 
-        Max. Text Size                      : 10
-    
-    Events
-        Touch Press Event
-            tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
-            covx btOnOff6.val,tTmp.txt,0,0
-            tSend.txt+=tTmp.txt
-            //send calc crc
-            btlen tSend.txt,sys0
-            crcrest 1,0xffff // reset CRC
-            crcputh 55 bb
-            crcputs sys0,1
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1506,28 +1302,6 @@ Hotspot m4
                 page popupLight
             }
         
-Hotspot m5
-    Attributes
-        Scope                               : local
-        Dragging                            : 0
-        Disable release event after dragging: 0
-        Send Component ID                   : disabled
-    
-    Events
-        Touch Press Event
-            pageIcons.tTmp1.txt=tEntity6.txt
-            pageIcons.tTmp2.txt=entn6.txt
-            if(type6.txt=="shutter")
-            {
-                //popupShutter.tHeading.txt=tEntity6.txt
-                page popupShutter
-            }
-            if(type6.txt=="light")
-            {
-                //popupLight.tEntity.txt=tEntity6.txt
-                page popupLight
-            }
-        
 Timer tmSerial
     Attributes
         Scope      : local
@@ -1607,7 +1381,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -2220,128 +1994,6 @@ Timer tmSerial
                                             covx tTmp.txt,sys0,0,0
                                             hSlider5.maxval=sys0
                                         }
-                                        // get Type
-                                        spstr strCommand.txt,type6.txt,"~",33
-                                        // get internal name
-                                        spstr strCommand.txt,entn6.txt,"~",34
-                                        if(type6.txt=="delete"||type6.txt=="")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,0
-                                            vis tEntity6,0
-                                            vis tIcon6,0
-                                            vis bText6,0
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                        }else
-                                        {
-                                            // change icon
-                                            spstr strCommand.txt,tIcon6.txt,"~",35
-                                            vis tIcon6,1
-                                            // change icon color
-                                            spstr strCommand.txt,tTmp.txt,"~",36
-                                            covx tTmp.txt,sys0,0,0
-                                            tIcon6.pco=sys0
-                                            // set name
-                                            spstr strCommand.txt,tEntity6.txt,"~",37
-                                            vis tEntity6,1
-                                        }
-                                        if(type6.txt=="shutter")
-                                        {
-                                            vis bUp6,1
-                                            vis bStop6,1
-                                            vis bDown6,1
-                                            vis btOnOff6,0
-                                            vis bText6,0
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                        }
-                                        if(type6.txt=="light")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,1
-                                            vis bText6,0
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                            // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,"~",38
-                                            covx tTmp.txt,sys0,0,0
-                                            btOnOff6.val=sys0
-                                        }
-                                        if(type6.txt=="switch")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,1
-                                            vis bText6,0
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                            // get Button State (optional Value)
-                                            spstr strCommand.txt,tTmp.txt,"~",38
-                                            covx tTmp.txt,sys0,0,0
-                                            btOnOff6.val=sys0
-                                        }
-                                        if(type6.txt=="text")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,0
-                                            vis bText6,1
-                                            tsw bText6,0
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                            bText6.pco=65535
-                                            bText6.pco2=65535
-                                            // get Text (optional Value)
-                                            spstr strCommand.txt,bText6.txt,"~",38
-                                        }
-                                        if(type6.txt=="button")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,0
-                                            vis bText6,1
-                                            tsw bText6,1
-                                            vis hSlider6,0
-                                            vis nNum6,0
-                                            bText6.pco=1374
-                                            bText6.pco2=1374
-                                            // get Text (optional Value)
-                                            spstr strCommand.txt,bText6.txt,"~",38
-                                        }
-                                        if(type6.txt=="number")
-                                        {
-                                            vis bUp6,0
-                                            vis bStop6,0
-                                            vis bDown6,0
-                                            vis btOnOff6,0
-                                            vis bText6,0
-                                            tsw bText6,0
-                                            vis hSlider6,1
-                                            vis nNum6,1
-                                            // get config (optional Value) (use bText as variable)
-                                            spstr strCommand.txt,bText6.txt,"~",38
-                                            //first value is current value
-                                            spstr bText6.txt,tTmp.txt,"|",0
-                                            covx tTmp.txt,sys0,0,0
-                                            hSlider6.val=sys0
-                                            nNum6.val=sys0
-                                            //second value is min value
-                                            spstr bText6.txt,tTmp.txt,"|",1
-                                            covx tTmp.txt,sys0,0,0
-                                            hSlider6.minval=sys0
-                                            //third value is max value
-                                            spstr bText6.txt,tTmp.txt,"|",2
-                                            covx tTmp.txt,sys0,0,0
-                                            hSlider6.maxval=sys0
-                                        }
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
@@ -2452,7 +2104,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -34,6 +34,8 @@ Page cardGrid
             vis tEntity4,0
             vis tEntity5,0
             vis tEntity6,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -69,25 +71,25 @@ Variable (string) entn1
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) type5
     Attributes
@@ -105,13 +107,13 @@ Variable (string) entn5
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) entn6
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tHeading
     Attributes
@@ -254,7 +256,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -279,7 +281,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -315,7 +317,7 @@ Button bEntity1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -351,7 +353,7 @@ Button bEntity2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -387,7 +389,7 @@ Button bEntity3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -423,7 +425,7 @@ Button bEntity4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -459,7 +461,7 @@ Button bEntity5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -495,7 +497,7 @@ Button bEntity6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -599,7 +601,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -838,7 +840,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -18,25 +18,26 @@ Page cardMedia
             vis tTmp,0
             vis tId,0
             vis t5,0
-            //vis nPageDisp,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 500
+        Max. Text Size: 750
     
 Variable (string) entn
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) vaSpeakerList
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 200
+        Max. Text Size: 400
     
 Variable (int32) vaSpeakerPos
     Attributes
@@ -134,7 +135,7 @@ Text t2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -163,7 +164,7 @@ Text tPlayPause
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -192,7 +193,7 @@ Text t0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -232,7 +233,7 @@ Text t1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -262,7 +263,7 @@ Text t3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -301,7 +302,7 @@ Text tSpeaker
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -352,7 +353,7 @@ Text t5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -390,7 +391,7 @@ Slider hVolume
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -415,7 +416,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -447,7 +448,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -534,7 +535,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -697,7 +698,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -31,6 +31,8 @@ Page cardThermo
             vis bt6,0
             vis bt7,0
             vis bt8,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -42,7 +44,7 @@ Variable (string) entn
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) va0
     Attributes
@@ -237,7 +239,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -273,7 +275,7 @@ Button bDown
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -309,7 +311,7 @@ Button bUp
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -341,7 +343,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -368,7 +370,7 @@ Dual-state Button bt0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -395,7 +397,7 @@ Dual-state Button bt1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -422,7 +424,7 @@ Dual-state Button bt2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -449,7 +451,7 @@ Dual-state Button bt3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -476,7 +478,7 @@ Dual-state Button bt4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -503,7 +505,7 @@ Dual-state Button bt5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -530,7 +532,7 @@ Dual-state Button bt6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -557,7 +559,7 @@ Dual-state Button bt7
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -584,7 +586,7 @@ Dual-state Button bt8
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -671,7 +673,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -948,7 +950,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

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

@@ -30,7 +30,7 @@ Text tTmp1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
     
 Text tTmp2
     Attributes
@@ -40,7 +40,7 @@ Text tTmp2
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
     
 Picture p0
     Attributes

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

@@ -152,7 +152,7 @@ Text tVersion
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 30
+        Text                                : 34
         Max. Text Size                      : 10
     
 Picture p0
@@ -182,7 +182,7 @@ Button bSendStartup
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

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

@@ -29,7 +29,7 @@ Page popupLight
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -59,8 +59,8 @@ Variable (string) strCommand
 Variable (string) entn
     Attributes
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (int32) mode
     Attributes
@@ -100,7 +100,7 @@ Text t1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Brightness
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
     
 Text t2
     Attributes
@@ -130,7 +130,7 @@ Text t4
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Temperature
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
     
 Text tSend
     Attributes
@@ -180,7 +180,7 @@ Text t0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Color
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
     
 Picture p0
     Attributes
@@ -213,7 +213,7 @@ Picture pColorWheel
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -243,7 +243,7 @@ Slider hBrightness
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -273,7 +273,7 @@ Slider hTempSlider
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -298,7 +298,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -361,7 +361,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -535,6 +535,12 @@ Timer tmSerial
                                                 vis pColorWheel,1
                                             }
                                         }
+                                        // set t0 Color (Localization)
+                                        spstr strCommand.txt,t0.txt,"~",7
+                                        // set t4 Temperature (Localization)
+                                        spstr strCommand.txt,t4.txt,"~",8
+                                        // set t1 Brightness (Localization)
+                                        spstr strCommand.txt,t1.txt,"~",9
                                     }
                                     if(tInstruction.txt=="time")
                                     {
@@ -570,25 +576,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -120,7 +120,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -147,7 +147,7 @@ Button b2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -174,7 +174,7 @@ Button b1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -339,25 +339,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
+                                            page cardMedia
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -29,7 +29,7 @@ Page popupShutter
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -46,8 +46,8 @@ Variable (string) strCommand
 Variable (string) entn
     Attributes
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tEntity
     Attributes
@@ -109,7 +109,7 @@ Text tId
         Text                                : 
         Max. Text Size                      : 20
     
-Text t1
+Text tPosHeading
     Attributes
         Scope                               : local
         Dragging                            : 0
@@ -119,6 +119,16 @@ Text t1
         Text                                : Position
         Max. Text Size                      : 15
     
+Text tInfo1
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 40
+    
 Picture p0
     Attributes
         Scope                               : local
@@ -147,7 +157,7 @@ Slider hPosition
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -172,7 +182,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -197,7 +207,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -222,7 +232,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -247,7 +257,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -331,6 +341,10 @@ Timer tmSerial
                                         spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
+                                        // set tinfo1 text
+                                        spstr strCommand.txt,tInfo1.txt,"~",2
+                                        // set tPosHeading (localization)
+                                        spstr strCommand.txt,tPosHeading.txt,"~",3
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
@@ -366,30 +380,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

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

@@ -17,6 +17,8 @@ Page screensaver
             vis tInstruction,0
             vis tTmp,0
             vis p0,0
+            vis tNotifyHead,0
+            vis tNotifyText,0
             //load gloabl time string from pageIcons
             //tTime.txt=vaTime.txt
             spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -48,25 +50,17 @@ Variable (int32) vaTap
         Scope: local
         Value: 0
     
-Text tInstruction
+Variable (string) tInstruction
     Attributes
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 50
     
-Text tTmp
+Variable (string) tTmp
     Attributes
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
-        Send Component ID                   : disabled
-        Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 50
     
 Text tTime
     Attributes
@@ -298,6 +292,26 @@ Text tMR
         Text                                : 
         Max. Text Size                      : 10
     
+Text tNotifyHead
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 35
+    
+Text tNotifyText
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 35
+    
 Picture p0
     Attributes
         Scope                               : local
@@ -458,6 +472,91 @@ Timer tmSerial
                                         //tMR
                                         spstr strCommand.txt,tMR.txt,"~",16
                                     }
+                                    if(tInstruction.txt=="color")
+                                    {
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,tTime.bco,0,0
+                                        screensaver.bco=tTime.bco
+                                        tAMPM.bco=tTime.bco
+                                        tDate.bco=tTime.bco
+                                        tMainIcon.bco=tTime.bco
+                                        tMainText.bco=tTime.bco
+                                        tMainIconAlt.bco=tTime.bco
+                                        tMainTextAlt.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tMR.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tForecast1.bco=tTime.bco
+                                        tForecast1Val.bco=tTime.bco
+                                        tF1Icon.bco=tTime.bco
+                                        tForecast2.bco=tTime.bco
+                                        tForecast2Val.bco=tTime.bco
+                                        tF2Icon.bco=tTime.bco
+                                        tForecast3.bco=tTime.bco
+                                        tForecast3Val.bco=tTime.bco
+                                        tF3Icon.bco=tTime.bco
+                                        tForecast4.bco=tTime.bco
+                                        tForecast4Val.bco=tTime.bco
+                                        tF4Icon.bco=tTime.bco
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        covx tTmp.txt,tTime.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",3
+                                        covx tTmp.txt,tAMPM.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        covx tTmp.txt,tDate.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        covx tTmp.txt,tMainIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",6
+                                        covx tTmp.txt,tMainText.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        covx tTmp.txt,tForecast1.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        covx tTmp.txt,tForecast2.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        covx tTmp.txt,tForecast3.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        covx tTmp.txt,tForecast4.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        covx tTmp.txt,tF1Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",12
+                                        covx tTmp.txt,tF2Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        covx tTmp.txt,tF3Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",14
+                                        covx tTmp.txt,tF4Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        covx tTmp.txt,tForecast1Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",16
+                                        covx tTmp.txt,tForecast2Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",17
+                                        covx tTmp.txt,tForecast3Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",18
+                                        covx tTmp.txt,tForecast4Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",19
+                                        covx tTmp.txt,t10.bco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",20
+                                        covx tTmp.txt,tMainIconAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",21
+                                        covx tTmp.txt,tMainTextAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",22
+                                        covx tTmp.txt,tMRIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                        covx tTmp.txt,tMR.pco,0,0
+                                    }
+                                    if(tInstruction.txt=="notify")
+                                    {
+                                        spstr strCommand.txt,tNotifyHead.txt,"~",1
+                                        spstr strCommand.txt,tNotifyText.txt,"~",2
+                                        if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+                                        {
+                                            vis tNotifyHead,1
+                                            vis tNotifyText,1
+                                        }else
+                                        {
+                                            vis tNotifyHead,0
+                                            vis tNotifyText,0
+                                        }
+                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         dim=100
@@ -547,6 +646,16 @@ TouchCap tc0
     
     Events
         Touch Press Event
+            if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+            {
+                if(dim!=0)
+                {
+                    tNotifyHead.txt=""
+                    tNotifyText.txt=""
+                    vis tNotifyHead,0
+                    vis tNotifyText,0
+                }
+            }
             dim=dimValueNormal
             vaTap.val+=1
             covx vaTap.val,tTmp.txt,0,0
@@ -555,7 +664,7 @@ TouchCap tc0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

HMI/code_gen/icons/icons.py

@@ -28,19 +28,24 @@ def get_icon_id(ma_name):
 
 # write mapping lib for typescript
 with open(os.path.join(__location__, "../../../iobroker", "icon_mapping.ts"), 'w') as f:
-    f.write("let iconMap = new Map<string, string>([\n")
+    f.write("""
+export class IconsSelector {
+    iconMap = new Map<string, string>([
+""")
     for icon in icon_metadata:
         iconchar = chr(int(icon['hex'], 16))
         name = icon["name"]
-        f.write(f"    [\"{name}\", \"{iconchar}\"],\n")
+        f.write(f"        [\"{name}\", \"{iconchar}\"],\n")
     f.write("]);\n")
     f.write("""
-function get_icon(ma_name:string):string{
+    GetIcon(ma_name:string):string{
-    if(iconMap.has(ma_name)){
+        if(this.iconMap.has(ma_name)){
-        return iconMap.get(ma_name);
+            return this.iconMap.get(ma_name)!;
+        }
+        return ""; 
     }
-    return iconMap.get("alert-circle-outline");
 }
+
 """);
 
 # write documentation file

HMI/code_gen/pages/cardEntitiesSerial.py

@@ -7,7 +7,7 @@ head = sharedhead + """
 """ + navigation
 print(head)
 start = 3
-for i in range(1,7):
+for i in range(1,6):
     idxstart = start + (i-1)*6
     item = f"""
               // get Type

HMI/code_gen/pages/shared.py

@@ -160,7 +160,7 @@ navigation = """
               }
               if(tTmp.txt=="1")
               {
-                vis bPrev,1
+                vis bNext,1
                 bNext.txt=""
               }
 """

HMI/n2t-out-visual/cardAlarm.txt

@@ -41,6 +41,8 @@ Page cardAlarm
             vis b9,0
             vis b10,0
             vis tCode,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -54,7 +56,7 @@ Variable (string) entn
         ID            : 9
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) tSend
     Attributes
@@ -297,7 +299,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -351,7 +353,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -822,7 +824,7 @@ Button arm1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -876,7 +878,7 @@ Button arm3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -930,7 +932,7 @@ Button arm2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -984,7 +986,7 @@ Button arm4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1073,7 +1075,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //text arm1
@@ -1266,7 +1268,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

HMI/n2t-out-visual/cardEntities.txt

@@ -70,6 +70,8 @@ Page cardEntities
             vis bText4,0
             vis hSlider4,0
             vis nNum4,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -111,28 +113,28 @@ Variable (string) entn1
         ID            : 49
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         ID            : 50
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         ID            : 51
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         ID            : 52
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Number nNum1
     Attributes
@@ -696,7 +698,7 @@ Slider hSlider1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -739,7 +741,7 @@ Slider hSlider2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -782,7 +784,7 @@ Slider hSlider3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -825,7 +827,7 @@ Slider hSlider4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -872,7 +874,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -919,7 +921,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -966,7 +968,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1013,7 +1015,7 @@ Button bStop2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1060,7 +1062,7 @@ Button bDown2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1107,7 +1109,7 @@ Button bUp2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1154,7 +1156,7 @@ Button bStop3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1201,7 +1203,7 @@ Button bDown3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1248,7 +1250,7 @@ Button bUp3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1295,7 +1297,7 @@ Button bStop4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1342,7 +1344,7 @@ Button bDown4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1389,7 +1391,7 @@ Button bUp4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1443,7 +1445,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1490,7 +1492,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1537,7 +1539,7 @@ Button bText1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1584,7 +1586,7 @@ Button bText2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1631,7 +1633,7 @@ Button bText3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1678,7 +1680,7 @@ Button bText4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1723,7 +1725,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1768,7 +1770,7 @@ Dual-state Button btOnOff2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1813,7 +1815,7 @@ Dual-state Button btOnOff3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1858,7 +1860,7 @@ Dual-state Button btOnOff4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -2096,7 +2098,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -2698,7 +2700,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

HMI/n2t-out-visual/cardGrid.txt

@@ -42,6 +42,8 @@ Page cardGrid
             vis tEntity4,0
             vis tEntity5,0
             vis tEntity6,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -83,28 +85,28 @@ Variable (string) entn1
         ID            : 18
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         ID            : 19
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         ID            : 20
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         ID            : 21
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) type5
     Attributes
@@ -125,14 +127,14 @@ Variable (string) entn5
         ID            : 36
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) entn6
     Attributes
         ID            : 37
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tHeading
     Attributes
@@ -527,7 +529,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -574,7 +576,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -632,7 +634,7 @@ Button bEntity1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -690,7 +692,7 @@ Button bEntity2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -748,7 +750,7 @@ Button bEntity3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -806,7 +808,7 @@ Button bEntity4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -864,7 +866,7 @@ Button bEntity5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -922,7 +924,7 @@ Button bEntity6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1036,7 +1038,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -1276,7 +1278,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

HMI/n2t-out-visual/cardMedia.txt

@@ -26,28 +26,29 @@ Page cardMedia
             vis tTmp,0
             vis tId,0
             vis t5,0
-            //vis nPageDisp,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
         ID            : 7
         Scope         : local
         Text          : 
-        Max. Text Size: 500
+        Max. Text Size: 750
     
 Variable (string) entn
     Attributes
         ID            : 18
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) vaSpeakerList
     Attributes
         ID            : 27
         Scope         : local
         Text          : 
-        Max. Text Size: 200
+        Max. Text Size: 400
     
 Variable (int32) vaSpeakerPos
     Attributes
@@ -306,7 +307,7 @@ Text t2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -355,7 +356,7 @@ Text tPlayPause
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -404,7 +405,7 @@ Text t0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -484,7 +485,7 @@ Text t1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -534,7 +535,7 @@ Text t3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -613,7 +614,7 @@ Text tSpeaker
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -704,7 +705,7 @@ Text t5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -767,7 +768,7 @@ Slider hVolume
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -814,7 +815,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -868,7 +869,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -956,7 +957,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -1120,7 +1121,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

HMI/n2t-out-visual/cardThermo.txt

@@ -39,6 +39,8 @@ Page cardThermo
             vis bt6,0
             vis bt7,0
             vis bt8,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -52,7 +54,7 @@ Variable (string) entn
         ID            : 21
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) va0
     Attributes
@@ -533,7 +535,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -587,7 +589,7 @@ Button bDown
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -641,7 +643,7 @@ Button bUp
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -695,7 +697,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -744,7 +746,7 @@ Dual-state Button bt0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -793,7 +795,7 @@ Dual-state Button bt1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -842,7 +844,7 @@ Dual-state Button bt2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -891,7 +893,7 @@ Dual-state Button bt3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -940,7 +942,7 @@ Dual-state Button bt4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -989,7 +991,7 @@ Dual-state Button bt5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1038,7 +1040,7 @@ Dual-state Button bt6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1087,7 +1089,7 @@ Dual-state Button bt7
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1136,7 +1138,7 @@ Dual-state Button bt8
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1224,7 +1226,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -1502,7 +1504,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

HMI/n2t-out-visual/nspanel_Stats.txt

@@ -10,49 +10,49 @@ pageTest
 	13   Component(s)
 	13   Line(s) of event code
 	13   Unique line(s) of event code
-popupNotify
+cardMedia
-	17   Component(s)
+	30   Component(s)
-	178  Line(s) of event code
+	331  Line(s) of event code
-	117  Unique line(s) of event code
+	171  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
+screensaver
+	35   Component(s)
+	292  Line(s) of event code
+	235  Unique line(s) of event code
 cardGrid
 	39   Component(s)
-	418  Line(s) of event code
+	420  Line(s) of event code
-	243  Unique line(s) of event code
+	246  Unique line(s) of event code
+popupNotify
+	17   Component(s)
+	196  Line(s) of event code
+	123  Unique line(s) of event code
+popupShutter
+	20   Component(s)
+	193  Line(s) of event code
+	109  Unique line(s) of event code
 popupLight
 	27   Component(s)
-	320  Line(s) of event code
+	341  Line(s) of event code
-	173  Unique line(s) of event code
+	185  Unique line(s) of event code
-popupShutter
-	19   Component(s)
-	178  Line(s) of event code
-	101  Unique line(s) of event code
-cardMedia
-	30   Component(s)
-	329  Line(s) of event code
-	168  Unique line(s) of event code
 cardAlarm
 	35   Component(s)
-	343  Line(s) of event code
+	345  Line(s) of event code
-	213  Unique line(s) of event code
+	216  Unique line(s) of event code
-cardThermo
-	41   Component(s)
-	442  Line(s) of event code
-	246  Unique line(s) of event code
-screensaver
-	33   Component(s)
-	195  Line(s) of event code
-	152  Unique line(s) of event code
 cardEntities
 	62   Component(s)
-	964  Line(s) of event code
+	966  Line(s) of event code
-	409  Unique line(s) of event code
+	412  Unique line(s) of event code
+cardThermo
+	41   Component(s)
+	444  Line(s) of event code
+	249  Unique line(s) of event code
 
 Total
 	12   Page(s)
-	341  Component(s)
+	344  Component(s)
-	3541 Line(s) of event code
+	3702 Line(s) of event code
-	947  Unique line(s) of event code
+	1025 Unique line(s) of event code

HMI/n2t-out-visual/pageIcons.txt

@@ -57,7 +57,7 @@ Text tTmp1
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -87,7 +87,7 @@ Text tTmp2
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0

HMI/n2t-out-visual/pageStartup.txt

@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 30
+        Text                                : 34
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
@@ -467,7 +467,7 @@ Button bSendStartup
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

HMI/n2t-out-visual/popupLight.txt

@@ -37,7 +37,7 @@ Page popupLight
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -69,8 +69,8 @@ Variable (string) entn
     Attributes
         ID            : 21
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (int32) mode
     Attributes
@@ -154,7 +154,7 @@ Text t1
         Opacity                             : 127
         x coordinate                        : 10
         y coordinate                        : 226
-        Width                               : 100
+        Width                               : 244
         Height                              : 30
         Effect                              : load
         Effect Priority                     : 0
@@ -165,11 +165,11 @@ Text t1
         Font ID                             : 0
         Back. Color                         : 6371
         Font Color                          : 65535
-        Horizontal Alignment                : center
+        Horizontal Alignment                : left
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Brightness
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -244,7 +244,7 @@ Text t4
         Opacity                             : 127
         x coordinate                        : 9
         y coordinate                        : 143
-        Width                               : 116
+        Width                               : 242
         Height                              : 30
         Effect                              : load
         Effect Priority                     : 0
@@ -255,11 +255,11 @@ Text t4
         Font ID                             : 0
         Back. Color                         : 6371
         Font Color                          : 65535
-        Horizontal Alignment                : center
+        Horizontal Alignment                : left
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Temperature
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -405,11 +405,11 @@ Text t0
         Font ID                             : 0
         Back. Color                         : 6371
         Font Color                          : 65535
-        Horizontal Alignment                : center
+        Horizontal Alignment                : left
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : Color
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -465,7 +465,7 @@ Picture pColorWheel
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -510,7 +510,7 @@ Slider hBrightness
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -555,7 +555,7 @@ Slider hTempSlider
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -602,7 +602,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -618,7 +618,7 @@ Button bColor
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 89
+        x coordinate                        : 93
         y coordinate                        : 68
         Width                               : 50
         Height                              : 50
@@ -705,7 +705,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -881,6 +881,12 @@ Timer tmSerial
                                                 vis pColorWheel,1
                                             }
                                         }
+                                        // set t0 Color (Localization)
+                                        spstr strCommand.txt,t0.txt,"~",7
+                                        // set t4 Temperature (Localization)
+                                        spstr strCommand.txt,t4.txt,"~",8
+                                        // set t1 Brightness (Localization)
+                                        spstr strCommand.txt,t1.txt,"~",9
                                     }
                                     if(tInstruction.txt=="time")
                                     {
@@ -916,25 +922,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

HMI/n2t-out-visual/popupNotify.txt

@@ -283,7 +283,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -332,7 +332,7 @@ Button b2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -381,7 +381,7 @@ Button b1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -548,25 +548,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
+                                            page cardMedia
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

HMI/n2t-out-visual/popupShutter.txt

@@ -37,7 +37,7 @@ Page popupShutter
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -56,8 +56,8 @@ Variable (string) entn
     Attributes
         ID            : 18
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tEntity
     Attributes
@@ -68,7 +68,7 @@ Text tEntity
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 65
-        y coordinate                        : 108
+        y coordinate                        : 94
         Width                               : 195
         Height                              : 30
         Effect                              : load
@@ -98,7 +98,7 @@ Text tIcon1
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 12
-        y coordinate                        : 109
+        y coordinate                        : 108
         Width                               : 45
         Height                              : 30
         Effect                              : load
@@ -239,7 +239,7 @@ Text tId
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
-Text t1
+Text tPosHeading
     Attributes
         ID                                  : 17
         Scope                               : local
@@ -269,6 +269,36 @@ Text t1
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tInfo1
+    Attributes
+        ID                                  : 19
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 65
+        y coordinate                        : 122
+        Width                               : 195
+        Height                              : 30
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 0
+        Back. Color                         : 6371
+        Font Color                          : 38066
+        Horizontal Alignment                : left
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 40
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
@@ -322,7 +352,7 @@ Slider hPosition
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -369,7 +399,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -416,7 +446,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -463,7 +493,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -510,7 +540,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -596,6 +626,10 @@ Timer tmSerial
                                         spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
+                                        // set tinfo1 text
+                                        spstr strCommand.txt,tInfo1.txt,"~",2
+                                        // set tPosHeading (localization)
+                                        spstr strCommand.txt,tPosHeading.txt,"~",3
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
@@ -631,30 +665,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

HMI/n2t-out-visual/screensaver.txt

@@ -25,6 +25,8 @@ Page screensaver
             vis tInstruction,0
             vis tTmp,0
             vis p0,0
+            vis tNotifyHead,0
+            vis tNotifyText,0
             //load gloabl time string from pageIcons
             //tTime.txt=vaTime.txt
             spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -59,6 +61,20 @@ Variable (int32) vaTap
         Scope: local
         Value: 0
     
+Variable (string) tInstruction
+    Attributes
+        ID            : 31
+        Scope         : local
+        Text          : 
+        Max. Text Size: 50
+    
+Variable (string) tTmp
+    Attributes
+        ID            : 32
+        Scope         : local
+        Text          : 
+        Max. Text Size: 50
+    
 Text tTime
     Attributes
         ID                                  : 5
@@ -749,48 +765,48 @@ Text tMR
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
-Text tTmp
+Text tNotifyHead
     Attributes
-        ID                                  : 31
+        ID                                  : 33
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 368
+        x coordinate                        : 0
-        y coordinate                        : 0
+        y coordinate                        : 201
-        Width                               : 25
+        Width                               : 450
-        Height                              : 30
+        Height                              : 58
         Effect                              : load
         Effect Priority                     : 0
         Effect Time                         : 300
         Fill                                : solid color
         Style                               : flat
         Associated Keyboard                 : none
-        Font ID                             : 0
+        Font ID                             : 3
-        Back. Color                         : 65535
+        Back. Color                         : 0
-        Font Color                          : 0
+        Font Color                          : 65535
         Horizontal Alignment                : center
-        Vertical Alignment                  : center
+        Vertical Alignment                  : top
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 35
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
-Text tInstruction
+Text tNotifyText
     Attributes
-        ID                                  : 32
+        ID                                  : 34
         Scope                               : local
         Dragging                            : 0
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 335
+        x coordinate                        : 0
-        y coordinate                        : 0
+        y coordinate                        : 258
-        Width                               : 27
+        Width                               : 450
-        Height                              : 30
+        Height                              : 47
         Effect                              : load
         Effect Priority                     : 0
         Effect Time                         : 300
@@ -798,13 +814,13 @@ Text tInstruction
         Style                               : flat
         Associated Keyboard                 : none
         Font ID                             : 0
-        Back. Color                         : 65535
+        Back. Color                         : 0
-        Font Color                          : 0
+        Font Color                          : 65535
         Horizontal Alignment                : center
-        Vertical Alignment                  : center
+        Vertical Alignment                  : top
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 35
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -980,6 +996,91 @@ Timer tmSerial
                                         //tMR
                                         spstr strCommand.txt,tMR.txt,"~",16
                                     }
+                                    if(tInstruction.txt=="color")
+                                    {
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,tTime.bco,0,0
+                                        screensaver.bco=tTime.bco
+                                        tAMPM.bco=tTime.bco
+                                        tDate.bco=tTime.bco
+                                        tMainIcon.bco=tTime.bco
+                                        tMainText.bco=tTime.bco
+                                        tMainIconAlt.bco=tTime.bco
+                                        tMainTextAlt.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tMR.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tForecast1.bco=tTime.bco
+                                        tForecast1Val.bco=tTime.bco
+                                        tF1Icon.bco=tTime.bco
+                                        tForecast2.bco=tTime.bco
+                                        tForecast2Val.bco=tTime.bco
+                                        tF2Icon.bco=tTime.bco
+                                        tForecast3.bco=tTime.bco
+                                        tForecast3Val.bco=tTime.bco
+                                        tF3Icon.bco=tTime.bco
+                                        tForecast4.bco=tTime.bco
+                                        tForecast4Val.bco=tTime.bco
+                                        tF4Icon.bco=tTime.bco
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        covx tTmp.txt,tTime.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",3
+                                        covx tTmp.txt,tAMPM.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        covx tTmp.txt,tDate.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        covx tTmp.txt,tMainIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",6
+                                        covx tTmp.txt,tMainText.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        covx tTmp.txt,tForecast1.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        covx tTmp.txt,tForecast2.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        covx tTmp.txt,tForecast3.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        covx tTmp.txt,tForecast4.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        covx tTmp.txt,tF1Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",12
+                                        covx tTmp.txt,tF2Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        covx tTmp.txt,tF3Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",14
+                                        covx tTmp.txt,tF4Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        covx tTmp.txt,tForecast1Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",16
+                                        covx tTmp.txt,tForecast2Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",17
+                                        covx tTmp.txt,tForecast3Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",18
+                                        covx tTmp.txt,tForecast4Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",19
+                                        covx tTmp.txt,t10.bco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",20
+                                        covx tTmp.txt,tMainIconAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",21
+                                        covx tTmp.txt,tMainTextAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",22
+                                        covx tTmp.txt,tMRIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                        covx tTmp.txt,tMR.pco,0,0
+                                    }
+                                    if(tInstruction.txt=="notify")
+                                    {
+                                        spstr strCommand.txt,tNotifyHead.txt,"~",1
+                                        spstr strCommand.txt,tNotifyText.txt,"~",2
+                                        if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+                                        {
+                                            vis tNotifyHead,1
+                                            vis tNotifyText,1
+                                        }else
+                                        {
+                                            vis tNotifyHead,0
+                                            vis tNotifyText,0
+                                        }
+                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         dim=100
@@ -1071,6 +1172,16 @@ TouchCap tc0
     
     Events
         Touch Press Event
+            if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+            {
+                if(dim!=0)
+                {
+                    tNotifyHead.txt=""
+                    tNotifyText.txt=""
+                    vis tNotifyHead,0
+                    vis tNotifyText,0
+                }
+            }
             dim=dimValueNormal
             vaTap.val+=1
             covx vaTap.val,tTmp.txt,0,0
@@ -1079,7 +1190,7 @@ TouchCap tc0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

HMI/n2t-out/cardAlarm.txt

@@ -33,6 +33,8 @@ Page cardAlarm
             vis b9,0
             vis b10,0
             vis tCode,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -44,7 +46,7 @@ Variable (string) entn
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) tSend
     Attributes
@@ -150,7 +152,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -182,7 +184,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -365,7 +367,7 @@ Button arm1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -395,7 +397,7 @@ Button arm3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -425,7 +427,7 @@ Button arm2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -455,7 +457,7 @@ Button arm4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -543,7 +545,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //text arm1
@@ -735,7 +737,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

HMI/n2t-out/cardEntities.txt

@@ -62,6 +62,8 @@ Page cardEntities
             vis bText4,0
             vis hSlider4,0
             vis nNum4,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -97,25 +99,25 @@ Variable (string) entn1
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Number nNum1
     Attributes
@@ -310,7 +312,7 @@ Slider hSlider1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -338,7 +340,7 @@ Slider hSlider2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -366,7 +368,7 @@ Slider hSlider3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -394,7 +396,7 @@ Slider hSlider4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -419,7 +421,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -444,7 +446,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -469,7 +471,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -494,7 +496,7 @@ Button bStop2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -519,7 +521,7 @@ Button bDown2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -544,7 +546,7 @@ Button bUp2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -569,7 +571,7 @@ Button bStop3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -594,7 +596,7 @@ Button bDown3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -619,7 +621,7 @@ Button bUp3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -644,7 +646,7 @@ Button bStop4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -669,7 +671,7 @@ Button bDown4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -694,7 +696,7 @@ Button bUp4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -726,7 +728,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -751,7 +753,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -776,7 +778,7 @@ Button bText1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -801,7 +803,7 @@ Button bText2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -826,7 +828,7 @@ Button bText3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -851,7 +853,7 @@ Button bText4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -878,7 +880,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -905,7 +907,7 @@ Dual-state Button btOnOff2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -932,7 +934,7 @@ Dual-state Button btOnOff3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -959,7 +961,7 @@ Dual-state Button btOnOff4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -1151,7 +1153,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -1752,7 +1754,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

HMI/n2t-out/cardGrid.txt

@@ -34,6 +34,8 @@ Page cardGrid
             vis tEntity4,0
             vis tEntity5,0
             vis tEntity6,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -69,25 +71,25 @@ Variable (string) entn1
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn2
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn3
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) entn4
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 70
+        Max. Text Size: 80
     
 Variable (string) type5
     Attributes
@@ -105,13 +107,13 @@ Variable (string) entn5
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) entn6
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tHeading
     Attributes
@@ -254,7 +256,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -279,7 +281,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -315,7 +317,7 @@ Button bEntity1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -351,7 +353,7 @@ Button bEntity2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -387,7 +389,7 @@ Button bEntity3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -423,7 +425,7 @@ Button bEntity4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -459,7 +461,7 @@ Button bEntity5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -495,7 +497,7 @@ Button bEntity6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -599,7 +601,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         // get Type
@@ -838,7 +840,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

HMI/n2t-out/cardMedia.txt

@@ -18,25 +18,26 @@ Page cardMedia
             vis tTmp,0
             vis tId,0
             vis t5,0
-            //vis nPageDisp,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 500
+        Max. Text Size: 750
     
 Variable (string) entn
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) vaSpeakerList
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 200
+        Max. Text Size: 400
     
 Variable (int32) vaSpeakerPos
     Attributes
@@ -134,7 +135,7 @@ Text t2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -163,7 +164,7 @@ Text tPlayPause
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -192,7 +193,7 @@ Text t0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -232,7 +233,7 @@ Text t1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -262,7 +263,7 @@ Text t3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -301,7 +302,7 @@ Text tSpeaker
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -352,7 +353,7 @@ Text t5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -390,7 +391,7 @@ Slider hVolume
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -415,7 +416,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -447,7 +448,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -534,7 +535,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -697,7 +698,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

HMI/n2t-out/cardThermo.txt

@@ -31,6 +31,8 @@ Page cardThermo
             vis bt6,0
             vis bt7,0
             vis bt8,0
+            vis bPrev,0
+            vis bNext,0
         
 Variable (string) strCommand
     Attributes
@@ -42,7 +44,7 @@ Variable (string) entn
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (string) va0
     Attributes
@@ -237,7 +239,7 @@ Button bNext
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -273,7 +275,7 @@ Button bDown
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -309,7 +311,7 @@ Button bUp
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -341,7 +343,7 @@ Button bPrev
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -368,7 +370,7 @@ Dual-state Button bt0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -395,7 +397,7 @@ Dual-state Button bt1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -422,7 +424,7 @@ Dual-state Button bt2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -449,7 +451,7 @@ Dual-state Button bt3
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -476,7 +478,7 @@ Dual-state Button bt4
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -503,7 +505,7 @@ Dual-state Button bt5
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -530,7 +532,7 @@ Dual-state Button bt6
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -557,7 +559,7 @@ Dual-state Button bt7
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -584,7 +586,7 @@ Dual-state Button bt8
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -671,7 +673,7 @@ Timer tmSerial
                                         }
                                         if(tTmp.txt=="1")
                                         {
-                                            vis bPrev,1
+                                            vis bNext,1
                                             bNext.txt=""
                                         }
                                         //entity name
@@ -948,7 +950,7 @@ Timer tmSleep
                     btlen tSend.txt,sys0
                     crcrest 1,0xffff // reset CRC
                     crcputh 55 bb
-                    crcputs sys0,1
+                    crcputs sys0,2
                     crcputs tSend.txt,0
                     //send cmd
                     printh 55 bb

HMI/n2t-out/pageIcons.txt

@@ -30,7 +30,7 @@ Text tTmp1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
     
 Text tTmp2
     Attributes
@@ -40,7 +40,7 @@ Text tTmp2
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 80
     
 Picture p0
     Attributes

HMI/n2t-out/pageStartup.txt

@@ -152,7 +152,7 @@ Text tVersion
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 30
+        Text                                : 34
         Max. Text Size                      : 10
     
 Picture p0
@@ -182,7 +182,7 @@ Button bSendStartup
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

HMI/n2t-out/popupLight.txt

@@ -29,7 +29,7 @@ Page popupLight
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -59,8 +59,8 @@ Variable (string) strCommand
 Variable (string) entn
     Attributes
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Variable (int32) mode
     Attributes
@@ -100,7 +100,7 @@ Text t1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Brightness
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
     
 Text t2
     Attributes
@@ -130,7 +130,7 @@ Text t4
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Temperature
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
     
 Text tSend
     Attributes
@@ -180,7 +180,7 @@ Text t0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : Color
-        Max. Text Size                      : 15
+        Max. Text Size                      : 50
     
 Picture p0
     Attributes
@@ -213,7 +213,7 @@ Picture pColorWheel
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -243,7 +243,7 @@ Slider hBrightness
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -273,7 +273,7 @@ Slider hTempSlider
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -298,7 +298,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -361,7 +361,7 @@ Dual-state Button btOnOff1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -535,6 +535,12 @@ Timer tmSerial
                                                 vis pColorWheel,1
                                             }
                                         }
+                                        // set t0 Color (Localization)
+                                        spstr strCommand.txt,t0.txt,"~",7
+                                        // set t4 Temperature (Localization)
+                                        spstr strCommand.txt,t4.txt,"~",8
+                                        // set t1 Brightness (Localization)
+                                        spstr strCommand.txt,t1.txt,"~",9
                                     }
                                     if(tInstruction.txt=="time")
                                     {
@@ -570,25 +576,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

HMI/n2t-out/popupNotify.txt

@@ -120,7 +120,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -147,7 +147,7 @@ Button b2
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -174,7 +174,7 @@ Button b1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -339,25 +339,43 @@ Timer tmSerial
                                             pageIcons.tTmp1.txt=tTmp.txt
                                             page popupLight
                                         }
+                                        if(tId.txt=="pageStartup")
+                                        {
+                                            page pageStartup
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
+                                        }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
+                                        }
+                                        if(tId.txt=="popupLight")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
+                                        }
+                                        if(tId.txt=="popupNotify")
+                                        {
+                                            page popupNotify
                                         }
                                         if(tId.txt=="cardThermo")
                                         {
                                             page cardThermo
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                         {
-                                            page pageStartup
+                                            page cardMedia
-                                        }
-                                        if(tId.txt=="cardGrid")
-                                        {
-                                            page cardGrid
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

HMI/n2t-out/popupShutter.txt

@@ -29,7 +29,7 @@ Page popupShutter
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -46,8 +46,8 @@ Variable (string) strCommand
 Variable (string) entn
     Attributes
         Scope         : local
-        Text          : newtxt
+        Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 80
     
 Text tEntity
     Attributes
@@ -109,7 +109,7 @@ Text tId
         Text                                : 
         Max. Text Size                      : 20
     
-Text t1
+Text tPosHeading
     Attributes
         Scope                               : local
         Dragging                            : 0
@@ -119,6 +119,16 @@ Text t1
         Text                                : Position
         Max. Text Size                      : 15
     
+Text tInfo1
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 40
+    
 Picture p0
     Attributes
         Scope                               : local
@@ -147,7 +157,7 @@ Slider hPosition
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -172,7 +182,7 @@ Button b0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -197,7 +207,7 @@ Button bDown1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -222,7 +232,7 @@ Button bStop1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -247,7 +257,7 @@ Button bUp1
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb
@@ -331,6 +341,10 @@ Timer tmSerial
                                         spstr strCommand.txt,tTmp.txt,"~",1
                                         covx tTmp.txt,sys0,0,0
                                         hPosition.val=sys0
+                                        // set tinfo1 text
+                                        spstr strCommand.txt,tInfo1.txt,"~",2
+                                        // set tPosHeading (localization)
+                                        spstr strCommand.txt,tPosHeading.txt,"~",3
                                     }
                                     if(tInstruction.txt=="dimmode")
                                     {
@@ -366,30 +380,43 @@ Timer tmSerial
                                         //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
                                         udelete payloadLength-1
                                         bufferPos=0
-                                        if(tId.txt=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                         {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
+                                        if(tId.txt=="screensaver")
+                                        {
+                                            page screensaver
                                         }
                                         if(tId.txt=="cardEntities")
                                         {
                                             page cardEntities
                                         }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                         {
-                                            page cardMedia
+                                            page cardGrid
                                         }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                         {
-                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupLight
+                                        }
+                                        if(tId.txt=="popupShutter")
+                                        {
+                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page popupShutter
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
-                                        if(tId.txt=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                         {
-                                            page cardGrid
+                                            page cardThermo
+                                        }
+                                        if(tId.txt=="cardMedia")
+                                        {
+                                            page cardMedia
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {

HMI/n2t-out/screensaver.txt

@@ -17,6 +17,8 @@ Page screensaver
             vis tInstruction,0
             vis tTmp,0
             vis p0,0
+            vis tNotifyHead,0
+            vis tNotifyText,0
             //load gloabl time string from pageIcons
             //tTime.txt=vaTime.txt
             spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -48,6 +50,18 @@ Variable (int32) vaTap
         Scope: local
         Value: 0
     
+Variable (string) tInstruction
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 50
+    
+Variable (string) tTmp
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 50
+    
 Text tTime
     Attributes
         Scope                               : local
@@ -278,7 +292,7 @@ Text tMR
         Text                                : 
         Max. Text Size                      : 10
     
-Text tTmp
+Text tNotifyHead
     Attributes
         Scope                               : local
         Dragging                            : 0
@@ -286,9 +300,9 @@ Text tTmp
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 35
     
-Text tInstruction
+Text tNotifyText
     Attributes
         Scope                               : local
         Dragging                            : 0
@@ -296,7 +310,7 @@ Text tInstruction
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 50
+        Max. Text Size                      : 35
     
 Picture p0
     Attributes
@@ -458,6 +472,91 @@ Timer tmSerial
                                         //tMR
                                         spstr strCommand.txt,tMR.txt,"~",16
                                     }
+                                    if(tInstruction.txt=="color")
+                                    {
+                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        covx tTmp.txt,tTime.bco,0,0
+                                        screensaver.bco=tTime.bco
+                                        tAMPM.bco=tTime.bco
+                                        tDate.bco=tTime.bco
+                                        tMainIcon.bco=tTime.bco
+                                        tMainText.bco=tTime.bco
+                                        tMainIconAlt.bco=tTime.bco
+                                        tMainTextAlt.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tMR.bco=tTime.bco
+                                        tMRIcon.bco=tTime.bco
+                                        tForecast1.bco=tTime.bco
+                                        tForecast1Val.bco=tTime.bco
+                                        tF1Icon.bco=tTime.bco
+                                        tForecast2.bco=tTime.bco
+                                        tForecast2Val.bco=tTime.bco
+                                        tF2Icon.bco=tTime.bco
+                                        tForecast3.bco=tTime.bco
+                                        tForecast3Val.bco=tTime.bco
+                                        tF3Icon.bco=tTime.bco
+                                        tForecast4.bco=tTime.bco
+                                        tForecast4Val.bco=tTime.bco
+                                        tF4Icon.bco=tTime.bco
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        covx tTmp.txt,tTime.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",3
+                                        covx tTmp.txt,tAMPM.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        covx tTmp.txt,tDate.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        covx tTmp.txt,tMainIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",6
+                                        covx tTmp.txt,tMainText.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        covx tTmp.txt,tForecast1.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        covx tTmp.txt,tForecast2.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        covx tTmp.txt,tForecast3.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        covx tTmp.txt,tForecast4.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        covx tTmp.txt,tF1Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",12
+                                        covx tTmp.txt,tF2Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        covx tTmp.txt,tF3Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",14
+                                        covx tTmp.txt,tF4Icon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        covx tTmp.txt,tForecast1Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",16
+                                        covx tTmp.txt,tForecast2Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",17
+                                        covx tTmp.txt,tForecast3Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",18
+                                        covx tTmp.txt,tForecast4Val.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",19
+                                        covx tTmp.txt,t10.bco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",20
+                                        covx tTmp.txt,tMainIconAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",21
+                                        covx tTmp.txt,tMainTextAlt.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",22
+                                        covx tTmp.txt,tMRIcon.pco,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                        covx tTmp.txt,tMR.pco,0,0
+                                    }
+                                    if(tInstruction.txt=="notify")
+                                    {
+                                        spstr strCommand.txt,tNotifyHead.txt,"~",1
+                                        spstr strCommand.txt,tNotifyText.txt,"~",2
+                                        if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+                                        {
+                                            vis tNotifyHead,1
+                                            vis tNotifyText,1
+                                        }else
+                                        {
+                                            vis tNotifyHead,0
+                                            vis tNotifyText,0
+                                        }
+                                    }
                                     if(tInstruction.txt=="pageType")
                                     {
                                         dim=100
@@ -547,6 +646,16 @@ TouchCap tc0
     
     Events
         Touch Press Event
+            if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+            {
+                if(dim!=0)
+                {
+                    tNotifyHead.txt=""
+                    tNotifyText.txt=""
+                    vis tNotifyHead,0
+                    vis tNotifyText,0
+                }
+            }
             dim=dimValueNormal
             vaTap.val+=1
             covx vaTap.val,tTmp.txt,0,0
@@ -555,7 +664,7 @@ TouchCap tc0
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
             crcputh 55 bb
-            crcputs sys0,1
+            crcputs sys0,2
             crcputs tSend.txt,0
             //send cmd
             printh 55 bb

README.md

@@ -8,17 +8,25 @@ If you like this project consider buying me a pizza 🍕 <a href="https://paypal
 
 NsPanel Lovelace UI is a Firmware for the nextion screen inside of NSPanel in the Design of [HomeAssistant](https://www.home-assistant.io/)'s Lovelace UI Design.
 
-EU Model and US Model supported (in portrait and landscape orientation)
+**EU Model and US Model supported (in portrait and landscape orientation)**
+
+Content of the screen is controlled by a AppDaemon Python Script installed on your HomeAssistant Instance.
+
+Or an TypeScript on your ioBroker Instance in case you are an ioBroker User.
+
+NsPanel needs to be flashed with Tasmota (or upcoming with ESPHome)
 
 ## Features
 
-- Entities Page with support for cover, switch, input_boolean, binary_sensor, sensor, button, number, scenes, script, input_button and light
+- Entities Page with support for cover, switch, input_boolean, binary_sensor, sensor, button, number, scenes, script, input_button and light, input_text (read-only), lock, fan
-- Grid Page with support for cover, switch, input_boolean, button, scenes, and light
+- Grid Page with support for cover, switch, input_boolean, button, scenes, light and lock
 - Detail Pages for Lights (Brightness, Temperature and Color of the Light) and for Covers (Position)
 - Thermostat Page 
 - Media Player Card
 - Alarm Control Panel
 - Screensaver Page with Time, Date and Weather Information
+- Localization possible (currently 38 languages)
+- **Everything is dynamically configurable by a yaml config, no need to code or touch Nextion Editor**
 
 It works with [Tasmota](https://tasmota.github.io/docs/) and MQTT. 
 To control the panel and update it with content from HomeAssistant there is an [AppDaemon](https://github.com/AppDaemon/appdaemon) App.
@@ -39,26 +47,13 @@ Some (not all) screenshots from the US Portrait Version:
 
 For more detailed Instructions see the following Sections:
 
-- [How It Works](#how-it-works)
 - [Requirements](#requirements)
 
-- [Installation - Home Automation Part (Homeassistant)](#installation---home-automation-part-home-assistant)
+- [Installation - Home Automation Part (Home Assistant)](#installation---home-automation-part-home-assistant)
-   - [Installing AppDaemon](#installing-appdaemon)
-   - [Installing Studio Code Server (optional, recommended)](#installing-studio-code-server-optional-recommended)
-   - [Installing HACS (optional, recommended)](#installing-hacs-optional-recommended)
-   - [Installing AppDeamon Backend Application](#installing-appdeamon-backend-application)
-      - [With HACS (recommended)](#with-hacs-recommended)
-      - [Manually](#manually)
-   - [Installing Tasmota to your NSPanel](#installing---tasmota-to-your-nspanel)
 
 - [Installation - Home Automation Part (IoBroker)](#installation---home-automation-part-iobroker)
 
-- [Installation - NSPanel Part](#installation-nspanel-part)
+- [Installation - NSPanel Part (Firmware)](#installation---nspanel-part)
-   - [Flash Tasmota to your NSPanel](#flash-tasmota-to-your-nspanel)
-   - [Configure Tasmota Template for NSPanel](#configure-tasmota-template-for-nspanel)
-   - [Setup your MQTT Server in Tasmota](#setup-your-mqtt-server-in-tasmota)
-   - [Upload Berry Driver to Tasmota](#upload-berry-driver-to-tasmota)
-   - [Flash Firmware to Nextion Screen](#flash-firmware-to-nextion-screen)
 
 - [Configuration](#configuration)
    - [Configuring the MQTT integration in AppDaemon](#configuring-the-mqtt-integration-in-appdaemon)
@@ -67,27 +62,28 @@ For more detailed Instructions see the following Sections:
 - [FAQ](#faq---frequently-asked-questions)
 
 
-## How It Works
-
-The NSPanel has two components an esp32 which runs Tasmota in this project and the nextion display, which is controlled by the esp32 via serial.
-This project contains a display firmware, which can be controlled over serial/mqtt. 
-It's controlled by an AppDaemon Application, which crafts the required commands from your HomeAssistant Instance.
-
-For more details on how the display firmware works see the [README File in the HMI Folder](HMI/README.md)
-
 ## Requirements
 
  - NSPanel
  - USB to Serial TTL Adapter
- - Running [Home Assistant Instance](https://www.home-assistant.io/installation/)
+ - Running Instance of the Home Automation Platform of your Choise
- - Installed [MQTT Broker](https://www.home-assistant.io/docs/mqtt/broker) alongside Homeassistant
+   - Running [Home Assistant Instance](https://www.home-assistant.io/installation/)
+     - with installed [MQTT Broker](https://www.home-assistant.io/docs/mqtt/broker)
+   - Running [ioBroker Instance](https://www.iobroker.net/#en/documentation)
+     - with installed MQTT Broker
 
 ## Installation - Home Automation Part (Home Assistant)
 
+This section describes the Installation Steps for HomeAssistant, follow each step.
+
+<details><summary>1. Installing HomeAssiant Add-Ons</summary>
+<p>
+
 ### Installing AppDaemon
 
-The recommended backend application for this firmware is written in a python for [AppDaemon](https://github.com/AppDaemon/appdaemon). 
+
-This means it requires a working and running version of AppDaemon.
+The backend application for HomeAssistant is written in a python for [AppDaemon](https://github.com/AppDaemon/appdaemon). 
+This means it requires a working and running installation of AppDaemon.
 
 The easiest way to install it is through Home Assistant's Supervisor Add-on Store, it will be automaticly connected to your Home Assistant Instance.
 
@@ -105,7 +101,13 @@ For localisation (date in your local language) you need to add the python packag
 You will need a way to edit the `apps.yaml` config file in the Appdaemon folder. 
 Install Studio Code Server from Home Assistant's Supervisor Add-on Store to easily edit configuration Files on your HomeAssistant Instance.
 
-### Installing HACS (optional, recommended)
+</p>
+</details>
+
+<details><summary>2. Installing HomeAssiant Community Store</summary>
+<p>
+
+### Installing HACS
 
 HACS is the Home Assistant Community Store and allows for community integrations and
 automations to be updated cleanly and easily from the Home Assistant web user interface.
@@ -115,9 +117,13 @@ can be installed by a click on a button.
 
 If you want to use HACS, you will have to follow [their documentation on how to install HACS](https://hacs.xyz/docs/setup/download).
 
-### Installing AppDaemon Backend Application 
+</p>
+</details>
 
-#### With HACS (recommended)
+<details><summary>3. Installing Lovelace AppDaemon Backend Application </summary>
+<p>
+
+### Installing AppDaemon Backend Application 
 
 To install Lovelace UI Backend App with HACS, you will need to make sure that you enabled
 AppDaemon automations in HACS, as these are not enabled by default:
@@ -143,23 +149,27 @@ Now, to install NSPanel Lovelace UI Backend with HACS, follow these steps:
    `Download this repository with HACS`
 6. A confirmation panel will appear, click on `Download`, and wait for HACS to
    proceed with the download
-6. The Backend Application is now installed, and HACS will inform you when updates are available
+7. The Backend Application is now installed, and HACS will inform you when updates are available
-
-#### Manually
-
-Installing the Backend Application manually can be summarized by putting the content of the
-`apps/` directory of this repository (the `nspanel-lovelace-ui/` directory) into the `apps/`
-directory of your AppDaemon installation.
 
+</p>
+</details>
 
 ## Installation - Home Automation Part (IoBroker)
 
 If you are looking for an ioBroker Integration instead of HomeAssistant take a look into the [Readme](ioBroker/README.md) of the iobroker folder.
 Thanks to [britzelpuf](https://github.com/britzelpuf) for this integration.
 
+
+
+
 ## Installation - NSPanel Part
 
-This section describes how to free your nspanel from stock firmware and get it ready for Lovelace UI 🎉
+This section describes how to free your nspanel from stock firmware and get it ready for Lovelace UI 🎉 
+
+You only need to do one **Tasmota** OR **ESPHome**
+
+<details><summary>Installation Instructions for Tasmota (Recommended)</summary>
+<p>
 
 ### Flash Tasmota to your NSPanel
 
@@ -218,12 +228,27 @@ US Version Portrait: `FlashNextion http://nspanel.pky.eu/lui-us-p-release.tft`
 
 US Version Landscape: `FlashNextion http://nspanel.pky.eu/lui-us-l-release.tft`
 
+</p>
+</details>
+
+<details><summary>Installation Instructions for ESPHome</summary>
+<p>
+
+Support for ESPHome is WIP, see this third-party [ESPHome component](https://github.com/sairon/esphome-nspanel-lovelace-ui) which allows using ESPHome instead of Tasmota.
+
+</p>
+</details>
+
+
+
 ## Configuration
 
 ### Configuring the MQTT integration in AppDaemon
 
 For the app to work you need a working MQTT Configuration in AppDaemon. Please add the configuration of your mqtt server, user and password to your existing `appdaemon.yaml`
 
+NOTE: This are not the options of the AppDaemon Addon in HomeAssistant. You will find this file under: `config/appdaemon/appdeamon.yaml`
+
 ```yaml
 ---
 secrets: /config/secrets.yaml
@@ -330,7 +355,9 @@ key | optional | type | default | description
 `class` | False | string | | The name of the Class.
 `config` | False | complex | | Config/Mapping between Homeassistant and your NsPanel
 
-Possible configuration values for config key:
+
+
+### Possible configuration values for config key
 
 key | optional | type | default | description
 -- | -- | -- | -- | --
@@ -340,7 +367,7 @@ key | optional | type | default | description
 `model` | True | string | `eu` | Model; Possible values: "eu", "us-l" and "us-p"
 `sleepTimeout` | True | integer | `20` | Timeout for the screen to enter screensaver, to disable screensaver use 0
 `sleepBrightness` | True | integer/complex | `20` | Brightness for the screen to enter screensaver, see example below for complex/scheduled config.
-`sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home, can be a group, person or device_tracker entity.
+`sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home or off, can be a group, person or device_tracker entity.
 `locale` | True | string | `en_US` | Used by babel to determinante Date format on screensaver, also used for localization.
 `dateFormatBabel` | True | string | `full` | formatting options on https://babel.pocoo.org/en/latest/dates.html?highlight=name%20of%20day#date-fields
 `timeFormat` | True | string | `%H:%M` | Time Format on screensaver. Substring after `?` is displayed in a seperate smaller textbox. Useful for 12h time format with AM/PM  `"%I:%M   ?%p"`
@@ -349,7 +376,55 @@ key | optional | type | default | description
 `screensaver` | True | complex | | configuration for screensaver
 `hiddenCards` | True | complex | | configuration for cards that can be accessed though navigate items
 
-Possible configuration values for a card in card config:
+
+
+<details><summary>Possible languages for locale config key</summary>
+<p>
+
+  - `af_xx` - Afrikaans
+  - `ar_xx` - Arabic
+  - `bg_xx` - Bulgarian
+  - `ca_xx` - Catalan
+  - `cs_xx` - Czech
+  - `da_xx` - Danish
+  - `de_xx` - German
+  - `el_xx` - Greek
+  - `en_xx` - English
+  - `es_xx` - Spanish
+  - `et_xx` - Estonian
+  - `fa_xx` - Persian
+  - `fi_xx` - Finnish
+  - `fr_xx` - French
+  - `he_xx` - Hebrew
+  - `hr_xx` - Croatian
+  - `hu_xx` - Hungarian
+  - `hy_xx` - Armenian
+  - `id_xx` - Indonesian
+  - `is_xx` - Icelandic
+  - `it_xx` - Italian
+  - `lb_xx` - Luxembourgish
+  - `lt_xx` - Lithuanian
+  - `lv_xx` - Latvian
+  - `nb_xx` - Norwegian
+  - `nl_xx` - Dutch
+  - `nn_xx` - Norwegian
+  - `pl_xx` - Polish
+  - `pt_xx` - Portuguese
+  - `ro_xx` - Romanian
+  - `ru_xx` - Russian
+  - `sk_xx` - Slovak
+  - `sl_xx` - Slovenian
+  - `sv_xx` - Swedish
+  - `th_xx` - Thai
+  - `tr_xx` - Turkish
+  - `uk_xx` - Ukrainian
+  - `vi_xx` - Vietnamese
+
+</p>
+</details>
+
+#### Possible configuration values for a card in card config</summary>
+
 
 key | optional | type | default | description
 -- | -- | -- | -- | --
@@ -359,7 +434,8 @@ key | optional | type | default | description
 `entity` | False | string | `None` | contains the entity of the current card, valid for cardThermo, cardAlarm and cardMedia
 `key` | True | string | `None` | Used by navigate items
 
-Possible configuration values for screensaver config:
+
+#### Possible configuration values for screensaver config
 
 key | optional | type | default | description
 -- | -- | -- | -- | --
@@ -395,10 +471,19 @@ It is possible to schedule a brightness change for the screen at specific times.
         value: 0
 ```
 
+```yaml
+    sleepBrightness:
+      - time: "sunrise"
+        value: 10
+      - time: "sunset + 1:00:00"
+        value: 0
+```
+
+
 #### Override Icons or Names
 
 To override Icons or Names of entities you can configure an icon and/or name in your configuration, please see the following example.
-Only the icons listed in the [Icon Cheetsheet](https://htmlpreview.github.io/?https://github.com/joBr99/nspanel-lovelace-ui/blob/main/HMI/icon-cheatsheet.html) are useable.
+Only the icons listed in the [Icon Cheatsheet](https://htmlpreview.github.io/?https://github.com/joBr99/nspanel-lovelace-ui/blob/main/HMI/icon-cheatsheet.html) are useable.
 
 ```yaml
         entities:
@@ -426,6 +511,11 @@ will allow you to navigate to a cardGrid page with the configured key testKey
         key: testKey
 ```
 
+
+
+
+
+
 ## How to update
 
 Updating involves mainly already descriped steps from installation, so this is a short summary.

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

@@ -1,13 +1,7 @@
-import logging
-
-LOGGER = logging.getLogger(__name__)
-
-HA_API = None
-
 class Entity(object):
     def __init__(self, entity_input_config):
         if type(entity_input_config) is not dict:
-            LOGGER.error("Config error, not a dict check your entity configs")
+            #self._ha_api.log("Config error, not a dict check your entity configs")
             self.entityId = "error"
             self.nameOverride = None
             self.iconOverride = None
@@ -32,7 +26,7 @@ class Card(object):
         for e in card_input_config.get("entities", []):
             self.entities.append(Entity(e))
         self.id = f"{self.cardType}_{self.key}".replace(".","_").replace("~","_").replace(" ","_")
-        LOGGER.info(f"Created Card {self.cardType} with pos {pos} and id {self.id}")
+        #self._ha_api.log(f"Created Card {self.cardType} with pos {pos} and id {self.id}")
     
     def get_entity_list(self):
         entityIds = []
@@ -41,76 +35,90 @@ class Card(object):
         else:
             for e in self.entities:
                 entityIds.append(e.entityId)
+        # additional keys to check
+        add_ent_keys = ['weatherOverrideForecast1', 'weatherOverrideForecast2', 'weatherOverrideForecast3', 'weatherOverrideForecast4']
+        for ent_key in add_ent_keys:
+            val = self.raw_config.get(ent_key)
+            if val is not None:
+                entityIds.append(val.get("entity"))
         return entityIds
 
 class LuiBackendConfig(object):
 
-    _DEFAULT_CONFIG = {
+    def dict_recursive_update(self, source: dict, target: dict) -> dict:
-        'panelRecvTopic': "tele/tasmota_your_mqtt_topic/RESULT",
+        for sk, sv in source.items():
-        'panelSendTopic': "cmnd/tasmota_your_mqtt_topic/CustomSend",
+            if sk in target and isinstance(target[sk], dict):
-        'updateMode': "auto-notify",
+                target[sk] = self.dict_recursive_update(sv, target[sk])
-        'model': "eu",
+            else:
-        'sleepTimeout': 20,
+                target[sk] = sv
-        'sleepBrightness': 20,
+        return target
-        'sleepTracking': None,
-        'locale': "en_US",
-        'timeFormat': "%H:%M",
-        'dateFormatBabel': "full",
-        'dateFormat': "%A, %d. %B %Y",
-        'cards': [{
-            'type': 'cardEntities',
-            'entities': [{
-                'entity': 'switch.test_item',
-                'name': 'Test Item'
-                }, {
-                'entity': 'switch.test_item'
-            }],
-            'title': 'Example Entities Page'
-        }, {
-            'type': 'cardGrid',
-            'entities': [{
-                'entity': 'switch.test_item'
-                }, {
-                'entity': 'switch.test_item'
-                }, {
-                'entity': 'switch.test_item'
-                }
-            ],
-            'title': 'Example Grid Page'
-        }, {
-            'type': 'climate',
-            'entity': 'climate.test_item',
-        }],
-        'screensaver': {
-            'type': 'screensaver',
-            'entity': 'weather.example',
-            'weatherUnit': 'celsius',
-            'weatherOverrideForecast1': None,
-            'weatherOverrideForecast2': None,
-            'weatherOverrideForecast3': None,
-            'weatherOverrideForecast4': None,
-            'doubleTapToUnlock': False,
-            'alternativeLayout': False,
-            'defaultCard': None
-        },
-        'hiddenCards': []
-    }
 
     def __init__(self, ha_api, config_in):
-        global HA_API
+        self._ha_api = ha_api
-        HA_API = ha_api
         self._config = {}
         self._config_cards = []
         self._config_screensaver = None
         self._config_hidden_cards = []
 
+        self._DEFAULT_CONFIG = {
+            'panelRecvTopic': "tele/tasmota_your_mqtt_topic/RESULT",
+            'panelSendTopic': "cmnd/tasmota_your_mqtt_topic/CustomSend",
+            'updateMode': "auto-notify",
+            'model': "eu",
+            'sleepTimeout': 20,
+            'sleepBrightness': 20,
+            'sleepTracking': None,
+            'locale': "en_US",
+            'timeFormat': "%H:%M",
+            'dateFormatBabel': "full",
+            'dateFormat': "%A, %d. %B %Y",
+            'cards': [{
+                'type': 'cardEntities',
+                'entities': [{
+                    'entity': 'switch.test_item',
+                    'name': 'Test Item'
+                    }, {
+                    'entity': 'switch.test_item'
+                }],
+                'title': 'Example Entities Page'
+            }, {
+                'type': 'cardGrid',
+                'entities': [{
+                    'entity': 'switch.test_item'
+                    }, {
+                    'entity': 'switch.test_item'
+                    }, {
+                    'entity': 'switch.test_item'
+                    }
+                ],
+                'title': 'Example Grid Page'
+            }, {
+                'type': 'climate',
+                'entity': 'climate.test_item',
+            }],
+            'screensaver': {
+                'type': 'screensaver',
+                'entity': 'weather.example',
+                'weatherUnit': 'celsius',
+                'forecastSkip': 0,
+                'weatherOverrideForecast1': None,
+                'weatherOverrideForecast2': None,
+                'weatherOverrideForecast3': None,
+                'weatherOverrideForecast4': None,
+                'doubleTapToUnlock': False,
+                'alternativeLayout': False,
+                'defaultCard': None,
+                'key': 'screensaver'
+            },
+            'hiddenCards': []
+        }
+
         self.load(config_in)
 
-    def load(self, args):
+    def load(self, inconfig):
-        for k, v in args.items():
+        self._ha_api.log("Input config: %s", inconfig)
-            if k in self._DEFAULT_CONFIG:
+        self._config = self.dict_recursive_update(inconfig, self._DEFAULT_CONFIG)
-                self._config[k] = v
+        self._ha_api.log("Loaded config: %s", self._config)
-        LOGGER.info(f"Loaded config: {self._config}")
         
         # parse cards displayed on panel
         pos = 0
@@ -145,6 +153,7 @@ class LuiBackendConfig(object):
             entities.extend(card.get_entity_list())
         for card in self._config_hidden_cards:
             entities.extend(card.get_entity_list())
+        entities.extend(self._config_screensaver.get_entity_list())
         return entities
 
     def getCard(self, pos):

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

@@ -1,11 +1,8 @@
-import logging
 import datetime
 from helper import scale, pos_to_color
 
 from pages import LuiPagesGen
 
-LOGGER = logging.getLogger(__name__)
-
 class LuiController(object):
 
     def __init__(self, ha_api, config, send_mqtt_msg):
@@ -13,9 +10,10 @@ class LuiController(object):
         self._config = config
         self._send_mqtt_msg = send_mqtt_msg
 
-        # first card (default, after startup)
+        self._current_card = self._config._config_screensaver
-        self._current_card = self._config.getCard(0)
         self._previous_cards = []
+        # first card (default, after startup)
+        self._previous_cards.append(self._config.getCard(0))
         
         self._pages_gen = LuiPagesGen(ha_api, config, send_mqtt_msg)
 
@@ -28,10 +26,6 @@ class LuiController(object):
 
         # Setup date callback
         ha_api.run_daily(self._pages_gen.update_date, time)
-        
-        # weather callback
-        weather_interval = 15 * 60 # 15 minutes
-        ha_api.run_every(self.weather_update, "now", weather_interval)
 
         # register callbacks
         self.register_callbacks()
@@ -43,13 +37,19 @@ class LuiController(object):
         
         # calculate current brightness
         self.current_screensaver_brightness = self.calc_current_screensaver_brightness()
+
         # call update_screensaver_brightness on changes of entity configured in brightnessScreensaverTracking
         bst = self._config.get("sleepTracking")
         if bst is not None and self._ha_api.entity_exists(bst):
             self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=bst)
 
+        # register callback for state changes on tracked value
+        sleep_brightness_config = self._config.get("sleepBrightness")
+        if type(sleep_brightness_config) == str and self._ha_api.entity_exists(sleep_brightness_config):
+            self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=sleep_brightness_config)
+
     def startup(self):
-        LOGGER.info(f"Startup Event")
+        self._ha_api.log(f"Startup Event")
         # send time and date on startup
         self._pages_gen.update_time("")
         self._pages_gen.update_date("")
@@ -62,40 +62,42 @@ class LuiController(object):
         self.update_screensaver_brightness(kwargs={"value": self.current_screensaver_brightness})
         
         # send panel to screensaver
-        self._pages_gen.page_type("screensaver")
+        self._pages_gen.render_card(self._current_card)
-        self.weather_update("")
+
 
     def update_screensaver_brightness_state_callback(self, entity, attribute, old, new, kwargs):
+        if type(self._config.get("sleepBrightness")) == str:
+            self.current_screensaver_brightness = self.calc_current_screensaver_brightness()
         self.update_screensaver_brightness(kwargs={"value": self.current_screensaver_brightness})
         
     def update_screensaver_brightness(self, kwargs):
         bst = self._config.get("sleepTracking")
         brightness = 0
-        if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state == "not_home":
+        if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state in ["not_home", "off"]:
             brightness = 0
         else:
             self.current_screensaver_brightness = kwargs['value']
             brightness = kwargs['value']
         self._send_mqtt_msg(f"dimmode~{brightness}")
-
-    def weather_update(self, kwargs):
-        self._pages_gen.update_screensaver_weather()
         
     def calc_current_screensaver_brightness(self):
         current_screensaver_brightness = 20
+        sleep_brightness_config = self._config.get("sleepBrightness")
         # set brightness of screensaver
-        if type(self._config.get("sleepBrightness")) == int:
+        if type(sleep_brightness_config) == int:
-            current_screensaver_brightness = self._config.get("sleepBrightness")
+            current_screensaver_brightness = sleep_brightness_config
-        elif type(self._config.get("sleepBrightness")) == list:
+        elif type(sleep_brightness_config) == str:
-            sorted_timesets = sorted(self._config.get("sleepBrightness"), key=lambda d: self._ha_api.parse_time(d['time']))
+                current_screensaver_brightness = int(float(self._ha_api.get_state(sleep_brightness_config)))
+        elif type(sleep_brightness_config) == list:
+            sorted_timesets = sorted(sleep_brightness_config, key=lambda d: self._ha_api.parse_time(d['time']))
             # calc current screensaver brightness
             found_current_dim_value = False
             for index, timeset in enumerate(sorted_timesets):
-                LOGGER.info("Current time %s", self._ha_api.get_now().time())
+                self._ha_api.log("Current time %s", self._ha_api.get_now().time())
                 if self._ha_api.parse_time(timeset["time"]) > self._ha_api.get_now().time() and not found_current_dim_value:
                     # first time after current time, set dim value
                     current_screensaver_brightness = sorted_timesets[index-1]["value"]
-                    LOGGER.info("Setting dim value to %s", sorted_timesets[index-1])
+                    self._ha_api.log("Setting dim value to %s", sorted_timesets[index-1])
                     found_current_dim_value = True
             # still no dim value
             if not found_current_dim_value:
@@ -104,16 +106,16 @@ class LuiController(object):
 
     def register_callbacks(self):
         items = self._config.get_all_entity_names()
-        LOGGER.debug(f"Registering callbacks for the following items: {items}")
+        self._ha_api.log(f"Registering callbacks for the following items: {items}")
         for item in items:
             if self._ha_api.entity_exists(item):
                 self._ha_api.listen_state(self.state_change_callback, entity_id=item, attribute="all")
 
     def state_change_callback(self, entity, attribute, old, new, kwargs):
-        LOGGER.debug(f"Got callback for: {entity}")
+        self._ha_api.log(f"Got callback for: {entity}", level="DEBUG")
-        LOGGER.debug(f"Current page has the following items: {self._current_card.get_entity_list()}")
+        self._ha_api.log(f"Current page has the following items: {self._current_card.get_entity_list()}", level="DEBUG")
         if entity in self._current_card.get_entity_list():
-            LOGGER.debug(f"Callback Entity is on current page: {entity}")
+            self._ha_api.log(f"Callback Entity is on current page: {entity}", level="DEBUG")
             self._pages_gen.render_card(self._current_card, send_page_type=False)
             # send detail page update, just in case
             if self._current_card.cardType in ["cardGrid", "cardEntities"]:
@@ -130,7 +132,7 @@ class LuiController(object):
             self._pages_gen.generate_light_detail_page(entity_id)
 
     def button_press(self, entity_id, button_type, value):
-        LOGGER.info(f"Button Press Event; entity_id: {entity_id}; button_type: {button_type}; value: {value} ")
+        self._ha_api.log(f"Button Press Event; entity_id: {entity_id}; button_type: {button_type}; value: {value} ")
         # internal buttons
         if entity_id == "screensaver" and button_type == "bExit":
             # get default card if there is one
@@ -138,16 +140,20 @@ class LuiController(object):
                 dstCard = self._config.searchCard(self._config.get("screensaver.defaultCard"))
                 if dstCard is not None:
                     self._previous_cards = []
-                    self._current_card = dstCard
+                    self._previous_cards.append(dstCard)
             # check for double tap if configured and render current page
             if self._config.get("screensaver.doubleTapToUnlock") and int(value) >= 2:
+                self._current_card = self._previous_cards.pop()
                 self._pages_gen.render_card(self._current_card)
             elif not self._config.get("screensaver.doubleTapToUnlock"):
+                self._current_card = self._previous_cards.pop()
                 self._pages_gen.render_card(self._current_card)
             return
             
         if button_type == "sleepReached":
-            self._pages_gen.generate_screensaver_page()
+            self._previous_cards.append(self._current_card)
+            self._current_card = self._config._config_screensaver
+            self._pages_gen.render_card(self._current_card)
             return
 
         if button_type == "bExit":
@@ -176,7 +182,10 @@ class LuiController(object):
                 self._ha_api.turn_off(entity_id)
 
         if button_type == "number-set":
-            self._ha_api.get_entity(entity_id).call_service("set_value", value=value)
+            if entity_id.startswith('fan'):
+                self._ha_api.get_entity(entity_id).call_service("set_percentage", percentage=value)
+            else:
+                self._ha_api.get_entity(entity_id).call_service("set_value", value=value)
 
         # for shutter / covers
         if button_type == "up":
@@ -201,6 +210,11 @@ class LuiController(object):
                 self._ha_api.get_entity(entity_id).call_service("turn_on")
             elif entity_id.startswith('light') or entity_id.startswith('switch') or entity_id.startswith('input_boolean'):
                 self._ha_api.get_entity(entity_id).call_service("toggle")
+            elif entity_id.startswith('lock'):
+                if self._ha_api.get_entity(entity_id).state == "locked":
+                    self._ha_api.get_entity(entity_id).call_service("unlock")
+                else:
+                    self._ha_api.get_entity(entity_id).call_service("lock")
             else:
                 self._ha_api.get_entity(entity_id).call_service("press")
 

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

@@ -54,4 +54,4 @@ def get_attr_safe(entity, attr, default):
     res = entity.attributes.get(attr, default)
     if res is None:
         res = default
-    return res
+    return res

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

@@ -42,15 +42,19 @@ def map_to_mdi_name(ha_type, state=None, device_class=None):
     if ha_type == "script":
         return "script-text"
     if ha_type == "switch":
-        return "flash"
+        return "light-switch"
     if ha_type == "number":
         return "ray-vertex"
     if ha_type == "light":
         return "lightbulb"
+    if ha_type == "fan":
+        return "fan"
     if ha_type == "input_boolean":
         return "check-circle-outline" if state == "on" else "close-circle-outline"
     if ha_type == "cover":
         return "window-open" if state == "open" else "window-closed"
+    if ha_type == "lock":
+        return "lock-open" if state == "unlocked" else "lock"
 
     elif ha_type == "sensor":
         if state == "on":

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

@@ -15,6 +15,11 @@ translations = {
             'code': "Kode",
             'disarm': "Skakel Af",
             'run': "Hardloop",
+            'lock': "Sluit toe",
+            'unlock': "Sluit oop",
+            'brightness': "Helderheid",
+            'color_temperature': "Kleur temperatuur",
+            'position': "Posisie",
         },
         'ar': {
             'ACTIVATE': "تفعيل",
@@ -32,6 +37,11 @@ translations = {
             'code': "الرمز",
             'disarm': "تعطيل",
             'run': "تشغيل",
+            'lock': "قفل",
+            'unlock': "فتح",
+            'brightness': "السطوع",
+            'color_temperature': "درجة حرارة اللون",
+            'position': "موضع",
         },
         'bg': {
             'ACTIVATE': "Активирай",
@@ -50,6 +60,11 @@ translations = {
             'code': "Код",
             'disarm': "Деактивирaне",
             'run': "Изпълни",
+            'lock': "Заключване",
+            'unlock': "Отключване",
+            'brightness': "Яркост",
+            'color_temperature': "Цветова температура",
+            'position': "Позиция",
         },
         'ca': {
             'PRESS': "Prem",
@@ -69,6 +84,11 @@ translations = {
             'code': "Codi",
             'disarm': "Desactivar",
             'run': "Executa",
+            'lock': "Bloquejar",
+            'unlock': "Desbloquejar",
+            'brightness': "Brillantor",
+            'color_temperature': "Temperatura de color",
+            'position': "Posició",
         },
         'cs': {
             'PRESS': "Stisknutí",
@@ -88,6 +108,11 @@ translations = {
             'code': "Kód",
             'disarm': "Odbezpečit",
             'run': "Spustit",
+            'lock': "Zamknout",
+            'unlock': "Odemknout",
+            'brightness': "Jas",
+            'color_temperature': "Teplota barvy",
+            'position': "Pozice",
         },
         'da': {
             'PRESS': "Tryk",
@@ -107,6 +132,11 @@ translations = {
             'code': "Kode",
             'disarm': "Frakobl",
             'run': "Kør",
+            'lock': "Lås",
+            'unlock': "Lås op",
+            'brightness': "Lysstyrke",
+            'color_temperature': "Farvetemperatur",
+            'position': "Position",
         },
         'de': {
             'PRESS': "Drücken",
@@ -126,6 +156,11 @@ translations = {
             'code': "Code",
             'disarm': "Deaktivieren",
             'run': "Ausführen",
+            'lock': "Verriegeln",
+            'unlock': "Entriegeln",
+            'brightness': "Helligkeit",
+            'color_temperature': "Farbtemperatur",
+            'position': "Position",
         },
         'el': {
             'PRESS': "Πατήστε",
@@ -145,6 +180,11 @@ translations = {
             'code': "Κωδικός",
             'disarm': "Αφοπλισμός",
             'run': "Εκτέλεση",
+            'lock': "Κλείδωμα",
+            'unlock': "Ξεκλείδωμα",
+            'brightness': "Φωτεινότητα",
+            'color_temperature': "Θερμοκρασία χρώματος",
+            'position': "Θέση",
         },
         'en': {
             'PRESS': "Press",
@@ -164,6 +204,11 @@ translations = {
             'code': "Code",
             'disarm': "Disarm",
             'run': "Run",
+            'lock': "Lock",
+            'unlock': "Unlock",
+            'brightness': "Brightness",
+            'color_temperature': "Color temperature",
+            'position': "Position",
         },
         'es': {
             'PRESS': "Pulsa",
@@ -183,6 +228,11 @@ translations = {
             'code': "Código",
             'disarm': "Desarmar",
             'run': "Ejecutar",
+            'lock': "Bloquear",
+            'unlock': "Desbloquear",
+            'brightness': "Brillo",
+            'color_temperature': "Temperatura del color",
+            'position': "Posición",
         },
         'et': {
             'PRESS': "Vajuta nuppu",
@@ -202,6 +252,11 @@ translations = {
             'code': "Kood",
             'disarm': "Valvest maha",
             'run': "Käivita",
+            'lock': "Lukusta",
+            'unlock': "Ava",
+            'brightness': "Heledus",
+            'color_temperature': "Värvustemperatuur",
+            'position': "Asend",
         },
         'fa': {
             'ACTIVATE': "فعال سازی",
@@ -219,6 +274,11 @@ translations = {
             'code': "کد",
             'disarm': "دزدگیر خاموش",
             'run': "اجرا",
+            'lock': "قفل",
+            'unlock': "باز کردن",
+            'brightness': "روشنایی",
+            'color_temperature': "دمای رنگ",
+            'position': "موقعیت",
         },
         'fi': {
             'PRESS': "Paina",
@@ -238,6 +298,11 @@ translations = {
             'code': "Koodi",
             'disarm': "Poista hälytys",
             'run': "Suorita",
+            'lock': "Lukitse",
+            'unlock': "Avaa lukitus",
+            'brightness': "Kirkkaus",
+            'color_temperature': "Värilämpötila",
+            'position': "Sijainti",
         },
         'fr': {
             'PRESS': "Appui",
@@ -257,6 +322,11 @@ translations = {
             'code': "Code",
             'disarm': "Désarmer",
             'run': "Exécuter",
+            'lock': "Verrouiller",
+            'unlock': "Déverrouiller",
+            'brightness': "Luminosité",
+            'color_temperature': "Température de couleur",
+            'position': "Position",
         },
         'he': {
             'PRESS': "לחיצה",
@@ -276,6 +346,11 @@ translations = {
             'code': "קוד",
             'disarm': "לא דרוך",
             'run': "רוץ",
+            'lock': "נעילה",
+            'unlock': "ביטול נעילה",
+            'brightness': "בהירות",
+            'color_temperature': "טמפרטורת הצבע",
+            'position': "מיקום",
         },
         'hr': {
             'ACTIVATE': "Aktivirati",
@@ -293,6 +368,11 @@ translations = {
             'code': "Kod",
             'disarm': "Deaktiviraj",
             'run': "Pokreni",
+            'lock': "zaključati",
+            'unlock': "Otključati",
+            'brightness': "Svjetlina",
+            'color_temperature': "Temperatura boje",
+            'position': "Pozicija",
         },
         'hu': {
             'PRESS': "Gombnyomás",
@@ -312,6 +392,11 @@ translations = {
             'code': "Kód",
             'disarm': "Hatástalanít",
             'run': "Futtatás",
+            'lock': "Bezár",
+            'unlock': "Kinyit",
+            'brightness': "Fényerő",
+            'color_temperature': "Színhőmérséklet",
+            'position': "Pozíció",
         },
         'hy': {
             'ACTIVATE': "Ակտիվացնել",
@@ -328,6 +413,11 @@ translations = {
             'clear_code': "Մաքրել",
             'code': "Կոդ",
             'disarm': "Զինաթափել",
+            'lock': "Կողպեք",
+            'unlock': "Բացել",
+            'brightness': "Պայծառություն",
+            'color_temperature': "Գունային ջերմաստիճան",
+            'position': "Դիրք",
         },
         'id': {
             'PRESS': "Tekan",
@@ -347,6 +437,11 @@ translations = {
             'code': "Kode",
             'disarm': "Nonaktifkan",
             'run': "Jalankan",
+            'lock': "Kunci",
+            'unlock': "Buka",
+            'brightness': "Kecerahan",
+            'color_temperature': "Temperatur warna",
+            'position': "Posisi",
         },
         'is': {
             'PRESS': "Ýttu á",
@@ -365,6 +460,11 @@ translations = {
             'code': "Kóði",
             'disarm': "Taka af verði",
             'run': "Keyra",
+            'lock': "Læsa",
+            'unlock': "Aflæsa",
+            'brightness': "Birtustig",
+            'color_temperature': "Litastig",
+            'position': "Staðsetning",
         },
         'it': {
             'PRESS': "Premi",
@@ -384,6 +484,11 @@ translations = {
             'code': "Codice",
             'disarm': "Disattiva",
             'run': "Esegui",
+            'lock': "Blocca",
+            'unlock': "Sblocca",
+            'brightness': "Luminosità",
+            'color_temperature': "Temperatura colore",
+            'position': "Apertura",
         },
         'lb': {
             'ACTIVATE': "Aktivéieren",
@@ -401,6 +506,11 @@ translations = {
             'code': "Code",
             'disarm': "Desaktivéieren",
             'run': "Ausféieren",
+            'lock': "Spären",
+            'unlock': "Entspären",
+            'brightness': "Hellegkeet",
+            'color_temperature': "Faarf Temperatur",
+            'position': "Positioun",
         },
         'lt': {
             'ACTIVATE': "Suaktyvinti",
@@ -417,6 +527,11 @@ translations = {
             'code': "Kodas",
             'disarm': "Atrakinti",
             'run': "Paleisti",
+            'lock': "Užrakinti",
+            'unlock': "Atrakinti",
+            'brightness': "Ryškumas",
+            'color_temperature': "Spalvos temperatūra",
+            'position': "Padėtis",
         },
         'lv': {
             'ACTIVATE': "Aktivizēt",
@@ -433,6 +548,11 @@ translations = {
             'clear_code': "Notīrīt",
             'code': "Kods",
             'disarm': "Atslēgt",
+            'lock': "Aizslēgt",
+            'unlock': "Atslēgt",
+            'brightness': "Spilgtums",
+            'color_temperature': "Krāsu temperatūra",
+            'position': "Pozīcija",
         },
         'nb': {
             'PRESS': "trykk",
@@ -452,6 +572,11 @@ translations = {
             'code': "Kode",
             'disarm': "Deaktivere",
             'run': "Kjør",
+            'lock': "Lås",
+            'unlock': "Lås opp",
+            'brightness': "Lysstyrke",
+            'color_temperature': "Fargetemperatur",
+            'position': "Posisjon",
         },
         'nl': {
             'PRESS': "Klik",
@@ -471,6 +596,11 @@ translations = {
             'code': "Code",
             'disarm': "Uitschakelen",
             'run': "Uitvoeren",
+            'lock': "Vergrendelen",
+            'unlock': "Ontgrendelen",
+            'brightness': "Helderheid",
+            'color_temperature': "Kleurtemperatuur",
+            'position': "Positie",
         },
         'nn': {
             'ACTIVATE': "Aktiver",
@@ -489,6 +619,11 @@ translations = {
             'code': "Kode",
             'disarm': "Skru av",
             'run': "Køyr",
+            'lock': "Lås",
+            'unlock': "Lås opp",
+            'brightness': "Lysstyrke",
+            'color_temperature': "Fargetemperatur",
+            'position': "Posisjon",
         },
         'pl': {
             'PRESS': "Naciśnij",
@@ -508,25 +643,11 @@ translations = {
             'code': "Kod",
             'disarm': "Rozbrój",
             'run': "Uruchom",
-        },
+            'lock': "Zablokuj",
-        'pt': {
+            'unlock': "Odblokuj",
-            'PRESS': "Pressione",
+            'brightness': "Jasność",
-            'ACTIVATE': "Ativar",
+            'color_temperature': "Temperatura barwy",
-            'aux_heat': "Aquecedor aux",
+            'position': "Pozycja",
-            'cooling': "Resfriando",
-            'drying': "Secando",
-            'fan': "Ventilando",
-            'idle': "Oscioso",
-            'off': "Desligado",
-            'arm_away': "Armar ausente",
-            'arm_custom_bypass': "Bypass personalizado",
-            'arm_home': "Armar em casa",
-            'arm_night': "Acionamento noturno",
-            'arm_vacation': "Armar férias",
-            'clear_code': "Limpar",
-            'code': "Código",
-            'disarm': "Desarmar",
-            'run': "Executar",
         },
         'pt': {
             'PRESS': "Pressione",
@@ -545,6 +666,11 @@ translations = {
             'code': "Código",
             'disarm': "Desarmar",
             'run': "Executar",
+            'lock': "Bloquear",
+            'unlock': "Desbloquear",
+            'brightness': "Brilho",
+            'color_temperature': "Temperatura de cor",
+            'position': "Posição",
         },
         'ro': {
             'ACTIVATE': "Activați",
@@ -563,6 +689,11 @@ translations = {
             'code': "Cod",
             'disarm': "Dezarmat",
             'run': "Rulați",
+            'lock': "Blocat",
+            'unlock': "Deblocare",
+            'brightness': "Luminozitate",
+            'color_temperature': "Temperatură de culoare",
+            'position': "Poziţie",
         },
         'ru': {
             'PRESS': "Нажать",
@@ -582,6 +713,11 @@ translations = {
             'code': "Код",
             'disarm': "Снять с охраны",
             'run': "Запустить",
+            'lock': "Закрыть",
+            'unlock': "Открыть",
+            'brightness': "Яркость",
+            'color_temperature': "Цветовая температура",
+            'position': "Положение",
         },
         'sk': {
             'ACTIVATE': "Aktivovať",
@@ -600,6 +736,11 @@ translations = {
             'code': "Kód",
             'disarm': "Odkódovať",
             'run': "Spustiť",
+            'lock': "Zamknúť",
+            'unlock': "Odomknúť",
+            'brightness': "Jas",
+            'color_temperature': "Teplota farby",
+            'position': "Poloha",
         },
         'sl': {
             'PRESS': "Pritisnite",
@@ -618,6 +759,11 @@ translations = {
             'code': "Koda",
             'disarm': "Izklopi",
             'run': "Poženi",
+            'lock': "Zakleni",
+            'unlock': "Odkleni",
+            'brightness': "Svetlost",
+            'color_temperature': "Temperatura barve",
+            'position': "Položaj",
         },
         'sv': {
             'PRESS': "Tryck",
@@ -637,6 +783,11 @@ translations = {
             'code': "Kod",
             'disarm': "Larma från",
             'run': "Kör",
+            'lock': "Lås",
+            'unlock': "Lås upp",
+            'brightness': "Ljusstyrka",
+            'color_temperature': "Färgtemperatur",
+            'position': "Position",
         },
         'th': {
             'PRESS': "กด",
@@ -654,6 +805,11 @@ translations = {
             'clear_code': "ล้าง",
             'code': "รหัส",
             'disarm': "ปิดระบบสัญญาณกันขโมย",
+            'lock': "ล็อค",
+            'unlock': "ปลดล็อค",
+            'brightness': "ความสว่าง",
+            'color_temperature': "อุณหภูมิสี",
+            'position': "ตำแหน่ง",
         },
         'tr': {
             'PRESS': "Basınız",
@@ -673,6 +829,11 @@ translations = {
             'code': "Kod",
             'disarm': "Etkisiz hale getir",
             'run': "Çalıştır",
+            'lock': "Kilitle",
+            'unlock': "Kilidi aç",
+            'brightness': "Parlaklık",
+            'color_temperature': "Renk sıcaklığı",
+            'position': "Pozisyon",
         },
         'uk': {
             'PRESS': "Натисніть",
@@ -691,6 +852,11 @@ translations = {
             'code': "Код",
             'disarm': "DISARM",
             'run': "Запустити",
+            'lock': "Блокувати",
+            'unlock': "Розблокувати",
+            'brightness': "Яскравість",
+            'color_temperature': "Кольорова температура",
+            'position': "Положення",
         },
         'vi': {
             'ACTIVATE': "Kích hoạt",
@@ -708,11 +874,15 @@ translations = {
             'code': "Mã số",
             'disarm': "Vô hiệu hoá",
             'run': "Chạy",
+            'lock': "Khóa",
+            'unlock': "Mở khóa",
+            'brightness': "Độ sáng",
+            'color_temperature': "Nhiệt độ màu",
+            'position': "Vị trí",
         },
 }
 
 def get_translation(locale, input):
-    locale = locale.split("_")[0]
     en_fallback_res = translations.get("en").get(input, input)
     if locale in translations:
         return translations.get(locale).get(input, en_fallback_res)

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

@@ -1,21 +1,18 @@
 import json
 
-import logging
-
-LOGGER = logging.getLogger(__name__)
-
 class LuiMqttListener(object):
 
     def __init__(self, mqtt_api, topic, controller, updater):
         self._controller = controller
         self._updater = updater
+        self._mqtt_api = mqtt_api
         # Setup, mqtt subscription and callback
         mqtt_api.mqtt_subscribe(topic=topic)
         mqtt_api.listen_event(self.mqtt_event_callback, "MQTT_MESSAGE", topic=topic, namespace='mqtt')
 
 
     def mqtt_event_callback(self, event_name, data, kwargs):
-        LOGGER.debug(f'MQTT callback for: {data}')
+        self._mqtt_api.log(f'MQTT callback for: {data}')
         # Parse Json Message from Tasmota and strip out message from nextion display
         data = json.loads(data["payload"])
         if("nlui_driver_version" in data):
@@ -25,12 +22,13 @@ class LuiMqttListener(object):
         if("CustomRecv" not in data):
             return
         msg = data["CustomRecv"]
-        LOGGER.info(f"Received Message from Screen: {msg}")
+        self._mqtt_api.log(f"Received Message from Screen: {msg}")
         # Split message into parts seperated by ","
         msg = msg.split(",")
         # run action based on received command
         if msg[0] == "event":
             if msg[1] == "startup":
+                self._updater.request_berry_driver_version()
                 display_firmware_version = int(msg[2])
                 model = None
                 if display_firmware_version >= 23:
@@ -54,6 +52,8 @@ class LuiMqttListener(object):
 
                 if entity_id == "updateDisplayNoYes" and value == "yes":
                     self._updater.update_panel_driver()
+                if entity_id == "updateBerryNoYes" and value == "yes":
+                    self._updater.update_berry_driver()
 
                 self._controller.button_press(entity_id, btype, value)
             if msg[1] == "pageOpenDetail":

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

@@ -1,4 +1,3 @@
-import logging
 import datetime
 import dateutil.parser as dp
 
@@ -13,8 +12,6 @@ babel_spec = importlib.util.find_spec("babel")
 if babel_spec is not None:
     import babel.dates
 
-LOGGER = logging.getLogger(__name__)
-
 class LuiPagesGen(object):
 
     def __init__(self, ha_api, config, send_mqtt_msg):
@@ -27,7 +24,7 @@ class LuiPagesGen(object):
         attr = entity.attributes
         default_color_on  = rgb_dec565([253, 216, 53])
         default_color_off = rgb_dec565([68, 115, 158])
-        icon_color = default_color_on if entity.state == "on" else default_color_off
+        icon_color = default_color_on if entity.state in ["on", "unlocked"] else default_color_off
 
         if "rgb_color" in attr:
             color = attr.rgb_color
@@ -56,10 +53,6 @@ class LuiPagesGen(object):
     def page_type(self, target_page):
         self._send_mqtt_msg(f"pageType~{target_page}")
     
-    def generate_screensaver_page(self):
-        self.page_type("screensaver")
-        self.update_screensaver_weather()
-        
     def update_screensaver_weather(self):
         global babel_spec
         we_name = self._config._config_screensaver.entity.entityId
@@ -68,27 +61,43 @@ class LuiPagesGen(object):
         if self._ha_api.entity_exists(we_name):
             we = self._ha_api.get_entity(we_name)
         else:
-            LOGGER.error(f"Skipping Weather Update, entity {we_name} not found")
+            self._ha_api.error(f"Skipping Weather Update, entity {we_name} not found")
             return
 
         icon_cur        = get_icon_id_ha("weather", state=we.state)
         text_cur        = convert_temperature(we.attributes.temperature, unit)
 
+        forecastSkip = self._config._config_screensaver.raw_config.get(f"forecastSkip")+1
+        # check if the difference between the first 2 forecast items is less than 24h
+        difference = (dp.parse(we.attributes.forecast[forecastSkip]['datetime']) - dp.parse(we.attributes.forecast[0]['datetime']))
+        total_seconds = difference.total_seconds()
+        same_day = total_seconds < 86400
         weather_res = ""
         for i in range(1,5):
             wOF = self._config._config_screensaver.raw_config.get(f"weatherOverrideForecast{i}")
             if wOF is None:
-                up = we.attributes.forecast[i-1]['datetime']
+                fid = (i-1)*forecastSkip
-                #up   = datetime.datetime.fromisoformat(up)
+                if len(we.attributes.forecast) >= fid:
-                up   = dp.parse(up)
+                    up = we.attributes.forecast[fid]['datetime']
-                if babel_spec is not None:
+                    up   = dp.parse(up).astimezone()
-                    up = babel.dates.format_date(up, "E", locale=self._locale)
+                    if babel_spec is not None:
+                        if same_day:
+                            up = babel.dates.format_time(up, "H:mm", locale=self._locale)
+                        else:
+                            up = babel.dates.format_date(up, "E", locale=self._locale)
+                    else:
+                        if same_day:
+                            up = up.strftime('%H:%M')
+                        else:
+                            up = up.strftime('%a')
+                    icon = get_icon_id_ha("weather", state=we.attributes.forecast[fid]['condition'])
+                    down = convert_temperature(we.attributes.forecast[fid]['temperature'], unit)
                 else:
-                    up = up.strftime("%a")
+                    up = ""
-                icon = get_icon_id_ha("weather", state=we.attributes.forecast[i-1]['condition'])
+                    icon = ""
-                down = convert_temperature(we.attributes.forecast[i-1]['temperature'], unit)
+                    down = ""
             else:
-                LOGGER.info(f"Forecast {i} is overriden with {wOF}")
+                self._ha_api.log(f"Forecast {i} is overriden with {wOF}")
                 icon = wOF.get("icon")
                 name = wOF.get("name")
                 entity = self._ha_api.get_entity(wOF.get("entity"))
@@ -111,7 +120,7 @@ class LuiPagesGen(object):
         # type of the item is the string before the "." in the entityId
         entityType = entityId.split(".")[0]
         
-        LOGGER.debug(f"Generating item for {entityId} with type {entityType}",)
+        self._ha_api.log(f"Generating item for {entityId} with type {entityType}", level="DEBUG")
         # Internal types
         if entityType == "delete":
             return f"~{entityType}~~~~~"
@@ -162,11 +171,24 @@ class LuiPagesGen(object):
             icon_id = get_icon_id_ha("script", overwrite=icon)
             text = get_translation(self._locale,"run")
             return f"~button~{entityId}~{icon_id}~17299~{name}~{text}"
+        if entityType == "lock":
+            icon_id = get_icon_id_ha("lock", state=entity.state, overwrite=icon)
+            icon_color = self.get_entity_color(entity)
+            text = get_translation(self._locale,"lock") if entity.state == "unlocked" else get_translation(self._locale,"unlock")
+            return f"~button~{entityId}~{icon_id}~{icon_color}~{name}~{text}"
         if entityType == "number":
             icon_id = get_icon_id_ha("number", overwrite=icon)
             min_v = entity.attributes.get("min", 0)
             max_v = entity.attributes.get("max", 100)
             return f"~number~{entityId}~{icon_id}~17299~{name}~{entity.state}|{min_v}|{max_v}"
+        if entityType == "fan":
+            icon_id = get_icon_id_ha("fan", overwrite=icon)
+            icon_color = self.get_entity_color(entity)
+            return f"~number~{entityId}~{icon_id}~{icon_color}~{name}~{entity.attributes.percentage}|0|100"
+        if entityType == "input_text":
+            icon_id = get_icon_id_ha("input_text", overwrite=icon)
+            value = entity.state
+            return f"~text~{entityId}~{icon_id}~17299~{name}~{value}"
         return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~error~"
 
     def generate_entities_page(self, navigation, heading, items):
@@ -330,7 +352,7 @@ class LuiPagesGen(object):
         self._send_mqtt_msg(command)
         
     def render_card(self, card, send_page_type=True):
-        LOGGER.info(f"Started rendering of page {card.pos} with type {card.cardType}")
+        self._ha_api.log(f"Started rendering of page {card.pos} with type {card.cardType}")
         if len(self._config._config_cards) == 1:
             navigation = "0|0"
         else:
@@ -340,6 +362,7 @@ class LuiPagesGen(object):
         # Switch to page
         if send_page_type:
             self.page_type(card.cardType)
+
         if card.cardType in ["cardEntities", "cardGrid"]:
             self.generate_entities_page(navigation, card.title, card.entities)
             return
@@ -349,9 +372,8 @@ class LuiPagesGen(object):
             self.generate_media_page(navigation, card.entity)
         if card.cardType == "cardAlarm":
             self.generate_alarm_page(navigation, card.entity)
-
         if card.cardType == "screensaver":
-            self.generate_screensaver_page()
+            self.update_screensaver_weather()
 
 
     def generate_light_detail_page(self, entity):
@@ -380,12 +402,16 @@ class LuiPagesGen(object):
                 color = "enable"
             else:
                 color = "disable"
-        self._send_mqtt_msg(f"entityUpdateDetail~{get_icon_id('lightbulb')}~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}")
+        color_translation      = "Color"
+        brightness_translation = get_translation(self._locale, "brightness")
+        color_temp_translation = get_translation(self._locale, "color_temperature")
+        self._send_mqtt_msg(f"entityUpdateDetail~{get_icon_id('lightbulb')}~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}~{color_translation}~{color_temp_translation}~{brightness_translation}")
     
     def generate_shutter_detail_page(self, entity):
         entity = self._ha_api.get_entity(entity)
         pos = int(entity.attributes.get("current_position", 50))
-        self._send_mqtt_msg(f"entityUpdateDetail~{pos}")
+        pos_translation = get_translation(self._locale, "position")
+        self._send_mqtt_msg(f"entityUpdateDetail~{pos}~~{pos_translation}")
 
     def send_message_page(self, id, heading, msg, b1, b2):
         self._send_mqtt_msg(f"pageType~popupNotify")

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

@@ -1,9 +1,8 @@
-import logging
-
-LOGGER = logging.getLogger(__name__)
-
 class Updater:
-    def __init__(self, send_mqtt_msg, topic_send, mode, desired_display_firmware_version, desired_display_firmware_model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url):
+    def __init__(self, log, send_mqtt_msg, topic_send, mode, desired_display_firmware_version, desired_display_firmware_model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url):
+        
+        self._log = log
+        
         self.desired_display_firmware_version = desired_display_firmware_version
         self.desired_display_firmware_model = desired_display_firmware_model
         self.desired_display_firmware_url     = desired_display_firmware_url
@@ -43,51 +42,52 @@ class Updater:
         # return's true if a notification was send to the panel
         # run pre req check
         if self.check_pre_req():
-            LOGGER.info("Update Pre-Check sucessful Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_display_firmware_version)
+            self._log("Update Pre-Check sucessful Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_display_firmware_version)
             # check if tasmota driver needs update
             if self.current_tasmota_driver_version < self.desired_tasmota_driver_version:
-                LOGGER.info("Update of Tasmota Driver needed")
+                self._log("Update of Tasmota Driver needed")
                 # in auto mode just do the update
                 if self.mode == "auto":
                     self.update_berry_driver()
                     return False
                 # send notification about the update
                 if self.mode == "auto-notify":
-                    update_msg = "There's an update available for the Tasmota      Berry driver, do you want to start the update  now?                                                                      If you encounter issues after the update or      this message appears frequently, please check the manual and repeat the installation steps   for the Tasmota Berry driver. "
+                    update_msg = "There's an update available for the Tasmota    Berry driver, do you want to start the update  now?                                                                      If you encounter issues after the update or      this message appears frequently, please checkthe manual and repeat the installation steps   for the Tasmota Berry driver. "
                     self.send_message_page("updateBerryNoYes", "Driver Update available!", update_msg, "Dismiss", "Yes")
                     return True
                 return False
             # check if model has changed
             if self.current_display_model is not None and self.current_display_model != self.desired_display_firmware_model:
-                LOGGER.info(f"Mismatch between Display Firmware ({self.current_display_model}) and configured model ({self.desired_display_firmware_model})")
+                self._log(f"Mismatch between Display Firmware ({self.current_display_model}) and configured model ({self.desired_display_firmware_model})")
                 update_msg = f"The configured display firmware model has changed, do you want to start the update now? Current Model: {self.current_display_model}         Configured Model: {self.desired_display_firmware_model} If the update fails check the installation          manual and flash your version again over the Tasmota console. Be patient, the update will   take a while."
                 self.send_message_page("updateDisplayNoYes", "Display Update available!", update_msg, "Dismiss", "Yes")
                 return True
 
             # check if display firmware needs an update
             if self.current_display_firmware_version < self.desired_display_firmware_version:
-                LOGGER.info("Update of Display Firmware needed")
+                self._log("Update of Display Firmware needed")
                 # in auto mode just do the update
                 if self.mode == "auto":
                     self.update_panel_driver()
                     return False
                 # send notification about the update
                 if self.mode == "auto-notify":
-                    update_msg = "There's a firmware update available for the      Nextion screen of the NSPanel. Do you want tostart the update now?                                         If the update fails check the installation         manual and flash again over the Tasmota console. Be patient, the update will take a while."
+                    update_msg = "There's a firmware update available for the      Nextion screen of the NSPanel. Do you want tostart the update now?                                         If the update fails check the installation         manual and flash again over the Tasmota        console.                                                                 Be patient, the update will take a while."
                     self.send_message_page("updateDisplayNoYes", "Display Update available!", update_msg, "Dismiss", "Yes")
                     return True
                 return False
         else:
-            LOGGER.info("Update Pre-Check failed Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_display_firmware_version)
+            self._log("Update Pre-Check failed Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_display_firmware_version)
             return False
 
     def request_berry_driver_version(self):
+        self.current_tasmota_driver_version = None
         topic = self.topic_send.replace("CustomSend", "GetDriverVersion")
         self._send_mqtt_msg("X", topic=topic)
 
     def update_berry_driver(self):
-        topic = self.topic_send.replace("CustomSend", "UpdateDriverVersion")
+        topic = self.topic_send.replace("CustomSend", "Backlog")
-        self._send_mqtt_msg(self.desired_tasmota_driver_url, topic=topic)
+        self._send_mqtt_msg(f"UpdateDriverVersion {self.desired_tasmota_driver_url}; Restart 1", topic=topic)
     def update_panel_driver(self):
         topic = self.topic_send.replace("CustomSend", "FlashNextion")
         self._send_mqtt_msg(self.desired_display_firmware_url, topic=topic)