Merge 127671047f into bd24d4bcd1

.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 VERSION
+### PANEL / FIRMWARE VERION
 _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 VERSION
+### PANEL / FIRMWARE VERION
 _Please add the Panel/Firmware Version you are using (EU, US-L or US-P)_

.github/workflows/builder.yaml

@@ -21,7 +21,7 @@ jobs:
       changed: ${{ steps.changed_addons.outputs.changed }}
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Get changed files
         id: changed_files
@@ -68,7 +68,7 @@ jobs:
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Get information
         id: info
@@ -92,7 +92,7 @@ jobs:
 
       - name: Login to GitHub Container Registry
         if: env.BUILD_ARGS != '--test'
-        uses: docker/login-action@v3.7.0
+        uses: docker/login-action@v3.0.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -100,7 +100,7 @@ jobs:
 
       - name: Build ${{ matrix.addon }} add-on
         if: steps.check.outputs.build_arch == 'true'
-        uses: home-assistant/builder@2025.09.0
+        uses: home-assistant/builder@2024.01.0
         with:
           args: |
             ${{ env.BUILD_ARGS }} \

.github/workflows/codeql-analysis.yml

@@ -43,11 +43,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      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@v4
+      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@v4
+      uses: github/codeql-action/analyze@v3

.github/workflows/docs-dev.yml

@@ -15,10 +15,10 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - run: pip install mkdocs-material mkdocs-video markdown-include mike

.github/workflows/docs-release.yml

@@ -15,10 +15,10 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - run: pip install mkdocs-material mkdocs-video markdown-include mike

.github/workflows/hacs-validation.yaml

@@ -11,7 +11,7 @@ jobs:
     name: HACS Action
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v6"
+      - 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@v6
+    - 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@v7
+    - uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: Update iobroker localization file
         #file_pattern: "**.txt"

.github/workflows/lint.yaml

@@ -18,7 +18,7 @@ jobs:
       addons: ${{ steps.addons.outputs.addons_list }}
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: 🔍 Find add-on directories
         id: addons
@@ -33,9 +33,9 @@ jobs:
         path: ${{ fromJson(needs.find.outputs.addons) }}
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: 🚀 Run Home Assistant Add-on Lint
-        uses: frenck/action-addon-linter@v2.21
+        uses: frenck/action-addon-linter@v2.15
         with:
           path: "./${{ matrix.path }}"

.github/workflows/nextion2text.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v6
+    - 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@v7
+    - uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: ${{ steps.last-commit-message.outputs.msg }} (add nextion2text)
         #file_pattern: "**.txt"

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

@@ -102,28 +102,6 @@
 │              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 @@
@@ -336,7 +314,7 @@
 │          Value: 0
 │      
 │  Variable (int32) xc1
-│ @@ -370,165 +336,50 @@
+│ @@ -370,145 +336,50 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -347,10 +325,6 @@
 │ -    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
@@ -375,10 +349,6 @@
 │ -    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
@@ -403,10 +373,6 @@
 │ -    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
@@ -431,10 +397,6 @@
 │ -    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
@@ -459,10 +421,6 @@
 │ -    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
@@ -502,7 +460,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : PM
-│ @@ -710,15 +561,14 @@
+│ @@ -690,15 +561,14 @@
 │                                          if(tTmp.txt!="")
 │                                          {
 │                                              covx tTmp.txt,defaultFontColor,0,0
@@ -518,7 +476,7 @@
 │                                          if(tAMPM.txt=="")
 │                                          {
 │                                              vis tAMPM,0
-│ @@ -839,44 +689,34 @@
+│ @@ -819,44 +689,34 @@
 │                                          //e6Val
 │                                          spstr strCommand.txt,e6Val.txt,"~",60
 │                                          //f1Icon
@@ -563,3 +521,22 @@
 │                                          spstr strCommand.txt,tNotifyText.txt,"~",2
 │                                          if(tNotifyHead.txt!=""||tNotifyText.txt!="")
 │                                          {
+│ @@ -952,14 +812,18 @@
+│                                          {
+│                                              page cardPower
+│                                          }
+│                                          if(tId.txt=="cardChart")
+│                                          {
+│                                              page cardChart
+│                                          }
+│ +                                        if(tId.txt=="cardLChart")
+│ +                                        {
+│ +                                            page cardLChart
+│ +                                        }
+│                                      }
+│                                      if(tInstruction.txt=="timeout")
+│                                      {
+│                                          //set timeout to global var
+│                                          spstr strCommand.txt,tTmp.txt,"~",1
+│                                          covx tTmp.txt,sleepTimeout,0,0
+│                                      }

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

@@ -1985,26 +1985,6 @@
 │  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 @@
@@ -2279,7 +2259,7 @@
 │          Value: 0
 │      
 │  Variable (int32) xc1
-│ @@ -370,165 +324,50 @@
+│ @@ -370,145 +324,50 @@
 │          Scope              : local
 │          Dragging           : 0
 │          Send Component ID  : disabled
@@ -2290,10 +2270,6 @@
 │ -    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
@@ -2318,10 +2294,6 @@
 │ -    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
@@ -2346,10 +2318,6 @@
 │ -    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
@@ -2374,10 +2342,6 @@
 │ -    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
@@ -2402,10 +2366,6 @@
 │ -    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
@@ -2445,7 +2405,7 @@
 │          Send Component ID  : disabled
 │          Associated Keyboard: none
 │          Text               : PM
-│ @@ -710,15 +549,14 @@
+│ @@ -690,15 +549,14 @@
 │                                          if(tTmp.txt!="")
 │                                          {
 │                                              covx tTmp.txt,defaultFontColor,0,0
@@ -2461,7 +2421,7 @@
 │                                          if(tAMPM.txt=="")
 │                                          {
 │                                              vis tAMPM,0
-│ @@ -839,44 +677,34 @@
+│ @@ -819,44 +677,34 @@
 │                                          //e6Val
 │                                          spstr strCommand.txt,e6Val.txt,"~",60
 │                                          //f1Icon
@@ -2506,3 +2466,22 @@
 │                                          spstr strCommand.txt,tNotifyText.txt,"~",2
 │                                          if(tNotifyHead.txt!=""||tNotifyText.txt!="")
 │                                          {
+│ @@ -952,14 +800,18 @@
+│                                          {
+│                                              page cardPower
+│                                          }
+│                                          if(tId.txt=="cardChart")
+│                                          {
+│                                              page cardChart
+│                                          }
+│ +                                        if(tId.txt=="cardLChart")
+│ +                                        {
+│ +                                            page cardLChart
+│ +                                        }
+│                                      }
+│                                      if(tInstruction.txt=="timeout")
+│                                      {
+│                                          //set timeout to global var
+│                                          spstr strCommand.txt,tTmp.txt,"~",1
+│                                          covx tTmp.txt,sleepTimeout,0,0
+│                                      }

HMI/US/portrait/diff-filtered.txt

@@ -1,4 +1,4 @@
-+++ /dev/fd/62	2025-12-26 19:43:25.803166597 +0000
++++ /dev/fd/62	2024-01-20 19:56:08.135834636 +0000
 +I/n2t-out/Program.s.txt
 ++ HMI/US/portrait/n2t-out/Program.s.txt
 +1 +12,11 @@
@@ -686,13 +686,6 @@
 +                                     covx tTmp.txt,sys0,0,0
 +                                     hSlider6.maxval=sys0
 +                                 }
-+                             }
-+                             if(tInstruction.txt=="pageType")
-+                             {
-+                                 sleepValue=0
-+                                 //command format pageType,specialPageName
-+                                 //write name of speical page to tId
-+                                 spstr strCommand.txt,tId.txt,"~",1
 +I/n2t-out/cardGrid.txt
 ++ HMI/US/portrait/n2t-out/cardGrid.txt
 + +7,14 @@
@@ -946,6 +939,13 @@
 +                                     spstr strCommand.txt,tEntity9.txt,"~",66
 +                                     vis tEntity9,1
 +                                 }
++                             }
++                             if(tInstruction.txt=="pageType")
++                             {
++                                 sleepValue=0
++                                 //command format pageType,specialPageName
++                                 //write name of speical page to tId
++                                 spstr strCommand.txt,tId.txt,"~",1
 +I/n2t-out/cardLChart.txt
 ++ HMI/US/portrait/n2t-out/cardLChart.txt
 + +7,14 @@
@@ -1527,26 +1527,6 @@
 +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 @@
@@ -1821,7 +1801,7 @@
 + Value: 0
 +
 +e (int32) xc1
-+165 +324,50 @@
++145 +324,50 @@
 + Scope              : local
 + Dragging           : 0
 + Send Component ID  : disabled
@@ -1832,10 +1812,6 @@
 +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
@@ -1860,10 +1836,6 @@
 +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
@@ -1888,10 +1860,6 @@
 +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
@@ -1916,10 +1884,6 @@
 +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
@@ -1944,10 +1908,6 @@
 +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
@@ -2048,3 +2008,22 @@
 +                                 spstr strCommand.txt,tNotifyText.txt,"~",2
 +                                 if(tNotifyHead.txt!=""||tNotifyText.txt!="")
 +                                 {
++14 +800,18 @@
++                                 {
++                                     page cardPower
++                                 }
++                                 if(tId.txt=="cardChart")
++                                 {
++                                     page cardChart
++                                 }
++                                 if(tId.txt=="cardLChart")
++                                 {
++                                     page cardLChart
++                                 }
++                             }
++                             if(tInstruction.txt=="timeout")
++                             {
++                                 //set timeout to global var
++                                 spstr strCommand.txt,tTmp.txt,"~",1
++                                 covx tTmp.txt,sleepTimeout,0,0
++                             }

HMI/n2t-out-visual/nspanel_Stats.txt

@@ -30,10 +30,6 @@ popupLightNew
 	23   Component(s)
 	412  Line(s) of event code
 	209  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
@@ -58,6 +54,10 @@ cardLChart
 	33   Component(s)
 	412  Line(s) of event code
 	267  Unique line(s) of event code
+popupLight
+	28   Component(s)
+	412  Line(s) of event code
+	227  Unique line(s) of event code
 cardPower
 	54   Component(s)
 	541  Line(s) of event code
@@ -66,6 +66,10 @@ cardThermo
 	57   Component(s)
 	550  Line(s) of event code
 	320  Unique line(s) of event code
+screensaver2
+	64   Component(s)
+	424  Line(s) of event code
+	264  Unique line(s) of event code
 popupInSel
 	34   Component(s)
 	621  Line(s) of event code
@@ -86,10 +90,6 @@ popupThermo
 	44   Component(s)
 	523  Line(s) of event code
 	276  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)
 	1205 Line(s) of event code
@@ -98,5 +98,5 @@ cardEntities
 Total
 	23   Page(s)
 	881  Component(s)
-	10798 Line(s) of event code
+	10769 Line(s) of event code
-	2472 Unique line(s) of event code
+	2466 Unique line(s) of event code

HMI/n2t-out-visual/popupLight.txt

@@ -806,11 +806,6 @@ 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/screensaver2.txt

@@ -903,10 +903,6 @@ Text f1Icon
     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
@@ -951,10 +947,6 @@ Text f2Icon
     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
@@ -999,10 +991,6 @@ Text f3Icon
     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
@@ -1047,10 +1035,6 @@ Text f4Icon
     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
@@ -1095,10 +1079,6 @@ Text f5Icon
     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
@@ -1814,10 +1794,6 @@ Timer tmSerial
                                         {
                                             page cardChart
                                         }
-                                        if(tId.txt=="cardLChart")
-                                        {
-                                            page cardLChart
-                                        }
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {

HMI/n2t-out/popupLight.txt

@@ -457,11 +457,6 @@ 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/screensaver2.txt

@@ -377,10 +377,6 @@ Text f1Icon
     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
@@ -405,10 +401,6 @@ Text f2Icon
     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
@@ -433,10 +425,6 @@ Text f3Icon
     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
@@ -461,10 +449,6 @@ Text f4Icon
     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
@@ -489,10 +473,6 @@ Text f5Icon
     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
@@ -976,10 +956,6 @@ Timer tmSerial
                                         {
                                             page cardChart
                                         }
-                                        if(tId.txt=="cardLChart")
-                                        {
-                                            page cardLChart
-                                        }
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {

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/2026.svg)
+![Project Maintenance](https://img.shields.io/maintenance/yes/2023.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,5 +65,3 @@ 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,3 +1,2 @@
 ha_api = None
 mqtt_api = None
-ad_api = None

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

@@ -132,7 +132,6 @@ 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,7 +3,6 @@ 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):
 
@@ -151,7 +150,7 @@ class LuiController(object):
         items = self._config.get_all_entity_names()
         apis.ha_api.log(f"gtest123: {items}")
         prefixes = ("navigate.", "delete", "iText")
-        items = set([x for x in items if not (x is None or x.startswith(prefixes))])
+        items = [x for x in items if not (x is None or x.startswith(prefixes))]
         apis.ha_api.log(f"Registering callbacks for the following items: {items}")
         for item in items:
             if apis.ha_api.entity_exists(item):
@@ -206,15 +205,11 @@ class LuiController(object):
             self._pages_gen.generate_timer_detail_page(entity_id, True)
 
     def button_press(self, entity_id, button_type, value):
-        #apis.ha_api.log(f"Button Press Event; entity_id: {entity_id}; button_type: {button_type}; value: {value} ")
+        apis.ha_api.log(f"Button Press Event; entity_id: {entity_id}; button_type: {button_type}; value: {value} ")
-        entity_id_new = entity_id
         if entity_id.startswith('uuid'):
             entity_config = self._config._config_entites_table.get(entity_id)
             if entity_config is not None:
-                entity_id_new = entity_config.entityId
+                entity_id = entity_config.entityId
-        apis.ha_api.log(f"Button Press Event; entity_id: {entity_id}; entity_id_resolved: {entity_id_new}; button_type: {button_type}; value: {value} ")
-        entity_id = entity_id_new
-        
         # internal buttons
         if entity_id == "screensaver" and button_type == "bExit":
             # get default card if there is one
@@ -338,11 +333,6 @@ 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":
@@ -357,8 +347,8 @@ class LuiController(object):
             else:
                 apis.ha_api.get_entity(entity_id).call_service("turn_off")
         if button_type == "media-shuffle":
-            shuffle = not apis.ha_api.get_entity(entity_id).attributes['shuffle']
+            suffle = not apis.ha_api.get_entity(entity_id).attributes.shuffle
-            apis.ha_api.get_entity(entity_id).call_service("shuffle_set", shuffle=shuffle)
+            apis.ha_api.get_entity(entity_id).call_service("shuffle_set", shuffle=suffle)
         if button_type == "volumeSlider":
             pos = int(value)
             # HA wants this value between 0 and 1 as float
@@ -375,7 +365,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)
@@ -402,9 +392,9 @@ class LuiController(object):
         if button_type == "opnSensorNotify":
             msg = ""
             entity = apis.ha_api.get_entity(entity_id)
-            if open_sensors := entity.attributes.get("open_sensors") is not None:
+            if "open_sensors" in entity.attributes and entity.attributes.open_sensors is not None:
-                for e in open_sensors:
+                for e in entity.attributes.open_sensors:
-                    msg += f"- {apis.ha_api.get_entity(e).attributes['friendly_name']}\r\n"
+                    msg += f"- {apis.ha_api.get_entity(e).attributes.friendly_name}\r\n"
             self._pages_gen.send_message_page("opnSensorNotifyRes", "", msg, "", "")
 
         # for cardUnlock
@@ -421,22 +411,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 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":
@@ -448,12 +438,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
@@ -468,9 +458,3 @@ 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':       'fan-auto',
+    'auto':       'calendar-sync',
-    'heat_cool':  'sun-snowflake-variant',
+    'heat_cool':  'calendar-sync',
     'heat':  'fire',
     'off':  'power',
     'cool':  'snowflake',
@@ -213,9 +213,6 @@ 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)
@@ -266,8 +263,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 := entity.attributes.get("media_content_type"):
+        if "media_content_type" in entity.attributes:
-            if media_content_type in media_content_type_mapping:
+            if entity.attributes.media_content_type in media_content_type_mapping:
-                result_icon = media_content_type_mapping[media_content_type]
+                result_icon = media_content_type_mapping[entity.attributes.media_content_type]
 
     return get_icon_char(result_icon)

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

