From a9ef296fb20f419cc6e96250eafca9056772645f Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Tue, 9 Jan 2024 18:49:57 +0100 Subject: [PATCH] =?UTF-8?q?Display=20`=C2=B0`=20when=20moving=20sliders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Solves #1569 --- advanced/esphome/nspanel_esphome_core.yaml | 4 ++-- advanced/hmi/nspanel_CJK_eu.HMI | Bin 20441863 -> 20441934 bytes advanced/hmi/nspanel_CJK_eu.tft | Bin 11636880 -> 11636912 bytes advanced/hmi/nspanel_CJK_eu_code/boot.txt | 2 +- advanced/hmi/nspanel_CJK_eu_code/climate.txt | 5 +++-- advanced/hmi/nspanel_CJK_us.HMI | Bin 20255537 -> 20255610 bytes advanced/hmi/nspanel_CJK_us.tft | Bin 11643096 -> 11643128 bytes advanced/hmi/nspanel_CJK_us_code/boot.txt | 2 +- advanced/hmi/nspanel_CJK_us_code/climate.txt | 7 ++++--- advanced/hmi/nspanel_CJK_us_land.HMI | Bin 20940694 -> 20443086 bytes advanced/hmi/nspanel_CJK_us_land.tft | Bin 11636880 -> 11636912 bytes .../hmi/nspanel_CJK_us_land_code/boot.txt | 2 +- .../hmi/nspanel_CJK_us_land_code/climate.txt | 5 +++-- advanced/hmi/nspanel_eu.HMI | Bin 15033379 -> 15033379 bytes advanced/hmi/nspanel_eu_code/boot.txt | 2 +- advanced/hmi/nspanel_eu_code/climate.txt | 5 +++-- advanced/hmi/nspanel_us.HMI | Bin 14820802 -> 14820802 bytes advanced/hmi/nspanel_us_code/boot.txt | 2 +- advanced/hmi/nspanel_us_code/climate.txt | 7 ++++--- advanced/hmi/nspanel_us_land.HMI | Bin 14712667 -> 14755923 bytes advanced/hmi/nspanel_us_land_code/boot.txt | 2 +- advanced/hmi/nspanel_us_land_code/climate.txt | 5 +++-- nspanel_blueprint.yaml | 4 ++-- nspanel_eu.tft | Bin 7311536 -> 7311536 bytes nspanel_us.tft | Bin 7383288 -> 7383288 bytes nspanel_us_land.tft | Bin 7311536 -> 7311536 bytes 26 files changed, 30 insertions(+), 24 deletions(-) diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml index c116cfc..66ad682 100644 --- a/advanced/esphome/nspanel_esphome_core.yaml +++ b/advanced/esphome/nspanel_esphome_core.yaml @@ -14,12 +14,12 @@ substitutions: ota_password: ${wifi_password} ap_password: ${wifi_password} ##### DON'T CHANGE THIS ###### - version: "4.2beta.4" + version: "4.2beta.5" ############################## ##### External components ##### external_components: - - source: github://pr#6051 # Remove this when that PR is released (Hopefully v2024.1.0) + - source: github://pr#6051 # Remove this and update min ver when that PR is released (Hopefully v2024.1.0) components: - nextion refresh: 300s diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI index be50b57758293c22d2a19a0dd2826541f3d72f9b..3fc7f474d0cdea55f1e0fa2f6973fee400aa49ef 100644 GIT binary patch delta 15526 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 delta 2255 zcmeI!c~n$o7{~GV9cGxQfw`JMF=AvZlEY>asHH6e7K>3)Bq)>%r9|Nr&?4y5jHyL< zmBET!0Vyk4YBUIt#In>P(=s6bCT;c!$Oz7b4-QC=ZhwjtB}osQY|)wo5rm# z2x{vP)0>midU1?#FA#?dgpd_cvbx=%NLi_#bNBX*Nvab8na&RhF{fuaN6u!e!5${L zM2$ghYPyFhqGEZyn7G|}b#$;f{le89DGlO~yX>37P8VJhEwj~n4eP2!pYnwjKz8(@HK+WxdV1ow;d6=RR$q;n$xhyfQ#;G zzR~2X>FE_ov7SOidZ&ei4O}rr-E1@|t2UbD%m}x>J$ARwow}gQXzMac(0~hQK?kno zT}FN9|M&Cnd-`9$pAOtlW9NLusz|G%u_`WBMQc@bR>ieU(f{l7RZ3SJ-9+IOL1Snv zjia0C78*|z=vKOoZl^nFB1KXZMbjj@lkTDzilsP;r^$3TCD1)|FWpCpbU!^nN%SC1 zp=3&-sWgpJDUBYYhiN*^pqVs_(&-U;lxEW$%Am(6lOCrhD2wLSSiD=b?NK>r9Htga zh@T9#7nWrWu^%{LS!QpXk>zR6J8IF{lx_<=2~R;b=-OW;L#2@2q4D1@b;!ZKJ6MPP?w zSOKrVtMD3>!0WIQR>5jm18ZR<LMl!+NNIH{ea!0B^zD@D6N*N~nTrsDXFkJ#fG# z*bMJGLgQ=GQ+4+78zL(mt1D|0G|A=s(8sZ(M2H}bb9{EC5P|*UfHguGozG7ZvG)8p zdYusXndm#>O3%-ylnJ5q&u2I$*VOu~DDuoQ$Z&f`Yps_(JErcG-M=Mom<+S$#MGU1 z9E_`*ptt)~Sz?Pa<^|YF66@dtsD}nhHdZ>d<@&+6ZjN%z)si&pTXzQ z0$;#x_!9QOUib?3!G8D}THzb`77jogd0ide*(1x`D6e9 diff --git a/advanced/hmi/nspanel_CJK_eu.tft b/advanced/hmi/nspanel_CJK_eu.tft index 91da3fd4d1dfcb8ac1ba3c44014a26a6098be594..076637277c8797f0549827c010e1a8591c5d2d51 100644 GIT binary patch delta 16110 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 delta 16113 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 J`9@{a{{xI3$uIx_ diff --git a/advanced/hmi/nspanel_CJK_eu_code/boot.txt b/advanced/hmi/nspanel_CJK_eu_code/boot.txt index 2e4f89d..c8b433d 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/boot.txt @@ -104,7 +104,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_CJK_eu_code/climate.txt b/advanced/hmi/nspanel_CJK_eu_code/climate.txt index 1745915..9f0dcfa 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,7 +606,6 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 @@ -614,6 +613,8 @@ Slider climateslider va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/advanced/hmi/nspanel_CJK_us.HMI b/advanced/hmi/nspanel_CJK_us.HMI index b1237bf6b215f705b570512d9dd6a9909fc0399d..ebacf6adb1a5e23129199c2ba26362bc979480f1 100644 GIT binary patch delta 15731 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 wankcw*UYD delta 2344 zcmeIyc~n$o7{~GVg;@fDxtTV}gc+vE;>a+P4rZH{TB3=8xe!62P-3W1X+|zjgG&l} z&Cv=56;Q)KmKsF}t<0QKtjx4o^xAD z4)|1nTu~th$iVcZv}xwyF(ZWM2;t%{Xrv{I;p^+qYH;`C=V^IV0(xjqtm8f3{Gq80;}h(G;ai?Vak~dXA|e%`4)JNhhS+DAhTBai)Fq zvX7st5-Gb9lCR;o7_&^A&J{v#vPku;AIWlcy1!A5R~Px4f{GV9#epc_)<;Eke5RPC z?({dwp6U@aQN4oIS0~qqks2u^)<;^*X){~zYs(1L5@7PGIjD{b2$U<;v;b33H?>v- z7q(rFv~}Elkh(U&B>Sp$s8A0Fn4&KXsTU2Yp49_8uHL!1UbK{Xu9;`2wT;@keWGeM z1lr2t8--!DUI_g4i0hWroj)mNSNaLD*PLvzcDy)1oo6t~a5W#btJ@4F#eFDDPKowu zU0r04v@d8jn)#DDVryYT)EP4gAIBJGNoUGcUn8oQ#k zE4mUz|F6$iD$S#5AlWFI2GQL#nC_u_={~xj9-tvKlpdsqXc!Hr5%e%ULL(`LM$u?` zl*UjjjitvZj^b$?Jx=3k0!^ezlt52VB0Wh-luS?2)09G!X$qxM8a+eL(o{;PY4jXr z&~%zXGbyt=D?UNfrRs8j*Mx*D-yYKHI59VCqob^{wrfssb{0GjFTjg13uePhFb7_C z1!rfc#%h#vHk)UI{_Pv!V%F}?Iry}}T$l&*VF3`l3U$Mk#@`RVGZT3@}&i1y%LJ~V~)d}FGPe_+qlIk zL_g0sWStNO{xsqkxW0WntVjr*XFjI5eST7j5Q=Ahsw*+CAaISNFfh|k+8l+UPNQPR zKA9=$8Hv-f(vwqWL^u++7FZna5NEZ+73%CR2RL#J{$nq+eyr?BmEA zS}-Q3)arynSPSc5JrqGPl)whq2%F$-D22`N4wOMTY=H`>ges_pci}y7!B*G?HLx9O zp$^`Mde{Lw;RE;(K7w8FG3lI5%=Sb8g~v;dJHP z%rSCq;dJ8!a!j0CIYFH6oZC1(IJa|xIXyXdaC&iibMEBy;e>EPIbob|PG63h(~lFu Rv2Y?eR#{(a?JpaS{S8Do{BHmN diff --git a/advanced/hmi/nspanel_CJK_us.tft b/advanced/hmi/nspanel_CJK_us.tft index 818c542317b48eccd4852485160e5e4f12ddffb8..71a52ef98814e030cb3404e4a8bbbfc0c00bb1c9 100644 GIT binary patch delta 15716 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 diff --git a/advanced/hmi/nspanel_CJK_us_code/boot.txt b/advanced/hmi/nspanel_CJK_us_code/boot.txt index 3dd3f98..9b69c80 100644 --- a/advanced/hmi/nspanel_CJK_us_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_us_code/boot.txt @@ -101,7 +101,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_CJK_us_code/climate.txt b/advanced/hmi/nspanel_CJK_us_code/climate.txt index 259d11b..c7c123f 100644 --- a/advanced/hmi/nspanel_CJK_us_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_us_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,14 +606,15 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 - temp_number0.val=slider_high.val*temp_step.val + temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI index 3f7dd7ee366588f636efa15fc9a736a197d6cebf..567fef7d86c30f31fa7ce2ee7491bbf7a2e486d9 100644 GIT binary patch delta 15912 zcmeI2Rdkih(ypt!=bVAaBsd8y+zGD1gF7L(28ZAl96n@1a0?RL-9m%}65QS0ZQ<^I z-j}ua`N!Uu=jvSiYmDms>}sp7uCDHHhPl&!B|UxTPEs{D^Uv1OZ4zK6*)$LM+cXRrdsho9>+~4s} z%Od{&xwsrR_sF{~|I`&OFf`;J`ln1gd2je0r;l+Te>41s)2GajVz=bmzuFf4FXKKv zxFtvb)w$Sz)$M+GE4*MbA2aLGt?=5(e5}IHZb{Z<|1>UK=s)dgIO(>0S@%y}$^Wva zcF{YMEW!<*fY1M{uEmMJWoVSA$f*MD3m5&*%8Mi3%g5pWsw-Z=?>|;~?Avc?Q7`qM zjz#`!#%wiHhbQy)@$M2^Ky@jd^iP|^&u3j48{i!l;H@AUVjwn%9pZ=!@OIntIy}(3 z_5ViGfB0GcH=6!mqiJlQcUU08EfC=rh;R!;xCJ8I0ugS3-foev|9@x@9q9eCfvc3u z-&NXG##Po;&Q;!3!Bx=};Hu=R?5g6b>Z<0d?yBLc>8j#FCf?+SD^a0R&< zx*E9}yPCL~x|+F~yIQzfx>~tfyV|&dU2R?MTjN6$*hXcE9}`n)x5iJLPNp=pM^pOLIyzw zLxw*W}`6<MCE6J`HrE3R6dat-_g0D$|JJzhuoG%D!s_WpR!*XtK=fJf5`}G zLfz3{vPYUy7xr6*OEc<>s1wqhy3?Y@N(+@%FuYnJEmbO!_ezbFR@C*?YLm29sVtGd zjG7>As9bH-DhX!8nl?2`+ERDShKB8^3$?2-Y0q{3u%otvN+B}bp=L=(>YQ#Er4w~? z-P9E6OkLI_s+)A7Zb}k0Sh}i=BDSRJj)buGK~l9@tZr1!a93xfJC(s6YO(a7?uQ2& z_N4BHCmQymZi1J(E4``f>Qph(hq?^O)LZFGotL-TCH<&7?yYV~f9lpIS6gI&$}Q43 z1vV*^PG6Q%i5f_sFH2>q1R12#h_p%vuv!_wvD%==d)2jY5jJg|X z)i@bWUE6f3r;MQPR5~?RMpD3e!L zN5-Pok{KCPqPWTOEap85~ltVoja3SE)!s?K9)%hmx(HqNY%{h zvP@FhMABzbk7P1?NLDplrf|I3S=B+AN&}l^!;+?vytAv0GM#+~WLFzxhDBw@9BQV_ zRB5$r&7nriES20yp`4g5oD-kR2_MZ?8L*4FuqAU;E|KoJ)i0ULFbm0}LS&wD;(3%u zwUY?+kfM3j0h!O}`IHxHU!c51V)Ci_vXGuOe%QK2Dz8YKpRx+8#VWIsC;63DOK8lq z0&1Tufj@L~ag4H-#<)tT8M2O{oT{YiEbBR&HMAslY=iQ$$>)-Y<&BKiiKXEFO&lhZ zKb*Olx@dpw`xbU7RT@6pis{sj((1ZIqMZsagRR>}Qv=Il;wT28UpaL_qTvtqyBrQ+ z4EruGk5G;!)vJILv0YgRn!^=Tu*6ZBqauPPp0ts)gCSKo0B3e5X={KQCJ8DX5=|u- zlgKq~tpsCs(XE9lV@OMAAZ{#X< zkD4L+uTi(Yxq2_xsaw=S9hMu^wQmXCP3439*SHlL-lAK5TEoG&Y3uCP>Z07CtzFxw z)pD0QuV8e(N8N>B6(RSTRJylCy9X)&W+9TyWqWN3fI}-&K8-m(*1W!GNzg%et-QmECYq-zX2Gs&rS2~(9q*@%`pSl<`m3Gtjh({=sB7|_Mz;+`EdQVvyauZK z@{?Y8Jy4yMUo?8pAeB}9rqTBX!@r`@cl8i;Pn1UA@k4Q|Xy_~{G7RU_P-%v%`C`+U zZqaZgUc1JYeHP$Yeyknd1)B4dNfj#le(^B;OS%*m5s-$Nb%O#6T1ruHMvG!yWzrsDX8l* zP92hz)cK9aQB0+=#~a2Y%u>^=1z|Y(X{c*D0ogGvbtNXkGwHab2NMzLJ{pH|>?9;@ zU)KJfgoUKn$SFf7D{HD`U_-YlYKi=%Q^LY2xMnkIWHZ01NF|xrCCM}lotZ9tJPkKn z7LCn0I9)xLtki9tf!i}17cz1te3_j+>d#VBC5J|Q+?=HbN=~*53P%9v;%w<=t7(#( z?W{GkVND*oHOm~_0(t40s5uC@d>nA?T!e}rb)Dv6#rgkuD*~5E0qVTwW8Vu>_j*1~ zNg?WHFTg=9Ox@6hYMT@x1 z!^p*@aCIq-;0juXiTz2HmZM#1uB5;Uti6mzu==b-LMqF3zFCQ+U5=|8zeY@~+3R ztHzZ)T91TUosOHo0mrTe*Hn5VGI>qyr6p=3(sC_$L6_VFqidsw%C#AJvJOW%y%|rl zx{RawTT~~hM+1LZThv0SPpju|#mh&G5?vxvxd~35NV!O5L>r}b#YmM>45?uxt|J?% zQ>1biJE=FxK^hXNyu}TqCPu2Hl7!>UVr^26w}|7pv)$52+!@Fjme#S6NF$z99*@M0 z?#0eGB5}f<)V+(u`AbeB?WtQ-iA?9l7^8|k!EbeB&lh_ znr$#44f{s2HZAE8Ypry|8{06k59!4=*zZgF!7l09*%5`SA_H_PMHKEgyjQi(8HLUn zNoAv8Rwhz?>N1l$MWJsNQtv30OtNy6kx}q!HhN)P6ugj~x(QJhoRotNXL9JAAhkLQ z7UrUEXB5_+n{*)x_d_1mK4)!S>TtKaOFoi&G|cxSrH_XB`APYru}uX?<)UFiK~f#o z79zD`kHR2J_vA1|s2minJftXT45=7tDu*dfTFQ1MNb6Z!k`xmSV@i>ZMdJeY2dQ7t zSV(E=QpBJ~8B&HAJi*G6^2DIF9I0Fk`j)qdK{2?uDvNb1hmNrX~sRA1|pz@`_bfN~ulE z9E%I54yj@+E{(dR7O{9%)+2R|Md$i7#)^e8fzZjASd~N?fYc<`2C?08QbSUFEY{hG zbdtKpqzAExk0zwAu`snMNLilSQQeF~XWNdUo3lFSb~J23D!U!4Ye{OrcCAQVw_{DM zN&VQa4QT>(!K7KFwxmVdF-bepR*ur1bda?jNT;_WwmKRM_?XzqDA*7Or*~$xTO6kA zLdr<$N-7?Q=|V`gop6+9i z!cxYo36}IVxO5iAtFF?|AS0O_czE_V$ZHdK;8S6MNhb1g2VU!;q_jKnSvt@lJ67DO zywxCsoEVsZq&=8Dek9;J9zq(I2pY;B&RzIk7)D+3U23QdCvDw@N9zbuA!|2s^+$I zRXPmaG?PioiNmu^WAkQB-hKE}?`-UEeS7%dq z>o^{*bLjLLC*ak&qz@<55V7XbnLSUcJrZGXefphJH)KAob~~-A$^vdlozr+?EaWgr z&)_0jWOCy6Kcn)h#Rl(yS7+60Sz>U3-#VvC%TkV#_B`JB%M2bRug|NMvYgvA>w=mm zD`-}pi&)Z1nhcbh{v|v`))>6zN?uk;)moZR@d{qI>kK|L^;JC1 z*K?8&SMe0tU_6yNcMU7q$iB6%!wZ{8`Ualln>k(l4g4~&g>zKA3A46xap`WU4iX8S zCBtsvn%%}OwQu7}jpB4KZmXXX&CXBn;0BLj?Zmq ze`CNs9A>~{T+DmfFxeBlZT3+Y^8~xN-{3jXtNJ3>*s%OJ?B{ic=%;UR z@C~jc?mM2}H@WueKd`1-)Lr+sJ1cGuumVlP{dE zs#8bGSNiRvQ}2;)Tyab?U0;2t&Lr25YOxsxY%r1d-AjzUrsi7YjIk5!C}KW$d^u6 z6*n6WYM*o%B?)^xO{WJ)Qd@pYq_vOsRqi%FkwL!tjdms!t|6gH%*eVKKXq~vt{v*@mp%7!J~ z$fCbXYA)n*R^3soG&cO4R63i^r_xf{DZ8F7={Vho?E0nnknZKsM)`8+hdHsw={d~u zT>8FbuptwU&8_pQzo^@s2d>U&!#4HEtFKBX8dxPCHa0Vjewk8EV-yVSO_NMw&B;S(S@~-%45T? z9Se%+0xB=t9WAPNOFoV=zLe(Vua9RA2p`c+&{k^=Pfgc3TfDhMB0vb3Z=C55x zdsi37*<{{kTTSzuArAmS&I&itpInGqjG9Ry;{nXiUjC| zQh`o76#!jD>iSjEaS~ud%;%|${j5ZqSy@+<%G~2~mGuUxLSu$i(LZrop&MKk;aH7* zZPgGT)oDUvHSLlbHk^ox)wQ)7zcmAYRoBO)78@R^p(jgi4ii)p1J+@eA2rdXE(aV{ z3maC?hKuM~Ekr+7b{)aIe|+xj?8&20D#?HPz2YtH@r9Eg~2LE7CwUze5~IwA-M zwG|EQ&=BXnHO)`iNFSCqoa9;~eNckgZgFF*y{)YXeraf;%c^$t`OK#Jw6wSJ`!~25 zhVH=5Ih*T^($R)r{?9en8C55S)aw>FVx4)!7PiF1T{v`TD}+>6M!$P&3>d;luhvHI zlx{pt609AnJNr7?A_98Y3W@A!t2?QlHhe{AY>!Ck#pC(Cy*_J6Zw`2(16?IHS`41!Mo4$(Vg zu&ubL_-=Zn8iG@zO7zer)KD7Tqo@8T!?>h&Rxh|_xD7u*`SjKSY6K^4(MNxgk#tv3 zUtLrE3DJf9^lcf%H4W*nV`VgrE-(P+cnm3#G}fk+t`&;Ud6x|zFs(v$5*cU18^2>H zKGVmOhKAz1KaBA)JyZwC1RKA9&xYbld?Kr#hw98SiM!)5P^VXu|7^)1{Y0kl^g0J) z;;G#21A~!*r?Ixu5M+(%q}M|b3o~fU&Y_5&nKrx#N(@7ioy8s-hT&+3Q|C8acaYf} zZ~Aa-jx~qYR2qR>U@mv($p~FZ&7;%vTKcg>(80+^p>{sccHAf(CJVTCd!z`PK;96tLkIk8cT(_3zV8UemL)Ot$*Ay*kJ^Q+*!bclu zg8wwVN;dL{-I@k(ZQ?>&P1k*8Gj*q?>l(5JJuFE*Lobo7bX@cdy-p%IOv{;iscfU} z+e{c3MH3d!(pMy!&KwYq%oRfuQq9JN70W=f&4E9*v)#!#xbx$<;^lL7gv3+lKTqRL z$i7J;;Dw#kt&YHbkYLfSvh%TbiA+Oo3-n&u#Q~2j&@*H=bxjw-Gkd7ZzX-xybWPekJ-`hy(c+G{RFx;;n}(kz2757ECzm+AL%n2SqTj(tBuU9S}y z@4ur|R$hsV;~14{6?W`6br)CRV4a|?U036ujLHQ zlJzj_EKRMt9zGX8n$A~#^<3)GF>h#TZ0Ab{^uw5KB7x{dqc%nuxJGQjYB!UDVg5yd4G>xP;BAz#hLYAtzR}V|5!ZlGMN*^Z5!c@@{5RRz|lX4h~>S7n#7*AcDN>=~6@z7Aumv-9v92%j3X zI`>UXQj@wbH*r(eq6sT+Vc% zkh+2QExlD5aKIc7;E*78x&Hvkvmu9G@DO3vh+QT;!rB|#v3F(v#)_M;U7E*;g{Ity zXOFQF%}D*9fSTLwc(OdfkGd^LDWBpe>y~ym7(;4h$G-+L2B?!zpi1AMJdOnCW0g=rwzxw@XJm0@L{tQQe8P z(JzstI#JpT^& zR8Kqd->!Ga?!DM<*L!sC&33&%pmQHm!H>xJeHj%GKf;&&*e?7N4sU<@qwZ(CD+ZvQ z`urIl47KBrHXFa-Av@6StHk@Owoc0+JC4rnuXrd9=78P4>18s+j-%uLUH6lrT>J3v z+NOqal2Jdf_Tg-o@u!|CBS>3+BBVxg;_AQfWU*+p`){25QLKIY8@oN4wJXFNl`(dl zwQkA;$ym0t5|v4+T&zB%%{CcF8feTs8P5RmvYG1=MtW>BF*3pKG_ufcy2?aum~ogq zGRcm=Zu>d#ojdu@iX8^OA(1YVrrPm+5bTEE`KFO>Cjm{TS*_j8OqpS~(D0Qz8qT!i zx4A(c_#t5yX_5!Nc*9A{J@6$s8>IGn;B#{hbr(JGkvW(2!UJEj^GLtgBZ8FL6Yb`M zB#);_Dhup*4HY3RWNjHwe0VM*HS#nmEm_R!E}rTpp>7-Ll^2YOB7OHVZW2w> zPU9glBrhj)v7}U_?RJGv>GV!?iK8+%mGPv4?6L!ssM1bMypvRel)&01Y?nxC?KDYb zmmNRdc5)iK>}FJSbK*ycJv4Bf)41c`c;ee)y3;h5eLR#;oTiuT|8qQ(fvf`zpM%Lv zUOC7~UM0gMhe$t?!TpEr-Z;J9rnMa5bRpg_>nMY3fVWvK$4EZOLB~nENhe4hQh-j9 zlB5KkB5fv}CIzJeogsZrWdYC9nnkJ2E;+}@Y@Wu1$ay>7s{7NJF>-;&vr1aiK`yf0 z+O%epTw;((KG8O8zEQ%VK89V=nG$7PD5KaP3xB(@CCM%>56unuqd?!yL_K zHp_EXhh~RoUXXlqfL@aJkY15G<^;WF-=w(={`}6q8*-Thc}wb)8~NiM=|^reQrM6dH#=(r6Lvoy}1O z9}PuKqSze>I9oA9u)~3sIE!I(+(_$+!Tm`bxF2g3H+v;1b?zll>+V3FTvfuX6Awpf zC3Q-g(c=I zb?IqLjnbx~B^j_znNZpo`O5)!O)d?0Wn^`sGB}i(90-~gWz1yB?7*e@s0_jgA!!$-ar@5h=N-Yh3{+EVl!1h{IL| z9Em)fu3SYkK=M+#ts+iDK2m`IGZuFXe6%gVjF zNr$hIt<|xMrASR{;8yhKbV+Jr$4ZlC)HKti48lh;)-p?^EGe;;St;eX&fwZ+jg%+Z z>p)k5w62cXAQc_%MuO_%N8JDizApRJMI2d`*f~W#vr#HDkapF>Ij-VBifCTnL`YQ! z63E;7rixVK#Ki-V4XV>y8v}8AYtYr+4WO&ZNyaxYv!xcvHwY0`n*qE#2!9EvLpmOW zJEAV>8g=zZkAf^*i}i`Gf)MF}q%T3xH6W>mxEX>-&W7mRkn~qW)HWjJY=|C>Nrk9u z;=nE7PhC@nS>=WZxMrjl4H4AMxwu{p5eqFy4;q>w(h_7zt43z9w4(B2BhyD(ld3dE z+Gs=C-`EV3U{bjzh?KT}_Pq)G(T?<`3DRQ=^2dXNHI;l0z-fu~uw zR(L@5Vu&WTGJT~tH!*)}vrzib3rAby>gvl#zuMXimwu#1ZLrM#q?2u6)&Tmgaj@~ zT@YO3Nv*rWtT57tuE>}Zc-i6>+oJ4BS4M%Y@X>~W#L#B|DcgIyemDGzg z&0zsgbT{o}I+cDsKr={FdzhXwlc)Dv57R|vk=pe%9VMJ}sHbTuvq_nInZ`1Q6xs{d z%3RXPUKn~FDNk=)%n_up-gvamC%x_sV-_$6wCrPcTe6Vo(--Mr5$Sqgb5RyE8*J%k zp2!l?-2UdREM+zb8(TYaq61B`MP&FK@Ej$y(nB5Y~ zloK=-S#LY(+gP(y;z;vdNKNsiD&w%G9bEhKaX6kkNg?BL>=H;<#~YUuQG1-!Z5nhZNUx`%-AQK0!P61SryTg0 z^_*cLQJ$tUat7Rbh7B9f#KAgC-T9gD!Z}jkS@6txM^4c`;V|I>X?i%!y6A963g+Lq zFVSef*;vSBX1$rSae-eUt(t8z%T?0B*|^HDk*>|g8~HlO(jR6cQQiP5k2y%AH(8x( z4jSHK1mu}xDyrL#f^hX*6Qb_0_WV55-er%+^YGXId(?fQ?mo#Y0&jx{q)ZV=ybno5 zBXH+GV#*1Kz=Qp7Qq2gwr5{_YZWMv+{)E(lU7j*P24NWWjJk>QG4ylNlKC+81u1qu z+Px$ln-3FS@yK4EkHhwwN37HW9Mm`5?L`Zas^60CEBdi3*|(YCo9bs+;pJ1s}Q5ciCdu9 zYJ3&gsC&B_2h~mrUxS!&IPvx^xz^khHzy`Zx6X8zBu@O8H+G$wD@mP*8K3ngUfkK^ z+5urswhIq+}w+?J$od zGkYxBX%& zqzOF_B0dT^@nieDgLrln=8C%)iTsmU>z>Q6d+40m~HQn}-}R?2YV^~VuWWl2R&fXa~)NaaaY zPJ$}1$ElNecUl#l_&`{D3UAc_I^@eKTp^WcVZ>={L}h0REfvm~M5#g_eLsV%rYdXa zoJDr5#vVz};UcQe0au-a(`%5*o`-=oNt@2Y{92?^7Z8}WNvAL1!Cr?Ha50;)q%Lvq zMLZ(vk;+^$qoh9Fns5o9l7Y^!_!^@jV<2N8F332@ct{vz0%Rg&5@a%D3S=r|8e}?T z24p5=79<=p8!`tn7cvhL0hte309goG1X&DO0$B=K23ZbS0a*!I1z8PQ16d1M2U!o< z0NDuH1lbJP0@(_QglvOEL82iskXXoeNE{>{vIDX+F1|)WNV~Xl$wu$B&pY{kmv`9x zpv1WQLA&xU48#A0?1t=t?1k)u?1vnH9E2Q#9EKc$9EBW%9EY5MoP?Z$oQ9l%oQ0f& zoQGV1T!dVLT!vhMT!mbNT!-9%+=SeUJNf>0sS5VKpS!jF5|?vBLPOo|g&n6I|0Q37 z&o%uI2P{K2{TKIHfx8u-cl^&<`9C~u6+UPFrJswh{a&!ABjgk0Gvo{8E94vGJLCuCC*&98_vAbs)N}|7&BCy-v9PmnuyA9Mghf&o?kqf5 zc(U+f;bf7Fg*S`jEK;yY$s!et)GX4lNXsG}3m+D~EYh>cz~V0!8Chgvk(osn7Fk(j zW09Rj4i-6C$8k$09$A0xSx$D8!;Liy|zFvM9!)IExZ2O0p=$!k}@-}hi zp~N6>sCfyr4h9HX8h9lW&5X^+TUyGzVIu1HVe6&vfB*FIyk74QXXkm&v+eA>IENe# zujSS|Uc#~hp_4LtqR})-n=o(yb8k77W>&7i3$EJA@{U^B-ntEn;E)rt;fKwvp*v%O zVq1)In_O{x+K?WoK}fup!DeL)93hi)g-d=Z(dzU_I8cW%>AJ95Ixz zuqk+jEmCVrbM3j>xVwb;Pj&6m5v;tz-=647F;%a}_ny->wid|--BuT5yS zYED1{yFL?xI8hhX{LHMSN@3Wb0LJjMN4EGh7f*Gt6{~|Z;RB zwm8)S$iM^Spa4(Fsa958et2s?ytP@2n~D7&Zf$klTur7%$kfO(H6EE7d8S5@sqtK= zQU2%03pG2Es2BC77>cE5s1H3$eJPHfqvxp~y+AKge~PCB8bB{mBE3ulX%Hn*GQC0u z8cajzReFtHr=j!)4Wl<{IE|o@G>S%(ky2<3jipq2i^kF0WTJOyJWZg9G>InD6ndAY zQW{O$ZqBKc@L#`NAq@#m_Y}nPS-BIX!&PRFAko+>BS1V=XEs@qFPLFEya(^Y2apak zU?$9h45&){=d0XeV|zJOfFgD+tftcEqP7S=&NtcMM- z5x#;=uoQwD?I58Q$VxDAbP2ktH~=mjhA$ap+>Ild5WhSPZ-bBJl%P;JmEYMJUX68o~EzggYQN0LA}T7D7%-w(gNll=p`wBnJH{Rxn3!P4tOXU7SdJQv640m- z_O1#y*bv2Du^THf*g>%+*zWi24qra<#^3u7d?7jBo##AfW_I?>v$M0iH0iL(3|rcQ zn-hcQRkvRGY2EcP!(VUe9?)7{8D{e;wd$1x{$H;P=-7vy`}%q9lbiB@ zs4o&H_WbYv|3=`y5%_Ne{u_b+M&Q2@_-_RMzaIflg)2g_QEU~HVyDamwN-gDMrMB{k z;-~m4b(Bw)x=MgjPpPj2Dh-r|N+YGQ(nM*he5M2`&6MU!3nf@-skBmBD(uM(;BQ~E0dl!3}1Ww0_t ziBg6tUns+r;mQbQq%ukwt&CB=RK_afl<~?0Wug+T#3+-LuavKq$;vm%w@R!sMVYEh zQ>H63l$pvbB~F>Ge5WYN9A&ODPnoa8D+`o`$|5B}S*$EkmMV$L_sTM5xw1l8sgSZt zS*@&5eo)pb>y#gr^~we%N%?7K@=s}$v>-X2S}sd2TgIL-#y3}BEVw>3QInH&v>Z|I zLt&CRgJ%EweL|gFN_ewC7~9FOQ|0_z_Mgh@XOYm8JTr zsaMSv*9FU0IuxuAF?o z-q?!V<|I2?Mt+pipdo)lYucq$Z$ct%JEPRhCGZwxB zou#k;6y5hHtxSdQAz4!4+dotKBGdFb3usXue77kzFU6ND0*0qrf-b$;XBFyJjgw$3w}hm6Go*L_58*+jw14!QJVMo z#zxpC*w3)dur08yuwP)?V5yeJH_|GUnYrkeU;~g40jwOG(uOhR8ynWzfw49yPmEw} z`LD9v8|4v08A~aajO9#~9XKM+0xTJsbC&vqkw1EXR&9A*wQ~gJ3;hIj~_k17DPn)(|Ww z%F!sdMmeRWV2w`6@?ex_MGBVknUmq4A<8nx7{SWnZ0@7Oi$ygSkRaH!GfvEm_R>TJ z*0$z$!Isx6!-fGkEGjau(}IniQHH(18Qm7n?DjRmYFaivOlz3R2hmkh?>Rb{8MESV z74Zbs3zH^qm3qX{Ta)No1GRTHiuH&)s|^z;I+N=f^(V*5xE@w(GgC_)u0hw=sC#%d zTK$81kJqHQwfOmjMz6!qrxgApe(F=udewpnT(n-ThacY!>TZ|d-Ljz#_&rSzHmFs3 z5IH8n^Jj@?=pM$FQf?AFR$wV2X@)S%R#)H*z!uKuK2?APpN%wZp+R#|2rmwEgu zYr#HY2RP$vC_7oTxQ^e)*fp447GssNXl{yHosXw2DX7dJ5Yh0BsLY=dHv%~eB$&cB z0Xa*tn}EdcXY3U<{uxL-Mg6Q=9D}kM`{V#)J;`^oS{q#s-3;_+AS(|tc7PnW0R5Q) zx2P7E@;Qv%f;k>y>@#|~MXe#q=TOD1>MqBAfb_vnq8nS)8oW30U)0@BjSfq6<6*kF zRV`1~e^H(7>l@%}^37E{Bu;dq*4xx!j?Iop=C_o(4e?DVcN^jzj!HE8sEps1ig;TC ztWVh&WPI5)b%@Cda2$P|h7+?=QW`G&nPW2cEoqO^yzCDc#YuWpD>|*JvoUPpW?YIW ziZ+98Jud0C6z;5g**`Oi@sd7kgl0>>7pGOGeVRIyCy?)U1kR$6?W)D|z$qE1pZ)*+ zdrdAo)JpsS`R%|pbv(`3p)7FFo4Q)MoeDd#dw z-ia$U@C;)oC_Nn~G?4PraZOy$GS(`Wu`ekpL#-`b&(iS>HN&(IP#v0M0dXH`7K9Ez z$JjX<_bZU$wE9;d&gU76rCyn89XI{ZYAw${=6YxSDEdX3C#7Vn%S}7rsYb!O5VnIx z??PC=3(zO3wHru33f~RH_9A03> z5kE+|`!G-$RJ0GV!!GOHO3gxT!{}-j5SJ^AO{Eq4(JlSZYGtCV(7WY9dBy0~AN$qi zE)}o+zwzxtbFz_i6|d3OY;_->OrsAVJI7Gs0X55gEr?nv@@9GAml{w21s0^$qLhQ` zTHcL9a?q_d6qTb|oTuGj>^{sH8cUy!*J|=<6nY5LJA?RPOz#W|JdD1+{++RrRB#x* ze@)&;REtCM9md@LK+pyU)sqU2s2)6-_)$#wc0l#hn1|nJI(8I|h0uees>M#rXUyv^ zZ90Yvtx@hVRNVP4x=jhkQE_L=JdUh?07MV>zDF}oV1DOQ(h0y*9!hxYLmjR_Gft{b z_LB|J@$boW`y?jABs`|JB!}l0rL7W1$?7=(Yv!azdPif3udbV#`@5yTrgWvF%Y}8KpYDx;~dUw zE#;k4cYAg$l--TT@5m?ecn{?sg*3ONW9K0!>w#v#3SloP;R5FUdeSbayG=j7Wb8ae zUsP+`ufd_!+Vt<){`8_c%%r{2PbcycE`BP-T|&g+KN)*RA(s(x0EbrVxW6OzUsgw% z?)=5rUsU%B+PF;NS1{q970W)|mJ>eTD1I*|{EVx(D^z{06V{0&JsE3Im*3Pqjx`Ky zv)HC%$ntCIHeQ>GuHmLohpt}7Pd&=Mfgx%L;(D5X6GPOHw%i1g3#26tzXc?h5^n*C ze#6*x3cC#?nqqHb61lw9n~bpOP2pBlzcx>u=Hd?QH`sev0M+^(`S1RgI{mI5=8@!n z2f5XS0`I66o8dNGPjb(df2b9VLY*CIx_y!jXRfx~5FeNJyd7>RRahJ!%94oZqZ1u% zIZLO#`Dz^-9MYSeYP!P{VEs+JbY?%H+`Fp9?R%hu?Kn$-wY2ASYoO*y+wQ5({Cmp0 zhx=21d(J*_;H)>y!I5U%NB;Jwr2Ci^evTX`XSEK&Zy=3+fS%W)_y-uXK@|NEu|u6W zt6PS%NSKo|HF<>Cp%nQD5?b4tv+tcbb(^gDxHvNh2xtums6VSsA&+quN8xWw?;c|) zkCI;j>YPCCg{sASk_%@oTsa#7TM5%Up#NQ=yc)>FNmN{@9^u)P{RG|FNqJ8&kW)XB z14-tmY6U)(jy+YgOb0*W>h)Z$UZ$7iIgnOM^|IOK zg_Zq4&4bEzR_oK!MYyvqZKPGEmalP3>`d9OF`C^faJHAGzd>)h(UvzrDtU9ZfQG+? zQtO9SYjxhhxPdg5H;|ogaRYe>Pb7uCL)b%#eTT5jipU0P{2oXqMZE_yzY=GEl8+V0 zdyQ&l(%qP+shDS80JennNzL^V!JK1aUHVMAC1mQk13Jhp;zZ4fb}8fT{{!4?ri zDAN{59be8?(bpy*btuUMI)~Kze?{SvIY60n(F>x!_!@`e8o$ae8v!T%Ojsnmycf z#ATTBHkmF!? zqs`IoK*B%eY#-J72uL`Ee*~m*T|Kp3Jj``O<+{|&11WqDP)~XZh~FdMayZTH0i0E> zM>orv{rPrs^hDhBdYnC?L!KZ_ry?EcT%WT{N-YnhGhHnY#5)jKPb<94b=>qrtM#1e zcawf1`TFu4s{$|cDyK*AG;hG!um&{V8|S^Yg4x;ro=GJI@Bgii-xwbrK)5B=Go3Z1Qp_^_s&t%n_@;7W)O zrKn1X_YOi1!j=cg_!gBB?+L(a9r1VkhRTS)+l;ej&Gk%j@j?9W6zGHa^cI{s26NUR zSjIb7LA(agYF+zx{KP8eVNOa*=nf2b+M89()v@a2Rm~Qg==P;FN<_D(<4@IncA4!t zJKdfZ7eP5wDYu&Wh+|;~y;7^SM5XeKVkwoftJD$0-I01fSN&b|;}6NyzK(`W*&TpC zFqA%iiQD`EimqwK14$?{suO2(U^_Zd`B!RnF+P-c?Cumd2 zy&Y(w!#J}HqqOp#>BQ=IX4E=DRc4OnEEo2Aw2U`YZ7P8OscKH0zvOHk?C_V=vJxujKyjT= zf!8=>DeU`kvI0ZaJOKPpS#$bhJZGOxK$cA)S07Y>Rdg3ruwx?BHX3RhEh{i|O$GQb zU7H=l*(I1YM(WxO^6d&;n=qxcu1%OCb;qalw$gN3iK=a$`M;=I2jY?FPv=>9aYj`JGg?bV?e429)nGFTRtirhF$=t%t(dLD;`l ztp`O9LQt(akbyads@0k!RqaneBj-w0`;$V3fOTvxR^s!dsvVmvRV{HIXYc2IK-Ch- zeJElE%!lU8m#Q{kzEri^@wmIjOI52)d0&9`4A9^OQq`WtOI6#u086HYQq}g7HXO8t z3pp!ZC{=CYLaAzzi?GOCBvmbv;zoj2JAt!h2~yQ+CrDL$0&KwIQmXcZ!bgL+i>0c~S;E<~B~sPqknfkEbzh2g^HQm5-Iq#LtCWb9QetUU(~%FW+5>p{d@oh) zL84SO%lDksS|(M^LfPZd%$#MM6)lshHfNbswXo%!?OHBXEsPQ;f>vP#Ccp}*Y86&U zRl5VM`%0;5cPJ_bw6v9+RU)ZsX)C3w#S&-tNUB;a1%3ruhgEnEStV7i!z!t2o~toI zR!ddWk3Xzx_uy%|1}ok*QWK1&+8u-bPgT=?;LK(%XP>UsiN*@%8)(Y(b)21n{k2ZU z8>$uy;9sg1x}LKiU^(lhsqi*V^(C|Ru?HHxKmZ4HIb1@D&~l2@W@KkoQnbS;>C=Oc$g zc5s46=Dkex2}a!VgiCHWn$ftY3N#|OsQ)HfClc8x>i6@OTfz71)hgg_94IAq`4qhhT=M}eat=zVGaryrH}xQA_YX>`n@S;TKx?0a<$jKo zy7oCz>f8@;HuF$vsnd}UOWiGa!VXKRyLCuPUFu;d(Ge+isg$=4%}hN4Avz+ZZt4*! zb)O&Q%zRWz-RGpO2hH^uX2mfnb*{&x)LjME{~*)J!h)CHfEQdi~_Ce0}+b^7s#rS1kibx&jW>$DUKL+Y*?^nXg- z&u4Itf>l4O6RTt6xM&lEW>PMmEMSGXGTxB72>|{jb*;{GmI&K*UP@ha%HE6$%3MU^ z!scF-6&O-y58z)?cjXd<_A;{UvXr_Dl(-cY{CowE1hAS{Wd(-RB?I`E)J^^k>IHlL zo0Pg3irNOL`{MT!sjHuAu3(gmZOHY%bLMh~)B3sCka5Q*s>|OyW^9S8jF+2~6o6SdrDW8s;%~kCG`a|!}47t};_AAwv8WiB= zOjpf3n>V0b&1`XNk`D^Z?=EhschPQd%@=Q#GPj#8E?)r)xyRXfSRzf|fyeT%C}{^g zeedHw{{Yty7E8l-!qb=Hcbbo2k2O5qTon)D(djtJ*M%h~**e2qLA)+B^xUD%6SM`R zi3ikbXe`76nGAob_tk3MEO!ap8pRStAOEX4#xw)SL(2aZXFh}6GcgvvMfy(4sZ1cg zR1CyrDUir#xY@!q+Pe$=T1t7lQ2jL^diDEd^{0*EFLGpD_n2d_`y98&Tn|6m9&?uc z)EBr7zJOv~HT&96K*4IQDc_7-FT$IVOBA&aXL*d`_Msm(uQ;1X!CBbkv3W&fvha+y z1(4UDoLXHs`|&Llz8|!RKRMe^F4^dA1O;VdN9qlbQGaoAy9w4C@;!h_mGl>9ZpC!- z03MW*$nhX(or*cjD8?r8Ezmkq5inB$u>O>qgUSl%Y7ST{Uvp;rhLf5H)=J7g1Ximz zoTbwA!(g?dEr-Fn52WW?PBZU-b)OQCfVJo?77Y}36s$!Qdlant@9^034%^82VAZFn zV_;nd)|PyZgLRogkApSiJvOP{bE&5)GhmGsf?X4| z_%W&)OG#%@RRtS?O|XHv82bt~v>+GHkU4-F+R`9wD`1m2`W#pjZ3VkUb5ZK3=3;MotW&yvxY^>Tbe#$w1~SnBIEn#8Y*zX^fj-Gb!OJDjG!ERV3#6 zvZ8cies2^@tz_&^0ts>#`kQV)3}DxNG4`A?hv>rpFuj5)&`be<&j|918oBeE1 zpyt`;bW;w{KytYWUJeD_1aFLoU{^c@-8z8U#*ptV)aFr6@6?T37(UvS)AE>Sv*a!;CM|H&%n-A883WB+K3#xh?tPK=(7pxB6g6$-q zdth~-(0gDN0_k5-(32Bj6;j}RT+I~~1rwEIj;$c?2Y^~s5^PH)+II@QXhHlT>be6c zoc2CMU3cgK5W7W{1$$kY7M}rW5#>Gtsj&~fz@UW3AT_4U#~|ea>0X5f<${z)Nd+J! zR1xeg4J-sHf#M563aTpD=BgBM9;6_OegaZHpq^CsDM5r}wY-jQbfvhzK>QQX@VX_*hJul7b{p#A@&%CVO%OLw_-hc` z2jJ=j$ZWGgfyx|2jZc8~$A0%M5TB6mTM)mmhmol-^UVeYx|RcC^ZK}k^(ie6#O74= z4#YnIMFf_l911e!5&{J)4wNaEK-pFh0~-jou7ONB8x&~jQPg-5Xq$%AH6Jxzq(rV+ z?58yp>_J1Bbv7ta=i?yOXe8LuMpWe)FA#m7LJrbhCKQB7&r8PME66KvLJ zhQbN=&uG_UV0(dm8f4_3*!!8(xY0qF#=vxq8%;@0sLr#QU`jJ11BGWZ>USQY*}&>I zH&jl46XOipxaNXgZ!U9i97Vclc#+To;!B>c8eSye&}#Ly4K&_}G?H&bMlDf4qRFn> zZ0|#GFAf&$SJ*w6o{Rcl7fM=+w}gkt&rLhx_z^y8($SJEH5tW!W~t4Qwx#t^FX{Sd z=hhCo(@v(V4UYeju8w`$%Zf{G;+>3QX{}U%6tyqWN`*8JoUnff!B%xJ@>lqGpfT4W zZ|8x9bd(9q&r_Tyc+)x}4>}s@E2ed%W;emB9*QgoEm6zr6z&Dy31Ce-8QCjNgi5&_ z-wA`-sYEWvldm^;UY(HzosHxbUY+T;Jk+-zSU?wRkBcyP)C0-M>0zdQ+*+Wu>j_B!q;LAS>q!d= z(P$B{A-$w{7Ew}d(AM=5%(=I`Kd4UjgJ+XfA722vgy?VoG@_Hr0VPu}8R(5H?a*X%$D_CuO#g)_+ zwVZ(SGaA?qwVa^%c6v)w1^bcOwKrOdZV%)MkbzXU1CS>a*#XG5Y4~E4JUar}Mj;)6 zcup7WJ9-C1cupt(P%XoB4p2+V4+ZHQxpx97eulsc@l&0E#8a`3w3#WGO6i?}w4uDt zK;8fuMeDi%c|*s#0LhpI`K38wK(G-O24qs4V0kpIE09UFx~sO^vC(Y7Cc*a7z;3vz z^(n5Kh8MNp3HB1!N}=}=S_K-^U30S609dVo#z#8(i{ky=wPB7;=Lq%(pU)as9BhfrvLy+c4gC&4bm@Ok6_qeFoM zG)vhUtMFX2TCgLqhcH@dQOl9@KqycR@*ap-uQjOc2f=p3Zqki`n95#jNDR_4%9dG+ zd&fG6HtZsd>fbPzqw9k-XHjM?Jp{!?{D|e>daSr$CnqQ#GNZZKTMfSi*A+WY$*e;qL17-z3=F zp9R}WVPC*=o1(vf=L(QVn+2P(MX;Z!@i2IRdACq&vfEyl((qhwk0*?6sj zQPOvHOyL>&d~un8DI1n<>~2Fg^M7zZT^C z3X3a$a*Wn?yX-0Pyu>fQ{*BhE@?WVa8fPij-0RP>%&@jE08?Q7P2Cr-2_Bbav0^giZ#SP!%5bj|x-Bb23{n%T> z*V0pw#U6*~;Z&sR>cfKBACZKWlsXNeSb0oCXw{>br7%6z`xvd9u2mORkJ7H`+Fibi zl4jr%Z#gF2Cn<3rK5kxX6wk?T9Z%2HX7i2|J_{q>oT6tTG3rrd9DW*7$ZQ0+Jt2d! ztD*-tl|>oc`hA)$#eApz=;(G@XF1up>WNc>0>)?+6DL-q$%-~xc$}u!3VL&f^5$S% z-kcXKf!58%xImxh;uOwYfUI1^ofYPJi5Ab(s)MY})9yL8yrkFrEt{rqJJg_@`Pw2= z8(?PY6^{zqP+UA%&kWW!pkOtmlm*%}msh|ZT!su@5v(=UU5F8TMd1t4oaa?6Cw>#G z1#IwdR5${I{plhMw&zu9wg^c)AC5oioqwfw(?#d TVidzlmI+I>@wP9tL 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 V@lkvdUE;I&BED+wfNx2$zW}*ea6AA2 delta 1000 zcmd7Q`%ler9LMp`Ih|9s+W0}8v-!!!{J@g=B?;x0+&Y9@)F6YHW5o4b~dwxcoNvkHny{aM0T=^-Rxm6NhGt6{iFZ~I7ljo zI7}KxI7&Ll$RLyBoFI#AayW^DQ=H}uXE{eM=gH#&7s;o9LW(G+gibr(%(P>WK1c%?ycrV9@;Chqx zv$8&8fWvN08mqN5H*~vc9Wn8Pb&ky1&QXr!_I%IOIgZgMLZEt#WV3-ybv$NEAd*q5v}5_cqiVA58|WvB-+Gh@kM+U?c$s05S?0`*Z1g% EzuP8!)c^nh diff --git a/advanced/hmi/nspanel_eu_code/boot.txt b/advanced/hmi/nspanel_eu_code/boot.txt index 2e4f89d..c8b433d 100644 --- a/advanced/hmi/nspanel_eu_code/boot.txt +++ b/advanced/hmi/nspanel_eu_code/boot.txt @@ -104,7 +104,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_eu_code/climate.txt b/advanced/hmi/nspanel_eu_code/climate.txt index 1745915..9f0dcfa 100644 --- a/advanced/hmi/nspanel_eu_code/climate.txt +++ b/advanced/hmi/nspanel_eu_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,7 +606,6 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 @@ -614,6 +613,8 @@ Slider climateslider va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index 9f9acbeac16f398191a5d055a31b5f2a6af4fc2c..a4fe118baba0783cd424e8b1e1178eb91cb742bb 100644 GIT binary patch delta 1039 zcmd7Q+f$5j7zgm*`?lMBQVAh_?N$z@=yg_6 zqGZ|f=2Y7{m2!wE;X{WH zvd4-)5o#?G-Q}zsZ9;r;=sWyshrl4YxVG=@WvI+Oczy!IU_-nh%=@DPKExD~h zHc1!Jo?o1)1v|B1iDdF29qGwe)q)Le-~ag&`hUo@7@ZcQL^Ao1j`ZZKT8swQ`~P9U zZ87GhAsizx5~DC0V=xxuU`7NYF&+~z5mA_g$(Vwvn1<E3ua>u=3*Y^V*wUo z5f)N%}7QHQn3YT*otk~ zj&$t6PV7Pkb|VwO9ys7c7P66pz1WBSIDlN_;UMx+fI~QpLMS+bqd11+IDwNmh11nV zp;rBm!HE^!s^;|M%BEh@?^`S^6~ezKFD(-ypeL_U^Kv|`C5qYZ&?#}B>;baZr8G3x z#jBkI8@|Z}{4&KJm1IzcR60`C5G}nWM6pEIXDcz0Ny8NX0qK2Jb8gdN zZqpsQOZVtLHBu8jpk`{JhxCXZ(-Uf?r}T{4=sCThcIu#))Ja|RieA$jdP|yG751*r F=bv~Ap(X$T delta 1137 zcmd7Q>r>287zgn4+uE8j&6G(tW;9F~y~$;a%3Ub8SR&U_h|pH5Ey)sn*~%@t{DgF2 z$*q=_U#{)uUX%!t%Nj3uf$@r&dgHrOGtKx1cxFCxzVn>(oH;K}LsO1x1DP$JfnuzG zQjF*=KV7+~sS-l^xzt7UDR6RRM>*DZuL{vPgnQP3Qtda-IMsmBe@%B7t>TwsqE^>G zQF87qYTlA<*BI>@iB#l7&ZH(6#jbH}>-y(U82mL`>uuC}OQa$vawavoC|Yk<^OyhO zK&{q0KLddX!gx%;L`=eDOu~tApwa(*n_<=A_uw1!#?cC0UX33{ls-yVTteJk^^+PYdDF(+@NC z_E((|!lS1jujJ=h2bRcLCcT>!B)1N=X*~RSRcfp*X?22LwrQH$3%`wNdrCa&&OY7}@gXOL|4Gsh!@? VTk4>9^qxM@N3tu`0iXK)_ya@WwXy&J diff --git a/advanced/hmi/nspanel_us_code/boot.txt b/advanced/hmi/nspanel_us_code/boot.txt index 3dd3f98..9b69c80 100644 --- a/advanced/hmi/nspanel_us_code/boot.txt +++ b/advanced/hmi/nspanel_us_code/boot.txt @@ -101,7 +101,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_us_code/climate.txt b/advanced/hmi/nspanel_us_code/climate.txt index 259d11b..c7c123f 100644 --- a/advanced/hmi/nspanel_us_code/climate.txt +++ b/advanced/hmi/nspanel_us_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,14 +606,15 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 - temp_number0.val=slider_high.val*temp_step.val + temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI index 020aa54741e1ad626ab54dd9a834a8fe3f9dae26..03d04f929f7ec79ac767178666fcd85156cefea3 100644 GIT binary patch delta 764 zcmd6l+f&S87{}jtQ)|XWztM$TJHxGc8#m6BQzF(WhYjUyol2Xc*s>qiIh58}#a7Ox z@^i>3VasWWSYh`+sID|)81G=lKj6Z5<}>p=GtWGqn{VfjB5QjPt1PXP-(saG`5rr9 zkZc($vnskBmQr82C+|Kgxt86i8v7|sYrGK$fRVJzcFAd&G*U?P*4OcGN_W-8N2 zVLCIgGm}}&W)5>nWghccz(O3Pv53ViA)O4CvW(@dU?rbcCrgEyV=8D_OYJ>9Hf{-9Oeimlya0Zd>rFACpgI| zPIHE{lv6<^=Qxj_DypgB0vEZ&Wv+0QYt&N5b?RxLksFxYuZ;3cmJ@|ria^OkpX@SYEZ_(&(8_{sx1&ZB`ct5>%UAwyj1jNR`E))x~9>BGD z0GBS$GdOba&-VVRt0Zdw6efa9aqufEXrB3<)wD^y$`(QH&-|KHGE67KAg+E~gSduq zjp7=YC&NTVT_y^f{o6AYh3P1!qnM6jI*REirlXjS!bDNs|1cb<C| xg}d&#?}17WJ@VKSPd)S83opI$T9r56s`k!%AAIyljn8U*@zpoqOMm1P`~}5K3l9JQ diff --git a/advanced/hmi/nspanel_us_land_code/boot.txt b/advanced/hmi/nspanel_us_land_code/boot.txt index 2e4f89d..c8b433d 100644 --- a/advanced/hmi/nspanel_us_land_code/boot.txt +++ b/advanced/hmi/nspanel_us_land_code/boot.txt @@ -104,7 +104,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_us_land_code/climate.txt b/advanced/hmi/nspanel_us_land_code/climate.txt index 1745915..9f0dcfa 100644 --- a/advanced/hmi/nspanel_us_land_code/climate.txt +++ b/advanced/hmi/nspanel_us_land_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,7 +606,6 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 @@ -614,6 +613,8 @@ Slider climateslider va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 3d50725..8616a0a 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -37,7 +37,7 @@ blueprint: 🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap) - ℹ️ Version: v4.2beta.4 + ℹ️ Version: v4.2beta.5 source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml domain: automation @@ -3928,7 +3928,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '4.2beta.4' + blueprint_version: '4.2beta.5' date_format_temp: !input 'date_format' # Avoid breaking change for existing users with legacy type format date_format: > diff --git a/nspanel_eu.tft b/nspanel_eu.tft index cb6c4280e1e298bf1d4a040773588d0e39644815..e61478045ca6c051f4c720a37c2c944a7a33ffed 100644 GIT binary patch delta 271 zcmWN=)lL>*007WQ3DVutNOws|C=HS--5s~wvT-(FfpNzh{1NjA}kYV497&T_xcRx&+G-cY1S##zs_-WCSWh+*#`Q^7i z)@|6dW!sKjd(Zn1(U`Z$-^b{Fcn}_jN8xdJ5}t-<;dyuwUWQlU^~+=QChI-!{`Pg~ EKOW9*%K!iX delta 272 zcmWN=M@|(`002PXBVBq&s`TEQQj{tkl#bGSxq>Vv;RGaX2^U~t;$N}h5*&v&$vi*4 zM4rQ2vEoF;`yfH0B*{{wO7l^=44JZI%aJQjz5<1c6f5ybsWRm%RI2h>wHmeR)N9bF zNwXHM+O+G?sY|yWz54VUFzAb~h721q>YMMzjGHiN%CsM5%$hTA!J;M0R{ZqKsx|92 zY}&GI$8Ue^+WWWv5WW8!n|k*Y-474K!|*6P4o||<@GLwJFT%_4D!l&x6un7)i*M+B Gjd=%UiEa`A diff --git a/nspanel_us.tft b/nspanel_us.tft index c0142e1a15ee730c3fd09388818d668997611501..0e6d6c28cfd7f23a118dc1b147e093e61ce84dcb 100644 GIT binary patch delta 273 zcmWN=M^Y0|007W2i3%|)MT$gJdhbOP6_BoUMCm0cNc9RV-VAqP#e$4k=LXz@rOPb& zZ|3E0v(a35;em*#n1>#DEKk0;Cla1|=D7leiWGaHM5!|6UaFAvN~PD{c&kda8nx=w zYtX1kvlgw|wCm8ROSc}q`t*Bezo_H!lrnrPG*>XISD^I@X3M3UOQtX8irCuuYO1TP^s#L4- zTCF$g)N9bFNwXHM-g>9ad+j=O>eB6lk9zd#^T}uZ1`HZ9Y{aNB<0ee{V#>4`v*yfO zuxQD$6|2^)+puZNwjI0neEq#2PyPHJN&HBr_QP-CL3kJ*g~#DZcp9FC=ixSyHms6-HTT!6lifc1B;h%1;UOS%z}hjvEUSN8~#gP?BO{v z7T!n@ktixjvJ|O4NRuu@rYzZVe8)8uRi?-3>q?Q#HcajCQO<#ZN{uQ^A;>xvTVhw@7Ao_uxZP-9Y6f^ z%Wu2>*t75N