From 2edfeef0952d6d761a36aa1602c6d6591ef1c85b Mon Sep 17 00:00:00 2001 From: Edward Firmo Date: Tue, 22 Aug 2023 08:45:39 +0200 Subject: [PATCH] Support to `code_arm_required` Only shows the alarm PIN keyboard if a code is required for arming (or when disarming). --- nspanel_blueprint.yaml | 2 ++ nspanel_esphome.yaml | 6 +++++- nspanel_eu.HMI | Bin 21307134 -> 21307134 bytes nspanel_eu.tft | Bin 6364132 -> 6364872 bytes nspanel_eu_code/alarm.txt | 19 +++++++++++++------ nspanel_us.HMI | Bin 21307134 -> 21307134 bytes nspanel_us.tft | Bin 7807280 -> 7808020 bytes nspanel_us_code/alarm.txt | 19 +++++++++++++------ nspanel_us_land.HMI | Bin 21307134 -> 21307134 bytes nspanel_us_land.tft | Bin 6364148 -> 6364888 bytes nspanel_us_land_code/alarm.txt | 19 +++++++++++++------ 11 files changed, 46 insertions(+), 19 deletions(-) diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index b5d1257..0fd440f 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -7657,6 +7657,7 @@ action: friendly_name: '{{ state_attr(alarm_entity, "friendly_name") }}' supported_features: '{{ state_attr(alarm_entity, "supported_features") | int(0) }}' code_format: '{{ state_attr(alarm_entity, "code_format") }}' + code_arm_required: '{{ state_attr(alarm_entity, "code_arm_required") }}' - condition: '{{ alarm.supported_features > 0 }}' - service: '{{ nextion.command.alarm_settings }}' data: @@ -7664,6 +7665,7 @@ action: state: '{{ alarm.state }}' supported_features: '{{ alarm.supported_features }}' code_format: '{{ alarm.code_format if alarm.code_format else "none" }}' + code_arm_required: '{{ alarm.code_arm_required if alarm.code_arm_required else false }}' entity: '{{ alarm_entity }}' mui_alarm: '{{ dict.values(mui[language].alarm) | list }}' continue_on_error: true diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index b432b9d..925062a 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -530,6 +530,7 @@ api: state: string supported_features: int code_format: string + code_arm_required: bool entity: string mui_alarm: string[] #std::vector #std::map then: @@ -549,6 +550,7 @@ api: ESP_LOGD("service.alarm_settings", "state: %s", state.c_str()); ESP_LOGD("service.alarm_settings", "supported_features: %i", supported_features); ESP_LOGD("service.alarm_settings", "code_format: %s", code_format.c_str()); + ESP_LOGD("service.alarm_settings", "code_arm_required: %i", (code_arm_required) ? 1 : 0); ESP_LOGD("service.alarm_settings", "entity: %s", entity.c_str()); } @@ -558,6 +560,7 @@ api: id(update_alarm_icon)->execute("icon_state", state.c_str()); id(disp1).set_component_text_printf("page_label", "%s", page_title.c_str()); id(disp1).set_component_text_printf("code_format", "%s", code_format.c_str()); + if (code_arm_required) id(disp1).set_component_text_printf("code_arm_req", "1"); else id(disp1).set_component_text_printf("code_arm_req", "0"); id(disp1).set_component_text_printf("entity", "%s", entity.c_str()); // Alarm page - Button's icons @@ -1033,8 +1036,9 @@ text_sensor: else if (domain == "alarm") { std::string code_format = doc["code_format"]; + std::string code_arm_req = doc["code_arm_req"]; std::string title = doc["mui"]; - if (code_format=="number") + if (code_format=="number" and (key=="disarm" or code_arm_req=="1")) { id(disp1).send_command_printf("page keyb_num"); id(disp1).set_component_value("keyb_num.page_id", 23); //Calling from Alarm page diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index 75ea33d3bd4e5585343fe0a981c761866cc9f4a3..5cc418f57cd8d4ced83a125b3e02979622d8f235 100644 GIT binary patch delta 2300 zcmd7Rc~n$o7{~GF&cJ}U6)=LC2?R<)h@c4!Fd*cDrDz737`tMG2w`C^;P4pN+#Bnf zEoM7J8extVCYhzuhGnIh1=*&C+P+ZO?}6JH{4f6LH0ON2=jGwO@4dr4bne;Y(Fuxw zy<#ydMfNzekC9q-*wf9?3fVWBeH5jk#yoDIGTPo2=;hv?M?~l6nHqe9CK<6IJ6JX> z4o>oNiJW}8-ri*Kt!lJXH(C@hfDv546-a?>0xsr-T*9S% zJD2eyzJu@Na$d}L@e*Fj%Xm3ga3!zUX**%;zo@;>W_k5dc>Dg^G!HeTVvRynY{Jj@ zbhr_%HFmGnzC>g6b>je{W%@eWlgNZ?iR|3+&qG4r9R&>lE_=X!S+xh*5?u7&iRB0=e&6=(NcZS zglOk_U##=XSQBvnf4*5`647$~f|!ZU_3jj+L;8HhROdQn2GL=CJ|vCkh`v5Ii|ClX zJ~+p@-j+?|uK%@aa)|JMN8}21xms3uS-c~xpPD;GIiwDsZu4F{As!qRN<2IWkT z$EYo}jnXzu#{;EhsbhPY_UZm0$oR>3{68rHyCSO@E218jtQ!48|?KDZw=*bEQA z7I+XIf`{P|*b0xrHh2skhbQ1kcnY3|XP^dZ;aRAI=U_YRfajqeUVsMJ2`|DfaKLVO z30{U*pb_@KtFRZE;5FC>ufu+L1KxxKa1ahbGrR?F!#nUUyaz3C7~Y2u;0SyOAHm0P z6pq0sa2!5`6Yv>)4z17zU%*ND625}3;T!lCPQht71K&YAoP~369=?Yk;79lgeuiJ* zSNIKnhd-bL{)E4v6E3W7E>PBk#2_(BTqLd%lf+HpF6krjko1-Glk}GikPMVuBDqxJ zDe;ncOU#l%5+8}LWU%Bi$q>oqlA)3-B*P?r5`Rg6f<0Mg%Xi1F3B8ip6N#Z3|NrEI%GG3CT>}@VcR>ti5 E8$Q5*cK`qY delta 1625 zcmd7OiB}b69LDjPyKsvZEgVS7L?W|HTq5v##fw}t%L=tj%_y-V$|NmPTCL$J#>}m& zcWhPLr7Q_^S}@VDg*LTlRl`?%)IaKJ?A~szJ5t^JDHhvX2dd$ zc)pe9H(SE-30Byg9$##wnMVC8E3XT;c4ehxZJBBqW>eTO+De1l*DUhsThHn;+vwrr z-sZ4Tzb|W)zx%+P>=~tC1V-WvjKY~X z3!`y1&cV4T#u$vnIGl&`F&-CS0w!V-F2rP9gc4kgOE3kcn2Jkr87@Z|u0T1i#8sGv zt1%rFxCS#Y6W8K8RN{Kf!faIG2Hc37a5HYft(b$`aQj+&hd(fBR$G!cGTA9jbrZ8I z$GiJmmZm0pIw7wy-OdPht`*eAEqCWQJLJ{&b}|nvt|+Us5>=He-L^fIsfk{8q1V5k zGbqq;!Yk=(7j@2g#d%Kb!0UosyEfg;p6ukh6=UtW-k6Ebrf%-W>Z%dT2kefSmRmf{ z+3U`%aJJMmm)lfLpgZVJsv(Ew(p@xqYp9N%qk39P&(k{c=mmO_UZR(& zf!5P2w1FCFBWTy8ET#i#g{fD%-al#p_Wa;TE59Htzu9HAVkbWyr0M=3`uDM~lR zQc{&PlDQ#nD&QchHQD<>&^l#`WHl)lQTN8}h> u1}cM;)07UyaOA_=Mn6>c`^`OB;|=aP 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 Zmf8WdCfU7R`G~T6xOWE5yenwc{{aOUcAWqK delta 16144 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 diff --git a/nspanel_eu_code/alarm.txt b/nspanel_eu_code/alarm.txt index 2f43ecd..cb1f7b9 100644 --- a/nspanel_eu_code/alarm.txt +++ b/nspanel_eu_code/alarm.txt @@ -81,6 +81,13 @@ Variable (string) entity Text : Max. Text Size: 100 +Variable (string) code_arm_req + Attributes + ID : 32 + Scope : local + Text : + Max. Text Size: 1 + Text page_label Attributes ID : 1 @@ -305,7 +312,7 @@ Hotspot bt_home bt_home_icon.pco=0 Touch Release Event - lastclick.txt="{\"domain\": \"alarm\", \"key\": \"home\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_home_text.txt+"\", \"code_format\": \""+code_format.txt+"\"}" + lastclick.txt="{\"domain\": \"alarm\", \"key\": \"home\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_home_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -329,7 +336,7 @@ Hotspot bt_away bt_away_icon.pco=0 Touch Release Event - lastclick.txt="{\"domain\": \"alarm\", \"key\": \"away\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_away_text.txt+"\", \"code_format\": \""+code_format.txt+"\"}" + lastclick.txt="{\"domain\": \"alarm\", \"key\": \"away\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_away_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -353,7 +360,7 @@ Hotspot bt_night bt_night_icon.pco=0 Touch Release Event - lastclick.txt="{\"domain\": \"alarm\", \"key\": \"night\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_night_text.txt+"\", \"code_format\": \""+code_format.txt+"\"}" + lastclick.txt="{\"domain\": \"alarm\", \"key\": \"night\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_night_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -377,7 +384,7 @@ Hotspot bt_vacat bt_vacat_icon.pco=0 Touch Release Event - lastclick.txt="{\"domain\": \"alarm\", \"key\": \"vacation\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_vacat_text.txt+"\", \"code_format\": \""+code_format.txt+"\"}" + lastclick.txt="{\"domain\": \"alarm\", \"key\": \"vacation\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_vacat_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -401,7 +408,7 @@ Hotspot bt_bypass bt_bypass_icon.pco=0 Touch Release Event - lastclick.txt="{\"domain\": \"alarm\", \"key\": \"bypass\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_bypass_text.txt+"\", \"code_format\": \""+code_format.txt+"\"}" + lastclick.txt="{\"domain\": \"alarm\", \"key\": \"bypass\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_bypass_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -425,7 +432,7 @@ Hotspot bt_disarm bt_disarm_icon.pco=0 Touch Release Event - lastclick.txt="{\"domain\": \"alarm\", \"key\": \"disarm\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_disarm_text.txt+"\", \"code_format\": \""+code_format.txt+"\"}" + lastclick.txt="{\"domain\": \"alarm\", \"key\": \"disarm\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_disarm_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/nspanel_us.HMI b/nspanel_us.HMI index d9fad4477c60cc6f3fd0485d317f8a22e24cd26f..9be2027d0f3e9212a492efdc908f6e6220fd60da 100644 GIT binary patch delta 2368 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 delta 13345 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 delta 1689 zcmdVW`BxQX0LJl|yKoCDE4|mm474=K#3cf*UcCrtSQ%nbnwefJ!c5XcrJaUH8MD+v z@3gyQ8)ZqD(`MqfODn{9&l||XUfX@^3OMgMV=X}01^DgJSXIeHaO>7}EwbtAl z>}JHKmZs&89%ZzTokg<@ql00X+mowXgW;~z|FynqcH6p9R~X9dm}R7=&4~STmd{47 zW$c*3<6Faq(H!&dUc1DjZ;ds@meJkAwQXUeZgsDGuQ{;#K%XwAQRh#c)Ty!}QdJQ# z$wOZ9k)IOWib$Yh%m41el}*vArl?6C@{*7Il;Ac+11a_Ykqx|zIXQ|fgfSRH5W!Fk zLloHe*%*y;P=GNg#8{k*^H7BIaRJ6*JTAlpT!e|Z7?Us= zF-*ZFxD=P67?-02Q*i~R;Yv(LDXzi{%*550g)+>>9Lz;IuEDjq4%g!b+=!b{ft%M^ zjb7jQIn4>~$V599a^iE#ik#M6%R=#FJK)wQStw{M+dbPSR}|L< zzp?D7~$L-(G9_0J`ggddXmDje#z3D$7SKAFwai3_1nV?1RqCQhP^LLy1L|1e!# zQ&dOm=xJI{E!G;7v(smtCFO2Q;t`$)N{Z4$>8YHkoTT(pdMhU@ zeUwz?6s50ns?twMQ~E0dl!3}1FW;xjHc*G diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 9663d1e597861e00ab1ad654c2202b2d93b16289..79c5a998ce10ec78b49b65aa8be69163b458c201 100644 GIT binary patch delta 13939 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 Tp9<(a-O|_d-@&WfrX2o1s}dp> delta 16247 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