Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)

siehe Beschreibung

.github/workflows/builder.yaml

@@ -100,7 +100,7 @@ jobs:
 
       - name: Build ${{ matrix.addon }} add-on
         if: steps.check.outputs.build_arch == 'true'
-        uses: home-assistant/builder@2023.12.0
+        uses: home-assistant/builder@2024.01.0
         with:
           args: |
             ${{ env.BUILD_ARGS }} \

.github/workflows/codeql-analysis.yml

@@ -47,7 +47,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

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

@@ -1,17 +1,5 @@
 --- HMI/n2t-out
 +++ HMI/US/landscape/n2t-out
-├── file list
-│ @@ -1,10 +1,9 @@
-│  Program.s.txt
-│  cardAlarm.txt
-│ -cardBurnRec.txt
-│  cardChart.txt
-│  cardEntities.txt
-│  cardGrid.txt
-│  cardGrid2.txt
-│  cardLChart.txt
-│  cardMedia.txt
-│  cardPower.txt
 │   --- HMI/n2t-out/Program.s.txt
 ├── +++ HMI/US/landscape/n2t-out/Program.s.txt
 │ @@ -13,10 +13,10 @@
@@ -114,6 +102,27 @@
 │              crcputs sys0,2
 │              crcputs tSend.txt,0
 │              //send cmd
+│   --- HMI/n2t-out/popupNotify.txt
+├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
+│ @@ -439,18 +439,14 @@
+│                                          {
+│                                              page cardPower
+│                                          }
+│                                          if(tId.txt=="cardChart")
+│                                          {
+│                                              page cardChart
+│                                          }
+│ -                                        if(tId.txt=="cardLChart")
+│ -                                        {
+│ -                                            page cardLChart
+│ -                                        }
+│                                      }
+│                                      // end of user code
+│                                      udelete payloadLength-1
+│                                      bufferPos=0
+│                                  }
+│                              }
+│                          }
 │   --- HMI/n2t-out/screensaver.txt
 ├── +++ HMI/US/landscape/n2t-out/screensaver.txt
 │ @@ -19,15 +19,14 @@
@@ -221,7 +230,7 @@
 │              vis p0,0
 │              vis tNotifyHead,0
 │              vis tNotifyText,0
-│ @@ -41,17 +40,14 @@
+│ @@ -41,52 +40,19 @@
 │              }
 │              tDate.txt=pageIcons.vaDate.txt
 │              dim=dimValue
@@ -232,14 +241,81 @@
 │ -        Postinitialize Event
 │ -            click m0,1
 │ -        
+│ -Variable (string) entn1
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 14
+│ -    
+│ -Variable (string) entn2
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 14
+│ -    
+│ -Variable (string) entn3
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 14
+│ -    
+│ -Variable (string) entn4
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 14
+│ -    
+│ -Variable (string) entn5
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 14
+│ -    
 │  Variable (string) strCommand
 │      Attributes
 │          Scope         : local
 │          Text          : 
-│          Max. Text Size: 1979
+│ -        Max. Text Size: 1955
+│ +        Max. Text Size: 1979
 │      
 │  Variable (string) strTmp
-│ @@ -376,34 +372,14 @@
+│      Attributes
+│          Scope         : local
+│          Text          : 
+│          Max. Text Size: 2
+│      
+│ @@ -96,27 +62,27 @@
+│          Text          : 
+│          Max. Text Size: 25
+│      
+│  Variable (string) tInstruction
+│      Attributes
+│          Scope         : local
+│          Text          : 
+│ -        Max. Text Size: 15
+│ +        Max. Text Size: 50
+│      
+│  Variable (string) tSend
+│      Attributes
+│          Scope         : local
+│          Text          : 
+│ -        Max. Text Size: 30
+│ +        Max. Text Size: 50
+│      
+│  Variable (string) tTmp
+│      Attributes
+│          Scope         : local
+│          Text          : 
+│ -        Max. Text Size: 30
+│ +        Max. Text Size: 50
+│      
+│  Variable (int32) vaTap
+│      Attributes
+│          Scope: local
+│          Value: 0
+│      
+│  Variable (int32) xc1
+│ @@ -370,159 +336,50 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -247,6 +323,131 @@
 │          Text               : 
 │          Max. Text Size     : 4
 │      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+│ -            //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
+│ -        
+│  Text f2Icon
+│      Attributes
+│          Scope              : local
+│          Dragging           : 0
+│          Send Component ID  : disabled
+│          Associated Keyboard: none
+│          Text               : 
+│          Max. Text Size     : 4
+│      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn2.txt+",button"
+│ -            //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
+│ -        
+│ -        Touch Release Event
+│ -            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+│ -            //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
+│ -        
+│  Text f3Icon
+│      Attributes
+│          Scope              : local
+│          Dragging           : 0
+│          Send Component ID  : disabled
+│          Associated Keyboard: none
+│          Text               : 
+│          Max. Text Size     : 4
+│      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn3.txt+",button"
+│ -            //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
+│ -        
+│  Text f4Icon
+│      Attributes
+│          Scope              : local
+│          Dragging           : 0
+│          Send Component ID  : disabled
+│          Associated Keyboard: none
+│          Text               : 
+│          Max. Text Size     : 4
+│      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn4.txt+",button"
+│ -            //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
+│ -        
+│  Text f5Icon
+│      Attributes
+│          Scope              : local
+│          Dragging           : 0
+│          Send Component ID  : disabled
+│          Associated Keyboard: none
+│          Text               : 
+│          Max. Text Size     : 4
+│      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn5.txt+",button"
+│ -            //send calc crc
+│ -            btlen tSend.txt,sys0
+│ -            crcrest 1,0xffff // reset CRC
+│ -            crcputh 55 bb
+│ -            crcputs sys0,2
+│ -            crcputs tSend.txt,0
+│ -            //send cmd
+│ -            printh 55 bb
+│ -            prints sys0,2
+│ -            prints tSend.txt,0
+│ -            prints crcval,2
+│ -        
 │ -Text m0
 │ -    Attributes
 │ -        Scope              : local
