Update nspanel-lovelace-ui.py

ready for 9.0.11

.devcontainer.json

@@ -0,0 +1,26 @@
+{
+  "name": "NSPanel Lovelace UI Home Assistant add-on repository",
+  "image": "ghcr.io/home-assistant/devcontainer:addons",
+  "appPort": ["7123:8123", "7357:4357"],
+  "postCreateCommand": "apt install -y python3 python3-pip && pip install -r nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/requirements.txt --break-system-packages",
+  "postStartCommand": "bash devcontainer_bootstrap",
+  "runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"],
+  "remoteUser":"root",
+  "containerEnv": {
+    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
+  },
+  "extensions": ["timonwong.shellcheck", "esbenp.prettier-vscode"],
+  "mounts": ["type=volume,target=/var/lib/docker"],
+  "settings": {
+    "terminal.integrated.profiles.linux": {
+      "zsh": {
+        "path": "/usr/bin/zsh"
+      }
+    },
+    "terminal.integrated.defaultProfile.linux": "zsh",
+    "editor.formatOnPaste": false,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": true,
+    "files.trimTrailingWhitespace": true
+  }
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -58,5 +58,5 @@ _If applicable, add screenshots/pictures to help explain your problem._
 _Add any other context about the problem here._
 _Please note here in case you are using ioBroker_
 
-### PANEL / FIRMWARE VERION
+### PANEL / FIRMWARE VERSION
 _Please add the Panel/Firmware Version you are using (EU, US-L or US-P)_

.github/ISSUE_TEMPLATE/feature-request.md

@@ -24,5 +24,5 @@ _A clear and concise description of what the feature should do._
 ### ADDITIONAL CONTEXT
 _Add any other context about the problem here._
 
-### PANEL / FIRMWARE VERION
+### PANEL / FIRMWARE VERSION
 _Please add the Panel/Firmware Version you are using (EU, US-L or US-P)_

.github/dependabot.yaml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "06:00"

.github/workflows/builder.yaml

@@ -0,0 +1,111 @@
+name: Builder
+
+env:
+  BUILD_ARGS: "--test"
+  MONITORED_FILES: "build.yaml config.yaml Dockerfile rootfs"
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  init:
+    runs-on: ubuntu-latest
+    name: Initialize builds
+    outputs:
+      changed_addons: ${{ steps.changed_addons.outputs.addons }}
+      changed: ${{ steps.changed_addons.outputs.changed }}
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v4
+
+      - name: Get changed files
+        id: changed_files
+        uses: jitterbit/get-changed-files@v1
+
+      - name: Find add-on directories
+        id: addons
+        uses: home-assistant/actions/helpers/find-addons@master
+
+      - name: Get changed add-ons
+        id: changed_addons
+        run: |
+          declare -a changed_addons
+          for addon in ${{ steps.addons.outputs.addons }}; do
+            if [[ "${{ steps.changed_files.outputs.all }}" =~ $addon ]]; then
+              for file in ${{ env.MONITORED_FILES }}; do
+                  if [[ "${{ steps.changed_files.outputs.all }}" =~ $addon/$file ]]; then
+                    if [[ ! "${changed_addons[@]}" =~ $addon ]]; then
+                      changed_addons+=("\"${addon}\",");
+                    fi
+                  fi
+              done
+            fi
+          done
+
+          changed=$(echo ${changed_addons[@]} | rev | cut -c 2- | rev)
+
+          if [[ -n ${changed} ]]; then
+            echo "Changed add-ons: $changed";
+            echo "changed=true" >> $GITHUB_OUTPUT;
+            echo "addons=[$changed]" >> $GITHUB_OUTPUT;
+          else
+            echo "No add-on had any monitored files changed (${{ env.MONITORED_FILES }})";
+          fi
+  build:
+    needs: init
+    runs-on: ubuntu-latest
+    if: needs.init.outputs.changed == 'true'
+    name: Build ${{ matrix.arch }} ${{ matrix.addon }} add-on
+    strategy:
+      matrix:
+        addon: ${{ fromJson(needs.init.outputs.changed_addons) }}
+        arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Get information
+        id: info
+        uses: home-assistant/actions/helpers/info@master
+        with:
+          path: "./${{ matrix.addon }}"
+
+      - name: Check if add-on should be built
+        id: check
+        run: |
+          if [[ "${{ steps.info.outputs.architectures }}" =~ ${{ matrix.arch }} ]]; then
+             echo "build_arch=true" >> $GITHUB_OUTPUT;
+             echo "image=$(echo ${{ steps.info.outputs.image }} | cut -d'/' -f3)" >> $GITHUB_OUTPUT;
+             if [[ -z "${{ github.head_ref }}" ]] && [[ "${{ github.event_name }}" == "push" ]]; then
+                 echo "BUILD_ARGS=" >> $GITHUB_ENV;
+             fi
+           else
+             echo "${{ matrix.arch }} is not a valid arch for ${{ matrix.addon }}, skipping build";
+             echo "build_arch=false" >> $GITHUB_OUTPUT;
+          fi
+
+      - name: Login to GitHub Container Registry
+        if: env.BUILD_ARGS != '--test'
+        uses: docker/login-action@v3.4.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build ${{ matrix.addon }} add-on
+        if: steps.check.outputs.build_arch == 'true'
+        uses: home-assistant/builder@2025.03.0
+        with:
+          args: |
+            ${{ env.BUILD_ARGS }} \
+            --${{ matrix.arch }} \
+            --target /data/${{ matrix.addon }} \
+            --image "${{ steps.check.outputs.image }}" \
+            --docker-hub "ghcr.io/${{ github.repository_owner }}" \
+            --addon

.github/workflows/codeql-analysis.yml

@@ -43,11 +43,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # 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

