From a92e3c9a7a830fb7bfbf478219fcc5fcaace8a04 Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Tue, 22 Nov 2022 17:55:55 +0000
Subject: [PATCH] sync (add nextion2text)

---
 HMI/US/landscape/diff-eu-version.txt          | 335 ++++++++----------
 HMI/US/landscape/n2t-out-visual/cardMedia.txt |  36 +-
 .../n2t-out-visual/nspanel_US_L_Stats.txt     |  20 +-
 .../landscape/n2t-out-visual/screensaver.txt  |   4 +-
 HMI/US/landscape/n2t-out/cardMedia.txt        |  36 +-
 HMI/US/landscape/n2t-out/screensaver.txt      |   4 +-
 HMI/US/portrait/diff-eu-version.txt           |  29 --
 HMI/US/portrait/diff-filtered.txt             |  30 --
 .../n2t-out-visual/nspanel_US_P_Stats.txt     |   8 +-
 .../portrait/n2t-out-visual/screensaver.txt   |   4 +-
 HMI/US/portrait/n2t-out/screensaver.txt       |   4 +-
 11 files changed, 219 insertions(+), 291 deletions(-)

diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt
index 3ea2e060..c4644fec 100644
--- a/HMI/US/landscape/diff-eu-version.txt
+++ b/HMI/US/landscape/diff-eu-version.txt
@@ -13,26 +13,152 @@
 │ -    lcd_dev fffb 0002 0000 0020
 │ -    page pageStartup
 ├── cardMedia.txt