@@ -274,7 +475,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : PM
-│ @@ -585,15 +561,14 @@
+│ @@ -704,15 +561,14 @@
 │                                          if(tTmp.txt!="")
 │                                          {
 │                                              covx tTmp.txt,defaultFontColor,0,0
@@ -290,3 +491,67 @@
 │                                          if(tAMPM.txt=="")
 │                                          {
 │                                              vis tAMPM,0
+│ @@ -833,44 +689,34 @@
+│                                          //e6Val
+│                                          spstr strCommand.txt,e6Val.txt,"~",60
+│                                          //f1Icon
+│                                          spstr strCommand.txt,f1Icon.txt,"~",63
+│                                          //f1Icon Color
+│                                          spstr strCommand.txt,tTmp.txt,"~",64
+│                                          covx tTmp.txt,f1Icon.pco,0,0
+│ -                                        //f1Icon intNameEntity
+│ -                                        spstr strCommand.txt,entn1.txt,"~",62
+│                                          //f2Icon
+│                                          spstr strCommand.txt,f2Icon.txt,"~",69
+│                                          //f2Icon Color
+│                                          spstr strCommand.txt,tTmp.txt,"~",70
+│                                          covx tTmp.txt,f2Icon.pco,0,0
+│ -                                        //f2Icon intNameEntity
+│ -                                        spstr strCommand.txt,entn2.txt,"~",68
+│                                          //f3Icon
+│                                          spstr strCommand.txt,f3Icon.txt,"~",75
+│                                          //f3Icon Color
+│                                          spstr strCommand.txt,tTmp.txt,"~",76
+│                                          covx tTmp.txt,f3Icon.pco,0,0
+│ -                                        //f3Icon intNameEntity
+│ -                                        spstr strCommand.txt,entn3.txt,"~",74
+│                                          //f4Icon
+│                                          spstr strCommand.txt,f4Icon.txt,"~",81
+│                                          //f4Icon Color
+│                                          spstr strCommand.txt,tTmp.txt,"~",82
+│                                          covx tTmp.txt,f4Icon.pco,0,0
+│ -                                        //f4Icon intNameEntity
+│ -                                        spstr strCommand.txt,entn4.txt,"~",80
+│                                          //f5Icon
+│                                          spstr strCommand.txt,f5Icon.txt,"~",87
+│                                          //f5Icon Color
+│                                          spstr strCommand.txt,tTmp.txt,"~",88
+│                                          covx tTmp.txt,f5Icon.pco,0,0
+│ -                                        //f5Icon intNameEntity
+│ -                                        spstr strCommand.txt,entn5.txt,"~",86
+│                                      }
+│                                      if(tInstruction.txt=="notify")
+│                                      {
+│                                          spstr strCommand.txt,tNotifyHead.txt,"~",1
+│                                          spstr strCommand.txt,tNotifyText.txt,"~",2
+│                                          if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+│                                          {
+│ @@ -966,14 +812,18 @@
+│                                          {
+│                                              page cardPower
+│                                          }
+│                                          if(tId.txt=="cardChart")
+│                                          {
+│                                              page cardChart
+│                                          }
+│ +                                        if(tId.txt=="cardLChart")
+│ +                                        {
+│ +                                            page cardLChart
+│ +                                        }
+│                                      }
+│                                      if(tInstruction.txt=="timeout")
+│                                      {
+│                                          //set timeout to global var
+│                                          spstr strCommand.txt,tTmp.txt,"~",1
+│                                          covx tTmp.txt,sleepTimeout,0,0
+│                                      }

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

@@ -1,17 +1,5 @@
 --- HMI/n2t-out
 +++ HMI/US/portrait/n2t-out
-├── file list
-│ @@ -1,10 +1,9 @@
-│  Program.s.txt
-│  cardAlarm.txt
-│ -cardBurnRec.txt
-│  cardChart.txt
-│  cardEntities.txt
-│  cardGrid.txt
-│  cardGrid2.txt
-│  cardLChart.txt
-│  cardMedia.txt
-│  cardPower.txt
 │   --- HMI/n2t-out/Program.s.txt
 ├── +++ HMI/US/portrait/n2t-out/Program.s.txt
 │ @@ -12,11 +12,11 @@
@@ -2016,6 +2004,25 @@
 │                                      }
 │                                      if(tInstruction.txt=="exitPopup")
 │                                      {
+│ @@ -439,18 +439,14 @@
+│                                          {
+│                                              page cardPower
+│                                          }
+│                                          if(tId.txt=="cardChart")
+│                                          {
+│                                              page cardChart
+│                                          }
+│ -                                        if(tId.txt=="cardLChart")
+│ -                                        {
+│ -                                            page cardLChart
+│ -                                        }
+│                                      }
+│                                      // end of user code
+│                                      udelete payloadLength-1
+│                                      bufferPos=0
+│                                  }
+│                              }
+│                          }
 │   --- HMI/n2t-out/screensaver.txt
 ├── +++ HMI/US/portrait/n2t-out/screensaver.txt
 │ @@ -7,27 +7,14 @@
@@ -2168,7 +2175,7 @@
 │              vis p0,0
 │              vis tNotifyHead,0
 │              vis tNotifyText,0
-│ @@ -41,17 +28,14 @@
+│ @@ -41,52 +28,19 @@
 │              }
 │              tDate.txt=pageIcons.vaDate.txt
 │              dim=dimValue
@@ -2179,14 +2186,81 @@
 │ -        Postinitialize Event
 │ -            click m0,1
 │ -        
+│ -Variable (string) entn1
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 14
+│ -    
+│ -Variable (string) entn2
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 14
+│ -    
+│ -Variable (string) entn3
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 14
+│ -    
+│ -Variable (string) entn4
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 14
+│ -    
+│ -Variable (string) entn5
+│ -    Attributes
+│ -        Scope         : local
+│ -        Text          : 
+│ -        Max. Text Size: 14
+│ -    
 │  Variable (string) strCommand
 │      Attributes
 │          Scope         : local
 │          Text          : 
-│          Max. Text Size: 1979
+│ -        Max. Text Size: 1955
+│ +        Max. Text Size: 1979
 │      
 │  Variable (string) strTmp
-│ @@ -376,34 +360,14 @@
+│      Attributes
+│          Scope         : local
+│          Text          : 
+│          Max. Text Size: 2
+│      
+│ @@ -96,27 +50,27 @@
+│          Text          : 
+│          Max. Text Size: 25
+│      
+│  Variable (string) tInstruction
+│      Attributes
+│          Scope         : local
+│          Text          : 
+│ -        Max. Text Size: 15
+│ +        Max. Text Size: 50
+│      
+│  Variable (string) tSend
+│      Attributes
+│          Scope         : local
+│          Text          : 
+│ -        Max. Text Size: 30
+│ +        Max. Text Size: 50
+│      
+│  Variable (string) tTmp
+│      Attributes
+│          Scope         : local
+│          Text          : 
+│ -        Max. Text Size: 30
+│ +        Max. Text Size: 50
+│      
+│  Variable (int32) vaTap
+│      Attributes
+│          Scope: local
+│          Value: 0
+│      
+│  Variable (int32) xc1
+│ @@ -370,159 +324,50 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -2194,6 +2268,131 @@
 │          Text               : 
 │          Max. Text Size     : 4
 │      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+│ -            //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
+│ -        
+│  Text f2Icon
+│      Attributes
+│          Scope              : local
+│          Dragging           : 0
+│          Send Component ID  : disabled
+│          Associated Keyboard: none
+│          Text               : 
+│          Max. Text Size     : 4
+│      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn2.txt+",button"
+│ -            //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
+│ -        
+│ -        Touch Release Event
+│ -            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+│ -            //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
+│ -        
+│  Text f3Icon
+│      Attributes
+│          Scope              : local
+│          Dragging           : 0
+│          Send Component ID  : disabled
+│          Associated Keyboard: none
+│          Text               : 
+│          Max. Text Size     : 4
+│      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn3.txt+",button"
+│ -            //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
+│ -        
+│  Text f4Icon
+│      Attributes
+│          Scope              : local
+│          Dragging           : 0
+│          Send Component ID  : disabled
+│          Associated Keyboard: none
+│          Text               : 
+│          Max. Text Size     : 4
+│      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn4.txt+",button"
+│ -            //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
+│ -        
+│  Text f5Icon
+│      Attributes
+│          Scope              : local
+│          Dragging           : 0
+│          Send Component ID  : disabled
+│          Associated Keyboard: none
+│          Text               : 
+│          Max. Text Size     : 4
+│      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn5.txt+",button"
+│ -            //send calc crc
+│ -            btlen tSend.txt,sys0
+│ -            crcrest 1,0xffff // reset CRC
+│ -            crcputh 55 bb
+│ -            crcputs sys0,2
+│ -            crcputs tSend.txt,0
+│ -            //send cmd
+│ -            printh 55 bb
+│ -            prints sys0,2
+│ -            prints tSend.txt,0
+│ -            prints crcval,2
+│ -        
 │ -Text m0
 │ -    Attributes
 │ -        Scope              : local