.github/workflows/docs-dev.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - main
+      - dev
     paths:
       - docs/*
       - .github/workflows/docs.yml
@@ -15,10 +15,14 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
-      - run: pip install mkdocs-material mkdocs-video markdown-include
+      - run: pip install mkdocs-material mkdocs-video markdown-include mike
       - run: cp HMI/README.md docs/hmi-serial-protocol.md
-      - run: mkdocs gh-deploy --force
+      - run: git config --global user.name Docs deploy
+      - run: git config --global user.email docs@dummy.bot.com
+      - run: mike deploy --push --update-aliases dev

.github/workflows/docs-release.yml

@@ -0,0 +1,29 @@
+name: docs-ci
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - docs/*
+      - .github/workflows/docs-release.yml
+      - mkdocs.yml
+      - HMI/README.md
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - run: pip install mkdocs-material mkdocs-video markdown-include mike
+      - run: cp HMI/README.md docs/hmi-serial-protocol.md
+      - run: git config --global user.name Docs deploy
+      - run: git config --global user.email docs@dummy.bot.com
+      - run: mike set-default stable
+      - run: mike deploy --push --update-aliases stable

.github/workflows/hacs-validation.yaml

@@ -11,7 +11,7 @@ jobs:
     name: HACS Action
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v4"
       - name: HACS Action
         uses: "hacs/action@main"
         with:

.github/workflows/iobroker-localization.yml

@@ -18,7 +18,7 @@ jobs:
   gen-ioBroker-localization:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         ref: ${{ github.head_ref }}
 
@@ -28,7 +28,7 @@ jobs:
         python HMI/code_gen/localization/iobroker.py
         mv ioBroker_NSPanel_locales.json ioBroker/ioBroker_NSPanel_locales.json
         
-    - uses: stefanzweifel/git-auto-commit-action@v4
+    - uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: Update iobroker localization file
         #file_pattern: "**.txt"

.github/workflows/lint.yaml

@@ -0,0 +1,41 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  find:
+    name: Find add-ons
+    runs-on: ubuntu-latest
+    outputs:
+      addons: ${{ steps.addons.outputs.addons_list }}
+    steps:
+      - name: ⤵️ Check out code from GitHub
+        uses: actions/checkout@v4
+
+      - name: 🔍 Find add-on directories
+        id: addons
+        uses: home-assistant/actions/helpers/find-addons@master
+
+  lint:
+    name: Lint add-on ${{ matrix.path }}
+    runs-on: ubuntu-latest
+    needs: find
+    strategy:
+      matrix:
+        path: ${{ fromJson(needs.find.outputs.addons) }}
+    steps:
+      - name: ⤵️ Check out code from GitHub
+        uses: actions/checkout@v4
+
+      - name: 🚀 Run Home Assistant Add-on Lint
+        uses: frenck/action-addon-linter@v2.18
+        with:
+          path: "./${{ matrix.path }}"

.github/workflows/nextion2text.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         ref: ${{ github.head_ref }}
 
@@ -80,7 +80,7 @@ jobs:
         find -name "**.txt"
         rm Nextion2Text.py* ignore-id.py out.txt
         
-    - uses: stefanzweifel/git-auto-commit-action@v4
+    - uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: ${{ steps.last-commit-message.outputs.msg }} (add nextion2text)
         #file_pattern: "**.txt"

.gitignore

@@ -2,5 +2,8 @@ __pycache__/
 # don't add nextion2text
 HMI/Nextion2Text.py
 
+# dont add panels.yaml
+panels.yaml
+
 # don't add Webstorm project stuff
 .idea

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "request": "launch",
+            "program": "main.py",
+            "cwd": "/workspaces/nspanel-lovelace-ui/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager",
+            "console": "integratedTerminal",
+            "justMyCode": true
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,19 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Start Home Assistant",
+      "type": "shell",
+      "command": "supervisor_run",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "problemMatcher": []
+    }
+  ]
+}

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

@@ -14,6 +14,75 @@
 │ +    //lcd_dev fffb 0002 0000 0020
 │      printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
 │      page pageStartup
+│   --- HMI/n2t-out/cardEntities.txt
+├── +++ HMI/US/landscape/n2t-out/cardEntities.txt
+│ @@ -20,15 +20,14 @@
+│              crcputs tSend.txt,0
+│              //send cmd
+│              printh 55 bb
+│              prints sys0,2
+│              prints tSend.txt,0
+│              prints crcval,2
+│              dim=dimValueNormal
+│ -            dim=dimValueNormal
+│              //wup=cardEntities
+│              //remove background & activate reparse mode
+│              vis p0,0
+│              recmod=1
+│              baud=115200
+│              //debug stuff
+│              vis tTmp,0
+│   --- HMI/n2t-out/cardThermo.txt
+├── +++ HMI/US/landscape/n2t-out/cardThermo.txt
+│ @@ -28,14 +28,19 @@
+│              vis tSend,0
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis tId,0
+│              vis xTempMin1,0
+│              vis xTempMax1,0
+│              vis xTempStep1,0
+│ +            vis xTempDest,0
+│ +            vis btUp,0
+│ +            vis btDown,0
+│ +            vis tCF,0
+│ +            vis btDetail,0
+│              //tEntity.txt=tHeading.txt
+│              // disable all buttons
+│              vis bt0,0
+│              vis bt1,0
+│              vis bt2,0
+│              vis bt3,0
+│              vis bt4,0
+│ @@ -1014,14 +1019,28 @@
+│                                              vis xTempDest1,1
+│                                              vis btDown1,1
+│                                              vis tCF1,1
+│                                              vis bUp2,1
+│                                              vis xTempDest2,1
+│                                              vis bDown2,1
+│                                              vis tCF2,1
+│ +                                        }else
+│ +                                        {
+│ +                                            vis btUp,1
+│ +                                            vis xTempDest,1
+│ +                                            vis btDown,1
+│ +                                            vis tCF,1
+│ +                                            vis btUp1,0
+│ +                                            vis xTempDest1,0
+│ +                                            vis btDown1,0
+│ +                                            vis tCF1,0
+│ +                                            vis bUp2,0
+│ +                                            vis xTempDest2,0
+│ +                                            vis bDown2,0
+│ +                                            vis tCF2,0
+│                                          }
+│                                          //Show btDetail
+│                                          spstr strCommand.txt,tTmp.txt,"~",58
+│                                          if(tTmp.txt!="1")
+│                                          {
+│                                              vis btDetail,1
+│                                          }else
 │   --- HMI/n2t-out/pageStartup.txt
 ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
 │ @@ -164,15 +164,15 @@
@@ -33,9 +102,68 @@
 │              crcputs sys0,2
 │              crcputs tSend.txt,0
 │              //send cmd
+│   --- HMI/n2t-out/popupLight.txt
+├── +++ HMI/US/landscape/n2t-out/popupLight.txt
+│ @@ -453,19 +453,14 @@
+│                                      ucopy strCommand.txt,4,payloadLength-5,0
+│                                      // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
+│                                      spstr strCommand.txt,tInstruction.txt,"~",0
+│                                      spstr strCommand.txt,tTmp.txt,"~",1
+│                                      if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
+│                                      {
+│                                          // change icon
+│ -                                        spstr strCommand.txt,tTmp.txt,"~",2
+│ -                                        if(tTmp.txt!="")
+│ -                                        {
+│ -                                            tIcon1.txt=tTmp.txt
+│ -                                        }
+│                                          //spstr strCommand.txt,tIcon1.txt,"~",2
+│                                          vis tIcon1,1
+│                                          // change icon color
+│                                          spstr strCommand.txt,tTmp.txt,"~",3
+│                                          covx tTmp.txt,sys0,0,0
+│                                          tIcon1.pco=sys0
+│                                          // get Button State
+│   --- 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
-│ @@ -28,17 +28,14 @@
+│ @@ -19,15 +19,14 @@
+│              crcputs sys0,2
+│              crcputs tSend.txt,0
+│              //send cmd
+│              printh 55 bb
+│              prints sys0,2
+│              prints tSend.txt,0
+│              prints crcval,2
+│ -            dim=dimValueNormal
+│              recmod=1
+│              baud=115200
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis p0,0
+│              vis tNotifyHead,0
+│              vis tNotifyText,0
+│ @@ -41,17 +40,14 @@
 │              }
 │              tDate.txt=pageIcons.vaDate.txt
 │              dim=dimValue
@@ -53,7 +181,7 @@
 │          Max. Text Size: 600
 │      
 │  Variable (string) strTmp
-│ @@ -102,34 +99,14 @@
+│ @@ -115,34 +111,14 @@
 │          Value: 0
 │      
 │  Variable (int32) ycR
@@ -88,9 +216,43 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : |
+│ @@ -485,17 +461,14 @@
+│                                          //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
+│ -                                        }else
+│ -                                        {
+│ -                                            vis tAMPM,1
+│                                          }
+│                                          spstr strCommand.txt,tTimeAdd.txt,"~",2
+│                                          ref tIcon1
+│                                          ref tIcon2
+│                                      }
+│                                      if(tInstruction.txt=="date")
+│                                      {
 │   --- HMI/n2t-out/screensaver2.txt
 ├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
-│ @@ -28,17 +28,14 @@
+│ @@ -19,15 +19,14 @@
+│              crcputs sys0,2
+│              crcputs tSend.txt,0
+│              //send cmd
+│              printh 55 bb
+│              prints sys0,2
+│              prints tSend.txt,0
+│              prints crcval,2
+│ -            dim=dimValueNormal
+│              recmod=1
+│              baud=115200
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis p0,0
+│              vis tNotifyHead,0
+│              vis tNotifyText,0
+│ @@ -41,52 +40,19 @@
 │              }
 │              tDate.txt=pageIcons.vaDate.txt
 │              dim=dimValue
@@ -101,14 +263,80 @@
 │ -        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: 1935
+│ +        Max. Text Size: 1979
 │      
 │  Variable (string) strTmp
-│ @@ -363,34 +360,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: 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,165 +336,50 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -116,6 +344,137 @@
 │          Text               : 
 │          Max. Text Size     : 4
 │      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+│ -            if(entn1.txt=="")
+│ -            {
+│ -                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+│ -            }
+│ -            //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"
+│ -            if(entn2.txt=="")
+│ -            {
+│ -                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+│ -            }
+│ -            //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"
+│ -            if(entn3.txt=="")
+│ -            {
+│ -                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+│ -            }
+│ -            //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"
+│ -            if(entn4.txt=="")
+│ -            {
+│ -                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+│ -            }
+│ -            //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"
+│ -            if(entn5.txt=="")
+│ -            {
+│ -                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+│ -            }
+│ -            //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
@@ -143,7 +502,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : PM
-│ @@ -572,15 +549,14 @@
+│ @@ -710,15 +561,14 @@
 │                                          if(tTmp.txt!="")
 │                                          {
 │                                              covx tTmp.txt,defaultFontColor,0,0
@@ -159,3 +518,48 @@
 │                                          if(tAMPM.txt=="")
 │                                          {
 │                                              vis tAMPM,0
+│ @@ -839,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!="")
+│                                          {

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

@@ -19,6 +19,18 @@ Page cardAlarm
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -19,6 +19,18 @@ Page cardChart
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -19,6 +19,18 @@ Page cardEntities
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             //wup=cardEntities
             //remove background & activate reparse mode

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

@@ -19,6 +19,18 @@ Page cardGrid
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             //remove background & activate reparse mode
             vis p0,0

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

@@ -19,6 +19,18 @@ Page cardGrid2
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             //remove background & activate reparse mode
             vis p0,0

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

@@ -19,6 +19,18 @@ Page cardLChart
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -19,6 +19,18 @@ Page cardMedia
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -19,6 +19,18 @@ Page cardPower
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -19,6 +19,18 @@ Page cardQR
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -19,6 +19,18 @@ Page cardThermo
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0
@@ -28,6 +40,11 @@ Page cardThermo
             vis xTempMin1,0
             vis xTempMax1,0
             vis xTempStep1,0
+            vis xTempDest,0
+            vis btUp,0
+            vis btDown,0
+            vis tCF,0
+            vis btDetail,0
             //tEntity.txt=tHeading.txt
             // disable all buttons
             vis bt0,0
@@ -1730,6 +1747,20 @@ Timer tmSerial
                                             vis xTempDest2,1
                                             vis bDown2,1
                                             vis tCF2,1
+                                        }else
+                                        {
+                                            vis btUp,1
+                                            vis xTempDest,1
+                                            vis btDown,1
+                                            vis tCF,1
+                                            vis btUp1,0
+                                            vis xTempDest1,0
+                                            vis btDown1,0
+                                            vis tCF1,0
+                                            vis bUp2,0
+                                            vis xTempDest2,0
+                                            vis bDown2,0
+                                            vis tCF2,0
                                         }
                                         //Show btDetail
                                         spstr strCommand.txt,tTmp.txt,"~",58

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

@@ -18,10 +18,10 @@ popupTimer
 	42   Component(s)
 	516  Line(s) of event code
 	257  Unique line(s) of event code
-cardChart
+cardLChart
 	33   Component(s)
-	437  Line(s) of event code
-	296  Unique line(s) of event code
+	412  Line(s) of event code
+	267  Unique line(s) of event code
 popupInSel
 	34   Component(s)
 	621  Line(s) of event code
@@ -42,61 +42,61 @@ popupFan
 	27   Component(s)
 	355  Line(s) of event code
 	206  Unique line(s) of event code
+cardChart
+	33   Component(s)
+	447  Line(s) of event code
+	297  Unique line(s) of event code
 cardQR
 	34   Component(s)
-	410  Line(s) of event code
-	238  Unique line(s) of event code
-cardAlarm
-	43   Component(s)
-	500  Line(s) of event code
-	273  Unique line(s) of event code
+	420  Line(s) of event code
+	239  Unique line(s) of event code
 popupLightNew
 	23   Component(s)
 	412  Line(s) of event code
 	209  Unique line(s) of event code
-screensaver
-	46   Component(s)
-	435  Line(s) of event code
-	309  Unique line(s) of event code
-cardPower
-	54   Component(s)
-	531  Line(s) of event code
-	349  Unique line(s) of event code
-cardLChart
-	33   Component(s)
-	402  Line(s) of event code
-	266  Unique line(s) of event code
+screensaver2
+	58   Component(s)
+	362  Line(s) of event code
+	248  Unique line(s) of event code
 cardThermo
 	57   Component(s)
-	540  Line(s) of event code
-	319  Unique line(s) of event code
-cardGrid
-	44   Component(s)
-	583  Line(s) of event code
-	332  Unique line(s) of event code
-cardGrid2
-	52   Component(s)
-	693  Line(s) of event code
-	384  Unique line(s) of event code
+	569  Line(s) of event code
+	337  Unique line(s) of event code
+cardAlarm
+	43   Component(s)
+	510  Line(s) of event code
+	274  Unique line(s) of event code
+cardMedia
+	59   Component(s)
+	713  Line(s) of event code
+	357  Unique line(s) of event code
+screensaver
+	46   Component(s)
+	445  Line(s) of event code
+	310  Unique line(s) of event code
 popupLight
 	28   Component(s)
 	412  Line(s) of event code
 	227  Unique line(s) of event code
-cardMedia
-	59   Component(s)
+cardGrid
+	44   Component(s)
+	593  Line(s) of event code
+	333  Unique line(s) of event code
+cardPower
+	54   Component(s)
+	541  Line(s) of event code
+	350  Unique line(s) of event code
+cardGrid2
+	52   Component(s)
 	703  Line(s) of event code
-	356  Unique line(s) of event code
+	385  Unique line(s) of event code
 cardEntities
 	67   Component(s)
-	1194 Line(s) of event code
-	535  Unique line(s) of event code
-screensaver2
-	58   Component(s)
-	352  Line(s) of event code
-	247  Unique line(s) of event code
+	1204 Line(s) of event code
+	536  Unique line(s) of event code
 
 Total
 	23   Page(s)
 	875  Component(s)
-	10568 Line(s) of event code
-	2450 Unique line(s) of event code
+	10707 Line(s) of event code
+	2466 Unique line(s) of event code

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

@@ -19,6 +19,18 @@ Page screensaver
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             recmod=1
             baud=115200
             vis tInstruction,0

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

@@ -19,6 +19,18 @@ Page screensaver2
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             recmod=1
             baud=115200
             vis tInstruction,0

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

@@ -11,6 +11,18 @@ Page cardAlarm
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -11,6 +11,18 @@ Page cardChart
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -11,6 +11,18 @@ Page cardEntities
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             //wup=cardEntities
             //remove background & activate reparse mode

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

@@ -11,6 +11,18 @@ Page cardGrid
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             //remove background & activate reparse mode
             vis p0,0

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

@@ -11,6 +11,18 @@ Page cardGrid2
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             //remove background & activate reparse mode
             vis p0,0

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

@@ -11,6 +11,18 @@ Page cardLChart
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -11,6 +11,18 @@ Page cardMedia
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -11,6 +11,18 @@ Page cardPower
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -11,6 +11,18 @@ Page cardQR
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

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

@@ -11,6 +11,18 @@ Page cardThermo
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0
@@ -20,6 +32,11 @@ Page cardThermo
             vis xTempMin1,0
             vis xTempMax1,0
             vis xTempStep1,0
+            vis xTempDest,0
+            vis btUp,0
+            vis btDown,0
+            vis tCF,0
+            vis btDetail,0
             //tEntity.txt=tHeading.txt
             // disable all buttons
             vis bt0,0
@@ -1006,6 +1023,20 @@ Timer tmSerial
                                             vis xTempDest2,1
                                             vis bDown2,1
                                             vis tCF2,1
+                                        }else
+                                        {
+                                            vis btUp,1
+                                            vis xTempDest,1
+                                            vis btDown,1
+                                            vis tCF,1
+                                            vis btUp1,0
+                                            vis xTempDest1,0
+                                            vis btDown1,0
+                                            vis tCF1,0
+                                            vis bUp2,0
+                                            vis xTempDest2,0
+                                            vis bDown2,0
+                                            vis tCF2,0
                                         }
                                         //Show btDetail
                                         spstr strCommand.txt,tTmp.txt,"~",58

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

@@ -11,6 +11,18 @@ Page screensaver
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             recmod=1
             baud=115200
             vis tInstruction,0

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

@@ -11,6 +11,18 @@ Page screensaver2
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             recmod=1
             baud=115200
             vis tInstruction,0

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

@@ -16,9 +16,95 @@
 │ +    //lcd_dev fffb 0002 0000 0020
 │      printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
 │      page pageStartup
+│   --- HMI/n2t-out/cardAlarm.txt
+├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt
+│ @@ -7,26 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│              dim=dimValueNormal
+│              vis p0,0
+│              vis tSend,0
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis tId,0
+│              vis arm1,0
+│   --- HMI/n2t-out/cardChart.txt
+├── +++ HMI/US/portrait/n2t-out/cardChart.txt
+│ @@ -7,26 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│              dim=dimValueNormal
+│              vis p0,0
+│              vis tSend,0
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis tId,0
+│              vis bPrev,0
 │   --- HMI/n2t-out/cardEntities.txt
 ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
-│ @@ -60,16 +60,36 @@
+│ @@ -7,27 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│ -            dim=dimValueNormal
+│              dim=dimValueNormal
+│              //wup=cardEntities
+│              //remove background & activate reparse mode
+│              vis p0,0
+│              recmod=1
+│              baud=115200
+│              //debug stuff
+│ @@ -73,16 +60,36 @@
 │              vis tIcon4,0
 │              vis tEntity4,0
 │              vis bText4,0
@@ -56,7 +142,7 @@
 │                      b[sys0].pco=defaultFontColor
 │                  }
 │                  if(b[sys0].type==53&&defaultBcoColor==0)
-│ @@ -85,45 +105,57 @@
+│ @@ -98,45 +105,57 @@
 │                  }
 │              }
 │          
@@ -120,7 +206,7 @@
 │          Text          : 
 │          Max. Text Size: 500
 │      
-│ @@ -153,14 +185,26 @@
+│ @@ -166,14 +185,26 @@
 │      
 │  Variable (string) type4
 │      Attributes
@@ -147,7 +233,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Value              : 0
-│ @@ -185,14 +229,30 @@
+│ @@ -198,14 +229,30 @@
 │      Attributes
 │          Scope              : local
 │          Dragging           : 0
@@ -178,7 +264,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : tEntity1
-│ @@ -221,14 +281,32 @@
+│ @@ -234,14 +281,32 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -211,7 +297,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : 
-│ @@ -266,14 +344,32 @@
+│ @@ -279,14 +344,32 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -244,7 +330,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : 
-│ @@ -407,14 +503,68 @@
+│ @@ -420,14 +503,68 @@
 │              crcputs tSend.txt,0
 │              //send cmd
 │              printh 55 bb
@@ -313,7 +399,7 @@
 │          Send Component ID: disabled
 │          State            : unpressed
 │          Text             : 
-│ @@ -503,14 +653,62 @@
+│ @@ -516,14 +653,62 @@
 │              crcputs tSend.txt,0
 │              //send cmd
 │              printh 55 bb
@@ -376,7 +462,7 @@
 │          Send Component ID: disabled
 │          State            : unpressed
 │          Text             : 
-│ @@ -647,14 +845,62 @@
+│ @@ -660,14 +845,62 @@
 │              crcputs tSend.txt,0
 │              //send cmd
 │              printh 55 bb
@@ -439,7 +525,7 @@
 │          Send Component ID: disabled
 │          State            : unpressed
 │          Text             : 
-│ @@ -743,14 +989,62 @@
+│ @@ -756,14 +989,62 @@
 │              crcputs tSend.txt,0
 │              //send cmd
 │              printh 55 bb
@@ -502,7 +588,7 @@
 │          Send Component ID: disabled
 │          State            : unpressed
 │          Text             : 
-│ @@ -839,14 +1133,62 @@
+│ @@ -852,14 +1133,62 @@
 │              crcputs tSend.txt,0
 │              //send cmd
 │              printh 55 bb
@@ -565,7 +651,7 @@
 │          Send Component ID: disabled
 │          State            : unpressed
 │          Text             : 
-│ @@ -943,14 +1285,66 @@
+│ @@ -956,14 +1285,66 @@
 │              crcputs tSend.txt,0
 │              //send cmd
 │              printh 55 bb
@@ -632,7 +718,7 @@
 │          Send Component ID: disabled
 │      
 │      Events
-│ @@ -1099,14 +1493,92 @@
+│ @@ -1112,14 +1493,92 @@
 │                  page popupInSel
 │              }
 │              if(type4.txt=="timer")
@@ -725,7 +811,7 @@
 │          Send Component ID: disabled
 │      
 │      Events
-│ @@ -1830,14 +2302,312 @@
+│ @@ -1843,14 +2302,312 @@
 │                                              covx tTmp.txt,sys0,0,0
 │                                              hSlider4.minval=sys0
 │                                              //third value is max value
@@ -1038,9 +1124,65 @@
 │                                          //command format pageType,specialPageName
 │                                          //write name of speical page to tId
 │                                          spstr strCommand.txt,tId.txt,"~",1
+│   --- HMI/n2t-out/cardGrid.txt
+├── +++ HMI/US/portrait/n2t-out/cardGrid.txt
+│ @@ -7,26 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│              dim=dimValueNormal
+│              //remove background & activate reparse mode
+│              vis p0,0
+│              recmod=1
+│              baud=115200
+│              //debug stuff
+│              vis tTmp,0
 │   --- HMI/n2t-out/cardGrid2.txt
 ├── +++ HMI/US/portrait/n2t-out/cardGrid2.txt
-│ @@ -25,26 +25,28 @@
+│ @@ -7,26 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│              dim=dimValueNormal
+│              //remove background & activate reparse mode
+│              vis p0,0
+│              recmod=1
+│              baud=115200
+│              //debug stuff
+│              vis tTmp,0
+│ @@ -37,26 +25,28 @@
 │              vis bEntity2,0
 │              vis bEntity3,0
 │              vis bEntity4,0
@@ -1070,7 +1212,7 @@
 │                      b[sys0].pco=defaultFontColor
 │                  }
 │              }
-│ @@ -93,14 +95,20 @@
+│ @@ -105,14 +95,20 @@
 │      
 │  Variable (string) entn8
 │      Attributes
@@ -1091,7 +1233,7 @@
 │          Max. Text Size: 80
 │      
 │  Variable (string) nent2
-│ @@ -165,14 +173,20 @@
+│ @@ -177,14 +173,20 @@
 │      
 │  Variable (string) type8
 │      Attributes
@@ -1112,7 +1254,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : tEntity1
-│ @@ -237,14 +251,23 @@
+│ @@ -249,14 +251,23 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -1136,7 +1278,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : 
-│ @@ -631,14 +654,58 @@
+│ @@ -643,14 +654,58 @@
 │              crcputs tSend.txt,0
 │              //send cmd
 │              printh 55 bb
@@ -1195,7 +1337,7 @@
 │          Send Component ID: disabled
 │          State            : unpressed
 │          Text             : 
-│ @@ -1093,14 +1160,46 @@
+│ @@ -1105,14 +1160,46 @@
 │                                              spstr strCommand.txt,tTmp.txt,"~",59
 │                                              covx tTmp.txt,sys0,0,0
 │                                              bEntity8.pco=sys0
@@ -1242,9 +1384,94 @@
 │                                          //command format pageType,specialPageName
 │                                          //write name of speical page to tId
 │                                          spstr strCommand.txt,tId.txt,"~",1
+│   --- HMI/n2t-out/cardLChart.txt
+├── +++ HMI/US/portrait/n2t-out/cardLChart.txt
+│ @@ -7,26 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│              dim=dimValueNormal
+│              vis p0,0
+│              vis tSend,0
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis tId,0
+│              vis bPrev,0
+│   --- HMI/n2t-out/cardMedia.txt
+├── +++ HMI/US/portrait/n2t-out/cardMedia.txt
+│ @@ -7,26 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│              dim=dimValueNormal
+│              vis p0,0
+│              vis tSend,0
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis tId,0
+│              vis t5,0
 │   --- HMI/n2t-out/cardPower.txt
 ├── +++ HMI/US/portrait/n2t-out/cardPower.txt
-│ @@ -45,16 +45,16 @@
+│ @@ -7,26 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│              dim=dimValueNormal
+│              vis p0,0
+│              vis tSend,0
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis tId,0
+│              vis bPrev,0
+│ @@ -57,16 +45,16 @@
 │                      b[sys0].bco=defaultBcoColor
 │                      b[sys0].pco=defaultFontColor
 │                  }
@@ -1263,7 +1490,7 @@
 │          
 │  Variable (string) nent1
 │      Attributes
-│ @@ -75,39 +75,75 @@
+│ @@ -87,39 +75,75 @@
 │          Max. Text Size: 1000
 │      
 │  Variable (int32) t0Speed
@@ -1339,7 +1566,7 @@
 │          Max. Text Size: 20
 │      
 │  Variable (string) tInstruction
-│ @@ -133,23 +169,14 @@
+│ @@ -145,23 +169,14 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -1363,7 +1590,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : 
-│ @@ -169,23 +196,14 @@
+│ @@ -181,23 +196,14 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -1387,7 +1614,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : 
-│ @@ -196,23 +214,14 @@
+│ @@ -208,23 +214,14 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -1411,7 +1638,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : 
-│ @@ -223,23 +232,14 @@
+│ @@ -235,23 +232,14 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -1435,7 +1662,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : 
-│ @@ -250,23 +250,14 @@
+│ @@ -262,23 +250,14 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -1459,7 +1686,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : 
-│ @@ -277,23 +268,14 @@
+│ @@ -289,23 +268,14 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -1483,7 +1710,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : 
-│ @@ -498,85 +480,79 @@
+│ @@ -510,85 +480,79 @@
 │                      h0.val=h0.minval
 │                  }
 │                  if(sys0<h0.minval)
@@ -1569,7 +1796,7 @@
 │          Scope      : local
 │          Period (ms): 50
 │          Enabled    : yes
-│ @@ -962,15 +938,15 @@
+│ @@ -974,15 +938,15 @@
 │                                          }
 │                                          if(tId.txt=="cardChart")
 │                                          {
@@ -1586,6 +1813,64 @@
 │                                          // get set time to global variable
 │                                          spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
 │                                      }
+│   --- HMI/n2t-out/cardQR.txt
+├── +++ HMI/US/portrait/n2t-out/cardQR.txt
+│ @@ -7,26 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│              dim=dimValueNormal
+│              vis p0,0
+│              vis tSend,0
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis tId,0
+│              vis bPrev,0
+│   --- HMI/n2t-out/cardThermo.txt
+├── +++ HMI/US/portrait/n2t-out/cardThermo.txt
+│ @@ -7,26 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│              dim=dimValueNormal
+│              vis p0,0
+│              vis tSend,0
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis tId,0
+│              vis xTempMin1,0
 │   --- HMI/n2t-out/pageStartup.txt
 ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
 │ @@ -34,20 +34,14 @@
@@ -1700,6 +1985,26 @@
 │  Variable (string) entn
 │      Attributes
 │          Scope         : local
+│ @@ -453,19 +453,14 @@
+│                                      ucopy strCommand.txt,4,payloadLength-5,0
+│                                      // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
+│                                      spstr strCommand.txt,tInstruction.txt,"~",0
+│                                      spstr strCommand.txt,tTmp.txt,"~",1
+│                                      if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
+│                                      {
+│                                          // change icon
+│ -                                        spstr strCommand.txt,tTmp.txt,"~",2
+│ -                                        if(tTmp.txt!="")
+│ -                                        {
+│ -                                            tIcon1.txt=tTmp.txt
+│ -                                        }
+│                                          //spstr strCommand.txt,tIcon1.txt,"~",2
+│                                          vis tIcon1,1
+│                                          // change icon color
+│                                          spstr strCommand.txt,tTmp.txt,"~",3
+│                                          covx tTmp.txt,sys0,0,0
+│                                          tIcon1.pco=sys0
+│                                          // get Button State
 │   --- HMI/n2t-out/popupNotify.txt
 ├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
 │ @@ -348,15 +348,15 @@
@@ -1719,9 +2024,56 @@
 │                                      }
 │                                      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
-│ @@ -28,17 +28,14 @@
+│ @@ -7,27 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│ -            dim=dimValueNormal
+│              recmod=1
+│              baud=115200
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis p0,0
+│              vis tNotifyHead,0
+│              vis tNotifyText,0
+│ @@ -41,17 +28,14 @@
 │              }
 │              tDate.txt=pageIcons.vaDate.txt
 │              dim=dimValue
@@ -1739,7 +2091,7 @@
 │          Max. Text Size: 600
 │      
 │  Variable (string) strTmp
-│ @@ -102,34 +99,14 @@
+│ @@ -115,34 +99,14 @@
 │          Value: 0
 │      
 │  Variable (int32) ycR
@@ -1774,7 +2126,25 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : |
-│ @@ -596,20 +573,14 @@
+│ @@ -485,17 +449,14 @@
+│                                          //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
+│ -                                        }else
+│ -                                        {
+│ -                                            vis tAMPM,1
+│                                          }
+│                                          spstr strCommand.txt,tTimeAdd.txt,"~",2
+│                                          ref tIcon1
+│                                          ref tIcon2
+│                                      }
+│                                      if(tInstruction.txt=="date")
+│                                      {
+│ @@ -612,20 +573,14 @@
 │                                          {
 │                                              vis tMainIcon,1
 │                                              vis tMainIconAlt,0
@@ -1797,7 +2167,35 @@
 │                                          if(tTime.bco!=screensaver.bco)
 │   --- HMI/n2t-out/screensaver2.txt
 ├── +++ HMI/US/portrait/n2t-out/screensaver2.txt
-│ @@ -28,17 +28,14 @@
+│ @@ -7,27 +7,14 @@
+│          Swide up page ID   : disabled
+│          Swide down page ID : disabled
+│          Swide left page ID : disabled
+│          Swide right page ID: disabled
+│      
+│      Events
+│          Preinitialize Event
+│ -            tSend.txt="event,renderCurrentPage"
+│ -            //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
+│ -            dim=dimValueNormal
+│              recmod=1
+│              baud=115200
+│              vis tInstruction,0
+│              vis tTmp,0
+│              vis p0,0
+│              vis tNotifyHead,0
+│              vis tNotifyText,0
+│ @@ -41,52 +28,19 @@
 │              }
 │              tDate.txt=pageIcons.vaDate.txt
 │              dim=dimValue
@@ -1808,14 +2206,80 @@
 │ -        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: 1935
+│ +        Max. Text Size: 1979
 │      
 │  Variable (string) strTmp
-│ @@ -363,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: 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,165 +324,50 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -1823,6 +2287,137 @@
 │          Text               : 
 │          Max. Text Size     : 4
 │      
+│ -    Events
+│ -        Touch Press Event
+│ -            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+│ -            if(entn1.txt=="")
+│ -            {
+│ -                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+│ -            }
+│ -            //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"
+│ -            if(entn2.txt=="")
+│ -            {
+│ -                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+│ -            }
+│ -            //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"
+│ -            if(entn3.txt=="")
+│ -            {
+│ -                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+│ -            }
+│ -            //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"
+│ -            if(entn4.txt=="")
+│ -            {
+│ -                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+│ -            }
+│ -            //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"
+│ -            if(entn5.txt=="")
+│ -            {
+│ -                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+│ -            }
+│ -            //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
@@ -1850,7 +2445,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : PM
-│ @@ -572,15 +549,14 @@
+│ @@ -710,15 +549,14 @@
 │                                          if(tTmp.txt!="")
 │                                          {
 │                                              covx tTmp.txt,defaultFontColor,0,0
@@ -1866,3 +2461,48 @@
 │                                          if(tAMPM.txt=="")
 │                                          {
 │                                              vis tAMPM,0
+│ @@ -839,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!="")
+│                                          {

HMI/US/portrait/diff-filtered.txt

@@ -1,12 +1,98 @@
-+++ /dev/fd/62	2023-10-14 14:36:40.102098093 +0000
++++ /dev/fd/62	2024-11-22 20:00:11.734673876 +0000
 +I/n2t-out/Program.s.txt
 ++ HMI/US/portrait/n2t-out/Program.s.txt
 +1 +12,11 @@
 +eature flags
 + featNewSliders=0
 +nth 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
++I/n2t-out/cardAlarm.txt
+++ HMI/US/portrait/n2t-out/cardAlarm.txt
++ +7,14 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     vis p0,0
++     vis tSend,0
++     vis tInstruction,0
++     vis tTmp,0
++     vis tId,0
++     vis arm1,0
++I/n2t-out/cardChart.txt
+++ HMI/US/portrait/n2t-out/cardChart.txt
++ +7,14 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     vis p0,0
++     vis tSend,0
++     vis tInstruction,0
++     vis tTmp,0
++     vis tId,0
++     vis bPrev,0
 +I/n2t-out/cardEntities.txt
 ++ HMI/US/portrait/n2t-out/cardEntities.txt
++ +7,14 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     dim=dimValueNormal
++     //wup=cardEntities
++     //remove background & activate reparse mode
++     vis p0,0
++     recmod=1
++     baud=115200
++     //debug stuff
 +6 +60,36 @@
 +     //ui e6
 +     vis btOnOff6,0
@@ -59,13 +145,13 @@
 +ributes
 + Scope         : local
 + Text          : 
++ Max. Text Size: 80
 + Max. Text Size: 38
 +
 +e (string) nent2
 +ributes
 + Scope         : local
 + Text          : 
-+ Max. Text Size: 80
 + Max. Text Size: 38
 +14 +185,26 @@
 +e (string) type6
@@ -600,8 +686,71 @@
 +                                     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 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     //remove background & activate reparse mode
++     vis p0,0
++     recmod=1
++     baud=115200
++     //debug stuff
++     vis tTmp,0
 +I/n2t-out/cardGrid2.txt
 ++ HMI/US/portrait/n2t-out/cardGrid2.txt
++ +7,14 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     //remove background & activate reparse mode
++     vis p0,0
++     recmod=1
++     baud=115200
++     //debug stuff
++     vis tTmp,0
 +6 +25,28 @@
 +     vis bEntity2,0
 +     vis bEntity3,0
@@ -632,7 +781,7 @@
 +             b[sys0].pco=defaultFontColor
 +         }
 +     }
-+4 +95,20 @@
++14 +95,20 @@
 +
 +e (string) entn8
 +ributes
@@ -797,15 +946,93 @@
 +                                     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 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     vis p0,0
++     vis tSend,0
++     vis tInstruction,0
++     vis tTmp,0
++     vis tId,0
++     vis bPrev,0
++I/n2t-out/cardMedia.txt
+++ HMI/US/portrait/n2t-out/cardMedia.txt
++ +7,14 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     vis p0,0
++     vis tSend,0
++     vis tInstruction,0
++     vis tTmp,0
++     vis tId,0
++     vis t5,0
 +I/n2t-out/cardPower.txt
 ++ HMI/US/portrait/n2t-out/cardPower.txt
++ +7,14 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     vis p0,0
++     vis tSend,0
++     vis tInstruction,0
++     vis tTmp,0
++     vis tId,0
++     vis bPrev,0
 +6 +45,16 @@
 +             b[sys0].bco=defaultBcoColor
 +             b[sys0].pco=defaultFontColor
@@ -1148,6 +1375,64 @@
 +                                 // get set time to global variable
 +                                 spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
 +                             }
++I/n2t-out/cardQR.txt
+++ HMI/US/portrait/n2t-out/cardQR.txt
++ +7,14 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     vis p0,0
++     vis tSend,0
++     vis tInstruction,0
++     vis tTmp,0
++     vis tId,0
++     vis bPrev,0
++I/n2t-out/cardThermo.txt
+++ HMI/US/portrait/n2t-out/cardThermo.txt
++ +7,14 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     vis p0,0
++     vis tSend,0
++     vis tInstruction,0
++     vis tTmp,0
++     vis tId,0
++     vis xTempMin1,0
 +I/n2t-out/pageStartup.txt
 ++ HMI/US/portrait/n2t-out/pageStartup.txt
 +0 +34,14 @@
@@ -1242,6 +1527,26 @@
 +e (string) entn
 +ributes
 + Scope         : local
++19 +453,14 @@
++                             ucopy strCommand.txt,4,payloadLength-5,0
++                             // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
++                             spstr strCommand.txt,tInstruction.txt,"~",0
++                             spstr strCommand.txt,tTmp.txt,"~",1
++                             if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
++                             {
++                                 // change icon
++                                 spstr strCommand.txt,tTmp.txt,"~",2
++                                 if(tTmp.txt!="")
++                                 {
++                                     tIcon1.txt=tTmp.txt
++                                 }
++                                 //spstr strCommand.txt,tIcon1.txt,"~",2
++                                 vis tIcon1,1
++                                 // change icon color
++                                 spstr strCommand.txt,tTmp.txt,"~",3
++                                 covx tTmp.txt,sys0,0,0
++                                 tIcon1.pco=sys0
++                                 // get Button State
 +I/n2t-out/popupNotify.txt
 ++ HMI/US/portrait/n2t-out/popupNotify.txt
 +15 +348,15 @@
@@ -1261,8 +1566,55 @@
 +                             }
 +                             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 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     recmod=1
++     baud=115200
++     vis tInstruction,0
++     vis tTmp,0
++     vis p0,0
++     vis tNotifyHead,0
++     vis tNotifyText,0
 +7 +28,14 @@
 +     }
 +     tDate.txt=pageIcons.vaDate.txt
@@ -1316,6 +1668,24 @@
 + Send Component ID  : disabled
 + Associated Keyboard: none
 + Text               : |
++17 +449,14 @@
++                                 //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
++                                 }else
++                                 {
++                                     vis tAMPM,1
++                                 }
++                                 spstr strCommand.txt,tTimeAdd.txt,"~",2
++                                 ref tIcon1
++                                 ref tIcon2
++                             }
++                             if(tInstruction.txt=="date")
++                             {
 +20 +573,14 @@
 +                                 {
 +                                     vis tMainIcon,1
@@ -1339,7 +1709,35 @@
 +                                 if(tTime.bco!=screensaver.bco)
 +I/n2t-out/screensaver2.txt
 ++ HMI/US/portrait/n2t-out/screensaver2.txt
-+7 +28,14 @@
++ +7,14 @@
++ Swide up page ID   : disabled
++ Swide down page ID : disabled
++ Swide left page ID : disabled
++ Swide right page ID: disabled
++
++nts
++ Preinitialize Event
++     tSend.txt="event,renderCurrentPage"
++     //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
++     dim=dimValueNormal
++     recmod=1
++     baud=115200
++     vis tInstruction,0
++     vis tTmp,0
++     vis p0,0
++     vis tNotifyHead,0
++     vis tNotifyText,0
++2 +28,19 @@
 +     }
 +     tDate.txt=pageIcons.vaDate.txt
 +     dim=dimValue
@@ -1350,14 +1748,80 @@
 + 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: 1935
 + 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: 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
++165 +324,50 @@
 + Scope              : local
 + Dragging           : 0
 + Send Component ID  : disabled
@@ -1365,6 +1829,137 @@
 + Text               : 
 + Max. Text Size     : 4
 +
++nts
++ Touch Press Event
++     tSend.txt="event,buttonPress2,"+entn1.txt+",button"
++     if(entn1.txt=="")
++     {
++         tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
++     }
++     //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"
++     if(entn2.txt=="")
++     {
++         tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
++     }
++     //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"
++     if(entn3.txt=="")
++     {
++         tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
++     }
++     //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"
++     if(entn4.txt=="")
++     {
++         tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
++     }
++     //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"
++     if(entn5.txt=="")
++     {
++         tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
++     }
++     //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
@@ -1408,3 +2003,48 @@
 +                                 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!="")
++                                 {

HMI/code_gen/pages/screensaver2.py

@@ -121,6 +121,8 @@ for i in range(1,6):
               //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
 

HMI/n2t-out-visual/cardAlarm.txt

@@ -19,6 +19,18 @@ Page cardAlarm
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out-visual/cardChart.txt

@@ -19,6 +19,18 @@ Page cardChart
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out-visual/cardEntities.txt

@@ -19,6 +19,19 @@ Page cardEntities
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
+            dim=dimValueNormal
             dim=dimValueNormal
             //wup=cardEntities
             //remove background & activate reparse mode

HMI/n2t-out-visual/cardGrid.txt

@@ -19,6 +19,18 @@ Page cardGrid
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             //remove background & activate reparse mode
             vis p0,0

HMI/n2t-out-visual/cardGrid2.txt

@@ -19,6 +19,18 @@ Page cardGrid2
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             //remove background & activate reparse mode
             vis p0,0

HMI/n2t-out-visual/cardLChart.txt

@@ -19,6 +19,18 @@ Page cardLChart
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out-visual/cardMedia.txt

@@ -19,6 +19,18 @@ Page cardMedia
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out-visual/cardPower.txt

@@ -19,6 +19,18 @@ Page cardPower
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out-visual/cardQR.txt

@@ -19,6 +19,18 @@ Page cardQR
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out-visual/cardThermo.txt

@@ -19,6 +19,18 @@ Page cardThermo
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out-visual/nspanel_Stats.txt

@@ -7,13 +7,13 @@ pageIcons
 	0    Line(s) of event code
 	0    Unique line(s) of event code
 pageTest
-	27   Component(s)
+	25   Component(s)
 	68   Line(s) of event code
 	66   Unique line(s) of event code
-cardLChart
-	33   Component(s)
-	402  Line(s) of event code
-	266  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
@@ -30,54 +30,54 @@ 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
-cardGrid
-	44   Component(s)
-	583  Line(s) of event code
-	332  Unique line(s) of event code
-cardQR
-	34   Component(s)
-	410  Line(s) of event code
-	238  Unique line(s) of event code
-cardChart
-	33   Component(s)
-	437  Line(s) of event code
-	296  Unique line(s) of event code
-screensaver2
-	59   Component(s)
-	362  Line(s) of event code
-	255  Unique line(s) of event code
-cardAlarm
-	43   Component(s)
-	500  Line(s) of event code
-	273  Unique line(s) of event code
 popupLight
 	28   Component(s)
+	417  Line(s) of event code
+	228  Unique line(s) of event code
+cardGrid2
+	52   Component(s)
+	703  Line(s) of event code
+	385  Unique line(s) of event code
+cardAlarm
+	43   Component(s)
+	510  Line(s) of event code
+	274  Unique line(s) of event code
+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
+	239  Unique line(s) of event code
+cardLChart
+	33   Component(s)
 	412  Line(s) of event code
-	227  Unique line(s) of event code
+	267  Unique line(s) of event code
+cardPower
+	54   Component(s)
+	541  Line(s) of event code
+	350  Unique line(s) of event code
 cardThermo
 	57   Component(s)
-	540  Line(s) of event code
-	319  Unique line(s) of event code
-cardMedia
-	59   Component(s)
-	703  Line(s) of event code
-	356  Unique line(s) of event code
+	550  Line(s) of event code
+	320  Unique line(s) of event code
 popupInSel
 	34   Component(s)
 	621  Line(s) of event code
 	297  Unique line(s) of event code
-cardPower
-	54   Component(s)
-	531  Line(s) of event code
-	349  Unique line(s) of event code
 screensaver
 	47   Component(s)
-	444  Line(s) of event code
-	316  Unique line(s) of event code
+	458  Line(s) of event code
+	318  Unique line(s) of event code
+cardMedia
+	59   Component(s)
+	713  Line(s) of event code
+	357  Unique line(s) of event code
 popupTimer
 	42   Component(s)
 	516  Line(s) of event code
@@ -86,17 +86,17 @@ popupThermo
 	44   Component(s)
 	523  Line(s) of event code
 	276  Unique line(s) of event code
-cardGrid2
-	52   Component(s)
-	693  Line(s) of event code
-	384  Unique line(s) of event code
+screensaver2
+	64   Component(s)
+	448  Line(s) of event code
+	272  Unique line(s) of event code
 cardEntities
 	67   Component(s)
-	1194 Line(s) of event code
-	535  Unique line(s) of event code
+	1205 Line(s) of event code
+	536  Unique line(s) of event code
 
 Total
 	23   Page(s)
-	878  Component(s)
-	10588 Line(s) of event code
-	2459 Unique line(s) of event code
+	881  Component(s)
+	10798 Line(s) of event code
+	2472 Unique line(s) of event code

HMI/n2t-out-visual/pageTest.txt

@@ -32,7 +32,7 @@ Variable (string) strCommand
     
 Variable (string) strTmp
     Attributes
-        ID            : 25
+        ID            : 24
         Scope         : local
         Text          : 
         Max. Text Size: 2
@@ -58,9 +58,9 @@ Text tBench
         Dragging            : 0
         Send Component ID   : disabled
         Opacity             : 127
-        x coordinate        : 288
-        y coordinate        : 90
-        Width               : 152
+        x coordinate        : 207
+        y coordinate        : 287
+        Width               : 88
         Height              : 30
         Effect              : load
         Effect Priority     : 0
@@ -82,14 +82,14 @@ Text tBench
     
 Text tTmp
     Attributes
-        ID                  : 24
+        ID                  : 23
         Scope               : local
         Dragging            : 0
         Send Component ID   : disabled
         Opacity             : 127
-        x coordinate        : 49
-        y coordinate        : 48
-        Width               : 257
+        x coordinate        : 212
+        y coordinate        : 253
+        Width               : 71
         Height              : 30
         Effect              : load
         Effect Priority     : 0
@@ -103,7 +103,7 @@ Text tTmp
         Horizontal Alignment: center
         Vertical Alignment  : center
         Input Type          : character
-        Text                : test123test123
+        Text                : x
         Max. Text Size      : 30
         Word wrap           : disabled
         Horizontal Spacing  : 0
@@ -135,7 +135,7 @@ Button b0
         x coordinate              : 0
         y coordinate              : 0
         Width                     : 100
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -203,9 +203,9 @@ Button b10
         Send Component ID         : disabled
         Opacity                   : 127
         x coordinate              : 100
-        y coordinate              : 98
+        y coordinate              : 81
         Width                     : 100
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -238,9 +238,9 @@ Button b11
         Send Component ID         : disabled
         Opacity                   : 127
         x coordinate              : 100
-        y coordinate              : 145
+        y coordinate              : 121
         Width                     : 100
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -273,9 +273,9 @@ Button b12
         Send Component ID         : disabled
         Opacity                   : 127
         x coordinate              : 0
-        y coordinate              : 242
+        y coordinate              : 202
         Width                     : 100
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -335,46 +335,15 @@ Button b13
         Touch Press Event
             showqq
         
-Button b14
+Button b15
     Attributes
         ID                        : 21
         Scope                     : local
         Dragging                  : 0
         Send Component ID         : disabled
         Opacity                   : 127
-        x coordinate              : 0
-        y coordinate              : 0
-        Width                     : 100
-        Height                    : 50
-        Effect                    : load
-        Effect Priority           : 0
-        Effect Time               : 300
-        Fill                      : solid color
-        Style                     : 3D auto
-        Font ID                   : 0
-        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                      : newtxt
-        Max. Text Size            : 10
-        Word wrap                 : disabled
-        Horizontal Spacing        : 0
-        Vertical Spacing          : 0
-    
-Button b15
-    Attributes
-        ID                        : 22
-        Scope                     : local
-        Dragging                  : 0
-        Send Component ID         : disabled
-        Opacity                   : 127
-        x coordinate              : 236
-        y coordinate              : 263
+        x coordinate              : 99
+        y coordinate              : 270
         Width                     : 100
         Height                    : 50
         Effect                    : load
@@ -403,13 +372,13 @@ Button b15
         
 Button b16
     Attributes
-        ID                        : 23
+        ID                        : 22
         Scope                     : local
         Dragging                  : 0
         Send Component ID         : disabled
         Opacity                   : 127
-        x coordinate              : 135
-        y coordinate              : 263
+        x coordinate              : 0
+        y coordinate              : 270
         Width                     : 100
         Height                    : 50
         Effect                    : load
@@ -444,9 +413,9 @@ Button b2
         Send Component ID         : disabled
         Opacity                   : 127
         x coordinate              : 0
-        y coordinate              : 195
+        y coordinate              : 162
         Width                     : 100
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -514,9 +483,9 @@ Button b4
         Send Component ID         : disabled
         Opacity                   : 127
         x coordinate              : 0
-        y coordinate              : 96
+        y coordinate              : 82
         Width                     : 100
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -551,7 +520,7 @@ Button b5
         x coordinate              : 100
         y coordinate              : 0
         Width                     : 100
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -584,9 +553,9 @@ Button b6
         Send Component ID         : disabled
         Opacity                   : 127
         x coordinate              : 0
-        y coordinate              : 49
+        y coordinate              : 41
         Width                     : 100
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -619,9 +588,9 @@ Button b7
         Send Component ID         : disabled
         Opacity                   : 127
         x coordinate              : 100
-        y coordinate              : 49
+        y coordinate              : 41
         Width                     : 100
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -653,10 +622,10 @@ Button b8
         Dragging                  : 0
         Send Component ID         : disabled
         Opacity                   : 127
-        x coordinate              : 341
-        y coordinate              : 9
+        x coordinate              : 94
+        y coordinate              : 161
         Width                     : 106
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -690,9 +659,9 @@ Button b9
         Send Component ID         : disabled
         Opacity                   : 127
         x coordinate              : 0
-        y coordinate              : 146
+        y coordinate              : 122
         Width                     : 100
-        Height                    : 50
+        Height                    : 40
         Effect                    : load
         Effect Priority           : 0
         Effect Time               : 300
@@ -717,21 +686,6 @@ Button b9
         Touch Press Event
             page popupNotify
         
-Hotspot m0
-    Attributes
-        ID               : 26
-        Scope            : local
-        Dragging         : 0
-        Send Component ID: disabled
-        Opacity          : 127
-        x coordinate     : 213
-        y coordinate     : 115
-        Width            : 210
-        Height           : 191
-        Effect           : load
-        Effect Priority  : 0
-        Effect Time      : 300
-    
 Timer tmSerial
     Attributes
         ID         : 14

HMI/n2t-out-visual/popupLight.txt

@@ -806,6 +806,11 @@ Timer tmSerial
                                     if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
                                     {
                                         // change icon
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        if(tTmp.txt!="")
+                                        {
+                                            tIcon1.txt=tTmp.txt
+                                        }
                                         //spstr strCommand.txt,tIcon1.txt,"~",2
                                         vis tIcon1,1
                                         // change icon color

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/screensaver.txt

@@ -19,6 +19,19 @@ Page screensaver
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
+            dim=dimValueNormal
             recmod=1
             baud=115200
             vis tInstruction,0
@@ -1069,6 +1082,9 @@ Timer tmSerial
                                         if(tAMPM.txt=="")
                                         {
                                             vis tAMPM,0
+                                        }else
+                                        {
+                                            vis tAMPM,1
                                         }
                                         spstr strCommand.txt,tTimeAdd.txt,"~",2
                                         ref tIcon1

HMI/n2t-out-visual/screensaver2.txt

@@ -19,6 +19,19 @@ Page screensaver2
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
+            dim=dimValueNormal
             recmod=1
             baud=115200
             vis tInstruction,0
@@ -43,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: 1935
     
 Variable (string) strTmp
     Attributes
@@ -69,7 +117,7 @@ Variable (string) tInstruction
         ID            : 18
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 15
     
 Variable (string) tSend
     Attributes
@@ -83,7 +131,7 @@ Variable (string) tTmp
         ID            : 19
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 30
     
 Variable (int32) vaTap
     Attributes
@@ -852,6 +900,25 @@ Text f1Icon
         Horizontal Spacing  : 0
         Vertical Spacing    : 0
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+            if(entn1.txt=="")
+            {
+                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+            }
+            //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
@@ -881,6 +948,25 @@ Text f2Icon
         Horizontal Spacing  : 0
         Vertical Spacing    : 0
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn2.txt+",button"
+            if(entn2.txt=="")
+            {
+                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+            }
+            //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
@@ -910,6 +996,25 @@ Text f3Icon
         Horizontal Spacing  : 0
         Vertical Spacing    : 0
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn3.txt+",button"
+            if(entn3.txt=="")
+            {
+                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+            }
+            //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
@@ -939,6 +1044,25 @@ Text f4Icon
         Horizontal Spacing  : 0
         Vertical Spacing    : 0
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn4.txt+",button"
+            if(entn4.txt=="")
+            {
+                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+            }
+            //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
@@ -968,6 +1092,25 @@ Text f5Icon
         Horizontal Spacing  : 0
         Vertical Spacing    : 0
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn5.txt+",button"
+            if(entn5.txt=="")
+            {
+                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+            }
+            //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
@@ -1538,26 +1681,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")
                                     {

HMI/n2t-out/cardAlarm.txt

@@ -11,6 +11,18 @@ Page cardAlarm
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out/cardChart.txt

@@ -11,6 +11,18 @@ Page cardChart
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out/cardEntities.txt

@@ -11,6 +11,19 @@ Page cardEntities
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
+            dim=dimValueNormal
             dim=dimValueNormal
             //wup=cardEntities
             //remove background & activate reparse mode

HMI/n2t-out/cardGrid.txt

@@ -11,6 +11,18 @@ Page cardGrid
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             //remove background & activate reparse mode
             vis p0,0

HMI/n2t-out/cardGrid2.txt

@@ -11,6 +11,18 @@ Page cardGrid2
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             //remove background & activate reparse mode
             vis p0,0

HMI/n2t-out/cardLChart.txt

@@ -11,6 +11,18 @@ Page cardLChart
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out/cardMedia.txt

@@ -11,6 +11,18 @@ Page cardMedia
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out/cardPower.txt

@@ -11,6 +11,18 @@ Page cardPower
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out/cardQR.txt

@@ -11,6 +11,18 @@ Page cardQR
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out/cardThermo.txt

@@ -11,6 +11,18 @@ Page cardThermo
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
             dim=dimValueNormal
             vis p0,0
             vis tSend,0

HMI/n2t-out/pageTest.txt

@@ -54,7 +54,7 @@ Text tTmp
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
-        Text               : test123test123
+        Text               : x
         Max. Text Size     : 30
     
 Picture p0
@@ -141,15 +141,6 @@ Button b13
         Touch Press Event
             showqq
         
-Button b14
-    Attributes
-        Scope            : local
-        Dragging         : 0
-        Send Component ID: disabled
-        State            : unpressed
-        Text             : newtxt
-        Max. Text Size   : 10
-    
 Button b15
     Attributes
         Scope            : local
@@ -281,12 +272,6 @@ Button b9
         Touch Press Event
             page popupNotify
         
-Hotspot m0
-    Attributes
-        Scope            : local
-        Dragging         : 0
-        Send Component ID: disabled
-    
 Timer tmSerial
     Attributes
         Scope      : local

HMI/n2t-out/popupLight.txt

@@ -457,6 +457,11 @@ Timer tmSerial
                                     if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
                                     {
                                         // change icon
+                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                        if(tTmp.txt!="")
+                                        {
+                                            tIcon1.txt=tTmp.txt
+                                        }
                                         //spstr strCommand.txt,tIcon1.txt,"~",2
                                         vis tIcon1,1
                                         // change icon color

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/screensaver.txt

@@ -11,6 +11,19 @@ Page screensaver
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
+            dim=dimValueNormal
             recmod=1
             baud=115200
             vis tInstruction,0
@@ -476,6 +489,9 @@ Timer tmSerial
                                         if(tAMPM.txt=="")
                                         {
                                             vis tAMPM,0
+                                        }else
+                                        {
+                                            vis tAMPM,1
                                         }
                                         spstr strCommand.txt,tTimeAdd.txt,"~",2
                                         ref tIcon1

HMI/n2t-out/screensaver2.txt

@@ -11,6 +11,19 @@ Page screensaver2
     
     Events
         Preinitialize Event
+            tSend.txt="event,renderCurrentPage"
+            //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
+            dim=dimValueNormal
             recmod=1
             baud=115200
             vis tInstruction,0
@@ -35,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: 1935
     
 Variable (string) strTmp
     Attributes
@@ -57,7 +100,7 @@ Variable (string) tInstruction
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 15
     
 Variable (string) tSend
     Attributes
@@ -69,7 +112,7 @@ Variable (string) tTmp
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 50
+        Max. Text Size: 30
     
 Variable (int32) vaTap
     Attributes
@@ -331,6 +374,25 @@ Text f1Icon
         Text               : 
         Max. Text Size     : 4
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+            if(entn1.txt=="")
+            {
+                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+            }
+            //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
@@ -340,6 +402,25 @@ Text f2Icon
         Text               : 
         Max. Text Size     : 4
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn2.txt+",button"
+            if(entn2.txt=="")
+            {
+                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+            }
+            //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
@@ -349,6 +430,25 @@ Text f3Icon
         Text               : 
         Max. Text Size     : 4
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn3.txt+",button"
+            if(entn3.txt=="")
+            {
+                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+            }
+            //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
@@ -358,6 +458,25 @@ Text f4Icon
         Text               : 
         Max. Text Size     : 4
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn4.txt+",button"
+            if(entn4.txt=="")
+            {
+                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+            }
+            //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
@@ -367,6 +486,25 @@ Text f5Icon
         Text               : 
         Max. Text Size     : 4
     
+    Events
+        Touch Press Event
+            tSend.txt="event,buttonPress2,"+entn5.txt+",button"
+            if(entn5.txt=="")
+            {
+                tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+            }
+            //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
@@ -705,26 +843,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")
                                     {

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -5,7 +5,7 @@ If you like this project consider buying me a pizza 🍕 <a href="https://paypal
 [![hacs_badge](https://img.shields.io/badge/HACS-Default-41BDF5.svg)](https://github.com/hacs/integration)
 ![hacs validation](https://github.com/joBr99/nspanel-lovelace-ui/actions/workflows/hacs-validation.yaml/badge.svg)
 [![GitHub Release](https://img.shields.io/github/release/joBr99/nspanel-lovelace-ui.svg)](https://github.com/joBr99/nspanel-lovelace-ui/releases)
-![Project Maintenance](https://img.shields.io/maintenance/yes/2023.svg)
+![Project Maintenance](https://img.shields.io/maintenance/yes/2024.svg)
 [![GitHub Activity](https://img.shields.io/github/commit-activity/y/joBr99/nspanel-lovelace-ui.svg)](https://github.com/joBr99/nspanel-lovelace-ui/commits/main)
 
 
@@ -65,3 +65,5 @@ SmartHomeNG: https://github.com/sisamiwe/shng-nspanel-plugin
 OpenHAB: https://github.com/donoo/o2n2l
 
 NodeRed: https://github.com/laluz742/node-red-contrib-nspanel-lui
+
+ESPHome without any Backend: https://github.com/olicooper/esphome-nspanel-lovelace-native

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

@@ -1,2 +1,3 @@
 ha_api = None
 mqtt_api = None
+ad_api = None

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

@@ -132,6 +132,7 @@ class LuiBackendConfig(object):
             'sleepTrackingZones': ["not_home", "off"],
             'sleepOverride': None,
             'locale': "en_US",
+            'quiet': True,
             'timeFormat': "%H:%M",
             'dateFormatBabel': "full",
             'dateAdditionalTemplate': "",

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

@@ -3,6 +3,7 @@ import datetime
 import apis
 from helper import scale, pos_to_color, rgb_dec565
 from pages import LuiPagesGen
+from luibackend.config import Card
 
 class LuiController(object):
 
@@ -324,7 +325,7 @@ class LuiController(object):
                     apis.ha_api.get_entity(entity_id).call_service("lock")
             elif entity_id.startswith('button') or entity_id.startswith('input_button'):
                 apis.ha_api.get_entity(entity_id).call_service("press")
-            elif entity_id.startswith('input_select'):
+            elif entity_id.startswith('input_select') or entity_id.startswith('select'):
                 apis.ha_api.get_entity(entity_id).call_service("select_next")
             elif entity_id.startswith('vacuum'):
                 if apis.ha_api.get_entity(entity_id).state == "docked":
@@ -333,6 +334,11 @@ class LuiController(object):
                     apis.ha_api.get_entity(entity_id).call_service("return_to_base")
             elif entity_id.startswith('service'):
                 apis.ha_api.call_service(entity_id.replace('service.', '', 1).replace('.','/', 1), **entity_config.data)
+            elif entity_id.startswith('valve'):
+                if apis.ha_api.get_entity(entity_id).state == "open":
+                    apis.ha_api.get_entity(entity_id).call_service("close_valve")
+                else:
+                    apis.ha_api.get_entity(entity_id).call_service("open_valve")
 
         # for media page
         if button_type == "media-next":
@@ -347,8 +353,8 @@ class LuiController(object):
             else:
                 apis.ha_api.get_entity(entity_id).call_service("turn_off")
         if button_type == "media-shuffle":
-            suffle = not apis.ha_api.get_entity(entity_id).attributes.shuffle
-            apis.ha_api.get_entity(entity_id).call_service("shuffle_set", shuffle=suffle)
+            shuffle = not apis.ha_api.get_entity(entity_id).attributes['shuffle']
+            apis.ha_api.get_entity(entity_id).call_service("shuffle_set", shuffle=shuffle)
         if button_type == "volumeSlider":
             pos = int(value)
             # HA wants this value between 0 and 1 as float
@@ -365,7 +371,7 @@ class LuiController(object):
         if button_type == "colorTempSlider":
             entity = apis.ha_api.get_entity(entity_id)
             #scale 0-100 from slider to color range of lamp
-            color_val = scale(int(value), (0, 100), (entity.attributes.min_mireds, entity.attributes.max_mireds))
+            color_val = scale(int(value), (0, 100), (entity.attributes['min_mireds'], entity.attributes['max_mireds']))
             apis.ha_api.get_entity(entity_id).call_service("turn_on", color_temp=color_val)
         if button_type == "colorWheel":
             apis.ha_api.log(value)
@@ -392,9 +398,9 @@ class LuiController(object):
         if button_type == "opnSensorNotify":
             msg = ""
             entity = apis.ha_api.get_entity(entity_id)
-            if "open_sensors" in entity.attributes and entity.attributes.open_sensors is not None:
-                for e in entity.attributes.open_sensors:
-                    msg += f"- {apis.ha_api.get_entity(e).attributes.friendly_name}\r\n"
+            if open_sensors := entity.attributes.get("open_sensors") is not None:
+                for e in open_sensors:
+                    msg += f"- {apis.ha_api.get_entity(e).attributes['friendly_name']}\r\n"
             self._pages_gen.send_message_page("opnSensorNotifyRes", "", msg, "", "")
 
         # for cardUnlock
@@ -411,22 +417,22 @@ class LuiController(object):
 
         if button_type == "mode-preset_modes":
             entity = apis.ha_api.get_entity(entity_id)
-            preset_mode = entity.attributes.preset_modes[int(value)]
+            preset_mode = entity.attributes['preset_modes'][int(value)]
             entity.call_service("set_preset_mode", preset_mode=preset_mode)
 
         if button_type == "mode-swing_modes":
             entity = apis.ha_api.get_entity(entity_id)
-            swing_mode = entity.attributes.swing_modes[int(value)]
+            swing_mode = entity.attributes['swing_modes'][int(value)]
             entity.call_service("set_swing_mode", swing_mode=swing_mode)
 
         if button_type == "mode-fan_modes":
             entity = apis.ha_api.get_entity(entity_id)
-            fan_mode = entity.attributes.fan_modes[int(value)]
+            fan_mode = entity.attributes['fan_modes'][int(value)]
             entity.call_service("set_fan_mode", fan_mode=fan_mode)
 
-        if button_type == "mode-input_select":
+        if button_type in ["mode-input_select", "mode-select"]:
             entity = apis.ha_api.get_entity(entity_id)
-            option = entity.attributes.options[int(value)]
+            option = entity.attributes['options'][int(value)]
             entity.call_service("select_option", option=option)
 
         if button_type == "mode-light":
@@ -438,12 +444,12 @@ class LuiController(object):
             if options_list is not None:
                 option = options_list[int(value)]
             else:
-                option = entity.attributes.effect_list[int(value)]
+                option = entity.attributes['effect_list'][int(value)]
             entity.call_service("turn_on", effect=option)
             
         if button_type == "mode-media_player":
             entity = apis.ha_api.get_entity(entity_id)
-            option = entity.attributes.source_list[int(value)]
+            option = entity.attributes['source_list'][int(value)]
             entity.call_service("select_source", source=option)
             
         # timer detail page
@@ -458,3 +464,9 @@ class LuiController(object):
             apis.ha_api.get_entity(entity_id).call_service("pause")
         if button_type == "timer-finish":
             apis.ha_api.get_entity(entity_id).call_service("finish")
+            
+    @property
+    def current_card(self) -> Card:
+        """Used to get the current card"""
+
+        return self._current_card

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

@@ -159,8 +159,8 @@ alarm_control_panel_mapping = {
 }
 
 climate_mapping = {
-    'auto':       'calendar-sync',
-    'heat_cool':  'calendar-sync',
+    'auto':       'fan-auto',
+    'heat_cool':  'sun-snowflake-variant',
     'heat':  'fire',
     'off':  'power',
     'cool':  'snowflake',
@@ -213,6 +213,9 @@ def get_icon_ha(entity_id, overwrite=None, stateOverwrite=None):
         entity = apis.ha_api.get_entity(entity_id)
         state = entity.state if stateOverwrite is None else stateOverwrite
 
+    if entity_id in ["sensor.weather_forecast_daily", "sensor.weather_forecast_hourly"]:
+        ha_type = "weather"
+        
     if overwrite is not None:
         if type(overwrite) is str:
             return get_icon_char(overwrite)
@@ -263,8 +266,8 @@ def get_icon_ha(entity_id, overwrite=None, stateOverwrite=None):
     # based on media_content_type
     elif ha_type == "media_player":
         result_icon = "speaker-off"
-        if "media_content_type" in entity.attributes:
-            if entity.attributes.media_content_type in media_content_type_mapping:
-                result_icon = media_content_type_mapping[entity.attributes.media_content_type]
+        if media_content_type := entity.attributes.get("media_content_type"):
+            if media_content_type in media_content_type_mapping:
+                result_icon = media_content_type_mapping[media_content_type]
 
     return get_icon_char(result_icon)

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

@@ -3,19 +3,37 @@ import apis
 
 class LuiMqttListener(object):
 
-    def __init__(self, topic, controller, updater):
+    def __init__(self, use_api, topic, api_panel_name, api_device_id, controller, updater):
         self._controller = controller
         self._updater = updater
+        self._api_device_id = api_device_id
 
         # Setup, mqtt subscription and callback
-        apis.mqtt_api.mqtt_subscribe(topic=topic)
-        apis.mqtt_api.listen_event(self.mqtt_event_callback, "MQTT_MESSAGE", topic=topic, namespace='mqtt')
+        if use_api:
+            apis.ha_api.listen_event(self.api_event_callback, "esphome.nspanel.data")
+        else:
+            apis.mqtt_api.mqtt_subscribe(topic=topic)
+            apis.mqtt_api.listen_event(self.mqtt_event_callback, "MQTT_MESSAGE", topic=topic, namespace='mqtt')
 
+    def api_event_callback(self, event_name, data, kwargs):
+        if not "device_id" in data:
+            return
+        if not data["device_id"] == self._api_device_id:
+            return
+
+        apis.ha_api.log(f'API callback for: {data}')
+
+        self.customrecv_event_callback(event_name, data, kwargs)
 
     def mqtt_event_callback(self, event_name, data, kwargs):
-        apis.mqtt_api.log(f'MQTT callback for: {data}')
+        apis.ha_api.log(f'MQTT callback for: {data}')
+
         # Parse Json Message from Tasmota and strip out message from nextion display
         data = json.loads(data["payload"])
+
+        self.customrecv_event_callback(event_name, data, kwargs)
+
+    def customrecv_event_callback(self, event_name, data, kwargs):
         if("nlui_driver_version" in data):
             msg = data["nlui_driver_version"]
             self._updater.set_tasmota_driver_version(int(msg))
@@ -23,7 +41,7 @@ class LuiMqttListener(object):
         if("CustomRecv" not in data):
             return
         msg = data["CustomRecv"]
-        apis.mqtt_api.log(f"Received Message from Screen: {msg}")
+        apis.ha_api.log(f"Received Message from Screen: {msg}")
         # Split message into parts seperated by ","
         msg = msg.split(",")
         # run action based on received command
@@ -59,17 +77,38 @@ class LuiMqttListener(object):
                 self._controller.detail_open(msg[2], msg[3])
 
 class LuiMqttSender(object):
-    def __init__(self, api, topic_send):
+    def __init__(self, api, use_api, topic_send, api_panel_name, quiet):
         self._ha_api = api
+        self._use_api = use_api
         self._topic_send = topic_send
+        self._api_panel_name = api_panel_name
         self._prev_msg = ""
+        self._quiet = quiet
 
     def send_mqtt_msg(self, msg, topic=None, force=False):
         if not force and self._prev_msg == msg:
-            self._ha_api.log(f"Dropping identical consecutive message: {msg}")
+            apis.ha_api.log(f"Dropping identical consecutive message: {msg}")
             return
         self._prev_msg = msg
-        if topic is None:
-            topic = self._topic_send
-        self._ha_api.log(f"Sending MQTT Message: {msg}")
-        apis.mqtt_api.mqtt_publish(topic, msg)
+
+        if self._quiet is False:
+            apis.ha_api.log(f"Sending Message: {msg}")
+            
+        if self._use_api:
+            apis.ha_api.call_service(service="esphome/" + self._api_panel_name + "_nspanelui_api_call", command=2, data=msg)
+        else:
+            if topic is None:
+                topic = self._topic_send
+            apis.mqtt_api.mqtt_publish(topic, msg)
+
+    def request_berry_driver_version(self):
+        if self._use_api:
+            apis.ha_api.call_service(service="esphome/" + self._api_panel_name + "_nspanelui_api_call", command=1, data="x")
+        else:
+            apis.mqtt_api.mqtt_publish(self._topic_send.replace("CustomSend", "GetDriverVersion"), "x")
+
+    def flash_nextion(self, url):
+        if self._use_api:
+            apis.ha_api.call_service(service="esphome/" + self._api_panel_name + "_nspanelui_api_call", command=255, data=url)
+        else:
+            apis.mqtt_api.mqtt_publish(self._topic_send.replace("CustomSend", "FlashNextion"), url)

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

@@ -1,4 +1,5 @@
 import datetime
+from dateutil import tz
 import dateutil.parser as dp
 import time
 
@@ -96,21 +97,28 @@ class LuiPagesGen(object):
                 if state == "sunny":
                     icon_color = 65504 #bright-yellow
 
-            if "rgb_color" in attr:
-                color = attr.rgb_color
-                if "brightness" in attr:
-                    color = rgb_brightness(color, attr.brightness)
+            if color := attr.get("rgb_color"):
+                if brightness := attr.get("brightness"):
+                    color = rgb_brightness(color, brightness)
                 icon_color = rgb_dec565(color)
-            elif "brightness" in attr:
-                color = rgb_brightness([253, 216, 53], attr.brightness)
+            elif brightness := attr.get("brightness"):
+                color = rgb_brightness([253, 216, 53], brightness)
                 icon_color = rgb_dec565(color)
             return icon_color
 
+
     def update_time(self, kwargs):
-        time = datetime.datetime.now().strftime(self._config.get("timeFormat"))
+        time = None
+        # get current time, with timezone if set
+        if self._config.get("timezone"):
+            timezone = tz.gettz(self._config.get("timezone"))
+            time = datetime.datetime.now(tz=timezone)
+        else:
+            time = datetime.datetime.now()
+        nice_time = time.strftime(self._config.get("timeFormat"))
         addTemplate = self._config.get("timeAdditionalTemplate")
         addTimeText = apis.ha_api.render_template(addTemplate)
-        self._send_mqtt_msg(f"time~{time}~{addTimeText}")
+        self._send_mqtt_msg(f"time~{nice_time}~{addTimeText}")
 
     def update_date(self, kwargs):
         global babel_spec
@@ -183,6 +191,9 @@ class LuiPagesGen(object):
         else:
             entityType = "delete"
 
+        if entityId in ["sensor.weather_forecast_daily", "sensor.weather_forecast_hourly"]:
+            entityType = "weather"
+
         apis.ha_api.log(f"Generating item for {entityId} with type {entityType}", level="DEBUG")
 
         status_entity = apis.ha_api.get_entity(item.status) if item.status and apis.ha_api.entity_exists(item.status) else None
@@ -212,7 +223,7 @@ class LuiPagesGen(object):
                 if status_entity:
                     icon_res = get_icon_ha(item.status, overwrite=icon)
                     icon_color = self.get_entity_color(status_entity, ha_type=item.status.split(".")[0], overwrite=colorOverride)
-                    if item.status.startswith("sensor") and (cardType == "cardGrid" or cardType == "cardGrid2") and item.iconOverride is None:
+                    if item.status.startswith("sensor") and cardType in ["cardGrid", "cardGrid1", "cardGrid2"] and item.iconOverride is None:
                         icon_res = status_entity.state[:4]
                         if icon_res[-1] == ".":
                             icon_res = icon_res[:-1]
@@ -236,7 +247,7 @@ class LuiPagesGen(object):
             if status_entity:
                 icon_id = get_icon_ha(item.status, overwrite=icon)
                 icon_color = self.get_entity_color(status_entity, ha_type=item.status.split(".")[0], overwrite=colorOverride)
-                if item.status.startswith("sensor") and (cardType == "cardGrid" or cardType == "cardGrid2") and item.iconOverride is None:
+                if item.status.startswith("sensor") and cardType in ["cardGrid", "cardGrid1", "cardGrid2"] and item.iconOverride is None:
                     icon_id = status_entity.state[:4]
                     if icon_id[-1] == ".":
                         icon_id = icon_id[:-1]
@@ -264,7 +275,7 @@ class LuiPagesGen(object):
             icon_up_status = "disable"
             icon_stop_status = "disable"
             icon_down_status = "disable"
-            bits = entity.attributes.supported_features
+            bits = entity.attributes.get('supported_features')
             pos = entity.attributes.get("current_position")
             if pos is None:
                 pos_status = entity.state
@@ -298,6 +309,11 @@ class LuiPagesGen(object):
             unit_of_measurement = entity.attributes.get("unit_of_measurement", "")
             value = entity.state
 
+            try:
+                value = str(round(float(value), 1))
+            except:
+                print("An exception occurred") 
+                
             # limit value to 4 chars on us-p
             if self._config.get("model") == "us-p" and cardType == "cardEntities":
                 value = entity.state[:4]
@@ -309,7 +325,7 @@ class LuiPagesGen(object):
             value = value + unit_of_measurement
             if entityType == "binary_sensor":
                 value = get_translation(self._locale, f"backend.component.binary_sensor.state.{device_class}.{entity.state}")
-            if (cardType == "cardGrid" or cardType == "cardGrid2") and entityType == "sensor" and icon is None:
+            if cardType in ["cardGrid", "cardGrid1", "cardGrid2"] and entityType == "sensor" and icon is None:
                 icon_id = entity.state[:4]
                 if icon_id[-1] == ".":
                     icon_id = icon_id[:-1]
@@ -371,20 +387,50 @@ class LuiPagesGen(object):
         elif entityType == "weather":
             entityTypePanel = "text"
             unit = get_attr_safe(entity, "temperature_unit", "")
-            if type(item.stype) == int and len(entity.attributes.forecast) >= item.stype:
-                fdate = dp.parse(entity.attributes.forecast[item.stype]['datetime'])
-                global babel_spec
-                if babel_spec is not None:
-                    dateformat = "E" if item.nameOverride is None else item.nameOverride
-                    name = babel.dates.format_datetime(fdate.astimezone(), dateformat, locale=self._locale)
+            rt = None
+            if type(item.stype) == str:
+                spintstr = item.stype.split(":")
+                rt = spintstr[0]
+                item.stype = int(spintstr[1])
+            if type(item.stype) == int:
+                bits = get_attr_safe(entity, "supported_features", 0b0)
+                if not rt:
+                    rt = "daily"
+                    if bits & 0b001: #FORECAST_DAILY
+                        rt = "daily"
+                    elif bits & 0b010: #FORECAST_HOURLY
+                        rt = "hourly"
+                    elif bits & 0b100: #FORECAST_TWICE_DAILY
+                        rt = "twice_daily"
+
+                results = apis.ha_api.call_service(
+                    "weather/get_forecasts", target={"entity_id": entityId}, service_data={"type": rt}
+                )
+                forecast = results.get("result", {}).get("response", {}).get(entityId, {}).get('forecast') or entity.attributes.get('forecast', [])
+                if len(forecast) >= item.stype:
+                    day_forecast = forecast[item.stype]
+                    fdate = dp.parse(day_forecast['datetime'])
+                    global babel_spec
+                    if babel_spec is not None:
+                        dateformat = "E" if item.nameOverride is None else item.nameOverride
+                        name = babel.dates.format_datetime(fdate.astimezone(), dateformat, locale=self._locale)
+                    else:
+                        dateformat = "%a" if item.nameOverride is None else item.nameOverride
+                        name = fdate.astimezone().strftime(dateformat)
+                    icon_id = get_icon_ha(entityId, stateOverwrite=day_forecast['condition'])
+                    value = f'{day_forecast.get("temperature", "")}{unit}'
+                    color = self.get_entity_color(entity, ha_type=entityType, stateOverwrite=day_forecast['condition'], overwrite=colorOverride)
                 else:
-                    dateformat = "%a" if item.nameOverride is None else item.nameOverride
-                    name = fdate.astimezone().strftime(dateformat)
-                icon_id = get_icon_ha(entityId, stateOverwrite=entity.attributes.forecast[item.stype]['condition'])
-                value = f'{entity.attributes.forecast[item.stype].get("temperature", "")}{unit}'
-                color = self.get_entity_color(entity, ha_type=entityType, stateOverwrite=entity.attributes.forecast[item.stype]['condition'], overwrite=colorOverride)
+                    value = f'{get_attr_safe(entity, "temperature", "")}{unit}'
             else:
                 value = f'{get_attr_safe(entity, "temperature", "")}{unit}'
+        elif entityType == "valve":
+            entityTypePanel = "valve"
+            value = get_translation(self._locale, f"backend.component.binary_sensor.state.door.{entity.state}")
+            if entity.state == "open":
+                icon_id = get_icon_id("valve-open")
+            else:
+                icon_id = get_icon_id("valve-closed")
         else:
             name = "unsupported"
         # Overwrite for value
@@ -443,7 +489,7 @@ class LuiPagesGen(object):
             command = f"entityUpd~Not found~{navigation}~{item}~check~220~apps.yaml~150~300~5~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Please~your~~"
         else:
             entity       = apis.ha_api.get_entity(item)
-            heading      = title if title != "unknown" else entity.attributes.friendly_name
+            heading      = title if title != "unknown" else entity.attributes['friendly_name']
             current_temp = get_attr_safe(entity, "current_temperature", "")
             dest_temp    = get_attr_safe(entity, "temperature", None)
             dest_temp2   = ""
@@ -519,6 +565,50 @@ class LuiPagesGen(object):
             command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp} {temperature_unit}~{dest_temp}~{state_value}~{min_temp}~{max_temp}~{step_temp}{icon_res}~{currently_translation}~{state_translation}~{action_translation}~{temperature_unit_icon}~{dest_temp2}~{detailPage}"
         self._send_mqtt_msg(command)
 
+    def generate_chart_page(self, navigation, title, entity):
+        item = entity.entityId
+        if not apis.ha_api.entity_exists(item):
+            command = f"entityUpd~Not found~{navigation}"
+        else:
+            entity       = apis.ha_api.get_entity(item)
+            heading      = title if title != "unknown" else entity.attributes['friendly_name']
+
+            # get data from homeassistant
+            data_raw = apis.ha_api.get_history(entity_id = item, days = 7)
+            data = [(d.get('last_updated', None),d.get('state', None)) for d in data_raw[0]]
+            data = dict(data)
+
+            # Parse timestamps and convert to datetime objects, excluding 'unavailable' values
+            time_temp_pairs = [(datetime.datetime.fromisoformat(timestamp), int(val)) for timestamp, val in data.items() if val != 'unavailable']
+            # Sort the data based on timestamps
+            time_temp_pairs.sort(key=lambda x: x[0])
+            # Calculate the time span
+            start_time = time_temp_pairs[0][0]
+            end_time = time_temp_pairs[-1][0]
+            time_span = end_time - start_time
+            # Calculate time intervals for evenly spaced data points
+            num_data_points = 24
+            time_intervals = [start_time + i * time_span / (num_data_points - 1) for i in range(num_data_points)]
+            # Find the closest data points for these time intervals
+            evenly_spaced_data = []
+            for interval in time_intervals:
+                closest_pair = min(time_temp_pairs, key=lambda x: abs(x[0] - interval))
+                time, val = closest_pair
+                val = int(val)
+                evenly_spaced_data.append((time, val))
+
+            datapoints = ""
+            for idx, (time, val) in enumerate(evenly_spaced_data):
+                datapoints += f"{val}~"
+
+            color = 65504
+            ydesc = "Akku [%]"
+            yscale = "25:50:75:100"
+            #datapoints = "19^22:00~17~12~8~7^2:00~6~6~5~5^6:00~5~15~19~12^10:00~17~24~18~12^14:00~13~13~13~15^18:00~25~28~26"
+
+            command = f"entityUpd~{heading}~{navigation}~{color}~{ydesc}~{yscale}~{datapoints}"
+        self._send_mqtt_msg(command)
+
     def generate_media_page(self, navigation, title, entity, entities, mediaBtn):
         entityId = entity.entityId
         if entity.status is not None:
@@ -528,12 +618,12 @@ class LuiPagesGen(object):
         else:
             media_icon = self.generate_entities_item(entity, "cardGrid")
             ha_entity     = apis.ha_api.get_entity(entityId)
-            heading       = title if title != "unknown" else ha_entity.attributes.friendly_name
+            heading       = title if title != "unknown" else ha_entity.attributes['friendly_name']
             title         = get_attr_safe(ha_entity, "media_title", "")
             author        = get_attr_safe(ha_entity, "media_artist", "")
             volume        = int(get_attr_safe(ha_entity, "volume_level", 0)*100)
             iconplaypause = get_icon_id("pause") if ha_entity.state == "playing" else get_icon_id("play")
-            bits = ha_entity.attributes.supported_features
+            bits = ha_entity.attributes['supported_features']
             onoffbutton = "disable"
             if bits & 0b10000000:
                 if ha_entity.state == "off":
@@ -583,7 +673,7 @@ class LuiPagesGen(object):
                 if not entity.attributes.get("code_arm_required", False):
                     numpad = "disable"
                 if overwrite_supported_modes is None:
-                    bits = entity.attributes.supported_features
+                    bits = entity.attributes['supported_features']
                     if bits & 0b000001:
                         supported_modes.append("arm_home")
                     if bits & 0b000010:
@@ -622,7 +712,7 @@ class LuiPagesGen(object):
 
             #add button to show sensor state
             add_btn = ""
-            if "open_sensors" in entity.attributes and entity.attributes.open_sensors is not None:
+            if entity.attributes.get("open_sensors") is not None:
                 add_btn=f"{get_icon_id('progress-alert')}~{rgb_dec565([243,179,0])}~"
             if alarmBtn is not None and type(alarmBtn) is dict:
                 entity  = alarmBtn.get("entity")
@@ -726,6 +816,8 @@ class LuiPagesGen(object):
         if send_page_type:
             if card.cardType == "cardGrid" and len(card.entities) > 6:
                 card.cardType = "cardGrid2"
+            if card.cardType == "cardGrid1":
+                card.cardType = "cardGrid"
             self.page_type(card.cardType)
 
         # send sleep timeout if there is one configured for the current card
@@ -735,7 +827,7 @@ class LuiPagesGen(object):
             self._send_mqtt_msg(f'timeout~{self._config.get("sleepTimeout")}')
 
         temp_unit = card.raw_config.get("temperatureUnit", "celsius")
-        if card.cardType in ["cardEntities", "cardGrid", "cardGrid2"]:
+        if card.cardType in ["cardEntities", "cardGrid", "cardGrid1","cardGrid2"]:
             self.generate_entities_page(navigation, card.title, card.entities, card.cardType, temp_unit)
             return
         if card.cardType == "cardThermo":
@@ -770,6 +862,10 @@ class LuiPagesGen(object):
         if card.cardType == "cardPower":
             self.generate_power_page(navigation, card.title, card.entities)
             return
+        if card.cardType == "cardChart":
+            self.generate_chart_page(navigation, card.title, card.entity)
+            return
+
 
     def generate_light_detail_page(self, entity_id, is_open_detail=False):
         if entity_id.startswith('uuid'):
@@ -783,25 +879,26 @@ class LuiPagesGen(object):
         color_temp = "disable"
         color = "disable"
         effect_supported = "disable"
+        supported_color_modes = entity.attributes['supported_color_modes']
 
-        if "onoff" not in entity.attributes.supported_color_modes:
+        if "onoff" not in supported_color_modes:
             brightness = 0
         if entity.state == "on":
-            if "brightness" in entity.attributes:
+            if brightness := entity.attributes.get("brightness"):
                 # scale 0-255 brightness from ha to 0-100
-                brightness = int(scale(entity.attributes.brightness,(0,255),(0,100)))
+                brightness = int(scale(brightness, (0,255), (0,100)))
             else:
                 brightness = "disable"
-            if "color_temp" in entity.attributes.supported_color_modes:
-                if "color_temp" in entity.attributes:
+            if "color_temp" in supported_color_modes:
+                if color_temp := entity.attributes.get("color_temp"):
                     # scale ha color temp range to 0-100
-                    color_temp = int(scale(entity.attributes.color_temp,(entity.attributes.min_mireds, entity.attributes.max_mireds),(0,100)))
+                    color_temp = int(scale(color_temp, (entity.attributes['min_mireds'], entity.attributes['max_mireds']),(0, 100)))
                 else:
                     color_temp = "unknown"
             else:
                 color_temp = "disable"
             list_color_modes = ["xy", "rgb", "rgbw", "hs"]
-            if any(item in list_color_modes for item in entity.attributes.supported_color_modes):
+            if any(item in list_color_modes for item in supported_color_modes):
                 color = "enable"
             else:
                 color = "disable"
@@ -841,7 +938,7 @@ class LuiPagesGen(object):
         iconTiltRightStatus = "disable"
         tilt_pos = "disable"
 
-        bits = entity.attributes.supported_features
+        bits = entity.attributes['supported_features']
 
         # position supported
         if bits & 0b00001111:

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

@@ -1,6 +1,5 @@
 class Updater:
-    def __init__(self, log, send_mqtt_msg, topic_send, mode, desired_display_firmware_version, desired_display_firmware_model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url):
-        
+    def __init__(self, log, mqttsend, topic_send, mode, desired_display_firmware_version, desired_display_firmware_model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url):
         self._log = log
         
         self.desired_display_firmware_version = desired_display_firmware_version
@@ -10,7 +9,7 @@ class Updater:
         self.desired_tasmota_driver_url       = desired_tasmota_driver_url
         
         self.mode = mode
-        self._send_mqtt_msg = send_mqtt_msg
+        self.mqttsend = mqttsend
         self.topic_send = topic_send
         self.current_tasmota_driver_version   = None
         self.current_display_firmware_version = None
@@ -18,6 +17,7 @@ class Updater:
 
     def set_tasmota_driver_version(self, driver_version):
         self.current_tasmota_driver_version   = driver_version
+
     def set_current_display_firmware_version(self, panel_version, panel_model=None):
         self.current_display_firmware_version = panel_version
         self.current_display_model            = panel_model
@@ -33,8 +33,8 @@ class Updater:
             return False
 
     def send_message_page(self, id, heading, msg, b1, b2):
-        self._send_mqtt_msg(f"pageType~popupNotify")
-        self._send_mqtt_msg(f"entityUpdateDetail~{id}~{heading}~65535~{b1}~65535~{b2}~65535~{msg}~65535~0")
+        self.mqttsend.send_mqtt_msg(f"pageType~popupNotify")
+        self.mqttsend.send_mqtt_msg(f"entityUpdateDetail~{id}~{heading}~65535~{b1}~65535~{b2}~65535~{msg}~65535~0")
 
     def check_updates(self):
         # return's true if a notification was send to the panel
@@ -80,12 +80,11 @@ class Updater:
 
     def request_berry_driver_version(self):
         self.current_tasmota_driver_version = None
-        topic = self.topic_send.replace("CustomSend", "GetDriverVersion")
-        self._send_mqtt_msg("X", topic=topic)
+        self.mqttsend.request_berry_driver_version()
 
     def update_berry_driver(self):
         topic = self.topic_send.replace("CustomSend", "Backlog")
-        self._send_mqtt_msg(f"UpdateDriverVersion {self.desired_tasmota_driver_url}; Restart 1", topic=topic)
+        self.mqttsend.send_mqtt_msg(f"UpdateDriverVersion {self.desired_tasmota_driver_url}; Restart 1", topic=topic)
+
     def update_panel_driver(self):
-        topic = self.topic_send.replace("CustomSend", "FlashNextion")
-        self._send_mqtt_msg(self.desired_display_firmware_url, topic=topic)
+        self.mqttsend.flash_nextion(self.desired_display_firmware_url)

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

@@ -1,4 +1,4 @@
-import hassapi as hass
+import adbase as ad
 
 from luibackend.config import LuiBackendConfig
 from luibackend.controller import LuiController
@@ -6,29 +6,35 @@ from luibackend.mqtt import LuiMqttListener, LuiMqttSender
 from luibackend.updater import Updater
 
 import apis
+import json
+from typing import Literal
 
-class NsPanelLovelaceUIManager(hass.Hass):
+class NsPanelLovelaceUIManager(ad.ADBase):
 
     def initialize(self):
-        self.log('Starting')
-        apis.ha_api   = self
+        self.adapi = self.get_ad_api()
+        self.adapi.log('Starting')
+        apis.ad_api = self.adapi
+        apis.ha_api   = self.get_plugin_api("HASS")
         apis.mqtt_api = self.get_plugin_api("MQTT")
 
-        cfg = self._cfg = LuiBackendConfig(self, self.args["config"])
+        cfg = self._cfg = LuiBackendConfig(apis.ha_api, self.args["config"])
+
+        use_api = cfg.get("use_api") == True
 
         topic_send = cfg.get("panelSendTopic")
         topic_recv = cfg.get("panelRecvTopic")
+        api_panel_name = cfg.get("panelName")
+        api_device_id = cfg.get("panelDeviceId")
+        quiet = cfg.get("quiet")
 
-        mqttsend = LuiMqttSender(self, topic_send)
+        mqttsender = self._mqttsender = LuiMqttSender(apis.ha_api, use_api, topic_send, api_panel_name, quiet)
 
-        # Request Tasmota Driver Version
-        apis.mqtt_api.mqtt_publish(topic_send.replace("CustomSend", "GetDriverVersion"), "x")
-
-        controller = LuiController(cfg, mqttsend.send_mqtt_msg)
+        self._controller = LuiController(cfg, mqttsender.send_mqtt_msg)
         
         desired_tasmota_driver_version   = 8
         desired_display_firmware_version = 53
-        version     = "v4.3.1"
+        version     = "v4.7.3"
         
         model       = cfg.get("model")
         if model == "us-l":
@@ -39,11 +45,36 @@ class NsPanelLovelaceUIManager(hass.Hass):
             desired_display_firmware_url = cfg._config.get("displayURL-EU",   f"http://nspanel.pky.eu/lovelace-ui/github/nspanel-{version}.tft")
         desired_tasmota_driver_url       = cfg._config.get("berryURL",         "https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be")
 
-
-
         mode = cfg.get("updateMode")
-        updater = Updater(self.log, mqttsend.send_mqtt_msg, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url)
+        updater = Updater(self.adapi.log, mqttsender, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url)
         
-        LuiMqttListener(topic_recv, controller, updater)
+        # Request Tasmota Driver Version
+        updater.request_berry_driver_version()
 
-        self.log(f'Started ({version})')
+        LuiMqttListener(use_api, topic_recv, api_panel_name, api_device_id, self._controller, updater)
+
+        self.adapi.log(f'Started ({version})')
+        
+    #
+    # helpers
+    #
+    
+    def show_card(self, card_key: str) -> None:
+        """Used to show card on panel"""
+        
+        msg = json.dumps({"CustomRecv":f"event,buttonPress2,navigate.{card_key},button"})
+        topic = self._cfg.get("panelRecvTopic")
+        self._mqttsender.send_mqtt_msg(msg, topic)
+        
+    def navigate(self, direction: Literal['up', 'prev', 'next']) -> None:
+        """Used to navigate different directions on the panel"""
+        
+        msg = json.dumps({"CustomRecv":f"event,buttonPress2,nav{direction.title()},button"})
+        topic = self._cfg.get("panelRecvTopic")
+        self._mqttsender.send_mqtt_msg(msg, topic)
+        
+    @property
+    def current_card(self) -> str:
+        """Used to get the panel's current card"""
+        
+        return self._controller.current_card.key

docs/config-overview.md

@@ -68,6 +68,7 @@ key | optional | type | default | description
 `dateAdditionalTemplate` | True | string | `""` | Addional Text dispayed after Date, can contain a Homeassistant Template Example `" - {{ states('sun.sun') }}"`
 `timeAdditionalTemplate` | True | string | `""` | Addional Text dispayed below Time, can contain a Homeassistant Template
 `dateFormat` | True | string | `%A, %d. %B %Y` | date format used if babel is not installed
+`timezone` | True | string | "" | Timezone for the time on the panel: `Europe/Berlin` - See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones for a list of TZ Identifiers (supported from upcoming version v4.4)
 `defaultBackgroundColor` | True | string | ha-dark | backgroud color of all cards, valid values: `black`, `ha-dark`
 `cards` | False | complex | | configuration for cards that are displayed on panel; see docs for cards
 `screensaver` | True | complex | | configuration for screensaver; see docs for screensaver

docs/configure_mqtt.md

@@ -9,20 +9,30 @@ Please leave the Full Topic as it is in default configuration (and on the screen
 
 Change the topic to something unique for your panel, you will need this topic later in the configuration of your panel in appdaemon / apps.yaml
 
+# Note for Appdeamon Addon Version >= 15
+
+The configuration has been moved out of the config folder from homeassistant. This is how you can access it with the VSCode Addon.
+
+![image](https://github.com/joBr99/nspanel-lovelace-ui/assets/29555657/ddf75cac-fca1-48e7-9e84-646e7a80d38a)
+
+![image](https://github.com/joBr99/nspanel-lovelace-ui/assets/29555657/6b19180a-b637-4c22-9ec0-c7a4fd304b27)
+
+
 # Configure MQTT Connection on AppDaemon
 
 For the app to work you need a working MQTT Configuration in AppDaemon. Please add the configuration of your mqtt server, user and password to your existing `appdaemon.yaml` Restart your AppDaemon Container (not HomeAssistant) after adding the MQTT Configuration.
 
-You will find this file in the following location: `config/appdaemon/appdeamon.yaml`
+You will find this file in the following location: `/addon_configs/a0d7b954_appdaemon/appdeamon.yaml`
 
 ```yaml
 ---
-secrets: /config/secrets.yaml
+secrets: /homeassistant/secrets.yaml
 appdaemon:
   latitude: 52.0
   longitude: 4.0
   elevation: 2
   time_zone: Europe/Berlin
+  app_dir: /homeassistant/appdaemon/apps/ # !!! This is really important for AppDaemon HA Addon >= 15
   plugins:
     HASS:
       type: hass
@@ -47,6 +57,8 @@ hadashboard:
 
 Please add the following minimal configuration to your apps.yaml, which is located in `config/appdaemon/apps/apps.yaml`
 
+Note: You need to move your `apps.yaml` to this location if it isn't there.
+
 ```yaml
 ---
 nspanel-1:

docs/faq.md

@@ -4,7 +4,12 @@
 
 You have most likely an error in your MQTT configuration somewhere. To find the error follow theese steps:
 
-1. Check your appdaemon log. (Settings > Add-ons > AppDaemon > Log)
+1. Check the location of your apps.yaml
+With the AppDaemon Addon >= 15 the config dir has been moved.
+It's required to configure the location back to the old one, this is done by the `app_dir` line in your `appdaemon.yaml`.
+This also requires you to move your apps.yaml to this location. Please make sure your apps.yaml is at `/config/appdaemon/apps/apps.yaml` and move it otherwise.
+
+2. Check your appdaemon log. (Settings > Add-ons > AppDaemon > Log)
 You should see something like this:
 `INFO MQTT: MQTT Plugin initialization complete`  
 If you are seeing Messages like this:  
@@ -12,14 +17,14 @@ If you are seeing Messages like this:
 Your appdaemon mqtt config is wrong, check your appdaemon.yaml.  
 The log of your mqtt broker might give you additional information.  
 
-2. Check MQTT Configuration of Tasmota.
+3. Check MQTT Configuration of Tasmota.
 Your Tasmota device needs to connect sucessfully to your MQTT Broker, if you are in the waiting for content screen, the panel will send periodic messages to it's mqtt topic. Note that there is a minimum password length of 5 chars for the MQTT Connection in Tasmota.
 
-3. Make sure that you are using the same topic in apps.yaml and in your tasmota configuration. 
+4. Make sure that you are using the same topic in apps.yaml and in your tasmota configuration. 
 The examples in the docs ([MQTT Config](https://docs.nspanel.pky.eu/configure_mqtt/)) are an valid example (tasmota<>apps.yaml).  
 Please don't modify the Full Topic in your Tasmota Config, unless you know the implications, changing the Full Topic will result in diffent Send and Receive Channels, that have to be correct in your apps.yaml.
 
-4. If you are still in the waiting for content screen please share the following items, with the Waiting for Content Issue type on the [Github Issues Page](https://github.com/joBr99/nspanel-lovelace-ui/issues/new/choose)
+5. If you are still in the waiting for content screen please share the following items, with the Waiting for Content Issue type on the [Github Issues Page](https://github.com/joBr99/nspanel-lovelace-ui/issues/new/choose)
 
     - a screenshot of your tasmota mqtt configration (please censor your mqtt password)
     - your appdaemon.yaml (please censor your mqtt password)

docs/prepare_ha.md

@@ -47,7 +47,6 @@ services:
 ```
 </details>
 
-
 ### Add babel package to AppDaemon Container (Optional)
 
 For localisation (date in your local language) you need to add the python package babel to your AppDaemon Installation.
@@ -94,3 +93,4 @@ Now, to install NSPanel Lovelace UI Backend with HACS, follow these steps:
 6. A confirmation panel will appear, click on `Download`, and wait for HACS to
    proceed with the download
 7. The Backend Application is now installed, and HACS will inform you when updates are available
+

ioBroker/Blockly/Abfallkalender.js

@@ -1,74 +0,0 @@
-const idAbfalliCal = 'ical.1'; // iCal Instanz zum Abfallkalender
-const idZeichenLoeschen = 14; // x Zeichen links vom String abziehen, wenn vor dem Eventname noch Text steht z.B. Strassenname; Standard = 0
-const idRestmuellName ='Hausmüll'; // Schwarze Tonne
-const idWertstoffName = 'Gelber Sack'; // Gelbe Tonne / Sack
-const idPappePapierName = 'Papier';  // Blaue Tonne
-const idBioabfaelleName = 'Biomüll'; // Braune Tonne
- 
- 
-var i, Muell_JSON, Event2, Color = 0;
- 
-for (i = 1; i <= 4; i++) {
-    if (!existsState('0_userdata.0.Abfallkalender.' + parseFloat(i) + '.date')) {
-        log(i + '.date nicht vorhanden, wurde erstellt');
-        createState('0_userdata.0.Abfallkalender.' + parseFloat(i) + '.date', '',
-            {
-                name: parseFloat(i) + '.date',
-                role: 'state',
-                type: 'string',
-                read: true,
-                write: true,
-                def: ''
-            });
-    };
-    if (!existsState('0_userdata.0.Abfallkalender.' + parseFloat(i) + '.event')) {
-        log(i + '.event nicht vorhanden, wurde erstellt');
-        createState('0_userdata.0.Abfallkalender.' + parseFloat(i) + '.event', '',
-            {
-                name: parseFloat(i) + '.event',
-                role: 'state',
-                type: 'string',
-                read: true,
-                write: true,
-                def: ''
-            });
-    };
-    if (!existsState('0_userdata.0.Abfallkalender.' + parseFloat(i) + '.color')) {
-        log(i + '.color nicht vorhanden, wurde erstellt');
-        createState('0_userdata.0.Abfallkalender.' + parseFloat(i) + '.color', 0,
-            {
-                name: parseFloat(i) + '.color',
-                role: 'state',
-                type: 'number',
-                read: true,
-                write: true,
-                def: 0
-            });
-    };
-}
- 
-function subsequenceFromStartLast(sequence, at1) {
-    var start = at1;
-    var end = sequence.length;
-    return sequence.slice(start, end);
-}
- 
-on({ id: idAbfalliCal + '.data.table', change: "ne" }, async function () {
- 
-    for (i = 0; i <= 3; i++) {
-        Muell_JSON = getState(idAbfalliCal + '.data.table').val;
-        setStateDelayed((['0_userdata.0.Abfallkalender.', parseFloat(i) + 1, '.date'].join('')), getAttr(Muell_JSON, (String(i) + '.date')), false, parseInt(((0) || "").toString(), 10), false);
-        Event2 = subsequenceFromStartLast(getAttr(Muell_JSON, (String(i) + '.event')), idZeichenLoeschen);
-        setStateDelayed((['0_userdata.0.Abfallkalender.', parseFloat(i) + 1, '.event'].join('')), Event2, false, parseInt(((0) || "").toString(), 10), false);
-        if (Event2 == idRestmuellName) {
-            Color = 33840;
-        } else if (Event2 == idBioabfaelleName) {
-            Color = 2016;
-        } else if (Event2 == idPappePapierName) {
-            Color = 31;
-        } else if (Event2 == idWertstoffName) {
-            Color = 65504;
-        }
-        setStateDelayed((['0_userdata.0.Abfallkalender.', parseFloat(i) + 1, '.color'].join('')), Color, false, parseInt(((0) || "").toString(), 10), false);
-    }
-});

ioBroker/Blockly/Abfallkalender.ts

@@ -0,0 +1,224 @@
+/*
+ * @author 2023 @tt-tom
+ * 
+ * Version 5.1.1
+ * 
+ * Das Script erstellt die Datenpunkte und Alias für den Abfallkalender im Sonoff NSPanel
+ * Es wird der iCal Adapter benötigt und eine URL mit Terminen vom Entsorger bzw. eine .ics-Datei mit den Terminen.
+ * Das Script triggert auf dem bereitgestellten JSON im iCal adapter und füllt die 0_userdata.0 Datenpunkte
+ * Weitere Informationen findest du in der FAQ auf Github https://github.com/joBr99/nspanel-lovelace-ui/wiki
+ * 
+ * changelog
+ *  - 06.12.2023 - v5.0.2 add custom name for trashtype
+ *  - 06.12.2023 - v5.1.0 Refactoring
+ *  - 22.01.2024 - v5.1.1 Add tow Events more
+ * 
+ * 
+*/
+
+
+const idTrashData: string = 'ical.0.data.table'; // Datenpunkt mit Daten im JSON Format
+const idUserdataAbfallVerzeichnis: string = '0_userdata.0.Abfallkalender'; // Name des Datenpunktverzeichnis unter 0_userdata.0 -> Strandard = 0_userdata.0.Abfallkalender
+const idAliasPanelVerzeichnis: string = 'alias.0.NSPanel.allgemein'; //Name PanelVerzeichnis unter alias.0. Standard = alias.0.NSPanel.1
+const idAliasAbfallVerzeichnis: string = 'Abfall'; //Name Verzeichnis unterhalb der idPanelverzeichnis  Standard = Abfall
+
+const anzahlZeichenLoeschen: number = 14; // x Zeichen links vom String abziehen, wenn vor dem Eventname noch Text steht z.B. Strassenname; Standard = 0
+const jsonEventName1: string = 'Hausmüll'; // Vergleichstring für Schwarze Tonne
+const customEventName1: string = '';        // benutzerdefinierter Text für schwarze Tonne
+const jsonEventName2: string = 'Gelber Sack'; // Vergleichstring für Gelbe Tonne / Sack
+const customEventName2: string = '';        // benutzerdefinierter Text für gelbe Tonne
+const jsonEventName3: string = 'Papier';    // Vergleichstring für Blaue Tonne
+const customEventName3: string = '';       // benutzerdefinierter Text für blaue Tonne
+const jsonEventName4: string = 'Biomüll';   // Vergleichstring für Braune Tonne
+const customEventName4: string = '';        // benutzerdefinierter Text für braune Tonne
+const jsonEventName5: string = 'Treppe';   // Vergleichstring für Event 5
+const customEventName5: string = 'Besen schwingen';        // benutzerdefinierter Text für Event 5
+const jsonEventName6: string = '';   // Vergleichstring für Event 6
+const customEventName6: string = '';        // benutzerdefinierter Text für Event 6
+
+const Debug: boolean = false;
+
+// ------------------------- Trigger zum füllen der 0_userdata Datenpunkte aus dem json vom ical Adapter -------------------------------
+
+// Trigger auf JSON Datenpunkt
+on({ id: idTrashData, change: 'ne' }, async function () {
+    JSON_auswerten();
+});
+
+// ------------------------------------- Ende Trigger ------------------------------------
+
+// ------------------------------------- Funktion JSON auswerten und DP füllen -------------------------------
+async function JSON_auswerten() {
+    try {
+
+        let trashJSON: any;
+        let instanzName: any;
+        let eventName: string;
+        let eventDatum: string;
+        let eventStartdatum: string;
+        let farbNummer: number = 0;
+        let farbString: string;
+        let abfallNummer: number = 1;
+
+        trashJSON = getState(idTrashData).val;
+        instanzName = idTrashData.split('.');
+
+        if (Debug) log('Rohdaten von Instanz ' + instanzName[0] + ': ' + JSON.stringify(trashJSON), 'info')
+
+
+        if (Debug) log('Anzahl Trash - Daten: ' + trashJSON.length, 'info');
+
+        for (let i = 0; i < trashJSON.length; i++) {
+            if (abfallNummer === 7) {
+                if (Debug) log('Alle Abfall-Datenpunkte gefüllt', 'warn');
+                break;
+            }
+
+            log('Daten vom ical Adapter werden ausgewertet', 'info');
+            eventName = getAttr(trashJSON, (String(i) + '.event')).slice(anzahlZeichenLoeschen, getAttr(trashJSON, (String(i) + '.event')).length);
+            // Leerzeichen vorne und hinten löschen
+            eventName = eventName.trimEnd();
+            eventName = eventName.trimStart();
+            eventDatum = getAttr(trashJSON, (String(i) + '.date'));
+            eventStartdatum = getAttr(trashJSON, (String(i) + '._date'));
+
+            let d: Date = currentDate();
+            let d1: Date = new Date(eventStartdatum);
+
+            if (Debug) log('--------- Nächster Termin wird geprüft ---------', 'info');
+            //if (Debug)  log(d + ' ' + d1, 'info');
+            if (Debug) log('Startdatum UTC: ' + eventStartdatum, 'info');
+            if (Debug) log('Datum: ' + eventDatum, 'info');
+            if (Debug) log('Event: ' + eventName, 'info');
+            if (Debug) log('Kontrolle Leerzeichen %' + eventName + '%', 'info');
+
+            if (d.getTime() <= d1.getTime()) {
+                if ((eventName == jsonEventName1) || (eventName == jsonEventName2) || (eventName == jsonEventName3) || (eventName == jsonEventName4) || (eventName == jsonEventName5) || (eventName == jsonEventName6)) {
+
+                    switch (eventName) {
+                        case jsonEventName1:
+                            farbNummer = 33840;
+                            if (customEventName1 != '') {
+                                eventName = customEventName1;
+                                if (Debug) log('Event customName: ' + eventName, 'info');
+                            };
+                            break;
+                        case jsonEventName2:
+                            farbNummer = 65504;
+                            if (customEventName2 != '') {
+                                eventName = customEventName2;
+                                if (Debug) log('Event customName: ' + eventName, 'info');
+                            };
+                            break;
+                        case jsonEventName3:
+                            farbNummer = 31;
+                            if (customEventName3 != '') {
+                                eventName = customEventName3
+                                if (Debug) log('Event customName: ' + eventName, 'info');
+                            };
+                            break;
+                        case jsonEventName4:
+                            farbNummer = 2016;
+                            if (customEventName4 != '') {
+                                eventName = customEventName4;
+                                if (Debug) log('Event customName: ' + eventName, 'info');
+                            };
+                            break;
+                        case jsonEventName5:
+                            farbNummer = 2016;
+                            if (customEventName5 != '') {
+                                eventName = customEventName5;
+                                if (Debug) log('Event customName: ' + eventName, 'info');
+                            };
+                            break;
+                        case jsonEventName6:
+                            farbNummer = 2016;
+                            if (customEventName6 != '') {
+                                eventName = customEventName6
+                                if (Debug) log('Event customName: ' + eventName, 'info');
+                            };
+                            break;
+                    }
+                
+                    //if (farbString != undefined) farbNummer = rgb_dec565(hex_rgb(farbString));
+
+
+                    setState(idUserdataAbfallVerzeichnis + '.' + String(abfallNummer) + '.date', eventDatum);
+                    setState(idUserdataAbfallVerzeichnis + '.' + String(abfallNummer) + '.event', eventName);
+                    setState(idUserdataAbfallVerzeichnis + '.' + String(abfallNummer) + '.color', farbNummer);
+
+
+                    //if (Debug) log('farbString: ' + farbString + ' farbNummer: ' + farbNummer, 'info');
+                    if (Debug) log('Abfallnummer: ' + abfallNummer, 'info');
+
+                    abfallNummer += 1
+                } else {
+                    if (Debug) log('Kein Abfalltermin => Event passt mit keinem Abfallnamen überein.', 'warn');
+                }
+            } else {
+                if (Debug) log('Termin liegt vor dem heutigen Tag', 'warn');
+            }
+        }
+    } catch (err) {
+        log('error at subscrption: ' + err.message, 'warn');
+    }
+};
+
+// ------------------------------------- Ende Funktion JSON ------------------------------
+
+// ------------------------------------- Funktion zur Prüfung und Erstellung der Datenpunkte in 0_userdata.0 und alias.0 -----------------------
+
+async function Init_Datenpunkte() {
+    try {
+        for (let i = 1; i <= 6; i++) {
+            if (existsObject(idUserdataAbfallVerzeichnis + '.' + String(i)) == false) {
+                log('Datenpunkt ' + idUserdataAbfallVerzeichnis + '.' + String(i) + ' werden angelegt', 'info')
+                await createStateAsync(idUserdataAbfallVerzeichnis + '.' + String(i) + '.date', '', { type: 'string' });
+                await createStateAsync(idUserdataAbfallVerzeichnis + '.' + String(i) + '.event', '', { type: 'string' });
+                await createStateAsync(idUserdataAbfallVerzeichnis + '.' + String(i) + '.color', 0, { type: 'number' });
+                setObject(idAliasPanelVerzeichnis + '.' + idAliasAbfallVerzeichnis, { type: 'device', common: { name: { de: 'Abfall', en: 'Trash' } }, native: {} });
+                setObject(idAliasPanelVerzeichnis + '.' + idAliasAbfallVerzeichnis + '.event' + String(i), { type: 'channel', common: { role: 'warning', name: { de: 'Ereignis ' + String(i), en: 'Event' + String(i) } }, native: {} });
+                await createAliasAsync(idAliasPanelVerzeichnis + '.' + idAliasAbfallVerzeichnis + '.event' + String(i) + '.TITLE', idUserdataAbfallVerzeichnis + '.' + String(i) + '.event', true, <iobJS.StateCommon>{ type: 'string', role: 'weather.title.short', name: { de: 'TITEL', en: 'TITLE' } });
+                await createAliasAsync(idAliasPanelVerzeichnis + '.' + idAliasAbfallVerzeichnis + '.event' + String(i) + '.LEVEL', idUserdataAbfallVerzeichnis + '.' + String(i) + '.color', true, <iobJS.StateCommon>{ type: 'number', role: 'value.warning', name: { de: 'LEVEL', en: 'LEVEL' } });
+                await createAliasAsync(idAliasPanelVerzeichnis + '.' + idAliasAbfallVerzeichnis + '.event' + String(i) + '.INFO', idUserdataAbfallVerzeichnis + '.' + String(i) + '.date', true, <iobJS.StateCommon>{ type: 'string', role: 'weather.title', name: { de: 'INFO', en: 'INFO' } });
+                log('Fertig', 'info')
+            } else {
+                log('Datenpunkt ' + idUserdataAbfallVerzeichnis + '.' + String(i) + ' vorhanden', 'info')
+            }
+        }
+        log('Startabfrage der Daten', 'info');
+        JSON_auswerten();
+    } catch (err) {
+        log('error at function Init_Datenpunkte: ' + err.message, 'warn');
+    }
+}
+Init_Datenpunkte();
+
+// --------------------------- Ende Funktion Datenpunkte ------------------------------------------------
+
+
+// --------------------------- Zusatzfuktionen -------------------------------------------------------------
+function currentDate() {
+    let d: Date = new Date();
+    return new Date(d.getFullYear(), d.getMonth(), d.getDate());
+}
+
+function rgb_dec565(rgb: RGB): number {
+    //return ((Math.floor(rgb.red / 255 * 31) << 11) | (Math.floor(rgb.green / 255 * 63) << 5) | (Math.floor(rgb.blue / 255 * 31)));
+    return ((rgb.red >> 3) << 11) | ((rgb.green >> 2)) << 5 | ((rgb.blue) >> 3);
+}
+
+function hex_rgb(colorhex: string): RGB {
+    let r = parseInt(colorhex.substring(1, 3), 16);
+    let g = parseInt(colorhex.substring(3, 5), 16);
+    let b = parseInt(colorhex.substring(5, 7), 16);
+    return { red: r, green: g, blue: b };
+}
+
+type RGB = {
+    red: number,
+    green: number,
+    blue: number
+};
+
+// -------------------- Ende Zudatzfunktionen --------------------------------------------------------------------------

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/Blockly/Alarm_clock.ts

