From e1610bcc6fbb3809ff20bd3d6098c8a715928505 Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Wed, 29 Jul 2026 23:23:30 +0200 Subject: [PATCH] Avoid fast scan RSSI and chevron overlap --- App/ui/main.c | 10 +++++----- archive/f4hwn.fusion.development.bin | Bin 104208 -> 104196 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/App/ui/main.c b/App/ui/main.c index 484111ce..293d8322 100644 --- a/App/ui/main.c +++ b/App/ui/main.c @@ -1593,11 +1593,6 @@ void UI_DisplayMain(void) #endif } -#if defined(ENABLE_FEAT_F4HWN_SCAN_FASTER) && defined(ENABLE_FEAT_F4HWN_SCAN_RSSI) - if (vfo_num == gEeprom.RX_VFO && gScanStateDir != SCAN_OFF && !FUNCTION_IsRx()) - UI_MAIN_DrawScanRssiSparkline(line); -#endif - if((gScanStateDir == SCAN_OFF || vfo_num != gEeprom.RX_VFO) && TX_freq_check(frequency) != 0 && gEeprom.VfoInfo[vfo_num].TX_LOCK == true) { if (!FUNCTION_IsRx() || RxOnVfofrequency != frequency) @@ -2257,6 +2252,11 @@ void UI_DisplayMain(void) #endif } +#if defined(ENABLE_FEAT_F4HWN_SCAN_FASTER) && defined(ENABLE_FEAT_F4HWN_SCAN_RSSI) + if (gScanStateDir != SCAN_OFF && !FUNCTION_IsRx()) + UI_MAIN_DrawScanRssiSparkline(isMainOnly() ? 0 : (uint8_t)(gEeprom.RX_VFO * 4u)); +#endif + #ifdef ENABLE_AGC_SHOW_DATA center_line = CENTER_LINE_IN_USE; UI_MAIN_PrintAGC(false); diff --git a/archive/f4hwn.fusion.development.bin b/archive/f4hwn.fusion.development.bin index 4c61f8956f46838a854aa7e83bddc6b82f8b32c9..54cce14f90b10ddc2453d3e9bd50974db55f3a65 100755 GIT binary patch delta 14569 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�i1Vj@c^kkE;%*7CN^U;Qt!#d) zQf}hS%C|xy5as=I#|hIj!@`j0&cvWK?wt^{o#xcqIq4AD-VUcqK014oIdbp96=Mv>B`GD%i44-0R1*|mySG%{TfL<+7FfR_zLw=O+r$pajIUvt zn=0dLHdV&W+61R(lR0tLw2n<~FT9>*Tz3w|+1KVoJ%O1q)~$2Hq$eD^PDMH9?n+}OeHqpU(U!W>(ZQ8U6^ug|C% zh0~I$BDE$0PNaNlHdSbx{$RN|y*`_H#ZUb9FPXy!nJ#J8KcXz(@SvjksnnF(21}h$ zb0*y2)TEb|Fl*@mQ};&-%A+34HT7gs>!~2BzI%I;@fX|nvPgSQWfY(CtIm`T_f2O` zuAc;>EgS4tA-1cqFhji@%^R6+ADo;FM@sV4vWX+6uw;i~TXOwSM{8AXXldW-v{vO-ql|5L zrv<5ZklNmP5UCcVq|SHv^!6MCEY`KB(GdP-`@-?7!Lik5!hzS`S!W&$p<&t;FrXT@ zqUo5WuJTh0f&x;aE)J@7k2@e<^TG+R?QK^YB6-gO6(@rNDh6-S5Z7`ZLeq`U?nsEm z@xCC6tG4T~TCz9L&R^(AiI7W$!Nhm+{T)V9@iQGMv0H+QO$Xu1DqiWPz30Bj<}qCT zTSl5{+c^tN@9B9L!kSf0r&GGblAx+-RBBjbm-q`G@mm4q^QV8CNxk@~-!cpDv#CSD z{eWokxy~OQwHdDEOTcMk zKc9T}neF5AvI&3EmGFnw2E=)PIJCW6HapQx+pV~FVk|V5oZkim;wg{PphzcqB%!ly zKt#KCpU0ux77$|s+DxcZV9uz3xIZ9o=C46E5Q>fr34Cx2g80`H)d1p*w-CO)(eJ~F@fMV~2#ISebY78|u z#8O0L#=yM1*`CO{L{EP9{2oM%*IXz}dNwf0T*^M1D(`DuqF*4Jy@Y+OOT58PUYLzI zO=0IaM4Q)imPZ}%%kLubt`|SqnPZaYGf%etm?t4>V?zjd5%OOn3i>zD6+jC-|94St zEz+{rB6~6u;ni$J{?8~=3m@q)6q?X;H}an1X#|()5z&bry%S?k#ot{yMhB zFAn>ahQk$Xi=6ihE8pSBM5ObWBOiiu+fk0|r$N8xL_graC2qJf5DD_b2t4_FLDV~N z{GwSmjQwN2|Mvo1^mP2L!)1-~;)v0oc{KM8uI~O0F*R$jXqjI;=VJ!B2Q6c-_{DcV zmYZfXg@h%^UR+&o@rk71Fq0bmng}PT2P?s-zvLS(CPg3c^*3u-QuPZcvyLCSm@;yO zM_+xnWqD-=|IspgMb2$R%gp|Lr#95)kAW0(VO2`45(p7hFkz1O~V=twp zJ?^_Ju*`O-Q`s1eK5u%JjonxjQq|miDR^$jmMwZF9)RC?~Hr9}~ zI~6k8kYb6jkmMJw{*F{Kq(N?vTm0fTKJ#)$)G+X;dx-B7`3skgWZ>Fe{DN9^{)Ph)vltp-otAJQGpqpv36CN%5n zAk)w8NL{_9OUy(N`mXH%$8BIMEi+7!kiVZi2!a{%b&*&vtyi({=NDx6w@ZBTN3Hw+ zTkCzk=jy`vRqoZ0Az6b|9xdA#(xs(5=bEvu1Y9lxWPKS9x*lAXxqlF71^x}x;@SP6 zvX?KP3c9c=zaT#tn@4}(64GNp?+30UeG8b2I_+4sF`#*X56{A}y3xSC_ec{5y7N66 zt9b>Pjle`KJ4541c;P@pU!!ss(tUv;z?0~_3XNo=v2QTgldx=+caIbtqGTXR;v6tQvsy zN<4cBsA*k$&@Z}s%gp6tQfkX96vkK^VqjeAN{g*>DO&Cx$P~J87}%Zsv#yLNohuKs zDKI(3EBty_3d}>)4P%rmc-QPX#Uei9Mv8i(>!!HPXWuBP^MFr%p(0nn9}d1;2knOZ z@1XLrYyi?Jz&Yf5fjU9E0NL=3K>j?^vh!TghV?*RHjd*!ncmsjVqS;9_btH@LuR%? z9e(kIN4`u^wS+qz{@2W}jY;PzH;3Ol#x21x$qsC-P2G2y-7S@ZBA(FS!zRFRrpJzV7Qr7db;uCJM zf-k-`H10LmG{+<}4f`j%gMdmNEaN%;@vV6@kZ0Y_EMFA3E8kA>o8Jh1DKV+g`lW!X z#VMW%h8xPu`{T*+WS^)H-V}fHgu@?x{{&hOR?Nfm4CFt=;(r8c1wO#7%R0PY4{+pP1kNKZJ72QiD8N!#cjObZe5!sE z??~4R-LHF za0`c!gieF~%O_@ICzEsPP;RRKrietF9#7Y-1i28j|zY)|0;rre7 zmnxOsSewK)ms5_)&a^iXd`>#(tURJJM&LZs3kA=k;D21CRXIC?U5*(2oC?*R8{(ud zMz7g3yW)oU);9}IdNFg0_k(kFVXT-r#a>@=$N)NVaQxXdG3lZYSM2g2w`f{?;y2&@ z8;P@|Iv-KHGb$~^cgXBfcOz@M|Bi;I% zWk!O<6ZkT37Cs?)-K)dr7N2=DqFeo!)6UinF{Yn(ic`GHn=o>R%g6>6B-T=~DtiQ; z&hZot8TZgb5SuUkaoKO$sqhVlQ+yfxRSp9OoZ=W9IF)`FLWsPaj4^gCX8bg-@?}lm ziSok63~XCmjXak#{$CN^DniNZLSqf-H0+L8;kqSudNMLUooU8RJ@x(%T#+b+$n}iN7S?v4NMQCAE>ykFr3T1D~F;s`oR z^Q5Xss*BfPr}#@RrgdP1*I@wS)xFp;sUwnJrbcOT6cx~cwl||Fil{<5)Q#$N7rph` zF7c?3v~!uZ{HTTA=@Qd?vUqffeZDTyC5?}!c-^<5VxxVt*imfzKs6Y-X(Q z5(iN1dud%XEsX0Ktk*>-@(|(=iv7VF=;bv@-JOgir2Os_PgkVT-D!m4&im4f-Dz0t zwfAv>saKd|N=sSd)SA(q(wXjbIrB-MQlEk2WB1$vr?c60EQ}_qe^P(^W%ZVSb1}AM z(#0M$G&a%wtD_6j`IAG-ic7o1J5o^$jqdTNm-HI6put6vN2Ey`W2lJ6NuR~g>!gwv z#8L`{No!(hXxv*~X3$i|)dMv$u8Z5!saX1q21?EM&~&Pk-1pER^|KzASSc07QFBsl zV6_7wLfZ<5Qvba9nJOBPT+^qfOFSZ7j-x#kE^WP+2GLv6clXjhvPjF~X%fDIkxs-@ zUP?^xiOxh^+s_DAcTyi_pVz6t^pjD$TuSRn*!88EJ!x}X4sOg${z&t{0ckZ#T>E*% zZ;~>BvPKSZsUg{1KJ3WXu)1V6vBD!d{1eCA{T3l8+PsmvYvR1`_2uKnuCX+SGyB-F zf4(~udiTBbWCG!OT-umGll#5wzZ;!C_Z%}O+XjR*qo=LFtY}H9^@xBkQnpQ;=^{!L zEgn%T#U)Zn)D@rX70MmWmZl_9+CojB3r1Gnt~}yIu%}7Ej-_67$i9Z`m&iNzIrthU zV7tD9cXSl=ThPxz7eZRkg4Td`g63j7k}pXXApbb<6`tJyzC_^G52}(n5@{g~k*boQ zO;e>qNpvis73VCcXmDevfV`adGaYHKi^0-{WEvm7!mYx~?b5kqGN`pdr&upVrO=+b zt)B4z{*8F_(JGHf3=BqmN!`2m8P-b{oa}&0S1;0=Wc=C3vhTIYTmC3_L3LwUcl#ig zjofj!tTg!8k13nn;#J7h7HN1UB^l-8;4;kp5sbPHbOGF&Cy^ciK4bwgt*SA&P^xu_ zUDB#d8cDxM$1~C2wl#*AsNz9!ZL<*GJmcs6~MR^!Po{UST;3=JXed5cpVb+bM^2gKFgsTdPTzVWjsYoBYM-ih@k6j^TX4xiFJ~_Hx(4!geJB>drfS{ zz15MxHhkdPWX_Ops{1MJ*Th&?F65A$V**=3_XkSccqP|d75|n>jM%AOlAbgYcqDB# zV!yj6RrP_KG)Q%Q=;erOz8oeu{F0QA3t{?D8kq~(dc18xE-fJHC7tX`Kc1wLu*qL^^B0iFKWbTiF zlu1wahjm&jo$L>Hpu6PlPrK!YUoD`46CVfvKg9mL4#KB_Y_uU?jP!b7EznJSRowI) zGs_Xh#Ih2bLYvR7inRd+o;!S{>i(zl*>LTB^;aS7ci%zU2Y?G-NRtLoQT)h2P>lAx zTKT5=#Ixnv2^if~Q6lXgKvp^@O@bqm@{KE-70$XQrn_XVxhf9$7n<|5N$anQy=}(| zA&1c|7*iR>_7Y_Hu#{T_|KVrpND(E_o6@Nw$_P*M*IVugt>i7j5-pc>#n{~wrJ`aQ zO_!y*V(9xo=|C~0<$z=_rkSycFx~P5Wp$Q6+g&Y<7zEakv|tcTLD^%2XplbMN4;K_ zBcKDaS)1vKi1xi)MrTxp)bechF7miDOCL;qi5yZ@2_+?HaHDWvC{%GpOvUxm%LpA@ z5#LG6@p6#Ur)-|KREY>)&yJbq@ut*jCCp?-^%YU#)gr=Dg$56L5a-xb%&v%hZ!x3I za&_$7B^dWHsjCDlxk`#3LNCyR(#|2YG-(Uiu^SkGnKXjRGm&RCQ_3Go^Ngpx=Pj>y zlHQmUhmYlSFcmKGt(OLzx4ioQdwNXzcqnDoed%2tx*pNnR#nc`#aCZV&c;~c5g+Le zgM3B2=q^B9Z@GywmI1Pp9kH)*m~S&2x3>)p=;+ zrdvLk%WYJt)P{u>E?m3@qTyaho)$l&0k$^ZsM@T#W9j==A>M z(V8PgtuFDhH_@CpCb>2d5hkDL?ZKn>VD%Ct z_Xs)=XLLvFhwEmgDx8Ud>e{24YvLQ}gEC5rJ?b3VGbgHlh7Pu|SF)iOIYp^&3gk)PM0@6EmcjN5ag$AiX~llU*oX7)j-nCgqGmcb6pdD0Ch# zEgwa@Bg63j0c!0Pp$JOZqiGi&A0Lgq^rNF%rIpMl%>AW&ZXX|O69h~R#lg$d(P;v>V+IAGis+azTb?9|gzeibbVPjjhI zx>(v*MU!a0L}THVZn;p7Ja8G3K=TDEL`XX2sy-n#*FWWEckye%)3z4jX)g z8H2s*3qO(~J^cU;#gbbepvkmfiW(2b)=1;V(>JtBN}B+4xl6K7ps#3V+m4AaZ}cC@ z`XGjXMCy2u;!^ep@ofb@yVb&?R5dR+j<8#%~wQ|lr)o;W2=;AQejlC zThSQJrkE~?*Q6itAoix`oQ3r*wMDiteXQ<|Fi2^$p#Qt2!da9*=yQ*z<&wDVR>Mq0 zB%9d6{N4yoGp=d5BcAoFcSN?_7Rf%zCV*&c}3cZ>Ld0cASj#ROG4`^ zVLE)`puw>r+x@O%h)&sfNi@5ZjeoZc!TT6j0ZYdFYmOE$@ohklo9`)7>})dT%3<{F zcvJyhmp`LgjkJ6zBA+Bq;e^l!MF#+K5UO5UFq<~gU)#iN>VbcGXbYc1u@N+-E$Iom zN$Q+eNOQF<_AfY}M<;%W=sb`rQ)&5=^hLDXq6#QRtHsjz8Y<~|53)8iOrST>xeM@Z zYkRGR?upEtjC06TU=i>X@C@)AumV^Myaa4+JM%29>QT1?=?YwS5Myi)(o0knN`H<9 zzXDDIKLHnj%Ro<*+X9;k!kR$kdT)X%K=*;d1!nRk1-xBmMP3cs1{w}}6jZMG1!x55 z$?a69iA3U8Jct6l1lkSM0g9_*b{(__=r;%s$AG$#j|EjD4-3sALGK0a4jK=d1S$_O z3p4?=4`?E20q78*92f&k0s?4j#*RAD%tvMsumq?DmIJGRb-+eoGtda^0A2%L#q9Qi zwgE>0IZAB@{Q-~zm2#P1fKK2F&;{H9+VQRvZ~`_;3aH zM#Yee8hrM^*jlzumf{bkkL8l5rJq3*w+>6521-tgLEE7kF-(@E2iU{-UCCC-HTp>T z95pJWDo!P_Z=j?s_1onUfo_qS@HXNE%)<}BPtp-i(;{Sk%ZoWo(rv+J`LR^Bg(j!j zpCZlEt4Y(;z%;RMF-^w-rdd81@>fopL(<1vD63930^vY6;9ejD$O3YKXn|_o&_oiL zJsck>+>a}swebBgj1@rIfV&FXT5wlk@#w#QpJ8lqn4&zPf6Hk#{&fWDZ{;+*o5pvY V()_KYi})Q6JAlr%&0DFC{vXT0z!m@i delta 14599 zcmY*=30#y__y0Y!z_1C32*WxHBsiiVpdzUVE({}@nz?1}h1r7nR+z62ZmFrMT=QYk z)Uv`Yb;!udvV6;IooRWKtb|u(GDQb1pV{aCea3p<-=B})Irl!#UC%w|+;h);T>ECo zHvD^^CLTW(t)TtRV@$J_n5G}!qBM|$pH!xk zmA5JL=@^d+nSkF}A@gZK%SR#aDQIxZiii`T)Su_axu~=yr&qL$Mzsvr&8j{HQ*i+W9y7JX*pjV=k4n%+H8d(2SO4Sr>`I zTBi3sBd3>nYJW4u^WFWE=?{Lge-XOB-Cs*>Jbu9XxW_$%OsUm_OvyFVEzBUZ_Ha1) z(E;(POP$RtYC~(Iqa4o!lq`!yITi$TjI>#-hvOyQF(8`;wM69R$>~nZu>3=^c<*si z{hq`$2Ql^EK&^m-`wE-riI#>z*_7~lfb>kGuZ}e({tpf#ZyWqLI5>95bXw2%4N0Jj z{N#{l$<6bMJTlesmi|L6a=OkthE1kOUN}4t+<0Vok&KG?zLF7S<{c$VsE$t_nT^*g zMox_t-K2?hyzORLGOLu@!mo^6MedeIO2-l{;77}HNZ;~HnVx6^r_rYP>lpW8jJXTr zJuGLMa|ulId&}I>lZiU{i7|Tmy`^nTf=ny3kSYXF0D%BwjuR~7jA`Aml&HMcxW&=S~?z*6WwUJGCNwXe-o8sPV~|-t*ku8;qb+r zIz6TmQ;Pnp!5FY9Vg3O6x@GMAxg=9r_`wCWG?W__uBXnHmW4NohVWM(c@`3#T(u(D z)uKunecxhVJTX{&=;LF;RNzxNP|~vT@#8W&$cw8_NKM_U{+QxhPAqwr;x=Q^eokhZ z+!Ke#Z90}&73#Q;k64;X!&(+DgBYV zpIxn`<^1aE97t}$nnJ0MH32%uE7#7X$^5|DDOAk^Ym1OBT9-*BeD=CkP=k(jBOrL% z=k+pX;bWff1ZnBN{$(Zoz`xpT2w~`0b)5S*A0!t)u;mSUjZb`W1pVBy{l&8~rP?3r zi08Amk02-Cz5NmVD(ejNJdfCo`KCsPEUyK`8?GakxFH>Ff79c}!;&YN)&E@e)%P1!Ho77&X9;;Bf- zcz#Hjno#3o{eHD&v4D8V|GE7(B;`C-?K)T2uc!O?zWNFDEbp#=oD%u$hVArfOLv2j z=;fB;CJ4&=Er#9MisVwvt~@wHQdOVm%@iz(l|uj{9q;ld_f^vQmQ(u{%aoGPoNvk5 zKNwdROak8Mt%-Ywb90hHm{2PaSzUv}_A8qJFi zjU|7}szb}=2BTAXEcaA4On;=K*y*%8PQ+yFKBhXNV+q9L=U* z`NX5~^Z|e5=m2PwaCAB?D!N~`d614>Bg7^GLXYce-%qN^;71(NPVh5hhSpJ{(*7?Jp;!y4_5-L91vAX%2`(JhCQc7;n?DLB^0~ zx#K#Y{gnYc+Vqu?j`JVB8ceA?>g(jxW?1r%p%v-q#{fj5uMhW;N{{paKKkn~%jntkcV9H#=J;Fas)Usz@N ziO~D!JV#7PHAhUW??cw4<)QqrNl_QZ51GO_)5|#P6A;bbchI`5X%E|Pa?{M^5!?fX z+;290m#E^hMnx0L8g1pJqphJ$viwjU)>NJ!#>1N^Kb%WbEwl#2hrBE+%35zqu40BT ztAK$83`%Q=zQ0bUjRsS`_pT4_s$^x3jef7V*S*ywW63qjZOlM6=9ujd)9b4@p&k`q zu)xD>V~znP|AvYtRzFRq4TvE==6KvcWBDFC>G#`t>2m9e@%iYi)T(HF)-;KIH)AEw zwxybD${E*V))lVYs^|j&@foikYds`5i2bf5rsxBSRa6iVAN5L4FIl9))w>`E9+nkj zn;#rFv#qqt3UhTK+H1l0kAmy}!Fy(V%04g1^LXprin+#UtnMJx{obQUi?^!uOvlVz zrj-{^xaAuipY=^-}1Erb2>ts68E>F1-TDixfnFe8Vc6T(TF---wA`jpOW^(Pf3Fc8q!P;tS zVe?l5|G;*^yn(2$|n+GfaojYwDP7 zT6A-mW4@pCTHXKUsNO#g%3E0Rl*Hp}J|pM^$Ex3*iH z;#zO~p~NXvkl0VOF^#Gzyx`Z=$U~PC%Tgja%X+}d^t;BCrOc~IG)%O;Rt;@(Pv}X=Pf10BCC_F`2n=l6q2Nol2wm z7AxJ;8lpLqbitx#tZ$fgRnj>N~shSHQavo61e3V4~kEWbLk zi3TMaB5n8mS6V*l9BGm@CNJlZyAM16)frj8-!5a9YIcn|XeZqZC6pIacG_~z(q<29 zGAFN;B-+yH6>FU=OKBbS7ekq?xl>gisw*}o=7u@;`}TDPM31Y;C`)~-a|mpdBx@%- z!qbs0l@F{JA4iC_FYFyo3!uhBA`LW-HP(Ju!46R-RROWz2gZ2;m{y#nvOnzA#EM$4CCBVLi?8idGgg?zUjp$P0))oUfZMn6Y5C4ebltWW`9G z-`*b5Bt4nk!F17wlB%8JI!|M8{S{2wzoa8m*shp+^{fE8CRw3n9l;vbr5*DZnbphU z5A7N=XUulff-e@FPOjQEUOq>jEjvGd%trS0wDqPfFk^CT<;uV2OSTOrIltS$%#L}B z;+9FBPwQw%qiojZ?N|-vWY*QjNy}DagZOraG?|(H2RqD0U2tMk{7bZT_NTS~EZ=5d zqW!12d<)3(@)zvUhqc(-1L73dGKiqh(imLx#VL_*GM%*IwQ9e(+|TrV|GVbj`d8b7 z_MdCC2Bu-pUkPnmY)sk^-An^z4y|9M%g{HM3YZ#pyo;%7RB^Z)bndmrrI{}^iUOSrhZ{-Fk`Q;ug?3y;dK3Job_~aOxV7mYljZcwY+i-9xJ3 zpwKR}Qu2f)4{`$@grU&4*cP($Q)*a0y^Up9O(|1ZKlT&v4C%+(LNcP7zN}>T%u)~6 z%lQ{UqY?s#C!lLeZY(kDlS<@uSxlyrH_)Ikhtn-De5>@@w@-J{y$dWC?D|D7bbbim zrYZ4*@p8VWQ@7}q&dHOOy$?D4VMaLC&RIeeV3-{BUny^b_5@+bDB<>J5Pt(?2Kx3ZIg1Y0ERmV-vKx<+?}9;twoO*^nsp zcTnpWfA!v@Vf{m`swTNEF_CiD8Ut9F_uRUwSF7Mg*c#jCr<^w*);G!H`ASo7KvH?R zbp@FEYH77quDvDx?m1_99L_20`wy#;#UH#ck?GzKx)gr#P4BYy*ETKaA7sYAJrXk( z1esCc3C~<@dDwWD9aFuJmrk?yWmQ4RyN@saNh_c3lk=@V#ZQpeGreD|@Qo_W(_OVl zd$?vO>7$z&JYT;!+&9lo!`MAtmM86cU16Ry(J^kNesNj+L2F`OaL<>@Cqnh4^7ruD zKjlP49%0;oUAzP;6vlHdq{r*MIRzOtOi%sDmV-%NPE0k$^SKw&hlP3XI(`HP`L;_N zWWX$|1|tn~TyRAN^AB2SFw^}weBTwWk4+z!OUozCkO?HQe*}<`bf0`o(w66NW{uHy}H2m{Mxyr$H+FPO>Iqe^Y0~ zAIV~`8p9ktUFv>X+dfm|!Nse_=?zPhi<=S|#7SKp5btx9?W*WiwW}f)*sv+S1{P2d)|%E;s398-2w}$5P<~m-bLFgtWlgg#3)1_oD?#^` z-e;3ejQ%i`G%cw#%+ zclFqEH_-#foH+IbpZTj{?gA6bmfK`?tS_^!Y){${mx7dy^i38V`1&)ezny9GSr4Y< zGfg4f(82DZK838p6kDBMZ8X*D(yJ$!n08WmN_CinoYIMWQn||E4VX-6wOPy~{=n_O zW{xN|{;t~apuB9;{j$cTDLreNEatwdwosiz)w^UUvy==o_IPk$S@`{fjA<-<0}TwX z?a{6_{A%4*8g3g{5ywpzwdOu>efye{YNyyqyB1bsvAt;v(;kBF@~}NQX-4Vfk<-~+ zyR0#(b}d3Ul65}_kzRw-K_%#DK=PA5fW_YnNGAwMMLMAZS9g)>3%p+jUnwSqX^tU1 zavWpQNkVeG>fnHF=jSfw=UJd&wJ7ygWlm5GUhizF%&Ec{tou5TBXt<5U7g2}YDP-v zJj5roXVWOYtUZ+qxzN7YyarrcV%n%pKAiW?mvhp~pm6d=rjKvF3;|QRFIiMrDZMo!|5r;PQ#JL>zhDXF z@}`jd2rl2H#ad^fT$_suBAPDqRUPqRQtc4f{fm50hk>vqbtK1b3COk`gC{K88L8=c zPk57wiyi5y^2ST>2-x|BSFlqwoKNl+9}CDE#-xPQcZ-kk{Qu-5c>TzKW+O~-_CJ~V znO3Eq;gZ2G?(;e?ZwJ>l0~>&~z;oc6#J_3a?i64#xc(m3Ug~4ET}};(GqZhpIl0mx zxqG&=my_;3vwnP8+T#{E6aLbB>?giZ7>vj)_HCpla!B9ASm-`Ez7F`s$J}zgERCdb z1fvOlG1U3WWmpcYU+fBKa&gvn5=_;VfOHak1#63dcz94KY#8DhZo8CB9lYyOdS=I4 zq;j0ta|~7%tnrJjE`nb>D4+4rVw`kzhsyn85zo6kEcTUvlS19 zHGDW($k$&3XsMcrbyKZ|X~&ekoy%+Fq#i|B54=LFi#mvxp!9Pml+ z!tpMRpY6;xN~2!_W`BlRMIlo3Ga|0bkUxKnRI5R^0B=d>36!ftT5@b8XJZfi|qQsGV~nDJ~DQT(|md+V;>q-8PdEi_(g4=lqr(RpI+XyzZ2uPd@SAeEx6w5w9Z_8pR?p_V@U{-|{Jk z|L~iZp5fweBgcN|R^2nSs>fksN>*plFdw2cOfU7IVQi;QJm+OOsa9i9G}N{sRkaqc z7#A3BRDxfXaEqc@F-H9{H(ymxKHwc_(lB+^MwD3<(ASJEXNLE2UG%P<=?vpynWjp0 zPp!oxE_dsy?)E3GSHWNXv7J(GJ^Ev|e|KtvJ$=uwT~!xP4CLx$hnfQgn7SkikFtU5(hsh2Qh&3m$bXoyvI5 zwS=OhzK#^qr$SoKS$yKp-V62*OdlANsy20gV0!zCG6UQ&-K$NlqQa`OZp069;TT+* zO1|Qn0cw8WT6XeUfBF^WJ-O_@d*_thi&bNYU*BE7c;0nwG^O$U>(fzo%k|W$YdtNO z*Wyg9a?Ezg!IeDis&b#W%%cdV%}6ixgap$okbc}V<)-yK8a$3fEdlnWSTWmxgT#YTHttdc$BI3vQPIl17<8 zcYxc{D!dPT1pFIVi)Z(NN=F6hXyL=^{EqxkY$^kRJ4lZM9R+xhW?0Q?)VYq;n+AF> zpu)2_Kn=9ML#lMpL+{Xd)hoy}0JE|D42@^vg&hr@N9BB^hXUoma&$f&jTfM?uQ1r} zVCf#fa~1MEP;Va6Rvv%T5HZm$Eu6H34|CJaGTh{Dy_t<`sgpOi;>OzO7z*!E{pefT zk!w(9GoG&n{s~Bq=!2kzyGivF<|RcnHlfV@ppuwN3@kzVMLeqqs!u$B%qOZmrKYlR z$u(u=GDEDD3=i{7-Knu-oiZpM0;`CthC=Zg_{r|{KFQ8p%rW2S5Vye~%UGUK2C;bg z|CCjt>@z&jZ7|#l+%=*O@sWTeLK(rbPybamxbLEDrSrCUlTW!-Yz~2<4F#@)!yKHw z37UxfZ=llQumtHoz$N5!K^>sofMi@Nk-vH*Z zaVyf8wWz}aih8Lk704UoHOlHOf>v$b_bE1T-eoL_=!IjVmnX% zGqdaw|6SR4h(G%bU_`M|(aapb`xVU&aY-OlUsg5{PtGNI#peRI#cFpbthq{;Z~W9A zsT*iKV|R=9@il*Dnt#NEhT}?Ka=fI^66PTPGw5baav`1@kbfT{@CE3Hz=3 zzrT#pybd@{G#vAaZ=-$|>eqqZf>`~>`9!5cXQ)xL?PZj$KnVA?_@YyN%u#VlVF<(N zCj$k4MZvF~q)|9J0^Rl)-TZRJfm`BN-WZ+gz})g%;%DADI1&tDF0mzmV=x=S9O8cO zkf3pNh-z+gPF7#?;-dg*kULb(UTg!SCWK~6p1Pk!juHO4y%qKGL|wJ^otL9G1sUCsKh+jPxk_-2wAl;&*-*P9Q#a z0%h}fk1;mG8DRN~ic6>1SY|kwJB~l;=|jJ9!K0;ae$tb^=&0{n>IL(?hP3kz@tZ)U ziF8TT1~v#mNEwc_xNWlC5e298B(a8uD6&SP+${ItdnY{b07U3xUtHE}HY(h2cZeSc zE+Ph(;CG0pV0jd};b?=Gks-#W!EB%8BfWjbHlVzSsJz4(X&&GCF4_%jFiK_>8mdXF zVt2&l&OgKkT+K*_YM1p7(csqy)3>d-#&bICx5Y?))EiGv@lU+^sCHP|9Z-=5po9PE zadqWxay@)!690m`BjSMLuL7M9O4JU2qopvD&cV@<;7WCJN3yj1&`Eg znBstnJH)}laV70RyAwm`M;g_d9ZIc4ql69>t)XaPVHjPY*}}+hGE*<%qi~9&Z-gJh zX)Em)7DiA$9cXQcpa`P-h1VjNR?{s$=q1epron9h9qtyVcqO6e7GLvri`P7w z4JGf^T6&)vd}8q!1>2q4R@*Ip7OXYWJBOWypD@g8*dWu+d^d|3@a_O=S%u|Mv^Xv% zP^%4-i%y8UWRyfJ_cM6Kxsx;bz!M$su0_n?t7*}KBZ9yC1G zeUemioy-(dQo<5vRFAzSeAR=lWiIl{b?G>`_Q)wXpT%xs!Bi0g)dTU@r?2#zgONWi z{1Q#WVtcwS+PfjKKif5INJ+Q&x?qT*vC$8DNT)&zDqQxt#ROqh3=Jlua59Eor5IsW zEG1JT)= z$>D*=Iur3R!n8nDC-q~tg`F}?KMA#m39-FtBpnnc_onS}dS^g1`oc|v3R0`(xVUwT zKMP`S>N9_kQwfRRA|0Nj>t$^cn_TV|FZd>pyZePjKy3AdYi}TW`09!YS`B&&vGf-;yk z+!U=t1jVGT4il~>V$9{jNHxu;hlSVFbSB{_PInG*vx~tX+{E!0S8%2AH6~Z3R}En|#2WVy zCfok7@rKwXWT#Sc^k7ft63BoqCTQPZ6eg$Au&5($hd99>7F>uTVRtI!B;4a(V@ZU2 zF6TGIovsDibryO34JbuND#q}b5SK;`!;-+&EFce%xGzO;{{Gk_Et6?9z#DjG#QPDz zbRY(S(iA+OCtOXV0rYIEIvuBdI@mf)1M^1xg~eLBLM~yVj`Gq!4=f&2U#;I5UV*zx zTR{Klm_=j0tCp2R`*aR*im*=yZ8XP8oR^?{EBfhoG&#@ZuE)s zVWFg1z0ikgMhij)Bz#S?y3}Y*tTvdKMqML{hXY!s#H>CQX7-`fygr^< zt;V#lbR$bF$u6O?jTULj?|8@JSM90Q&t$13YExo~vh09GdUi-S(1-d&2;N%l2+cWm zL#z`nU=K_96dg(|EephqYp=Q?ngdchp9}d}^kM3w?yQotSs`t7FKI4Y9OAn!*6)_> zrr7AZDb@?o*`%ebLS8nlrvbvrY|5r>!li6%hM_`XUs@mLa=u}jHtUACO8BHN<%e}a z>)M~Y0l6mw#jDGmIp7vK#`$*yZzbfoXG^N?68|L(Fks_)UYKv7Od26?k02)F2 zgsuUkrbmU)T$K4jSdvTmlCr&?OW!9{IL}#(Y^7=3uEw$MpZS8bjJSl9?qnFg9 zd<#v9RRQ=<3o7O_+l&RK#936(CC(8>3`DQ@3iAiT&eRHL2f`^(2{#AQKB?ild>S){Rf?AuWU*G`burYtwUpWv`joOP_7?I1 zPixPi)SswB7+Fl}1R3ry?g@r6u8a5MifSuD3)jVS!VG?O9(;|Qq1En)cxTA`H2dsy&|pyWK&`#7IrxNqap`@rAaKh=wA zK90xv5vExZz!Yr4wOIW#g0X~V#-H-MId=hej4rX=^X9y2IDJlWqj0hW105~=P=Ynf z6MQ9LY=(O<+_`7af;x+7MD*|vq-FR3=pN)Fg~E~0>1)E=k+5ZTf_WsF=sDqwk>GZ$ z&^3~d#$~#qbR)ELQe=)qe^t$C)eZ5iaI}=vvG00{VAs0D2v<*S?uKh(lh9U*nf4S4 z%ivFU3X99Iyjz8JWi(51O$-Et&N6z4UKK`<0waDGo*jig5`+dRw^I0G6eUMMbOP7K zIFD1T6uL)IT>5+jp5=Wej?b^o4@SntQ_L~JH6C&D#nm_9CF)1hOl6h(hB!@FGa6QG zjc{Z%rn69J8;$)rK}a2gJ}wI*#-IpY|uYN(e;=q zm!-^EjB79ne~JbE>tY@7j_{$0x@10|@a8zuWGA}1#AE(H#Tvv6yTmEbaTVn34ID=a zg)z`(XLhN`-i2Klg%RXn+=#(nVD-Vg%!f!mJ?WfSQuxXQ7UV9^c>pG=}JXnO1R$ABa%3_(7Ho~FcBd>H=&(Q~a6 zrqT~G3KKGC&^Po(>z^~wAKekoJV=G9cGv8*yd%5iEa#$iP9^K7!X@cZ*L7T;Iz*cg zKMSS~qBjd0)3(;d5|O<5x`(KQ9u&TNi2B4igF#v?t1V|Q-4VM{l?zd`X$7{fO|z*m zqK`{fAH}8{e;0QNU*JJ(7p|XJ{}O9BT<%!y9WhmiodbK&BxKK_ywKBbRrBvSh0L8p z@u~lCZ?K0q|0(wJDh?&%OQSbz0`dcyRBfBUQ9j}|1nVTj_&bdEH>jh1$tkaY(Q+>y zggf(D625G>VQ&VT-T?YTeHRMKxn#(ZBHp|3=zeIn^m*S}q@|k;$yx7!6Fvk*O8_Yr zv{{%nm$uLot=HyKG`_TM^~|H#Fq+&N^%&hIW#LXzxmuM^;HVsx0kb3_OQOP(C+TdI z)M5-U3ayS3MpsjD?=)n8M#E8{0d%eaRW-Hltfrpfne*Z5KMX7bRsw5)4Zs$l4yXrq zw|?~;t%)`tK)M_^7Q`4kf%H-Z1=HW6(I0_}z;8e|AOgKnZZ9k%2zw1ws&^bz2HFY= zcaur?3Ggi0hsY~I&wz%4ehDg7{0=k>^x`futHP1Eh6fR#cR(XSZ-e5#n0Y{>LE8|i zjR94H#)8Iz#)0+*?FE_y8V{NYDh)6nGy!x7Xd>tc&~jh`Fb$XsgaeQ6He<#}ECbBI zT3{ov72rSvup8J9901+~4q|q1gPsAt1f-DhFQAtIDPAa*`5m|gH~}9ZL%`}f-rWKe zs2_@aB9LvyPXRCjr~sw_5__cxR}~;NE(w<;P}Rsk18fD}06qYI0ImaGAQEMI0Xm>R zAe{vN{(fi}(q(|u-dNCaz$Cyd6_7?h9aQR6dMOP+DmWMEMZi*^7B~oO1zrYT1&#tI zfpft3fK*4iACd%8Vy~2!qNkadv2^$M8_L`O{s7zn+e;xqR%=>qo9S6u*uyCJ6tJ>& z;#N4&iSr&Fyl}zXA#+*YprQHsLv!&Bz|)Uu1`cU`Z5s)cIqp3~WPx6Q^Ia$ea2nVT zYychu{vph*!`8e_SRs+aLIX(ZXLupUXDKkhxItxAtQx=T7)~~fT^4L8B4h6fH|i*f zQiL#$8bi=Uu!f3Bf>_S(!|y7#TB>osFp^Vo>@gIPq`nzclJdR67Ss&;73Sd*@SAX) z)66i5-_l}M2=P0xVSXiy+(A=Qe|d^jtJXr^>X<6_b*Ab#%2XSNB40)-I7>UI&uGaA z!~uzb1~35mKoJlnGF56Mnoxt;Bk*m(C{ndOkA(;hlCkW9y9)Y|pnZwr)HVz!4%3ka g|8FU+#D6nE`X{0CB^nU+2Of0+w_4Y|gc#ZX1Er^+`v3p{