@@ -2221,7 +2420,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : PM
-│ @@ -585,15 +549,14 @@
+│ @@ -704,15 +549,14 @@
 │                                          if(tTmp.txt!="")
 │                                          {
 │                                              covx tTmp.txt,defaultFontColor,0,0
@@ -2237,3 +2436,67 @@
 │                                          if(tAMPM.txt=="")
 │                                          {
 │                                              vis tAMPM,0
+│ @@ -833,44 +677,34 @@
+│                                          //e6Val
+│                                          spstr strCommand.txt,e6Val.txt,"~",60
+│                                          //f1Icon
+│                                          spstr strCommand.txt,f1Icon.txt,"~",63
+│                                          //f1Icon Color
+│                                          spstr strCommand.txt,tTmp.txt,"~",64
+│                                          covx tTmp.txt,f1Icon.pco,0,0
+│ -                                        //f1Icon intNameEntity
+│ -                                        spstr strCommand.txt,entn1.txt,"~",62
+│                                          //f2Icon
+│                                          spstr strCommand.txt,f2Icon.txt,"~",69
+│                                          //f2Icon Color
+│                                          spstr strCommand.txt,tTmp.txt,"~",70
+│                                          covx tTmp.txt,f2Icon.pco,0,0
+│ -                                        //f2Icon intNameEntity
+│ -                                        spstr strCommand.txt,entn2.txt,"~",68
+│                                          //f3Icon
+│                                          spstr strCommand.txt,f3Icon.txt,"~",75
+│                                          //f3Icon Color
+│                                          spstr strCommand.txt,tTmp.txt,"~",76
+│                                          covx tTmp.txt,f3Icon.pco,0,0
+│ -                                        //f3Icon intNameEntity
+│ -                                        spstr strCommand.txt,entn3.txt,"~",74
+│                                          //f4Icon
+│                                          spstr strCommand.txt,f4Icon.txt,"~",81
+│                                          //f4Icon Color
+│                                          spstr strCommand.txt,tTmp.txt,"~",82
+│                                          covx tTmp.txt,f4Icon.pco,0,0
+│ -                                        //f4Icon intNameEntity
+│ -                                        spstr strCommand.txt,entn4.txt,"~",80
+│                                          //f5Icon
+│                                          spstr strCommand.txt,f5Icon.txt,"~",87
+│                                          //f5Icon Color
+│                                          spstr strCommand.txt,tTmp.txt,"~",88
+│                                          covx tTmp.txt,f5Icon.pco,0,0
+│ -                                        //f5Icon intNameEntity
+│ -                                        spstr strCommand.txt,entn5.txt,"~",86
+│                                      }
+│                                      if(tInstruction.txt=="notify")
+│                                      {
+│                                          spstr strCommand.txt,tNotifyHead.txt,"~",1
+│                                          spstr strCommand.txt,tNotifyText.txt,"~",2
+│                                          if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+│                                          {
+│ @@ -966,14 +800,18 @@
+│                                          {
+│                                              page cardPower
+│                                          }
+│                                          if(tId.txt=="cardChart")
+│                                          {
+│                                              page cardChart
+│                                          }
+│ +                                        if(tId.txt=="cardLChart")
+│ +                                        {
+│ +                                            page cardLChart
+│ +                                        }
+│                                      }
+│                                      if(tInstruction.txt=="timeout")
+│                                      {
+│                                          //set timeout to global var
+│                                          spstr strCommand.txt,tTmp.txt,"~",1
+│                                          covx tTmp.txt,sleepTimeout,0,0
+│                                      }

HMI/US/portrait/diff-filtered.txt

@@ -1,16 +1,4 @@
-+++ /dev/fd/62	2023-11-27 23:28:52.512823638 +0000
-+le list
-+ +1,9 @@
-+.s.txt
-+rm.txt
-+nRec.txt
-+rt.txt
-+ities.txt
-+d.txt
-+d2.txt
-+art.txt
-+ia.txt
-+er.txt
++++ /dev/fd/62	2024-01-19 15:23:13.505105687 +0000
 +I/n2t-out/Program.s.txt
 ++ HMI/US/portrait/n2t-out/Program.s.txt
 +1 +12,11 @@
@@ -698,13 +686,6 @@
 +                                     covx tTmp.txt,sys0,0,0
 +                                     hSlider6.maxval=sys0
 +                                 }
-+                             }
-+                             if(tInstruction.txt=="pageType")
-+                             {
-+                                 sleepValue=0
-+                                 //command format pageType,specialPageName
-+                                 //write name of speical page to tId
-+                                 spstr strCommand.txt,tId.txt,"~",1
 +I/n2t-out/cardGrid.txt
 ++ HMI/US/portrait/n2t-out/cardGrid.txt
 + +7,14 @@
@@ -958,6 +939,13 @@
 +                                     spstr strCommand.txt,tEntity9.txt,"~",66
 +                                     vis tEntity9,1
 +                                 }
++                             }
++                             if(tInstruction.txt=="pageType")
++                             {
++                                 sleepValue=0
++                                 //command format pageType,specialPageName
++                                 //write name of speical page to tId
++                                 spstr strCommand.txt,tId.txt,"~",1
 +I/n2t-out/cardLChart.txt
 ++ HMI/US/portrait/n2t-out/cardLChart.txt
 + +7,14 @@
@@ -1558,6 +1546,25 @@
 +                             }
 +                             if(tInstruction.txt=="exitPopup")
 +                             {
++18 +439,14 @@
++                                 {
++                                     page cardPower
++                                 }
++                                 if(tId.txt=="cardChart")
++                                 {
++                                     page cardChart
++                                 }
++                                 if(tId.txt=="cardLChart")
++                                 {
++                                     page cardLChart
++                                 }
++                             }
++                             // end of user code
++                             udelete payloadLength-1
++                             bufferPos=0
++                         }
++                     }
++                 }
 +I/n2t-out/screensaver.txt
 ++ HMI/US/portrait/n2t-out/screensaver.txt
 + +7,14 @@
@@ -1710,7 +1717,7 @@
 +     vis p0,0
 +     vis tNotifyHead,0
 +     vis tNotifyText,0
-+7 +28,14 @@
++2 +28,19 @@
 +     }
 +     tDate.txt=pageIcons.vaDate.txt
 +     dim=dimValue
@@ -1721,14 +1728,81 @@
 + Postinitialize Event
 +     click m0,1
 + 
++e (string) entn1
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 14
++
++e (string) entn2
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 14
++
++e (string) entn3
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 14
++
++e (string) entn4
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 14
++
++e (string) entn5
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 14
++
 +e (string) strCommand
 +ributes
 + Scope         : local
 + Text          : 
++ Max. Text Size: 1955
 + Max. Text Size: 1979
 +
 +e (string) strTmp
-+34 +360,14 @@
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 2
++
++7 +50,27 @@
++ Text          : 
++ Max. Text Size: 25
++
++e (string) tInstruction
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 15
++ Max. Text Size: 50
++
++e (string) tSend
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 30
++ Max. Text Size: 50
++
++e (string) tTmp
++ributes
++ Scope         : local
++ Text          : 
++ Max. Text Size: 30
++ Max. Text Size: 50
++
++e (int32) vaTap
++ributes
++ Scope: local
++ Value: 0
++
++e (int32) xc1
++159 +324,50 @@
 + Scope              : local
 + Dragging           : 0
 + Send Component ID  : disabled
@@ -1736,6 +1810,131 @@
 + Text               : 
 + Max. Text Size     : 4
 +
++nts
++ Touch Press Event
++     tSend.txt="event,buttonPress2,"+entn1.txt+",button"
++     //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
++ 
++Icon
++ributes
++ Scope              : local
++ Dragging           : 0
++ Send Component ID  : disabled
++ Associated Keyboard: none
++ Text               : 
++ Max. Text Size     : 4
++
++nts
++ Touch Press Event
++     tSend.txt="event,buttonPress2,"+entn2.txt+",button"
++     //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
++ 
++ Touch Release Event
++     tSend.txt="event,buttonPress2,"+entn1.txt+",button"
++     //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
++ 
++Icon
++ributes
++ Scope              : local
++ Dragging           : 0
++ Send Component ID  : disabled
++ Associated Keyboard: none
++ Text               : 
++ Max. Text Size     : 4
++
++nts
++ Touch Press Event
++     tSend.txt="event,buttonPress2,"+entn3.txt+",button"
++     //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
++ 
++Icon
++ributes
++ Scope              : local
++ Dragging           : 0
++ Send Component ID  : disabled
++ Associated Keyboard: none
++ Text               : 
++ Max. Text Size     : 4
++
++nts
++ Touch Press Event
++     tSend.txt="event,buttonPress2,"+entn4.txt+",button"
++     //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
++ 
++Icon
++ributes
++ Scope              : local
++ Dragging           : 0
++ Send Component ID  : disabled
++ Associated Keyboard: none
++ Text               : 
++ Max. Text Size     : 4
++
++nts
++ Touch Press Event
++     tSend.txt="event,buttonPress2,"+entn5.txt+",button"
++     //send calc crc
++     btlen tSend.txt,sys0
++     crcrest 1,0xffff // reset CRC
++     crcputh 55 bb
++     crcputs sys0,2
++     crcputs tSend.txt,0
++     //send cmd
++     printh 55 bb
++     prints sys0,2
++     prints tSend.txt,0
++     prints crcval,2
++ 
 +
 +ributes
 + Scope              : local
@@ -1779,3 +1978,67 @@
 +                                 if(tAMPM.txt=="")
 +                                 {
 +                                     vis tAMPM,0
++44 +677,34 @@
++                                 //e6Val
++                                 spstr strCommand.txt,e6Val.txt,"~",60
++                                 //f1Icon
++                                 spstr strCommand.txt,f1Icon.txt,"~",63
++                                 //f1Icon Color
++                                 spstr strCommand.txt,tTmp.txt,"~",64
++                                 covx tTmp.txt,f1Icon.pco,0,0
++                                 //f1Icon intNameEntity
++                                 spstr strCommand.txt,entn1.txt,"~",62
++                                 //f2Icon
++                                 spstr strCommand.txt,f2Icon.txt,"~",69
++                                 //f2Icon Color
++                                 spstr strCommand.txt,tTmp.txt,"~",70
++                                 covx tTmp.txt,f2Icon.pco,0,0
++                                 //f2Icon intNameEntity
++                                 spstr strCommand.txt,entn2.txt,"~",68
++                                 //f3Icon
++                                 spstr strCommand.txt,f3Icon.txt,"~",75
++                                 //f3Icon Color
++                                 spstr strCommand.txt,tTmp.txt,"~",76
++                                 covx tTmp.txt,f3Icon.pco,0,0
++                                 //f3Icon intNameEntity
++                                 spstr strCommand.txt,entn3.txt,"~",74
++                                 //f4Icon
++                                 spstr strCommand.txt,f4Icon.txt,"~",81
++                                 //f4Icon Color
++                                 spstr strCommand.txt,tTmp.txt,"~",82
++                                 covx tTmp.txt,f4Icon.pco,0,0
++                                 //f4Icon intNameEntity
++                                 spstr strCommand.txt,entn4.txt,"~",80
++                                 //f5Icon
++                                 spstr strCommand.txt,f5Icon.txt,"~",87
++                                 //f5Icon Color
++                                 spstr strCommand.txt,tTmp.txt,"~",88
++                                 covx tTmp.txt,f5Icon.pco,0,0
++                                 //f5Icon intNameEntity
++                                 spstr strCommand.txt,entn5.txt,"~",86
++                             }
++                             if(tInstruction.txt=="notify")
++                             {
++                                 spstr strCommand.txt,tNotifyHead.txt,"~",1
++                                 spstr strCommand.txt,tNotifyText.txt,"~",2
++                                 if(tNotifyHead.txt!=""||tNotifyText.txt!="")
++                                 {
++14 +800,18 @@
++                                 {
++                                     page cardPower
++                                 }
++                                 if(tId.txt=="cardChart")
++                                 {
++                                     page cardChart
++                                 }
++                                 if(tId.txt=="cardLChart")
++                                 {
++                                     page cardLChart
++                                 }
++                             }
++                             if(tInstruction.txt=="timeout")
++                             {
++                                 //set timeout to global var
++                                 spstr strCommand.txt,tTmp.txt,"~",1
++                                 covx tTmp.txt,sleepTimeout,0,0
++                             }

HMI/code_gen/pages/screensaver2.py

@@ -1,272 +1,274 @@
-from shared import *
-head = sharedhead + """
-            if(tInstruction.txt=="wake")
-            {
-              click tc0,1
-            }
-            if(tInstruction.txt=="dimmode")
-            {
-              // get value
-              spstr strCommand.txt,tTmp.txt,"~",1
-              covx tTmp.txt,dimValue,0,0
-              dim=dimValue
-              // get value normal
-              spstr strCommand.txt,tTmp.txt,"~",2
-              covx tTmp.txt,dimValueNormal,0,0
-              // get background color
-              spstr strCommand.txt,tTmp.txt,"~",3
-              if(tTmp.txt!="")
-              {
-                covx tTmp.txt,defaultBcoColor,0,0
-              }
-              // get font color
-              spstr strCommand.txt,tTmp.txt,"~",4
-              if(tTmp.txt!="")
-              {
-                covx tTmp.txt,defaultFontColor,0,0
-              }
-            }
-            if(tInstruction.txt=="time")
-            {
-              click m0,1
-              //get set time to global variable
-              spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
-              spstr pageIcons.vaTime.txt,tTime.txt,"?",0
-              spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
-              if(tAMPM.txt=="")
-              {
-                vis tAMPM,0
-              }
-              spstr strCommand.txt,tTimeAdd.txt,"~",2
-              ref tIcon1
-              ref tIcon2
-            }
-            if(tInstruction.txt=="date")
-            {
-              //get set date to global variable
-              spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
-              tDate.txt=pageIcons.vaDate.txt
-            }
-            if(tInstruction.txt=="statusUpdate")
-            {
-              //statusIcon1
-              spstr strCommand.txt,tIcon1.txt,"~",1
-              spstr strCommand.txt,tTmp.txt,"~",2
-              covx tTmp.txt,tIcon1.pco,0,0
-              //statusIcon2
-              spstr strCommand.txt,tIcon2.txt,"~",3
-              spstr strCommand.txt,tTmp.txt,"~",4
-              covx tTmp.txt,tIcon2.pco,0,0
-              spstr strCommand.txt,tTmp.txt,"~",5
-              if(tTmp.txt!="")
-              {
-                tIcon1.font=3
-              }
-              spstr strCommand.txt,tTmp.txt,"~",6
-              if(tTmp.txt!="")
-              {
-                tIcon2.font=3
-              }
-            }
-            if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
-            {
-
-              //tMainIcon
-              spstr strCommand.txt,tMainIcon.txt,"~",3
-              //tMainIcon Color
-              spstr strCommand.txt,tTmp.txt,"~",4
-              covx tTmp.txt,tMainIcon.pco,0,0
-              //tMainText
-              spstr strCommand.txt,tMainText.txt,"~",6
-"""
-
-start = 7
-for i in range(1,4):
-    idxstart = start + (i-1)*6
-    item = f"""
-              //d{i}Icon
-              spstr strCommand.txt,d{i}Icon.txt,"~",{idxstart+2}
-              //d{i}Icon Color
-              spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
-              covx tTmp.txt,d{i}Icon.pco,0,0
-              //d{i}Val
-              spstr strCommand.txt,d{i}Val.txt,"~",{idxstart+5}
-
-    """
-    head = head + item
-
-start = idxstart+6
-for i in range(1,7):
-    idxstart = start + (i-1)*6
-    item = f"""
-              //e{i}Name
-              spstr strCommand.txt,e{i}Name.txt,"~",{idxstart+4}
-              //e{i}Icon
-              spstr strCommand.txt,e{i}Icon.txt,"~",{idxstart+2}
-              //e{i}Icon Color
-              spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
-              covx tTmp.txt,e{i}Icon.pco,0,0
-              //e{i}Val
-              spstr strCommand.txt,e{i}Val.txt,"~",{idxstart+5}
-
-    """
-    head = head + item
-
-start = idxstart+6
-for i in range(1,6):
-    idxstart = start + (i-1)*6
-    item = f"""
-              //f{i}Icon
-              spstr strCommand.txt,f{i}Icon.txt,"~",{idxstart+2}
-              //f{i}Icon Color
-              spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
-              covx tTmp.txt,f{i}Icon.pco,0,0
-    """
-    head = head + item
-
-head = head + """
-            }
-
-            if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
-            {
-              spstr strCommand.txt,tTmp.txt,"~",1
-              covx tTmp.txt,tTime.bco,0,0
-              if(tTime.bco!=screensaver.bco)
-              {
-                for(sys0=0;sys0<60;sys0++)
-                {
-                  if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
-                  {
-                    b[sys0].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,tMainText.pco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",6
-              //covx tTmp.txt,tForecast1.pco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",7
-              //covx tTmp.txt,tForecast2.pco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",8
-              //covx tTmp.txt,tForecast3.pco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",9
-              //covx tTmp.txt,tForecast4.pco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",10
-              //covx tTmp.txt,tForecast1Val.pco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",11
-              //covx tTmp.txt,tForecast2Val.pco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",12
-              //covx tTmp.txt,tForecast3Val.pco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",13
-              //covx tTmp.txt,tForecast4Val.pco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",14
-              //covx tTmp.txt,t10.bco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",15
-              //covx tTmp.txt,tMainTextAlt2.pco,0,0
-              //spstr strCommand.txt,tTmp.txt,"~",16
-              //covx tTmp.txt,tTimeAdd.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
-              }
-              tNotifyHead.bco=tTime.bco
-              tNotifyText.bco=tTime.bco
-              spstr strCommand.txt,tTmp.txt,"~",3
-              if(tTmp.txt!="")
-              {
-                covx tTmp.txt,tNotifyHead.pco,0,0
-              }
-              spstr strCommand.txt,tTmp.txt,"~",4
-              if(tTmp.txt!="")
-              {
-                covx tTmp.txt,tNotifyText.pco,0,0
-              }
-"""
-
-print(head)
-
-
-#start = 23
-#for i in range(1,7):
-#    idxstart = start + (i-1)*6
-#    item = f"""
-#              // get Type
-#              spstr strCommand.txt,type{i}.txt,"~",{idxstart}
-#              // get internal name
-#              spstr strCommand.txt,entn{i}.txt,"~",{idxstart+1}
-#              if(type{i}.txt=="delete"||type{i}.txt=="")
-#              {{
-#                vis tEntity{i},0
-#                vis bEntity{i},0
-#              }}else
-#              {{
-#                // change icon
-#                spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
-#                vis bEntity{i},1
-#                // change icon color
-#                spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
-#                covx tTmp.txt,sys0,0,0
-#                bEntity{i}.pco=sys0
-#                // set name
-#                spstr strCommand.txt,tEntity{i}.txt,"~",{idxstart+4}
-#                vis tEntity{i},1
-#              }}
-#"""
-#    print(item)
-foot = """
-            }
-""" + sharedfoot.replace("sleepValue=0", "dim=100").replace("""
-            if(tInstruction.txt=="time")
-            {
-              // get set time to global variable
-              spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
-            }
-            if(tInstruction.txt=="date")
-            {
-              // get set date to global variable
-              spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
-            }
-            if(tInstruction.txt=="dimmode")
-            {
-              // get value
-              spstr strCommand.txt,tTmp.txt,"~",1
-              covx tTmp.txt,dimValue,0,0
-              // get value normal
-              spstr strCommand.txt,tTmp.txt,"~",2
-              covx tTmp.txt,dimValueNormal,0,0
-              dim=dimValueNormal
-              // get background color
-              spstr strCommand.txt,tTmp.txt,"~",3
-              if(tTmp.txt!="")
-              {
-                covx tTmp.txt,defaultBcoColor,0,0
-              }
-              // get font color
-              spstr strCommand.txt,tTmp.txt,"~",4
-              if(tTmp.txt!="")
-              {
-                covx tTmp.txt,defaultFontColor,0,0
-              }
-            }""","")
-print(foot)
-
-
+from shared import *
+head = sharedhead + """
+            if(tInstruction.txt=="wake")
+            {
+              click tc0,1
+            }
+            if(tInstruction.txt=="dimmode")
+            {
+              // get value
+              spstr strCommand.txt,tTmp.txt,"~",1
+              covx tTmp.txt,dimValue,0,0
+              dim=dimValue
+              // get value normal
+              spstr strCommand.txt,tTmp.txt,"~",2
+              covx tTmp.txt,dimValueNormal,0,0
+              // get background color
+              spstr strCommand.txt,tTmp.txt,"~",3
+              if(tTmp.txt!="")
+              {
+                covx tTmp.txt,defaultBcoColor,0,0
+              }
+              // get font color
+              spstr strCommand.txt,tTmp.txt,"~",4
+              if(tTmp.txt!="")
+              {
+                covx tTmp.txt,defaultFontColor,0,0
+              }
+            }
+            if(tInstruction.txt=="time")
+            {
+              click m0,1
+              //get set time to global variable
+              spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+              spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+              spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
+              if(tAMPM.txt=="")
+              {
+                vis tAMPM,0
+              }
+              spstr strCommand.txt,tTimeAdd.txt,"~",2
+              ref tIcon1
+              ref tIcon2
+            }
+            if(tInstruction.txt=="date")
+            {
+              //get set date to global variable
+              spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+              tDate.txt=pageIcons.vaDate.txt
+            }
+            if(tInstruction.txt=="statusUpdate")
+            {
+              //statusIcon1
+              spstr strCommand.txt,tIcon1.txt,"~",1
+              spstr strCommand.txt,tTmp.txt,"~",2
+              covx tTmp.txt,tIcon1.pco,0,0
+              //statusIcon2
+              spstr strCommand.txt,tIcon2.txt,"~",3
+              spstr strCommand.txt,tTmp.txt,"~",4
+              covx tTmp.txt,tIcon2.pco,0,0
+              spstr strCommand.txt,tTmp.txt,"~",5
+              if(tTmp.txt!="")
+              {
+                tIcon1.font=3
+              }
+              spstr strCommand.txt,tTmp.txt,"~",6
+              if(tTmp.txt!="")
+              {
+                tIcon2.font=3
+              }
+            }
+            if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
+            {
+
+              //tMainIcon
+              spstr strCommand.txt,tMainIcon.txt,"~",3
+              //tMainIcon Color
+              spstr strCommand.txt,tTmp.txt,"~",4
+              covx tTmp.txt,tMainIcon.pco,0,0
+              //tMainText
+              spstr strCommand.txt,tMainText.txt,"~",6
+"""
+
+start = 7
+for i in range(1,4):
+    idxstart = start + (i-1)*6
+    item = f"""
+              //d{i}Icon
+              spstr strCommand.txt,d{i}Icon.txt,"~",{idxstart+2}
+              //d{i}Icon Color
+              spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
+              covx tTmp.txt,d{i}Icon.pco,0,0
+              //d{i}Val
+              spstr strCommand.txt,d{i}Val.txt,"~",{idxstart+5}
+
+    """
+    head = head + item
+
+start = idxstart+6
+for i in range(1,7):
+    idxstart = start + (i-1)*6
+    item = f"""
+              //e{i}Name
+              spstr strCommand.txt,e{i}Name.txt,"~",{idxstart+4}
+              //e{i}Icon
+              spstr strCommand.txt,e{i}Icon.txt,"~",{idxstart+2}
+              //e{i}Icon Color
+              spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
+              covx tTmp.txt,e{i}Icon.pco,0,0
+              //e{i}Val
+              spstr strCommand.txt,e{i}Val.txt,"~",{idxstart+5}
+
+    """
+    head = head + item
+
+start = idxstart+6
+for i in range(1,6):
+    idxstart = start + (i-1)*6
+    item = f"""
+              //f{i}Icon
+              spstr strCommand.txt,f{i}Icon.txt,"~",{idxstart+2}
+              //f{i}Icon Color
+              spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
+              covx tTmp.txt,f{i}Icon.pco,0,0
+              //f{i}Icon intNameEntity
+              spstr strCommand.txt,entn{i}.txt,"~",{idxstart+1}
+    """
+    head = head + item
+
+head = head + """
+            }
+
+            if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
+            {
+              spstr strCommand.txt,tTmp.txt,"~",1
+              covx tTmp.txt,tTime.bco,0,0
+              if(tTime.bco!=screensaver.bco)
+              {
+                for(sys0=0;sys0<60;sys0++)
+                {
+                  if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
+                  {
+                    b[sys0].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,tMainText.pco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",6
+              //covx tTmp.txt,tForecast1.pco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",7
+              //covx tTmp.txt,tForecast2.pco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",8
+              //covx tTmp.txt,tForecast3.pco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",9
+              //covx tTmp.txt,tForecast4.pco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",10
+              //covx tTmp.txt,tForecast1Val.pco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",11
+              //covx tTmp.txt,tForecast2Val.pco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",12
+              //covx tTmp.txt,tForecast3Val.pco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",13
+              //covx tTmp.txt,tForecast4Val.pco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",14
+              //covx tTmp.txt,t10.bco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",15
+              //covx tTmp.txt,tMainTextAlt2.pco,0,0
+              //spstr strCommand.txt,tTmp.txt,"~",16
+              //covx tTmp.txt,tTimeAdd.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
+              }
+              tNotifyHead.bco=tTime.bco
+              tNotifyText.bco=tTime.bco
+              spstr strCommand.txt,tTmp.txt,"~",3
+              if(tTmp.txt!="")
+              {
+                covx tTmp.txt,tNotifyHead.pco,0,0
+              }
+              spstr strCommand.txt,tTmp.txt,"~",4
+              if(tTmp.txt!="")
+              {
+                covx tTmp.txt,tNotifyText.pco,0,0
+              }
+"""
+
+print(head)
+
+
+#start = 23
+#for i in range(1,7):
+#    idxstart = start + (i-1)*6
+#    item = f"""
+#              // get Type
+#              spstr strCommand.txt,type{i}.txt,"~",{idxstart}
+#              // get internal name
+#              spstr strCommand.txt,entn{i}.txt,"~",{idxstart+1}
+#              if(type{i}.txt=="delete"||type{i}.txt=="")
+#              {{
+#                vis tEntity{i},0
+#                vis bEntity{i},0
+#              }}else
+#              {{
+#                // change icon
+#                spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
+#                vis bEntity{i},1
+#                // change icon color
+#                spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
+#                covx tTmp.txt,sys0,0,0
+#                bEntity{i}.pco=sys0
+#                // set name
+#                spstr strCommand.txt,tEntity{i}.txt,"~",{idxstart+4}
+#                vis tEntity{i},1
+#              }}
+#"""
+#    print(item)
+foot = """
+            }
+""" + sharedfoot.replace("sleepValue=0", "dim=100").replace("""
+            if(tInstruction.txt=="time")
+            {
+              // get set time to global variable
+              spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+            }
+            if(tInstruction.txt=="date")
+            {
+              // get set date to global variable
+              spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+            }
+            if(tInstruction.txt=="dimmode")
+            {
+              // get value
+              spstr strCommand.txt,tTmp.txt,"~",1
+              covx tTmp.txt,dimValue,0,0
+              // get value normal
+              spstr strCommand.txt,tTmp.txt,"~",2
+              covx tTmp.txt,dimValueNormal,0,0
+              dim=dimValueNormal
+              // get background color
+              spstr strCommand.txt,tTmp.txt,"~",3
+              if(tTmp.txt!="")
+              {
+                covx tTmp.txt,defaultBcoColor,0,0
+              }
+              // get font color
+              spstr strCommand.txt,tTmp.txt,"~",4
+              if(tTmp.txt!="")
+              {
+                covx tTmp.txt,defaultFontColor,0,0
+              }
+            }""","")
+print(foot)
+
+

HMI/n2t-out-visual/cardBurnRec.txt

@@ -1,63 +0,0 @@
-Page cardBurnRec
-    Attributes
-        ID                 : 0
-        Scope              : local
-        Dragging           : 0
-        Send Component ID  : disabled
-        Opacity            : 127
-        Width              : 480
-        Effect             : load
-        Effect Priority    : 0
-        Effect Time        : 300
-        Locked             : no
-        Swide up page ID   : disabled
-        Swide down page ID : disabled
-        Swide left page ID : disabled
-        Swide right page ID: disabled
-        Fill               : solid color
-        Back. Color        : 65535
-    
-Timer tm0
-    Attributes
-        ID         : 1
-        Scope      : local
-        Period (ms): 1001
-        Enabled    : yes
-    
-    Events
-        Timer Event
-            dim=100
-            sys0=0
-            sys1=0
-            if(sys2==WHITE)
-            {
-                sys2=BLACK
-            }else
-            {
-                sys2=WHITE
-            }
-            sya1=sys2
-            while(sys0<8)
-            {
-                sya0=sys0%2
-                if(sya1==WHITE)
-                {
-                    sya1=BLACK
-                }else
-                {
-                    sya1=WHITE
-                }
-                fill 0,40*sys0,480,40,sya1
-                sys0++
-            }
-        
-TouchCap tc0
-    Attributes
-        ID   : 2
-        Scope: local
-        Value: 0
-    
-    Events
-        Touch Press Event
-            page pageStartup
-        

HMI/n2t-out-visual/nspanel_Stats.txt

@@ -6,10 +6,14 @@ pageIcons
 	7    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
-cardBurnRec
-	3    Component(s)
-	25   Line(s) of event code
-	21   Unique line(s) of event code
+pageTest
+	25   Component(s)
+	68   Line(s) of event code
+	66   Unique line(s) of event code
+popupNotify
+	19   Component(s)
+	271  Line(s) of event code
+	174  Unique line(s) of event code
 popupFan
 	27   Component(s)
 	355  Line(s) of event code
@@ -26,14 +30,6 @@ popupLightNew
 	23   Component(s)
 	412  Line(s) of event code
 	209  Unique line(s) of event code
-popupNotify
-	19   Component(s)
-	267  Line(s) of event code
-	172  Unique line(s) of event code
-pageTest
-	26   Component(s)
-	69   Line(s) of event code
-	67   Unique line(s) of event code
 cardGrid2
 	52   Component(s)
 	703  Line(s) of event code
@@ -46,6 +42,10 @@ cardChart
 	33   Component(s)
 	447  Line(s) of event code
 	297  Unique line(s) of event code
+cardGrid
+	44   Component(s)
+	593  Line(s) of event code
+	333  Unique line(s) of event code
 cardQR
 	34   Component(s)
 	420  Line(s) of event code
@@ -66,10 +66,6 @@ cardThermo
 	57   Component(s)
 	550  Line(s) of event code
 	320  Unique line(s) of event code
-cardGrid
-	44   Component(s)
-	593  Line(s) of event code
-	333  Unique line(s) of event code
 popupInSel
 	34   Component(s)
 	621  Line(s) of event code
@@ -91,16 +87,16 @@ popupThermo
 	523  Line(s) of event code
 	276  Unique line(s) of event code
 screensaver2
-	59   Component(s)
-	373  Line(s) of event code
-	256  Unique line(s) of event code
+	64   Component(s)
+	434  Line(s) of event code
+	264  Unique line(s) of event code
 cardEntities
 	67   Component(s)
 	1205 Line(s) of event code
 	536  Unique line(s) of event code
 
 Total
-	24   Page(s)
-	880  Component(s)
-	10740 Line(s) of event code
-	2475 Unique line(s) of event code
+	23   Page(s)
+	881  Component(s)
+	10779 Line(s) of event code
+	2466 Unique line(s) of event code

HMI/n2t-out-visual/pageTest.txt

@@ -335,41 +335,6 @@ Button b13
         Touch Press Event
             showqq
         
-Button b14
-    Attributes
-        ID                        : 25
-        Scope                     : local
-        Dragging                  : 0
-        Send Component ID         : disabled
-        Opacity                   : 127
-        x coordinate              : 229
-        y coordinate              : 188
-        Width                     : 106
-        Height                    : 40
-        Effect                    : load
-        Effect Priority           : 0
-        Effect Time               : 300
-        Fill                      : solid color
-        Style                     : 3D auto
-        Font ID                   : 1
-        Back. Color               : 50712
-        Back. Picture ID (Pressed): 65535
-        Back. Color (Pressed)     : 1024
-        Font Color (Unpressed)    : 0
-        Font Color (Pressed)      : 65535
-        Horizontal Alignment      : center
-        Vertical Alignment        : center
-        State                     : unpressed
-        Text                      : burntest
-        Max. Text Size            : 10
-        Word wrap                 : disabled
-        Horizontal Spacing        : 0
-        Vertical Spacing          : 0
-    
-    Events
-        Touch Press Event
-            page cardBurnRec
-        
 Button b15
     Attributes
         ID                        : 21

HMI/n2t-out-visual/popupNotify.txt

@@ -672,6 +672,10 @@ Timer tmSerial
                                         {
                                             page cardChart
                                         }
+                                        if(tId.txt=="cardLChart")
+                                        {
+                                            page cardLChart
+                                        }
                                     }
                                     // end of user code
                                     udelete payloadLength-1

