From 792aa6c3d2182ff7223c051e22facd9618e6241f Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 17 Jun 2022 17:46:54 +0200 Subject: [PATCH] fixed #220 --- HMI/README.md | 4 ++-- HMI/nspanel.HMI | Bin 11147230 -> 11147230 bytes HMI/nspanel.tft | Bin 7571896 -> 7572144 bytes apps/nspanel-lovelace-ui/luibackend/pages.py | 12 ++++++------ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/HMI/README.md b/HMI/README.md index 67e4c4b3..628cc594 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -103,7 +103,7 @@ The following message can be used to update the content on the cardEntities Page ### popupLight Page -`entityUpdateDetail~*iconId*~*iconColor*~*buttonState*~*sliderBrightnessPos*~*sliderColorTempPos*~*colorMode*~*color_translation*~*color_temp_translation*~*brightness_translation*` +`entityUpdateDetail~entityName~*iconId*~*iconColor*~*buttonState*~*sliderBrightnessPos*~*sliderColorTempPos*~*colorMode*~*color_translation*~*color_temp_translation*~*brightness_translation*` `entityUpdateDetail~1~17299~1~100~78~enable` @@ -111,7 +111,7 @@ The following message can be used to update the content on the cardEntities Page ### popupShutter Page -`entityUpdateDetail~*ignored*~*sliderPos*~2ndrow~textPosition~icon1~iconUp~iconStop~iconDown~iconUpStatus~iconStopStatus~iconDownStatus~textTilt~iconTiltLeft~iconTiltStop~iconTiltRight~iconTiltLeftStatus~iconTiltStopStatus~iconTiltLeftStatus` +`entityUpdateDetail~entityName~*sliderPos*~2ndrow~textPosition~icon1~iconUp~iconStop~iconDown~iconUpStatus~iconStopStatus~iconDownStatus~textTilt~iconTiltLeft~iconTiltStop~iconTiltRight~iconTiltLeftStatus~iconTiltStopStatus~iconTiltLeftStatus` `entityUpdateDetail~1~77` diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 9e9a47935472bfd8919d0ae4e70e2c59296b0e74..bc24fbe618f8af76ebfdc6475326889a711a7308 100644 GIT binary patch delta 2154 zcmd_o`%_e97zgn8tSqa5im=PO=iLQl6GFuW1i>X%Fe8Oj49Hs`yUSez7nT%FUDQ=j zF+$YGC=$D%_JfzH<}@`rFw->C*l5{QGvP3rDVevdW-7IrzOYL>PBZ-jote*^=RD`V zocDRo;K^g^K{$0p6|G{7*=y>|3l`-f8o9a(!dMdW5_I;d9;T<5o%Yd}!*^E@XSX*a z=xb-}j8nbf(_YocGg7uz&RVpX+~3|gF(9%qIr-7af8OQn;`&GDjyxlEu1e1gfg^MO zweIy=J=3Ll*DVX!E3wXd0bG*a8>dcD1zelcePVmIrX^b=feOYz0H`5Q$<}D>5B@ht z?fb(M>Y3yT^Mre}9-SxReeMcUXACjZZJHm=e|N`DL9KCpho)*IZ+ykUSjQM|+)&9_ zt1rG^!`Rno$?$c-iSql#e^Jj^uG*WI(azCzCO0t_;v18&fw4B@V+d+IioQ zOKZ28(Q0ihs&x)WQ^#WmI#Mp8$vr40(C$i}Ce5V&O5Q}5s`ylL zRPl{cD)l+T;_2|p=rGE!51&Nw)x3m0Ud^o(`ng_K2CDgGiR#ORl}L$gnm3z?QgMg`Kq zE!iTa)4erZd$3gOqHpiWV)%`Q-YpgF^wl}Nl@8yLXOpYVq@$z`QwUwKiSB7mE;D=D;@irOdP<5Bj?9wtiU;kHz#9- z*i8dTQ9AnhkSUP*D};?^+>smTgxMHINtsbHxvRuP)vQSGiAF{ZRf?mJWR&AoB4P%e znq-KhKASvU2|XYRIL$2!wNQ^+pQGdv?^aW6e?+3PXJO>^nJo``^dN%(0~jF^q97V3 zLkyVUF_;3e5C@M#JWPdYFdY(L2AClck{}s|_ez0Om<4H&4zs}m8Sn&Tf)(aK7G%R* zcoOEpQ;-8s!+cl(xsV6Xz(QCAiyI?4Qt>9sD(OM3r?tq25>L@Lk}E*H{mUK S8{UClI10y<2R+BHuKOE*02eL* delta 1718 zcmeIx|4-C)90&0C`vb=*xpsaI?tS+;4&+dTgZOrcB4|iTkV(i9njO)p5tzX#1*8(F zm!R_H6znBtz=b3%GpM$Yznr1gGR6>paBFQbw%poUo9GXHL${uEv{rvZ@9nYA>+^oS z-mmv(@4Y|MpA2cHVZqk|1Op-BCr?@>`89d-%aPAxlw`*HX^{f)U^Xk>_Bebm&x3F zBbiV7r$W+iM<)FXTJo-j|i$MCtR4W(=8 z)+2PVT?wO0vDS}yH2Ivma9Z!v8>o52m`DkCjRu;$6EUhz)hnAg`Qxn>>b-cy#%ac3 zv`IP>xsHo4`pBb<(ya-Tf!ean2J-eOiM*4d3-#grXW}d66YA9s#`Yj-shLI}7{kde zD>wNCx_?I5re;Q4G@NuZ;w<&|>BDHeO&OtwA*M-c?l#%!!GJ!TydBC{WXr?H%uSeb zRj*!ga%wgyls_JP;<9|v9^Ui?n8_{3Y62aKg?NW!lcr7@UF3euw21mA4K{T}o>&&d)6{5fMCc;w-L7n=%exhsnx>VJNtUt_^7fh{=_jitfhub)-Rf|R<>rembNxmzfdXcT z01HGy6fA>iutE$hhZPVDDvSA&p zhbJKiHb5>s1sh=#;M1& diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index fced199abb7b7f74afe133d27cb7e1792ce04984..d3ccf277b9816cbb5f15c0d60c8c78c4a93e6333 100644 GIT binary patch delta 13830 zcmeI2i9=P@_Q&_xhgm^T87>G4D9!_*IOK$)k|T~eE2us7iWkl?OH$G5LbJ?N?(e(K<=!qn`3rvS+V`IGS!=Jo_gZW3v(J?c z?|!G|zxSP*+g|1`%&_DBAAO*)@_uaCN~fq(JBMlXHTEHziO%m{5T zASv(aKRu?jXs|XfeOzAFpuhhA%L9LT;4csS<$=FE@RtYv^1%Ol4+I;EAq~~=Fgy(} z!`tvNd<{RNic!_@Hv)`mMxYU7R5xlEHH}~+#0WLQ42uzNL>RSA`fpfSi8Yz#48Foqh#jN!%z zW27<47;TI(#v18HhB3|q`cl>zYZuwbmvT2+`zmMX!bWQ%Wo)sAR*A1Cgzyy}%J&xPeAXI~ zG|)qckaCt3E<_V$wgsQ@P1LrK)MSb3qpV}51cc!;W=>3#1R7XmjiZ7hYb|=O$QrG* zr0h-B5XvpGdeZj*v~!a+f&w;K*VBwG)`-IMo2>s(l-4wJi*;Z7HWjTlX4`DFZE%I& z(w)7?XX_-Rq{!BY;9cl`5|k*LTP2zR4RRJeTD7} zu-4&^$Yq1Ao`p4zSO+K`j}9tg>6DsD;$S!=zhFt0z|cfJ-oDUUzlzA{fC9I6R4>YO#4^3Gbx zlIWcKh6q-k#mYSQmJZccG_1thfkvK#_tutJ8z@P1rUW5OqK4<->undTVO0OTwKlza z&Kd`QesT`N)^zurH3=g^H&N96JVw`sMxVEi!q?{WkR))!&Xjn;8l@!CfD6`s`1<4m zB&{7o`{jbQF=ANzA|x%zb`fTrT}9A;E?R3Tt*GRpb&S%gu>B=#4-chbp>f4JD@3_o z2+w~gRlB0liZW|oialZ-%^?Vzpl>FfHL4b^iIDy7$%(vTo-R+!KrQ%R6r6RFkk z%-XVFm$!xt&qSSCIApkO<^-SqLR^H_8dcuy%#Vf!r6h(*>mHfBc znn`?j*lru`#d^42x!u;ql8Wm@=(^febF@jN$J=eql~ii7!!{<8wYZi+ErBgpvtwKi z){{QlVe4w?{j{M#hoRo&u@i=RQ_Gz CZkh5{XinDwRnowlx#X}E0ZHX^&-VTgGU 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 R4JKuQ{*9;oSC8SA{{ulkM$P~L delta 13898 zcmeI2iDOOI_Q&_x=Vn9_Lq-xwOc6oE6mw!OLV~tR5GkIzk(-=DYfj2(>F|hGEU)-g z-|MeW)l*|)rlH0nsF~os8lD=`8e8=KzU$oF+nYZ53x3_~+;cu_tv#%@_CEXEWbLA( z>gJD*ss$b8=JytKemDA_aml9t5c136Q*lWb7Nw~EjjNq~KX%gcX1xnU-=)DZDQy>A z|J-u7SUg)W>h%RVga7#dhX?-fz#ks?!vlYK;13V{;er469tboPLmH}KF+2=U!^`kC zd<sA1GJY8in>kP&Qz7@mQ#2Af@Sfhy%XEZgM8O@D&qlJ-Rv@}{7t&KKDTO-kEXS6pu7#)pHMrWgokz^zr zU5#!=ccX{V)97XNHeNFN7=4X?MvBqj7+|CtX~sZfkTKYJ*?7fx)fi&DW(+lk8R^Dw zV}vo%$S_73na1nJXk&~q*7%b#&UnKZztOsGv%KX)@!nbWne-@)m1Lirs2$pd`}xt=2H51--M?+K_C!tp2oh ztF;+@xz$>SEZeM6N-J8u!x~0O+pL?Y!8U8{qJZtzr3yX7CGFc`T@%)}mJq^6^;Xu0 z3K6F?;h)hnqvH~5(Y&43Af;W==R2)278&)ZsHE6>#YY)ewC-E$1%*C&ZkzI+1 zW?sOI4qmV}usrh+g4SKIhESDKjJxwiD+MGthq$>m4{E45mvajCVT z(uPt?;omm&NvX9B`IcJi(t}cKu+o;QUbYU$$N0U<(Ah?bqq3SJbSRiN})^mSIG z+;eWzzq8UJ{Hc_Tm%!JnxWWNN88#bY? z9FjaIW!MDN?4p!mwy9&h;n|x~2;ZV(yKS|VuxGeN2nC#M7EeFBP!u7aNwO5%nn`@N zDz=UAWIbFjDYkWu5~>g_-EI6GHq8B*Q8g`V!QHK+Igk{v+p_u5j!S&^%&tpG<`%slBIdu`pqy>Z!!hk(k( zj_l#-Ft1JnYGgN2ylGmE?2)aRKw#G2YgUEKS-6ERV;n7vCjXk*-NGkAJP~qdC!RGN zoiMLK{s(PM=ulp60A=p8<>xWvk`pXM!A-lJm8-x3%%d>?cV4xekA{AUmk{w!9QxJD zdBpFyUpapr+@6OY`3`;Wa^6J|G-|&sm-@V&8{p#_CjGGA*4!Kz4}zo5g~cr}AZC+M zdEGfVM~wNKmGG(HP;u!y+nH7gpRS5Lm*?F(o&f`AVcsRs(J}8R9Cj|uW%+<6L7$_@ z#l0QAe^GdT;}mkxc8JbLWWzBv9r0U8PY)vDVpnm(9YX9DqIHgiD@IV{*fFmVJ8+Jj zQ{NRkaE=}G3b6y{*fHPFBX!0OoMXqFW7qC5Vz=tc3Pap;7(=`jnH`YF!)8ab_7YTA zz`!|R%okU}KL&@2S=`%MS_xkU?((yv-?3%~%OP+UZioZM9ajh#I0uaRqW^BlA#{2{5yMhLN4jS`I7;p7swp?=%3|u~gQWS2OZ9;{VDbcTv}qO|kh9~KmGH*k&ak=bw+43>=3Q{^;DP#zZf-j{1iUe@ zpj9OeaU(AX?kU@u@FX^K6Fbv}d9eAgr>*S~|MzQTr<(08RIIHx4@37nGWkdk4~_-FtL@3_6G z?|B>zOhYKSG7w@;1m^uvT^R_@8OXd(CA>d4RLsKNINKRe2~V}S9}V0L(qP~$+)x*s z8M$L#q^_d@I42bImr$LNa_^Yicu{zM<23n#?NF!z`wGX>Fo%x}8g`L)mgPAC^zlU; zOIeYt>sT7*IF>Sdx5(>~?QAPPb@PhzbsQi$LEW>&3!5~%pLs269+=a_k+`#J49W{G<{+=eqtm^;Js8>hs;oI|1M<@PS!K!w(2gsH;2cBd z%@M=bf^%}sK`?Ml7fMmMVKy8U`exzIoP0zj`Xj;Jrfi-`xSfoO+&q&o&*XSH&mPqVU7#k?=tcf||(953d-VrTwO7~;h@ z(D^Mc&Y^;HDgO}MnK=ajwsEaTa9)qhrlPvs2F~thKD`n?ljHRwgZxSiW`Uzkv+#hN z9nY?WPXXu2adFpw2i#ExIRt!g;F0=*x)v}x;04T_ci9&;#ErZl$aQkggciUg(_I|w za9{x~4Mz?X(BW|80BiL}%dS{Mi*tZ^g&Y9q9AI7{2f#T8Uc@;EnCGE=R}Mg*bAUPL zz_|$I0N?QJz|GowLl91JLJCF#8LtE2Q9@1I!mz!WUP_0XKssl^A>s z?mkdw$4e{W3&44DTzCRb{pH|}!Z`o|=KzniLJoj)4lrLqoC61=kpq0gZUQ%p7nFD=%(;|*2zSmhR}Mg*UCV40sw)S;IR}`pu7t0tkOOW8 zYb!BW5AHrtXU7{V;a`CBeNaF5@x44XT@|Jt?rlZX$;VHs83Nh`dDmr3>jYLC{F-?ei zrK(s6*QSVMaSD5Q-U#0pxXhz`*nVud%}&P8o;=CC4W&+`y-F}9N;RE&M9 zh(Q-U#BSW*7S%;Wi0m({^*zOE7(5rP#l8=u=sU<$48fOw2}-p1=&%&(ZBMZTkI2DF zjEIg>#g_xT#6(YQ-AbewJ6IL9_j?I%+)ojr?N0hMaeQ#m*g!331Alc}7ODl&-2++) z&H%d(YB!`sb+Da>v=ZsqH7P6++$ur@vHAHcQtu&830s8Y^- zEeOBZnE$O-mO(k7~zcN%@ez-OuV@%WqsmnsrQ@o=^h3)s)ScI4~fbpC`^RWazs32ndc4n&l_VOS``OAn@FC$%COc7g)7Yt7WK6AHZ@sBQ8b zaY7N=33|3&i&b$=Ez$uSom9lalaziM5Z9Cz4A|#8MHGHV-Op&TN*}VF(TYN?rxY>d zG`c}Oe&)A1&ZVz*Yr!hSl-o>S=QGhmw7m=YYgF@`)wd?ZIJxcwTR_Jl{o+A2Fm48EY^&TbuTf2^Llj?r2-SF}H zk=v>(>$#Gr>osk)QibkagMa-YondNJOzR}tbzKWq{OQbfZClf}KRL$ppYl)E<@2O7 z%aU+zAD}eBsk=FTW3=lA8a{nr5&It~!uC)R9UnQ&*=#b+zo`ZLu-I;YS1zWnk7_lk z_@=fjVJOu4K32qi)Z!<>ai<%$qz|CZ#kh@x;cfN-dcTuS{RI5Y3?8lPN_gH*S+bO4c z((Zd&Lob`B#F)0bvad#&woHENNo&ir2)WRcO3Ji-zF}UhWVhc|=*kmhHf|~7oK|Z= zPBVJ;BhqcQKdtylEA*V>FU13YO24ng$~pct_deLf04e?*K;0jJO$?x%2VkSCOL4q9 z#XSTYU7dzJ1WTk(LL4N7{16zyD7iWaq`_zZPkAXy%3(LT)V_79b1l=~^7 z)Ag~o%x`s|6w8C8@DG;aNif}po?IPB0Z+8+K0zU@e?|G8lBFKLASZ|te%4mYun@ZP zGd#a1()4^Ft@%X@G4ITc!7ECN+EHXY#U6lb)B9mlqNNyDPl_$|rFgG_!zb*QEM@Uj zEl5s@=0L2cp&hhZazg{kcn%+a-hlF-V;EOkv;HJ8rQFpK^tWHN>7Lhs2ezU5cFg)( zYf81l6YJVaQ8#f>RXtX&Yr7~>FZ9f7C&it1iynaFwWCM{D5ZlG8#~ZN1uUflc}uXs zPRNQ*v{!-!cA_$7=Q>N#xeKjU!OnH2v#MU`u`G!*hPnzt*;T^3EZJ@lz^MK>DfsW+4hyHSCse%)tFH@4ZNY;k#Zy_Y`SZwK(o?ovGJ zA%#yb>gcUU%N^Y)!&@)(ZPZJOpx#o9eTgD{&{U&d)Z0fdtTLmI6xn^H*ws(cI!z1p zTaBYY4E~)I4V4*vDBc&wr&FZZ-(QN5R4Vg@@#z!_sRG_SO^V2YQsfSzvsJ*Gr!B4u zJa@1ZQ(l(h&?~gND)8LFbd&kjSEV>HM2dPtX=OF=tFKZ?HSqSsq-c^Z#q{A+;0NA* z7;W|g|7e61#z-knWzb}Q@Q+5&3V;2&@9j}M{SImub-}0vDh|+B%d%0FQyroQrf87* zsww(Q4TzqMqNJJ-Ju^jC)nZ}?g=xxLxy98;1I1c^6Y4$_N!t3vV= zweM(J5sVR3&7=dt7}>)yQd}P^McZ*SHw66Q7+M>mZ}q(Ph7_%>loP5q^uCH~yZs*8 zOr^V_`e=`rty27*Y@vE>I^R>TD$}f#9|og6SyBXKQ&Mdh?ZUO)-oU~}J8SD1o^jby z{56~E*FhG=Wm9S$WY%Mw6k~FzYB<w-;vi^{-!lcz|LFjb1#(`aoZCX_sd&PM9jWz!k7 zI||NgF@wj|-J`b$yZm3#@N4TCR8SA1cBUxZBf}J}udh${>;&}13~JQ?J#?Bu84b{b zXPy)fQG2{ikqz~RiYN7Is26!|oP`0-CQBozZk$E&ji5TskRt0H?85I-StAT)nn58k z7Lde%{NZxQ}{yxfEspL#>+Y(MX|Jo9p{!*e4VjuSdvg zpHNafuicgG$sff-*LIZILZ9xv132~zZ10`_q1Ew=!D)IlenI$wQd8_$i9Z*?R2#06 z;-gjcZ33p+a1}jaHvda0o_|RjTY}C1lCHF5m#oGr|0gYL#V%P*2U_Wc-lNt?aSWCG zzCi0Qi!3o#2^CuvLyTHOYg@zThrg1d-C8Lct)rYa@cH4dXh|FJ=j)`fu9xDq4K$=J z`15s?-xfT6BQ}22_cu{eB6$2p8keYV^&MTv)5Afah~nD8Lm7pX+72EXxmk+Cs4V+> z3)N~5*~rb5*d9st9{yyb1Gd7Cw>sn@Ugk;D>(A!>it-~$ed^Z{d*R`2bf6PA3Z4RTza-;9f`%NyRI-PaRx5{=Y-a>tS2QBFg<0{)}cW2BZeJ6G))XlpnzYBQ! zPFmRoK3un3iiodibP{~HZZ{PqK{vEmiaDs0_E2gvbVG}2ax(a!y;6LQ`qej-*cE)x zUdrf-b&;@-2li)mfw`;9>V_rLW*^0Ohe>;gR-!K6Pi5U<(taO>^uSJ#dq9d22WfXt z96%4v$C+WmfyF(+XC9Q|jYG^EdQZi*-G0;DRyy~>w({N~DRkP^6Whwi3t;okAu8#G z{^#Sx$Zn6YL}N2apr3l{(`D%?%6SPZqx4ky%7{KKMVr&S2x3)Sn=8XB<%|^D&Pckm z7;h`)(Iw>!<@D7H!@fH!#h!Cg962w=vI`Esb3k((kKymm(vW_L^%jUeyC}u#OIX9D zR3`mgB^`N9kCJ)MsSHBDJAgt_g|AdavZRee^=K80&JEQ!`HckBRJ^$3Pk}aA zXxT8dI#SZ^VK6)ncGW`_w>(u5NRg* z9geS~id<^`hV$`0whkqYhtYy?RZzrYD{TIZOS^rQX*1KRXH?q|p^ANVRZ$X&cYgZ8 zs@IbnA}AmW!->H67o4O>iNEUmR+375vH;z(2c`9m{R^l#2xIEv#WtwKz%^+UQ? zA$uiW6`n0r5u8BjxyU6jN>0(g@kvf_7%p=x;#TJEZ;N=fhDDs1OsP7acO8>i_d9Xc z^}N$2!nG;MizmUeNy!vB35#=PSGqC@i&N{$+CP-*2GEBs9Pi|KH=iY`E0w(okA4EB z)NZu)Ef_2{4V3cL+=`k_MksQ+siH1@^_DXfS>0&&WEghou8KR|DSrwKJK)-GZ|gGr zb&6gfeR@#AR1CUW4;GG4GF@BB`e{g&>OCl9I`Tdc;@Lf@&I}}NU=Qj&1FTz5Rjlnv zmYHDPdQ$vMWTdT^Dl&VkBJd?uTz`ok%tS`odQnIoo&lCVsyL21yDy#1!+FR;_B@=2 zR`pXwXbNr5M>DJX(an4`eLh7Mz5CN=Z-bprp^~@JwD$m2JVjlTidd%6!dd2tqi7bI zSe}M0U?5GL4fW+|v|=_UbZ{U~Xt&(!dfzWLFrgy@Dd!!CkDKDN@}f)pmvZ6rU>FFH3u3x?wCJx|VFC|)8K8OO|Lk?%+yEp92 TYOJ~56W-USSe|rF|Nj2~{?abW diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index b3efca38..3a718474 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -511,8 +511,8 @@ class LuiPagesGen(object): - def generate_light_detail_page(self, entity): - entity = self._ha_api.get_entity(entity) + def generate_light_detail_page(self, entity_id): + entity = self._ha_api.get_entity(entity_id) switch_val = 1 if entity.state == "on" else 0 icon_color = self.get_entity_color(entity) brightness = "disable" @@ -540,10 +540,10 @@ 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~{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}~{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) + def generate_shutter_detail_page(self, entity_id): + entity = self._ha_api.get_entity(entity_id) entityType="cover" device_class = entity.attributes.get("device_class", "window") icon_id = get_icon_id_ha(entityType, state=entity.state, device_class=device_class) @@ -574,7 +574,7 @@ class LuiPagesGen(object): icon_down_status = "disable" pos_translation = get_translation(self._locale, "frontend.ui.card.cover.position") - self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}: {pos_status}~{pos_translation}~{icon_id}~{icon_up}~{icon_stop}~{icon_down}~{icon_up_status}~{icon_stop_status}~{icon_down_status}") + self._send_mqtt_msg(f"entityUpdateDetail~{entity_id}~{pos}~{pos_translation}: {pos_status}~{pos_translation}~{icon_id}~{icon_up}~{icon_stop}~{icon_down}~{icon_up_status}~{icon_stop_status}~{icon_down_status}") def send_message_page(self, ident, heading, msg, b1, b2): self._send_mqtt_msg(f"pageType~popupNotify")