@@ -0,0 +1,44 @@
+const dp_userdata: string = '0_userdata.0.NSPanel';
+const dp_alias: string = 'alias.0.NSPanel';
+
+// dpAction wird wenn der Wecker gestellt wird auf false geschaltet
+// dpAction wird wenn die Weckzeit erreicht ist auf true geschaltet
+// Der nachfolgende Datenpunkt muss manuell erstellt werden...
+const dpAction: string = '0_userdata.0.example_boolean';
+
+const Debug = true;
+
+let time: number;
+let scheduleAlarmTime: any = null;
+on({ id: dp_userdata + '.AlarmTime.State', change: 'ne' }, async (obj) => {
+
+    time = getState(dp_userdata + '.AlarmTime.Time').val;
+    if (Debug) log('Uhrzeit: ' + time, 'info');
+    if ('paused' == obj.state.val) {
+        (function () { if (scheduleAlarmTime) { 
+            clearSchedule(scheduleAlarmTime); 
+            scheduleAlarmTime = null; 
+            } 
+        });
+    } else if ('active' == obj.state.val) {
+        let stunde: number = Math.floor(time / 60);
+        let minute: number = time % 60;
+        if (Debug) log('Weckzeit: ' + ('0' + stunde).slice(-2) + ':' + ('0' + minute).slice(-2), 'info');
+        scheduleAlarmTime = schedule(minute + ' ' + stunde + ' * * *', async () => {
+            await setStateAsync(dpAction, <iobJS.State>{ val: true, ack: true });
+            await setStateAsync(dp_userdata + '.AlarmTime.State', <iobJS.State>{ val: 'paused', ack: true });
+        });
+    }
+});
+
+async function Init_Datenpunkte() {
+    if (existsState(dp_alias + '.AlarmTime.ACTUAL') == false) {
+        await createStateAsync(dp_userdata + '.AlarmTime.Time', '0', { type: 'number' });
+        await createStateAsync(dp_userdata + '.AlarmTime.State', 'paused', { type: 'string' });
+        setObject(dp_alias + '.AlarmTime', { type: 'channel', common: { role: 'value.alarmtime', name: 'Alarmtime' }, native: {} });
+        await createAliasAsync(dp_alias + '.AlarmTime.ACTUAL', dp_userdata + '.AlarmTime.Time', true, <iobJS.StateCommon>{ type: 'number', role: 'state', name: 'ACTUAL' });
+        await createAliasAsync(dp_alias + '.AlarmTime.STATE', dp_userdata + '.AlarmTime.State', true, <iobJS.StateCommon>{ type: 'string', role: 'state', name: 'STATE' });
+        log("<PageItem>{id: '"+ dp_alias + ".AlarmTime', name: 'Wecker', onColor: Red, offColor: Green, useColor: true}", 'info');
+    }
+}
+Init_Datenpunkte();