HMI/n2t-out-visual/screensaver2.txt

@@ -56,12 +56,47 @@ Page screensaver2
         Postinitialize Event
             click m0,1
         
+Variable (string) entn1
+    Attributes
+        ID            : 59
+        Scope         : local
+        Text          : 
+        Max. Text Size: 14
+    
+Variable (string) entn2
+    Attributes
+        ID            : 60
+        Scope         : local
+        Text          : 
+        Max. Text Size: 14
+    
+Variable (string) entn3
+    Attributes
+        ID            : 61
+        Scope         : local
+        Text          : 
+        Max. Text Size: 14
+    
+Variable (string) entn4
+    Attributes
+        ID            : 62
+        Scope         : local
+        Text          : 
+        Max. Text Size: 14
+    
+Variable (string) entn5
+    Attributes
+        ID            : 63
+        Scope         : local
+        Text          : 
+        Max. Text Size: 14
+    
 Variable (string) strCommand
     Attributes
         ID            : 4
         Scope         : local
         Text          : 
-        Max. Text Size: 1979
+        Max. Text Size: 1955
     
 Variable (string) strTmp
     Attributes
@@ -82,21 +117,21 @@ Variable (string) tInstruction
         ID            : 18
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 15
     
 Variable (string) tSend
     Attributes
         ID            : 20
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 30
     
 Variable (string) tTmp
     Attributes
         ID            : 19
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 30
     
 Variable (int32) vaTap
     Attributes