@@ -77,13 +77,12 @@ class LuiMqttListener(object):
                 self._controller.detail_open(msg[2], msg[3])
 
 class LuiMqttSender(object):
-    def __init__(self, api, use_api, topic_send, api_panel_name, quiet):
+    def __init__(self, api, use_api, topic_send, api_panel_name):
         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:
@@ -91,9 +90,7 @@ class LuiMqttSender(object):
             return
         self._prev_msg = msg
 
-        if self._quiet is False:
+        apis.ha_api.log(f"Sending Message: {msg}")
-            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:

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

@@ -97,12 +97,13 @@ class LuiPagesGen(object):
                 if state == "sunny":
                     icon_color = 65504 #bright-yellow
 
-            if color := attr.get("rgb_color"):
+            if "rgb_color" in attr and attr.rgb_color:
-                if brightness := attr.get("brightness"):
+                color = attr.rgb_color
-                    color = rgb_brightness(color, brightness)
+                if "brightness" in attr and attr.brightness:
+                    color = rgb_brightness(color, attr.brightness)
                 icon_color = rgb_dec565(color)
-            elif brightness := attr.get("brightness"):
+            elif "brightness" in attr and attr.brightness:
-                color = rgb_brightness([253, 216, 53], brightness)
+                color = rgb_brightness([253, 216, 53], attr.brightness)
                 icon_color = rgb_dec565(color)
             return icon_color
 
@@ -191,9 +192,6 @@ 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
@@ -223,7 +221,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 in ["cardGrid", "cardGrid1", "cardGrid2"] and item.iconOverride is None:
+                    if item.status.startswith("sensor") and (cardType == "cardGrid" or cardType == "cardGrid2") and item.iconOverride is None:
                         icon_res = status_entity.state[:4]
                         if icon_res[-1] == ".":
                             icon_res = icon_res[:-1]
@@ -247,7 +245,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 in ["cardGrid", "cardGrid1", "cardGrid2"] and item.iconOverride is None:
+                if item.status.startswith("sensor") and (cardType == "cardGrid" or cardType == "cardGrid2") and item.iconOverride is None:
                     icon_id = status_entity.state[:4]
                     if icon_id[-1] == ".":
                         icon_id = icon_id[:-1]
@@ -275,7 +273,7 @@ class LuiPagesGen(object):
             icon_up_status = "disable"
             icon_stop_status = "disable"
             icon_down_status = "disable"
-            bits = entity.attributes.get('supported_features')
+            bits = entity.attributes.supported_features
             pos = entity.attributes.get("current_position")
             if pos is None:
                 pos_status = entity.state
@@ -309,11 +307,6 @@ 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]
@@ -325,7 +318,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 in ["cardGrid", "cardGrid1", "cardGrid2"] and entityType == "sensor" and icon is None:
+            if (cardType == "cardGrid" or cardType == "cardGrid2") and entityType == "sensor" and icon is None:
                 icon_id = entity.state[:4]
                 if icon_id[-1] == ".":
                     icon_id = icon_id[:-1]
@@ -387,51 +380,20 @@ class LuiPagesGen(object):
         elif entityType == "weather":
             entityTypePanel = "text"
             unit = get_attr_safe(entity, "temperature_unit", "")
-            rt = None
+            if type(item.stype) == int and len(entity.attributes.forecast) >= item.stype:
-            index = item.stype
+                fdate = dp.parse(entity.attributes.forecast[item.stype]['datetime'])
-            if type(item.stype) == str and ":" in item.stype and len(item.stype.split(":")) == 2:
+                global babel_spec
-                spintstr = item.stype.split(":")
+                if babel_spec is not None:
-                rt = spintstr[0]
+                    dateformat = "E" if item.nameOverride is None else item.nameOverride
-                index = int(spintstr[1])
+                    name = babel.dates.format_datetime(fdate.astimezone(), dateformat, locale=self._locale)
-            if type(index) == 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) >= index:
-                    day_forecast = forecast[index]
-                    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:
-                    value = f'{get_attr_safe(entity, "temperature", "")}{unit}'
+                    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)
             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
