From 4cb8bbe72e00b959e04626b9e36282cc20d9393f Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Thu, 8 Jun 2023 14:42:54 +0200 Subject: [PATCH] Climate - Custom buttons - Long press (#864) * Climate - Custom buttons - Long press This add long press functionality to Custom buttons and also fix a bug on short press. I believe the new custom page is ready for get user's feedback with this. * Climate - Custom buttons - Long press * Climate - Custom buttons - Long press * Climate - Custom buttons - Long press --- nspanel_blueprint.yaml | 154 +++++++++++++------------ nspanel_eu.HMI | Bin 21307134 -> 21307134 bytes nspanel_eu.tft | Bin 6551632 -> 6551964 bytes nspanel_eu_code/weather02.txt | 26 ++--- nspanel_eu_code/weather03.txt | 26 ++--- nspanel_eu_code/weather04.txt | 26 ++--- nspanel_eu_code/weather05.txt | 26 ++--- nspanel_us.HMI | Bin 21307134 -> 21307134 bytes nspanel_us.tft | Bin 8060384 -> 8060716 bytes nspanel_us_code/weather02.txt | 208 +++++++++++++++++----------------- nspanel_us_code/weather03.txt | 208 +++++++++++++++++----------------- nspanel_us_code/weather04.txt | 208 +++++++++++++++++----------------- nspanel_us_code/weather05.txt | 208 +++++++++++++++++----------------- 13 files changed, 547 insertions(+), 543 deletions(-) diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index cb61018..f60f112 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -8305,88 +8305,92 @@ action: - alias: climate button press conditions: - '{{ nspanel_event.page == page.climate }}' - - '{{ "button" in nspanel_event.component }}' + - '{{ nspanel_event.component in ["button01", "button02", "button03", "button04", "button05", "button06", "button07"] }}' - '{{ nspanel_event.value == "release" }}' sequence: - - if: '{{ nspanel_event.component in ["button08", "button09"] }}' - then: # Custom buttons - - wait_template: > - {% set button_wait = states(nspanelevent) %} - {% set button_wait = button_wait | from_json if button_wait is string and button_wait not in ["unavailable", "unknown", "", None] else { "page": "unknown", "component": "unknown", "value": "unknown" } %} - {{ - button_wait.page == nspanel_event.page and - button_wait.component == nspanel_event.component and - button_wait.value == "release" - }} - timeout: - seconds: 1 - continue_on_timeout: true - - *climate-update_custom_buttons-variables + - *variables-settings_entity + - *variables-climate_entity + - condition: '{{ settings_entity_domain == "climate" }}' + - variables: + new_hvac_mode: > + {{ + page_climate.buttons.hvac_mode + | selectattr("component", "defined") + | selectattr("component", "eq", nspanel_event.component) + | map(attribute="mode") + | list + | first + }} + - condition: '{{ new_hvac_mode in hvac_modes and new_hvac_mode in ["off", "heat", "cool", "heat_cool", "auto", "dry", "fan_only"] }}' + - service: climate.set_hvac_mode + data: + hvac_mode: '{{ new_hvac_mode }}' + target: + entity_id: '{{ climate_entity }}' + continue_on_error: true + - *climate-update_buttons + + - alias: climate custom button press + conditions: + - '{{ nspanel_event.page == page.climate }}' + - '{{ nspanel_event.component in ["button08", "button09"] }}' + - '{{ nspanel_event.value == "press" }}' + sequence: + - wait_template: > + {% set button_wait = states(nspanelevent) %} + {% set button_wait = button_wait | from_json if button_wait is string and button_wait not in ["unavailable", "unknown", "", None] else { "page": "unknown", "component": "unknown", "value": "unknown" } %} + {{ + button_wait.page == nspanel_event.page and + button_wait.component == nspanel_event.component and + button_wait.value == "release" + }} + timeout: + seconds: 1 + continue_on_timeout: true + - *climate-update_custom_buttons-variables + - variables: + ##### Entity - Page Button - Toggle Entity ##### + button_wait: > + {{ + states(nspanelevent) + if nspanelevent is string and states(nspanelevent) not in ["unavailable", "unknown", "", None] + else { "page": "unknown", "component": "unknown", "value": "unknown" } + }} + last_click_button: '{{ climate_custom_buttons | selectattr("component", "defined") | selectattr("component", "eq", nspanel_event.component) | list }}' + - condition: '{{ last_click_button | count >= 0 and button_wait.page == nspanel_event.page }}' + - if: '{{ not wait.completed }}' + then: # Long press + - choose: + - conditions: '{{ button_wait.component == "button08" }}' + sequence: !input climate_button08_hold_custom_action + - conditions: '{{ button_wait.component == "button09" }}' + sequence: !input climate_button09_hold_custom_action + else: # Short press - variables: - ##### Entity - Page Button - Toggle Entity ##### - button_wait: > + last_click_button: '{{ last_click_button[0] }}' + entity_domain: > {{ - states(nspanelevent) - if nspanelevent is string and states(nspanelevent) not in ["unavailable", "unknown", "", None] - else { "page": "unknown", "component": "unknown", "value": "unknown" } + last_click_button.entity.split(".")[0] | default("unknown") + if + last_click_button.entity is string and + last_click_button.entity | length > 0 and + last_click_button.entity.split(".") | count > 0 + else "unknown" }} - last_click_button: '{{ climate_custom_buttons | selectattr("component", "defined") | selectattr("component", "eq", nspanel_event.component) | list }}' - - condition: '{{ last_click_button | count >= 0 and button_wait.page == nspanel_event.page }}' - - if: '{{ not wait.completed }}' - then: # Long press - - choose: - - conditions: '{{ button_wait.component == "button08" }}' - sequence: !input climate_button08_hold_custom_action - - conditions: '{{ button_wait.component == "button09" }}' - sequence: !input climate_button09_hold_custom_action - else: # Short press - - variables: - last_click_button: '{{ last_click_button[0] }}' - entity_domain: > - {{ - last_click_button.entity.split(".")[0] | default("unknown") - if - last_click_button.entity is string and - last_click_button.entity | length > 0 and - last_click_button.entity.split(".") | count > 0 - else "unknown" - }} - - condition: '{{ entity_domain not in ["unknown", "person", "binary_sensor", "sensor", "climate"] }}' - - service: >- - {% if entity_domain in ["light", "switch", "cover", "input_boolean", "automation", "fan"] %} - {{ entity_domain }}.toggle - {% elif entity_domain in ["button", "input_button"] %} - {{ entity_domain }}.press - {% elif entity_domain in ["scene", "script"] %} - {{ entity_domain }}.turn_on - {% else %} - homeassistant.update_entity - {% endif %} - data: - entity_id: '{{ last_click_button.entity }}' - continue_on_error: true - else: # Climate buttons - - *variables-settings_entity - - *variables-climate_entity - - condition: '{{ settings_entity_domain == "climate" }}' - - variables: - new_hvac_mode: > - {{ - page_climate.buttons.hvac_mode - | selectattr("component", "defined") - | selectattr("component", "eq", nspanel_event.component) - | map(attribute="mode") - | list - | first - }} - - condition: '{{ new_hvac_mode in hvac_modes and new_hvac_mode in ["off", "heat", "cool", "heat_cool", "auto", "dry", "fan_only"] }}' - - service: climate.set_hvac_mode + - condition: '{{ entity_domain not in ["unknown", "person", "binary_sensor", "sensor", "climate"] }}' + - service: >- + {% if entity_domain in ["light", "switch", "cover", "input_boolean", "automation", "fan"] %} + {{ entity_domain }}.toggle + {% elif entity_domain in ["button", "input_button"] %} + {{ entity_domain }}.press + {% elif entity_domain in ["scene", "script"] %} + {{ entity_domain }}.turn_on + {% else %} + homeassistant.update_entity + {% endif %} data: - hvac_mode: '{{ new_hvac_mode }}' - target: - entity_id: '{{ climate_entity }}' + entity_id: '{{ last_click_button.entity }}' continue_on_error: true - - *climate-update_buttons - alias: Button page - Button press conditions: diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index 957149b5a8d74e5846f552ce56f52229e27472f7..a93787a4c5da1ce8efaca2144624e5011c5cac62 100644 GIT binary patch delta 1641 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 delta 13543 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 O=WEMkn;+*aiT)oEKA&Fz diff --git a/nspanel_eu_code/weather02.txt b/nspanel_eu_code/weather02.txt index 5c39501..dfe10b4 100644 --- a/nspanel_eu_code/weather02.txt +++ b/nspanel_eu_code/weather02.txt @@ -65,7 +65,7 @@ Text date Text : Max. Text Size : 25 -Text value01 +Text temperature Attributes ID : 8 Scope : local @@ -75,7 +75,7 @@ Text value01 Text : Max. Text Size : 15 -Text value05 +Text value01 Attributes ID : 9 Scope : local @@ -85,7 +85,7 @@ Text value05 Text : Max. Text Size : 15 -Text value04 +Text value05 Attributes ID : 10 Scope : local @@ -95,7 +95,7 @@ Text value04 Text : Max. Text Size : 15 -Text value02 +Text value04 Attributes ID : 11 Scope : local @@ -105,7 +105,7 @@ Text value02 Text : Max. Text Size : 15 -Text value03 +Text value02 Attributes ID : 12 Scope : local @@ -115,7 +115,7 @@ Text value03 Text : Max. Text Size : 15 -Text value01_icon +Text value03 Attributes ID : 13 Scope : local @@ -123,9 +123,9 @@ Text value01_icon Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 15 -Text value02_icon +Text value01_icon Attributes ID : 14 Scope : local @@ -135,7 +135,7 @@ Text value02_icon Text : Max. Text Size : 10 -Text value03_icon +Text value02_icon Attributes ID : 15 Scope : local @@ -145,7 +145,7 @@ Text value03_icon Text : Max. Text Size : 10 -Text value04_icon +Text value03_icon Attributes ID : 16 Scope : local @@ -155,7 +155,7 @@ Text value04_icon Text : Max. Text Size : 10 -Text value05_icon +Text value04_icon Attributes ID : 17 Scope : local @@ -165,7 +165,7 @@ Text value05_icon Text : Max. Text Size : 10 -Text temperature +Text value05_icon Attributes ID : 18 Scope : local @@ -173,7 +173,7 @@ Text temperature Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 15 + Max. Text Size : 10 Picture weather_icon Attributes diff --git a/nspanel_eu_code/weather03.txt b/nspanel_eu_code/weather03.txt index 5ef9270..c05f616 100644 --- a/nspanel_eu_code/weather03.txt +++ b/nspanel_eu_code/weather03.txt @@ -65,7 +65,7 @@ Text date Text : Max. Text Size : 25 -Text value01 +Text temperature Attributes ID : 8 Scope : local @@ -75,7 +75,7 @@ Text value01 Text : Max. Text Size : 15 -Text value05 +Text value01 Attributes ID : 9 Scope : local @@ -85,7 +85,7 @@ Text value05 Text : Max. Text Size : 15 -Text value04 +Text value05 Attributes ID : 10 Scope : local @@ -95,7 +95,7 @@ Text value04 Text : Max. Text Size : 15 -Text value02 +Text value04 Attributes ID : 11 Scope : local @@ -105,7 +105,7 @@ Text value02 Text : Max. Text Size : 15 -Text value03 +Text value02 Attributes ID : 12 Scope : local @@ -115,7 +115,7 @@ Text value03 Text : Max. Text Size : 15 -Text value01_icon +Text value03 Attributes ID : 13 Scope : local @@ -123,9 +123,9 @@ Text value01_icon Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 15 -Text value02_icon +Text value01_icon Attributes ID : 14 Scope : local @@ -135,7 +135,7 @@ Text value02_icon Text : Max. Text Size : 10 -Text value03_icon +Text value02_icon Attributes ID : 15 Scope : local @@ -145,7 +145,7 @@ Text value03_icon Text : Max. Text Size : 10 -Text value04_icon +Text value03_icon Attributes ID : 16 Scope : local @@ -155,7 +155,7 @@ Text value04_icon Text : Max. Text Size : 10 -Text value05_icon +Text value04_icon Attributes ID : 17 Scope : local @@ -165,7 +165,7 @@ Text value05_icon Text : Max. Text Size : 10 -Text temperature +Text value05_icon Attributes ID : 18 Scope : local @@ -173,7 +173,7 @@ Text temperature Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 15 + Max. Text Size : 10 Picture weather_icon Attributes diff --git a/nspanel_eu_code/weather04.txt b/nspanel_eu_code/weather04.txt index ba3bcf6..1def451 100644 --- a/nspanel_eu_code/weather04.txt +++ b/nspanel_eu_code/weather04.txt @@ -65,7 +65,7 @@ Text date Text : Max. Text Size : 25 -Text value01 +Text temperature Attributes ID : 8 Scope : local @@ -75,7 +75,7 @@ Text value01 Text : Max. Text Size : 15 -Text value05 +Text value01 Attributes ID : 9 Scope : local @@ -85,7 +85,7 @@ Text value05 Text : Max. Text Size : 15 -Text value04 +Text value05 Attributes ID : 10 Scope : local @@ -95,7 +95,7 @@ Text value04 Text : Max. Text Size : 15 -Text value02 +Text value04 Attributes ID : 11 Scope : local @@ -105,7 +105,7 @@ Text value02 Text : Max. Text Size : 15 -Text value03 +Text value02 Attributes ID : 12 Scope : local @@ -115,7 +115,7 @@ Text value03 Text : Max. Text Size : 15 -Text value01_icon +Text value03 Attributes ID : 13 Scope : local @@ -123,9 +123,9 @@ Text value01_icon Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 15 -Text value02_icon +Text value01_icon Attributes ID : 14 Scope : local @@ -135,7 +135,7 @@ Text value02_icon Text : Max. Text Size : 10 -Text value03_icon +Text value02_icon Attributes ID : 15 Scope : local @@ -145,7 +145,7 @@ Text value03_icon Text : Max. Text Size : 10 -Text value04_icon +Text value03_icon Attributes ID : 16 Scope : local @@ -155,7 +155,7 @@ Text value04_icon Text : Max. Text Size : 10 -Text value05_icon +Text value04_icon Attributes ID : 17 Scope : local @@ -165,7 +165,7 @@ Text value05_icon Text : Max. Text Size : 10 -Text temperature +Text value05_icon Attributes ID : 18 Scope : local @@ -173,7 +173,7 @@ Text temperature Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 15 + Max. Text Size : 10 Picture weather_icon Attributes diff --git a/nspanel_eu_code/weather05.txt b/nspanel_eu_code/weather05.txt index 52c56c3..31fa499 100644 --- a/nspanel_eu_code/weather05.txt +++ b/nspanel_eu_code/weather05.txt @@ -65,7 +65,7 @@ Text date Text : Max. Text Size : 25 -Text value01 +Text temperature Attributes ID : 8 Scope : local @@ -75,7 +75,7 @@ Text value01 Text : Max. Text Size : 15 -Text value05 +Text value01 Attributes ID : 9 Scope : local @@ -85,7 +85,7 @@ Text value05 Text : Max. Text Size : 15 -Text value04 +Text value05 Attributes ID : 10 Scope : local @@ -95,7 +95,7 @@ Text value04 Text : Max. Text Size : 15 -Text value02 +Text value04 Attributes ID : 11 Scope : local @@ -105,7 +105,7 @@ Text value02 Text : Max. Text Size : 15 -Text value03 +Text value02 Attributes ID : 12 Scope : local @@ -115,7 +115,7 @@ Text value03 Text : Max. Text Size : 15 -Text value01_icon +Text value03 Attributes ID : 13 Scope : local @@ -123,9 +123,9 @@ Text value01_icon Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 15 -Text value02_icon +Text value01_icon Attributes ID : 14 Scope : local @@ -135,7 +135,7 @@ Text value02_icon Text : Max. Text Size : 10 -Text value03_icon +Text value02_icon Attributes ID : 15 Scope : local @@ -145,7 +145,7 @@ Text value03_icon Text : Max. Text Size : 10 -Text value04_icon +Text value03_icon Attributes ID : 16 Scope : local @@ -155,7 +155,7 @@ Text value04_icon Text : Max. Text Size : 10 -Text value05_icon +Text value04_icon Attributes ID : 17 Scope : local @@ -165,7 +165,7 @@ Text value05_icon Text : Max. Text Size : 10 -Text temperature +Text value05_icon Attributes ID : 18 Scope : local @@ -173,7 +173,7 @@ Text temperature Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 15 + Max. Text Size : 10 Picture weather_icon Attributes diff --git a/nspanel_us.HMI b/nspanel_us.HMI index a04a47b71b925e5ef99335e735ba898a687c78d4..c3130c6f42232fa7eec248607246af4fa03d910e 100644 GIT binary patch delta 1780 zcmdVYi(6B59LMpqjcrI^gcl-LNLm&aNm?ijm<&@(qkCx~k=-n`WfqZ_5I%Df5a>q7 zAY)y%dx&zfGAJ@Ai=;5K3o?gxuTx5tCHnayK2P-*cXQS)?7ypY^eP)d*W0|^iIHQn-Cm`$ zoZr_Enw9EQQ~#Q$a!eWGQwpQ`bFIDgyGNTNVw4F9uH0jP#^chhK_#<{8|n`w?hFfw z$lE)$IAHe#>;^KDi9*Os7A;`6#x{F(`ygNF@%ik#_$6+ESAsH#KBNb^#hXa$50Vgss1s7o|reQiR#wD16nYa{LxD1!$3S5b+ za5b*MwYUzmFdNt724rIna&RMZaTDg^X54~XaT{*OJlughk%#$MfV<$r-B^fwun70! zKIG$m6yO0Y#u6;WGCYVvEJqQF0l2XO9;`$O9zrR~P>zRDfl92x>W$uPx5en}+|*gF z&2@W+8mn%1vFp(*6=m_j_0^?{GT3l*zrRdfmgh>-=Ip3RGHTlv zX(cADuH4%(N_AuuS=6po1(9k~+dhlxY4q9+4z=!Z{xEG$E}D}9Z_DJ+SMG4QC)FCw>qOkbE<`F_pDJXn)1gsSbT}*e{XGS*Q{zy zuNL)>{XDHy{eJIwZA!Q=$E=1p162(@fwm}hyQjNQ%h}&uZBlFf1>v5Scpp{KBc#$A zdX%cEh90A}^f=X$pPry6=_z`eo}p)H9j&M5=y`g9UZj`kWqO5Pr8?R`^|X;TQ3Gl8 z8f~W6=?!|5w$NMDNKN!My+h6PE^VdvsD)bTefog5(TDUAwb944o!aRW`jk3o2Yp66 z>2umeU(lEI6@5*ew41spKzk@i-L#kX(KqxheMjHZ5A-AbL_gCnq|>kT8||k9)I+~h zFa1G((n0!*{-#6JM~6#W;tdrfF-lC55Q$l0kys_6l0lL%$qABhNrYsufIaP9+Bvvv~5+^xbGD5~rcDB|g)T Gbl?bxr{nJc delta 1898 zcmdVZ`&SfY9LMn;_5v(uE7=;Cf)usD5Xu5|6$CQLNbF)+(n6MHrV>_SX|3_4O(7v? z=`oU4$buvl!5B>l5)cg{%8KlU3!7b}8dJ+ksLvPrfs_3KI_JFJGds_7=6s(Yw!h9{ z?1zGb{!7yrFN>I!oTT~p8X26SDKO&4E|=CbNb{dnYgy*Ns-%|ctGvpCWOtNld}@xY zNzBt|B(+nosr1$IGhci!8R5_b_+zc==sHyIY>NM)= zx_d`wyDWB>MFJ1df)4axP+S(z;6_=scssl<%-OS5i(SRxR2)vl;Zz(>#o<&OPPKTN z8qbpr7)II~Nij5;rqEQf&@`G(u@px$D4r51k#3-wbR*58B)W-a)6JAjx6m9)p}BM` z-A1?59W;;bq`PQ7-A(t<0!pQO$x3OIPWRD5x}P4PMf4y&M2qQRT0)P|Qd&mKDT5xR zOj<#Y(c|<4t)whkMNiUGw3^n?)AS74Xe~WU*+i5>&yk&;r**WRaw(5qpbeBy1@t0q z+%2c(=(aabtW(xD_k>OmM-OG1MML{BgRs}j7BR0#F)K&v<@p|Bj$vJ(Gj_FyR4B5F z6|*?AUp9-hid?hk*oLPLyi+0NW_UTG=$@Ypq+cJGEABmV~Khy+g#6DXl}sN-iH9%Udg!SDZVG zZLH(mS<;SgOp?Tj9oRlFP}0u9f$)tbRe1S7V>qJ&J*1&?D4W~llo*jV#xY!2XS)-G zt+;!W$ZuE~u7u2Vm-yh{W)vBDD|ABbbB%L`EcBDQMC4i50+BYVr?KX=tKCm@*xfe8 zdeU8_70xZIeC;h^4k(0|K)@z=8H(T)*bK$+DmY;alt3xG23z5Ecmv9y9NvU&Pyuhj zcGv+sp%QjM6;#7+cpGX!fjzJn-hq8k3w7`=)I$Tj2m7HBnxGjDKnom%L-0PdLK}Pl z?eHOVz(?>g9EMNeQ}_%z;d3|wU%;2}6?_ffKo=YZ7j#1pxZztk2H(N=@B{n^$DtQ~ zf}i0RP~imp3Mb(doQB`vcQ^xoz@P9JoP|E zEN2{NJm*TzRh)qnh4a${&efa<&O}ZmCyH|o=UUDr&UKvYInkUL&ScIM&Qy+tGmSHy V6U&L?%;3ax5~TW;utX{P)Ia{LHJbnc diff --git a/nspanel_us.tft b/nspanel_us.tft index e227cd59c1a849fdc40ef952cd30d8103c20569e..46e6995f57970dc7f402b13ed30bab41da1ed32e 100644 GIT binary patch delta 15690 zcmeI2iDM1d`~ROaiF=cXAV?$#Vkto^Q8d)j#a2{RY3)?i(n@Gc=AyQ-MWms4VyQI} zYwSrxgxXr9A$CE;PLRY-komo5&gIJ|>0j_`_2i!Cb3pk4E#3(|INVv_cPEy6PltqXpUMD&7xT~C(T)N z(TZxWS~1N{E3TE$N^0&}DXp|tM)S}-wX&L*=B<^}%4-!gAFZNRNvo{+YE`tVS~ab@ z_MTQltEu^EwY1t=9nD{>tJTx$YYnsjt)ce5)<|otHPJrM0=1@EGwnmIxz<8!skPER z(mvKc(LU8$Yi+c)T05=1_L!@|oKG!;HUua#lFSV}PS6Vl%yY{vAjn+f!srAx& zYkjo7T0gD7HbDDU8>oG!4br~X25UpKq1rI*2kl2~__m-4^FXrB==xLEfBK3!@Et~BRr^S{NTu-W2Ka+)$xJrgCc7wm5y`ete}=$cSn#f zm#7u=NxbcB(5jM3t!we%u62}?*+z$2obouh%zUrlqO7|Fd&Eb024AeLlrGQ99|yMt zt{i{t6N7YZXA*AN8mPp`;KQ|*iK8T%@KbPQ#<(%@2}^?;IV;IA@wuymR~1pFZD3Ra z`CdkF87{guxSX*cJ!5)p4E9teY&8ad#=SNLdzd)h`>)`152fr8$-V!6&9`I(-}6xR zU5Q8kHJ-}wJlUc5)7KrG+(vxlubeK)9h!}(=&+-d!X=gjE#=H_f{IQn`{4+bktjc* z{EYGo$|#i4@nt^@X&5oSPYZ<_IubReQsmr(DEpd1RD`HK;#qBolB+nFac{&WyAy>E zkZ~~Ld4q`hESK?Q#9pI_{4-@dpZw|ALZW;hM~biz?Wf{2d_9q6xg$M8mlIT!tZ_7+ ze9{~#3_FlP4m2)-=*Dxz=x~`TllN(&C;5&Pj2%)$3F>;AD7tGAdW8P&!k=uV1r48E zgz8}fEfFWS67*{siy03`oHtxhc#Mn}BYtnOpd}wz&Gy5>m8Pv8C@A)bl{O*aX<;E{ zqoC$lR!YGRTo4uLv;Be&KC{vz?7(xxSI-M-)W^w;J(LO*{!mc#J{bof{-CHr9yOiK z_RfkI{n%8Ysp0XlsUaV&cbYJts4f$6<`}g!yN*%!ThbA>jpWl~R6mi=y_qR>S~<@r0ZpP_M?!1*}*>Ca-7=F;)@CXZ6QaGQ~in?bzQGlq-7Bu z|9xz9EW?k+sr!|`7jojS>J8@3!lo zJ5&#jn5ZsxtF=-l7=X_$D>-nI>Z823l6y>2<1Ej?zK>#$$*Ny5qps`0Gy#7#{_|Lf zCl8#g&b6$JA}YCx^U+6H8O45@8fWdeifG3w;?Kw0DtMKqKJrQ`T} zS|*9?qq=kJDe5H4eKhuo=F}<3bbl4+O;O{VBBP=57|i&d)R6MU-J!m(kZKS)3AAw0 z(YDPlKRZ$57U;4*hL=pk&=xU#cp7%%2H49O>_o1uLg~uFiM;Ud15t^L23;Q{IO375 z+3eubyllQ&mMhIrJ6Kw+Ci-bLkDQ@aw|%zG+)L`cYCe-yzZgn!m z(;8-me;9pQ@WD{kR`NK=O?xNf#9fme51ME-_dgd>jpxo(!(2|TAzHeY=*U|33sb8* z8?ml$5qnwGRZH;?Vd`R+itC8(qIj=o_gQLnrQ$jcoTbJoAH?#+CP5zT6t0#vf~?e# zEiOL`YWzzqQD!V>gkv6liDj4HFb`!m5>47jTyc@DLYdN3oARg%6%(DvXwdZz)QkI1 zQaxt}J96m=oY0-XH8yc<1aj=$$mtPkoJ;>rMDsVpEjIJQ+1Qc(n|SYR2*h&>k+y|@ zorAufTX^jpuw<}WTRFL}>Ql~@R*1e-nugMLVQ^i~rhNR>bzw|J8SZy3#GMcRjBuiloKD;JV&ibP`6YFJ!8_)6|BXFb|jC zRy0@M&OY;zYU?&`KOd=jZ^u+`XA9$!H0rt@E|!?Xm&@T@S)HpCPcSETexzDf6z8;s z>Q-LwuDU9H6F5B*n)nh%sOwdE_8FYU+6&YqXVoPB)WA@46)wF{4RZ_HVf4~<#^;BL z9J^5URf2YKVgmN#ULsM?ogBUh`*tsp6BpqOMeZbWOd=kiZL8qsPfnCVKJ=WbQRGez zO;opd2nT9xBn(WFiO1n{^e!Iy2d>pdNgVnI636c%Dxb`qQdJ+XCL#fPuR$%uC1G$~ zUrg)qcayy2<}Sf$?w(APl+6B1u_N7+xyMp9(d7l0u^qqN?6XYuwLUfDY!-)&=RPhR zxlA4CI&-h=v;&`9sWyzT{BjuKG!r|&xm+eJ$C;S2k7&_8&hS=!I4MeXEolHupgHlz zmKvJ0bUr5 zJTYKp4sy2`xSvti^%QXdqcaV`cyd&X8tL}cK{*+W&nbU#`_(ujUmWD2tJOHSU4Ids zL~;F_s8kC3uYnA9{l#6@sEJN{{~>yc!mbSOF{Z|vj8NAb+aI#IaKu`5pygC5#vkRp zwGdw#>blOiNgqePXCy-sv@1rpr=()AzT^y{}?9c;0r5tU2h)b%*6dFZd} z(|N=dsJQ$Fb+Jn4ZJTj}>teR0D92=uuq|qsr5o73jKfV3-V6q_6+;l43}_X~-1c0S z2Xr5wXRokJGUS?cnf;R0WJ}4bMAffyb~0wI2P1EF*@No`Tj7!<(e|5V48_yVl_b)r@%?l&OPelf6%q(9-PUtHtEf8w0i z18#kTr|!l4)Vsl3_Ns}lQ^2;M47`aU69!;N*goibB9N|+d*d*<`*14VZxM~V#o?#m zFc;!f*J1|H^+>TASL%9srIwAs5+iOuZZffGEPtDuAHddPZ}HFrIPsmac-8eRku7&T z>>zf${9Spp&G2~{g^&GaEcjAGT$S>7IjThlfuB9+thq7gY z1bO>UGDCmENL#R5X?3La35aWs-Sewc01d>y88n}sWV6iy6Eir6=u{5J9>%T?&f)aK zVD)o}{>bI|N8m_CUDtnwLyyM?@PRu_XtOnQD$QBZ*p++Sm-eNEC!Fx!%XF||2YgEoyR@SVeqFfh|l3uXid9Z0OF*7f@Qzdh6gY0`7CJe6Y?hd|i$?DQ28(zT7ba_QI^cAOGK#nf2 zIPU^-q<{tHOQ+pU>x7)$WMOb!@9ywDatxC>l77Ils!0Y;@4|c{C!LpMAko5nKAfQ@ zT7J;6Fw{Bp67ElfQP=e~Z>-iSQ|)Kn2w08;2W6@?m5n+t%*5uqkf3DZ;o&wPuiEq> z)}vLZ6ZIv7>-s&1SJ=GZ$~nee_A(B^QwY)oH@~9#IiSwNuBh8BmjF8`T>UC0+oA-H+u*+){4!nkqk9H7r&4HhQ6*KC(KHG6Q#;ua$KDmx@ zA2|wq_vDQ0826DQyWGII5=8`!E5ZkFV4P9c^{b8#G481xSNbN#od<7c;n}_?R%K#@qn^C@VHadCm;@dF1J^;Gj`E}3v zS?K8HB4{XzPf;G8g=}R|H_p}T@1M7fPREN1s_rT%-Bo7$;SRE;0_ytIH$9KtLC^4F zf-+I&x^eTnNEeE_t}lPnDd8?UwJk1aF-qqWGF`KKNcRbVt|z_ex$GW#I+hgF4aLQs z-LjDmUp~?4%$rWrv(YKpU66Yze1R_|)4Ap#T_T{aKX}tKI7f|e9);%!x?apul0_cw zDa~?W&F#Dlrt3rS>ERnOr_y1t15ftLl){u&VuA|fEsThiY$E4yyXjMtj*OfSY zvd!lmlQwt(leQ*+R;w(y;xXhvz@Ht%<|kDalmlu_!{&{k5TCYo@D()BS8xtGIUwM2 z$1(IEXu~R)>?pOuJ63Hp6k^rZxm5%yRR!-pfiwvC&IzO$P*so$8gmj90iQStdJeR8 zHNn4~0!6?(Pk}~N6I8M~s0%jvwqqL&|K`}%pz4CAVN~BU$c2Dso)VdiQGu6qvS5pd6Q7(b;3E)G!7bWjBRaXRQr&>=Mi>jp)@wa$b7RTER? zhx1p--0%PMZlj?P@3zkI6SNisj$S|-1pMLx(zwFZD7v$|Jk?E@Nf2QO-Ezf z+Bi=c$c2E9WT-o=>uU=-4Lb9ZTFtr|K>-KP0qj{vI=BM@UX%&Z&8Z_OzfM65H+W$d z-rZl&et&7}W6I8Xnv~Z(dn1xTOFDSRZ zwD3vwrGe5pWOz`|F&FX%qX zsz%b*ObcHE@V^%RO=Fx?ls-+Qg@1*50SkBkK+qr*??9Q&v~V|o0v4VcD5z3XK_{C^ z3qOpwfQ3(QCg=i6#D_ASY2g|`0So`6xuE$d?XgfbEW9P^1uQ(jg`h4i1zB3jbf$&p z0T!_ExK;*y*TQGCHW-A4&rWULv2Zj=3wLgddt6()g}*|lcP+eKJDI|6;myqOZ3`a- z64tH|3rB;r@LTBdReQUIBajxpxxJtYpV=+k2nw_C(VyY@H9DCVjzC)YUC=teW zg;{t)2bf4lyM-f=7Cy0~pvaB|E!^M*E&Lhicb)7OjzC)Y-cEw*er~sLBPh(m!#)=j zg-)i0Bajwu=`85y&V^XG(NLI$p9KHt3%i9QkQTn;3qd3r8R=yk=KusH@$=jo@D`{3#m0`^s+N2&9D{_zD*X zsA=H{q=h%@CTLAJyM-f=7H;j1sp?*cg&PfpS@?1AEDSI$9D%g(4qppO{JIbeHyZxc z!o9x{H2oX9g(EO6+;SJxqX%a-uvNF-LcM^4*XW^z@bvUbDA!@TXt{`$z{j>V-M@-adlr^_333 zw~uu2h`xee^_328)C+U)p8W(J>L(q%XFuuSb^7C$iQ+%NFf3ndP1FlG_>}>I>VJzR z*0<8tOb5>Z{9gxOFc9YyWyyEa!RMh~z`?r=!f#M0J-(OOOb71-P{6_61`FzkQhJDV za2M1IIQZW~1eG5u=-5!1&UEnofCU^}8-`mtO6U*L!6%?zz`>jUC}<8!>)|q;>EM9? z1swbdeysan2S40$HCDg9lYHyxW)ZqckmApyzAhjM#&U*2OnaFZ#(!( zkR786ad0$92QM>P(4^6J2S*?sJOi|Sh~2@BpfCrI3K6suolFNuARXLG#R^fiJGc=P z=HS=CyV&dwjzBtitWD4XTR{gmctHoRHU_gl#_r$ENx$3)(u~?%)WdgO{9u zA9W`b;^0QZzdHB@G(N&8)4>r)2k$l!tHX(Q2RDL$b?~Z_Fmsda4vs)N_ybVq$#w@v zART7cmJmbPYEcu|1= zweW+paZ=|9IxXEPVX$f=-}Jn=7-K7Cr``fQ2`mCukN*tNGHx8>3#p!XMAa z(;>zUjAc60!tVnXu<*^1f*ckIieDftd;{VF7CvmDpxr1xEt2U>3;!OVfQ46CY`}LH z;ZK$sOxHb@!wFI5hpUy8C(AhRM_Zz0_zJ8?S8(EREGdSfZdmv09|8OQhF`2Y2ie+M zHlwA|N?sCV^HVmj;KM<-IBTz!xcRPxuRO+2|1Q*oY70MlU-T!VLDvW4w>w=QE1x@` z47Sa+C{cpEqImcSBvGPx;Rqz@3HDQz;7i_W1-BdYJDzbiAWyMh^o-(3BW;P!JJG?| z`R82cXPYO7jj*{|<4tzx&3^9r$u`hs-74Af&MNl*+2(7FG2?4*I<5ZMHrNssjXO=W z(ZPdLHmI%+kL#I$Q9dQMQqmOpp$%Ib#%# zA~S|vM%!*UPhM>d`cSlzKP=P^v5ob5zE&pkS|=z0#W)D#KaJB;Lp&YOY~DOAKd#5E zZ9OkhvCsWcfA`)wc7q%lA%9&6GDG{lGuvhxW!V67W&;l$gY&n>Z2jQPAs=(Vv)o+3 zUa{P1EcQ2d1KY-8)_;%1Gr3rK!}SWlD?l0eS3>j>Mgx9$p;`F*n>=;eINMyeg`4DV zB;vF0W*#1C^K}4|N8r5$Uq`mE+jty-8|v>K!7p3o(ADw?2AkpQBlub!X;}eMd>i{L z!Va$3%Iz1~;w){q35wgs$rHiaZsV+pVE4iLZs+X9VE4DN_a9&jw+nKLGw#KBP`#ZK zCxd+)hX<^2oV*0=<2cS*0+r{2dB^kGrI@9=s2dNRU%%~FSf3=$ivd%1;oYlU#ytVo(=J{ZZi^GqTzNJwlTB-EWtHe%e0UA|wNJ)m zCUf%$^lP8YLnFYl!FuiH;p@P%lX>AfFy4)?`Fq%H4jAv|z&T(a?-8_R4>#Wc_VFGb zx&bT)tk0jE@jF<~9(I`vw&+hh3f{|Z8^IR+$$=Ze+U&)4_j2q!ur_-+eID3DumN~Y zU=!HGz3j3XZ0SBc-`&r@GT736yq0ZoZeRZ`RTF~G3WucNz@*^L9>PgDBn6j(`n!TF zcH|wwkr}=%xImDYBT{gIN2K5~!8)Z#!DSwif}4>d=xK@++>8_{xCZ|STK10=T!Vk4 z;Ld}!OO=8<|Bn>h^i<4SsuY}tdI7;50c?C!3hqd%6x{Hm_;z|!3U2sODLBt#f~Fjk zg7Z8k1-A#xKTQg5&oL>uA!&FnlqLl?Buxs=<+z|x$EDz0j!VJCf_a~if{Q&a1=r;S zexx}e1=r<-6x8B#C3|7tij1^eo6}N3RtJp zQgByJNx@A$jn&|3DY&VprQqtG!56DDQgC(8NWq;4YkyV>?)(`kxM^pxMmQ@4H|?wx zT);U&E6z#51)P(Dy9CxLT?+2fIVrfA>G(}1T?%eyx)faF^Z34YUJ9=9c`3NuOHwr@ zGO=vSl!613f(yQklWUAl&fE!qU-H?K-i+TaUjRL%K zLke!x4JkOUn^^JOl!EiRDFwF|tlljtxV<-};D+52bnccE+^}0xaHVex8h={~uJmmw zxb0w-v!vj*-=CJSGevZUa?$&!M51vcc46x^#UDY)f#1Qok01-JZ;6x^qGVdZzF z;6A-89qu-7KJeP%Zr_!Hn{^M9c~1&%);%e>`q^;wY$>?<*-~)nVC{0G;L@|D;HKsX zdYmH#H#J8Ju0bxoIOIyfHOQ5M%K+;$nL#1vmYr6kPpRn9EmEaP?nF z!DWCsux*OC_C|oxR6an{)0_`UhN&!6@3W|VVgn~LM3I!|3unH6b*NO&R z4O-ek;iX}q2>3`CXa@&{5QdI>t7K@spewrwxoy10VVh!xbFsKdWz<9^ny4zJCI8Wn$q zM)+esCfX{L3#JP+1aDlPB?nlZ*D(>N8Ac3!`pK3UFQ;7KC8=}a*^heKihJV zW^!GHa_cIbvlwYEP&@MtGEXsxj0RmVCu-qM7vtw?^L<(EzAe(#zn(%pP>R)8h&wOA zn@Pm}^62lxWC2Ys?pmN#Ixhd4b+sOx&4H=U+G#5%WgfI@=;IQt>? zt8)N*Ke8pdYy-3XVOf`pypa=NeCK16?PACZK%Z7za@z4F|FQDGp+s+4<3% z&6IeC{c~@EOS}n>dWJ2yH{lh}Y>BQvfvrXP`U8v){vG4TKDW6#1_5!OHEMg~ebvn8 zwg_h>(Aa!y#e9ROitz?dn8gD2Lm>OVKtf9(_jrL_UJX{JDSN!M`MDT%UAHNr3fC*C cdKm9U4}59cuMBC*ey?m>EV|xcT1Sun2SIJiNB{r; delta 14930 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