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 21d7331b..09980090 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 44898105..674b8599 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ 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}")