@@ -490,7 +452,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   = ""
@@ -572,7 +534,7 @@ class LuiPagesGen(object):
             command = f"entityUpd~Not found~{navigation}"
         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
 
             # get data from homeassistant
             data_raw = apis.ha_api.get_history(entity_id = item, days = 7)
@@ -619,12 +581,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":
@@ -674,7 +636,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:
@@ -713,7 +675,7 @@ class LuiPagesGen(object):
 
             #add button to show sensor state
             add_btn = ""
-            if entity.attributes.get("open_sensors") is not None:
+            if "open_sensors" in entity.attributes and entity.attributes.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")
@@ -817,8 +779,6 @@ 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
@@ -828,7 +788,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", "cardGrid1","cardGrid2"]:
+        if card.cardType in ["cardEntities", "cardGrid", "cardGrid2"]:
             self.generate_entities_page(navigation, card.title, card.entities, card.cardType, temp_unit)
             return
         if card.cardType == "cardThermo":
@@ -880,26 +840,25 @@ class LuiPagesGen(object):
         color_temp = "disable"
         color = "disable"
         effect_supported = "disable"
-        supported_color_modes = entity.attributes['supported_color_modes']
         
-        if "onoff" not in supported_color_modes:
+        if "onoff" not in entity.attributes.supported_color_modes:
             brightness = 0
         if entity.state == "on":
-            if brightness := entity.attributes.get("brightness"):
+            if "brightness" in entity.attributes and entity.attributes.brightness:
                 # scale 0-255 brightness from ha to 0-100
-                brightness = int(scale(brightness, (0,255), (0,100)))
+                brightness = int(scale(entity.attributes.brightness,(0,255),(0,100)))
             else:
                 brightness = "disable"
-            if "color_temp" in supported_color_modes:
+            if "color_temp" in entity.attributes.supported_color_modes and entity.attributes.supported_color_modes:
-                if color_temp := entity.attributes.get("color_temp"):
+                if "color_temp" in entity.attributes and entity.attributes.color_temp:
                     # scale ha color temp range to 0-100
-                    color_temp = int(scale(color_temp, (entity.attributes['min_mireds'], entity.attributes['max_mireds']),(0, 100)))
+                    color_temp = int(scale(entity.attributes.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 supported_color_modes):
+            if any(item in list_color_modes for item in entity.attributes.supported_color_modes):
                 color = "enable"
             else:
                 color = "disable"
@@ -939,7 +898,7 @@ class LuiPagesGen(object):
         iconTiltRightStatus = "disable"
         tilt_pos = "disable"
 
-        bits = entity.attributes['supported_features']
+        bits = entity.attributes.supported_features
 
         # position supported
         if bits & 0b00001111:
@@ -1095,4 +1054,3 @@ class LuiPagesGen(object):
         self._send_mqtt_msg(f"pageType~popupNotify")
         self._send_mqtt_msg(f"entityUpdateDetail~{ident}~{heading}~65535~{b1}~65535~{b2}~65535~{msg}~65535~0")
     
-

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

@@ -1,4 +1,4 @@
-import adbase as ad
+import hassapi as hass
 
 from luibackend.config import LuiBackendConfig
 from luibackend.controller import LuiController
@@ -6,19 +6,15 @@ from luibackend.mqtt import LuiMqttListener, LuiMqttSender
 from luibackend.updater import Updater
 
 import apis
-import json
-from typing import Literal
 
-class NsPanelLovelaceUIManager(ad.ADBase):
+class NsPanelLovelaceUIManager(hass.Hass):
 
     def initialize(self):
-        self.adapi = self.get_ad_api()
+        self.log('Starting')
-        self.adapi.log('Starting')
+        apis.ha_api   = self
-        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(apis.ha_api, self.args["config"])
+        cfg = self._cfg = LuiBackendConfig(self, self.args["config"])
 
         use_api = cfg.get("use_api") == True
 
@@ -26,15 +22,14 @@ class NsPanelLovelaceUIManager(ad.ADBase):
         topic_recv = cfg.get("panelRecvTopic")
         api_panel_name = cfg.get("panelName")
         api_device_id = cfg.get("panelDeviceId")
-        quiet = cfg.get("quiet")
 
-        mqttsender = self._mqttsender = LuiMqttSender(apis.ha_api, use_api, topic_send, api_panel_name, quiet)
+        mqttsend = LuiMqttSender(self, use_api, topic_send, api_panel_name)
 
-        self._controller = LuiController(cfg, mqttsender.send_mqtt_msg)
+        controller = LuiController(cfg, mqttsend.send_mqtt_msg)
         
         desired_tasmota_driver_version   = 8
         desired_display_firmware_version = 53
-        version     = "v4.7.3"
+        version     = "v4.3.3"
         
         model       = cfg.get("model")
         if model == "us-l":
@@ -46,35 +41,11 @@ class NsPanelLovelaceUIManager(ad.ADBase):
         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.adapi.log, mqttsender, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url)
+        updater = Updater(self.log, mqttsend, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url)
         
         # Request Tasmota Driver Version
         updater.request_berry_driver_version()
 
-        LuiMqttListener(use_api, topic_recv, api_panel_name, api_device_id, self._controller, updater)
+        LuiMqttListener(use_api, topic_recv, api_panel_name, api_device_id, controller, updater)
 
-        self.adapi.log(f'Started ({version})')
+        self.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-screensaver.md

@@ -44,6 +44,8 @@ Using a 6th entity will automatically activate the alternative layout.
           type: 0
         - entity: weather.demo_weather_north
           type: 1
+        - entity: weather.demo_weather_north
+          type: 2
         - entity: sensor.energy_usage
         - entity: delete
         - entity: sensor.indoor_temp

docs/prepare_ha.md

@@ -93,4 +93,3 @@ 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
-

docs/prepare_nspanel.md

@@ -1,71 +1,65 @@
-# Flash Tasmota to Your NSPanel
+# Flash Tasmota to your NSPanel
 
