Compare commits

..

2 Commits

Author SHA1 Message Date
slajob
9332a88277 Merge 127671047f into 92616429ba 2024-02-12 17:13:53 +01:00
slajob
127671047f missing friday entity from example photo 2024-01-10 18:22:05 +01:00
23 changed files with 99 additions and 202 deletions

View File

@@ -92,7 +92,7 @@ jobs:
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
if: env.BUILD_ARGS != '--test' if: env.BUILD_ARGS != '--test'
uses: docker/login-action@v3.1.0 uses: docker/login-action@v3.0.0
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
@@ -100,7 +100,7 @@ jobs:
- name: Build ${{ matrix.addon }} add-on - name: Build ${{ matrix.addon }} add-on
if: steps.check.outputs.build_arch == 'true' if: steps.check.outputs.build_arch == 'true'
uses: home-assistant/builder@2024.03.5 uses: home-assistant/builder@2024.01.0
with: with:
args: | args: |
${{ env.BUILD_ARGS }} \ ${{ env.BUILD_ARGS }} \

View File

@@ -102,28 +102,6 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //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/n2t-out/popupNotify.txt
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt ├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
│ @@ -439,18 +439,14 @@ │ @@ -439,18 +439,14 @@
@@ -543,3 +521,22 @@
│ spstr strCommand.txt,tNotifyText.txt,"~",2 │ spstr strCommand.txt,tNotifyText.txt,"~",2
│ if(tNotifyHead.txt!=""||tNotifyText.txt!="") │ 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
│ }

View File

@@ -1985,26 +1985,6 @@
│ Variable (string) entn │ Variable (string) entn
│ Attributes │ Attributes
│ Scope : local │ 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/n2t-out/popupNotify.txt
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt ├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
│ @@ -348,15 +348,15 @@ │ @@ -348,15 +348,15 @@
@@ -2486,3 +2466,22 @@
│ spstr strCommand.txt,tNotifyText.txt,"~",2 │ spstr strCommand.txt,tNotifyText.txt,"~",2
│ if(tNotifyHead.txt!=""||tNotifyText.txt!="") │ 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
│ }

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2024-02-25 11:03:09.634837907 +0000 +++ /dev/fd/62 2024-01-20 23:31:31.560618969 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +12,11 @@ +1 +12,11 @@
@@ -686,13 +686,6 @@
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0 + 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 +I/n2t-out/cardGrid.txt
++ HMI/US/portrait/n2t-out/cardGrid.txt ++ HMI/US/portrait/n2t-out/cardGrid.txt
+ +7,14 @@ + +7,14 @@
@@ -946,6 +939,13 @@
+ spstr strCommand.txt,tEntity9.txt,"~",66 + spstr strCommand.txt,tEntity9.txt,"~",66
+ vis tEntity9,1 + 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 +I/n2t-out/cardLChart.txt
++ HMI/US/portrait/n2t-out/cardLChart.txt ++ HMI/US/portrait/n2t-out/cardLChart.txt
+ +7,14 @@ + +7,14 @@
@@ -1527,26 +1527,6 @@
+e (string) entn +e (string) entn
+ributes +ributes
+ Scope : local + 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 +I/n2t-out/popupNotify.txt
++ HMI/US/portrait/n2t-out/popupNotify.txt ++ HMI/US/portrait/n2t-out/popupNotify.txt
+15 +348,15 @@ +15 +348,15 @@
@@ -2028,3 +2008,22 @@
+ spstr strCommand.txt,tNotifyText.txt,"~",2 + spstr strCommand.txt,tNotifyText.txt,"~",2
+ if(tNotifyHead.txt!=""||tNotifyText.txt!="") + 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
+ }

View File

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

View File

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

View File

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

View File

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

View File

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

Binary file not shown.

Binary file not shown.

View File

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

View File

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

View File

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

View File

