Update pages.py

Bumps [docker/login-action](https://github.com/docker/login-action) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/builder.yaml

@@ -92,7 +92,7 @@ jobs:
 
       - name: Login to GitHub Container Registry
         if: env.BUILD_ARGS != '--test'
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.1.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@2024.01.0
+        uses: home-assistant/builder@2024.03.5
         with:
           args: |
             ${{ env.BUILD_ARGS }} \

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

@@ -102,6 +102,28 @@
 │              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 @@
@@ -521,22 +543,3 @@
 │                                          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,6 +1985,26 @@
 │  Variable (string) entn
 │      Attributes
 │          Scope         : local
+│ @@ -453,19 +453,14 @@
+│                                      ucopy strCommand.txt,4,payloadLength-5,0
+│                                      // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
+│                                      spstr strCommand.txt,tInstruction.txt,"~",0
+│                                      spstr strCommand.txt,tTmp.txt,"~",1
+│                                      if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
+│                                      {
+│                                          // change icon
+│ -                                        spstr strCommand.txt,tTmp.txt,"~",2
+│ -                                        if(tTmp.txt!="")
+│ -                                        {
+│ -                                            tIcon1.txt=tTmp.txt
+│ -                                        }
+│                                          //spstr strCommand.txt,tIcon1.txt,"~",2
+│                                          vis tIcon1,1
+│                                          // change icon color
+│                                          spstr strCommand.txt,tTmp.txt,"~",3
+│                                          covx tTmp.txt,sys0,0,0
+│                                          tIcon1.pco=sys0
+│                                          // get Button State
 │   --- HMI/n2t-out/popupNotify.txt
 ├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
 │ @@ -348,15 +348,15 @@
@@ -2466,22 +2486,3 @@
 │                                          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	2024-01-20 23:31:31.560618969 +0000
++++ /dev/fd/62	2024-02-25 11:03:09.634837907 +0000
 +I/n2t-out/Program.s.txt
 ++ HMI/US/portrait/n2t-out/Program.s.txt
 +1 +12,11 @@
@@ -686,6 +686,13 @@
 +                                     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 @@
@@ -939,13 +946,6 @@
 +                                     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,6 +1527,26 @@
 +e (string) entn
 +ributes
 + Scope         : local
++19 +453,14 @@
++                             ucopy strCommand.txt,4,payloadLength-5,0
++                             // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
++                             spstr strCommand.txt,tInstruction.txt,"~",0
++                             spstr strCommand.txt,tTmp.txt,"~",1
++                             if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
++                             {
++                                 // change icon
++                                 spstr strCommand.txt,tTmp.txt,"~",2
++                                 if(tTmp.txt!="")
++                                 {
++                                     tIcon1.txt=tTmp.txt
++                                 }
++                                 //spstr strCommand.txt,tIcon1.txt,"~",2
++                                 vis tIcon1,1
++                                 // change icon color
++                                 spstr strCommand.txt,tTmp.txt,"~",3
++                                 covx tTmp.txt,sys0,0,0
++                                 tIcon1.pco=sys0
++                                 // get Button State
 +I/n2t-out/popupNotify.txt
 ++ HMI/US/portrait/n2t-out/popupNotify.txt
 +15 +348,15 @@
@@ -2008,22 +2028,3 @@
 +                                 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,6 +30,10 @@ 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
@@ -54,10 +58,6 @@ 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,10 +66,6 @@ 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
@@ -90,6 +86,10 @@ popupThermo
 	44   Component(s)
 	523  Line(s) of event code
 	276  Unique line(s) of event code
+screensaver2
+	64   Component(s)
+	428  Line(s) of event code
+	266  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)
-	10769 Line(s) of event code
+	10778 Line(s) of event code
 	2466 Unique line(s) of event code

HMI/n2t-out-visual/popupLight.txt

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

HMI/n2t-out-visual/screensaver2.txt

@@ -1794,6 +1794,10 @@ Timer tmSerial
                                         {
                                             page cardChart
                                         }
+                                        if(tId.txt=="cardLChart")
+                                        {
+                                            page cardLChart
+                                        }
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {

HMI/n2t-out/popupLight.txt

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

HMI/n2t-out/screensaver2.txt

@@ -956,6 +956,10 @@ Timer tmSerial
                                         {
                                             page cardChart
                                         }
+                                        if(tId.txt=="cardLChart")
+                                        {
+                                            page cardLChart
+                                        }
                                     }
                                     if(tInstruction.txt=="timeout")
                                     {

README.md

@@ -65,3 +65,5 @@ SmartHomeNG: https://github.com/sisamiwe/shng-nspanel-plugin
 OpenHAB: https://github.com/donoo/o2n2l
 
 NodeRed: https://github.com/laluz742/node-red-contrib-nspanel-lui
+
+ESPHome without any Backend: https://github.com/olicooper/esphome-nspanel-lovelace-native

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

@@ -213,6 +213,9 @@ def get_icon_ha(entity_id, overwrite=None, stateOverwrite=None):
         entity = apis.ha_api.get_entity(entity_id)
         state = entity.state if stateOverwrite is None else stateOverwrite
 
+    if entity_id in ["sensor.weather_forecast_daily", "sensor.weather_forecast_hourly"]:
+        ha_type = "weather"
+        
     if overwrite is not None:
         if type(overwrite) is str:
             return get_icon_char(overwrite)

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

@@ -192,6 +192,9 @@ class LuiPagesGen(object):
         else:
             entityType = "delete"
 
+        if entityId in ["sensor.weather_forecast_daily", "sensor.weather_forecast_hourly"]:
+            entityType = "weather"
+
         apis.ha_api.log(f"Generating item for {entityId} with type {entityType}", level="DEBUG")
 
         status_entity = apis.ha_api.get_entity(item.status) if item.status and apis.ha_api.entity_exists(item.status) else None
@@ -221,7 +224,7 @@ class LuiPagesGen(object):
                 if status_entity:
                     icon_res = get_icon_ha(item.status, overwrite=icon)
                     icon_color = self.get_entity_color(status_entity, ha_type=item.status.split(".")[0], overwrite=colorOverride)
-                    if item.status.startswith("sensor") and (cardType == "cardGrid" or cardType == "cardGrid2") and item.iconOverride is None:
+                    if item.status.startswith("sensor") and cardType in ["cardGrid", "cardGrid1", "cardGrid2"] and item.iconOverride is None:
                         icon_res = status_entity.state[:4]
                         if icon_res[-1] == ".":
                             icon_res = icon_res[:-1]
@@ -245,7 +248,7 @@ class LuiPagesGen(object):
             if status_entity:
                 icon_id = get_icon_ha(item.status, overwrite=icon)
                 icon_color = self.get_entity_color(status_entity, ha_type=item.status.split(".")[0], overwrite=colorOverride)
-                if item.status.startswith("sensor") and (cardType == "cardGrid" or cardType == "cardGrid2") and item.iconOverride is None:
+                if item.status.startswith("sensor") and cardType in ["cardGrid", "cardGrid1", "cardGrid2"] and item.iconOverride is None:
                     icon_id = status_entity.state[:4]
                     if icon_id[-1] == ".":
                         icon_id = icon_id[:-1]
@@ -318,7 +321,7 @@ class LuiPagesGen(object):
             value = value + unit_of_measurement
             if entityType == "binary_sensor":
                 value = get_translation(self._locale, f"backend.component.binary_sensor.state.{device_class}.{entity.state}")
-            if (cardType == "cardGrid" or cardType == "cardGrid2") and entityType == "sensor" and icon is None:
+            if cardType in ["cardGrid", "cardGrid1", "cardGrid2"] and entityType == "sensor" and icon is None:
                 icon_id = entity.state[:4]
                 if icon_id[-1] == ".":
                     icon_id = icon_id[:-1]
@@ -779,6 +782,8 @@ class LuiPagesGen(object):
         if send_page_type:
             if card.cardType == "cardGrid" and len(card.entities) > 6:
                 card.cardType = "cardGrid2"
+            if card.cardType == "cardGrid1":
+                card.cardType = "cardGrid"
             self.page_type(card.cardType)
 
         # send sleep timeout if there is one configured for the current card
@@ -788,7 +793,7 @@ class LuiPagesGen(object):
             self._send_mqtt_msg(f'timeout~{self._config.get("sleepTimeout")}')
         
         temp_unit = card.raw_config.get("temperatureUnit", "celsius")
-        if card.cardType in ["cardEntities", "cardGrid", "cardGrid2"]:
+        if card.cardType in ["cardEntities", "cardGrid", "cardGrid1","cardGrid2"]:
             self.generate_entities_page(navigation, card.title, card.entities, card.cardType, temp_unit)
             return
         if card.cardType == "cardThermo":

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

@@ -6,6 +6,8 @@ from luibackend.mqtt import LuiMqttListener, LuiMqttSender
 from luibackend.updater import Updater
 
 import apis
+import json
+from typing import Literal
 
 class NsPanelLovelaceUIManager(ad.ADBase):
 
@@ -26,9 +28,9 @@ class NsPanelLovelaceUIManager(ad.ADBase):
         api_device_id = cfg.get("panelDeviceId")
         quiet = cfg.get("quiet")
 
-        mqttsend = LuiMqttSender(apis.ha_api, use_api, topic_send, api_panel_name, quiet)
+        mqttsender = self._mqttsender = LuiMqttSender(apis.ha_api, use_api, topic_send, api_panel_name, quiet)
 
-        self._controller = LuiController(cfg, mqttsend.send_mqtt_msg)
+        self._controller = LuiController(cfg, mqttsender.send_mqtt_msg)
         
         desired_tasmota_driver_version   = 8
         desired_display_firmware_version = 53
@@ -44,7 +46,7 @@ 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, mqttsend, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url)
+        updater = Updater(self.adapi.log, mqttsender, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url)
         
         # Request Tasmota Driver Version
         updater.request_berry_driver_version()
@@ -53,6 +55,24 @@ class NsPanelLovelaceUIManager(ad.ADBase):
 
         self.adapi.log(f'Started ({version})')
         
+    #
+    # helpers
+    #
+    
+    def show_card(self, card_key: str) -> None:
+        """Used to show card on panel"""
+        
+        msg = json.dumps({"CustomRecv":f"event,buttonPress2,navigate.{card_key},button"})
+        topic = self._cfg.get("panelRecvTopic")
+        self._mqttsender.send_mqtt_msg(msg, topic)
+        
+    def navigate(self, direction: Literal['up', 'prev', 'next']) -> None:
+        """Used to navigate different directions on the panel"""
+        
+        msg = json.dumps({"CustomRecv":f"event,buttonPress2,nav{direction.title()},button"})
+        topic = self._cfg.get("panelRecvTopic")
+        self._mqttsender.send_mqtt_msg(msg, topic)
+        
     @property
     def current_card(self) -> str:
         """Used to get the panel's current card"""

docs/prepare_ha.md

@@ -93,3 +93,34 @@ 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
+
+# Workaround for HomeAssistant 2024.04
+AppDaemon is using the old REST API that until AppDaemon moved on the the websocket API this woraround is needed to get weather forecast data from homeassistant. (https://github.com/AppDaemon/appdaemon/issues/1837)
+
+To get the forecast data in appdaemon, there is a script needed in homeassistant's configuration.yaml:
+
+```yaml
+template:
+  - trigger:
+      - platform: time_pattern
+        hours: /1
+    action:
+      - service: weather.get_forecasts
+        data:
+          type: daily
+        target:
+          entity_id: weather.k3ll3r # change to your weather entity in this line
+        response_variable: daily
+    sensor:
+      - name: Weather Forecast Daily
+        unique_id: weather_forecast_daily
+        state: "{{ now().isoformat() }}"
+        attributes:
+          forecast: "{{ daily['weather.k3ll3r'].forecast }}" # change to your weather entity in this line
+```
+![image](https://github.com/joBr99/nspanel-lovelace-ui/assets/29555657/41f21db3-a6e2-4e4f-8dab-b9351ecd23e5)
+
+Adjust the entities in your apps.yaml that are accessing the forecast to the newly created trigger template:
+
+![image](https://github.com/joBr99/nspanel-lovelace-ui/assets/29555657/1cfd913d-88be-4cb0-9a68-0e864ee1ad4f)
+

ioBroker/DEV/NSPanelTs.ts

@@ -6107,8 +6107,6 @@ function subscribePowerSubscriptions(id: string): void {
 function GeneratePowerPage(page: NSPanel.PagePower): NSPanel.Payload[] {
     try {
 
-        if (!page.items[0].id) throw new Error ('Missing pageItem.id for PowerPage!');
-
         let obj:object = {};
         let demoMode = false;        
         if (page.items[0].id == undefined){
@@ -8984,6 +8982,8 @@ function HandleScreensaverUpdate(): void {
             SendToPanel({ payload: 'weatherUpdate~' + payloadString });
 
             HandleScreensaverStatusIcons();
+
+	    HandleScreensaverColors();
         }
 
     } catch (err: any) {

ioBroker/NsPanelTs.ts

@@ -6107,8 +6107,6 @@ function subscribePowerSubscriptions(id: string): void {
 function GeneratePowerPage(page: NSPanel.PagePower): NSPanel.Payload[] {
     try {
 
-        if (!page.items[0].id) throw new Error ('Missing pageItem.id for PowerPage!');
-
         let obj:object = {};
         let demoMode = false;        
         if (page.items[0].id == undefined){
@@ -8984,6 +8982,8 @@ function HandleScreensaverUpdate(): void {
             SendToPanel({ payload: 'weatherUpdate~' + payloadString });
 
             HandleScreensaverStatusIcons();
+
+	    HandleScreensaverColors();
         }
 
     } catch (err: any) {