-│ @@ -637,14 +637,276 @@
-│                                              vis bNext,1
-│                                              bNext.txt=""
-│                                          }
-│                                          //entity name
-│                                          spstr strCommand.txt,entn.txt,"~",3
-│                                          //icon
-│                                          spstr strCommand.txt,tIcon.txt,"~",4
+│ @@ -826,33 +826,283 @@
+│      Attributes
+│          Scope      : local
+│          Period (ms): 1000
+│          Enabled    : yes
+│      
+│      Events
+│          Timer Event
+│ -            if(sleepTimeout!=0&&dimValue!=dim)
+│ +            // data available
+│ +            if(usize>1)
+│              {
+│ -                sleepValue+=1
+│ -                if(sleepTimeout<=sleepValue)
+│ +                bufferPos=0
+│ +                while(bufferPos<usize)
+│                  {
+│ -                    sleepValue=0
+│ -                    dim=dimValue
+│ -                    tSend.txt="event,sleepReached,cardMedia"
+│ -                    //send calc crc
+│ -                    btlen tSend.txt,sys0
+│ -                    crcrest 1,0xffff // reset CRC
+│ -                    crcputh 55 bb
+│ -                    crcputs sys0,2
+│ -                    crcputs tSend.txt,0
+│ -                    //send cmd
+│ -                    printh 55 bb
+│ -                    prints sys0,2
+│ -                    prints tSend.txt,0
+│ -                    prints crcval,2
+│ +                    // check for 0x55 0xBB - Command Init Secuence
+│ +                    if(u[bufferPos]==187&&u[bufferPos-1]==85)
+│ +                    {
+│ +                        //remove garbage at the start of the buffer if there's any to free buffer for command
+│ +                        if(u[bufferPos]!=1)
+│ +                        {
+│ +                            udelete bufferPos-1
+│ +                        }
+│ +                        //instruction is now aligned with buffer, because we deleted garbage before instrcution
+│ +                        //get length after init sequence (check if there are more than to bytes in buffer)
+│ +                        if(3<usize)
+│ +                        {
+│ +                            // check if serial buffer has reached the announced length
+│ +                            ucopy payloadLength,2,2,0
+│ +                            // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
+│ +                            payloadLength+=3
+│ +                            // payload length does also not contain crc, so we are adding another 2 bytes for crc
+│ +                            payloadLength+=2
+│ +                            if(payloadLength<usize)
+│ +                            {
+│ +                                // calculate crc
+│ +                                crcrest 1,0xFFFF
+│ +                                // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
+│ +                                //crcputu 3,u[2]
+│ +                                // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
+│ +                                crcputu 0,payloadLength-1
+│ +                                // get recived crc to be able to compare it
+│ +                                ucopy recvCrc,payloadLength-1,2,0
+│ +                                // compare crc with recived value
+│ +                                if(crcval==recvCrc)
+│ +                                {
+│ +                                    // crc is okay
+│ +                                    // here is the location where acual code should be
+│ +                                    // write command to variable strCommand
+│ +                                    ucopy strCommand.txt,4,payloadLength-5,0
+│ +                                    // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
+│ +                                    spstr strCommand.txt,tInstruction.txt,"~",0
+│ +                                    if(tInstruction.txt=="entityUpd")
+│ +                                    {
+│ +                                        //heading
+│ +                                        spstr strCommand.txt,tHeading.txt,"~",1
+│ +                                        // navigation icons
+│ +                                        spstr strCommand.txt,tId.txt,"~",2
+│ +                                        spstr tId.txt,tTmp.txt,"|",0
+│ +                                        if(tTmp.txt=="0")
+│ +                                        {
+│ +                                            vis bPrev,0
+│ +                                            tsw mSwipePrev,0
+│ +                                            tsw mSwipeUp,0
+│ +                                        }
+│ +                                        if(tTmp.txt=="1")
+│ +                                        {
+│ +                                            vis bPrev,1
+│ +                                            tsw mSwipePrev,1
+│ +                                            tsw mSwipeUp,0
+│ +                                            bPrev.txt=""
+│ +                                        }
+│ +                                        if(tTmp.txt=="2")
+│ +                                        {
+│ +                                            vis bPrev,1
+│ +                                            tsw mSwipePrev,0
+│ +                                            tsw mSwipeUp,1
+│ +                                            bPrev.txt=""
+│ +                                        }
+│ +                                        spstr tId.txt,tTmp.txt,"|",1
+│ +                                        if(tTmp.txt=="0")
+│ +                                        {
+│ +                                            vis bNext,0
+│ +                                            tsw mSwipeNext,0
+│ +                                        }
+│ +                                        if(tTmp.txt=="1")
+│ +                                        {
+│ +                                            vis bNext,1
+│ +                                            tsw mSwipeNext,1
+│ +                                            bNext.txt=""
+│ +                                        }
+│ +                                        if(tTmp.txt=="2")
+│ +                                        {
+│ +                                            vis bNext,1
+│ +                                            bNext.txt=""
+│ +                                        }
+│ +                                        //entity name
+│ +                                        spstr strCommand.txt,entn.txt,"~",3
+│ +                                        //icon
+│ +                                        spstr strCommand.txt,tIcon.txt,"~",4
+│ +                                        //icon farbe
+│ +                                        spstr strCommand.txt,tTmp.txt,"~",5
+│ +                                        if(tTmp.txt!="")
+│ +                                        {
+│ +                                            covx tTmp.txt,tIcon.pco,0,0
+│ +                                        }
 │ +                                        //title
-│ +                                        spstr strCommand.txt,tTitle.txt,"~",5
-│ +                                        //author
-│ +                                        spstr strCommand.txt,tAuthor.txt,"~",6
-│ +                                        //volume
+│ +                                        spstr strCommand.txt,tTitle.txt,"~",6
+│ +                                        //title farbe
 │ +                                        spstr strCommand.txt,tTmp.txt,"~",7
+│ +                                        if(tTmp.txt!="")
+│ +                                        {
+│ +                                            covx tTmp.txt,tTitle.pco,0,0
+│ +                                        }
+│ +                                        //author
+│ +                                        spstr strCommand.txt,tAuthor.txt,"~",8
+│ +                                        //author farbe
+│ +                                        spstr strCommand.txt,tTmp.txt,"~",9
+│ +                                        if(tTmp.txt!="")
+│ +                                        {
+│ +                                            covx tTmp.txt,tAuthor.pco,0,0
+│ +                                        }
+│ +                                        //volume
+│ +                                        spstr strCommand.txt,tTmp.txt,"~",10
 │ +                                        covx tTmp.txt,sys0,0,0
 │ +                                        hVolume.val=sys0
 │ +                                        //icon
-│ +                                        spstr strCommand.txt,tPlayPause.txt,"~",8
+│ +                                        spstr strCommand.txt,tPlayPause.txt,"~",11
 │ +                                        //speaker current
-│ +                                        spstr strCommand.txt,tSpeaker.txt,"~",9
+│ +                                        spstr strCommand.txt,tSpeaker.txt,"~",12
 │ +                                        if(tSpeaker.txt!="")
 │ +                                        {
 │ +                                            tSpeaker.pco=1374
@@ -41,14 +167,14 @@
 │ +                                            tSpeaker.pco=65535
 │ +                                        }
 │ +                                        //speaker list
-│ +                                        spstr strCommand.txt,vaSpeakerList.txt,"~",10
+│ +                                        spstr strCommand.txt,vaSpeakerList.txt,"~",13
 │ +                                        if(vaSpeakerList.txt=="")
 │ +                                        {
 │ +                                            vis t6,0
 │ +                                        }
 │ +                                        vaSpeakerPos.val=0
 │ +                                        // on off button
-│ +                                        spstr strCommand.txt,tTmp.txt,"~",11
+│ +                                        spstr strCommand.txt,tTmp.txt,"~",14
 │ +                                        if(tTmp.txt=="disable")
 │ +                                        {
 │ +                                            vis t5,0
@@ -58,7 +184,7 @@
 │ +                                            covx tTmp.txt,t5.pco,0,0
 │ +                                        }
 │ +                                        //tIconBtnEntityName
-│ +                                        spstr strCommand.txt,vaMenu.txt,"~",12
+│ +                                        spstr strCommand.txt,vaMenu.txt,"~",15
 │ +                                    }
 │ +                                    if(tInstruction.txt=="time")
 │ +                                    {
@@ -181,160 +307,13 @@
 │ +                    // clear whole buffer
 │ +                    //code_c
 │ +                    //bufferPos=0
-│ +                }
-│ +            }
-│ +        
-│ +Timer tmSleep
-│ +    Attributes
-│ +        Scope      : local
-│ +        Period (ms): 1000
-│ +        Enabled    : yes
-│ +    
-│ +    Events
-│ +        Timer Event
-│ +            // data available
-│ +            if(usize>1)
-│ +            {
-│ +                bufferPos=0
-│ +                while(bufferPos<usize)
-│ +                {
-│ +                    // check for 0x55 0xBB - Command Init Secuence
-│ +                    if(u[bufferPos]==187&&u[bufferPos-1]==85)
-│ +                    {
-│ +                        //remove garbage at the start of the buffer if there's any to free buffer for command
-│ +                        if(u[bufferPos]!=1)
-│ +                        {
-│ +                            udelete bufferPos-1
-│ +                        }
-│ +                        //instruction is now aligned with buffer, because we deleted garbage before instrcution
-│ +                        //get length after init sequence (check if there are more than to bytes in buffer)
-│ +                        if(3<usize)
-│ +                        {
-│ +                            // check if serial buffer has reached the announced length
-│ +                            ucopy payloadLength,2,2,0
-│ +                            // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
-│ +                            payloadLength+=3
-│ +                            // payload length does also not contain crc, so we are adding another 2 bytes for crc
-│ +                            payloadLength+=2
-│ +                            if(payloadLength<usize)
-│ +                            {
-│ +                                // calculate crc
-│ +                                crcrest 1,0xFFFF
-│ +                                // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
-│ +                                //crcputu 3,u[2]
-│ +                                // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
-│ +                                crcputu 0,payloadLength-1
-│ +                                // get recived crc to be able to compare it
-│ +                                ucopy recvCrc,payloadLength-1,2,0
-│ +                                // compare crc with recived value
-│ +                                if(crcval==recvCrc)
-│ +                                {
-│ +                                    // crc is okay
-│ +                                    // here is the location where acual code should be
-│ +                                    // write command to variable strCommand
-│ +                                    ucopy strCommand.txt,4,payloadLength-5,0
-│ +                                    // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-│ +                                    spstr strCommand.txt,tInstruction.txt,"~",0
-│ +                                    if(tInstruction.txt=="entityUpd")
-│ +                                    {
-│ +                                        //heading
-│ +                                        spstr strCommand.txt,tHeading.txt,"~",1
-│ +                                        // navigation icons
-│ +                                        spstr strCommand.txt,tId.txt,"~",2
-│ +                                        spstr tId.txt,tTmp.txt,"|",0
-│ +                                        if(tTmp.txt=="0")
-│ +                                        {
-│ +                                            vis bPrev,0
-│ +                                            tsw mSwipePrev,0
-│ +                                            tsw mSwipeUp,0
-│ +                                        }
-│ +                                        if(tTmp.txt=="1")
-│ +                                        {
-│ +                                            vis bPrev,1
-│ +                                            tsw mSwipePrev,1
-│ +                                            tsw mSwipeUp,0
-│ +                                            bPrev.txt=""
-│ +                                        }
-│ +                                        if(tTmp.txt=="2")
-│ +                                        {
-│ +                                            vis bPrev,1
-│ +                                            tsw mSwipePrev,0
-│ +                                            tsw mSwipeUp,1
-│ +                                            bPrev.txt=""
-│ +                                        }
-│ +                                        spstr tId.txt,tTmp.txt,"|",1
-│ +                                        if(tTmp.txt=="0")
-│ +                                        {
-│ +                                            vis bNext,0
-│ +                                            tsw mSwipeNext,0
-│ +                                        }
-│ +                                        if(tTmp.txt=="1")
-│ +                                        {
-│ +                                            vis bNext,1
-│ +                                            tsw mSwipeNext,1
-│ +                                            bNext.txt=""
-│ +                                        }
-│ +                                        if(tTmp.txt=="2")
-│ +                                        {
-│ +                                            vis bNext,1
-│ +                                            bNext.txt=""
-│ +                                        }
-│ +                                        //entity name
-│ +                                        spstr strCommand.txt,entn.txt,"~",3
-│ +                                        //icon
-│ +                                        spstr strCommand.txt,tIcon.txt,"~",4
-│                                          //icon farbe
-│                                          spstr strCommand.txt,tTmp.txt,"~",5
-│                                          if(tTmp.txt!="")
-│                                          {
-│                                              covx tTmp.txt,tIcon.pco,0,0
-│                                          }
-│                                          //title
-│ @@ -818,44 +1080,14 @@
-│                      // ucopy n2.val,0,usize,0
-│                      // clear whole buffer
-│                      //code_c
-│                      //bufferPos=0
 │                  }
 │              }
 │          
-│ -Timer tmSleep
-│ -    Attributes
-│ -        Scope      : local
-│ -        Period (ms): 1000
-│ -        Enabled    : yes
-│ -    
-│ -    Events
-│ -        Timer Event
-│ -            if(sleepTimeout!=0&&dimValue!=dim)
-│ -            {
-│ -                sleepValue+=1
-│ -                if(sleepTimeout<=sleepValue)
-│ -                {
-│ -                    sleepValue=0
-│ -                    dim=dimValue
-│ -                    tSend.txt="event,sleepReached,cardMedia"
-│ -                    //send calc crc
-│ -                    btlen tSend.txt,sys0
-│ -                    crcrest 1,0xffff // reset CRC
-│ -                    crcputh 55 bb
-│ -                    crcputs sys0,2
-│ -                    crcputs tSend.txt,0
-│ -                    //send cmd
-│ -                    printh 55 bb
-│ -                    prints sys0,2
-│ -                    prints tSend.txt,0
-│ -                    prints crcval,2
-│ -                }
-│ -            }
-│ -        
 │  TouchCap tc0
 │      Attributes
 │          Scope: local
 │          Value: 0
-│      
-│      Events
-│          Touch Press Event
 ├── pageStartup.txt
 │ @@ -173,15 +173,15 @@
 │          Max. Text Size                      : 10
@@ -354,34 +333,6 @@
 │              crcputs tSend.txt,0
 │              //send cmd
 ├── screensaver.txt
-│ @@ -252,25 +252,25 @@
-│      Attributes
-│          Scope                               : local
-│          Dragging                            : 0
-│          Disable release event after dragging: 0
-│          Send Component ID                   : disabled
-│          Associated Keyboard                 : none
-│          Text                                : 
-│ -        Max. Text Size                      : 10
-│ +        Max. Text Size                      : 5
-│      
-│  Text tIcon2
-│      Attributes
-│          Scope                               : local
-│          Dragging                            : 0
-│          Disable release event after dragging: 0
-│          Send Component ID                   : disabled
-│          Associated Keyboard                 : none
-│          Text                                : 
-│ -        Max. Text Size                      : 10
-│ +        Max. Text Size                      : 5
-│      
-│  Text tMR
-│      Attributes
-│          Scope                               : local
-│          Dragging                            : 0
-│          Disable release event after dragging: 0
-│          Send Component ID                   : disabled
 │ @@ -351,15 +351,15 @@
 │  Text tTime
 │      Attributes
diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt
index 8697ccad..00001fe4 100644
--- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt
@@ -1073,18 +1073,36 @@ Timer tmSerial
                                         spstr strCommand.txt,entn.txt,"~",3
                                         //icon
                                         spstr strCommand.txt,tIcon.txt,"~",4
+                                        //icon farbe
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        if(tTmp.txt!="")
+                                        {
+                                            covx tTmp.txt,tIcon.pco,0,0
+                                        }
                                         //title
-                                        spstr strCommand.txt,tTitle.txt,"~",5
-                                        //author
-                                        spstr strCommand.txt,tAuthor.txt,"~",6
-                                        //volume
+                                        spstr strCommand.txt,tTitle.txt,"~",6
+                                        //title farbe
                                         spstr strCommand.txt,tTmp.txt,"~",7
+                                        if(tTmp.txt!="")
+                                        {
+                                            covx tTmp.txt,tTitle.pco,0,0
+                                        }
+                                        //author
+                                        spstr strCommand.txt,tAuthor.txt,"~",8
+                                        //author farbe
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        if(tTmp.txt!="")
+                                        {
+                                            covx tTmp.txt,tAuthor.pco,0,0
+                                        }
+                                        //volume
+                                        spstr strCommand.txt,tTmp.txt,"~",10
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tPlayPause.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",11
                                         //speaker current
-                                        spstr strCommand.txt,tSpeaker.txt,"~",9
+                                        spstr strCommand.txt,tSpeaker.txt,"~",12
                                         if(tSpeaker.txt!="")
                                         {
                                             tSpeaker.pco=1374
@@ -1093,14 +1111,14 @@ Timer tmSerial
                                             tSpeaker.pco=65535
                                         }
                                         //speaker list
-                                        spstr strCommand.txt,vaSpeakerList.txt,"~",10
+                                        spstr strCommand.txt,vaSpeakerList.txt,"~",13
                                         if(vaSpeakerList.txt=="")
                                         {
                                             vis t6,0
                                         }
                                         vaSpeakerPos.val=0
                                         // on off button
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tTmp.txt,"~",14
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t5,0
@@ -1110,7 +1128,7 @@ Timer tmSerial
                                             covx tTmp.txt,t5.pco,0,0
                                         }
                                         //tIconBtnEntityName
-                                        spstr strCommand.txt,vaMenu.txt,"~",12
+                                        spstr strCommand.txt,vaMenu.txt,"~",15
                                     }
                                     if(tInstruction.txt=="time")
                                     {
diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
index c5bfd07d..f3396790 100644
--- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
+++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
@@ -50,18 +50,18 @@ cardThermo
 	53   Component(s)
 	608  Line(s) of event code
 	316  Unique line(s) of event code
-cardMedia
-	34   Component(s)
-	605  Line(s) of event code
-	214  Unique line(s) of event code
-popupThermo
-	44   Component(s)
-	515  Line(s) of event code
-	272  Unique line(s) of event code
 screensaver
 	45   Component(s)
 	396  Line(s) of event code
 	294  Unique line(s) of event code
+popupThermo
+	44   Component(s)
+	515  Line(s) of event code
+	272  Unique line(s) of event code
+cardMedia
+	34   Component(s)
+	620  Line(s) of event code
+	207  Unique line(s) of event code
 popupInSel
 	34   Component(s)
 	529  Line(s) of event code
@@ -74,5 +74,5 @@ cardEntities
 Total
 	17   Page(s)
 	571  Component(s)
-	7203 Line(s) of event code
-	1810 Unique line(s) of event code
+	7218 Line(s) of event code
+	1804 Unique line(s) of event code
diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt
index 8dbb4117..465214e5 100644
--- a/HMI/US/landscape/n2t-out-visual/screensaver.txt
+++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt
@@ -593,7 +593,7 @@ Text tIcon1
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 5
+        Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -623,7 +623,7 @@ Text tIcon2
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 5
+        Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt
index fcf548c8..18507cc1 100644
--- a/HMI/US/landscape/n2t-out/cardMedia.txt
+++ b/HMI/US/landscape/n2t-out/cardMedia.txt
@@ -641,18 +641,36 @@ Timer tmSerial
                                         spstr strCommand.txt,entn.txt,"~",3
                                         //icon
                                         spstr strCommand.txt,tIcon.txt,"~",4
+                                        //icon farbe
+                                        spstr strCommand.txt,tTmp.txt,"~",5
+                                        if(tTmp.txt!="")
+                                        {
+                                            covx tTmp.txt,tIcon.pco,0,0
+                                        }
                                         //title
-                                        spstr strCommand.txt,tTitle.txt,"~",5
-                                        //author
-                                        spstr strCommand.txt,tAuthor.txt,"~",6
-                                        //volume
+                                        spstr strCommand.txt,tTitle.txt,"~",6
+                                        //title farbe
                                         spstr strCommand.txt,tTmp.txt,"~",7
+                                        if(tTmp.txt!="")
+                                        {
+                                            covx tTmp.txt,tTitle.pco,0,0
+                                        }
+                                        //author
+                                        spstr strCommand.txt,tAuthor.txt,"~",8
+                                        //author farbe
+                                        spstr strCommand.txt,tTmp.txt,"~",9
+                                        if(tTmp.txt!="")
+                                        {
+                                            covx tTmp.txt,tAuthor.pco,0,0
+                                        }
+                                        //volume
+                                        spstr strCommand.txt,tTmp.txt,"~",10
                                         covx tTmp.txt,sys0,0,0
                                         hVolume.val=sys0
                                         //icon
-                                        spstr strCommand.txt,tPlayPause.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",11
                                         //speaker current
-                                        spstr strCommand.txt,tSpeaker.txt,"~",9
+                                        spstr strCommand.txt,tSpeaker.txt,"~",12
                                         if(tSpeaker.txt!="")
                                         {
                                             tSpeaker.pco=1374
@@ -661,14 +679,14 @@ Timer tmSerial
                                             tSpeaker.pco=65535
                                         }
                                         //speaker list
-                                        spstr strCommand.txt,vaSpeakerList.txt,"~",10
+                                        spstr strCommand.txt,vaSpeakerList.txt,"~",13
                                         if(vaSpeakerList.txt=="")
                                         {
                                             vis t6,0
                                         }
                                         vaSpeakerPos.val=0
                                         // on off button
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tTmp.txt,"~",14
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t5,0
@@ -678,7 +696,7 @@ Timer tmSerial
                                             covx tTmp.txt,t5.pco,0,0
                                         }
                                         //tIconBtnEntityName
-                                        spstr strCommand.txt,vaMenu.txt,"~",12
+                                        spstr strCommand.txt,vaMenu.txt,"~",15
                                     }
                                     if(tInstruction.txt=="time")
                                     {
diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt
index f0ebb1e9..da8ae319 100644
--- a/HMI/US/landscape/n2t-out/screensaver.txt
+++ b/HMI/US/landscape/n2t-out/screensaver.txt
@@ -256,7 +256,7 @@ Text tIcon1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 5
+        Max. Text Size                      : 10
     
 Text tIcon2
     Attributes
@@ -266,7 +266,7 @@ Text tIcon2
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 5
+        Max. Text Size                      : 10
     
 Text tMR
     Attributes
diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt
index 20cbe66e..ea0f91c2 100644
--- a/HMI/US/portrait/diff-eu-version.txt
+++ b/HMI/US/portrait/diff-eu-version.txt
@@ -646,32 +646,3 @@
 │              crcputs sys0,2
 │              crcputs tSend.txt,0
 │              //send cmd
-├── screensaver.txt
-│ @@ -252,25 +252,25 @@
-│      Attributes
-│          Scope                               : local
-│          Dragging                            : 0
-│          Disable release event after dragging: 0
-│          Send Component ID                   : disabled
-│          Associated Keyboard                 : none
-│          Text                                : 
-│ -        Max. Text Size                      : 10
-│ +        Max. Text Size                      : 5
-│      
-│  Text tIcon2
-│      Attributes
-│          Scope                               : local
-│          Dragging                            : 0
-│          Disable release event after dragging: 0
-│          Send Component ID                   : disabled
-│          Associated Keyboard                 : none
-│          Text                                : 
-│ -        Max. Text Size                      : 10
-│ +        Max. Text Size                      : 5
-│      
-│  Text tMR
-│      Attributes
-│          Scope                               : local
-│          Dragging                            : 0
-│          Disable release event after dragging: 0
-│          Send Component ID                   : disabled
diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt
index 74f8f710..e69de29b 100644
--- a/HMI/US/portrait/diff-filtered.txt
+++ b/HMI/US/portrait/diff-filtered.txt
@@ -1,30 +0,0 @@
-+++ /dev/fd/62	2022-11-22 17:43:56.613131221 +0000
-+reensaver.txt
-+25 +252,25 @@
-+ributes
-+ Scope                               : local
-+ Dragging                            : 0
-+ Disable release event after dragging: 0
-+ Send Component ID                   : disabled
-+ Associated Keyboard                 : none
-+ Text                                : 
-+ Max. Text Size                      : 10
-+ Max. Text Size                      : 5
-+
-+con2
-+ributes
-+ Scope                               : local
-+ Dragging                            : 0
-+ Disable release event after dragging: 0
-+ Send Component ID                   : disabled
-+ Associated Keyboard                 : none
-+ Text                                : 
-+ Max. Text Size                      : 10
-+ Max. Text Size                      : 5
-+
-+R
-+ributes
-+ Scope                               : local
-+ Dragging                            : 0
-+ Disable release event after dragging: 0
-+ Send Component ID                   : disabled
diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
index 02585696..5af8d52a 100644
--- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
+++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
@@ -54,10 +54,6 @@ cardPower
 	43   Component(s)
 	435  Line(s) of event code
 	297  Unique line(s) of event code
-screensaver
-	45   Component(s)
-	396  Line(s) of event code
-	294  Unique line(s) of event code
 cardAlarm
 	40   Component(s)
 	439  Line(s) of event code
@@ -66,6 +62,10 @@ cardThermo
 	53   Component(s)
 	608  Line(s) of event code
 	316  Unique line(s) of event code
+screensaver
+	45   Component(s)
+	396  Line(s) of event code
+	294  Unique line(s) of event code
 cardEntities
 	77   Component(s)
 	1391 Line(s) of event code
diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt
index 70c31305..69d6651e 100644
--- a/HMI/US/portrait/n2t-out-visual/screensaver.txt
+++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt
@@ -593,7 +593,7 @@ Text tIcon1
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 5
+        Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
@@ -623,7 +623,7 @@ Text tIcon2
         Vertical Alignment                  : center
         Input Type                          : character
         Text                                : 
-        Max. Text Size                      : 5
+        Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt
index 4e5478f4..7a1cc9f8 100644
--- a/HMI/US/portrait/n2t-out/screensaver.txt
+++ b/HMI/US/portrait/n2t-out/screensaver.txt
@@ -256,7 +256,7 @@ Text tIcon1
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 5
+        Max. Text Size                      : 10
     
 Text tIcon2
     Attributes
@@ -266,7 +266,7 @@ Text tIcon2
         Send Component ID                   : disabled
         Associated Keyboard                 : none
         Text                                : 
-        Max. Text Size                      : 5
+        Max. Text Size                      : 10
     
 Text tMR
     Attributes