From 9d0c2c351a1d33b51fd898c58c13b4612bf1cb54 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 3 Apr 2022 09:17:33 +0200 Subject: [PATCH] fixed navigation on subpages for cardThermo cardMedia and cardAlarm --- HMI/US/landscape/nspanel_US_L.HMI | Bin 7483127 -> 7483127 bytes HMI/US/landscape/nspanel_US_L.tft | Bin 6307768 -> 6307768 bytes HMI/US/portrait/nspanel_US_P.HMI | Bin 7549466 -> 7549466 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 6366048 -> 6366048 bytes HMI/nspanel.HMI | Bin 7483127 -> 7483127 bytes HMI/nspanel.tft | Bin 6307712 -> 6307712 bytes apps/nspanel-lovelace-ui/luibackend/pages.py | 13 +++++++------ 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 7c11497b1099c9d253217eb155f36600113cfe14..b3d8a8c90ebd5e4704e9aa18867216f24b9f8282 100644 GIT binary patch delta 680 zcmc)E$u5I&7{%fLr-S5MwTiapniVbOqvn~Gmex>Hsj8V)Z7ggoG_ewzE?kGSN#hP| zY{b@r#3eLh=eOV*yvdVulCycg-kwxnxT}()NsCb>o^O+VH)at&jM-dXxA?usfKK@G zgpeNIBkIz2hbB=Ktdt?cD zP(ck1v{{dw|C;;n4>GxgE}>5pWDJU|whql|v&nqr(l0sh^{dMHwLNG+A&O88BTO)( z1f?iLIVw}W$f9OytN6m+2*PV}G`edxyk1~G(T zj9?UF7{>%AF$EXgn8pk|@M0Eo@WGFHEMO5!2w)j2Sj8IF5yS>I5yBS2*hU09*u@_9 WaezY{;TR`~B8F4Mv-aTG)5{NcsL4F{*6crJBuOR3L_TCUwP_crD9Tm&s;Nl<&lZnK^>oAZI7iSz? zjH`o#mq3V{zd^6TH+gb$a+Wvukx}PxS0#x=wNWjpM56E36b(mCEz`3u@q16pdf`=3 z9zS<9W?{FShyNy0kqzS8CxrA|kql|0l4QGo)fpv`{L;DAn&6wW^4=?#+<4@;N0y+1 z8X9P!OMB$J_w0XvkjlpNvHVy;%Am-a*vpkaoyb$JeUjrLe@(fJTLT6Zq6oz>q68+C z!i+MMqXLzvLN#hoi#pV!0gY%vGg{D!HnhV6D>`6<9i8Zc0tcMvMh|+?hkguT5JMQo z2u3l6aZF$mQ<#PeGjPL$Se8)8Qm;P!1`HZ9Y{aNB<0ed+GHpgm z+N?SAG8QaavTVhwHS0EP+OloOu08t>96ECB#HlmqE?l~D?Z&OUuWTxcWj@nUHoOlX Y!pHC_d=6j2*Y9-nmP;nye||sy0VCm1p#T5? delta 232 zcmWN=)lGw8006+07I)VlDelrjad&r$vjp#bxP&zrf`o2Em;}B{F8`N{=fj+s0&xk2 ziWDnRs!X{Gm8w*$QL9e92926DYtgDryAF{~UApy1>eZ*;fI&lsjTkj%+=NL}rp-u6 zn>8n6-hxF-maSN|X5EHOTej`kwP)XfLr0FCICbXSg-chi-MDr4l}$yl%tt!PhWFt^ X_!vHg&*4k>`kjv6a>>Nc`{(aJBu-G+ diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index efe2703f62467a6aed891a278ddbbeb8b70c8b8e..670c76d273e09feb1eef6461a89f2286d8726ea2 100644 GIT binary patch delta 653 zcmci5xi5op0LJn6=PmD8SJh43_fbk+RrjsxzVE9jt;8T8R!?8eCr)7vnxb7tzKFjDwXmQL^{}D=jc7tMT3|yf>}W$fI?#zObfX8o=tDmS zFo+=x!+{YvF^VyaV*-PN`qmwc5 zJIIWaaXX*QZ{VB!rgwPmKHua!cprt^7c>gV_wpbl|Cun#;yo6=5ve+1^#^1g|C8L3 zDcPz{*QLM39Cqp3B}pQ(5RTX1%lf?M*N^Lv;t44NI>^w&fH*azD9)c-O;dvZ8T4pc zJQ9$IBqSpRsYrtnCZr<+naDyma*&HWn30bH6ru>lC_yR8U_m)5P>Cv3qXt%0(`;W3 zeZ+KZQLo-@mo8C%Yc}j(c%oiAYEg%JG@ubpXhsWK(FOjsGfo+e%n`H98;`#7HOo6zB zLPF6z!O#Hon<^BOWuux_I delta 236 zcmWN=)lGw8006+0mg4U6{w6wDOzROa(54+3mYiJCD-r!PDNVEq%fGBWoDu|YF zZ3ub_;@X#%peN7=UekN|L_c11QE{20_O7fZo%VKc-{e(F3tlLbQV(~kE7qbpY=_I* z@7DZIE$Y=Y6;y_2i~Uaxdwf4td-ycCWAvw1^L5Z;G@rSQ0hdvU7@-q-5i835!ZRsD_q%Xu7lz4eKCu^<-3l2{fiVpXh(b>SBqVpD91ZLuSE#h%y~2jVdF JdV5rU{tYZAwRQji delta 535 zcmc)Exi7rWyVPA(H-CW1JF$?UgI(ee5Rxu-5{sd$ z!E6-i>Jy8^Kj2AT!;@!uVsFp-n7GJO+GW03uXNg7n^&p5@VPQ8?fzCde%cO)(=!HSViTH@iWQ>0O z^MQvi5=kPN6jDhe9WxfJWROV~+2oK*9{ChdND;-9P)Zr)R8UD3)znZ+9X9G|pbsq*RKio`fKOINPlxOMlH&qlG#XD-Tz_u)hM W7(Rv1;Y;}Xor~Vmsl-p_{o@bTR!}Pd delta 232 zcmWl|Wlq9z007V-*j-rs4eZ9m?gqQCJqjP*<~=-vn+Nb<`txnC_*;w@|BERRmr$xq zxeAr4RI5>|PQ3<=nlx+CDydDo4xPHBM7s6p)hDgrfI&lsjTkj%+=NL}re(~SHD}&} zMOjOhtyr~Y-G)tDw(Z!pXWxNCM~JQchPs#uQ diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 3ef096a9..ec5a4240 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -64,6 +64,8 @@ class LuiPagesGen(object): we_name = self._config._config_screensaver.entity.entityId unit = self._config._config_screensaver.raw_config.get("weatherUnit", "celsius") + LOGGER.info(f"test123 {we_name}") + if self._ha_api.entity_exists(we_name): we = self._ha_api.get_entity(we_name) else: @@ -178,7 +180,7 @@ class LuiPagesGen(object): def generate_thermo_page(self, navigation, entity): item = entity.entityId if not self._ha_api.entity_exists(item): - command = f"entityUpd~{item}~Not found~220~220~Not found~150~300~5" + command = f"entityUpd~{heading}~{navigation}~{item}~220~220~Not found~150~300~5" else: entity = self._ha_api.get_entity(item) heading = entity.attributes.friendly_name @@ -230,13 +232,13 @@ class LuiPagesGen(object): icon_res = "~"*4*padding_len + icon_res + "~"*4*padding_len # use first 5 icons icon_res = icon_res + "~"*4*4 - command = f"entityUpd~{heading}~~{item}~{current_temp}~{dest_temp}~{status}~{min_temp}~{max_temp}~{step_temp}{icon_res}" + command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp}~{dest_temp}~{status}~{min_temp}~{max_temp}~{step_temp}{icon_res}" self._send_mqtt_msg(command) def generate_media_page(self, navigation, entity): item = entity.entityId if not self._ha_api.entity_exists(item): - command = f"entityUpd~|{item}|Not found|{get_icon_id('alert-circle-outline')}|Please check your|apps.yaml in AppDaemon|50|{get_icon_id('alert-circle-outline')}" + command = f"entityUpd~|Not found||{item}|{get_icon_id('alert-circle-outline')}|Please check your|apps.yaml in AppDaemon|50|{get_icon_id('alert-circle-outline')}" else: entity = self._ha_api.get_entity(item) heading = entity.attributes.friendly_name @@ -264,13 +266,13 @@ class LuiPagesGen(object): onoffbutton = 1374 else: onoffbutton = rgb_dec565([255,255,255]) - command = f"entityUpd~|{heading}||{item}|{icon}|{title}|{author}|{volume}|{iconplaypause}|{source}|{speakerlist[:200]}|{onoffbutton}" + command = f"entityUpd~|{heading}|{navigation}|{item}|{icon}|{title}|{author}|{volume}|{iconplaypause}|{source}|{speakerlist[:200]}|{onoffbutton}" self._send_mqtt_msg(command) def generate_alarm_page(self, navigation, entity): item = entity.entityId if not self._ha_api.entity_exists(item): - command = f"entityUpd~{item}~Not found~Not found~Check your~Check your~apps.~apps.~yaml~yaml~0~~0" + command = f"entityUpd~{item}~~Not found~Not found~Check your~Check your~apps.~apps.~yaml~yaml~0~~0" else: entity = self._ha_api.get_entity(item) icon = get_icon_id("shield-off") @@ -324,7 +326,6 @@ class LuiPagesGen(object): arm_buttons += f"~{get_translation(self._locale, b)}~{b}" if len(supported_modes) < 4: arm_buttons += "~"*((4-len(supported_modes))*2) - navigation = "" command = f"entityUpd~{item}~{navigation}{arm_buttons}~{icon}~{color}~{numpad}~{flashing}" self._send_mqtt_msg(command)