From 12f6bd75b50857fb77c83f4ae342c1c310860500 Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Sat, 23 Sep 2023 22:11:06 +0200 Subject: [PATCH] Fix mute volume not working Solves #1079 items 2 and 3 --- nspanel_esphome.yaml | 11 +++++++---- nspanel_eu.HMI | Bin 20387572 -> 20387572 bytes nspanel_eu.tft | Bin 7442752 -> 7442752 bytes nspanel_eu_code/media_player.txt | 2 +- nspanel_us.HMI | Bin 20870573 -> 20870573 bytes nspanel_us.tft | Bin 7516104 -> 7516100 bytes nspanel_us_code/media_player.txt | 2 +- nspanel_us_land.HMI | Bin 14767051 -> 14767051 bytes nspanel_us_land.tft | Bin 7442752 -> 7442752 bytes nspanel_us_land_code/media_player.txt | 2 +- 10 files changed, 10 insertions(+), 7 deletions(-) diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index eadc9f0..837c902 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -682,12 +682,12 @@ api: id(disp1).set_component_value("is_muted", (is_volume_muted) ? 1 : 0); if (supported_features & 8 and is_volume_muted) // unmute { - id(disp1).set_component_text_printf("bt_mute", "%s", "\uE57E"); // mdi:volume-low + id(disp1).set_component_text_printf("bt_mute", "%s", "\uEE07"); // mdi:volume-variant-off id(disp1).show_component("bt_mute"); } else if (supported_features & 8) // mute { - id(disp1).set_component_text_printf("bt_mute", "%s", "\uEE07"); // mdi:volume-variant-off + id(disp1).set_component_text_printf("bt_mute", "%s", "\uE57E"); // mdi:volume-low id(disp1).show_component("bt_mute"); } else id(disp1).hide_component("bt_mute"); @@ -1620,7 +1620,9 @@ number: icon: mdi:timer unit_of_measurement: "s" set_action: - - lambda: id(timer_sleep).execute(id(current_page).state.c_str(), int(x)); + - lambda: |- + id(timer_dim).execute(id(current_page).state.c_str(), int(id(timeout_dim).state)); + id(timer_sleep).execute(id(current_page).state.c_str(), int(x)); ##### START - SELECT CONFIGURATION ##### select: @@ -1739,7 +1741,8 @@ script: timeout: int then: - lambda: |- - ESP_LOGV("script.timer_dim", "Reset timer: %is", timeout); + ESP_LOGD("script.timer_dim", "Reset timer: %is", timeout); + ESP_LOGD("script.timer_dim", "Is dim? %i", id(is_dim_brightness) ? 1 : 0); if (id(is_dim_brightness)) { if (page != "screensaver" and page != "boot") diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index 9dcbf036753476364c9be0dbd4a8caf4e82ab6fd..110ced5746c3832ed911be35dc48cf0f350b3152 100644 GIT binary patch delta 1507 zcmd7Mk9XB`9LMqR_wIZ5gUVM$D~u)UHd+%o5}9B9P%&b}+LZiAN;F(0ZthFNRO8ZB zEfO_9S~WLarVO)HeiP+Kzy1EbGL)j8?~Zf&7y6v@c%Jile?FgcJ}osHGFssFtaU5g z*eK7BRk`V|lUU%^2Rb?b5^=T7Rrr))(DC`U?<-958 zIL%9fEjgP5`}d5pmWQ1Vy}8~LORQ~M8;q5u`57@Uy8nTjn48&}AX1Z&?6kMZru z*(%UEI#=iEd|jY^>aPJBs0%engEd4K>0%Y?5?!jHx=fd=NLT1e4bxS+TE!Z!5|!#2 zjnGJ4t5Ld6*Xst|sL{GfV|25|YMgG-c-^YoG(ly$U3citW#PsmFKbPwiOIMZZJ+Dr zCl}>K3wp&X^Cx)8rL(Ksx$#QBtaZFcL%4Iid46?aa#mIKq`-k;c}ZOucVQwX;ciUE zJ-8PUOu>DKLbxAOQH}@jARa;m9>z3G#|%{B5j=_*9>e39i8!9XEX>9nRADZj#8a4u zr!gPT;8`rdLR8~9JdYRfA{Lny?D1u?FwpUA%|)@c}->NB9_@U@bnyXIO{z_#9v0OMHb5*oaNoj4jxTZTK4B z;9Go$@9_hE#83Dczu;H=hTqYQ?bv}o(1Jhl7yiah?7~0TjXn4m|6y-MNu4_bmVhP2 z;#q>0R7;vA-I8HB#B!*mm8G?%jpZ-g1QHNJ|Gxrlq5$ljSJO(UxN@ zS(alh$62y1oh`>(x>!!I$Csnz&p24jsIx;i;<}p0hjC51x zY9eLdsH(F~EA2{*uPn5=LRC9M_XgU=o;#iD>(w^d=L#S04UEVSj8MP=R4ea31ovwiTBe%l|RZds(e(uKIxd->;Ufi4e@FU!pALV}B zp9gR($MHap=RusngLw!iauN^aWKQ8>{1^}C5j>I~=TsiWqxlIQ!(%y($MJYh=O_6o z&fuqc0#D>;coI+MDLj>@@pPWSnLLwc@odiGXL$~1Z+F*>bhK<&5udqQjXI)@_RP2X z|3q{rQIav+n-QfO^MvL^^NhK!B~dqr|NPK!qMNTRZcCJ7oYTZ*?h85)WgB}-l(}CJ zb8GLRi=E8_GrQk9KxcZH`;5Nk{&;_)T;rmt1I_txf;kUMGUr1n<~(GCIUh)s+2g;P zxG{KCjCm|kLt{=!Bf4Vo?+4?b>4q^UWSIK_6V18LWTMN)IbEj_T{q^=ndUxnHj%@) zekV^BQM7SV#vGzx>CCF;zDi~H#IW114I zZaeCZRd*F;h3IYKwT+6>Q4dSd60LaLlc*iHsm}f0SiSbVHX}%_SF>W(-di_?==ImM zaI63M(8^6AYTk|64m~&rB^rWEjuKx4&rBk&St6F!; z8>iPh%e!Ff&5l#UO5DxV(z&?->bQeTiq+c9xemQ9OPi0^=N%ZW*7op}>J@IyxSpD{ z-W{UX~o#?Zea}XI5i1YOgy&t>2&}>uc6&ITmx7pH}ULxiAlMU_Ru+0`Nc{ zEQCei1%}121oGiISPILa0G2}`tbmnJ1kb|@;DcgV1tp-uYFGm=!dh4dFTu;O9!jAM zHozNvMU{JScfc5-Ew2L`ynKVk8es QI!QV!yVI(>C?#Y51NHw4s{jB1 diff --git a/nspanel_eu.tft b/nspanel_eu.tft index b2bb25e5d84bd6f54584704feaffc88b0b51ec5a..65b87715b0087e1a268e14ee0671984f7a27297a 100644 GIT binary patch delta 270 zcmWN=M@|$_007X?Vdzz=(z`f-^dh||edvNx73oJ{@e;P2fisY>m<=nAz%{%A|0VC` z@iplsypteNl4L1TrAe0|B2$)ZIdbL6SD;XlVkJH(Ri<2pN>x7kq*{$yb?P-})TCL9 zR&CmS*5Qk&PF=cv)uUIReggX%|nH)F<4m^5YDj9GK$efPtHMN5{gShXf*-G)tD zw(Z#U)1H05{C42bkz*%Mry22t=zS!98vY6YhG*fw@I1T-FT<!@W_^j3!b?P-})TCL9 zuUdWcU7L0>aUD8!>DHrHpMC=d4H-6K)R=KUOqeuf+KgFq<}FyXWZ8;UYu0VpwB@I5 zJ9hoD=eIxp+IQg4k>jV6j6_oGA(}V||Aqg<)9@@j4==*Y@G86xZ=R!x+xT1Lt}w0q E9g>=4tN;K2 diff --git a/nspanel_eu_code/media_player.txt b/nspanel_eu_code/media_player.txt index f1fb7c5..af5093a 100644 --- a/nspanel_eu_code/media_player.txt +++ b/nspanel_eu_code/media_player.txt @@ -223,7 +223,7 @@ Text bt_mute printh FF FF FF Touch Release Event - if(is_muted.val==1) + if(is_muted.val==0) { va0.txt="true" }else diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 79e73661704c8b55d5d113a7d201719aae4a9004..90f3b484fbe18d5de8dc3694906dfb87f16ea5e6 100644 GIT binary patch delta 2022 zcmdtfdr(wm7{~GRvKPebTJFXz*#z^HMnskuRLs&eC7`mh@l#GR0@sm@gD1ZIZtq!Hqq$tAE5hbECyPO_~{qs}_%r$w3hu8;1Dv9xq zjLwJgZ?4f4^K3ld;LWnlGL1;=a^5iA9Xwa+QxzpJ#JsiF0t3(UZ>P_#Viyns1~7sN%(}%M8fgAM?NVw{ofZ|#s#sRVvMQEUv8;+^ z)zHA+(_z4CQPZ~5NE$_>DT&6=SQ{HeLNjR=&89h&LATOenn$`UPX)AumeO5xH!Y(=pJuKx7UcC9r}wPU60BmXY)o=kWm=tYo3Qkw_&*_}ji<`7Q23b3;*d`XqirocP z8K^Ea%M+d@7HRL;Xp`e@9-FAtMV==@=q-!g6AW@jSkb>tTL$L;V|tFzlMiamMv>r* zY15zx?tx+`fqS782$sWr;Dr0(0ayWL@F1*&Rp5ehsDOuHH9QQDz#5S7C_Dy_!xQi% zJOxj~Gf)Z7!gG2|+w*I)jp-#5UH{qD%DOns*4@SG4C`P$yaHA5Dr|s_;DOh`3qIHc)u6-c@CLjIZ$S;b4YjZt>YyIB zz&o%N8eki|3)^7_yazkseb@ybz;5^u8etE71RujE&;)zoQ}_(_!G8E0zJLSJ3@vaF z4nZq?312}Q_~C2#2EK*E@Ev>)KfsR=fFtk|{0v9o7x)#9K|36W-{5!n13KUYoGkPE zgbO$!90SM5F>%bCP)-j{7^f$v7pFI;52r7uAIHM!&pCs0CT9T0%CT|I;)HV|IFXzv zPBiCi&OlBK$Idy2Gl&z*iQ^3BoXZ))Q90*v&gTr}4C7qDiRWC%N#I<>N#tD28P2(c ab17#8XC!A7XEY~?Ge&Io`^JiGb*BJmHHKOM delta 2849 zcmdVadwk7x9LMqRcjsaosx6cVU920mE+(amE>?;z()+Xh%Ix6}fAmM4$K&}r-}Aej-}n4}zq9tx zuMulOcUY(ow3<3@%Cye?2VSMDSC-qSmO1dD^mrQ`ry8yOv_t(`jV;Pj!s26ECntCI zjr)6NygMrm(fVyeL#kkcQhIB2nJuo?W>2vnDS2>Ne5`%l?5$VJ zV2&%k*cGoK3~XQr2RKbve3Qfb{LAe$uxzs=@z<`rqVRZAs~h0dX&;nWINXe^G`hHX_Xnj;-qX|P;>@=VPf6>5leeD;CGy~B zW_fsEb^big>=f)+a&(5n9Q}^5!Pa00?;dN1lD2^~vuKYIW#jd24UeA63wP(cIsW*1 zC(n!UCvt|T)T5s?b#7@Z&0AuOK4wi}sGT-verz1mjW*y)Yl{g9UIuEQAN(L3jurh7w>{ z1dqUCSOSm2Qg{p=hh^{tEH~R9d~!uj)Y7-In#iM>il;Y@qbrT1K&DnI$6o(XcyeE7 zl2XHMDp0q_n9fRFVC`^sGQPwbukWr@2W$Lp52env#z!wZdD4^mDmC3&zPF!J6RmOD zHA>xLjaOzWHNhH34#i)XH5u2i0ZOg1K0JTDQns-A8B~nGyS2Pxq*6_-@%B+ljg|jS zygH6ks=2ki+jym#aqWhp!RD@)3}1AEd-7koiL0t`@838j=;5)cK_@TG3c6(E(LMR) zO}TFK#oUlXbC-lXhw1ppxYouQKjxoy2Tng`cp7c)(`Nd9<1@|jEqXQg9vMt(cy#@~ z+55d*`^n?yXbwM!r>ZM%DI+r9BSV`Er@)$2IW za5dLt-9Fqbsx_8JvhSh-54(~B9?lq1;L$Vd=EZTZ7M60&w=;&+&5bAS4NYd>in+`A z{+-56oZifzVkVw2MrqDlf!$9%1`n#8;W>jN@DiK<1um*6Sj4_IPc=S@-f^a9qBB@G zogT~SCyWGpZeEU$myQ20k$vI*RPH)E)RKqT{fqQ2UKoy__n(>a0L2 zkx_m(SBCqS)?MX>7p(5;o^rWP^OL=9cR3bf>2TdH$P)`V`;u^hZO6vI_#`+wH0IH7%Bj9DG+AK>84 zH;!3tOjt6()e4bQ+DSPRd>I#>^-@EnvuIc$K9V8Zk80=x(nPzf)=CfE#H z;AMCPw!*8h4YtE;umg6&E_fZ@fH&bS*bP0kc6@G)?;SV?t zf5M4**`{6qk}!!)VwX51PDv9jH05D)LasU7T diff --git a/nspanel_us.tft b/nspanel_us.tft index 6a74f17694030a9fcd67a2d5e8eed4cfcfeefbcd..af6b099c5454b9eb5f368b67d6c61a1a5f3ebf16 100644 GIT binary patch delta 4245 zcmeH{jZ>7@6~>=?cY$3NP%65jRz$%>vm&2MwOUxC7y}w@tJTym8hwLW-Q|r=+Zm^7 zJ&7h`5|GM?Uqq3D1uKwhw%90`(x?d}#!_l9ii}Z{Xr0obb|#%>dv-VJO#gz1aJ%rClhSq1wx5?n>Ud{?f58v)6vHrywoArE#WzRPhT!CUQ_N{Jop{lz~BZ3H!!$?!3_*ChN~a9Uq%6v&9CA}GeT$~ibow^Upqca?%Ag7{9hn zZ8eU^@YSe zw?C!RD6p$k-q39%t9E`lc(nN&yNy#Zmisp~7hBd&+V$!!LwHsw5!MOog$=@wg^m7K zZ*9tGQ-yr~n0KnG=lrx(n{~KOsvhuLKD`Z~OC9a|_@6E~Es%~rSkw$44jwh!BBeq&Vk-+1k#}@%B z&xiF=(O;|pY9pOVU`W=9~JggbnSkMIgyxWQzJMbPxVAo~9SRH}w za$g_f;k%A)7~2qm8oBWAuwZweT-XzVt5)D27>~^XU{h}dei{Wh)ey`XrV!_j#HZq) zsIoD|qj2Y$NaWjqr$t{YRd@waA^nQz7poQAhr{}9(J6mYxG~KZ%0E;NY`(Qk;e~D+ z+NGh=QHZ{;@a2FF12TY3C*cFF@i4-U%`(6vqMOHPoGcCN0@1Z@4dZ%PuN8f8p~l#G z(IG$ScvP>`=sp#V0qMU_k4NP$jdOj`NSA^AdL)LXG;5^Ic3`<&@PQtU-B&asD;&5e z`g0wF=lV1zKHuqkzO(dnr}97LM`D`^*Wdj+^&M=AJ~B{y~F;E4-yrGWU3Y zrDR66YwQ-@6s)|0B{Pb5u<4I0`lH4f;f|2~4sY6Nj^O35nK7z}*S#i{Ti?<6T$p`9 zV=qtHFO^$)(S8}YM=#n6X*|dK zj?4S+an1?JRPeGB(!7H`zcKIHFH0g2@TfVw!{N)~vb#Pjmz*?rt3K{O UDQoHC_(t=$k%7Rnfxf%{0mEya`~Uy| delta 4508 zcmeHH30IWo6~6B~Gt2@?RFDvmMTi>{SqEH51*4d_#HBV#4Z&Dp+C*W7uckF8?a`2{ zAmtcv;c7rMfI!40u_V(d3M2>wO=zhF0wzeUOCu+zCfd}bJzwuPgGv1jWzIb3o9B7% zeeOGV-ZQO(ow^Q2akA(rc{D#(-YzSC76&H!!+^(G84lU~~hc8yMZd|NRF1QJ_Q}>d}B+Xhaj5 z(SqLSgJWFdQdi1V-Y+I0dKTG@Onz zFbb{s2+qW4jKNrp!+1oF6v8tj9od}FNf zN%7X$Suxf)n>8uM_2nu1bYWsOA&ylFZM541?lFGGaE;p&wdvH-ml5l$Tis*MG}}!g*45T*|GT%a(c2g7*}~=u`PiOj7EzSd zV-FXdl+O=cTbHDDx~%C`5oVuHjh*)Ku4%n?n~(0R%N`?t#}zx{=Zs%4USPb)*udDx z$ad|xk`vo3(&%)RBU&`jP3>{l6;$n5t7G+*TDMxSJ?^>&YFUl7@V1-*0L3>{HPEPn zw*=T^0LT{i>pmlT5^bn=EE-eAwz`FTw{jc3o{{rwSK?8}B^h{MpGgI+4>>Q1qE0xX zr`rCvk8RV4eP5nQrPS~2S*~j*92X_6Da`hvwv&!Xk>t90(h(3Yl1O)vzkd_NBIN%OVB_-!*vj*UU>rCB<%XMLi~HO#mzhi>id;pUSg)S-K z-v%>m;sZ=&{!XxjhFlL%V_uUeVdG~Wp2fUug@ni_Ebe-gQ z5x$zFs(Zy@cTAlpCd`~Wo;pgEys=@e5_U2g8J2UjHBXsHIi&cAFnWbJan(5q&5U8j z9GbU}6E#UyuZlbF#D94bx9{VF<+Vxp2V-%&gncx1KOZcQmh9)4%d9NxkZ^!;lYHM` z=Q72=!OrH7BwS<6>XfjZzR{e`6ja8J?|BKoWpptn(O?-nzN9NxT(LD5B=~(SVLqdn zac|)Td?kKZxM!6%(JyM~X1Q|R?E8sU`WN{r4J~)Z)7T27h`(l8g%TK=2j}9`r~X-ae~J6}EiKhjO|6z5bajiQjEs+A^Vd9Q>odL{j-JvUqy_0pwZDeoCl`XqEy z*I^|}q|kSVc?o`>N-*?Gn9WG1rW#&?A6=-r|mPT>0K5p3YcFYmac`IeP5~J5xTF5ID%c6vIi2>e-pX zf3NK9XT@|`LNcR}qL14Ab{B#1-Ia32}tGoZf#gqrT8EepLpwh5rud znsi-#nb(MRYTi)jOYc=@28Q`UqH>*%e5b>d0I^A+1W6CS(_ydZ>~=}Dow=4H-%_)s zW=qYMnk_Y3YPKBqs%|mxS&r;@h7!dvhBJbZj3SyCoQ!4+v5aLL-B(j(!mavp%EN2BPS;cDB;9@Pwq_B=u(pXPA8`#Ju zHj}{?GTBNN+2pVdH{01kE|AAg^4Z01_OO=%_OYKr4p78FJRG8!!<2A@qa5QnCpgI| zN-5)Xjo0N23~TD2>CcLF_ZetL_={59F_Hd)-tB#dltlc(@iZ|m^N896KG zKmrLAo=G4CBQ#t-0)AtVO3R&n4$apJsFj--CJBp;-%pu=>N|64LHf~;^dr*C(%&mPKa6AX#R1VM%eTuyG)m1t)Q(=Tb;H#ZFSn}wAE=_?odZ(c!=3nb{75U z&j1E8h`|hDD8ukFoDrlml2MFi3>l1N9OIe5L^7GgWU`pTRHiYV8O$V`Sa#@a_738s!d~6C>#cI~DmO|E1#CkTckzzJc!e&a@!d3!68QTc5 zopN@tlU?j)4;6&i%Ra(XQpJ9%so?+zspSxdIYNXw>YJi|uQNZlFceRVwfU>6Q+}1S z#)~t4W_Ara+M{w*j>&O3Aq{d;PRVIGBWLBDoRsRk4ALOHalF!mAU*xNN Olkf5)?r3joDfkNz)^4Q$ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 7646b7f6f556b9b2a0e555e8ee68b10ae4040ba0..6344453db8541ad18ed55e84a31dba4c2e49f9dd 100644 GIT binary patch delta 270 zcmWN=$4(Pq007|B7O+Lxh$1L^2uQ6U2o5%ty<{o~T973?0*5d0J$MEZ4!!i`kpm<= zkN=l^xyygiTzDbkfvA`~`3gJ~mr&@D$BGmyQL0S23YDIy^3*fco~u#og_r8oYtX1k zvlgw|w0osPr!KE`OL`;atscGJ>C^AM0fRpH=#$Te3>z_O%(w}Y(!Q87ZN{uQ^A;>x zvTVgytJbXBuxZOT-)-CR!>&C){kqD;vytTAL^c!dhX>*B@Gv|IkHeGjH2f2uT_>{V Lsr%UN&0YFGm#${C delta 270 zcmWN=M@|$_007X?VF2k;MS79u3{9#^hoOU1DbhO}fyGO_2WKE*F&kDK!Na)XzvR6> zy`{W{kCG%ykt$8P44JY-WXqB3gFN{P6e?1z#7Cvdl&esw$|u!6t5K^?y#|e%G;7i7 zi#F{#bn5a|R7|%Xz54X~X275!!$yqy?uVbojGHiN%Cs4?=ETiguxQD$6|2^)`(?wX zE!%eN`fbm?1Bd=Na_r>!G%Jx5{ToS~hG*e