@@ -865,6 +900,21 @@ Text f1Icon
         Horizontal Spacing  : 0
         Vertical Spacing    : 0
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+            //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
+        
 Text f2Icon
     Attributes
         ID                  : 54
@@ -894,6 +944,35 @@ Text f2Icon
         Horizontal Spacing  : 0
         Vertical Spacing    : 0
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn2.txt+",button"
+            //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
+        
+        Touch Release Event
+            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+            //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
+        
 Text f3Icon
     Attributes
         ID                  : 55
@@ -923,6 +1002,21 @@ Text f3Icon
         Horizontal Spacing  : 0
         Vertical Spacing    : 0
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn3.txt+",button"
+            //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
+        
 Text f4Icon
     Attributes
         ID                  : 53
@@ -952,6 +1046,21 @@ Text f4Icon
         Horizontal Spacing  : 0
         Vertical Spacing    : 0
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn4.txt+",button"
+            //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
+        
 Text f5Icon
     Attributes
         ID                  : 52
@@ -981,6 +1090,21 @@ Text f5Icon
         Horizontal Spacing  : 0
         Vertical Spacing    : 0
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn5.txt+",button"
+            //send calc crc
+            btlen tSend.txt,sys0
+            crcrest 1,0xffff // reset CRC
+            crcputh 55 bb
+            crcputs sys0,2
+            crcputs tSend.txt,0
+            //send cmd
+            printh 55 bb
+            prints sys0,2
+            prints tSend.txt,0
+            prints crcval,2
+        
 Text m0
     Attributes
         ID                  : 32
