h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-22 05:58:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

some more cleanup

Browse Source
This commit is contained in:
joBr99
2022-03-22 00:09:04 +01:00
committed by GitHub
parent 60acdf0600
commit fab72bd954
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
View File

@@ -190,9 +190,9 @@ class LovelaceUIPanel:
self.generate_entities_page(items) self.generate_entities_page(items)
# send detail pages in case they are open # send detail pages in case they are open
if(entity.startswith("cover")): if(entity.startswith("cover")):
self.generate_detail_page("popupShutter", entity) self.generate_shutter_detail_page(entity)
if(entity.startswith("light")): if(entity.startswith("light")):
self.generate_detail_page("popupLight", entity) self.generate_light_detail_page(entity)
return return
if page_type in ["cardThermo", "cardMedia"]: if page_type in ["cardThermo", "cardMedia"]:
@@ -283,7 +283,10 @@ class LovelaceUIPanel:
if msg[1] == "pageOpenDetail": if msg[1] == "pageOpenDetail":
self.api.log("Received pageOpenDetail command", level="DEBUG") self.api.log("Received pageOpenDetail command", level="DEBUG")
self.generate_detail_page(msg[2], msg[3]) if msg[2] == "popupShutter":
self.generate_shutter_detail_page(msg[3])
if msg[2] == "popupLight":
self.generate_light_detail_page(msg[3])
if msg[1] == "tempUpd": if msg[1] == "tempUpd":
self.api.log("Received tempUpd command", level="DEBUG") self.api.log("Received tempUpd command", level="DEBUG")
@@ -632,46 +635,43 @@ class LovelaceUIPanel:
icon_color = rgb_dec565(color) icon_color = rgb_dec565(color)
return icon_color return icon_color
def generate_light_detail_page(self, entity):
def generate_detail_page(self, page_type, entity): entity = self.api.get_entity(entity)
if page_type == "popupLight": switch_val = 1 if entity.state == "on" else 0
entity = self.api.get_entity(entity) icon_color = self.getEntityColor(entity)
switch_val = 1 if entity.state == "on" else 0 brightness = "disable"
color_temp = "disable"
icon_color = self.getEntityColor(entity) color = "disable"
# scale 0-255 brightness from ha to 0-100
brightness = "disable" if entity.state == "on":
color_temp = "disable" if "brightness" in entity.attributes:
color = "disable" brightness = int(scale(entity.attributes.brightness,(0,255),(0,100)))
# scale 0-255 brightness from ha to 0-100 else:
if entity.state == "on": brightness = "disable"
if "brightness" in entity.attributes: if "color_temp" in entity.attributes.supported_color_modes:
brightness = int(scale(entity.attributes.brightness,(0,255),(0,100))) if "color_temp" in entity.attributes:
# scale ha color temp range to 0-100
color_temp = int(scale(entity.attributes.color_temp,(entity.attributes.min_mireds, entity.attributes.max_mireds),(0,100)))
else: else:
brightness = "disable" color_temp = "unknown"
if "color_temp" in entity.attributes.supported_color_modes: else:
if "color_temp" in entity.attributes: color_temp = "disable"
# scale ha color temp range to 0-100
color_temp = int(scale(entity.attributes.color_temp,(entity.attributes.min_mireds, entity.attributes.max_mireds),(0,100))) list_color_modes = ["xy", "rgb", "rgbw", "hs"]
else: if any(item in list_color_modes for item in entity.attributes.supported_color_modes):
color_temp = "unknown" color = "enable"
else: else:
color_temp = "disable" color = "disable"
self.send_mqtt_msg(f"entityUpdateDetail,{get_icon_id('lightbulb')},{icon_color},{switch_val},{brightness},{color_temp},{color}")
list_color_modes = ["xy", "rgb", "rgbw", "hs"]
if any(item in list_color_modes for item in entity.attributes.supported_color_modes):
color = "enable"
else:
color = "disable"
self.send_mqtt_msg(f"entityUpdateDetail,{get_icon_id('lightbulb')},{icon_color},{switch_val},{brightness},{color_temp},{color}")
if page_type == "popupShutter":
pos = self.api.get_entity(entity).attributes.current_position def generate_shutter_detail_page(self, entity):
# reverse position for slider pos = self.api.get_entity(entity).attributes.current_position
pos = 100-pos # reverse position for slider
self.send_mqtt_msg(f"entityUpdateDetail,{pos}") pos = 100-pos
self.send_mqtt_msg(f"entityUpdateDetail,{pos}")
def send_message_page(self, id, heading, msg, b1, b2): def send_message_page(self, id, heading, msg, b1, b2):
self.send_mqtt_msg(f"pageType,popupNotify") self.send_mqtt_msg(f"pageType,popupNotify")
self.send_mqtt_msg(f"entityUpdateDetail,|{id}|{heading}|65535|{b1}|65535|{b2}|65535|{msg}|65535|0") self.send_mqtt_msg(f"entityUpdateDetail,|{id}|{heading}|65535|{b1}|65535|{b2}|65535|{msg}|65535|0")