From aaa8fc73d537c549c94c9211bb1a37094223b80e Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Tue, 22 Mar 2022 11:37:04 +0100 Subject: [PATCH] migrated thero page to new button cmd format --- HMI/README.md | 12 ++++++------ HMI/nspanel.HMI | Bin 7356153 -> 7356153 bytes HMI/nspanel.tft | Bin 6291448 -> 6290864 bytes .../nspanel-lovelace-ui.py | 12 +++++------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/HMI/README.md b/HMI/README.md index cdec10ee..f0136350 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -188,19 +188,19 @@ The following message can be used to update the content on the cardEntities Page `event,pageOpen,0` -`event,tempUpd,*pageNumber*,*entityName*,*temperature*` +`event,buttonPress2,*entityName*,tempUpd,*temperature*` -`event,buttonPress,*pageNumber*,*tHeading*,*entityName,1,hvac_action,*hvac_action* +`event,buttonPress2,*entityName*,hvac_action,*hvac_action*` ### cardMedia Page -`event,buttonPress,1,tHeading,internalNameEntity,1,media-back` +`event,buttonPress2,internalNameEntity,media-back` -`event,buttonPress,1,tHeading,internalNameEntity,1,media-pause` +`event,buttonPress2,internalNameEntity,media-pause` -`event,buttonPress,1,tHeading,internalNameEntity,1,media-next` +`event,buttonPress2,internalNameEntity,media-next` -`event,buttonPress,1,tHeading,internalNameEntity,1,volumeSlider,75` +`event,buttonPress2,internalNameEntity,volumeSlider,75` ### cardAlarm Page diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 21d7331b57ee8159568fed2648cd5a6996e43329..09980090429bb76daa59435619de23e451a1de4e 100644 GIT binary patch delta 3166 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 Z&Ce_q8Kw2=4IOv!FCty-*L><9{|2jNSI__e diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index e1cc2552..d532df2b 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -288,11 +288,6 @@ class LovelaceUIPanel: if msg[2] == "popupLight": self.generate_light_detail_page(msg[3]) - if msg[1] == "tempUpd": - self.api.log("Received tempUpd command", level="DEBUG") - temp = int(msg[4])/10 - self.api.get_entity(msg[3]).call_service("set_temperature", temperature=temp) - if msg[1] == "screensaverOpen": self.update_screensaver_weather("") @@ -437,6 +432,10 @@ class LovelaceUIPanel: pos = pos/100 self.api.get_entity(entity_id).call_service("volume_set", volume_level=pos) + if btype == "tempUpd": + temp = int(optVal)/10 + self.api.get_entity(msg[3]).call_service("set_temperature", temperature=temp) + def generate_page(self, page_number): # get type of page page_type = self.config["pages"][self.current_page_nr]["type"] @@ -657,8 +656,7 @@ class LovelaceUIPanel: self.send_mqtt_msg(f"entityUpdateDetail,{get_icon_id('lightbulb')},{icon_color},{switch_val},{brightness},{color_temp},{color}") def generate_shutter_detail_page(self, entity): - pos = int(self.get_safe_ha_attribute(entity.attributes, "current_position", 50)) - + pos = int(self.get_safe_ha_attribute(entity.attributes, "current_position", 50)) # reverse position for slider pos = 100-pos self.send_mqtt_msg(f"entityUpdateDetail,{pos}")