Compare commits

...

26 Commits

Author SHA1 Message Date
Johannes
0074a29c31 fixes #739 2023-03-03 16:39:32 +01:00
joBr99
948d70f55a fix #789 2023-02-28 20:12:15 +01:00
Johannes
d41e031c14 Update nspanel-lovelace-ui.py 2023-02-27 20:04:00 +01:00
joBr99
f19b3bac36 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-02-27 20:00:33 +01:00
joBr99
1578b1d43b update iobroker skript to 4.0.3 2023-02-27 20:00:21 +01:00
joBr99
7abb24378f Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-02-27 18:57:49 +00:00
joBr99
51e8b83244 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-02-27 19:53:54 +01:00
joBr99
29de6438cf bugfix popupNotify to screensaver2 2023-02-27 19:53:45 +01:00
joBr99
425f601e8c . 2023-02-27 19:53:34 +01:00
joBr99
111138005f . 2023-02-27 19:53:31 +01:00
Armilar
b93643f1cc v4.0.2 - Release
- Add new HMI Serial-Protocol to cardPower
- Check whether setObjects is set
- Add Screensaver2 - Renew all Screensaver functions
- Fix bExit - to much notify~~ events outside of screensaver --> Black Screens
- Add Screensaver2 Parameter to Service Pages
- Add cardUnlock
- Extension of the Squeezebox player by bembelstemmer
- cardChart/cardLChart YAxisTicks from a datapoint by bembelstemmer
- Make Temperature Steps configurable by bembelstemmer
- Hotfix cardThermo Status by Gargano
- Optimize cardThermo by bembelstemmer
- use dynamically Indicator-Icons in Advanced-Screensaver by Gargano
2023-02-27 17:12:22 +01:00
Armilar
1f017d6c3f v4.0.2 - Release
- Add new HMI Serial-Protocol to cardPower
- Check whether setObjects is set
- Add Screensaver2 - Renew all Screensaver functions
- Fix bExit - to much notify~~ events outside of screensaver --> Black Screens
- Add Screensaver2 Parameter to Service Pages
- Add cardUnlock
- Extension of the Squeezebox player by bembelstemmer
- cardChart/cardLChart YAxisTicks from a datapoint by bembelstemmer
- Make Temperature Steps configurable by bembelstemmer
- Hotfix cardThermo Status by Gargano
- Optimize cardThermo by bembelstemmer
- use dynamically Indicator-Icons in Advanced-Screensaver by Gargano
2023-02-27 16:54:46 +01:00
Armilar
68d353b03c v4.0.0
- Add new HMI Serial-Protocol to cardPower
- Check whether setObjects is set
- Add Screensaver2 - Renew all Screensaver functions
- Fix bExit - to much notify~~ events outside of screensaver --> Black Screens
- Add Screensaver2 Parameter to Service Pages
- Add cardUnlock
- Extension of the Squeezebox player by bembelstemmer
- cardChart/cardLChart YAxisTicks from a datapoint by bembelstemmer
- Make Temperature Steps configurable by bembelstemmer
- Hotfix cardThermo Status by Gargano
- Optimize cardThermo by bembelstemmer
2023-02-27 15:27:02 +01:00
Armilar
4c460247ff v4.0.0 - Update
- Add new HMI Serial-Protocol to cardPower
- Check whether setObjects is set
- Add Screensaver2 - Renew all Screensaver functions
- Fix bExit - to much notify~~ events outside of screensaver --> Black Screens
- Add Screensaver2 Parameter to Service Pages
- Add cardUnlock
- Extension of the Squeezebox player by bembelstemmer
- cardChart/cardLChart YAxisTicks from a datapoint by bembelstemmer
- Make Temperature Steps configurable by bembelstemmer
- Hotfix cardThermo Status by Gargano
- Optimize cardThermo by bembelstemmer
2023-02-27 15:14:25 +01:00
joBr99
328159fee0 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-02-26 22:50:44 +01:00
joBr99
276025b6c4 fixes #785 2023-02-26 22:49:55 +01:00
Armilar
ff8881c426 Merge pull request #786 from bembelstemmer/thermoDynamics
ioBroker optimize cardThermo
2023-02-26 19:28:19 +01:00
Oliver
425e2fbf1c Merge branch 'thermoDynamics' of https://github.com/bembelstemmer/nspanel-lovelace-ui into thermoDynamics 2023-02-26 18:13:02 +01:00
Oliver
b087cafdb5 cleanup logging 2023-02-26 18:12:49 +01:00
bembelstemmer
fffb3178c2 Merge branch 'joBr99:main' into thermoDynamics 2023-02-26 17:55:46 +01:00
Oliver
683eaca479 Fix setting FAN_ONLY Mode 2023-02-26 17:54:56 +01:00
Oliver
4cfd7a5c3c Fix jumping back to previous card when switching mode and cardThermo is subElement 2023-02-26 17:51:36 +01:00
Johannes
2a98edd665 Update nspanel-lovelace-ui.py 2023-02-26 16:34:39 +01:00
bembelstemmer
5bb932293b Support Event Actions of dynamic types 2023-02-22 21:51:36 +01:00
Oliver
394e5b4614 Fix power off state visualization 2023-02-22 19:04:21 +01:00
Oliver
68cf4f74e3 Generate cardThermo Mode buttons based on Alias Mode State Property instead of Number 2023-02-22 19:04:02 +01:00
21 changed files with 2088 additions and 882 deletions

View File