ioBroker/Blockly/CardChart_History.js

@@ -0,0 +1,51 @@
+const sourceDP = 'alias.0.Wohnzimmer.Heizung.ACTUAL';
+const targetDP = '0_userdata.0.Test.chartTest';
+const rangeHours = 24;
+const maxXAchsisTicks = 6;
+const historyInstance = 'history.0';
+const factor = 1; // Bei zu großen Werten und negativen Anzeigen im Panel um das 10fache erhöhen
+
+on({id: sourceDP, change: "any"}, async function (obj) {
+    sendTo(historyInstance, 'getHistory', {
+        id: sourceDP,
+        options: {
+            start:     Date.now() - (60 * 60 * 1000 * rangeHours),
+            end:       Date.now(),
+            count:     rangeHours,
+            limit:     rangeHours,
+            aggregate: 'average'
+        }
+    }, function (result) {
+        var cardChartString = "";
+        var stepXAchsis = rangeHours / maxXAchsisTicks;
+
+        for (var i = 0; i < rangeHours; i++){
+            var deltaHour = rangeHours - i;
+            var targetDate = new Date(Date.now() - (deltaHour * 60 * 60 * 1000));
+
+            //Check history items for requested hours
+            for (var j = 0, targetValue = 0; j < result.result.length; j++) {
+                var valueDate = new Date(result.result[j].ts);
+                var value = Math.round(result.result[j].val / factor * 10);
+
+                if (valueDate > targetDate){                        
+                    if ((targetDate.getHours() % stepXAchsis) == 0){
+                        cardChartString += targetValue + '^' + targetDate.getHours() + ':00' + '~';
+                    } else {
+                        cardChartString += targetValue + '~';
+                    }
+                    break;
+                } else {
+                    targetValue = value;
+                }
+            }
+        }
+        
+        cardChartString = cardChartString.substring(0,cardChartString.length-1);
+        if (existsState(targetDP) == false ) { 
+            createState(targetDP, cardChartString, true, { type: 'string' });
+        } else {
+            setState(targetDP, cardChartString, true);
+        }
+    });    
+});