@@ -1551,26 +1675,36 @@ Timer tmSerial
                                         //f1Icon Color
                                         spstr strCommand.txt,tTmp.txt,"~",64
                                         covx tTmp.txt,f1Icon.pco,0,0
+                                        //f1Icon intNameEntity
+                                        spstr strCommand.txt,entn1.txt,"~",62
                                         //f2Icon
                                         spstr strCommand.txt,f2Icon.txt,"~",69
                                         //f2Icon Color
                                         spstr strCommand.txt,tTmp.txt,"~",70
                                         covx tTmp.txt,f2Icon.pco,0,0
+                                        //f2Icon intNameEntity
+                                        spstr strCommand.txt,entn2.txt,"~",68
                                         //f3Icon
                                         spstr strCommand.txt,f3Icon.txt,"~",75
                                         //f3Icon Color
                                         spstr strCommand.txt,tTmp.txt,"~",76
                                         covx tTmp.txt,f3Icon.pco,0,0
+                                        //f3Icon intNameEntity
+                                        spstr strCommand.txt,entn3.txt,"~",74
                                         //f4Icon
                                         spstr strCommand.txt,f4Icon.txt,"~",81
                                         //f4Icon Color
                                         spstr strCommand.txt,tTmp.txt,"~",82
                                         covx tTmp.txt,f4Icon.pco,0,0
+                                        //f4Icon intNameEntity
+                                        spstr strCommand.txt,entn4.txt,"~",80
                                         //f5Icon
                                         spstr strCommand.txt,f5Icon.txt,"~",87
                                         //f5Icon Color
                                         spstr strCommand.txt,tTmp.txt,"~",88
                                         covx tTmp.txt,f5Icon.pco,0,0
+                                        //f5Icon intNameEntity
+                                        spstr strCommand.txt,entn5.txt,"~",86
                                     }
                                     if(tInstruction.txt=="notify")
                                     {
@@ -1674,10 +1808,6 @@ Timer tmSerial
                                         {
                                             page cardChart
                                         }
-                                        if(tId.txt=="cardLChart")
-                                        {
-                                            page cardLChart
-                                        }
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {

HMI/n2t-out/cardBurnRec.txt

@@ -1,53 +0,0 @@
-Page cardBurnRec
-    Attributes
-        Scope              : local
-        Dragging           : 0
-        Send Component ID  : disabled
-        Locked             : no
-        Swide up page ID   : disabled
-        Swide down page ID : disabled
-        Swide left page ID : disabled
-        Swide right page ID: disabled
-    
-Timer tm0
-    Attributes
-        Scope      : local
-        Period (ms): 1001
-        Enabled    : yes
-    
-    Events
-        Timer Event
-            dim=100
-            sys0=0
-            sys1=0
-            if(sys2==WHITE)
-            {
-                sys2=BLACK
-            }else
-            {
-                sys2=WHITE
-            }
-            sya1=sys2
-            while(sys0<8)
-            {
-                sya0=sys0%2
-                if(sya1==WHITE)
-                {
-                    sya1=BLACK
-                }else
-                {
-                    sya1=WHITE
-                }
-                fill 0,40*sys0,480,40,sya1
-                sys0++
-            }
-        
-TouchCap tc0
-    Attributes
-        Scope: local
-        Value: 0
-    
-    Events
-        Touch Press Event
-            page pageStartup
-        

HMI/n2t-out/pageTest.txt

@@ -141,19 +141,6 @@ Button b13
         Touch Press Event
             showqq
         
-Button b14
-    Attributes
-        Scope            : local
-        Dragging         : 0
-        Send Component ID: disabled
-        State            : unpressed
-        Text             : burntest
-        Max. Text Size   : 10
-    
-    Events
-        Touch Press Event
-            page cardBurnRec
-        
 Button b15
     Attributes
         Scope            : local

HMI/n2t-out/popupNotify.txt

@@ -443,6 +443,10 @@ Timer tmSerial
                                         {
                                             page cardChart
                                         }
+                                        if(tId.txt=="cardLChart")
+                                        {
+                                            page cardLChart
+                                        }
                                     }
                                     // end of user code
                                     udelete payloadLength-1

HMI/n2t-out/screensaver2.txt

@@ -48,11 +48,41 @@ Page screensaver2
         Postinitialize Event
             click m0,1
         
+Variable (string) entn1
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 14
+    
+Variable (string) entn2
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 14
+    
+Variable (string) entn3
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 14
+    
+Variable (string) entn4
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 14
+    
+Variable (string) entn5
+    Attributes
+        Scope         : local
+        Text          : 
+        Max. Text Size: 14
+    
 Variable (string) strCommand
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 1979
+        Max. Text Size: 1955
     
 Variable (string) strTmp
     Attributes
@@ -70,19 +100,19 @@ Variable (string) tInstruction
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 15
     
 Variable (string) tSend
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 30
     
 Variable (string) tTmp
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 30
     
 Variable (int32) vaTap
     Attributes
@@ -344,6 +374,21 @@ Text f1Icon
         Text               : 
         Max. Text Size     : 4
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+            //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
+        
 Text f2Icon
     Attributes
         Scope              : local
@@ -353,6 +398,35 @@ Text f2Icon
         Text               : 
         Max. Text Size     : 4
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn2.txt+",button"
+            //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
+        
+        Touch Release Event
+            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+            //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
+        
 Text f3Icon
     Attributes
         Scope              : local
@@ -362,6 +436,21 @@ Text f3Icon
         Text               : 
         Max. Text Size     : 4
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn3.txt+",button"
+            //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
+        
 Text f4Icon
     Attributes
         Scope              : local
@@ -371,6 +460,21 @@ Text f4Icon
         Text               : 
         Max. Text Size     : 4
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn4.txt+",button"
+            //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
+        
 Text f5Icon
     Attributes
         Scope              : local
@@ -380,6 +484,21 @@ Text f5Icon
         Text               : 
         Max. Text Size     : 4
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn5.txt+",button"
+            //send calc crc
+            btlen tSend.txt,sys0
+            crcrest 1,0xffff // reset CRC
+            crcputh 55 bb
+            crcputs sys0,2
+            crcputs tSend.txt,0
+            //send cmd
+            printh 55 bb
+            prints sys0,2
+            prints tSend.txt,0
+            prints crcval,2
+        
 Text m0
     Attributes
         Scope              : local
@@ -718,26 +837,36 @@ Timer tmSerial
                                         //f1Icon Color
                                         spstr strCommand.txt,tTmp.txt,"~",64
                                         covx tTmp.txt,f1Icon.pco,0,0
+                                        //f1Icon intNameEntity
+                                        spstr strCommand.txt,entn1.txt,"~",62
                                         //f2Icon
                                         spstr strCommand.txt,f2Icon.txt,"~",69
                                         //f2Icon Color
                                         spstr strCommand.txt,tTmp.txt,"~",70
                                         covx tTmp.txt,f2Icon.pco,0,0
+                                        //f2Icon intNameEntity
+                                        spstr strCommand.txt,entn2.txt,"~",68
                                         //f3Icon
                                         spstr strCommand.txt,f3Icon.txt,"~",75
                                         //f3Icon Color
                                         spstr strCommand.txt,tTmp.txt,"~",76
                                         covx tTmp.txt,f3Icon.pco,0,0
+                                        //f3Icon intNameEntity
+                                        spstr strCommand.txt,entn3.txt,"~",74
                                         //f4Icon
                                         spstr strCommand.txt,f4Icon.txt,"~",81
                                         //f4Icon Color
                                         spstr strCommand.txt,tTmp.txt,"~",82
                                         covx tTmp.txt,f4Icon.pco,0,0
+                                        //f4Icon intNameEntity
+                                        spstr strCommand.txt,entn4.txt,"~",80
                                         //f5Icon
                                         spstr strCommand.txt,f5Icon.txt,"~",87
                                         //f5Icon Color
                                         spstr strCommand.txt,tTmp.txt,"~",88
                                         covx tTmp.txt,f5Icon.pco,0,0
+                                        //f5Icon intNameEntity
+                                        spstr strCommand.txt,entn5.txt,"~",86
                                     }
                                     if(tInstruction.txt=="notify")
                                     {
@@ -841,10 +970,6 @@ Timer tmSerial
                                         {
                                             page cardChart
                                         }
-                                        if(tId.txt=="cardLChart")
-                                        {
-                                            page cardLChart
-                                        }
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {

ioBroker/Blockly/Alarm_Page_Erweitertes_Skript_mit_PopupNotifyPage.xml

@@ -971,12 +971,37 @@
                             </value>
                           </block>
                         </value>
-                        <value name="VALUE">
-                          <shadow type="logic_boolean" id="I4PsJQb;6k+70^g*Xt/}">
-                            <field name="BOOL">TRUE</field>
-                          </shadow>
-                          <block type="math_random_float" id="C5/h)jq=yPM?,9J=(w65"></block>
-                        </value>
+  <value name="VALUE">
+    <shadow type="logic_boolean" id="I4PsJQb;6k+70^g*Xt/}">
+      <field name="BOOL">TRUE</field>
+    </shadow>
+    <block type="text_join" id="XdhGC7#MxGw|KhC1x#MY">
+      <mutation items="2"></mutation>
+      <value name="ADD0">
+        <block type="text" id="[(_1;{xE-xfzeB4]$uk;">
+          <field name="TEXT">ID</field>
+        </block>
+      </value>
+      <value name="ADD1">
+        <block type="convert_tostring" id="g{jZOA*6Clhc5`9::h.S">
+          <value name="VALUE">
+            <block type="math_random_int" id="SXG?j1]Jza!2fg[(cl!i">
+              <value name="FROM">
+                <shadow type="math_number" id="#/-;$~`{=}8wYY$kbvA9">
+                  <field name="NUM">1</field>
+                </shadow>
+              </value>
+              <value name="TO">
+                <shadow type="math_number" id="0x8~a;asHsiJ2Its%!VJ">
+                  <field name="NUM">100</field>
+                </shadow>
+              </value>
+            </block>
+          </value>
+        </block>
+      </value>
+    </block>
+  </value>
                         <value name="DELAY_MS">
                           <shadow type="math_number" id="+6#n%fO}e4h%;FhKPV0c">
                             <field name="NUM">0</field>

ioBroker/ioBroker_NSPanel_locales.json

@@ -2497,6 +2497,14 @@
          "vi-VN":"Mật khẩu",
          "zh-CN":"密码",
          "zh-TW":"密碼"
+      },
+      "Wlan enabled":{
+         "en-US":"Wlan enabled",
+         "de-DE":"Wlan aktiviert"
+      },
+      "Wlan disabled":{
+         "en-US":"Wlan disabled",
+         "de-DE":"Wlan deaktiviert"
       }
    },
    "media":{

ioBroker/ioBroker_NSPanel_locales_service.json

@@ -2697,5 +2697,9 @@
    "update_message":{
       "en-US":"Update Notifications",
       "de-DE":"Update Mitteilungen"
+   },
+   "scriptname":{
+      "en-US":"Script name",
+      "de-DE":"Skriptname"
    }
 }

ioBroker/tsconfig.json

@@ -0,0 +1,28 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "noEmit": true,
+    "allowJs": true,
+    "checkJs": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "strict": true,
+    "noImplicitReturns": true,
+    "noImplicitAny": false,
+    "target": "ES2022",
+    "typeRoots": [
+      ".iobroker/types",
+      "node_modules/@types"
+    ]
+  },
+  "include": [
+    "**/*.js",
+    "**/*.ts",
+    "./.iobroker/types/javascript.d.ts"
+  ],
+  "exclude": [
+    "node_modules/**"
+  ]
+}

nspanel-lovelace-ui/config.yaml

@@ -1,6 +1,6 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 name: NSPanel Lovelace UI Addon
-version: "4.7.73"
+version: "4.7.74"
 slug: nspanel-lovelace-ui
 description: NSPanel Lovelace UI Addon
 services:

nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py

@@ -67,7 +67,7 @@ class LovelaceUIPanel:
         self.schedule = Scheduler()
         self.schedule.minutely(datetime.time(second=0), self.update_time)
         self.schedule.hourly(datetime.time(
-            minute=0, second=0), self.update_time)
+            minute=0, second=0), self.update_date)
         schedule_thread = threading.Thread(target=self.schedule_thread_target)
         schedule_thread.daemon = True
         schedule_thread.start()