diff --git a/HMI/README.md b/HMI/README.md index 772241d8..45ca008c 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -111,7 +111,7 @@ The following message can be used to update the content on the cardEntities Page ### popupShutter Page -`entityUpdateDetail~*ignored*~*sliderPos*` +`entityUpdateDetail~*ignored*~*sliderPos*~2ndrow~textPosition` `entityUpdateDetail~1~77` diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 7b6039af..c267209d 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 97b61623..7d54a539 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 ccc25666..1201cf53 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 7d212f8d..09854459 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 801db59e..866fefef 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index e0ffdc3c..568a20ba 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 469467d0..b397e847 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -402,16 +402,16 @@ class LuiPagesGen(object): color = "enable" else: color = "disable" + color_translation = "Color" brightness_translation = get_translation(self._locale, "brightness") color_temp_translation = get_translation(self._locale, "color_temperature") - color_translation = "Color" - 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}~{color_translation}~{color_temp_translation}~{brightness_translation}") def generate_shutter_detail_page(self, entity): entity = self._ha_api.get_entity(entity) pos = int(entity.attributes.get("current_position", 50)) pos_translation = get_translation(self._locale, "position") - self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}") + self._send_mqtt_msg(f"entityUpdateDetail~{pos}~~{pos_translation}") def send_message_page(self, id, heading, msg, b1, b2): self._send_mqtt_msg(f"pageType~popupNotify")