From 331e170d789e70bfcab0f1bcdecb447286b90f44 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 29 Aug 2022 21:16:59 +0200 Subject: [PATCH] bump to 41 and fix color on screensaver --- HMI/US/landscape/nspanel_US_L.HMI | Bin 11147230 -> 11147230 bytes HMI/US/landscape/nspanel_US_L.tft | Bin 7668568 -> 7668704 bytes HMI/US/portrait/nspanel_US_P.HMI | Bin 11491767 -> 11491767 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 7763400 -> 7763536 bytes HMI/nspanel.HMI | Bin 11147230 -> 11147230 bytes HMI/nspanel.tft | Bin 7673196 -> 7673196 bytes apps/nspanel-lovelace-ui/luibackend/pages.py | 24 ++++++++---------- .../nspanel-lovelace-ui.py | 4 +-- 8 files changed, 13 insertions(+), 15 deletions(-) diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 1651d90d2c8b7ceec05d779034d392f92ff763d0..b4859f0ee4c768399de2ea2a63968b76b50e726f 100644 GIT binary patch delta 1804 zcmdte|4&tQ7{Kx8TrOTNKf%2hFK|5sR%9v2x1=(J(!7F!C|^oSkpM+NKp-tE2si?U z$+zNT5`y9vm_O8_?Pi;kg>G%RwSH)A{-Bu4t+lz;50yW-^%jnvr2n9^y>_4Te4gj? zJm+5fY$Es?KCcRjlCs@(i5qgW#e8nBbjh?$L>p`iy6M}q;MDDR&z*`*rdsWrHBAP8 z2=;2))UUw>nwC76;qb1OnM_GfY$&^b_nrUcXT|<$ zgc;$6%WxYWBf?m0c#TLS%835bcdWpE(^2zt;CO*Ar%+2%aogi6RMK9rYf)d;nm_#K z)bAsDN$c0?{M$UaYegK|d|bFrWFTlhzU3D=Va8n>MUI$p#3m~q-y+g$=2MET-b-6W z4x9P>ZC1_o9S`!YQd40y+}$N|$ZY7WVF7cY&e{hJ;%cz!Pc>Qjr2W=_iwCSYuf?jl z+Gh3E9ux`DTIavAxl?4w92VLw(r+#?++)QndaaAT8W8C=YqEw!oMvyfVrMhXIV#d; z)?6L7;_6Wmn^{vEH73$y7X3AD#qDPUH%9gIp|-SDfg6+Yp&{z;YF~Wd$`^VdT(#f! zxrgdvJb~qx^^P#*`CfOa*mjp)-I~@DR9xOtj~ct8hp5p@dZp^$7voV`GrBW6t+=c< zv7x*^qj`OOV`X_+Q*)}B`B%~XlvR|nuqZV8KNlsNnFOVMr$?ySZ*-^o;Ys%fTc?hQ z)Q2}oS#TaUm#~&d9=fc1RaTWZJaF+x{g=J!beDTXrsL9PxMp%kU(g!g8!Y0ur$jNk~QtQjvzIu?p#U z2G8O-tj6=mz#3#C3oqbBti?LKg!S-a1G15Wjd&Tk$ipV&V>7m(0EH+*FD?e2k60Je263HMIZVxfI)nOk1+&=qxb~JFpN(zg5wy)7*60M T#&HU#aRz5G5hyL0Y`yRg#F`gx delta 1382 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 HV&4A&P%g6K diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index e9a7d0aa031e93f29b73355fd1d5400db3e19ad0..fe84c0e45d4674d4c4e06c5e4d9b27bf6f070d65 100644 GIT binary patch delta 2021 zcmeIy{Zmv`7zgm@F1xTeQn0d%3tUhlUywx>P^g49Ai#)3C5TGf6$m$0S>Cd=MC8hg zpdgDJiikxemqnQ=usb!;2=!yAj5Rh+GuH4!GyW1Ola4h*-^B|To&JQ*%xCsF=XsuU z&)$3IiX&qx5x7I2b33`veHQEfn5>+wB#kek{OPg+6L8qMUmbazzr(ChbKHnk@rP1R zaWQtwLNR{tMhDSE9uYTE;ZvqaG(MKDGx76jnkXb1v#DAqMiriN&qzDXla)j3cZH67 zzPz3u-I;Dp^7Q2(@(#nYf~45Tvc)suls<%Qmh3z~$C9gO6;0lr-iisLktPJe^6@FU3MO(Mc)RY?EW>4!M3~K2e8MGmh7_ zRf=XtYN#*60i*-f+ZG$>NxNL%UnQ>_4#*ey=AayBAC_xw z)XBZpV?=7M_Tj&*Xdvp6F6PrjbV@ozcZ(daZ<9B=)IroF)g*Tj`AWSR3}=?&%x)fSTEx z^-qS%9E=z$}3BXELGL<`4(FYRy-*_cwr{zMbZLHmLC)j*x0v7kH}4zpXuC1S&Zhq1wQQA38^BU} z!~B`aq19cQ8QQX3)M~tEnjWrFcAp)L)NO&67z*<-b>mdp@Kr|R2 z1~x)07$FYgApthQW=Mo2cm|$@=U@vYLkc_(CU^l-Aq~>uMaY0m$bzl#5@f^6kOQy4 zHpqqTumg5N9=r1`F(gA}EFucpFM#FIeFnC<7bpgZ)qr zcBp_#sDf&!fp_5mya(^YK{x~-z=v=cYT*df!BMCO0ggcfG(rh*sC DJfVgo delta 1707 zcmdtg{ZCbO9Ki9<_j*C2-2_SCULj`S6A}t4S5OqmRD1$?kc4=+3MR>8M1rL^xbx#_vCl|3!UwC?|bKa9=_jm zjv1PWFrm8ds8W?Ep2n7pZMzD^+CE8(mU}i4_2pa@Xj4;xG8G-Dv&~TwYP9`scV=c~ zw0ZtLnEyZ1+Co ztqf#F#VZLEMpf`T8WlSyW>|@ubg9s{QCDpCvA?f21s*z9+yC-Rd>5#5B=inBd_xWe z8)m_d2t=Agj@eCr{NLASL>n>2JR{b4+L&*|8SzGf;WS*v0weL$q@H|x;@I{3=8+m_ zPGs<%ueA1?@AHpb)3hg+|8s9@ci@e{u3kt950PLCuvR7C!g z`~97m;h?uNCEJW0a2-!Zl^o=I zn%O>|ryhMEbnna6UA0bk_4=9ihA&i`rw2S6l>8drE!#ILIcH7ohXN(1t#00;`lRwLhU;NwW3i+?9`4EDLJ&Vw%1C^^IE(=x(o9@|1P5w^6shMfZgc-8Z^)o5z&+ zt%+{#(fyU7yQV+fX)_D`?W7*)8c?#(davgPS%KA`139wqSb>$uL>5+IHP#>-ZmdNPaM;B9D7lL7qJhOsKQIAMh$9F2M_k+0P4|zgLoN- z(1=%X7)@wK3tG{JcD#xXyoOG^jw9$oH;&>ByoqBt4lmw94^E&L2Hr*=eCWqJco!#e z3Vxi%0M1|#XA!^<&S4lqjNm-p!v(yLi@1c#xPno9fUEcr*Ki$U7{?9V#7DS=+h%9q I#|2;i0|)K!rT_o{ diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 7a10c3ba9d867bed98f299d20b8a19c5eb246e95..8c9696b3a7eeda31f54c450e6efae2abc84189ff 100644 GIT binary patch delta 12146 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 HCr14bZg4Mp delta 12788 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 diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index aa2c3f96f200a3f4c9bd2303cfa725a61de5f201..6b69852e3261cf6bbb8046e38dbdbf39407efd62 100644 GIT binary patch delta 1052 zcmdtd$xl;J6vy#$Krd@Fbs{-2Bct$?bU3YU_Y3ekw~fUwO1F z?k)@k#ozjpn;~AO@p#)MM7Qj*_fIBMEt*qi39q{{`frbJ1Psv@5kjUu=oK>G(=GPL z&EK(LM7-=0C3yepyRG3(fu^^a;-iPvh)5NsztD8&=dft})GMzpW>3WI5^2z&!-jM# zX7ADT?LYa3>aF^y3}vXks-MbKj%TJnu2sK+rRa2zLa5~pw)XK)th(17!}fJR)zC0s@lO}K)qXvQ_P;5u&L XCT`(2?%*!&;XWRq)oSm2Xv_HtXng@I delta 959 zcmd7P$xl;p5Ww;G`ub{YJRntCtaYo!z0kVv)~!WEQBhEEsfsNsZB?``xb`OnSETBz zVik9c35JxU@nE93+>NJR8vgWazIJsl>*0) z(n9IIPLgCa`5Qw{UuC)UH+tPeJt>`1ta7o-?Tq;U^~ff#N%~k#k^ZU=%U0=KR&5?o z74Pez8BfR}C0p4%@GTuRyjApxy407%_u*BspfMga%Fsc99x4o(pmA98*MEMVC=eq> zp)iS2Vzej{=6;JOlo|2C7FD#`Pqreh?5EkFb^SIsWQ?C}-IwCoyamM=11rYDhH)5= z37CjUuwybDD8Up=#WYOE49vtVI8ll+xZuWY%)wmD!+b2jLM*~!EWuJN!*Z;E2P?4( ztFZ=a;e`+7SceL%MG(u5f3FvmLgS}M;=R;A=49CvgOE?C*M=g6ev`rSk!YRO1)5~ zT!l(is@14fr(T0bO+3@e(9@BFR(9Qlv_gE<>hgvSiEg+zYv0%9AgmK%pYVN|Y*7 zu0o|M)n2Jlt4_TJjb3}>ttQP{w0ft_d+j=W(5Xwe9=-Z}^hv(~gNA(e#jp{h#*CXV zY09*(X3Uy1Z^5D^%T}yfvu?wtE!)2NZpW^@zxy|lsK$$~tApJ0`^bLyBRmKX!=vyx V{2BfVfB(CWocwu+y*=&!{|HnpZo>co diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index c6c4e34e..a4109d50 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -142,24 +142,22 @@ class LuiPagesGen(object): up = name if name is not None else entity.attributes.friendly_name icon = get_icon_id_ha("sensor", state=entity.state, device_class=entity.attributes.get("device_class", ""), overwrite=icon) if "color" in wOF: - theme = {} - shift = int(self._config._config_screensaver.raw_config.get("alternativeLayout", False)) - overwrite = wOF.get("color") - if type(overwrite) is list: - color = overwrite - if type(overwrite) is dict: - state = entity.state - for overwrite_state, overwrite_val in overwrite.items(): - if overwrite_state == state: + if theme is None: + theme = {} + color = wOF.get("color") + if type(color) is dict: + for overwrite_state, overwrite_val in color.items(): + if overwrite_state == entity.state: color = overwrite_val - if i+shift == 1: + if i == 1: theme["tF1Icon"] = color - elif i+shift == 2: + elif i == 2: theme["tF2Icon"] = color - elif i+shift == 3: + elif i == 3: theme["tF3Icon"] = color - elif i+shift == 4: + elif i == 4: theme["tF4Icon"] = color + unit_of_measurement = entity.attributes.get("unit_of_measurement", "") down = f"{entity.state} {unit_of_measurement}" weather_res+=f"~{up}~{icon}~{down}" diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index 3da4f968..48463842 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -24,8 +24,8 @@ class NsPanelLovelaceUIManager(hass.Hass): controller = LuiController(self, cfg, send_mqtt_msg) - desired_display_firmware_version = 40 - version = "v3.3.0" + desired_display_firmware_version = 41 + version = "v3.3.1" model = cfg.get("model") if model == "us-l":