-You need to connect to your NSPanel via serial and flash Tasmota using [tasmota32-nspanel.bin](http://ota.tasmota.com/tasmota32/release/tasmota32-nspanel.bin).  
+You need to connect to your nspanel via serial and flash tasmota [tasmota32-nspanel.bin](http://ota.tasmota.com/tasmota32/release/tasmota32-nspanel.bin) to your NSPanel. 
-You can use the [Tasmota Web Installer](https://tasmota.github.io/install/) to do so.
+You can use the Tasmota Web Installer to do so. [Tasmota Web Installer](https://tasmota.github.io/install/)
 
-Check out Blakadder's Template Repo for more information on flashing. **Do not** use the autoexec.be from that page.  
+Checkout Blakadders Template Repo for more information on flashing, do not use the autoexec.be from this page.
 [NSPanel Page of the Tasmota Template Repository](https://templates.blakadder.com/sonoff_NSPanel.html)
 
-If you prefer ESPHome over Tasmota, you can use this third-party ESPHome component, which replaces Tasmota and the Berry driver used in this project.  
+If you prefer EspHome over Tasmota, you can use this thrid party esphome component, which is replacing tasmota and the berry driver of this project.
-[ESPHome Component](https://github.com/sairon/esphome-nspanel-lovelace-ui)
+[ESPHome component](https://github.com/sairon/esphome-nspanel-lovelace-ui)
 
 
----
-
 ## Configure Tasmota Template for NSPanel
 
-Configure the NSPanel template for Tasmota. (Go to Configuration > Configure Other, paste the template there, and make sure to tick the Activate checkbox.)
+Configure the NSPanel template for Tasmota. (Go to Configuration and Configure Other and paste the template there, make sure to tick the activate checkbox)
 
 ![tasmota-template-config](img/tasmota-template-config.png)
 
-You can use the following template or copy the one from the [Tasmota Template Repo Site](https://templates.blakadder.com/sonoff_NSPanel.html):
+You can use the following template or copy the one on the [Tasmota Template Repo Site](https://templates.blakadder.com/sonoff_NSPanel.html).
 
-{"NAME":"NSPanel","GPIO":[0,0,0,0,3872,0,0,0,0,0,32,0,0,0,0,225,0,480,224,1,0,0,0,33,0,0,0,0,0,0,0,0,0,0,4736,0],"FLAG":0,"BASE":1,"CMND":"ADCParam 2,11200,10000,3950 | Sleep 0 | BuzzerPWM 1"}
+`{"NAME":"NSPanel","GPIO":[0,0,0,0,3872,0,0,0,0,0,32,0,0,0,0,225,0,480,224,1,0,0,0,33,0,0,0,0,0,0,0,0,0,0,4736,0],"FLAG":0,"BASE":1,"CMND":"ADCParam 2,11200,10000,3950 | Sleep 0 | BuzzerPWM 1"}`
 
-After a reboot of Tasmota, your screen will light up with the stock display firmware.
+After a reboot of tasmota your screen will light up with the stock display firmware.
-
----
 
 ## Upload Berry Driver to Tasmota
 
-Go to Consoles > Console in Tasmota and execute the following command:
+Go to `Consoles` > `Console` in Tasmota and execute the following command:
 
-Backlog UrlFetch https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; SetOption151 0; Restart 1
+```
+Backlog UrlFetch https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; SetOption151 0;Restart 1
+```
 
-This downloads the autoexec.be file from the repository and restarts Tasmota.
+This will download the autoexec.be file from the repository and restart tasmota.
 
-Note: This command also disables Matter to free up memory, as it's unlikely to be used by most Home Assistant users. (Matter can cause memory issues during flashing of the Nextion screen, but you can re-enable it later if needed.)
+Note: The command is also disabling matter to free up memory, as it's most likely not used by any homeassistant users anyway.
-
+(Matter could cause memory issues during flashing of the Nextion Screen, but you can still enable it if you need to.)
----
 
 ## Flash Firmware to Nextion Screen
 
-Due to the limitations of Berry, it's not possible to download the TFT file directly from GitHub. A small server is available to download the file via HTTP.
+Due the limitations of Berry, it's not possible to download the tft file directly from github, so I'm also renting a small server where you can download the file via HTTP.
 
-Use one of the following commands in the Tasmota console (not the Berry console) to flash the latest release from this repository:
+Use the one following commands in the tasmota console (not berry console) to flash the latest release from this repository:
 
-EU Version:  
+EU Version: `FlashNextion http://nspanel.pky.eu/lui-release.tft`
-FlashNextion http://nspanel.pky.eu/lui-release.tft
 
-US Version Portrait:  
+US Version Portrait: `FlashNextion http://nspanel.pky.eu/lui-us-p-release.tft`
-FlashNextion http://nspanel.pky.eu/lui-us-p-release.tft
 
-US Version Landscape:  
+US Version Landscape: `FlashNextion http://nspanel.pky.eu/lui-us-l-release.tft`
-FlashNextion http://nspanel.pky.eu/lui-us-l-release.tft
 
-After sending the command, the screen should show a progress bar. The flashing process takes around 5 minutes.
+After sending the command, the screen should show a progress bar. The flashing progress takes around 5 minutes.
 
-Note for US users: You'll need to add the model config option to your apps.yaml later. More details can be found on the config overview page.
+Note: For the US Version Users - keep in mind that you need to add the model config option to your apps.yaml later, more details on config overview page
 
----
 
 <details>
-<summary>Alternatively, you can use your own web server or the one built into Home Assistant:</summary>
+<summary>Alternatively you can use your own webserver or the one build into HomeAssistant:</summary>
 <br>
-Upload the nspanel.tft from the latest release to a web server (for example, the www folder of Home Assistant) and execute the following command in the Tasmota Console.  
+Upload the nspanel.tft from the lastest release to a Webserver (for example www folder of Home Assistant) and execute the following command in Tasmota Console. (Development Version: [tft file from HMI folder](HMI/nspanel.tft))
-(Development version: [TFT file from HMI folder](HMI/nspanel.tft))
 
-**The web server must be HTTP. HTTPS is not supported due to Berry language limitations in Tasmota.**
+**Webserver must be HTTP, HTTPS is not supported, due to limitations of berry lang on tasmota**
 
-FlashNextion http://ip-address-of-your-homeassistant:8123/local/nspanel.tft
+`FlashNextion http://ip-address-of-your-homeassistant:8123/local/nspanel.tft`
 </details>
+
+

ioBroker/Blockly/Abfallkalender.js

@@ -0,0 +1,74 @@
+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

@@ -1,224 +0,0 @@
-/*
- * @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/CardChart_History.js

@@ -1,51 +0,0 @@
-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

@@ -1,78 +0,0 @@
-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);
-    });    
-});

ioBroker/Blockly/CardLChart_Influx2.ts

@@ -1,130 +0,0 @@
-/**
- * Dieses Script fragt eine influxDb ab, um Daten für die cardLcart (Liniendiagramm) zuberechnen und im richtigen Format bereitzustellen.
- * Es erstellt automatisch einen Datenpunkt.
- * Die Abfrage muss ggf. angepasst werden. Aktuell ermittelt sie Werte der letzten 24h, zu Stundenwerten zusammengefasst.
- */
-
-const Debug = false; // true für erweiterte Ausgaben im Log
- 
-const NSPanel_Path = '0_userdata.0.NSPanel.';
-const Path = NSPanel_Path + 'Influx2NSPanel.cardLChart.';
-const InfluxInstance = 'influxdb.0';
-const influxDbBucket = 'storage_short';
-const numberOfHoursAgo = 24;
-const xAxisTicksEveryM = 60;
-const xAxisLabelEveryM = 240;
-//
- 
-const sensors : Record<string, Record <string, string>> = {};
-/**
- * Hier werden die Sensoren festgelegt nach flogendem Schema
- * 
- * sensors[‘Datenpunkt(kompletter Pfad) des Messwertes'] = {'taget': 'Name des Datenpunkt für die Chartwerte', 'measurement': 'genutzter Alias in der Influxdb für den Messwert'};
- * 
- * Wenn der Wert in der Datenbank keinen Alias hat bleibt der Wert 'measurement':  weg.
- * Jeder Messwert bekommt einen eigenen sensors[...] = {'target':....}
- */
-
-
-sensors['netatmo-crawler.0.stationData.1.temperature'] = {'target':'AussenTemp', 'measurement':'wetter.temperatur'};
- 
-//  #####   ab hier keine Änderungen mehr nötig   #####
- 
-// create data source for NsPanel on script startup
-Object.keys(sensors).forEach(async id => {
-   await generateDateAsync(id);
-});
- 
-// then listen to the sensors and update the data source states accordingly
-on({ id: Object.keys(sensors), change: 'any' }, async function (obj) {
-   if (!obj.id) {
-       return;
-   }
-   await generateDateAsync(obj.id);
-});
- 
-//__________________________
-// Beschreibe diese Funktion: Daten generieren
-async function generateDateAsync(sensorId: string) {
-   let idMeasurement = sensors[sensorId].measurement;
-   if (idMeasurement =='' ||idMeasurement == undefined) {idMeasurement = sensorId};
-   const dataPointId:string = Path + sensors[sensorId].target +'.ACTUAL';
-   if (Debug) log(`(f) generateDateAsync: ${sensorId} ${dataPointId} > ${idMeasurement}`);
-   
-   const query =[
-       'from(bucket: "' + influxDbBucket + '")',
-       '|> range(start: -' + numberOfHoursAgo + 'h)',
-       '|> filter(fn: (r) => r["_measurement"] == "' + idMeasurement + '")',
-       '|> filter(fn: (r) => r["_field"] == "value")',
-       '|> drop(columns: ["from", "ack", "q"])',
-       '|> aggregateWindow(every: 1h, fn: last, createEmpty: false)',
-       '|> map(fn: (r) => ({ r with _rtime: int(v: r._time) - int(v: r._start)}))',
-       '|> yield(name: "_result")'].join('');
- 
-   if (Debug) console.log('Query: ' + query);
- 
-   const result : any = await sendToAsync(InfluxInstance, 'query', query);
-   if (result.error) {
-       console.error(result.error);
-       return;
-   }
-   if (Debug) console.log(JSON.stringify(result));
-   const numResults = result.result.length;
-   let coordinates : string = '';
-   for (let r = 0; r < numResults; r++) 
-   {
-       const list : string[] = [];
-       const numValues = result.result[r].length;
- 
-       for (let i = 0; i < numValues; i++) 
-       {
-           const time = Math.round(result.result[r][i]._rtime/1000/1000/1000/60);
-           const value = Math.round(result.result[r][i]._value * 10);
-           list.push(time + ":" + value);
-       }
- 
-       coordinates = list.join("~");
-       if (Debug) console.log(coordinates);
-   }
- 
-   const ticksAndLabelsList : string[] = []
-   const date = new Date();
-   date.setMinutes(0, 0, 0);
-   const ts = Math.round(date.getTime() / 1000); 
-   const tsYesterday = ts - (numberOfHoursAgo * 3600);
-   if (Debug) console.log('Iterate from ' + tsYesterday + ' to ' + ts + ' stepsize=' + (xAxisTicksEveryM * 60));
-   for (let x = tsYesterday, i = 0; x < ts; x += (xAxisTicksEveryM * 60), i += xAxisTicksEveryM)
-   {
-       if ((i % xAxisLabelEveryM))
-           ticksAndLabelsList.push('' + i);
-       else
-       {
-           const currentDate = new Date(x * 1000);
-           // Hours part from the timestamp
-           const hours = "0" + String(currentDate.getHours());
-           // Minutes part from the timestamp
-           const minutes = "0" + String(currentDate.getMinutes());
-           const formattedTime = hours.slice(-2) + ':' + minutes.slice(-2);
- 
-           ticksAndLabelsList.push(String(i) + "^" + formattedTime);
-       }
-   }
-   if (Debug) console.log('Ticks & Label: ' + ticksAndLabelsList);
-   if (Debug) console.log('Coordinates: ' + coordinates);
-   await setOrCreate(dataPointId, ticksAndLabelsList.join("+") + '~' + coordinates, true);
-}
- 
-//__________________________
-// Beschreibe diese Funktion: Datenpunkte anlegen bzw. schreiben
-async function setOrCreate(id : string, value : any, ack : boolean) {
-   if (!(await existsStateAsync(id))) {
-        await createStateAsync(id, value, {
-           name: id.split('.').reverse()[0],
-           desc: 'Sensor Values [~<time>:<value>]*',
-           type: 'string',
-           role: 'value',
-       });
-   } else {
-       await setStateAsync(id, value, ack);
-   }
-}

ioBroker/Blockly/CardPower.js

@@ -1,54 +0,0 @@
-/**
-* generate an JSON for display Power-Card on NSPanel
-* Source: https://github.com/joBr99/nspanel-lovelace-ui/wiki/ioBroker-Card-Definitionen-(Seiten)#cardpower-ab-ts-script-v341
-* Version: 0.1 - L4rs
-*/
-schedule("* * * * *", function () {
- 
-    // Definition der Datenpunkte für das JSON der POWER-Card und der anzuzeigenden Leistungswerte
-    var powerCardJson = "0_userdata.0.NSPanel.Energie.PowerCard",
-      pwr1 = "", // Batterie
-      pwr2 = Math.round(getState("mqtt.0.SmartHome.Energie.PV.openDTU.114180710360.0.power").val),    // Solar
-      pwr3 = "",    // Wind
-      pwr4 = "",   // Verbraucher
-      pwr5 = Math.round(getState("hm-rpc.0.MEQ0706303.1.POWER").val),    // Stromnetz
-      pwr6 = 0, // Auto
-      pwrHome = Math.round(pwr5 - pwr2);    // Berechnung des Energiefluss anstelle eines Datenpunktes
-    
-    // Definition der Keys im JSON
-    var keys = ["id", "value", "unit", "icon", "iconColor", "speed"];
-    
-    // Definition der "Kacheln", inkl. StandardIcon. Es können alle Icon aus dem Iconmapping genutzt werden.
-    // Kacheln die nicht genutzt werden sollen, müssen wie z.b. item1 formatiert sein
-    var home = [0, pwrHome, "W", "home-lightning-bolt-outline", 0]; // Icon home
-    var item1 = [1, pwr1, "", "", 0, ""];   // Icon battery-charging-60
-    var item2 = [2, pwr2, "W", "solar-power-variant-outline", 3, pwr2 > 0 ? -2 : 0]; // Icon solar-power-variant
-    var item3 = [3, pwr3, "", "", 0, ""];   // Icon wind-turbine
-    var item4 = [4, pwr4, "", "", 0, ""];   // Icon shape
-    var item5 = [5, pwr5, "W", "transmission-tower", 10, 10];   // Icon transmission-tower
-    var item6 = [6, pwr6, "kW", "car-electric-outline", 5, 0];  // Icon car
-    
-    /**
-     * JSON generieren und in den Datenpunkt schreiben,
-     *
-     *  --- ab hier keine Änderungen mehr ---
-     */
-    function func(tags, values) {
-      return Object.assign(
-        ...tags.map((element, index) => ({ [element]: values[index] }))
-      );
-    }
-    
-    setState(
-      powerCardJson,
-      JSON.stringify([
-        func(keys, home),
-        func(keys, item1),
-        func(keys, item2),
-        func(keys, item3),
-        func(keys, item4),
-        func(keys, item5),
-        func(keys, item6),
-      ])
-    );
-   });

ioBroker/ioBroker_NSPanel_locales.json

@@ -2565,10 +2565,6 @@
          "en-US":"Crossfade",
          "de-DE":"Überblenden"
       }, 
-      "tools":{
-         "en-US":"Tools",
-         "de-DE":"Tools"
-      },      
       "speaker":{
          "en-US":"Speakerlist",
          "de-DE":"Wiedergabegeräte",

ioBroker/ioBroker_NSPanel_locales_service.json

@@ -2701,13 +2701,5 @@
    "scriptname":{
       "en-US":"Script name",
       "de-DE":"Skriptname"
-   },
-   "hiddencards_offon":{
-      "en-US":"hidden Cards (on/off)",
-      "de-DE":"ausgeblendete Seiten (an/aus)" 
-   },
-   "easyview_layout":{
-      "en-US":"Easyview Layout",
-      "de-DE":"Einfaches Layout"
    }
 }

nspanel-lovelace-ui/config.yaml

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

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

@@ -209,11 +209,11 @@ class HAEntity(panel_cards.Entity):
                     forecast = libs.home_assistant.execute_script(
                         entity_name=self.entity_id,
                         domain='weather',
-                        service="get_forecasts",
+                        service="get_forecast",
                         service_data={
                             'type': forecast_type
                         }
-                    ).get(self.entity_id,{}).get("forecast", [])
+                    ).get("forecast", [])
                     if len(forecast) > pos:
                         forcast_pos = forecast[pos]
                         forcast_condition = forcast_pos.get("condition", "")
@@ -475,7 +475,7 @@ class AlarmCard(HACard):
         main_entity = self.entities[0]
         main_entity.render()
 
-        logging.debug("Alarm card state for '%s': %s", main_entity.entity_id, main_entity.state)
+        print(main_entity.state)
 
         icon = get_icon_char("shield-off")
         color = rgb_dec565([255,255,255])

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

@@ -8,8 +8,6 @@ def wait_for_ha_cache():
     while time.time() < mustend:
         if len(libs.home_assistant.home_assistant_entity_state_cache) == 0:
             time.sleep(0.1)
-    if len(libs.home_assistant.home_assistant_entity_state_cache) == 0:
-        logging.warning("Home Assistant entity cache is still empty after waiting 5 seconds")
     time.sleep(1)
 
 def calculate_dim_values(sleepTracking, sleepTrackingZones, sleepBrightness, screenBrightness, sleepOverride, return_involved_entities=False):
@@ -22,32 +20,27 @@ def calculate_dim_values(sleepTracking, sleepTrackingZones, sleepBrightness, scr
             dimmode = sleepBrightness
         elif isinstance(sleepBrightness, list):
             logging.error("list style config for sleepBrightness no longer supported")
-        #elif sleepBrightness.startswith("ha:"):
+        elif sleepBrightness.startswith("ha:"):
-        #    time.sleep(1)
+            time.sleep(1)
-        #    dimmode = int(float(libs.home_assistant.get_template(sleepBrightness)[3:]))
+            dimmode = int(float(libs.home_assistant.get_template(sleepBrightness)[3:]))
-        #    involved_entities.extend(libs.home_assistant.get_template_listener_entities(sleepBrightness))
+            involved_entities.extend(libs.home_assistant.get_template_listener_entities(sleepBrightness))
         elif libs.home_assistant.is_existent(sleepBrightness):
             involved_entities.append(sleepBrightness)
-            try:
+            dimmode = int(float(libs.home_assistant.get_entity_data(sleepBrightness).get('state', 10)))
-                dimmode = int(float(libs.home_assistant.get_entity_data(sleepBrightness).get('state', 10)))
-            except (TypeError, ValueError):
-                logging.exception("sleepBrightness entity '%s' has an invalid state value", sleepBrightness)
 
     if screenBrightness:
         if isinstance(screenBrightness, int):
             dimValueNormal = screenBrightness
         elif isinstance(screenBrightness, list):
             logging.error("list style config for screenBrightness no longer supported")
-        #elif screenBrightness.startswith("ha:"):
+        elif screenBrightness.startswith("ha:"):
-        #    time.sleep(1)
+            time.sleep(1)
-        #    dimValueNormal = int(float(libs.home_assistant.get_template(screenBrightness)[3:]))
+            dimValueNormal = int(float(libs.home_assistant.get_template(screenBrightness)[3:]))
-        #    involved_entities.extend(libs.home_assistant.get_template_listener_entities(screenBrightness))
+            involved_entities.extend(libs.home_assistant.get_template_listener_entities(screenBrightness))
         elif libs.home_assistant.is_existent(screenBrightness):
             involved_entities.append(screenBrightness)
-            try:
+            dimValueNormal = int(float(libs.home_assistant.get_entity_data(screenBrightness).get('state', 100)))
-                dimValueNormal = int(float(libs.home_assistant.get_entity_data(screenBrightness).get('state', 100)))
+
-            except (TypeError, ValueError):
-                logging.exception("screenBrightness entity '%s' has an invalid state value", screenBrightness)
     # force sleep brightness to zero in case sleepTracking is active
     if sleepTracking:
         if libs.home_assistant.is_existent(sleepTracking):
@@ -71,13 +64,12 @@ def calculate_dim_values(sleepTracking, sleepTrackingZones, sleepBrightness, scr
     else:
         return dimmode, dimValueNormal
 
-def handle_buttons(entity_id, btype, value, entity_config=None, action_context=None):
+def handle_buttons(entity_id, btype, value, entity_config=None):
-    action_context = action_context or {}
     match btype:
         case 'button':
-            button_press(entity_id, value, action_context=action_context)
+            button_press(entity_id, value)
         case 'OnOff':
-            on_off(entity_id, value, action_context=action_context)
+            on_off(entity_id, value)
         case 'number-set':
             if entity_id.startswith('fan'):
                 attr = libs.home_assistant.get_entity_data(entity_id).get('attributes', [])
@@ -85,7 +77,7 @@ def handle_buttons(entity_id, btype, value, entity_config=None, action_context=N
             service_data = {
                 "value": int(value)
             }
-            call_ha_service(entity_id, "set_value", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "set_value", service_data=service_data)
         case 'up' | 'stop' | 'down' | 'tiltOpen' | 'tiltStop' | 'tiltClose' | 'media-next' | 'media-back' | 'media-pause' | 'timer-cancel' | 'timer-pause' | 'timer-finish':
             action_service_mapping = {
                 'up': 'open_cover',
@@ -102,37 +94,37 @@ def handle_buttons(entity_id, btype, value, entity_config=None, action_context=N
                 'timer-finish': 'finish',
             }
             service = action_service_mapping[btype]
-            call_ha_service(entity_id, service, action_context=action_context)
+            call_ha_service(entity_id, service)
         case 'timer-start':
             if value:
                 service_data = {
                     "duration": value
                 }
-                call_ha_service(entity_id, "start", service_data=service_data, action_context=action_context)
+                call_ha_service(entity_id, "start", service_data=service_data)
             else:
-                call_ha_service(entity_id, "start", action_context=action_context)
+                call_ha_service(entity_id, "start")
         case 'positionSlider':
             service_data = {
                 "position": int(value)
             }
-            call_ha_service(entity_id, "set_cover_position", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "set_cover_position", service_data=service_data)
         case 'tiltSlider':
             service_data = {
                 "tilt_position": int(value)
             }
-            call_ha_service(entity_id, "set_cover_tilt_position", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "set_cover_tilt_position", service_data=service_data)
         case 'media-OnOff':
             state = libs.home_assistant.get_entity_data(entity_id).get('state', '')
             if state == "off":
-                call_ha_service(entity_id, "turn_on", action_context=action_context)
+                call_ha_service(entity_id, "turn_on")
             else:
-                call_ha_service(entity_id, "turn_off", action_context=action_context)
+                call_ha_service(entity_id, "turn_off")
         case 'media-shuffle':
             suffle = libs.home_assistant.get_entity_data(entity_id).get('attributes', []).get('shuffle')
             service_data = {
                 "shuffle": not suffle
             }
-            call_ha_service(entity_id, "set_value", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "set_value", service_data=service_data)
         case 'volumeSlider':
             pos = int(value)
             # HA wants to have this value between 0 and 1 as float
@@ -140,12 +132,12 @@ def handle_buttons(entity_id, btype, value, entity_config=None, action_context=N
             service_data = {
                 "volume_level": pos
             }
-            call_ha_service(entity_id, "volume_set", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "volume_set", service_data=service_data)
         case 'speaker-sel':
             service_data = {
                 "volume_level": value
             }
-            call_ha_service(entity_id, "select_source", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "select_source", service_data=service_data)
         # for light detail page
         case 'brightnessSlider':
             # scale 0-100 to ha brightness range
@@ -153,7 +145,7 @@ def handle_buttons(entity_id, btype, value, entity_config=None, action_context=N
             service_data = {
                 "brightness": brightness
             }
-            call_ha_service(entity_id, "turn_on", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "turn_on", service_data=service_data)
         case 'colorTempSlider':
             attr = libs.home_assistant.get_entity_data(entity_id).get('attributes', [])
             min_mireds = attr.get("min_mireds")
@@ -163,19 +155,19 @@ def handle_buttons(entity_id, btype, value, entity_config=None, action_context=N
             service_data = {
                 "color_temp": color_val
             }
-            call_ha_service(entity_id, "turn_on", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "turn_on", service_data=service_data)
         case 'colorWheel':
             value = value.split('|')
             color = pos_to_color(int(value[0]), int(value[1]), int(value[2]))
             service_data = {
                 "rgb_color": color
             }
-            call_ha_service(entity_id, "turn_on", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "turn_on", service_data=service_data)
         case 'disarm' | 'arm_home' | 'arm_away' | 'arm_night' | 'arm_vacation':
             service_data = {
                 "code": value
             }
-            call_ha_service(entity_id, f"alarm_{btype}", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, f"alarm_{btype}", service_data=service_data)
         case 'mode-preset_modes' | 'mode-swing_modes' | 'mode-fan_modes':
             attr = libs.home_assistant.get_entity_data(entity_id).get('attributes', [])
             mapping = {
@@ -190,7 +182,7 @@ def handle_buttons(entity_id, btype, value, entity_config=None, action_context=N
                     service_data = {
                         mapping[btype][:-1]: mode
                     }
-                    call_ha_service(entity_id, f"set_{mapping[btype][:-1]}", service_data=service_data, action_context=action_context)
+                    call_ha_service(entity_id, f"set_{mapping[btype][:-1]}", service_data=service_data)
         case 'mode-input_select' | 'mode-select':
             options = libs.home_assistant.get_entity_data(entity_id).get('attributes', []).get("options", [])
             if options:
@@ -198,7 +190,7 @@ def handle_buttons(entity_id, btype, value, entity_config=None, action_context=N
                 service_data = {
                     "option": option
                 }
-                call_ha_service(entity_id, "select_option", service_data=service_data, action_context=action_context)
+                call_ha_service(entity_id, "select_option", service_data=service_data)
         case 'mode-media_player':
             options = libs.home_assistant.get_entity_data(entity_id).get('attributes', []).get("source_list", [])
             if options:
@@ -206,7 +198,7 @@ def handle_buttons(entity_id, btype, value, entity_config=None, action_context=N
                 service_data = {
                     "source": option
                 }
-                call_ha_service(entity_id, "select_source", service_data=service_data, action_context=action_context)
+                call_ha_service(entity_id, "select_source", service_data=service_data)
         case 'mode-light':
             options = entity_config.get("effectList", libs.home_assistant.get_entity_data(entity_id).get('attributes', []).get("effect_list", []))
             if options:
@@ -214,13 +206,13 @@ def handle_buttons(entity_id, btype, value, entity_config=None, action_context=N
                 service_data = {
                     "effect": option
                 }
-                call_ha_service(entity_id, "turn_on", service_data=service_data, action_context=action_context)
+                call_ha_service(entity_id, "turn_on", service_data=service_data)
         case 'tempUpd':
             temp = int(value)/10
             service_data = {
                 "temperature": temp
             }
-            call_ha_service(entity_id, "set_temperature", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "set_temperature", service_data=service_data)
         case 'tempUpdHighLow':
             value = value.split("|")
             temp_high = int(value[0])/10
@@ -229,67 +221,47 @@ def handle_buttons(entity_id, btype, value, entity_config=None, action_context=N
                 "target_temp_high": temp_high,
                 "target_temp_low": temp_low,
             }
-            call_ha_service(entity_id, "set_temperature", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "set_temperature", service_data=service_data)
         case 'hvac_action':
             service_data = {
                 "hvac_mode": value
             }
-            call_ha_service(entity_id, "set_hvac_mode", service_data=service_data, action_context=action_context)
+            call_ha_service(entity_id, "set_hvac_mode", service_data=service_data)
         case _:
            logging.error("Not implemented: %s", btype)
 
-def call_ha_service(entity_id, service, service_data=None, action_context=None):
+def call_ha_service(entity_id, service, service_data = {}):
-    if service_data is None:
-        service_data = {}
-    action_context = action_context or {}
     etype = entity_id.split(".")[0]
-    ok = libs.home_assistant.call_service(
+    libs.home_assistant.call_service(
         entity_name=entity_id,
         domain=etype,
         service=service,
         service_data=service_data
     )
-    if ok:
-        logging.info(
-            "Panel action forwarded to Home Assistant: panel='%s', action='%s', value='%s', entity='%s', service='%s', data=%s",
-            action_context.get("panel", "unknown"),
-            action_context.get("btype", "unknown"),
-            action_context.get("value"),
-            entity_id,
-            service,
-            service_data,
-        )
-    if not ok:
-        logging.error(
-            "Home Assistant service call failed: entity='%s', service='%s', data=%s",
-            entity_id,
-            service,
-            service_data,
-        )
 
-def button_press(entity_id, value, action_context=None):
+def button_press(entity_id, value):
     etype = entity_id.split(".")[0]
     match etype:
         case 'scene' | 'script':
-            call_ha_service(entity_id, "turn_on", action_context=action_context)
+            call_ha_service(entity_id, "turn_on")
         case 'light' | 'switch' | 'input_boolean' | 'automation' | 'fan':
-            call_ha_service(entity_id, "toggle", action_context=action_context)
+            call_ha_service(entity_id, "toggle")
         case 'lock':
             state = libs.home_assistant.get_entity_data(entity_id).get('state', '')
             if state == "locked":
-                call_ha_service(entity_id, "unlock", action_context=action_context)
+                call_ha_service(entity_id, "unlock")
             else:
-                call_ha_service(entity_id, "lock", action_context=action_context)
+                call_ha_service(entity_id, "lock")
         case 'button' | 'input_button':
-            call_ha_service(entity_id, "press", action_context=action_context)
+            call_ha_service(entity_id, "press")
         case 'input_select' | 'select':
-            call_ha_service(entity_id, "select_next", action_context=action_context)
+            call_ha_service(entity_id, "select_next")
         case 'vacuum':
             state = libs.home_assistant.get_entity_data(entity_id).get('state', '')
             if state == "docked":
-                call_ha_service(entity_id, "start", action_context=action_context)
+                call_ha_service(entity_id, "start")
             else:
-                call_ha_service(entity_id, "return_to_base", action_context=action_context)
+                call_ha_service(entity_id, "return_to_base")
         case _:
             logging.error("buttonpress for entity type %s not implemented", etype)
 
@@ -297,14 +269,14 @@ def button_press(entity_id, value, action_context=None):
     #          apis.ha_api.call_service(entity_id.replace(
     #              'service.', '', 1).replace('.', '/', 1), **entity_config.data)
 
-def on_off(entity_id, value, action_context=None):
+def on_off(entity_id, value):
     etype = entity_id.split(".")[0]
     match etype:
         case 'light' | 'switch' | 'input_boolean' | 'automation' | 'fan':
             service = "turn_off"
             if value == "1":
                 service = "turn_on"
-            call_ha_service(entity_id, service, action_context=action_context)
+            call_ha_service(entity_id, service)
         case _:
             logging.error(
                 "Control action on_off not implemented for %s", entity_id)

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

@@ -16,7 +16,6 @@ ws_connected = False
 home_assistant_entity_state_cache = {}
 template_cache = {}
 response_buffer = {}
-nspanel_event_handler = None
 
 
 ON_CONNECT_HANDLER = None
@@ -47,16 +46,10 @@ def register_on_disconnect_handler(handler):
 
 def on_message(ws, message):
     global auth_ok, request_all_states_id, home_assistant_entity_state_cache, response_buffer, template_cache
-    try:
+    json_msg = json.loads(message)
-        json_msg = json.loads(message)
+    if json_msg["type"] == "auth_required":
-    except json.JSONDecodeError:
-        logging.exception("Failed to parse Home Assistant websocket message as JSON")
-        return
-
-    message_type = json_msg.get("type")
-    if message_type == "auth_required":
         authenticate_client()
-    elif message_type == "auth_ok":
+    elif json_msg["type"] == "auth_ok":
         auth_ok = True
         logging.info("Home Assistant auth OK. Requesting existing states.")
         subscribe_to_events()
@@ -64,41 +57,30 @@ def on_message(ws, message):
         if ON_CONNECT_HANDLER is not None:
             ON_CONNECT_HANDLER()
     # for templates
-    elif message_type == "event" and json_msg.get("id") in response_buffer:
+    elif json_msg["type"] == "event" and json_msg["id"] in response_buffer:
-        event = json_msg.get("event", {})
-        listeners = event.get("listeners", {})
         template_cache[response_buffer[json_msg["id"]]] = {
-            "result": event.get("result"),
+            "result": json_msg["event"]["result"],
-            "listener-entities": listeners.get("entities", [])
+            "listener-entities": json_msg["event"]["listeners"]["entities"]
         }
-    elif message_type == "event" and json_msg.get("event", {}).get("event_type") == "state_changed":
+    elif json_msg["type"] == "event" and json_msg["event"]["event_type"] == "state_changed":
-        event_data = json_msg.get("event", {}).get("data", {})
+        entity_id = json_msg["event"]["data"]["entity_id"]
-        entity_id = event_data.get("entity_id")
+        home_assistant_entity_state_cache[entity_id] = json_msg["event"]["data"]["new_state"]
-        if not entity_id:
-            logging.debug("Received state_changed event without entity_id")
-            return
-        home_assistant_entity_state_cache[entity_id] = event_data.get("new_state")
         send_entity_update(entity_id)
         # rerender template
         for template, template_cache_entry in template_cache.items():
             if entity_id in template_cache_entry.get("listener-entities", []):
                 cache_template(template)
-    elif message_type == "event" and json_msg.get("event", {}).get("event_type") == "esphome.nspanel.data":
+    elif json_msg["type"] == "event" and json_msg["event"]["event_type"] == "esphome.nspanel.data":
-        event_data = json_msg.get("event", {}).get("data", {})
+        nspanel_data_callback(json_msg["event"]["data"]["device_id"], json_msg["event"]["data"]["CustomRecv"])
-        device_id = event_data.get("device_id")
+    elif json_msg["type"] == "result" and not json_msg["success"]:
-        custom_recv = event_data.get("CustomRecv")
+        logging.error("Failed result: ")
-        if nspanel_event_handler is None:
+        logging.error(json_msg)
-            logging.debug("No NsPanel event handler registered; dropping event for device '%s'", device_id)
+    elif json_msg["type"] == "result" and json_msg["success"]:
-            return
+        if json_msg["id"] == request_all_states_id:
-        nspanel_event_handler(device_id, custom_recv)
+            for entity in json_msg["result"]:
-    elif message_type == "result" and not json_msg.get("success"):
-        logging.error("Home Assistant request failed: %s", json_msg)
-    elif message_type == "result" and json_msg.get("success"):
-        if json_msg.get("id") == request_all_states_id:
-            for entity in json_msg.get("result", []):
                 home_assistant_entity_state_cache[entity["entity_id"]] = entity
         else:
-            if json_msg.get("id") in response_buffer and json_msg.get("result"):
+            if json_msg["id"] in response_buffer and json_msg.get("result"):
                 response_buffer[json_msg["id"]] = json_msg["result"]
         return None  # Ignore success result messages
     else:
@@ -116,11 +98,7 @@ def _ws_connection_open(ws):
 def _ws_connection_close(ws, close_status_code, close_msg):
     global ws_connected
     ws_connected = False
-    logging.error(
+    logging.error("WebSocket connection closed!")
-        "WebSocket connection closed (status=%s, message=%s)",
-        close_status_code,
-        close_msg,
-    )
     if ON_DISCONNECT_HANDLER is not None:
         ON_DISCONNECT_HANDLER()
 
@@ -141,12 +119,9 @@ def _do_connection():
                                 on_open=_ws_connection_open, on_close=_ws_connection_close)
     while True:
         logging.info(F"Connecting to Home Assistant at {ws_url}")
-        try:
+        ws.close()
-            ws.close()
+        time.sleep(1)
-            time.sleep(1)
+        ws.run_forever(sslopt={"cert_reqs": ssl.CERT_NONE})
-            ws.run_forever(sslopt={"cert_reqs": ssl.CERT_NONE})
-        except Exception:
-            logging.exception("WebSocket connection loop failed")
         time.sleep(10)
 
 
@@ -170,8 +145,8 @@ def subscribe_to_events():
     send_message(json.dumps(msg))
 
 def subscribe_to_nspanel_events(nsp_callback):
-    global next_id, nspanel_event_handler
+    global next_id, nspanel_data_callback
-    nspanel_event_handler = nsp_callback
+    nspanel_data_callback = nsp_callback
     msg = {
         "id": next_id,
         "type": "subscribe_events",
@@ -194,10 +169,8 @@ def send_entity_update(entity_id):
     on_ha_update(entity_id)
 
 def nspanel_data_callback(device_id, msg):
-    if nspanel_event_handler is None:
+    global nspanel_data_callback
-        logging.debug("NsPanel callback invoked before handler was registered")
+    nspanel_data_callback(device_id, msg)
-        return
-    nspanel_event_handler(device_id, msg)
 
 def call_service(entity_name: str, domain: str, service: str, service_data: dict) -> bool:
     global next_id
@@ -214,11 +187,8 @@ def call_service(entity_name: str, domain: str, service: str, service_data: dict
         }
         send_message(json.dumps(msg))
         return True
-    except Exception:
+    except Exception as e:
-        logging.exception(
+        logging.exception("Failed to call Home Assisatant service.")
-            "Failed to call Home Assistant service: %s.%s for %s",
-            domain, service, entity_name
-        )
         return False
 
 def send_msg_to_panel(service: str, service_data: dict) -> bool:
@@ -233,8 +203,8 @@ def send_msg_to_panel(service: str, service_data: dict) -> bool:
         }
         send_message(json.dumps(msg))
         return True
-    except Exception:
+    except Exception as e:
-        logging.exception("Failed to call Home Assistant panel service: %s", service)
+        logging.exception("Failed to call Home Assisatant service.")
         return False
 
 def execute_script(entity_name: str, domain: str, service: str, service_data: dict) -> str:
@@ -271,13 +241,13 @@ def execute_script(entity_name: str, domain: str, service: str, service_data: di
             else:
                 return response_buffer[call_id]["response"]
         raise TimeoutError("Did not recive respose in time to HA script call")
-    except Exception:
+    except Exception as e:
-        logging.exception("Failed to call Home Assistant script: %s.%s", domain, service)
+        logging.exception("Failed to call Home Assisatant script.")
         return {}
 
 def cache_template(template):
     if not template:
-        raise ValueError("Invalid template")
+        raise Exception("Invalid template")
     global next_id, response_buffer
     try:
         call_id = next_id
@@ -289,7 +259,7 @@ def cache_template(template):
         }
         send_message(json.dumps(msg))
         return True
-    except Exception:
+    except Exception as e:
         logging.exception("Failed to render template.")
         return False
 
@@ -331,10 +301,5 @@ def is_existent(entity_id: str):
 
 def send_message(message):
     global ws, next_id
-    try:
+    next_id += 1
-        next_id += 1
+    ws.send(message)
-        ws.send(message)
-    except NameError:
-        logging.error("WebSocket client is not initialized; dropping outgoing message")
-    except Exception:
-        logging.exception("Failed sending websocket message to Home Assistant")

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

@@ -25,76 +25,53 @@ last_settings_file_mtime = 0
 mqtt_connect_time = 0
 has_sent_reload_command = False
 
-log_level_name = os.getenv("loglevel", "DEBUG").upper()
+logging.basicConfig(level=logging.DEBUG)
-log_level = getattr(logging, log_level_name, None)
-invalid_log_level = not isinstance(log_level, int)
-if invalid_log_level:
-    log_level = logging.DEBUG
-
-logging.basicConfig(
-    level=log_level,
-    format="%(asctime)s %(levelname)s [%(threadName)s] %(name)s: %(message)s",
-)
-if invalid_log_level:
-    logging.warning("Invalid loglevel '%s', defaulting to DEBUG", log_level_name)
 
 def on_ha_update(entity_id):
     global panel_in_queues
     # send HA updates to all panels
     for queue in panel_in_queues.values():
-        try:
+        queue.put(("HA:", entity_id))
-            queue.put(("HA:", entity_id))
-        except Exception:
-            logging.exception("Failed to enqueue HA update for entity '%s'", entity_id)
 
 def on_ha_panel_event(device_id, msg):
     global panel_in_queues
 
     if device_id in panel_in_queues.keys():
         queue = panel_in_queues[device_id]
-        try:
+        queue.put(("MQTT:", msg))
-            queue.put(("MQTT:", msg))
-        except Exception:
-            logging.exception("Failed to enqueue panel event for device '%s'", device_id)
 
 def process_output_to_panel():
     while True:
-        try:
+        msg = panel_out_queue.get()
-            msg = panel_out_queue.get()
+
-            service = msg[0] + "_nspanelui_api_call"
+        #client.publish(msg[0], msg[1])
-            service_data = {
+        #apis.ha_api.call_service(service="esphome/" + self._api_panel_name + "_nspanelui_api_call", command=2, data=msg)
-                "data": msg[1],
+        service = msg[0] + "_nspanelui_api_call"
-                "command": 2
+        service_data = {
+            "data": msg[1],
+            "command":2
             }
-            libs.home_assistant.send_msg_to_panel(
+        libs.home_assistant.send_msg_to_panel(
-                service=service,
+            service = service,
-                service_data=service_data
+            service_data = service_data
-            )
+        )
-        except Exception:
-            logging.exception("Failed to process outgoing panel message")
 
 
 def connect():
     global settings, panel_out_queue
-    ha_is_configured = settings["home_assistant_address"] != "" and settings["home_assistant_token"] != ""
     if "mqtt_server" in settings and not "use_ha_api" in settings:
         MqttManager(settings, panel_out_queue, panel_in_queues)
     else:
         logging.info("MQTT values not configured, will not connect.")
 
     # MQTT Connected, start APIs if configured
-    if ha_is_configured:
+    if settings["home_assistant_address"] != "" and settings["home_assistant_token"] != "":
         libs.home_assistant.init(settings, on_ha_update)
         libs.home_assistant.connect()
     else:
         logging.info("Home Assistant values not configured, will not connect.")
-        return
 
-    wait_seconds = 0
     while not libs.home_assistant.ws_connected:
-        wait_seconds += 1
-        if wait_seconds % 10 == 0:
-            logging.info("Waiting for Home Assistant websocket connection... (%ss)", wait_seconds)
         time.sleep(1)
     if settings.get("use_ha_api"):
         libs.home_assistant.subscribe_to_nspanel_events(on_ha_panel_event)
@@ -120,20 +97,13 @@ def setup_panels():
         panel_thread.start()
 
 def panel_thread_target(queue_in, name, settings_panel, queue_out):
-    try:
+    panel = LovelaceUIPanel(name, settings_panel, queue_out)
-        panel = LovelaceUIPanel(name, settings_panel, queue_out)
-    except Exception:
-        logging.exception("Failed to initialize panel thread for '%s'", name)
-        return
     while True:
-        try:
+        msg = queue_in.get()
-            msg = queue_in.get()
+        if msg[0] == "MQTT:":
-            if msg[0] == "MQTT:":
+            panel.customrecv_event_callback(msg[1])
-                panel.customrecv_event_callback(msg[1])
+        elif msg[0] == "HA:":
-            elif msg[0] == "HA:":
+            panel.ha_event_callback(msg[1])
-                panel.ha_event_callback(msg[1])
-        except Exception:
-            logging.exception("Panel thread '%s' failed while handling queue message", name)
 
 def get_config_file():
     CONFIG_FILE = os.getenv('CONFIG_FILE')
@@ -147,27 +117,18 @@ def get_config(file):
     try:
         with open(file, 'r', encoding="utf8") as file:
             settings = yaml.safe_load(file)
-    except FileNotFoundError:
-        logging.error("Config file not found: %s", file)
-        return False
-    except OSError:
-        logging.exception("Failed reading config file: %s", file)
-        return False
     except yaml.YAMLError as exc:
-        logging.error("Error while parsing YAML file: %s", file)
+        print ("Error while parsing YAML file:")
         if hasattr(exc, 'problem_mark'):
             if exc.context != None:
-                logging.error(
+                print ('  parser says\n' + str(exc.problem_mark) + '\n  ' +
-                    "Parser says\n%s\n%s %s\nPlease correct data and retry.",
+                    str(exc.problem) + ' ' + str(exc.context) +
-                    str(exc.problem_mark), str(exc.problem), str(exc.context)
+                    '\nPlease correct data and retry.')
-                )
             else:
-                logging.error(
+                print ('  parser says\n' + str(exc.problem_mark) + '\n  ' +
-                    "Parser says\n%s\n%s\nPlease correct data and retry.",
+                    str(exc.problem) + '\nPlease correct data and retry.')
-                    str(exc.problem_mark), str(exc.problem)
-                )
         else:
-            logging.exception("Something went wrong while parsing yaml file")
+            print ("Something went wrong while parsing yaml file")
         return False
 
     if not settings.get("mqtt_username"):
@@ -211,14 +172,10 @@ def config_watch():
     project_files.append(get_config_file())
     handler = ConfigChangeEventHandler(project_files)
     observer = Observer()
-    watch_path = os.path.dirname(get_config_file()) or "."
+    observer.schedule(handler, path=os.path.dirname(get_config_file()), recursive=True)
-    observer.schedule(handler, path=watch_path, recursive=True)
     observer.start()
     while True:
-        try:
+        time.sleep(1)
-            time.sleep(1)
-        except Exception:
-            logging.exception("Config watch loop failed")
 
 def signal_handler(signum, frame):
     logging.info(f"Received signal {signum}. Initiating restart...")

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

@@ -19,6 +19,7 @@ class MqttManager:
         self.client.username_pw_set(
             settings["mqtt_username"], settings["mqtt_password"])
         # Wait for connection
+        connection_return_code = 0
         mqtt_server = settings["mqtt_server"]
         mqtt_port = int(settings["mqtt_port"])
         logging.info("Connecting to %s:%i as %s",
@@ -27,12 +28,9 @@ class MqttManager:
             try:
                 self.client.connect(mqtt_server, mqtt_port, 5)
                 break  # Connection call did not raise exception, connection is sucessfull
-            except Exception:  # pylint: disable=broad-exception-caught
+            except:  # pylint: disable=bare-except
                 logging.exception(
-                    "Failed to connect to MQTT %s:%i. Will try again in 10 seconds.",
+                    "Failed to connect to MQTT %s:%i. Will try again in 10 seconds. Code: %s", mqtt_server, mqtt_port, connection_return_code)
-                    mqtt_server,
-                    mqtt_port,
-                )
                 time.sleep(10.)
         self.client.loop_start()
         process_thread = threading.Thread(target=self.process_in_queue, args=(self.client, self.msg_in_queue))
@@ -40,52 +38,31 @@ class MqttManager:
         process_thread.start()
 
     def on_mqtt_connect(self, client, userdata, flags, rc):
-        if rc != 0:
-            logging.error("MQTT connection failed with return code: %s", rc)
-            return
         logging.info("Connected to MQTT Server")
         # subscribe to panelRecvTopic of each panel
         for settings_panel in self.settings["nspanels"].values():
-            topic = settings_panel["panelRecvTopic"]
+            client.subscribe(settings_panel["panelRecvTopic"])
-            result, _ = client.subscribe(topic)
-            if result == mqtt.MQTT_ERR_SUCCESS:
-                logging.debug("Subscribed to panel topic: %s", topic)
-            else:
-                logging.error("Failed to subscribe to panel topic '%s' (result=%s)", topic, result)
 
     def on_mqtt_message(self, client, userdata, msg):
         try:
-            payload_text = msg.payload.decode('utf-8')
+            if msg.payload.decode() == "":
-            if payload_text == "":
-                logging.debug("Ignoring empty MQTT payload on topic: %s", msg.topic)
                 return
             if msg.topic in self.msg_out_queue_list.keys():
-                data = json.loads(payload_text)
+                data = json.loads(msg.payload.decode('utf-8'))
                 if "CustomRecv" in data:
                     queue = self.msg_out_queue_list[msg.topic]
                     queue.put(("MQTT:", data["CustomRecv"]))
-                else:
-                    logging.debug("JSON payload on topic '%s' has no 'CustomRecv' key", msg.topic)
             else:
                 logging.debug("Received unhandled message on topic: %s", msg.topic)
-        except UnicodeDecodeError:
-            logging.exception("Failed to decode MQTT payload as UTF-8 on topic: %s", msg.topic)
-        except json.JSONDecodeError:
-            logging.exception("Failed to parse MQTT JSON payload on topic: %s", msg.topic)
         except Exception:  # pylint: disable=broad-exception-caught
-            logging.exception("Unexpected error while processing MQTT message on topic: %s", msg.topic)
+            logging.exception("Something went wrong during processing of message:")
             try:
                 logging.error(msg.payload.decode('utf-8'))
-            except Exception:  # pylint: disable=broad-exception-caught
+            except:  # pylint: disable=bare-except
                 logging.error(
                     "Something went wrong when processing the exception message, couldn't decode payload to utf-8.")
 
     def process_in_queue(self, client, msg_in_queue):
         while True:
-            try:
+            msg = msg_in_queue.get()
-                msg = msg_in_queue.get()
+            client.publish(msg[0], msg[1])
-                result = client.publish(msg[0], msg[1])
-                if result.rc != mqtt.MQTT_ERR_SUCCESS:
-                    logging.error("Failed publishing message to topic '%s' (rc=%s)", msg[0], result.rc)
-            except Exception:  # pylint: disable=broad-exception-caught
-                logging.exception("Failed processing outgoing MQTT queue message")

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

@@ -105,10 +105,7 @@ class LovelaceUIPanel:
 
     def schedule_thread_target(self):
         while True:
-            try:
+            self.schedule.exec_jobs()
-                self.schedule.exec_jobs()
-            except Exception:
-                logging.exception("Scheduler execution failed for panel '%s'", self.name)
             time.sleep(1)
 
     def update_time(self):
@@ -206,9 +203,6 @@ class LovelaceUIPanel:
     def customrecv_event_callback(self, msg):
         logging.debug("Recv Message from NsPanel (%s): %s", self.name, msg)
         msg = msg.split(",")
-        if len(msg) < 2:
-            logging.error("Malformed panel message on '%s': %s", self.name, msg)
-            return
         # run action based on received command
         if msg[0] == "event":
             if msg[1] == "startup":
@@ -233,20 +227,9 @@ class LovelaceUIPanel:
             if msg[1] == "renderCurrentPage":
                 self.render_current_page(requested=True)
             if msg[1] == "buttonPress2":
-                if len(msg) < 4:
-                    logging.error("Malformed buttonPress2 payload on '%s': %s", self.name, msg)
-                    return
                 entity_id = msg[2]
-                if entity_id == "":
-                    return
                 btype = msg[3]
                 value = msg[4] if len(msg) > 4 else None
-                entity_config = {}
-                action_context = {
-                    "panel": self.name,
-                    "btype": btype,
-                    "value": value,
-                }
                 if btype == "bExit":
                     if entity_id in ["screensaver", "screensaver2"] and self.settings.get("screensaver").get("doubleTapToUnlock") and value == "1":
                         return
@@ -288,47 +271,25 @@ class LovelaceUIPanel:
                                     self.render_current_page(switchPages=True)
                             # send ha stuff to ha
                             case _:
-                                ha_control.handle_buttons(
+                                ha_control.handle_buttons(entity_id, btype, value, entity_config=entity_config)
-                                    entity_id,
-                                    btype,
-                                    value,
-                                    entity_config=entity_config,
-                                    action_context=action_context,
-                                )
                     case 'cardUnlock-unlock':
                         card_iid = entity_id.split(".")[1]
                         if int(self.current_card.config.get("pin")) == int(value):
                             self.privious_cards.append(self.current_card)
                             self.current_card = self.searchCard(card_iid)
                             self.render_current_page(switchPages=True)
-                    case 'mode-light':
-                        ha_control.handle_buttons(
-                            entity_id,
-                            btype,
-                            value,
-                            entity_config=entity_config,
-                            action_context=action_context,
-                        )
                     case _:
-                        ha_control.handle_buttons(
+                        ha_control.handle_buttons(entity_id, btype, value)
-                            entity_id,
-                            btype,
-                            value,
-                            action_context=action_context,
-                        )
 
             if msg[1] == "pageOpenDetail":
-                if len(msg) < 4:
-                    logging.error("Malformed pageOpenDetail payload on '%s': %s", self.name, msg)
-                    return
                 entity_id = msg[3]
-                effectList = None
                 # replace iid with real entity id
                 if entity_id.startswith("iid."):
                     iid = entity_id.split(".")[1]
                     for e in self.current_card.entities:
                         if e.iid == iid:
                             entity_id = e.entity_id
+                            effectList = None
                             if entity_id.startswith("light"):
                                 effectList = e.config.get("effectList")
                 if msg[2] == "popupInSel": #entity_id.split(".")[0] in ['input_select', 'media_player']:

nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/requirements.txt

@@ -1,4 +1,4 @@
-paho-mqtt==1.6.1
+paho-mqtt
 pyyaml
 websockets
 websocket-client