From 903f9dd7bf21f33fc1b5e38f42a42aabd72e2e5b Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 12 Mar 2022 19:33:21 +0100 Subject: [PATCH] bugfix on light detail page --- HMI/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out/popupLight.txt | 67 +++++++++--------- HMI/nspanel.HMI | Bin 11134137 -> 11134137 bytes HMI/nspanel.tft | Bin 8122708 -> 8122732 bytes .../nspanel-lovelance-ui.py | 5 +- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 97afaf7e..4fadae18 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -165,7 +165,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 2 + Text : 3 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 73bfa98b..b95dbaf7 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -529,39 +529,42 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 - // get Brightness value - spstr strCommand.txt,tTmp.txt,",",2 - if(tTmp.txt=="disable") + if(mode.val==0) { - vis t1,0 - vis t2,0 - vis hBrightness,0 - mode_bright.val=0 - }else - { - vis t1,1 - vis t2,1 - vis hBrightness,1 - mode_bright.val=1 - covx tTmp.txt,sys0,0,0 - hBrightness.val=sys0 - } - // get ColorTemp value - spstr strCommand.txt,tTmp.txt,",",3 - if(tTmp.txt=="disable") - { - vis t4,0 - vis t3,0 - vis hTempSlider,0 - mode_temp.val=0 - }else - { - vis t4,1 - vis t3,1 - vis hTempSlider,1 - mode_temp.val=1 - covx tTmp.txt,sys0,0,0 - hTempSlider.val=sys0 + // get Brightness value + spstr strCommand.txt,tTmp.txt,",",2 + if(tTmp.txt=="disable") + { + vis t1,0 + vis t2,0 + vis hBrightness,0 + mode_bright.val=0 + }else + { + vis t1,1 + vis t2,1 + vis hBrightness,1 + mode_bright.val=1 + covx tTmp.txt,sys0,0,0 + hBrightness.val=sys0 + } + // get ColorTemp value + spstr strCommand.txt,tTmp.txt,",",3 + if(tTmp.txt=="disable") + { + vis t4,0 + vis t3,0 + vis hTempSlider,0 + mode_temp.val=0 + }else + { + vis t4,1 + vis t3,1 + vis hTempSlider,1 + mode_temp.val=1 + covx tTmp.txt,sys0,0,0 + hTempSlider.val=sys0 + } } // get ColorWheel value spstr strCommand.txt,tTmp.txt,",",4 diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 280476fbe9ea3a25f0d890cbbddf3e024747cf1f..4f0cd070af4e3ae31e2376be0821f4b0f8c712c7 100644 GIT binary patch delta 1706 zcmd_o|4&tQ9LMp`hkGyIOW>S)LGVT~I8TJ=Lev9`KfoBbF$Tbs3dUhYk_^&fP$$KB_=&*%OA zyw2{K`f}7V1zA5KGo%!LyG%99%YRw?E9IDM@CRk8NqjRsc|)EtmpSut+_hrvsw~mP zPo><4d_FDQpG}Le>Fw-xn2LIJF_0yM3_Xj~TARbY-%sfxtBz+^riK5j=mqn|zXoU6 zt+RvWq>Raxi)Q;io)+Sxx%r`5@0d$mSYV03=5(I z!T6Zi>;I!y^(Fa|eJMWeqFz~I9x?r)1v2f{-K8>L)qbcQ3^cU42C~%kT$@ulK26SV zFTSM13L8?9hWSWG1{T1MyO4>yu@LuQ5wfrtOK>ml!%{56{m900k z2k;+7kV@qZjn>7aJ@SB8JZ_bp7lSqRSLsw`>vOcw}v=7DB~^>t}b&?H}4H z#0^Wh-rq1+AKoX#ospRnjY1?w)|cHvoD9!Yqi$_QAYq+8QWSVEx;!CPEtlE`^}~#Q zUfR_s2RwR0Lu38+oI|yH3kw}8NI|Ws;>Z2IH&&hdRiDRS-PLa_RU3QsM0GLI(A3~z zPqgwT*)*lqd93OKpEX5&+vkllJF^|>YT+JFy3A8EhLNT^JN0CB%`j~0)HPO3)t;Q& zwmZYyO?lZ))wIoH3pFIk$eNZU)imzXRB?wlT`o}*q0`2@bX}z%F|2B^!_ZYtvnNLV z(lrUh`t>;FuJ+{KlC~iGpS1b6 zq@8U}RBQXf?>O5UulA3-Qf^CqL9<0tC-ocJ=^<~58vI?KO>PO;d-Q_Efzmu{W|Z1& zHo61r=auWL+AFTQP>#)b9$Qd>N>rg5FJLQbP>VWjLp`=*2X^8`?80vB!Co|A9~$9C z6ZYc(nsE?^@DdKA1ux?jcwpcNj>3ypyoxsXa15`Z9UXWb$8iED@dn<+DRiO>-SDFa my*Lepw{Qk$(T9Ev;2hq@AcpV`hB1Qkco(CAimPK=|NI-pe}3}- delta 1506 zcmdtfS!|3^6u|LwXQtCKmezcoV$`mdK^ID`t)=#*manR{)xLG1_O@E>P)liR@Y#3T zctKkEQi(N4ctPU913@CG2ayQ+BEp}k;K{4F$uBwg+prc{;Uq!;-q(Wy8O1%5;dvM5m7fHm0XLmzpco$e&2szQ))H2 zIG?kdk;?bR-lkP_%%9cn@KAX@nVZ$&fsv}ykGeZ$BG*a-o}IgA`Prv&l`cu~^toGB zofWjzVsl@q>sPECCCZ^-ffY6cz-}r>;Mb47U`Ln#@JZfaZ-}>r*IA>bCEBxYz4X-Q z7_Iy2^#$#;AD=GC(?tT6Kc20NR9OA-yA+X~4e^FqB1R*BzWL%`_gzawJ_q>oAsN5& zEi*-$HS~GM3zd>X5l$D6}$JClRV7w@$Ui}Ail*Nj4^ z%VS(G)Sc$D5LY8*=6}-4m3gXI|Jd26NpgDjKh!ki(M9K_l7y=oLg7LfTA~$N!;Llw zM_aT*dvriYbV6rzK?J&@8@i(hJm`sD=#5B3AsR90gT9DGKlDc&24EltVK9bZDB_WT zVHl1P7>PuT!f1@aSd7DXOu$4;!ek_23Z`P3nQ(Rbla2P37DwnmKim|hqK%uuF1IzN zXOxj%!<>^oX*Q#*KyPZ~e$XEOb@t|im!TId#td8jUUN+IWNmOsYMqW`%s>ieA{A+v zh1r;cxtND^%*O&O#3C%l5-i0sEXNA0L0_HjIQGvbiVITJ601O<&AsogL9K|sl#|fOoDV)X` QoW(huN2QrsS2g#`H>Z*XZU6uP diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index a62c259d7ea026390c988ad0ed598b911a2790d5..a2c6e17f1a507ee87ab7acbbe473fad6a9de5de8 100644 GIT binary patch delta 5188 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 XFqqRH3dT;H_fVC%8^)Y|k+c5|M=4U- delta 5215 zcmeHJ`(IVn5}(=U9A5I00^ee2g5cvy=}8pKe4r9&YKm`35+$=#;Hb+)ZLVI;OuFb; zK1xd{5k-`9l$Vdle1m5Ay6IIBjZo|Jxp9lKeP?g_^wYh6!G#aAnLYFU?lo&>)-398 zKeAjB*)RadWks(J`PV&0v zlMnflANf;D3ZN(GNeZMOYDKN74Yj3q)Sfy}M+&A+^c00qXX-*vQ&$S5FzQC(6hYmo z2lb?0^cU()k@O5bOMR#>+37jzM^V(D22eD`&_H^g2GI*Nn1;|$8b+}+oJP<{ilY}P zo)Tyjji#4q42`96^fHa736w|^X%bDQDKwR)(R7+YN%RWMq-1)PW>E^wra6>KuhCq3 zo#xRS^d`-x1+KK(MDTu z<^53^ZM6kf?)0*wKlb5*cN~MYA1%D&Wk-VV4hz7O0N`o!z&Szu(mF>FckSosqlIW( z(9h9^-yPuaBJft;J-=!74-PNq0sXoZ>FBGb{y zVx5QlV~S&>Yf+}-)$ZEEwR|&APy?NN9PwRn5GPbQ!tsOEi>n+Wi$oT?7FR7v?weV8 z5h2+M@C0~6TqM9Ke+>?50Kwn}i|qg@(He}Fpq~aGD2xTj9HYS^i7FBTfM)=Fm8pTh z@P|MfXv_qdUZ%kn!A}J{%m_lb=VgI zb-O917o+)JrRvB%wkvPE$x+*t%jOq@u#6kFs|a61)%6A1N=?^S2{VX?exx@0#12Gw zED|sXA)MwE){_bc*!p1vOqlY{#K4a z9+9J3n{Q{`RgrB-JVGLO%vBKFoBI*hJ;6o~p>bF##cE6!M{|sssCc zuDrFz1a9}aa{AzCgoh%FUqaZ&H$GRLH5|=xw^U(^G#l8@irGE}`7^r^zuhf~JIi&u zC2^Hw5TZFJPeu3`s;=LKpXB+A5oIg>DNk*+){I5qGFGiQe~LF zgWU?HP`5a|P`P}vry#sN6~T8JLN|UW9xZzc$5p7pmaq7MJ$5=m-x&zUM6Pl50U^e6 z;{jFT`CC%ccHZamgF^Z_iSHa#PWSwo2Ryy=;3sNR&GvcV zR7)+lXa7;E!$sHj}uMiu!V7F$j#LaWyh;zc;iLp{k;56kxt zbLwH)b*fmu;jYC}Aw$*mR9GU{}wK8p}~7>If!qV~GlNf8lk5 zP-;M*=J-;z71Ow`R0X@In2r;MBbwvO6j^@}3vYW)wRf*KeHWU1eah9RIEk;7E0_DU z`3Ps`BQNizI;J<>Aw)+ zGoE!!O4xrPPcBeSTWA`>Mou^`pio|NTuK+1j^L4jphU)U%okFHz;uo%lzPv1AiS~& z;gU!mcdd}J&F7I7a?#JS6AFn~`(3@yiiXmvioV6>br|>1d5yfl$QNC!`Rf znn%l)y%Is=@~AdNb z#8JY{WS;;YuIsGg=_Dx;dXb_3G1D;MsD}0_8!%u>AIhJ7AnuEo!aaT{C$nI z*W3*VS2rME86)i#e@@CjmnWT*j1^}ggmTb%iK{q^OKK%!?teF${dX~;JBL>aC@~x1 z1lLvyC^4Jgxi6sHjR=8!zDhv3+*l=`hD~x0u=9d|8aDCdIspycjBtRrUlh<#K7G+R zHXq2;`4FM^7GsU|U(3d_x$tYlvlSs}8^W{O5oU76CDZfaCHe4*kK_{I@!!bsHB?<^ zEmwwbo;iGXeIt!<@?(TP98)dpoaEGM;RNoK`f}IH!ZB1`|4#cwIFC(E`eorv`NVAM zE5ez=QCEbs<5L71H;Bd8P<6e(CC;Mjqh#R9kiRONnq9`czHwDJHSBdweHHes+%Lv( zBDr7w+i(gs{qM>rV%UCNEkPF-URR-*$JegQ;jS{>J1sc^h~&rrki)$&|BptSb4VJ^ zcry>TD_;%=&$=N!C92tHZp-!}e7DzVzK|BR&+?q>S`?8dcxij}uH<>ge>)kwb}<8OaZYpew)BH#EArGr{! diff --git a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py index cfe47045..ba82c961 100644 --- a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py +++ b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py @@ -451,10 +451,7 @@ class NsPanelLovelanceUI: if "color_temp" in entity.attributes: # scale ha color temp range to 0-100 color_temp = int(self.scale(entity.attributes.color_temp,(entity.attributes.min_mireds, entity.attributes.max_mireds),(0,100))) - else: - color_temp = 0 - else: - color_temp = "disable" + if "xy" in entity.attributes.supported_color_modes: color = "enable" else: