From e8f0f227bdbee5d23744c6a8e6dd746c282ff7d4 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 17 Sep 2022 22:24:30 +0200 Subject: [PATCH] fix for #471 --- HMI/US/landscape/nspanel_US_L.HMI | Bin 11147230 -> 11147230 bytes HMI/US/landscape/nspanel_US_L.tft | Bin 7672112 -> 7672064 bytes HMI/US/portrait/nspanel_US_P.HMI | Bin 11491767 -> 11491767 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 7766824 -> 7766776 bytes HMI/nspanel.HMI | Bin 8927401 -> 8927401 bytes HMI/nspanel.tft | Bin 7745884 -> 7745836 bytes apps/nspanel-lovelace-ui/luibackend/pages.py | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 2e426d57b3d95497dcf1ecebbb640ed763fc0579..2e04a429cf032a04da6f5bee40c1258c8aafcd1e 100644 GIT binary patch delta 2030 zcmeIyTToPW9KiA4Sy-T;OfIpz%F2qHRK(pdO|pa%5CsIK1O!QL-av_)Ach-IP-#>L zN)r^3coBzYPE$6S5#xg~Hco@nFcyv$Y7aH_&`i_R7xvJC&pmc#J~O}n@BHuobN<)P z^c$~1*?v~}Lopa+=uf4( z#~VyisWa>+1V zCUuY7BB?ddns-CPUXcd(>s{%G4=LU)injs-+~5u)JT%4I^XK3H-^u@KCmjzs<~w{H zehz;}fa5_&;72CAw{dK9^(S@e*>H25daE5qq7j3~RgSqFls7A7FKbdOmAGhE^VFPBv(t9t|9iQ1g64ebvdaAd~j_rNEMSwXntHFO{HO@BY%F(8|nR<>8ez zm9|xjRofMtzgtAael`7XTYzd?X7X3&Pgm5sQ!JyI+HVF^w3o(xG16o#`=zkdrj|5Y z?=)VuJGaG$S%KVE|DwfDJAd7r>e-Ss zV8H?`)RG2*EaMs%USGXdH*Bdjv@{tPAs99+MhKR`j)$-mp?DaN;8BF(F@z%mk%&Sx zVi1dEcpPz9jwi4JEAb>&As$a*HJ-*ZSc3#4;#oY0wMarTQm_uGSdR@zLpn0B5t+!s zCTvDFp2rK=f*j-`4_lFs0&GJeUc`13p%^77MHzNrCw5^s_MjXU*o%Fr#7n3`HEK|c zI_yV18gKxOIEa_gghO!P6*Qv-t#}o$p$+YL9dF=G9L5p6g$}%pcknJ$bfOFI;e8y% dF?@jI=td7t;3Rr+3Vk?@etf7k83%HF{{b@500sa6 delta 2265 zcmeIzdr(wW90%~<-51J2AP9T+?y?KPs+b~#sAY&HRLC0?(Li~q5CV!8B9B&a1r#zK z+M$OEretc7gX6V~21nDTDgJ1t$6uh0jbx6}0E`mrQkjumJq+0Z(?O8d_{s(h+?CE7CslYS8^4CZ-d3f9<% zSEZ6>8`+)8@WE?SqBXkniAQU8hZ$SKi~?vt3p&t)K@Kx|jos^xHb(v*G2uT(%;oQz z<_d5Hx~98=T){5WSpw0e zn#$`xDZ)5UxmfN0X$es$@1Igil*H%ns302Gg({2HR=Z!6a$yb8EnZ$;&xTi8mdFoU zY{eS(<4kF{tZB1()yhHpL}M3DtT&rz4baKGQ_OKXjU|L#_cdGD?>^?+f|X^RlBTnJ zzUE1GWVJO&*7})m=>(e`^S~0SVUy!X%!Ft$us>66r(b1)m|4>8CS!RB~Djw`hO zrZG$}Eo;x+%0|K^6Z@*iWOtr3DBn2grDjV+=GyrNkNK*>nKzASjPK*IV4@b@=OD5* zj|bth4L1WX-w!9+%lqt_sb;qv+2q-E(w#`6!#rs1%hmLDr>Iem$RKLv6P?ahGw~s^ z>p2c*SKun)*&1F+^oO!98p+46xb&;@dx!F&-Z+z<-A^k~qjeOU@kDEOIet7m#eZP~o-^wic<`LD>&yC6%u60Oj6J_?b>98QzY?8JuY-!TlAr!*kaR`S9aKH?h39}#) zX2TOO2j)T)%!6o%fhQpr=0hAT0QVY;;3;?-7Q-_T4@)2cmcp~}94v!GNP_3#1$YsX zVL7BgDx^U=WI!flK{n*T3RnrbunO{EHLQV`ARh`~Ev$n=D1u@rf%UKfHbNJgoIk!YR(}-1Eg#ET zImv^c|9@_Q=N5Qwf#()@Zh_|(cy58`7RX7isfCu>&@S3lyJ?d)YjbLaUdYB%rN9b5RQpf30dbEz$@8~gltRAP| z)#LSq9SOl!nQh@aohLMs<1M_Vc49r*&cZFbOz@EnEL=W5slB}D&h;lGb(O2!dE|to zzM?k|-Ib8+*WQJwE)ltti} zaxYO}&HFJSzm?d*V_gyhL^JDLm&ChXa;UpQ3DJ^2ubt>4$=#{L?`EeC>&;FbMw^{F z)Zz_w5|jO;@t+Q_`P+5a>gUwqswA>PhZQEd^8x>OAR)kN@k>1A-RM*;Nww^1H!_QJ zj=?QM#aVl&g$Z!)0HZ&!Txy z^}2|B3>{esiCODc_WgV8bbyc z|8GQiY?4p7h~$2Yk^mXwUQ7|>8htrA1*LR^jSE9buh35AX^vNO@sNf{qS%rTXqf zyUCY+JSym|VplrvMs$+uk?o0~$u-^R2%c|&Zx|{E(NEECbRPm{QG-_Xl{9&k8wKOJ zo(QMY`z5Ww=vU!vapq4!0RTUx*F~17r=0QPk^Pu)BMBY5eGux|gJ$w%fvf<|^{QZS{bWr}n zo5yxg6*!`P9hKGNM3JC_#e$NK*kx;VQjNq3j_8B|Q`tXKRamBfZ=d0eydZPp0=ZRZ zm1UX*=+^gwze!UKJYJ;!)S3J!ni6RiS9Vs#mhCW)eNnR;SD%wo*Zh^^*~7?*>%{fD zsd6G`q=~@D?Ek||7rb>S1 zDmRsHy7G&l0jC6C7>4!hQzSLR`aNkFUE$c*v8N}e1YJKZXzm#t6F2Ii8X182&TzGr z|L&n)5SeW1se;554(kbZH=cE>yI=6gRm$7V@mRz;%Mx1VBzy9(UTU@oa7~d z2iJL5Z+w41ns_yV> z{Zvyin@-m2N5m6n+B`d;GVA=u=U2ZF{u6l8iN=q%443T6s#84BhRkZXV8H2$`GSV}Z@^XL&Ti^le+ zJ{C0oA3^Sjp9}nU41}g~Mhx_N48&$TC(9jrt$kCa8^=wOMTlzV=-B2cX2skEA; zxECbisbn~mxXhKq5l?+RB<H>yiIjuyum zBjHvCuOF$bZu4qNdQ_9+<8V~-I6F=iim$leC>3N{fpluK4gdE*%)EA#S|yHg$%myJ_@7&rYTckxzD z`0~4Im3-pQGsi1GS>?~4kH>j=2S_qEl(Z6UJCB}#zyicI>ZxtjYg5FJfszh4k`(ij zq-2gtz)AlY$jJ$iT=24_S&b#t36j)|TPMPJ3phGaSv{kIC3R?mBS5porqg zBsf8hP`j>qa)%@J44kO;A^^RT!PIjw#j?cdwv*t{4Y+)gvKm=!r9CL?a8hQ$-osHI=CCO^N-Ou9qKe%+c63g>jJ@Wh zc$-={9ydHoFX`{&G+VI$RGen`>yp;;xv5wqoK4e!`1FwU5g(cc#D^>Gi0mn8B5z6q zBKcGrkSjn2@uGBO$SXa0e>%*4w3noPZ%7J?l2n5;r^DPwdHr-mV_0uV0evtj+GL(E z156la&p@JBh#F5Q4GO?m$TP7^idbravtDKf;?06ji%rc=LsI~G! zBA0!j@?9?_O6tq=Kg7hB5_#8$D&PF&L`gN1ai$CYR`or6sDM)F70RM}^d+yJgHU*P zlB83Uc-UM-;JZ9$E^O62MbZ-P_7SYtoF{$+5}%(aBkf0Yv&CPs7R?Rrg3pLa>=ite#nqio98T4LGsrboVQTryNAq{ zR6kQvJWtF)iV0!P!QiwHBqe+(X$MDt0yK>?J^@-X7isGwNiH0@2xtk9T?EuOOOoYd zNdq`&F;HLbw;1TSY)Nk}l(dGumH-{c5lfWSvg;E`8yDf&7W1PesTQhqvj%q%5pjREAWdq zOM1MSL)T-W#T>mJGY!m>)NQMz`Ru&`TO7!d8(^U}JM8MWb?xA4xA&-xuw6U$`Wj3} z2h-nmu!Cu}2@Fnb6K3iTCVZ!)G+v#HnYwdvE}Z+i)$SFU-yj06TRHC=m2cUwThj7x zC0*LX$(!K-8<;m^WdD7V3V6^Kgh7AK*aD<>p`_W|J`YH39-F7EVhQ_iMMhXs;>-wc zXG$d9D&ZHl;Zldbqeh#`k4ftNgX9Zks)45;jOPn8w1x4?k8!|umG2pOTvGE=ymgdG zx?IM;Z%0*#WYZ253>%=EKT0b53HqJjV>?u!w3Tty4pn5ScG4MGy9DR8Ro?OhGR@o+ z-<;%NuAh%Q8_9+F(7M~NlJYps3az{GdaJUUzbKbf{UUNn!C2&yF0>l@_|XX3OJ8vI zE{GVHBu(O|-4HQ&%5I3fb6L^}G)^i?sqYbw7l$#T9(^yy&^sLaEkufblhlTN_dukG zd+dSzn_R(gv~)J@h5egw*k1ejRv;swt>a2NI*`5h0ZqRKS4Au3Q~Q9Xvuz(PARBKu zH@J)s6(EtWD{%y`Jgtb<3X(60pZ>1fcASXI1<=y=%3%Bo#14v!_ zdG!HRD4$mG$b+h}`EHec;A{+giMJg@6?=*M9l|hgo_GlAbh;yH6IwQh9acdG9=V|< zb*rbUOA&MLNqT^G?moZx9lT{OM}CL>pZwFFDjt6azdHFR2NxlYwSI^Khc=fhim<8H z>{X1p$NVMfB-(B+Ee1M<9~L98bl~zM*g)sUcD<4fg-j60=T|A8oa6uwJ*oz}zXoa> z8uOf^kb8}{994TZ{DcOlS@$tw{T@C zynahH!&wLKRWr!M=gM%=MAzx`ejWy8c^G`bRWSv+Z>hQe$&% zdn@id=VF?w*VzZz|w6E6q?qTAoLbTUxLsvAm!~0y7sC; z0qlDj46f{#!E|bGP~Q#)MRznPla1fNbmE}jp!b?i2JMJ6sGze!e|F}Zzd>(Q+TRfz zwYnI1T`u_@$)OfM1mdy0t3kQl49b7apgp|j3Z_}kV(UV8&Z~gxaXp}RPlIOnGH4E`T!nlb^Ht2e?hVWsWl&LXgG%`AYhc!K#x*e4 z`e5e123h(Ww5S8^TW)w7!0yb3{idLS%2i1R8@tk14dFUXSv zd4HAq*3~u$XT%wIAov(vo9*jof=} zaryI^Ufb>=N^5Y~eMD)EIA@fahs41{(d@5^!3Lh}fx6YBjiiX+Q8+TR4QzUV+!D-T z50tgu@pyywy<^bCF<5o1eGTW&TrT_xFASia!TL71p5qMq3(dmk9wJx)IfFHPyi;zM zGgyPh{}-%|8nvHG|H2jyPqhy_Nv9q6VXpdHEs#G?<(ZF_pE$y+ALG{P#-6&D*oj?Tbq6lb~sIm%mHQt@RZ1MxJ|pjET%`7XsZ6<~Be} zu=JmA-`{?D*ikyWR>R%~b7eI!F%IUmJnvv?dVm?mg&wJUL_DW?riPeDItEmM?$1v> xQ{!cD7N>ir`gvs2+jIo~hKfKG*laIMb`9V5kZg^nj_BT2J$0JPh=Pcq{{vJ>5I+C_ delta 8362 zcmeHLi9?k|_dYW(%f09YcVtH>Q9wytFjvUZ6ctPp%Y{(fWhv%nDkyqX#7gC2Rza~A3im$G88*#DD_~Nu- z#o7Iy{(owLrxti>fu|ODYJsN~cxr+F_ZFzHg_hdTZrWXYXisg@X6>bG=$hK1y|s_7 zrEBXtx~{IL>+1&ES2xst+Fu9gKpmumb%+ktjdYj}*U#u@bz>c&o9L!GQb*}%-Ap&v zG5R^(LdWWsx|MFN+vqsmRzI)X>GryV?x;KI&N^Nv=ofSs{i1$Jch%kW%euSnp%Zma z-Anh@Njh2g(XZ&fx}Sbk_tzbh;j{N9d7ylpd|e z=&_r}HL=N6UVJ-#Y`Dz#;`cgc_{lzA+#+GDzijQryXs}Mmw%c0alMQebo>Wcr`{b7*F$?cDBhJAK3twgo4~mBxxAoaB}fDqgZ>yJg(*k(p+fcHPY`?HZb$ z+KES8RxhK2DC0-TxyLq2bk_|LI|a9*aEX zl6x){&Ie_j@eQx6E2*wS@o+ep|s zFa^54W9yibG3rf`$tw?l9br3gAj2;~bmhzD%t&dfVsEd^rbg;*$>qz&1@Nr{869lJ zUYSSwihDd{NMMrP;xo%YDMN~+U^Z^TcFxZ^}%|zQMfUX}BG;_Z@UGyM2MSkS_L{Lc`4?2M7-@*5Z zmVHSM@SwX8Fp1i9q_?D!#U9iI&wip6nRZJ$gwbnZzFs1X*5XK35B8)D;Il*%+LdC^ zqMe>}7Zb7wrJy+md9|?xPR$uwD$ekf=atRh=}314yr;_a7agGv)tGx==^>`(+@aguXI%5;s$$m z!hm9~#2>GD2OTqK<oCmY zSk&afKTXeRVA|dI-}<)KPFAO9d|^clhH20?*9>P*d`z{@m<9&=1rY^wfQ zLGqlSWoU2lA6-?r0f=`GRvYDS4NJSawa*M8Ni{*irq>37nCe)M&sE-Fji3eOZ7y&iHBIy)Q8UkaE;8jDg_le%p z>Dmo>Y%0dR&4sDTW)7$&=_=X;PI?1w6~N=)P&SW}I+AMDX`Y0 zD6jU1J0sOv*)WusjZ#;Qz);DxeN|K5G+Hf|%|bbOj0%>ap`1Mi2i6V3Z5v5CjCO@v zjzwev;-4F;O||M#oPeX=MJsql(lQPhhoctZ96t_{JD-)bv9Y9=A|wrFBLmjk$q^aK z<~^y2q;XB56k2#R-^@^9s9Qdn@PdSBhprpsW@qvV%ThZ~63Vl{bayiQ4?hu+-Yh~L)R00#YE3bs)xqCyC^L9Jm=-8Qoor%#~D$V2yM>GXY4CZj!d~ z+=)PXaM?s4u`f$n%9ADmiRD$3fYk3UX(|uPMT)H7or`i|?gxN=?;$BAQBnf;eb?#K z?`l7 zTrrK0y{BS~X#-$&*xCKy07*ac_I&7aaDdaume|)NH5w>s^dN`b*G$EVv3zVQGVid# zF3T)-W#0bI$1&BGd8Ac|v}E$KX{yw{cBZ7sJa9TDuARvR(^aYIRF$E9;iTz zKkcL(YD2T>4@7O&48+31Hzj$##nA-_!G)Ys09y^ok+hfVz7OjS;m+>^39?Gc=Z8RK zkd>Rv#9C+Hmei52%*3Fx>@y34K72>gUwn8LkPrF(EVW+@im(GDJ zyf?|Qp*7W!eP<3_b|tU>K-v6PgX3IS=Urs;$*zq%eC?vaRabKwh}F!6NG9G>Bt1rZ zkyDCPg!G=mc}1$!JTM{3Dc8vvy5YwfLZQj3XQo==9N!WuK9C7yhzd| zKJy7y|D5fgK&OHwNW7m&+RbH4ffjJZQnlS9>r+WvO1S7#<;aA-HX#!IqG67_AXKB9_^OH%~rSs$J~Zs8(vxhS6Z|JuC$T|eda8@Gd=?} zXcca8t9b1M6>JHh#c;l0nu81CAkJD2#X`T3ZJGeXS9s31rH=4`80F&WllHL0`8My`wPHYWkvVuw9B54h0t;I}M=CyEc|E&(M z=(`RP;J=mg)~Qmjv)d#c{7O>o9UT83IKWvR`5%nT`&!~28NME2kjF{ufxK8IX%pAj z0OUoE+n{V>FIR3rM%a7Ul@UD5M~Pke-Hgm@#4)YOvaqx zU7OWDbNf@Sz}o7}C`R*Bl8+VS1QcgC;hS5KXS2Al6k6w8lDNDj+Msm~kGCnC>HBg? z@jt=AJ{XByl0ZwLPcRLk9rQh?ZiPt8pCx_D0ox$blDln#$h^yvj4Kf7v@a*nl8#r0 z5yFoSiV-xAW4?mOJ&?os##a!z$G+QP|JQz%v>$CPpVt;kRfK^@zHPQ{^i~ZhZtEYC8sC*v<4?Y}2i~%kefDDiZucCi z;_zPhmD@f3YcJB+u=^-*Xj|E~51Sgs<@+%A{J$l+J&<&rm+l8TpZD)aUKz*h4`2h? z4;^}C8w!~qjMpw!{>9m${OF*1#jHSGM%&LRhajhT$|1Ggz2vc^Y25j+iZFeGuHC*I zlF7XDFv5Gq6G=1d9Di8( zbI4KD!O!uoX15DB_kZ$61AgHc>R>sS9fQ}G*DzdlFuW$N47}zzZkp)2oW8fkpdA*2 z*SV`8pB17$-u!}TpNJJ8`1U5;MNfMhw8zJwqqPiL!c$M;eg%lneF^TX+6JwvW6*}W z29n*_@4*4$-J8{3^No5ArR??{F1No_&!~3$9j8=@;oAsmmEr;%(8!?oIp7DVg)UF9 zsVyEQVFuL-XSXxXi)zdnY_jPyj`HFoj4zaGGC8!X5HKjE4h*oxzS!o6uGpe1oI zbXx;;#`qaRGdbdC2t5Mg)6O8j_6FWZZ#bAo>~k4RCXmS;44To=pfCCR%V0A3J{a#4 zoecV=vq87w4SF_#cU*zqD704)8(k6%+Q=XOg51!B_y2-v4!&T}#V!V2ebJyBJnL6X zbCB2niU=@wbyzsh(9T+T@~X;pw*Z>ReJc=Jmad#v0o9AULG70f+SJ`38+W+|`C=Y< z4Kttaff*AGy4Ta7ha7bs%xO-#4#uyyK`}`NwM#arGuQnMmhkJ%ZGTf&#b6G(0Z&Nl z<5>G8x9}V%D*e$J^t#b>0GLe_wLgvWevReqMpD^eePpO2jTy&0C z)g|{yC1TRl7nbeEd6lTut3OpWrCVPvs#0IM$MnM)anfxFMxkrBudWt6dRx6=>GP^V z>HQ7L#OIPvxcwdMs}HB%fnGa+*zLF7{;bw3{|^Ld0^9#UkS3(Lg48rE4IYZ-cvWm- z;K>oE8!fGoOa~0bkqtBGET8!ksbv7$|5P@=C+P_XW_d zSe*s#olyog9Sz&^n)`@VK(1I#ALEkyr$nWU`8QUbC8~;-{*5i%o!}UD3JN$rMDVT$ z>I3OMk&_>)VDT4cJ;bH64aYo!Z6YT*M&59}f8;;HjWdZmKgMMz1%zkr{3p2U^mUFA z{{(3(p8N!ckH|IX2M7O;-NSRamK}D#2Yfjnvt#Z%=-TaZ|C5{7+gc=c%`3N7nD@Nv zV1|gH)hR+s>soPu*GsF-{Rr50Jl3#A;lm{xKpspsXe9S_1M+~UxLIwM#(9XQ_Y69M zwuHO5Tf=4JJRaq4Ej4e?H>hB$V~Pk5YXsg%k~}a)+B8Qpso{w!(m2l3YV$0f4ke}= z9JCEzf^N`Z=a(Q~agB;O#DpcvW*{C43>yBvL2dYo$r_F?qn>7~&D3uuvM3r48I5}1 zhx{pC1XGcSqkddzwpMuM&2sE-m)zs5n{{enZ<@<$fGKb?XXQmFbGas%*<5I`ZWkYM zqPI25ROB2`1v;6JdRx=wfZ5#B+Zt>sq=9q*|N4tCRM%7=Oy-AAd&sm#q%*ejYgs3{ JMSq{#`oGSL5<~z1 diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index d7f154d4f49caadd0152e8aacad99bc2facbb0f8..e2bf1b87ebd918725b7ab4531a54fbbfec6c12bf 100644 GIT binary patch delta 2242 zcmeIyYfw~W7zgm@EW3~<8<%Ba*|@GC$V~zR5)cy#L@u%jgt~G`6y*+aM?|;Qf5c_RghAoV=>vjOU^z|&W2PAlFlkXb)9pj**i8TBoNXQJYu`FEzu|q~^WOG(o&!H} zM#clz@&Tvi)Wx}lC4uot2_!xruC}4G5_BZgS;{SRrgJu(Ig$rBZlq9hL8|d=#;Y?O z&?Q?O`%JRb$B_3oN}5b2;>J2gGOdcaFbXWo6}MdaQ>jzYa3dz%v)I@-KALY;l#Da6 zxYKdjq&DonwU^tSsn0lf+<5RQna{@;B};t_H9e@NM&sJE|Gd;~Yc*Xh7524XJ{cB% z-@fBFT&TVRo7{7!r9OrtbgoqCwzPKS_vN-0((hDW6^DZ5hG01d60iU%$iR{hmRo)K zYiEqy`v1Vve-l`}jowyor?=ND^bV($(rn9_$YU2go7rr;vm^7!R$gqr;)TrNS&>I% z#R+Zue4?WkLc6Dc=&;!K-%Iqhr7$ijN20~~7AS}WnJ~V&#=MWV7W;~GcGeNKiTm6@ zVg4yhx1hx)HrB6>X6L-!6zu2QJu?3DZOXV<_Jzfu9Xprh=ER168<6wy-OAZ;{-GfC zL^3MIl3CaG`?HwSsw9>(pbFtsYwHyrLamEtFAW+$ zop7A0Vr{p2{Mar|oz*<&BV1#2qxsgK#1dVT3gaj7k(=7B_*Un|@qJpNB=Hx2ltt7f z{<75V=BRAhLDVXa&*Ts-6C-gw7kdlsM7oZ!o5J{gzB%kQyNTk&14fI87R7^m5O!0$ zt(xd3alE=gh~oMbjei$~4V(X(5~P?9E_zSN2A+)E_kp zHvEUiitX3*M({U%)jw#F92v7w+DX~4pJOfGxL^Gh$I8~Zgz$sWE|)m|z?>>`h!5b@ zeT}Tn&vD2&<1%;rZtth;W`L{GFfUib!~DG5Wo|}x-bWW%&t}@4!`P5crEl(b7xFT^ z$(%1f(Hyq;6mzvsrI|xJjeMD^`%1dGDz9z*yAo+3gGeieJQR5}wGGIZ*bbqq_#Bd~ zgiEX{A+i(_NdfquX*wXZ%zQvhxiK$kLSc6wagLMlEqSV$pnoavJscl3;rvS^A}D2J zqqa_LxX5X*VO-}5Zr~0c;0YR730~k0tH1|*VKw-HKLkJ^1i=~zhDRU-LSZdD3Skfq z5%3tSgGh*iXjl(1umK*2jSvfQ@B};w@sI$UAQ3i05+p+kq{0?R11+S(R>*)%$bzRJ z8@9oA*a14&2|17pd5{lJ!!9U*-LMA=!5FiBPz1$L0;Ny}Y)ImKo zKqEB4erSdR&;keH5a{7qcn%D37@mh0pcUHSMQDc(I08rE7<9r*a2#F+23_z9yb7+lA=32#9+oPf9C9q55x=!28c5AVVNya$7DiXYd#f9uX)_l(9* delta 2540 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 Krv*=DefYm{GJv}P delta 8213 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 delta 1952 zcmd_r{Zmv`7zgm@?yK!!E^mA9ZpaEMCr`InO@l z-shgPd-mRd<}7gKUve{?YRozOkaMWB(wnR3U)Sg@6S-T6IG~V|&R=rUSjef}eYH!) zyLq}4F*i5dsdaHB6iU@yA1zR~4M`R5-4LjG84@nrxXi~2S3MBO>OtPuHZCLMzmxkq z%yedtG?&wzpyxRnUZZbN#nEF``iFdE$6_3cbpQNBvu5Ui^PIsDw* z2M^s@PSn3hnmOzs(n}N6y@BWh`O8b3LEs3Cb}`rW#N3_$A1hAYH``TQ zR?oQL6$i(KY@29Iu^h=2Z)OKZIaaZi&lD?uHz#v!{jo$|JTYm$q2UDP3J5Xcx261P z4YTJ(M+7ITd2ymzh-$(%oyYE088z%tAMawGhw(bLqkuQEyQ`yhqHWB4KUupmtyHIyEarScN$rvwC*&XEZn-3dZHiY_x%V@6K*5nl-uPN+1r#lMeRx_$~u%i z@hc9g++H>PvUjc(?E7mz4NLyUYZR+L@j3Emo6ygR1yjD(Y_TEVd}dEDY1#}HcnacR zA;g0f7C{0e!eUqgOCbr8VHqrk6i9^?kOt{sgO!j0PeUfGg4K`(*^mQk;2C%po`dHh z7xLf*coEjZI>?9h@DjWXuYesKumK975H^AniogY%pcpno3Ao`^*aBOj6kdZeD2EEz z29;0+)ldVk!y8Zw+u=>9gL-Iy9k3G`p$VE{7qmbt?1s1CZD@mb=zw>i6K3DXUU(Ng zun+c&Nz>l;bK2H&ZKPfFtPt`zPe|SvH|y|EAjiEp7DwgtxUy9lpTdR-k9)C6!ufe# zW&DSL64xD6a+2OB>Xqw{e)vyL4Y`jIspNCFsNlMfLPfpoS(;fcLu|s8!eL- XG3{bvN>uQ+!w&)I5^p<#SEv34k&qy~ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 64e619567437f17a7ff362a820ece0752ad99e92..8dfc8b60db6b44da155f3c24513fc67a406abea2 100644 GIT binary patch delta 10250 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 OZQyKXTi5+;pZ@@TdCLm` diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index c31b16b1..05754fac 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -633,7 +633,7 @@ class LuiPagesGen(object): color_translation = "Color" brightness_translation = get_translation(self._locale, "frontend.ui.card.light.brightness") color_temp_translation = get_translation(self._locale, "frontend.ui.card.light.color_temperature") - self._send_mqtt_msg(f"entityUpdateDetail~{entity_id}~{get_icon_id('lightbulb')}~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}~{color_translation}~{color_temp_translation}~{brightness_translation}") + self._send_mqtt_msg(f"entityUpdateDetail~{entity_id}~~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}~{color_translation}~{color_temp_translation}~{brightness_translation}") def generate_shutter_detail_page(self, entity_id): entity = apis.ha_api.get_entity(entity_id) @@ -727,7 +727,7 @@ class LuiPagesGen(object): else: preset_modes = "" - self._send_mqtt_msg(f"entityUpdateDetail~{entity_id}~{get_icon_id('fan')}~{icon_color}~{switch_val}~{speed}~{speedMax}~{speed_translation}~{preset_mode}~{preset_modes}") + self._send_mqtt_msg(f"entityUpdateDetail~{entity_id}~~{icon_color}~{switch_val}~{speed}~{speedMax}~{speed_translation}~{preset_mode}~{preset_modes}") def send_message_page(self, ident, heading, msg, b1, b2): self._send_mqtt_msg(f"pageType~popupNotify")