From a4b201a2fac21a60932608103e527b1740ad00b1 Mon Sep 17 00:00:00 2001 From: Edward Firmo Date: Tue, 15 Aug 2023 20:48:46 +0200 Subject: [PATCH] Create Alarm page --- nspanel_blueprint.yaml | 77 ++++++++++---------- nspanel_esphome.yaml | 75 +++++++++++++++++++ nspanel_eu.HMI | Bin 21307134 -> 21307134 bytes nspanel_eu.tft | Bin 6338020 -> 6329316 bytes nspanel_eu_code/alarm.txt | 129 ++++++++++++--------------------- nspanel_us.HMI | Bin 21307134 -> 21307134 bytes nspanel_us.tft | Bin 7781124 -> 7772416 bytes nspanel_us_code/alarm.txt | 129 ++++++++++++--------------------- nspanel_us_land.HMI | Bin 21307134 -> 21307134 bytes nspanel_us_land.tft | Bin 6338040 -> 6329332 bytes nspanel_us_land_code/alarm.txt | 129 ++++++++++++--------------------- 11 files changed, 250 insertions(+), 289 deletions(-) diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 6ec11ac..97d9990 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -7682,34 +7682,38 @@ action: ## PAGE ALARM ## - alias: Alarm settings page conditions: '{{ nspanel_event.page == page.alarm }}' - sequence: &refresh_page_alarm - - variables: #https://github.com/home-assistant/core/blob/dev/homeassistant/components/alarm_control_panel/const.py - alarm: - state: '{{ states(nspanel_event.entity) | default("unavailable") }}' - friendly_name: '{{ state_attr(nspanel_event.entity, "friendly_name") }}' - supported_features: '{{ state_attr(nspanel_event.entity, "supported_features") | int(0) }}' - code_format: '{{ state_attr(nspanel_event.entity, "code_format") }}' - icon: > - {% set icon_attr = state_attr(nspanel_event.entity, "icon") | default("") %} - {{ - all_icons[icon_attr.split(":")[1]] | default(all_icons.shield) - if - icon_attr not in ["unavailable", "unknown", "", None] - and icon_attr is string - and icon_attr.split(":") | count > 0 - else all_icons.shield - }} - - condition: '{{ alarm.supported_features > 0 }}' - ### DEBUG - Service to set alarm page - - service: '{{ nextion.command.alarm_settings }}' - data: - page_icon: '{{ alarm.icon }}' - page_title: '{{ alarm.friendly_name }}' - state: '{{ alarm.supported_features }}' - supported_features: '{{ alarm.supported_features }}' - code_format: '{{ alarm.code_format }}' - entity: '{{ nspanel_event.entity }}' - continue_on_error: true + sequence: &refresh-page_alarm + - variables: + alarm_entity: !input alarm + - if: '{{ alarm_entity is string and alarm_entity is match "alarm_control_panel." }}' + then: + - variables: #https://github.com/home-assistant/core/blob/dev/homeassistant/components/alarm_control_panel/const.py + alarm: + state: '{{ states(alarm_entity) | default("unavailable") }}' + 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") }}' + icon: > + {% set icon_attr = state_attr(alarm_entity, "icon") | default("") %} + {{ + all_icons[icon_attr.split(":")[1]] | default(all_icons.shield) + if + icon_attr not in ["unavailable", "unknown", "", None] + and icon_attr is string + and icon_attr.split(":") | count > 0 + else all_icons.shield + }} + - condition: '{{ alarm.supported_features > 0 }}' + - service: '{{ nextion.command.alarm_settings }}' + data: + page_icon: '{{ alarm.icon }}' + page_title: '{{ alarm.friendly_name }}' + state: '{{ alarm.state }}' + supported_features: '{{ alarm.supported_features }}' + code_format: '{{ alarm.code_format }}' + entity: '{{ alarm_entity }}' + mui_alarm: '{{ dict.values(mui[language].alarm) | list }}' + continue_on_error: true ## PAGE CLIMATE ## - alias: Climate page @@ -8953,11 +8957,10 @@ action: - '{{ nspanel_event.page == page.fan }}' - '{{ trigger.entity_id is match "fan." }}' sequence: *refresh_page_fan - - alias: 'Alarm page' - conditions: - - '{{ nspanel_event.page == page.alarm }}' - - '{{ trigger.entity_id is match "alarm_control_panel." }}' - sequence: *refresh_page_alarm + #- alias: 'Alarm page' + # conditions: + # - '{{ nspanel_event.page == page.alarm }}' + # sequence: *refresh-page_alarm ##### UPDATE ENTITY PAGES ##### - alias: 'Update entity pages' @@ -9037,13 +9040,7 @@ action: id: alarm_state - '{{ trigger.event.data.new_state.state not in ["unavailable", "unknown", "", None] }}' - '{{ nspanel_event.page == page.alarm }}' - sequence: - - variables: - alarm_entity: '{{ trigger.event.data.entity_id }}' - supported_features: '{{ state_attr(alarm_entity, "supported_features") }}' - code_arm_required: '{{ state_attr(alarm_entity, "code_arm_required") }}' - - *climate-update_slider #DEBUG - - *climate-update_buttons #DEBUG + sequence: *refresh-page_alarm ########## TRIGGER - HOME PAGE ########### diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index e94f919..62ca6f2 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -511,6 +511,7 @@ api: supported_features: int code_format: string entity: string + mui_alarm: string[] #std::vector #std::map then: - if: condition: @@ -529,6 +530,80 @@ api: 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", "entity: %s", entity.c_str()); + ESP_LOGD("service.alarm_settings", "mui_alarm[1]: %s", mui_alarm[1].c_str()); + } + + - lambda: |- # Alarm page - Header + if (page_icon == "" or page_icon.empty()) + id(disp1).set_component_text_printf("icon_state", "%s", "\uE497"); //mdi:shield + else + id(disp1).set_component_text_printf("icon_state", "%s", page_icon.c_str()); + id(disp1).set_component_text_printf("page_label", "%s", page_title.c_str()); + - lambda: |- # Alarm page - Button's icons + id(disp1).set_component_text_printf("bt_home_icon", "\uE689"); //mdi:shield-home + id(disp1).set_component_text_printf("bt_away_icon", "\uE99C"); //mdi:shield-lock + id(disp1).set_component_text_printf("bt_night_icon", "\uF827"); //mdi:shield-moon + id(disp1).set_component_text_printf("bt_vacat_icon", "\uE6BA"); //mdi:shield-airplane + id(disp1).set_component_text_printf("bt_bypass_icon", "\uF19F"); //mdi:shield-edit + id(disp1).set_component_text_printf("bt_disarm_icon", "\uE99D"); //mdi:shield-off + + + # Supported features + # ARM_HOME = 1 + # ARM_AWAY = 2 + # ARM_NIGHT = 4 + # TRIGGER = 8 + # ARM_CUSTOM_BYPASS = 16 + # ARM_VACATION = 32 + + - lambda: |- # Alarm - Buttons + if (supported_features & 1) // Alarm - Button - Home + { + id(disp1).send_command_printf("bt_home_pic.pic=%i", (state=="armed_home") ? 133 : 132); + id(disp1).set_component_text_printf("bt_home_text", mui_alarm[0].c_str()); + id(disp1).set_component_background_color("bt_home_text", (state=="armed_home") ? 19818 : 52857); + id(disp1).set_component_background_color("bt_home_icon", (state=="armed_home") ? 19818 : 52857); + //id(disp1).set_component_font_color(btnicon.c_str(), btn_icon_font); + id(disp1).show_component("bt_home"); + } + if (supported_features & 2) // Alarm - Button - Away + { + id(disp1).send_command_printf("bt_away_pic.pic=%i", (state=="armed_away") ? 133 : 132); + id(disp1).set_component_text_printf("bt_away_text", mui_alarm[1].c_str()); + id(disp1).set_component_background_color("bt_away_text", (state=="armed_away") ? 19818 : 52857); + id(disp1).set_component_background_color("bt_away_icon", (state=="armed_away") ? 19818 : 52857); + id(disp1).show_component("bt_away"); + } + if (supported_features & 4) // Alarm - Button - Night + { + id(disp1).send_command_printf("bt_night_pic.pic=%i", (state=="armed_night") ? 133 : 132); + id(disp1).set_component_text_printf("bt_night_text", mui_alarm[2].c_str()); + id(disp1).set_component_background_color("bt_night_text", (state=="armed_night") ? 19818 : 52857); + id(disp1).set_component_background_color("bt_night_icon", (state=="armed_night") ? 19818 : 52857); + id(disp1).show_component("bt_night"); + } + if (supported_features & 32) // Alarm - Button - Vacation + { + id(disp1).send_command_printf("bt_vacat_pic.pic=%i", (state=="armed_vacation") ? 133 : 132); + id(disp1).set_component_text_printf("bt_vacat_text", mui_alarm[3].c_str()); + id(disp1).set_component_background_color("bt_vacat_text", (state=="armed_vacation") ? 19818 : 52857); + id(disp1).set_component_background_color("bt_vacat_icon", (state=="armed_vacation") ? 19818 : 52857); + id(disp1).show_component("bt_vacat"); + } + if (supported_features & 16) // Alarm - Button - Custom bypass + { + id(disp1).send_command_printf("bt_bypass_pic.pic=%i", (state=="armed_bypass") ? 133 : 132); + id(disp1).set_component_text_printf("bt_bypass_text", mui_alarm[4].c_str()); + id(disp1).set_component_background_color("bt_bypass_text", (state=="armed_bypass") ? 19818 : 52857); + id(disp1).set_component_background_color("bt_bypass_icon", (state=="armed_bypass") ? 19818 : 52857); + id(disp1).show_component("bt_bypass"); + } + if ( true ) // Alarm - Button - Disarm + { + id(disp1).send_command_printf("bt_disarm_pic.pic=%i", (state=="disarmed") ? 133 : 132); + id(disp1).set_component_text_printf("bt_disarm_text", mui_alarm[5].c_str()); + id(disp1).set_component_background_color("bt_disarm_text", (state=="disarmed") ? 19818 : 52857); + id(disp1).set_component_background_color("bt_disarm_icon", (state=="disarmed") ? 19818 : 52857); } ##### START - GLOBALS CONFIGURATION ##### diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index 499a38bc6691fb3ba1f52a022fcbba315b118bfd..4d48c1d08ee37719b4a8c354299a7ca3093c2936 100644 GIT binary patch delta 4161 zcmeH}eOy)b9mjv?g7*?A55m2GPh5nO0C@;jJPJxKZ9&*fmzg~25SxHBv{`4Fp z6XW4$wFTQ+4|5Al*Qu4M=q%e-=FFU#QerKIWNl7bD*Jrl*gddbd%gBwy;2|? ze&_ppxaa)t@5{A4&F7UB1GS=p{xxj`z6wc_3ZWcE+1 z@O7PWR#uw4Q{y+BNLEfHOTYwNfGZdS%-V@$OW470%Q`o7rzzcO5-SEi9CrX^Aw)SXYe$h&S&yjJcHlPXY=p#JNO(vm*2^M!0+OjJd5AW zv-v!J5C0*b&+p|6_(J|8eji`N@8^s81AGb3;ki7I=ko%-lrQ5y=7oGYFXAisgZw9a zB`@YByp*rvt9coB@HM=gujLiIl2`F{d_Aw`HN2MB@%r8J2QK68yF0m;_ErLR%~Y}E zRVAW!yTn+DnYIyQ7B|MWxD3b59*nu@vG8Qf4SDow^J2`$G#q#OFcz=p^kA!2>v3KH zV`e?SFpx2KJzg~d{jSFo85?h6wL>Fqn9Nw6-q|I1=*CdHHN@H8auZ{|`ozzMF(&Kz z;gQbv)F{R_>g`>zjQQ#L$Kx2|di$c=obAPlnE(2X&r=v%uO}6!JLB^i&Tm$DhcoWE zld&2-KR?SEch6(&l0Naf^PTaV3mF^G+q)Jq_9eym*|I$k=og4z%B5IrORCCx@%)-# zlUU*=`-qxjyC;dpN8e+L2iK z>EV8DZ!b1UR;@cuzS+>H^`g=$_Fd?S6oVhH_0vu#$ z+73Tt6X`Z}mgr1UY+9R_IzghxY7?b+5A^EUHkFM7O}TZ zv5LVON4tn#F55H=xca|_$-T?bERwlm6K9g}HoOAW;kRKNEO%gMi&$?_{YCe&Dzo4{-$j=aIVd^JhN?(&r)XI+8BDch`K(trY znng#Z>@8wK@i3#q)g6JcIDcr?p?z)~MteV8jgUk{)9|yfXdPvk^{f1$-@u6cSEj2` zl4KX#o~f`3@1=NpmS|N-6R5<}48y+=V;4~$hm{sr$e#*ZT%}DsQYgELRFCrJ;gxz- z$ydMXy|kz-Z}rO2y}u9#tZKE0@n2^X{eg0%@LVF>M9?z%LD63=PZB}fTWhq&bq(_+ zZAFOc?ITWgRg4v`m2yW*r>s8^nns)nQ09v4h3a^5WOGBO*y^rKrprd0gOaMPaO76rQp;i$biSD8w6zLW-d%WEzS>y`d;v^LG{nS3^MRPk7>dGdLs57=!dVnfPInfC979nkGZcl(w>pc0hp{MZ zH53JpbZ1de3`N1!P!#G7MPV@0Srn>K6i(}h|NSTm*W*MKg>Jn)5JllE#dIKFSBR3&(OU?+G1>;k*N@4$;d122J>!SBH<;8m~( zyax7yePBQ60tdiB@CR@Rybj&~hryfRkKj+>&)_ZaHaG&_0Y|}Kz%lSHI1b(eC%|99 zN$@^61wH_$!5PpEJ_H|uv!Dl@10RD=z~8{9;5@hhdO;uf3|s{L;P2pb@DK1$a0&bi zTm}Q+3-E97CAb2vf@@%~p)W|<3P>iB3(1uCEZB6i8PHAM!K04PKqE! zlBScQNYSJiQY`5fQXDCs^gYt8q}xadq(o8@DVdZ)N+r!8rIFG}GfA^Z8PeXqpxY&% G!T$hxPsmsR delta 3993 zcmeIyi+fY`83*v+FKH8~U<)**RG=wCXr<6FF2i0-5oLf<>V)k;UdWNJyJRbFB9V4g-b_GnLbsRpYo!WBAg(E+@B+xoQ{KuJ+i#` zsWTMclzR1POXQpEY>RKo%=Gq)n=p91Wm{6g*f`Z)yp@aULwWk4JP8)CLL9_{%{Y{2 z&usb523LpOde|+&0#=BFc(55^x7``~o;2WQWT~4b(6y9Hd6Z8DbRD^=kS5agG>LAY z8)-8Al%~*BnnpL#%`}~gXa*J2Ep#j0Mz_;UDxo{*PP&Wkrdc$b?x8s}mrChg`Welm zpVKdBKK+sw&_Y^7i)jhnM@wlLEvH}63R+1XDx>>p6?v(gDrhxT(i*BFAFZWzFKM4y zd(YlEYaBlj6Yx-EsyT1!BYa^gL@!(P`8jPDVv{vmmtP@-)vPP86ru+>}^P^R!scq@q|)=$6+pD~et@RhD5fYD0Qgs%qU^ zGt)Tyv0h+NNniM?1N+M2RPeCARW;tXEj!R&=TOBHHM<&Jxl+klN`9q}P+^BRTW(Yt z`5uQVEcGl_z9rf~wQpBVmEm%FZqbTf`}zl}(#cv?bJBp`a;8+> z?W>XlUQbV>*Ks`<9oCSQW|0mY+^ITGdQwzz*E*YWhxL3Tv0Zn`$aP)k`#WWg#pX1h6iOS}G%5j@w1sljZoLpkSab|ZK~-zimN zOM8j>V1;fTY&vymk?L{B{i$kchpsiWX7-lZ%A3=ctkUOdJ(R0*Wj(fb^oO_yb8GkH z>T8X{_iN5b)l#mf7|!w9Gto84{wia)Ct119=m|zqr|yjIp$g|}ikC4-g%4KPqSrhY zyQaByp(Evs)s}hqw>~|qoBx&yS^cT%=y~0495{!qYY5JgvP6xXq4hU#ba-q)vfA;b zzFXBkfQO0nI)VQVk z=yZ+whYwojdC;ir(*4r>DZAh2DXP256I3}1w3O(d(b!RwZ4^$`TxOF@H{Q1T3oM4~ zrzKk^{J}(4u4iV3pfoOa0dPfop2WZ1?S-3a31~x|AjB%0(=Gkga1PpT!iio9qDp2a9B939B~}+ z95xO+M-Psk90?p(aP;En&2c41B1aNOACA5p{Wy|292_Ye{W(%O25_WtT*WbvV-Uw+ zj>xS!xys-e!to=Hp&VCp4C5Hik;#$8aSg`^j%<#R9HTgLI9wc~IeyGBhGQ(pIF9ig nKjE0baVKr&=vW-?I}tN{Z=L8VOKU26+y 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 delta 20951 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 diff --git a/nspanel_eu_code/alarm.txt b/nspanel_eu_code/alarm.txt index a3f7116..cc39d72 100644 --- a/nspanel_eu_code/alarm.txt +++ b/nspanel_eu_code/alarm.txt @@ -25,6 +25,11 @@ Page alarm prints lastclick.txt,0 printh 00 printh FF FF FF + vis bt_home,0 + vis bt_away,0 + vis bt_night,0 + vis bt_vacat,0 + vis bt_bypass,0 } Touch Press Event @@ -99,19 +104,9 @@ Text bt_home_text Text : Home Max. Text Size : 10 -Text bt_home_bri - Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_away_text Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : disabled @@ -119,19 +114,9 @@ Text bt_away_text Text : Away Max. Text Size : 10 -Text bt_away_bri - Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_night_text Attributes - ID : 17 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -139,39 +124,19 @@ Text bt_night_text Text : Night Max. Text Size : 10 -Text bt_night_bri - Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_vacat_text Attributes - ID : 20 + ID : 17 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Vacaation + Text : Vacation Max. Text Size : 10 -Text bt_vacat_bri - Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_bypass_text Attributes - ID : 23 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled @@ -179,19 +144,9 @@ Text bt_bypass_text Text : Bypass Max. Text Size : 10 -Text bt_bypass_bri - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_disarm_text Attributes - ID : 26 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled @@ -199,19 +154,9 @@ Text bt_disarm_text Text : Disarm Max. Text Size : 10 -Text bt_disarm_bri - Attributes - ID : 27 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_home_icon Attributes - ID : 28 + ID : 22 Scope : local Dragging : 0 Send Component ID : disabled @@ -221,7 +166,7 @@ Text bt_home_icon Text bt_away_icon Attributes - ID : 29 + ID : 23 Scope : local Dragging : 0 Send Component ID : disabled @@ -231,7 +176,7 @@ Text bt_away_icon Text bt_night_icon Attributes - ID : 30 + ID : 24 Scope : local Dragging : 0 Send Component ID : disabled @@ -241,7 +186,7 @@ Text bt_night_icon Text bt_vacat_icon Attributes - ID : 31 + ID : 25 Scope : local Dragging : 0 Send Component ID : disabled @@ -251,7 +196,7 @@ Text bt_vacat_icon Text bt_bypass_icon Attributes - ID : 32 + ID : 26 Scope : local Dragging : 0 Send Component ID : disabled @@ -261,7 +206,7 @@ Text bt_bypass_icon Text bt_disarm_icon Attributes - ID : 33 + ID : 27 Scope : local Dragging : 0 Send Component ID : disabled @@ -285,35 +230,35 @@ Picture bt_home_pic Picture bt_away_pic Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_night_pic Attributes - ID : 16 + ID : 14 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_vacat_pic Attributes - ID : 19 + ID : 16 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_bypass_pic Attributes - ID : 22 + ID : 18 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_disarm_pic Attributes - ID : 25 + ID : 20 Scope : local Dragging : 0 Send Component ID: disabled @@ -346,12 +291,15 @@ Hotspot alarm_back Hotspot bt_home Attributes - ID : 34 + ID : 28 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_home_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"home\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 @@ -363,12 +311,15 @@ Hotspot bt_home Hotspot bt_away Attributes - ID : 35 + ID : 29 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_away_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"away\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 @@ -380,12 +331,15 @@ Hotspot bt_away Hotspot bt_night Attributes - ID : 36 + ID : 30 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_night_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"night\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 @@ -397,12 +351,15 @@ Hotspot bt_night Hotspot bt_vacat Attributes - ID : 37 + ID : 31 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_vacat_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"vacation\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 @@ -414,12 +371,15 @@ Hotspot bt_vacat Hotspot bt_bypass Attributes - ID : 38 + ID : 32 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_bypass_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"bypass\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 @@ -431,12 +391,15 @@ Hotspot bt_bypass Hotspot bt_disarm Attributes - ID : 39 + ID : 33 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_disarm_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"disarm\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 57bf742db52f7847b1c0a51a9fa9120ebd61de51..da984899851b3bbb57296111b14b88fb18408b88 100644 GIT binary patch delta 4125 zcmeH}ZCn*q9>>oN4;Mic`5`ttuR+Si(Eq|1=Z(q=vpy3xX8Dm#gda=DO+1%To#Zl0U3AzPv8Z-wSZ*Hm6v`X1-KZ=v64^b zF+7$};c+~kPvz5i0-w%j@I*e7&*DGf_wgkDQ=ZI!#_#8|`5gXp?%;FzFZeI{Jf6bm z^9T5Y{8xMdU&t5n#rz?j%F}o{&)}K-VZMa_nlI(ccozQ+e}w;*FX!1jhv)JYd?nB0 z`Fs^$&DZb(UdVsPi}+f;ju-P1zWzn!=`#Njm!I>aMKl@9W2m^%=!`6RQerH}+r40z z#fPy?9=F=nevEnOZPAA@AJoyGt1n}L@~w7VAY&8snr5uYb$UBJlre9;erXtEzIuDb z0GxNbJ&>_}GAnV9R2t6Mdi`XNA?^e2{@`Iof6WNSg7k@Zj$-Uly*?t!=#L+Z4@B>8 zurp@W>yM9TjO+aiCK>(NF_{1Mfva(ht<{UN6O8s(iN>8Rz0YVjCo@*8*JsQz+D&sA z`&OU$(|Jbw{RbGkuJ<=AVC)99@qMy`i}fF9zmi66p;Y9>ilgC0Ra09lMtQ_Lr6j>Dj^*EqjL& zCyUCy+#-%2DxM;?C7howj;`9^DQXX|2@o}{PDSLND~xnC`TI*D;_=;zMLTiTxlO_V z)1_4@qJBe_Rjb^sjJoqEQ}-%c+yjW5#U;Vwt^-Oht>s4N`SV;y7Ri#{-*(e!>p4nz zk*AowUwOhkN=->ch<3$O-AVJG*?%@goVw}kFKQ1d-kP69?Rk3IH><2Z^XUm?nsvY9?o5wqq+0N7)R>m z!fFv3riN-qT9h7_;Ho>3h|w3?wpumZOGJ-LbcB~x*Ot>;%iT`Tpj8o4s67bFPhZBV zxmlTGLA-tZ1ns~?H9~T&*+lhNCKm1aug&$e#?AEt^@-wSjM^d+1Dqjre-^DNRuxj1 z9Xk|F;r<59=V%3SYNRBJ>Z?KoZrGyL$D8Zj-$$4F2dAlHCCMg+w3P;n#uhw5M;k6` z0HrO>aO>+apCSg&!ey1rP`?!0AKMsAFS(bdCSsb-lOE2>OJBLX`$=u0d6>FZbTld< zA~#ZNg^d^KzX;tjptqg@&sdBMu$wYqf++*yOc^lSlmUt<1KRr=8Q^Kk zfIg-S=wr?Rn<)df*^CT$VW^P-_n0zZmMH@cM;aOM`4}SuQcW331 zQwI1Y7#UDz$^cJO1}LTs=$LI}z&d2WX??F>hzz*hjzI=A>HT5IfG?;`tLFPfjGfgF zoKB_o9Wo$n;E&txkK6A5ZQE^-yX~tDa@S4sO}Xo)_>SCt(|b$qx}R;4Mf(2cXUfX$ zDkuXRz(!CGD!^l46W9zY!Q)^Hcmh;`YET1y4+MA;JO!Qxe*jy-A3-f}foD2A&7I!5&Zt_JS9{KJX%V3A_w6@CtYp><0(HYv3R_1YQUA z;0@3K-UM%fx4}E$FnAZd2i^yN2Ooe&@F6$?j)ITCG4L_?1bhmPgMWa}zzOg<_$N3C zPJz?lU!Vz`0cXJ%pc$M4=RphjH~12K1ulS#;1XyBm%$bAHMk1C0sjHtf@|PAa2@;? zw1FGodvFu9gN}-FyHp8CGRcGFN%A6jlPn}3QZJG($&b{VPreB1(N!af=E_U zFe!x8pAyUeZL;B+_J33@Mg0g%n4MCru?yBPEcglV*?-rPs^tGo}1X{{t|l Bj?Mr8 delta 4008 zcmeIzdstL;8VB&-Z4*b+P-^4ZGM~ak^P*Olg)k==%;wC)>aGd3v7Yc|PCgox^+1 z@4V;C^PBdqE92ThE`M6)x^3^SU6JpeWov0_YI5&!$7GcYAwugNO`Fc^Y72jo{Aq92 z*xvT!Ydue__Ig9DtVt0+43 z>~Ew2HzR#>XebS%;dC*LppkS5jiOx2qf05D3TQN4Mq{XuE~g^8g2vJ~x{|IUAC0F! z(x2#Rnm`lj&oqgyp})|zbRA8mztZ(Ig{IOCR7^M0O>{H;ji%9bnn5$^7WzBQq7s@- zr8I};(mX1oTj@3`r}=a{Eue*T2l=UjDmQ9ts^d%QGRN?X9*TF}R~_4~_pfM`LUeWF zGye8R3$Y}sv!35Yh$yRG*iDES^zk2c7b3ydS+7bE;zFzEwL~HAuAC1StDcP6p1EEKzqQ!l;z-?avk<$i8@hXXq@Hn$5Utknq7orK zv+4nJga}%7_cE@Pws`Jv)snU#(R8-xy?d#UTbrQX)K+-RrTg^0HZ|L>RjHP;JMHSN zgStzN`&QRhA1mu0XpN7TUbSqW9<4Is7b`hFpy>rNPqjQe-zyiXjHgyrs@fq&syh3C z?l)bBYOa>5{=;&QO8-ueF}-biz3g18WO9Ya#KB*$Ri}JA{JG(FUg1eq`J?U(ti>Xk zsx>E=tzxgDnQGQBEYZzn_?unH@p6JxgEwkD&4&)@>pL$W$V#zEkE%bU$C_IX>**&4 zN?TxG^>VpO%{`(oQd8QN=Z0IXQB=afQjcohPfj(+Yq->uK9$*+DNoMx1lBd>%bBXg zZLG0|nlec9s!xMjv^nyq{-8CK&tW8~-9gP^`i|=vor}t3C6CW_$4;DDJay{4=_RvN z-9i7OxVem@dRpg*r!T2O(<;2yf(^&?RJH5GsYiL@2zgZ~$%r-I?>O}+i^m!sGqhRj zXHD7GV`ZXRXE&;pFXOIk6?#MKsaiTty)l({zR~}e!%4p>w`z82O*YwsA!er<(PoLm zsF#7pJq2>2`Z&qx*?F`o+Bo?v~0D_7CfQa#^Es!-hjtk z`>J-@zgzYM+XE^43-BZx8?+d+J>h>(mwnWD2ktxkN^bWUcqOM_U#6?NE&fD>rx#}) zNjm)sp-I7ZvnIz_ny4~MOZx>X-?7P<>cbrxEP^WYa0mUgJ-+dp$9A6CJb$m7=T2vH z$It?~Tbi3c(5Lq}vyy7Q@}J1eU@wsD(OM z4l7_Ktb)~`;2yXa*1&zR7Vd`!AOQ97AgqIj;9>X&tcOS7QFsgS~ZSWjC4==!r@DjWXufVJD8oUl~z?-lg{tItG z3+#Zm;T?Dv-h-X+K70Tl!bk8id;*`sF4zsNum^(h8GH_3z?bk9?1iu48`uZ?;Q)LK zZ4iR*;Cna-hu{Y|3_rq8a0HIRF*pt8*+#HD<9u6-@PmUyxWR4V$UL2_$X&k*d`f#LkWN@6taW=;} z9OrUma-7G}mm`a#A4h+VY>ojO133n94CV+AeLhzga9qf75yudYKX44?7{)Q2<6@2x b93wd{;TXk{%aO-%DM!9+uE{Bo^A7wB&bnL& diff --git a/nspanel_us.tft b/nspanel_us.tft index 96bbfb04286703b1c93ccca4e3b59e900c05b564..099eee23b95dd070994e109add3dae7fa4c0d7a0 100644 GIT binary patch delta 15562 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 delta 22018 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 EAD@q2Q2+n{ diff --git a/nspanel_us_code/alarm.txt b/nspanel_us_code/alarm.txt index a3f7116..cc39d72 100644 --- a/nspanel_us_code/alarm.txt +++ b/nspanel_us_code/alarm.txt @@ -25,6 +25,11 @@ Page alarm prints lastclick.txt,0 printh 00 printh FF FF FF + vis bt_home,0 + vis bt_away,0 + vis bt_night,0 + vis bt_vacat,0 + vis bt_bypass,0 } Touch Press Event @@ -99,19 +104,9 @@ Text bt_home_text Text : Home Max. Text Size : 10 -Text bt_home_bri - Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_away_text Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : disabled @@ -119,19 +114,9 @@ Text bt_away_text Text : Away Max. Text Size : 10 -Text bt_away_bri - Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_night_text Attributes - ID : 17 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -139,39 +124,19 @@ Text bt_night_text Text : Night Max. Text Size : 10 -Text bt_night_bri - Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_vacat_text Attributes - ID : 20 + ID : 17 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Vacaation + Text : Vacation Max. Text Size : 10 -Text bt_vacat_bri - Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_bypass_text Attributes - ID : 23 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled @@ -179,19 +144,9 @@ Text bt_bypass_text Text : Bypass Max. Text Size : 10 -Text bt_bypass_bri - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_disarm_text Attributes - ID : 26 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled @@ -199,19 +154,9 @@ Text bt_disarm_text Text : Disarm Max. Text Size : 10 -Text bt_disarm_bri - Attributes - ID : 27 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - Text bt_home_icon Attributes - ID : 28 + ID : 22 Scope : local Dragging : 0 Send Component ID : disabled @@ -221,7 +166,7 @@ Text bt_home_icon Text bt_away_icon Attributes - ID : 29 + ID : 23 Scope : local Dragging : 0 Send Component ID : disabled @@ -231,7 +176,7 @@ Text bt_away_icon Text bt_night_icon Attributes - ID : 30 + ID : 24 Scope : local Dragging : 0 Send Component ID : disabled @@ -241,7 +186,7 @@ Text bt_night_icon Text bt_vacat_icon Attributes - ID : 31 + ID : 25 Scope : local Dragging : 0 Send Component ID : disabled @@ -251,7 +196,7 @@ Text bt_vacat_icon Text bt_bypass_icon Attributes - ID : 32 + ID : 26 Scope : local Dragging : 0 Send Component ID : disabled @@ -261,7 +206,7 @@ Text bt_bypass_icon Text bt_disarm_icon Attributes - ID : 33 + ID : 27 Scope : local Dragging : 0 Send Component ID : disabled @@ -285,35 +230,35 @@ Picture bt_home_pic Picture bt_away_pic Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_night_pic Attributes - ID : 16 + ID : 14 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_vacat_pic Attributes - ID : 19 + ID : 16 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_bypass_pic Attributes - ID : 22 + ID : 18 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_disarm_pic Attributes - ID : 25 + ID : 20 Scope : local Dragging : 0 Send Component ID: disabled @@ -346,12 +291,15 @@ Hotspot alarm_back Hotspot bt_home Attributes - ID : 34 + ID : 28 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_home_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"home\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 @@ -363,12 +311,15 @@ Hotspot bt_home Hotspot bt_away Attributes - ID : 35 + ID : 29 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_away_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"away\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 @@ -380,12 +331,15 @@ Hotspot bt_away Hotspot bt_night Attributes - ID : 36 + ID : 30 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_night_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"night\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 @@ -397,12 +351,15 @@ Hotspot bt_night Hotspot bt_vacat Attributes - ID : 37 + ID : 31 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_vacat_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"vacation\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 @@ -414,12 +371,15 @@ Hotspot bt_vacat Hotspot bt_bypass Attributes - ID : 38 + ID : 32 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_bypass_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"bypass\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 @@ -431,12 +391,15 @@ Hotspot bt_bypass Hotspot bt_disarm Attributes - ID : 39 + ID : 33 Scope : local Dragging : 0 Send Component ID: disabled Events + Touch Press Event + bt_disarm_pic.pic=134 + Touch Release Event lastclick.txt="{\"domain\": \"alarm\", \"key\": \"disarm\", \"value\": \"click\", \"entity\": \""+home.entity.txt+"\"}" printh 92 diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index 0e07d5a92776a00fe950cf896f26fadb00982f94..c10d98f0954549526542f70cd333aefd01b90b87 100644 GIT binary patch delta 6373 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 YI3gp6#1ly%l1SuPs!pjGN&VLS-&hk7egFUf delta 5617 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 W{$ziO9}~6e6S!9TuUwb-;r{~U`N0_g delta 20771 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