@@ -6,10 +6,6 @@ pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
popupNotify
19 Component(s)
257 Line(s) of event code
166 Unique line(s) of event code
popupShutter
25 Component(s)
398 Line(s) of event code
@@ -26,6 +22,10 @@ popupInSel
34 Component(s)
617 Line(s) of event code
295 Unique line(s) of event code
popupNotify
19 Component(s)
261 Line(s) of event code
168 Unique line(s) of event code
pageTest
26 Component(s)
68 Line(s) of event code
@@ -90,5 +90,5 @@ cardEntities
Total
21 Page(s)
800 Component(s)
9218 Line(s) of event code
9222 Line(s) of event code
2331 Unique line(s) of event code

View File

@@ -628,6 +628,10 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities

View File

@@ -399,6 +399,10 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities

Binary file not shown.

Binary file not shown.

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-02-18 15:07:51.297065909 +0000
+++ /dev/fd/62 2023-02-27 18:57:41.462287194 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardEntities.txt

View File

@@ -14,10 +14,6 @@ popupLight
28 Component(s)
408 Line(s) of event code
225 Unique line(s) of event code
popupNotify
19 Component(s)
257 Line(s) of event code
166 Unique line(s) of event code
popupFan
27 Component(s)
351 Line(s) of event code
@@ -58,6 +54,10 @@ pageStartup
19 Component(s)
189 Line(s) of event code
133 Unique line(s) of event code
popupNotify
19 Component(s)
261 Line(s) of event code
168 Unique line(s) of event code
cardMedia
59 Component(s)
645 Line(s) of event code
@@ -90,5 +90,5 @@ cardEntities
Total
21 Page(s)
811 Component(s)
9622 Line(s) of event code
9626 Line(s) of event code
2453 Unique line(s) of event code

View File

@@ -628,6 +628,10 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities

View File

@@ -399,6 +399,10 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities

Binary file not shown.

Binary file not shown.

View File

@@ -10,10 +10,6 @@ popupThermo
44 Component(s)
519 Line(s) of event code
274 Unique line(s) of event code
popupNotify
19 Component(s)
257 Line(s) of event code
166 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
@@ -26,6 +22,10 @@ cardChart
33 Component(s)
433 Line(s) of event code
294 Unique line(s) of event code
popupNotify
19 Component(s)
261 Line(s) of event code
168 Unique line(s) of event code
pageTest
26 Component(s)
68 Line(s) of event code
@@ -90,5 +90,5 @@ cardEntities
Total
21 Page(s)
802 Component(s)
9242 Line(s) of event code
9246 Line(s) of event code
2340 Unique line(s) of event code

View File

@@ -628,6 +628,10 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities

View File

@@ -399,6 +399,10 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities

Binary file not shown.

Binary file not shown.

View File

@@ -53,24 +53,28 @@ class Card(object):
self.entities.append(Entity(e))
self.id = f"{self.cardType}_{self.key}".replace(".","_").replace("~","_").replace(" ","_")
def get_entity_names(self):
entityIds = []
def get_entity_names(self, uuid=False):
entityIds = {}
if self.entity is not None:
entityIds.append(self.entity.entityId)
entityIds[self.entity.uuid] = self.entity.entityId
if self.entity.status is not None:
entityIds.append(self.entity.status)
entityIds[self.entity.uuid] = self.entity.status
for e in self.entities:
entityIds.append(e.entityId)
entityIds[e.uuid] = e.entityId
if e.status is not None:
entityIds.append(e.status)
entityIds[e.uuid] = e.status
# additional keys to check
add_ent_keys = ['statusIcon1', 'statusIcon2', 'alarmControl']
for ent_key in add_ent_keys:
val = self.raw_config.get(ent_key)
if val is not None:
entityIds.append(val.get("entity"))
return entityIds
entityIds[f"{ent_key}."] = val.get("entity")
if uuid:
return entityIds
else:
return entityIds.values()
def get_entity_list(self):
entitys = []

View File

@@ -144,6 +144,8 @@ class LuiController(object):
apis.ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=screen_brightness_config)
items = self._config.get_all_entity_names()
prefixes = ("navigate.")
items = [x for x in items if not 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):
@@ -152,13 +154,21 @@ class LuiController(object):
def state_change_callback(self, entity, attribute, old, new, kwargs):
apis.ha_api.log(f"Got callback for: {entity}", level="DEBUG")
apis.ha_api.log(f"Current page has the following items: {self._current_card.get_entity_names()}", level="DEBUG")
if entity in self._current_card.get_entity_names():
entities_on_card = self._current_card.get_entity_names(uuid=True)
# lookup uuid for enity on current card
res_uuid = "uuid.notfound"
if entity in entities_on_card.values():
for uuid, name in entities_on_card.items():
if entity == name:
res_uuid = uuid
apis.ha_api.log(f"Callback Entity is on current page: {entity}", level="DEBUG")
self._pages_gen.render_card(self._current_card, send_page_type=False)
# send detail page update, just in case
if self._current_card.cardType in ["cardGrid", "cardEntities", "cardMedia"]:
if entity.startswith("light"):
self._pages_gen.generate_light_detail_page(entity)
self._pages_gen.generate_light_detail_page(res_uuid)
if entity.startswith("cover"):
self._pages_gen.generate_shutter_detail_page(entity)
if entity.startswith("fan"):

View File

@@ -27,8 +27,8 @@ class NsPanelLovelaceUIManager(hass.Hass):
controller = LuiController(cfg, mqttsend.send_mqtt_msg)
desired_tasmota_driver_version = 8
desired_display_firmware_version = 49
version = "v3.9.4"
desired_display_firmware_version = 50
version = "v4.0.3"
model = cfg.get("model")
if model == "us-l":

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff