Update script version to v5.1.1.2 and fix screensaver logic

Removed instructions for downgrading Tasmota to version 15.0.1.

.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.3.0
+        uses: docker/login-action@v3.5.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.08.2
+        uses: home-assistant/builder@2025.03.0
         with:
           args: |
             ${{ env.BUILD_ARGS }} \

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

@@ -151,7 +151,7 @@ class LuiController(object):
         items = self._config.get_all_entity_names()
         apis.ha_api.log(f"gtest123: {items}")
         prefixes = ("navigate.", "delete", "iText")
-        items = [x for x in items if not (x is None or x.startswith(prefixes))]
+        items = set([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):

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

@@ -309,6 +309,11 @@ class LuiPagesGen(object):
             unit_of_measurement = entity.attributes.get("unit_of_measurement", "")
             value = entity.state
 
+            try:
+                value = str(round(float(value), 1))
+            except:
+                print("An exception occurred") 
+                
             # limit value to 4 chars on us-p
             if self._config.get("model") == "us-p" and cardType == "cardEntities":
                 value = entity.state[:4]
@@ -382,13 +387,29 @@ class LuiPagesGen(object):
         elif entityType == "weather":
             entityTypePanel = "text"
             unit = get_attr_safe(entity, "temperature_unit", "")
-            if type(item.stype) == int:
+            rt = None
+            index = item.stype
+            if type(item.stype) == str and ":" in item.stype and len(item.stype.split(":")) == 2:
+                spintstr = item.stype.split(":")
+                rt = spintstr[0]
+                index = int(spintstr[1])
+            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": "daily"}
+                    "weather/get_forecasts", target={"entity_id": entityId}, service_data={"type": rt}
                 )
                 forecast = results.get("result", {}).get("response", {}).get(entityId, {}).get('forecast') or entity.attributes.get('forecast', [])
-                if len(forecast) >= item.stype:
-                    day_forecast = forecast[item.stype]
+                if len(forecast) >= index:
+                    day_forecast = forecast[index]
                     fdate = dp.parse(day_forecast['datetime'])
                     global babel_spec
                     if babel_spec is not None:
@@ -1074,3 +1095,4 @@ 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

@@ -34,7 +34,7 @@ class NsPanelLovelaceUIManager(ad.ADBase):
         
         desired_tasmota_driver_version   = 8
         desired_display_firmware_version = 53
-        version     = "v4.3.3"
+        version     = "v4.7.3"
         
         model       = cfg.get("model")
         if model == "us-l":

docs/prepare_ha.md

@@ -94,37 +94,3 @@ Now, to install NSPanel Lovelace UI Backend with HACS, follow these steps:
    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
-      - platform: homeassistant
-        event: start
-    action:
-      - service: weather.get_forecasts
-        data:
-          type: daily
-        target:
-          entity_id: weather.home # change to your weather entity
-        response_variable: daily
-    sensor:
-      - name: Weather Forecast Daily
-        unique_id: weather_forecast_daily
-        state: "{{ states('weather.home') }}" # # change to your weather entity in this line
-        attributes:
-          temperature: "{{ state_attr('weather.home', 'temperature') }}" # change to your weather entity
-          temperature_unit: "{{ state_attr('weather.home', 'temperature_unit') }}" # change to your weather entity
-          forecast: "{{ daily['weather.home'].forecast }}" # change to your weather entity
-```
-![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)
-

docs/prepare_nspanel.md

@@ -1,65 +1,71 @@
-# Flash Tasmota to your NSPanel
+# Flash Tasmota to Your NSPanel
 
-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 to do so. [Tasmota Web Installer](https://tasmota.github.io/install/)
+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 can use the [Tasmota Web Installer](https://tasmota.github.io/install/) to do so.
 
-Checkout Blakadders Template Repo for more information on flashing, do not use the autoexec.be from this page.
+Check out Blakadder's Template Repo for more information on flashing. **Do not** use the autoexec.be from that 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 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)
+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.  
+[ESPHome Component](https://github.com/sairon/esphome-nspanel-lovelace-ui)
 
 
+---
+
 ## Configure Tasmota Template for NSPanel
 
-Configure the NSPanel template for Tasmota. (Go to Configuration and Configure Other and paste the template there, make sure to tick the activate checkbox)
+Configure the NSPanel template for Tasmota. (Go to Configuration > Configure Other, paste the template there, and 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 on the [Tasmota Template Repo Site](https://templates.blakadder.com/sonoff_NSPanel.html).
+You can use the following template or copy the one from 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 will download the autoexec.be file from the repository and restart tasmota.
+This downloads the autoexec.be file from the repository and restarts Tasmota.
 
-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.)
+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.)
+
+---
 
 ## Flash Firmware to Nextion Screen
 
-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.
+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.
 
-Use the one following commands in the tasmota console (not berry console) to flash the latest release from this repository:
+Use one of the following commands in the Tasmota console (not the Berry console) to flash the latest release from this repository:
 
-EU Version: `FlashNextion http://nspanel.pky.eu/lui-release.tft`
+EU Version:  
+FlashNextion http://nspanel.pky.eu/lui-release.tft
 
-US Version Portrait: `FlashNextion http://nspanel.pky.eu/lui-us-p-release.tft`
+US Version Portrait:  
+FlashNextion http://nspanel.pky.eu/lui-us-p-release.tft
 
-US Version Landscape: `FlashNextion http://nspanel.pky.eu/lui-us-l-release.tft`
+US Version Landscape:  
+FlashNextion http://nspanel.pky.eu/lui-us-l-release.tft
 
-After sending the command, the screen should show a progress bar. The flashing progress takes around 5 minutes.
+After sending the command, the screen should show a progress bar. The flashing process takes around 5 minutes.
 
-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
+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.
 
+---
 
 <details>
-<summary>Alternatively you can use your own webserver or the one build into HomeAssistant:</summary>
+<summary>Alternatively, you can use your own web server or the one built into Home Assistant:</summary>
 <br>
-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))
+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.  
+(Development version: [TFT file from HMI folder](HMI/nspanel.tft))
 
-**Webserver must be HTTP, HTTPS is not supported, due to limitations of berry lang on tasmota**
+**The web server must be HTTP. HTTPS is not supported due to Berry language limitations in Tasmota.**
 
-`FlashNextion http://ip-address-of-your-homeassistant:8123/local/nspanel.tft`
+FlashNextion http://ip-address-of-your-homeassistant:8123/local/nspanel.tft
 </details>
-
-