@@ -3,7 +3,6 @@ import datetime
import apis import apis
from helper import scale, pos_to_color, rgb_dec565 from helper import scale, pos_to_color, rgb_dec565
from pages import LuiPagesGen from pages import LuiPagesGen
from luibackend.config import Card
class LuiController(object): class LuiController(object):
@@ -459,9 +458,3 @@ class LuiController(object):
apis.ha_api.get_entity(entity_id).call_service("pause") apis.ha_api.get_entity(entity_id).call_service("pause")
if button_type == "timer-finish": if button_type == "timer-finish":
apis.ha_api.get_entity(entity_id).call_service("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

View File

@@ -213,9 +213,6 @@ def get_icon_ha(entity_id, overwrite=None, stateOverwrite=None):
entity = apis.ha_api.get_entity(entity_id) entity = apis.ha_api.get_entity(entity_id)
state = entity.state if stateOverwrite is None else stateOverwrite 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 overwrite is not None:
if type(overwrite) is str: if type(overwrite) is str:
return get_icon_char(overwrite) return get_icon_char(overwrite)

View File

@@ -77,13 +77,12 @@ class LuiMqttListener(object):
self._controller.detail_open(msg[2], msg[3]) self._controller.detail_open(msg[2], msg[3])
class LuiMqttSender(object): 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._ha_api = api
self._use_api = use_api self._use_api = use_api
self._topic_send = topic_send self._topic_send = topic_send
self._api_panel_name = api_panel_name self._api_panel_name = api_panel_name
self._prev_msg = "" self._prev_msg = ""
self._quiet = quiet
def send_mqtt_msg(self, msg, topic=None, force=False): def send_mqtt_msg(self, msg, topic=None, force=False):
if not force and self._prev_msg == msg: if not force and self._prev_msg == msg:
@@ -91,9 +90,7 @@ class LuiMqttSender(object):
return return
self._prev_msg = msg 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: if self._use_api:
apis.ha_api.call_service(service="esphome/" + self._api_panel_name + "_nspanelui_api_call", command=2, data=msg) apis.ha_api.call_service(service="esphome/" + self._api_panel_name + "_nspanelui_api_call", command=2, data=msg)
else: else:

View File

@@ -192,9 +192,6 @@ class LuiPagesGen(object):
else: else:
entityType = "delete" 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") 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 status_entity = apis.ha_api.get_entity(item.status) if item.status and apis.ha_api.entity_exists(item.status) else None
@@ -224,7 +221,7 @@ class LuiPagesGen(object):
if status_entity: if status_entity:
icon_res = get_icon_ha(item.status, overwrite=icon) 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) 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] icon_res = status_entity.state[:4]
if icon_res[-1] == ".": if icon_res[-1] == ".":
icon_res = icon_res[:-1] icon_res = icon_res[:-1]
@@ -248,7 +245,7 @@ class LuiPagesGen(object):
if status_entity: if status_entity:
icon_id = get_icon_ha(item.status, overwrite=icon) 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) 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] icon_id = status_entity.state[:4]
if icon_id[-1] == ".": if icon_id[-1] == ".":
icon_id = icon_id[:-1] icon_id = icon_id[:-1]
@@ -321,7 +318,7 @@ class LuiPagesGen(object):
value = value + unit_of_measurement value = value + unit_of_measurement
if entityType == "binary_sensor": if entityType == "binary_sensor":
value = get_translation(self._locale, f"backend.component.binary_sensor.state.{device_class}.{entity.state}") 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] icon_id = entity.state[:4]
if icon_id[-1] == ".": if icon_id[-1] == ".":
icon_id = icon_id[:-1] icon_id = icon_id[:-1]
@@ -782,8 +779,6 @@ class LuiPagesGen(object):
if send_page_type: if send_page_type:
if card.cardType == "cardGrid" and len(card.entities) > 6: if card.cardType == "cardGrid" and len(card.entities) > 6:
card.cardType = "cardGrid2" card.cardType = "cardGrid2"
if card.cardType == "cardGrid1":
card.cardType = "cardGrid"
self.page_type(card.cardType) self.page_type(card.cardType)
# send sleep timeout if there is one configured for the current card # send sleep timeout if there is one configured for the current card
@@ -793,7 +788,7 @@ class LuiPagesGen(object):
self._send_mqtt_msg(f'timeout~{self._config.get("sleepTimeout")}') self._send_mqtt_msg(f'timeout~{self._config.get("sleepTimeout")}')
temp_unit = card.raw_config.get("temperatureUnit", "celsius") 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) self.generate_entities_page(navigation, card.title, card.entities, card.cardType, temp_unit)
return return
if card.cardType == "cardThermo": if card.cardType == "cardThermo":

View File

@@ -1,4 +1,4 @@
import adbase as ad import hassapi as hass
from luibackend.config import LuiBackendConfig from luibackend.config import LuiBackendConfig
from luibackend.controller import LuiController from luibackend.controller import LuiController
@@ -6,19 +6,15 @@ from luibackend.mqtt import LuiMqttListener, LuiMqttSender
from luibackend.updater import Updater from luibackend.updater import Updater
import apis import apis
import json
from typing import Literal
class NsPanelLovelaceUIManager(ad.ADBase): class NsPanelLovelaceUIManager(hass.Hass):
def initialize(self): 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") 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 use_api = cfg.get("use_api") == True
@@ -26,11 +22,10 @@ class NsPanelLovelaceUIManager(ad.ADBase):
topic_recv = cfg.get("panelRecvTopic") topic_recv = cfg.get("panelRecvTopic")
api_panel_name = cfg.get("panelName") api_panel_name = cfg.get("panelName")
api_device_id = cfg.get("panelDeviceId") 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_tasmota_driver_version = 8
desired_display_firmware_version = 53 desired_display_firmware_version = 53
@@ -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") desired_tasmota_driver_url = cfg._config.get("berryURL", "https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be")
mode = cfg.get("updateMode") 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 # Request Tasmota Driver Version
updater.request_berry_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

View File

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

View File

@@ -93,34 +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 6. A confirmation panel will appear, click on `Download`, and wait for HACS to
proceed with the download proceed with the download
7. The Backend Application is now installed, and HACS will inform you when updates are available 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)

View File

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

View File

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