some more cleanup

This commit is contained in:
joBr99
2022-03-22 00:09:04 +01:00
committed by GitHub
parent 60acdf0600
commit fab72bd954

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,14 +635,10 @@ 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):
if page_type == "popupLight":
entity = self.api.get_entity(entity) entity = self.api.get_entity(entity)
switch_val = 1 if entity.state == "on" else 0 switch_val = 1 if entity.state == "on" else 0
icon_color = self.getEntityColor(entity) icon_color = self.getEntityColor(entity)
brightness = "disable" brightness = "disable"
color_temp = "disable" color_temp = "disable"
color = "disable" color = "disable"
@@ -665,7 +664,8 @@ class LovelaceUIPanel:
color = "disable" color = "disable"
self.send_mqtt_msg(f"entityUpdateDetail,{get_icon_id('lightbulb')},{icon_color},{switch_val},{brightness},{color_temp},{color}") self.send_mqtt_msg(f"entityUpdateDetail,{get_icon_id('lightbulb')},{icon_color},{switch_val},{brightness},{color_temp},{color}")
if page_type == "popupShutter":
def generate_shutter_detail_page(self, entity):
pos = self.api.get_entity(entity).attributes.current_position pos = self.api.get_entity(entity).attributes.current_position
# reverse position for slider # reverse position for slider
pos = 100-pos pos = 100-pos