From a27bc617a2ee3577d98b3ca65e291cf68ffc63dd Mon Sep 17 00:00:00 2001
From: Johannes <johannes+develop+github@braun-rheingau.de>
Date: Mon, 28 Mar 2022 17:31:57 +0200
Subject: [PATCH] implemented buttons #81 and triggered state

---
 HMI/code_gen/icons/icons.py                   |   3 +-
 HMI/icons.md                                  |   1 +
 HMI/nspanel.HMI                               | Bin 7418507 -> 7418507 bytes
 HMI/nspanel.tft                               | Bin 6289392 -> 6289552 bytes
 .../luibackend/controller.py                  |   4 +
 .../luibackend/icon_mapping.py                |   1 +
 .../luibackend/localization.py                | 150 +++++++++++++++++-
 apps/nspanel-lovelace-ui/luibackend/pages.py  |  29 ++--
 8 files changed, 172 insertions(+), 16 deletions(-)

diff --git a/HMI/code_gen/icons/icons.py b/HMI/code_gen/icons/icons.py
index 6ac0d416..9cec3704 100644
--- a/HMI/code_gen/icons/icons.py
+++ b/HMI/code_gen/icons/icons.py
@@ -44,7 +44,8 @@ icons = [
     "shield-off",
     "shield",
     "shield-lock",
-    "shield-airplane"
+    "shield-airplane",
+    "bell-ring"
 ]
 
 
diff --git a/HMI/icons.md b/HMI/icons.md
index 17c6fec5..9e6aacd3 100644
--- a/HMI/icons.md
+++ b/HMI/icons.md
@@ -47,3 +47,4 @@ ID | MD Icon Name | Icon
 40 | shield | ![shield](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield.svg)
 41 | shield-lock | ![shield-lock](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-lock.svg)
 42 | shield-airplane | ![shield-airplane](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-airplane.svg)
+43 | bell-ring | ![bell-ring](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/bell-ring.svg)
diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI
index 75b5b0de2698bf61b7c728d59ca3577b26c8cdd9..2ab2a5f65ed3c0ed07664c4a4e4d89b829e35668 100644
GIT binary patch
delta 2370
zcmeIyZA=q)90%~<^;$?BMz54sP*Fh8>8wvh5Kz#9PMxL7gHx}#^5E(Ng~TRm97EYm
z5rRCl;Xh6Eo$QS-*w9?Esf*RP`H*GFmZ*^oSt6S;8cd8a4$<#%N3J32J6{;R<db}_
z|KIPfz5D&!eD@OH3|vV&H;t=qPqOl)qaU)@a~uU*I4jTTsONj`B)4FRt=2;k$FNPH
zPBT7`U2LU4!mafCxjzlHM=$6?4uJx}I{sQbjp=GUWuhQDxE_zbLYH#28Szppk=iJq
z%g2dckqTo*)_VSpdc>tXlNTZiN6zulI<Jq)j*Jurt;Q04UX1=waEj5TPr4SG7tA!;
z`NHa_-}D&+eMSy+z=IwP5GC~)qm!Pz-@pFbiKm5On<2HJ|Eo^c<`A~TP0-6PfoRQm
zq9$I+e|6;xF<gjoE}=c@;jy0{HXLXD<6_NHmrK|i%|fS4#ew?{0Zb4JW{3j|SYZ;x
zLjp{ODKHfhVH!+_BuIu7m;tGf1~Xw6d<?T;4txT0!3OhSJ}iKRun6ps4vQfJGGPg1
zK{n*TQdkDLkO#|Q1vnrd3ScFyf=^*Jtbw)g8LR^*6oL!Z!v-h<`FWH;DQtw#VH0eI
zEz*65crV6~SUmLKRd&lIX4G5NhyJsHC{d?8^jpzHht(HQ{t;2XTH~0g<r#5A?P|@L
zNknOrmEPNnh@v?q|6|u`c4rbbs`dY8W9uk2^)!@2bX;vXx{T<a(n}4wL<4Gr*P&(S
zDlOaBYB`}$%T%Q0fl@7B->l^y%j8_I-0iz^ZQ<)}M1QL{7I$c)I8aSgjHe_YS-XjJ
z>X**(Yc-em5ap{i<Lb2RY|wH?02feuJEk^9oE(nGO>$;!4Lh?~ZoXiao^BB9cs*VQ
zN&8F1qRLKpx>@q9^o2M!_)D#Y9XTtmU~})dyQKr?#C|>Nj!U<&?lY!2tSv8gf++)k
zYvgy-R94yid;Lq3lT(?ez?~>LoxVN1a)mopi!H3{rrW}rE{m3tYcbca;sZASMs)|9
z{y2TMH1wO8$&a}-vpIeHr03Vg{bO&ctekiIUbAxOhG;Ud$9|J5FxV@C8_HlSd;uOP
zhYF~KD%b{Jf)}>K4%jIT_U@{9VJJE{Yv9?3v3@&aJv#ac80*pO!&r~zaKu=LBgZ-%
zG1lRCW~^VgV;FYKrdN*pn>${$4c^>=?I9SLJy4Uz2Dkg-11(-3)JQGf+TklN0p5VH
A3;+NC

delta 2348
zcmeIxZA?>F7zgm@^!Ao@vW%AUHj$U%*o&;-tQCccT9^~JS?yq*UONzQ3Zsy0ZZV8u
zn8~Hol9Fo9d|UQqFIh~~Ai0UIBV?NiVS(v~ElxHtd&B7mmyu-&8Sa1SP3{eG@$(W-
z@=KofInTMx>Hmg*`BDf2tL<mGjQaC41UBM7Teg+4)>wpP2sCnf;A8e7TTagQdNQmz
zr;Q>GA_fb4VULZXu})z$YxRPuo>O*;sS^YB<_1&2a2N-i_Y=jlEv}<XP(Q2d$b>}x
zWb}r{2Y$2s!77H-hU#-aO~w5*7C$T29X(>Q?+KC#U$gn%I7Q>*=p_zwpvU{>d$HO3
zYRnnQgWtyvSu@R-Zw5}!7Z=}g4aeH8E}?hnPw!4z<w+|869`}i5iH82H7WnEdslSV
zD>|5R&Nk;12mdS(B0O@+z9Y?I#-D?={sE$1AyJQhRB20QVa~j^K7Q@~RELsVZrhh6
zp8qs(H99{g-|*PL4yoXPG)RXG$b>9-2o^&&EP))zg*?cIhoJzL!Xr=!kHTZ{I6MK%
zpa`A>Clo^oEQhCH1-M`(xM3BP!fIFpWl#=J!&<0-b+8^bfCnm}3Z8+D@GNYCYS;|V
z!SnC}YymH9g>B%27oi4f;U)0H%dj1GC^tOP^<>e}IWs!UuXv?ZU0K?l$3>zX_2t02
znnV=R?!R#n(KT&PRf=90rV;gPdz4I~!o`W%A65`0u|)l|OW(7vl&DAB|4$j-v&5b*
znky$dsSO-oOLRRkO9v~6e$@t=J$miksMqezdY!#RuT4I^p03sFvF&<&E}+(3iKiXg
zr8f@jCYsV7T-U58@%L7uO5BpVoUap^v>#pa22n)YAAd{V!#ef4s#~u^G7ivYLrZ!L
zA3}z@SFL%pyJZcpsI)nhzqd)9f(0)I6&EY}Yb9SJ|K{7Bm-z7u(iJ}TRf~noW%d-_
z`<b*saUQmdO!00C9y0Ut>eO_8X3)NjN7to3$Rl4%`xW;WQjTC4nrd>V^8**9qQoRG
z@de-GXMC+`reh&~=}q@1iZ~*b3JcCsaMsM7A5eW+>bP^K?>osZ#y(hN=I__7tdVa`
zNU#$E@CwvHJ?w%8XoM!%4X?r;*bB|jqTHHzt>L!Vb~Al;=w6)vJI+69@eCN^JZ*?`
zks;1bL!2)d;(YsUJ;EMCoMl6tWn-LWL!9Ni#d)^LkjMW;h<S8xutYi0-8P+~L_+N|
QOwQ{FLYtD;(cYr`3oVkLb^rhX

diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft
index 16f6232ae7acd50284ce9ad7e6d64e2ab731b7b3..6d62bb8159bd8285b7c95c28921c2511d80f4173 100644
GIT binary patch
delta 4918
zcmeHJ4Rcdv7C!GyQc_7Y*w%g}K&wKb0WBi7SlU!vtTwF$YiVzidj}~qtLu*VHGTj>
z-NSdGjoW&_Q5k0#TcEbqg6Xnhmu1-nTwHNxXO>-CcRJ4QFpeM}RZ$1ydEYjT@h@!O
z$!*Sko^zga?sIS6+lybuw6;rplxl5P!)2TDt$&_#xU6H<cmDQ5-`5@0mdbO}&u*Lj
z>>G0{UxoJlIOC~s_<wI(A9+6XT6o3E@anpW&x8XL4oo;O;lP9g6Anx`@PF?>1`5>B
zf>yL)3Qj^hrs8!t86D`v>+uG3;S{_P(=Z(~@FvW}EX>9n%tbePa4Js2>6nN4cr)ID
zx8e+(i3K<dXJa9HaSqPK+wgWQ!g+WH&c{1(0p5khSb_`jZY;$`Scc{3!wS3y7vsJ7
z3tWQtVI|&=4`3Dgu^MaeL9E54xC|e{I(!)Gad~^gG0TOQ-{^Q!q*1MCux=b|*f`jD
zXi(q&vRFXB{Ehy&ZGpF_WFCdK=-o7{UN5J%_6B?8H0o)Z!wvxA@@#-b`T3FmY|@>A
zi_UM>9~TQE`WD@3Ny;G3D383oT^~xW9L10A{5c-k6V^Wy;vclsqZiVioQ5fpKmJy)
zwvcOOV~)@$Y&K>PzN#0G|Cvt%q~~fdkHpHx5Y^`E_K3DiuM&>yc+ymx^_j&_G_BfP
zwOi*Sz(<geP^4<N(P0xV8h+C-g)dUE$Jk)A&jM(-0u)3}?KN_RcG^lW{m#g=GL%Ej
z^#LzkTNk{6qV<8Lv~GQH5~VK>OmQ=NhL8A)#bQvt3g9$jO;oWwu-H~?19*n=I*l|@
zOrB2THY#lix+vIbY+zuh)5y%0DK3^+oe9u(E*5j-#=xNg6qB=Sj4opO%p`!@ua45!
zD|!*rs)3IhyNst<??XoT>%U#x=k=DLJ%gpylA1+=H5n+SqJ2i1DqNTd%V<R$El-3#
z3NxxktcYu|pp+}0EJr-DZ)}DVm8n!gU2h^Rly|U8_-SZAC;M5)O~d<*G;$m;vZ!e%
z`!WB3u_0SBULJDX2zLx7^OgGP!vk!Dq+7W8xDiY{6@86qr5mB5Zg$#FbGnV^Q~}EY
z=cwi20>OZvj&vKD9;x?P769M0aaxmljB9E@l_F31GoB)ClvoYry~8%jur?7cON4ca
zu%4RZxyut_HT5y7nl#2ca2q*hIX{k4xqyb_g$*iO^#e8CPeLl~F^&qPYdvfPa-D}n
zFB|ObWrGj?E99cOUN%@VNd|jH4MsZO%LYq&2M;iAFw@dtB+t8J^Z;LcY(3{};0KXu
zyP~V#HJ+pSpM+eg5|b7q4RMJ_DkfRXw6s{_+UST)T;`Nz(pQOZqKZBqy`6FL_ZfC|
zJ=;dX<4NF7dP`=GNU%Gexsg7W;4On=veHQ@TR`GH#_JfTK~5%=k)t;$3cklSM#<C9
zHb%K<D&_Tak-y)_Vt7@*(V8vcBoC*KdKe|=K{iR!NggsSJ&e*Krj_UbJ$aBH(kT7<
zAU~wCfUi99kaB@^FiO|Bz$57-2bq=*N?cRZsT6t2AGI8uBF&W8A85rPen@3_G!Y(4
zgvS%%U+GWr+!KlL2wh@SH8~aUz-?p`X{}T)puG3Tnw(VGsvqwH?A=d7TKm3nR2#9;
zn+F1!R<4^yd22#mVWXNgA(Ov))`S#(mBav7j&Mr4+C?>23e|M!H`!b%0Mq4mTqvQQ
z`hcMzL4EasG>>G{`G_yI9cS?7Dsd%5YcGb}B2OvM@r$7ycBZ}Kv{pIRr;?$3>T3;n
zMGAe|8Zh~*tSyk~X57z5e8oG+{IL$v-y8PzFTSQhkY566;Dk@_1o-Zs8l2?2HXTx6
z?%jOnQY}zv0hq!3->Uc(Gt~mC`Eu`oX&_zzc(KX?SGj%}EQHP+0r$LP0V}`LT3{wT
zW(Zig(h9Hh+qfTc;n7wBpP#V8^PK;8?pV<ymcU`&`A>3#VVDA+oZy5S8@N*eF2ii7
zb!+g!Ivcd`&~D*@nraRH{f!OI@(ZR!+zf-SXmGhE1)4T*jT(`yQM02c)dfeP2y%sw
zW?nG=B0iw=7tAZ<vziVX{K0UDbM)<(X2kKuW(^v*XuPGyVia6rW;wmW1wJnQmGHqA
zG<?yFWY=xg;IVC-xLpIIWi(k9_^I!bnJMb%)Fm_GTFcBUJ2YtCslldJ4XC!yOlP@W
z{PUUz1L72{rM}B7x0lJoZ5r$gYtX}^ODVac)O>~I_R{Vv=0{?Lmfpu_r>S{_&s-F)
m;j=UJ=vU@Pv}?f3lK*ym%}nJebCycJG5b?uvG0eBLq7sk?h<VP

delta 6072
zcmeH}>u(fg6vofY?m~erSE2M~OT{8ki(MD6P-*d6g_fd~)}hWwMe#xmm}*dwt#Y7p
zQCcay#b7Y;QczSPm?be9kq=@di24B&@me(`7z?O~esF!x?9MQQ-M_$|%$x4~&Uw#y
z=bWdLX+NFNPxU7B_6q&fpB=N-7X7&N;Ho>f-2L|tn<rPD-BJ^{=cmFi*H3!*h0^M+
zbf%k&!|feEzZ$%>et%}iqPsel)%Rch9q8{se+T+I(BFan4)k~6f8T-8tg+4k4swVG
z@IcPsK|Gj;aF{cBC=cV|Jc38^D87hC^BB(Jv7F60oXdHf&lht67xFkR;!AiuU&_Ti
zfiL5UJc%cB317~oJcX~|GLG<-9ObDzji>WfT+TCiCRgy)Jc}#2if8jRd@Wzc*Ygd0
zBUkfHd^6ACxm?4wJdf*mKHtK(ay{S13%H@P@xv|4wK1wrYYeVA-ni!Y?e82nHaw+8
z)V-^Xr5TZuvhqktv|Pp38@trR1xBT6?`+J7A7*2eu3{T-KdH?)g7ClEjHLr3CDWp*
z=y%nFpEQnCiN}phwZ}AuCigY1GqUtJ_T>fa-SMBFHNMv4pLQ5Mn%1J`=NpsNj-193
z@!riwO<-sup;IE!Ggi~+*XP%%*R~qPdLp6jS4NRqs*GH9V7^hVhIbjcfnPVhq-NI|
z<5gXekr98c%b26Jo!n+%EyQZVx+8vao4Glpg;i{aX=xSlZ+Dojp^V`~ok5~u@g=XA
zxmx}{{EiY)0!u8BND#`C@EldpuyC@zFR11=EHtMIg2!GLhVF;YF-cK*cQVCd^=-q#
zYqJYOL@n?;Rl>Q+DuwFZZgYxOs7`j9n_?1Gf(pyBh}usi5)w5;ClVgUZZ8j~coq23
zfkaoFOU7rWc-aMfXo^38{D~Nxt;zU|6t5ssf9*7v+eekB1h?({QCIIWr`Ttd^Wbvb
zWr!Cx9t+Rz@<=LoQ5s$h?k(fwnUIEG7NVHjeL0u2VInp-CcJV;@<4+D|M471PaS9+
z;^i5|ym{pQKO;)zPI7gq+bmLbwZ_iuC>+h+4SC6#M%CumG1I6z_&R1PQNEcXN@gnj
zbL@6!3NAAhz7gD=DY(p3c;o^uGZh~9&J^)7Q{e%P)MvZR<@O<bGewYyT!Mr<;thLv
z&sfhe!KHT+k3Z*o<cSv_F54uJ%tqKW8JepKI7AiVxC*N;J|hjUNW*7=%b~=)g)3bi
z^E;-(Ax|yl-7p*6G2xYXRmeey0lF#zcREp(CXeKBRfKpgD6LQj-!zY9*JDq!*Pox9
zM7`Sk7DQ98dftL)B+4fmM2TpGcVV|H8gLPf@MpkX(SVC+g!@DTE}{{>ABS>Z1mGeX
z;UD8gaC#3!BRA3}aNEKN645x^6^)1cL<26Zl6cACw!{-JK3r~o5sk0~KG9%<h(;WZ
zSgvS1+(^Tl(r^>p`(RFC%jF^(6mT53!6Drc^YTUDjtLjh$U%Lg0e3oaXPP{c!`C4Z
z4dn1PMAL#j&0hb-$w{=RFZMz-Eh?}NqLC<{Xb>f$5k45nT+x7wXoUMj11_Qw?h_5T
zh(@?iG~gl{;WP238SxH8BRA3}aNEKN645x^6^)1cL<26Zl6cACw!{-JK3r~o8IiC@
ze4@by5sf%jV7a34@W;~dm1+1YaPNaTg<~!k(V&3ico+`phM1Q>3GSG15se(wCmL|4
z6Rm0TNDg0zL^O~?+&q@wi9LON*a$C3e%N$|k{>pL<e1J;oo^uFU09CUA2y@${RDQA
z{b7^82S59&BD^qJWlyS#puVaI--qRxQ$={H%3=KMtBUY(Ql&(*i&#;BzG_I|Q7p%t
z8p2aGPT*%>HG~%>pX5a9Nd)y(MffjRjyY9?C#ygoqbM_n==e6Bn()tnJNjlSQPVM<
z4nbRmG=NHH5-rXMP<4Q)82(S@5UtD)&@!aCk_t$B6#H)u&^heCg=SE9jz%x<4p0!E
zI~!>N-EV5Ny*WtRGl=$5F5S0Dqq!diX+@A4=m<*Aep92o(IGm70^idJ`syPD)P^W;
z5YZW$M0I&Ol{^umjRT1Cw0x?q(W&Ck5Pga7%yR7#+WnkP^|b>i2tUp;y;N5R9&H?>
zO4nIq+syaOxcQ!CmSu+N11h6jt%90X>uPy}^|pGv*BYk1uQv2rzo{d;tg!m~Mk{kr
zn|$@}3cL~MSQJs8pR!h#eFs$Yv|zs#+TBGLVI^9as!-qo6!=cXPFwNp>UBDq>#=o%
zPB&~kzdfqvow2gCYPIBy6)#&1&tuQ%bl<Z&HE%i}RqspQg_mOlFT9Uwv6}ZAlD8ss
zYr9TsI&@lv4mc-kQ3byvd8?ZKyY;D#|EZ$~%rV+_RqzLHA%3|X{Gz?#!QewddB$tb
mTAlh~xO%KC)q56kkd_^{(~eskTyMvXJZG&4_P(^_`hNio@?LfT

diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py
index 80a5032c..82b2ed65 100644
--- a/apps/nspanel-lovelace-ui/luibackend/controller.py
+++ b/apps/nspanel-lovelace-ui/luibackend/controller.py
@@ -216,3 +216,7 @@ class LuiController(object):
             self._ha_api.get_entity(entity_id).call_service("set_temperature", temperature=temp)
         if button_type == "hvac_action":
             self._ha_api.get_entity(entity_id).call_service("set_hvac_mode", hvac_mode=value)
+            
+        # for alarm page
+        if button_type in ["disarm", "arm_home", "arm_away", "arm_night", "arm_vacation"]:
+            self._ha_api.get_entity(entity_id).call_service(f"alarm_{button_type}", code=value)
\ No newline at end of file
diff --git a/apps/nspanel-lovelace-ui/luibackend/icon_mapping.py b/apps/nspanel-lovelace-ui/luibackend/icon_mapping.py
index 5f3180ba..2078fe69 100644
--- a/apps/nspanel-lovelace-ui/luibackend/icon_mapping.py
+++ b/apps/nspanel-lovelace-ui/luibackend/icon_mapping.py
@@ -42,6 +42,7 @@ icons = {
     'shield': 40,
     'shield-lock': 41,
     'shield-airplane': 42,
+    'bell-ring': 43,
 }
 
 def get_icon_id(ma_name):
diff --git a/apps/nspanel-lovelace-ui/luibackend/localization.py b/apps/nspanel-lovelace-ui/luibackend/localization.py
index d8de8d54..cac1c3fe 100644
--- a/apps/nspanel-lovelace-ui/luibackend/localization.py
+++ b/apps/nspanel-lovelace-ui/luibackend/localization.py
@@ -7,6 +7,13 @@ translations = {
         'fan': "Waaier",
         'idle': "Onaktief",
         'off': "Af",
+        'arm_away': "Bewapen weg",
+        'arm_custom_bypass': "Pasgemaakte omseil",
+        'arm_home': "Bewapen Huis",
+        'arm_night': "Nag alarm",
+        'clear_code': "Maak skoon",
+        'code': "Kode",
+        'disarm': "Skakel Af",
     },
     'ca_ES': {
         'PRESS': "Prem",
@@ -17,6 +24,14 @@ translations = {
         'fan': "Ventilació",
         'idle': "Inactiu",
         'off': "OFF",
+        'arm_away': "Activar, fora",
+        'arm_custom_bypass': "Bypass personalitzat",
+        'arm_home': "Activar, a casa",
+        'arm_night': "Activar, nocturn",
+        'arm_vacation': "Activa en mode vacances",
+        'clear_code': "Borrar",
+        'code': "Codi",
+        'disarm': "Desactivar",
     },
     'cs_CZ': {
         'PRESS': "Stisknutí",
@@ -27,10 +42,21 @@ translations = {
         'fan': "Ventilátor",
         'idle': "Nečinný",
         'off': "Vypnuto",
+        'arm_away': "Aktivovat režim nepřítomnost",
+        'arm_custom_bypass': "Vlastní obejítí",
+        'arm_home': "Aktivovat režim domov",
+        'arm_night': "Aktivovat noční režim",
+        'arm_vacation': "Aktivovat režim dovolená",
+        'clear_code': "Zrušit",
+        'code': "Kód",
+        'disarm': "Odbezpečit",
     },
     'cy_GB': {
         'ACTIVATE': "Actifadu",
         'off': "I ffwrdd",
+        'arm_custom_bypass': "Ffordd osgoi personol",
+        'arm_night': "Larwm nos",
+        'code': "Cod dilysu dwy-ffactor",
     },
     'da_DK': {
         'PRESS': "Tryk",
@@ -41,6 +67,14 @@ translations = {
         'fan': "Blæser",
         'idle': "Inaktiv",
         'off': "Fra",
+        'arm_away': "Tilkobl ude",
+        'arm_custom_bypass': "Brugerdefineret bypass",
+        'arm_home': "Tilkobl hjemme",
+        'arm_night': "Tilkoblet nat",
+        'arm_vacation': "Tilkobl ferie",
+        'clear_code': "Ryd",
+        'code': "Kode",
+        'disarm': "Frakobl",
     },
     'de_DE': {
         'PRESS': "Drücken",
@@ -51,8 +85,14 @@ translations = {
         'fan': "Ventilator",
         'idle': "Leerlauf",
         'off': "Aus",
-    },
-    'en_GB': {
+        'arm_away': "Aktivieren - Unterwegs",
+        'arm_custom_bypass': "Benutzerdefinierter Bypass",
+        'arm_home': "Aktivieren - Zuhause",
+        'arm_night': "Aktivieren - Nacht",
+        'arm_vacation': "Aktiviere Urlaub",
+        'clear_code': "Löschen",
+        'code': "Code",
+        'disarm': "Deaktivieren",
     },
     'en_US': {
         'PRESS': "Press",
@@ -63,6 +103,14 @@ translations = {
         'fan': "Fan",
         'idle': "Idle",
         'off': "Off",
+        'arm_away': "Arm away",
+        'arm_custom_bypass': "Custom bypass",
+        'arm_home': "Arm home",
+        'arm_night': "Arm night",
+        'arm_vacation': "Arm vacation",
+        'clear_code': "Clear",
+        'code': "Code",
+        'disarm': "Disarm",
     },
     'es_ES': {
         'PRESS': "Pulsa",
@@ -73,6 +121,14 @@ translations = {
         'fan': "Ventilador",
         'idle': "Inactivo",
         'off': "Apagado",
+        'arm_away': "Armar ausente",
+        'arm_custom_bypass': "Bypass personalizada",
+        'arm_home': "Armar en casa",
+        'arm_night': "Armar noche",
+        'arm_vacation': "Armar por vacaciones",
+        'clear_code': "Limpiar",
+        'code': "Código",
+        'disarm': "Desarmar",
     },
     'et_EE': {
         'PRESS': "Vajuta nuppu",
@@ -83,10 +139,20 @@ translations = {
         'fan': "Ventilaator",
         'idle': "Ootel",
         'off': "Väljas",
+        'arm_away': "Valvesta eemal",
+        'arm_custom_bypass': "Eranditega",
+        'arm_home': "Valvesta kodus",
+        'arm_night': "Valvesta öine",
+        'arm_vacation': "Valvesta puhkuse režiimis",
+        'clear_code': "Puhasta",
+        'code': "Kood",
+        'disarm': "Valvest maha",
     },
     'eu_ES': {
         'ACTIVATE': "Aktibatu",
         'off': "Itzalita",
+        'clear_code': "Garbitu",
+        'code': "Kodea",
     },
     'fi_FI': {
         'PRESS': "Paina",
@@ -97,6 +163,14 @@ translations = {
         'fan': "Tuuletin",
         'idle': "Lepotilassa",
         'off': "Pois",
+        'arm_away': "Viritä (poissa)",
+        'arm_custom_bypass': "Mukautettu ohitus",
+        'arm_home': "Viritä (kotona)",
+        'arm_night': "Viritä yöksi",
+        'arm_vacation': "Aktivoi lomatila",
+        'clear_code': "Tyhjennä",
+        'code': "Koodi",
+        'disarm': "Poista hälytys",
     },
     'fr_FR': {
         'PRESS': "Appui",
@@ -107,6 +181,14 @@ translations = {
         'fan': "Ventilateur",
         'idle': "Inactif",
         'off': "Off",
+        'arm_away': "Armer (absent)",
+        'arm_custom_bypass': "Bypass personnalisé",
+        'arm_home': "Armer (présent)",
+        'arm_night': "Armer nuit",
+        'arm_vacation': "Armer vacances",
+        'clear_code': "Effacer",
+        'code': "Code",
+        'disarm': "Désarmer",
     },
     'fy_DE': {
         'off': "Út",
@@ -122,6 +204,13 @@ translations = {
         'fan': "Ventilator",
         'idle': "Neaktivan",
         'off': "Isključen",
+        'arm_away': "Aktiviran odsutno",
+        'arm_custom_bypass': "Prilagođena premosnica",
+        'arm_home': "Aktiviran doma",
+        'arm_night': "Aktiviran nočni",
+        'clear_code': "Vedro",
+        'code': "Kod",
+        'disarm': "Deaktiviraj",
     },
     'id_ID': {
         'PRESS': "Tekan",
@@ -132,6 +221,14 @@ translations = {
         'fan': "Kipas",
         'idle': "Diam",
         'off': "Mati",
+        'arm_away': "Aktifkan utk keluar",
+        'arm_custom_bypass': "Diaktifkan khusus",
+        'arm_home': "Aktifkan utk di rumah",
+        'arm_night': "Aktifkan utk malam",
+        'arm_vacation': "Aktifkan utk liburan",
+        'clear_code': "Hapus",
+        'code': "Kode",
+        'disarm': "Nonaktifkan",
     },
     'is_IS': {
         'PRESS': "Ýttu á",
@@ -141,6 +238,14 @@ translations = {
         'fan': "Vifta",
         'idle': "Aðgerðalaus",
         'off': "Slökkt",
+        'arm_away': "Vörður úti",
+        'arm_custom_bypass': "Sérsniðin hjáleið",
+        'arm_home': "Vörður heima",
+        'arm_night': "Vörður nótt",
+        'arm_vacation': "Vörður frí",
+        'clear_code': "Hreinsa",
+        'code': "Kóði",
+        'disarm': "Taka af verði",
     },
     'it_IT': {
         'PRESS': "Premi",
@@ -151,6 +256,14 @@ translations = {
         'fan': "Ventilatore",
         'idle': "Inattivo",
         'off': "Spento",
+        'arm_away': "Attiva fuori casa",
+        'arm_custom_bypass': "Bypass personalizzato",
+        'arm_home': "Attiva in casa",
+        'arm_night': "Attiva notte",
+        'arm_vacation': "Attiva in vacanza",
+        'clear_code': "Canc",
+        'code': "Codice",
+        'disarm': "Disattiva",
     },
     'nl_NL': {
         'PRESS': "Klik",
@@ -161,6 +274,14 @@ translations = {
         'fan': "Ventilator",
         'idle': "Inactief",
         'off': "Uit",
+        'arm_away': "Inschakelen voor vertrek",
+        'arm_custom_bypass': "Inschakelen met overbrugging",
+        'arm_home': "Inschakelen voor thuis",
+        'arm_night': "Inschakelen voor 's nachts",
+        'arm_vacation': "Inschakelen voor vakantie",
+        'clear_code': "Wis",
+        'code': "Code",
+        'disarm': "Uitschakelen",
     },
     'nn_NO': {
         'ACTIVATE': "Aktiver",
@@ -170,6 +291,14 @@ translations = {
         'fan': "Vifte",
         'idle': "Tomgang",
         'off': "Av",
+        'arm_away': "Bortemodus",
+        'arm_custom_bypass': "Tilpassa bypass",
+        'arm_home': "Heimemodus",
+        'arm_night': "Aktiver natt",
+        'arm_vacation': "Armert feriemodus",
+        'clear_code': "Slett alt",
+        'code': "Kode",
+        'disarm': "Skru av",
     },
     'pt_PT': {
         'PRESS': "Pressione",
@@ -180,6 +309,13 @@ translations = {
         'fan': "Ventoinha",
         'idle': "Em espera",
         'off': "Desligado",
+        'arm_away': "Armado ausente",
+        'arm_custom_bypass': "Desvio personalizado",
+        'arm_home': "Armado casa",
+        'arm_night': "Armado noite",
+        'clear_code': "Apagar",
+        'code': "Código",
+        'disarm': "Desarmar",
     },
     'sr_RS': {
         'PRESS': "Pritisnite taster",
@@ -195,6 +331,14 @@ translations = {
         'fan': "Fläkt",
         'idle': "Inaktiv",
         'off': "Av",
+        'arm_away': "Larma bortaläge",
+        'arm_custom_bypass': "Larm förbikopplat",
+        'arm_home': "Larma hemmaläge",
+        'arm_night': "Larma nattläge",
+        'arm_vacation': "Larma semesterläge",
+        'clear_code': "Rensa",
+        'code': "Kod",
+        'disarm': "Larma från",
     },
 }
 
@@ -202,4 +346,4 @@ def get_translation(locale, input):
     if locale in translations:
         return translations.get(locale).get(input, input)
     else:
-        return translations.get("en_US").get(input, input)
+        return translations.get("en_US").get(input, input)
\ No newline at end of file
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index f836a0e5..8bd605f3 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -264,26 +264,24 @@ class LuiPagesGen(object):
             if entity.state == "disarmed":
                 color = rgb_dec565([13,160,53])
                 icon = get_icon_id("shield-off")
-                if entity.attributes.get("code_arm_required", "false") == "false":
+                test = entity.attributes.get("code_arm_required", "false")
+                if not entity.attributes.get("code_arm_required", False):
                     numpad = "disable"
                 bits = entity.attributes.supported_features
                 if bits & 0b000001:
-                    supported_modes.append("ARM HOME")
+                    supported_modes.append("arm_home")
                 if bits & 0b000010:
-                    supported_modes.append("ARM AWAY")
+                    supported_modes.append("arm_away")
                 if bits & 0b000100:
-                    supported_modes.append("ARM NIGHT")
+                    supported_modes.append("arm_night")
                 if bits & 0b100000:
-                    supported_modes.append("ARM VACATION")
+                    supported_modes.append("arm_vacation")
             else:
-                supported_modes.append("DISARM")
+                supported_modes.append("disarm")
 
             if entity.state == "armed_home":
                 color = rgb_dec565([223,76,30])
                 icon = get_icon_id("shield-home")
-            if entity.state == "arming":
-                color = rgb_dec565([243,179,0])
-                icon = get_icon_id("shield")
             if entity.state == "armed_away":
                 color = rgb_dec565([223,76,30])
                 icon = get_icon_id("shield-lock")
@@ -294,15 +292,22 @@ class LuiPagesGen(object):
                 color = rgb_dec565([223,76,30])
                 icon = get_icon_id("shield-airplane")
 
+            if entity.state in ["arming", "pending"]:
+                color = rgb_dec565([243,179,0])
+                icon = get_icon_id("shield")
+            if entity.state == "triggered":
+                color = rgb_dec565([223,76,30])
+                icon = get_icon_id("bell-ring")
+
             # add padding to arm buttons
             arm_buttons = ""
             for b in supported_modes:
-                arm_buttons += f",{b},{b}"
+                arm_buttons += f",{get_translation(self._locale, b)},{b}"
             if len(supported_modes) < 4:
                 arm_buttons += ","*((4-len(supported_modes))*2)
-            command = f"entityUpd,{item}{arm_buttons},{icon},{color},0"
+            command = f"entityUpd,{item}{arm_buttons},{icon},{color},{numpad}"
         self._send_mqtt_msg(command)
-
+        
     def render_page(self, page, send_page_type=True):
         config    = page.data
         page_type = config["type"]