From 2e87916847ab48cd38473d156708b798b5ae376f Mon Sep 17 00:00:00 2001 From: joBr99 Date: Fri, 9 Sep 2022 13:35:00 +0000 Subject: [PATCH 1/2] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/portrait/diff-filtered.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index bddee774..ccfae241 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-09-08 19:16:49.861772877 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-09-09 13:34:53.376074962 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-31 18:53:56.794842960 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-31 18:53:57.290849828 +0000 +@@ -14,6 +14,6 @@ From 79fb4f5e481ed11da90feeb7e4fd0f54db9d5519 Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 9 Sep 2022 16:21:20 +0200 Subject: [PATCH 2/2] Update pages.py --- apps/nspanel-lovelace-ui/luibackend/pages.py | 23 +++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 76e3c283..73890161 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -382,8 +382,11 @@ class LuiPagesGen(object): min_temp = int(get_attr_safe(entity, "min_temp", 0)*10) max_temp = int(get_attr_safe(entity, "max_temp", 0)*10) step_temp = int(get_attr_safe(entity, "target_temp_step", 0.5)*10) + icon_res_list = [] icon_res = "" + hvac_modes = get_attr_safe(entity, "hvac_modes", []) + for mode in hvac_modes: icon_id = get_icon_id('alert-circle-outline') color_on = 64512 @@ -408,11 +411,21 @@ class LuiPagesGen(object): state = 0 if(mode == entity.state): state = 1 - icon_res += f"~{icon_id}~{color_on}~{state}~{mode}" - - len_hvac_modes = len(hvac_modes) - padding_len = 8-len_hvac_modes - icon_res = icon_res + "~"*4*padding_len + + icon_res_list.append(f"~{icon_id}~{color_on}~{state}~{mode}") + + icon_res = "".join(icon_res_list) + + if len(icon_res_list) == 1: + icon_res = "~"*4 + icon_res_list[0] + "~"*4*6 + elif len(icon_res_list) == 2: + icon_res = "~"*4*2 + icon_res_list[0] + "~"*4*2 + icon_res_list[1] + "~"*4*2 + elif len(icon_res_list) == 3: + icon_res = "~"*4*2 + icon_res_list[0] + "~"*4 + icon_res_list[1] + "~"*4 + icon_res_list[2] + "~"*4 + elif len(icon_res_list) == 4: + icon_res = "~"*4 + icon_res_list[0] + "~"*4 + icon_res_list[1] + "~"*4 + icon_res_list[2] + "~"*4 + icon_res_list[3] + elif len(icon_res_list) >= 5: + icon_res = "~"*4 + "".join(icon_res_list) + "~"*4*(7-len(icon_res_list)) currently_translation = get_translation(self._locale, "frontend.ui.card.climate.currently") state_translation = get_translation(self._locale, "frontend.ui.panel.config.devices.entities.state")