ioBroker/Blockly/CardLChart_History.js

@@ -0,0 +1,78 @@
+const sourceDP = 'alias.0.Wohnzimmer.Heizung.ACTUAL';
+const targetDP = '0_userdata.0.Test.chartTest';
+const numberOfHoursAgo = 24;   // Period of time in hours which shall be visualized
+const xAxisTicksEveryM = 60;   // Time after x axis gets a tick  in minutes
+const xAxisLabelEveryM = 240;  // Time after x axis is labeled  in minutes
+const historyInstance = 'history.0';
+
+const Debug = false;
+const maxX = 1420;
+const limitMeasurements = 35;
+
+createState(targetDP, "", {
+        name: 'SensorGrid',
+        desc: 'Sensor Values [~<time>:<value>]*',
+        type: 'string',
+        role: 'value',
+});
+
+on({id: sourceDP, change: "any"}, async function (obj) {
+    sendTo(historyInstance, 'getHistory', {
+        id: sourceDP,
+        options: {
+            start:     Date.now() - (numberOfHoursAgo * 60 * 60 * 1000 ), //Time in ms: hours * 60m * 60s * 1000ms
+            end:       Date.now(),
+            count:     limitMeasurements,
+            limit:     limitMeasurements,
+            aggregate: 'average'
+        }
+    }, function (result) {
+        var ticksAndLabels = ""
+        var coordinates = "";
+        var cardLChartString = "";
+
+        let ticksAndLabelsList = []
+        var date = new Date();
+        date.setMinutes(0, 0, 0);
+        var ts = Math.round(date.getTime() / 1000);
+        var tsYesterday = ts - (numberOfHoursAgo * 3600);
+        
+        for (var x = tsYesterday, i = 0; x < ts; x += (xAxisTicksEveryM * 60), i += xAxisTicksEveryM)
+        {
+            if (i % xAxisLabelEveryM) 
+            {
+                ticksAndLabelsList.push(i);
+            } else 
+            {
+                var currentDate = new Date(x * 1000);
+                // Hours part from the timestamp
+                var hours = "0" + currentDate.getHours();
+                // Minutes part from the timestamp
+                var minutes = "0" + currentDate.getMinutes();
+                // Seconds part from the timestamp
+                var seconds = "0" + currentDate.getSeconds();
+                var formattedTime = hours.slice(-2) + ':' + minutes.slice(-2);
+                ticksAndLabelsList.push(String(i) + "^" + formattedTime);
+            }
+        }
+        ticksAndLabels = ticksAndLabelsList.join("+");        
+
+        let list = [];
+        let offSetTime = Math.round(result.result[0].ts / 1000);
+        let counter = Math.round((result.result[result.result.length -1 ].ts / 1000 - offSetTime) / maxX);        
+        for (var i = 0; i <  result.result.length; i++) 
+        {           
+            var time = Math.round(((result.result[i].ts / 1000) - offSetTime) / counter);
+            var value = Math.round(result.result[i].val * 10);
+            if ((value != null) && (value != 0)){
+                list.push(time + ":" + value)
+            }
+        }
+
+        coordinates = list.join("~");
+        cardLChartString = ticksAndLabels + '~' + coordinates
+        setState(targetDP, cardLChartString, true);
+        
+        if (Debug) console.log(cardLChartString);
+    });    
+});