From daa1b1ee0fa47d082568b92757ddc9ad5c897145 Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Mon, 14 Mar 2022 16:21:00 +0100 Subject: [PATCH] added button attr thermo page --- HMI/README.md | 4 +++- HMI/nspanel.HMI | Bin 11134137 -> 11134137 bytes HMI/nspanel.tft | Bin 8123820 -> 8139276 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/HMI/README.md b/HMI/README.md index fd1d8160..1ff58405 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -117,7 +117,9 @@ The following message can be used to update the content on the cardEntities Page ### cardThermo Page -`entityUpd,*internalNameEntiy*,*heading*,*currentTemp*,*destTemp*,*status*,*minTemp*,*maxTemp*,*stepTemp*` +`entityUpd,*internalNameEntiy*,*heading*,*currentTemp*,*destTemp*,*status*,*minTemp*,*maxTemp*,*stepTemp*[[,*iconId*,*activeColor*,*state*]]` + +`[[]]` are not part of the command, this part repeats 9 times for the buttons ### cardMedia Page diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 78a5b7d0a3c2a8036ba4870ad09a49a110031611..028c6717ad23d9646b365f2c8b4cabd3dfa02ee0 100644 GIT binary patch delta 10448 zcmeI13vd(18OQe|`B4{wb-J@L4_hV#Xl;!3up~l49Fpe2(`l>_69UM_JQW*b0S3-k zY1YL&94t)vct1=6!4Sd>ZEnb5uqQKVL#I4i%A}Bxy3Cju5VG zMnVgh#F1t$+4R`QNASpdGYCO0;F&Qy1G?a`uIp~{Sq+{e_@^9S6bM!bxnBGN@!}_U zZbtKwTN{y7KCMr;orqOgd zm}bx+bSNE0hto`&Ma?vuj-U_Hk@O)tijJmZ==bRNX%5Y$V`&~8NAszLTB(iNX#sUm zCw0;B^kF)IK0+U*6X|2LkUmZ)(I@DW^au1Q`ZRrpK1(OlDRe5GMyJymw1_@Oe@LIF z#Xofm_JLPEEc`k+FkJW$vmx8=&Z*msgX3UA_@R$YA|w+>SMYDjcL-_Hhs)Oo5VAoj z&rc;}w{rczL_z|}@umzyu35s@FPTCJj?K_t)l~HwT@fJ-%JmzcC!|qN>OvQ#&m?5C za^lb|LY_(t-+XHxAzv$v{ds{JsAdTv8l)Sar6#q!Z<|{7?oi7Q?@`Oi2b6L$ zHh%RGR=~Vnm>{odbI1{|0_Nf*2U~G66}>ArAF6)C3;I%DK3FdB zcHQ_)sQSnx!jMKW1*&$LL~ayh?=zX8sZvUV^D_k=_FmyL2jLBQz8YU{_3G;UT#E%d z7UJpDRgxjYS6<^YmsNTzmzygq%$_pe;+5s*YM;jk0lz;7+K>AO=q>q7RBl4Jh5c9f zVWGIo$||i&V0d-5B*4H`Qj#GygoOza)3KEvuX6w3V8_Iy@`|A18R2#c7f6YE>@+-n zjW>nTHY0KZrzCuy?+qC3wi^<;} z%HO89S~Lq_?}q?ZYwrTsH44DKLs0_QwFqF35uhLy-2nS}H zZ1B!)cN(mF)YK|}zQuiB2i0GQqWr6^?#M+=se&B>tBis?XS;i?9&Tpf`OkL-i#O7R zA@b1?!b-ioD^D!ef&Z9jgJDH}5zJrK8sJhu_!$(vDcZPnIs1KoeF8L1l0-N&S`c-m zKDd0;*b0eX@oDho-}p2x3p)P5i}+FXu2JLy@Z4Ga_@^95sa?*&9KR_IE_!N{;2-CV zgLI@D0#Cb(Ie<>TX+E5+H|B?9Z!)KaVt0IOY~@;jYZr2&1A}#{DeWG^rorWIUI=#i z;Gb$+xywC-<^FnK{pE&+LUX0t+oWS~qm5654?6hNo&?E+&e!i<5N?>#02pujk8$Im zqk|WF3P0`s!ViyxzvOct;~IKW=J4H=sXA$#$Z=ro#-|_qK)K9N1Gpt{Kxa$pQRtdt zN`%CAVN~>E<$l|*RzAz`o1>G+m*d`Yg9SOfb zS(^nXON3<31=+vm#|BTzT_r-f4#u7K|6M+Dm2czXbNRP6mp5?X)xmMbT^>7$-0Sq+ zS1j>9XY9UX-p?f6XG9n?O%ibodP0lr-RI>7F1Vyx&bXJviYMX>Y#dZ8>M&MtQPng7 z_Z2SdPPpJ=3R-5`zQURBgyY(z_L!AToltuW!LLVW8<~l`h?F3+ke86z$jitaWG*rf z@gSv088RO!M;0IpkwwU2WC^kq@glDv6-Xtr45>nvBh`oxS%IuXRv|UWYGjRky?AZn z(t$Ti)>Q{RbQjL7jQ!fJIGhcP{d$ zEn)1}PS$>{n5o*YUorM;p+~h}CoWVQyU5tDC5-+07sh^F!`QDWtJQmVGxn=%9b>;{ zV>x2Kj_|AYYa3&~Zer}$62^WV9Z;>++l>AC{toqcfU#fa9$@U(v2VoKujB97uRH5d zVlr-=xd%rT9}o#!p}0D#6;uNl;8I`Q z433+@aWfcQ+qfAVcE{spaOB5>o~=|xrT=L&_{K}pi|f6MB%~Huhtwf{X9EK>yZXz1F{j>glt9{k=KzeND~r3wj#~QHsmMBb_9?e$WCMzvK!fh>_zq=`;i04 ZL8JvaguH>gi5y0bAaBXuMMtMe{|1}a^Nj!i delta 4138 zcmeI!dvH@#8UXNn(HVG}IHb7BcZLviZ3PC+A zMHdADk8e~|WZe$oWH>dwk2qwB1?<2vBDuUXXn(pI87{IN6o=bo8g z^W~iHoSU2T-Sj;7n`z zz}Sm-z&ug;-aA`L1gmDp1``=VOcv%XB8eA1EhDhMXcJ6#wXE}Opl z9=G6MbAy?l3~{lvFgQlkI=8Huoih8kJ)I%$U27r;*Bdty`!`mKD^9CPf>e_~JyLm! zEWLlz7u5cqDtYPA*r6@AoUGb)vWf%(Py$Lp87SvZR#i0p?f>7?|Mop0Arhf#Bt{Y> zMKV-_D|oIxlF71nvv_Iw-E+3B*`5}8*)5ZXd@Lo?4Kh`mr}g~l%+h~0B>laL_po6A2Z zC5U}<{p%HwUo)G3i6e*#Shvth+{K&&K7yE@%U6d8VowQ?pGi7eM-cnx2I`s!;?}wN z<>Pc;TDCy1OJ{et|zdEFisjLoofmu@aK6Uo$~Z23YQL z?EgmWV>!M%lpdGzLrKY@N`5Gtc9-CT$0QD{HWSSF2FzWNhFy3ZTd-kzEfI`Up`eW#M{Tj<@oW#LLuJqh6wuJ zuVzRie(!dXl>7&O_GWP@iT934vv_!?BqP}S=5t3!mxPi|*zm7wW#!7^_I8HpnK6R=Z?#w1>A*W|{h(FXk)l`aw7sWO~xdLw-7m4}j-`cvh1UK9!ep=uS z@Va-?XXbyqOjefS!D(qVKK`+U<)7L!b&2Gusq`x)IPsA9=lH@q)k}D8wd8yS|Jro= zR{~u5rbx=aRx|ay;0kqhxemUUsw!0JObw9VXHmUdlljg?CH!_#sRh{gfRx4b+aeiR z$?MLG7LoiJ?bHbYf1pHmOv|5rPVxbXJNn^?7<0?ic)VJ?m;dVCDUSg6oEIO!>z)w5 zjF0_cYdLQCnOI1w@WY2;mnrEKOa6Pdz=Pj>_KtsnD#&tt z$}nZeUkyrSWEp;zkv8KKnyCsbdsZamg=Xoy^Tk${Ge9mA%*a(OspJR zH8L@|X2ZyJju1Y}NVefxT6RG#hoQ+0z3WFt#+@))KT(MKAZ={Z%sSO%-fLwH6l0?( zm&T%VsdO5ZLL)YZ)eI9oZg>;RXGnzsQxyP!MYa8SeWx%2`2CGyWt=g&# znH6Ei%toA+c8x8dQ9FW^EEv)RO>(E!s+M_bTxP~9R_L!%(Q?{PD;iA-ZM|LL3f3s| zOi=1Da9X|9t}%y1CORmWYFTr&#YZV=rGv6IE43k$fvsZHEUR$@nm9ExD*#dHHfRS-J18p=L?X5G7jPOiR+G_W=CnaWm07>QrcrC1#sIDJXz2*2vsfwGRYzOx+MwM`(`E}@tJKqO zxrx>~48mqzRugVzSLAhBbGWsx*AR8PV#=7$zJlr(D;QP4+-h{Dof&%{r_b7AZmQ4V zZ=uZu=&F16*;p3Ww2z&p^|XiM2vEi(I>={}9S#T5^>M~rDl zzb{TR9khFyrJs^#uVU14P7?|Qlm4u4si7epO?Z-?h{f0AT{xh~s$5R5Go>>3xmG!{ zwQ;*Y;YiVjZug)&TqlnyIG4xS=4kb~vf(~+I2_Gdx=i`7&zTK`BUScBql)pkGW!0u zrGWuYoNG!p#rz%K9xn{4lg4mGvn6Rr1lwc&c6-_YYqs0%fl#MWk<`gMYMg3mEgQ3F zGJ$j`ZE6a1q-}9?zt!49JJR#yJqz7-j;-_C;(@rgE~@R-TKk+ai$1B%GjT@N!O9~h zt=7OfBSu$msMFmLwZ(nTXt=euM;~?3iY}Af=2Gby&Y7aZ4c;MFit)5?Lk=pXOX>VA zu1G`?lWDXD7stA|UOLj_TpVn0JEHamwaJ7sB)*rM8St}B{b%)revgr z>#lFqK_fxxNf2ye2f4>~(iTf^HenX@LM z?DierU88%Zz&5ZQ;rd#{onvN u2<`$H+zsvl_k#Pt{on!cAUFgb0uO^nz+vzxcnmxaj({il(LF~K+5Z3|fqG^D diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index e53df739cb089362af415479550ff49932353bda..4168e2583e22e2c59e6b099d729eebaffccce0e1 100644 GIT binary patch delta 28365 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 KZ>MpKhyD+S+AXjE delta 19848 zcmeHOd3Y4nvhVK6I!qQq$OcI!A?!oQ0tq_=apNM3A}S)A2q?(nh3POE31}ogU2G_r34C|2+>m)!o0UQ&p#`PWPFf zVeS_f99zCU?^xKyvE}EoMcp6kzInj-DYuVExHMv5n;w5(dW&OfWya|_t)?!|z3JuW zKBAl!Z#teSzTx8c%jXxwjXqU9tJj*o&raX=`Au8*%(`vUBZrne<&bBGy*%Lf$wedX zT{LOnpMQTw;LiyB8G%0|@Mi@6jKH4}_bYp%7>T57Gd z)|y9aqvdLCwLC3fE6@tHc3OL_NGsMlXdSgqT4$|`)>Z4Kb=P`mC0bAII<1#>y>^3k zqjr;av({Vti`GZGMeD2e)B0-zv|F{?w1L{~+92%??N043ZLoH?HblEe8>$V{hHE3V zk=ni5DD6INv^GW?tKF|XppDbUYY%D@w29gzZL;=|_E&9+HdXWPQt#I&?}WDzt!kk* zs{BAx6Xn`#npmtRRgQaH4XXv4RDM27eKK&}zm=L$d3v^*q1Xlu3->0HcdnYGYze2g zC#p@92g9i%+?%R&38&aeYMSh({%6!K%I9HJea72UUPW!}4x?qbl323YKhJ=8f)H=qbqW;3>@GKl#pdp5$Ob z?-KNGL5DES_sGNfh-rD`d(!F9WN%K&P$1lr(4%9*3W@^y=(}y|5OUY|=2E=Z>k&yM z7>w$apKrG~Q|NzG&_@K-1bvJtEY9Ymu=u!Pk+!T?lNi$ zCMbQA+9FaY*cNcP0xG!$T+TP8S=9tOw@Gbdl~5D;H0@ihW@o=6occh}_XPb=&{Iqc zJo3lsl=Y^!F{Q0hW3vq5_l3Z_bqUkV^=fOX*{sIVqifVrbYVWq-uJwkV;JUIE;)^X zUGwX~&uB+je*4xAT@Sd7^6+!H$fC#!J&uMDs*f(QXG&7*Y)`gX zZhpFPqx!sZI-T}!@n$M=27SK{^SdP6yejBrL3KeTHiY?wWzcuWyyiorEwW#qtKh+elw-QCBWK1aBrh z>`gE%C|lLUn~w_qaY2s>dP2~*n8Lz4;_6*N-(zaCAVMrx3EoK>wpHCoCnvzffz~L; zvTe}*gW&xn=#PT_Ea)#xq5YD$`d!e=Ol{i5eNDb7c)!uJLboQM3BrV^rx|E)o^!88Q%&g8RTaVmb(5`~^5VV9TY+g?TURGNx*JV=YpS|vY zcsC)^) zH8l39nps|7YPs%LPlBY}*Km+5Jvn;JkW}f@=_&U_O2clwZd90*l$?HFl=R7?w~vmK ze)+BQIG6OuV^hX8l)A+J>%j(6*!B(+BczrqI{wuuMLxdqkwht?>dRTNQgoxiOVgx% z35}K~OP+zwLyF|Rr}yje(hWZq9!-*-m^kiSinQX}_s&U9Y5MzfzK@YS4vALZP?kmR z-f9%3r+FtVnIT8e&~!DPV%}2YDlZ;WW99BQ-FLrl>Vz@uzbvI3{yasNrE?3{@ijL* z<1QQ66O{&Hm)kdwqED#3Hj~<( zR6B)f&`B8?-V{a_W_a@{zDB)i={st%XDyqP*9*E%&<%oaWQsa@fsf+uzX?xnJh0L? z1K}n-j|pR50UmwqJG7U$YqjTyO^4@%Q24f>ZwXo@=t-t9@jf4giFXVW%Db5~d4k%Q zz1{Berc(90>RjdbOj>=n+K?t)^t!Ts5*jWF`ir2y33`bsbY3;e`*J4555euLx^~R3 zLhk4PIOdl3)kbXmvnSM+RB=)rO%s#7;qYMT2WktYubcEs-lVv9SqJ>aeOr<@XVRiy zy-BeQ#sY{|q8O{c+S@_F@z4j}X5x4qys0?st;f^(EXSLnG-6&sMx5;B>B)+wLf3_NaubanLL351(2{y1HSp7yq+SLS=8%!)`7 zQ;luv=0}SYie=8^v*Xm3IL2zm=s z%zc2kx>eBIm?G-p2HzkI?(o=tg7$Y){6}gUr!H%m`e^00kJN`{WulvAeC$n1nsI}~gF=&^dI|bb>=pLp}vyYEL zO{JkGljqNk_o?`d(6OVZpd&tSbQB*sQ0z1RsrICaE7cx^icceK;o}R$M-usCH+0FL z2>K5}KNa*WQ`q{PkHS{9Vaxp)5N_t?o`OJtGe{`CQ_wpEy-U!+OkrjyABCB_17?N*v6(5% zZ-?D$N861Q?hoXTAqo8Xr!m`dQN_R2SnDZ~gW>!{7{1P%TFlFaKUBmUATGMfpSk~t z@y&?kIA}b$`YYVs{=;J>f?Ah(UG(_ZYOJSROlhW|GX#A^&_|hKlC$_ICaDD`$+rV; z=10-I!Vr@bpS2qNwz zGetghK8k!?Hu9ld$s*S|yThBFmNX4{AT`!D+yc zYD&*hZfGj@$oKNm+&G`!XKkGGi^bLld+ZE;v=`v^oX#hv=&34t;Yal$YoY#MwsYTA zsma(6&N}{+ie6fI{HJNJKTWSzm&VhIdA=z6kk9ta^SNp3nQ2ip{WpBf_-dYS24BX@ zPC9UAS~AU_56PlSDg);kc$Idw->^| zbVpe{U0uk!zkt#Ci=d-fSXsQ{lxg97Uost7^?aR{RF;kFk9i5w#R-T2y2~WY`hi9i@mQVR+$VVu1u`fCG2=sEB zgssHFZ=hSzC6^*eN2s64=1qoW8thoXE(aS*Xt7VlA#RDdYQDtRmNLFBjVg~2T45Xm z@?nGRoIvOIIoud8U`4==g}~ni4iVApda6R;CxPRSTXvA)cLFGLSW)-;c!D~77V|$^ zJFa#ZwOuNv#0MI>)OS$sK$!%n0~HfydG32e(o4P>sU6_sQmC*(=+LElz&cRe)3Cto zY#6pe2zHEMcQ@IU7_FB>W(E=fc9dXGeA=gq(d<1C(U^@@1m*hEzP9D8oVyinusPg} zbwRhn4V=Txc&89}H{kfQ%$Rz*hroL%(qJ>*68mKiC^5A_731Bp)n&u{$>ge;f8Yu* z#yg_(9JyI~DDznnY#dId_JPDmaIKOKGosLk;-2%hmHSZl=X?ursCo_oXJLLuTls)6 zmvkS}O?Cm;RzASylI}xom%(Bmx^Wpwx(^+|RXOY87G@kIr)ii6pj&YV&eLbCFS-?X z;2d|x`-i}94S^3-r1Cly4Z;BYiN+3@hVKZ0-vZoiVmzqqF9)lm8ftd zQKRU*$>t}Vl_;<|QKKkx6)cXT;#EF1ot1D8=#rd}%7T-O-ABh)`C6Cr>HX+dvLM1S zWBdVhD_OufS&WYlflmOAKhfBfsb^vce3FqwV|DX@jwmHIFa4+1n;US)WR={lV!#+qB4ZcOtzrPqabWyh2>b`&_!G@()AM5p{3k_f zRU1&-fS*k*P{oS6W2ad|D>nv0@EzDz9?W4>1vVzf2fDfu4=5KM*aXN$r#2yyE{fdj zTafB=e#z!F|s| z6JJEkSw0#nt&~9C1#2E!X|jW=8f>m=4^@E;C11bjQz;@5S|@DvMFCK^!c1QPiqlEM z6Q?DmIWdMK%BFJBtw=j*p~>e6GQSWVqM~8^LGZJ9yvc75zS$V>-jaRkx6PNFz{A_1 zTk&y{yWzAXn!io>RSp^2x(%f{oF-Pl_u(|F0z}{&%2JeP)D-`vN>KsnP zwj)x^=C@2%b%M>+IUJ9b0NVxIR&|2S)j6CFY)6Q?4WAYt?F7apIh^|KKuNMj?p8^H z%@bv86uK2C;2c24M~1*h1GfTa(=#RnKGq>MsSTBF!2K9tHfKHRF@iG)K9?XnFaq5Q zaXp#@K26_=5F@NRQGipx4=O;HG3O~XY!~hXQ)t01--2?Mii8>~){x?TD&uEh-i~uQ zG9FZikmumng>!u}o&)_>HXzU0VEk8nm$7`eZ*mr2@Kk_{<}_Ue&dovnDt*m`uPkb% z31XZk#!AtxGy&%{G42h4`+(ccnR?1X;C_ewE^RaXFb0^7{pS7B6w>#g650M#be2(XQNw5fI|6nX+z50kG1jyW$wpXSq6ci@W&c+T1Ig%W34Qs?k{7lu+%EpwPFt` zjy>Z+u?NnvXFMqOz&ZAH;T(I$Ux9ur_K@e;GtO(}mREd}Tk!?Y1-NKV2yyrs=N33f z&R9Cx)0bI}Yi3z%2I3q>##W(Qi2%+CVthpid<}5BSyRv25coRaNNi3}C0Yu>sTY{t)RlSBS#nK$yBR_r3cO>-)ghoQGRT}X| zrjO8p*OBQXbpCZ@nx(oxmz8Nqai$p$$~17!G~+#>)ygz*&U9TkXPWUc=(jQrdCoNB z$TVGf!#7zt0jxHd5aKFkA?{Xofpd@GoVho^#Fk z;-FPspAHsG8`Bav^B^Lc6Y^OY&)8?^_zU1mQ%W<0`(FaHssZ9$4J`f@x|LnvTn&tW z69WG?aJyMk&$l7)8ly^#DrP_VT?HGsfXqlrtXm5C_gFXS@*lt>q1zQ_lDpEbkXj_$JfRPx11@2@bDm=5PxfBxeE* zPbd{nXl7Z-g*eBOvCHUIa)EPl8NU<)zX}{8qOn<1j~)W&SD52q>kk8DFwDk^ck@Zh}sqoh@ysVB-8l#>>yk$&eR-W zoe>F3KG7)r9LjtT3BKw^f``86>rd|A)x2_+W*4n2Lz)*T{ySAy%3p z&S_!16}pvX;GAa0Jt6R1;C8d7p0*+IyfCpb3*;RJIPYwr9lDiwn?vn^TY0zP9e`VT zx8bbMo<`H5P8N<6XQIe^co&>^rUvi()*6}RYc^(Ou%VGz#=BjEb7mPI1>DLYe|aAq0nijE(T9(>=|teme)(5;k0 zj%UtzPjoA#z&WLi_X>gE0NifR)N^A9{HCCk!T_g$4fH{`QfhPP7T{J&ZFqm+R!VL7 z0N_?iZTPJg9u7kdb((py^e`88&{9q^mhwR0d`q51>7nH$a5($9#jgzxfB?G0P4Ic}Lg$&yIQR&hSo{c{0y{CqC3v` zh9$5RcPrW{l=n5hcA64qeC;%a&Sv}C^5w~}(xH6J3olJdn}Q*w=w=h&I$;jr4-dz; zPFuhmX*Zr`7~evX|Ag@^RQykTc3`P!NLhC?NO1`>9`ubea4uoSgLWgpxrFP&xr7<- z#9owx%)o90@?64{ zd+QoT=fOtS_&^z7`VLl3zv5fit32kEES5|IJoBrOnR$tdvJs=!Qrd)QWRx@lprk}fe&{0<}w}zd*Smzx0(2A;*cVphWtHJu~d^ROI_n| zfpxc7Y9tN1S(e_y+mSwy--cgmPaG{5O3S0dBz)MGUc-00?uQ|OXG|BQ=N$}~{DLe! zhL!OK2GrozIu^fInRmGIV9&BSuh6mU%2Jk$^q-`EA1zCv-m-sh;Yv-GoR7)KVsJBl zvcn~0w6COO=}YK?JiXPcYDg(hM_u#UkMUz~V65*di|Ng4X z#Xn}VL<$zs%Mt!PU5ggU(pvOuJ*Wv%oh^^TtnZb&%Pg+vM_D@&%sk^aR6 z+LN;MJ^HnJTu7_w;=TA*x;gaBh92!nnj7Wc6Z!5_vQ)BIrjHhsrKe897kpnp;5NCL z%nV)cD-VUCk%pnA(J<6xi7YKbzt+%jo1xv(4txQY0Vk`ZCQE3D)4!u+ic2bf2tPQg zM!$9}e-B|g87ZH^$P9cZ^Q*-2y1q)TfDgNb4-IzXG`Q`gY4!XiVSDB6GQC>Q-=W@= z7^(OW$x_>=WqRphOzS-rC}qUd@A%^ZMqJ$a!lAv#=%Qlgc5 zii@#SdLYIhpJ3{Yfo!Z2r#Kaw8{_XZZe*NPJnUInYW18fT}CfiUTeR?X15pK3iiOi zNAdQK<#oN0(i*zBwFw;gJTGwGR>>7-g%;04`LUQc3vo+f=L*Y5#=|~rdR9OudhV)P z`}|VOoOc)5uwN#_zVNY^GBBWfkYz*H?+TpXsoWvXhFHAYmBGs0%00?Z3xO9jZ$McL zb&B)HCkn4XhJim^86l)-Xq>-GK_B?E!{(PMS#9%g8Q!Elg12Mo@?xpaDmoFzRhb|a zKeZYwd`<0~%(491z?@qnxi@aE8F-;GMq+tgU#e_?{pUqa8@*t6Sd8DSY*AiRwkZ`x zf}Qnk3EmFr9m-B+t3sao{%!@;Fn+_@KRV#TE!TA5C|)cS;C6WlF9537(6aje9j?xa zQgQQjvNRW+j(t+rIMoRk`A+d5_QuT7^>37muy$FvnS3SSriA~XYP8>#s|q&M1Ip5K z&MD`WACw=J3(EHp`$~}=iV$;vhB?APe^cmcg12nl5 zOtClPu#;waU9a!Rf}W?g4G%$OX+7*Rd?#9QWCh&Ph`7whj1iZX5sT6>mySuOi_Md-VYJ-z=}| zogBTPtFPfzKcQCFZw(xE{T4@m#{k2t9*z=6FUR$co{sCl?%=r1F;Ixz4m!wj2k2kK zb+PGH=fY&ExfvVl81Qhs%`5iLe0=;M`1b~Mq&UVn#tQTD2zD_Q-=7EO+&Mg@R{JBH zg6GZqQFG3A?Oq`_fps*M9}1{S!2Ve19%t&N`De=-XYmfTE+x+iC8Z9(DeidKFrv7N`R{0^_3A;*`*LBUY7~v!lQgei^ zKO4AyCU9IHI6m!I>Uhqv%(23;(msM-SyC3$a*pF~j`@xSj=7F`U_N3Atisu9#~RQj z0-I^N9XURx48^{V9_@>#jN43Mr2 zE888>XooC4zJo4g`dc}0E_OE&9d^pnhMjcU?Qf-Y*eP}{v3Kv1rQW+`=>qyUd+11( zKU=wb7w=B?#D-S_M_;@b>-#0Dz<=RV!Yk?hZ2z8!%`eGP%syJ!1iCiAL@zh-A8!5@ zeud5(8K!mVTF#_y&1eVsN{^%hH;^(>Ef2vFF8ghJpO&oJ@`d8hidd&w6G1ry5j`xY6G8^44CO!-jnDJHs`NWao_v3^u50({0|w?#(w|+