diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index b83f23a2..04c374b0 100644 Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index 4254ed15..955c3574 100644 Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index b622bbc3..ecb8ddd1 100644 Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 499bb72a..8b1d421b 100644 Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index d1d9592a..ca8d5ad6 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index a126148e..a3538884 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py index df101e01..9e678260 100644 --- a/apps/nspanel-lovelace-ui/luibackend/controller.py +++ b/apps/nspanel-lovelace-ui/luibackend/controller.py @@ -299,6 +299,11 @@ class LuiController(object): if button_type == "tempUpd": temp = int(value)/10 self._ha_api.get_entity(entity_id).call_service("set_temperature", temperature=temp) + if button_type == "tempUpdHighLow": + value = value.split("|") + temp_high = int(value[0])/10 + temp_low = int(value[1])/10 + self._ha_api.get_entity(entity_id).call_service("set_temperature", target_temp_high=temp_high, target_temp_low=temp_low) if button_type == "hvac_action": self._ha_api.get_entity(entity_id).call_service("set_hvac_mode", hvac_mode=value) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 24689ee7..08be9a51 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -289,8 +289,12 @@ class LuiPagesGen(object): entity = self._ha_api.get_entity(item) heading = title if title != "unknown" else entity.attributes.friendly_name current_temp = get_attr_safe(entity, "current_temperature", "") - dest_temp = int(get_attr_safe(entity, "temperature", 0)*10) - + dest_temp = get_attr_safe(entity, "temperature", None) + if dest_temp is None: + dest_temp = get_attr_safe(entity, "target_temp_high", 0) + dest_temp2 = int(get_attr_safe(entity, "target_temp_low", 0)*10) + dest_temp = int(dest_temp*10) + hvac_action = get_attr_safe(entity, "hvac_action", "") state_value = "" if hvac_action != "": @@ -339,7 +343,7 @@ class LuiPagesGen(object): state_translation = get_translation(self._locale, "frontend.ui.panel.config.devices.entities.state") action_translation = get_translation(self._locale, "frontend.ui.card.climate.operation") - command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp} {temperature_unit}~{dest_temp}~{state_value}~{min_temp}~{max_temp}~{step_temp}{icon_res}~{currently_translation}~{state_translation}~{action_translation}~{temperature_unit_icon}" + command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp} {temperature_unit}~{dest_temp}~{state_value}~{min_temp}~{max_temp}~{step_temp}{icon_res}~{currently_translation}~{state_translation}~{action_translation}~{temperature_unit_icon}~{dest_temp2}" self._send_mqtt_msg(command) def generate_media_page(self, navigation, title, entity, mediaBtn): @@ -557,7 +561,7 @@ class LuiPagesGen(object): elif pos_status == "closed": icon_down_status = "disable" - pos_translation = get_translation(self._locale, "frontend.ui.card.light.position") + pos_translation = get_translation(self._locale, "frontend.ui.card.cover.position") self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}: {pos_status}~{pos_translation}~{icon_id}~{icon_up}~{icon_stop}~{icon_down}~{icon_up_status}~{icon_stop_status}~{icon_down_status}") def send_message_page(self, ident, heading, msg, b1, b2):