From 98a1ce3f19e88018c0735871c43b1c93f18f8f18 Mon Sep 17 00:00:00 2001
From: Johannes Braun <johannes@braun-rheingau.de>
Date: Wed, 21 Dec 2022 07:05:36 +0100
Subject: [PATCH] change timer from button to text

---
 HMI/code_gen/pages/cardEntitiesSerial.py     |   4 ++--
 HMI/nspanel.HMI                              | Bin 9115979 -> 9115979 bytes
 HMI/nspanel.tft                              | Bin 8038260 -> 8038260 bytes
 apps/nspanel-lovelace-ui/luibackend/pages.py |   6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HMI/code_gen/pages/cardEntitiesSerial.py b/HMI/code_gen/pages/cardEntitiesSerial.py
index f5019910..17d62809 100644
--- a/HMI/code_gen/pages/cardEntitiesSerial.py
+++ b/HMI/code_gen/pages/cardEntitiesSerial.py
@@ -110,7 +110,7 @@ for i in range(1,5):
                 covx tTmp.txt,sys0,0,0
                 btOnOff{i}.val=sys0
               }}
-              if(type{i}.txt=="text")
+              if(type{i}.txt=="text"||type{i}.txt=="timer")
               {{
                 vis bUp{i},0
                 vis bStop{i},0
@@ -125,7 +125,7 @@ for i in range(1,5):
                 // get Text (optional Value)
                 spstr strCommand.txt,bText{i}.txt,"~",{idxstart+5}
               }}
-              if(type{i}.txt=="button"||type{i}.txt=="input_sel"||type{i}.txt=="timer")
+              if(type{i}.txt=="button"||type{i}.txt=="input_sel")
               {{
                 vis bUp{i},0
                 vis bStop{i},0
diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI
index 306c8c4d0491a53ab5f7cf1371580f1f77aa8ac0..ee6c2f5e3ee33afc0a32af0a565843f03fe15275 100644
GIT binary patch
delta 829
zcmd6h*-KPm7>CcXGb!jW<~CZHlWA7gXq)3!YK!gJK4ptm+G1l)HI>@fHjgu&LtrpD
zUz;gWS9K9B9J(kkif$z6rYMN0tBIhHF3QV3%b-7@4<0^V_`T2X9lU>68<gC;uBl46
zSF@{X_>tyTo5NO%T~!|BS}Ml6ik#lv%0JI+?^H_msEYEeTTz~zw+vl*9rJsZnW6VV
zMU%h!ygPg?{*#n;B#cOV63Vo<Z#I4lUr(49h_i;`tg0kNGDf0FERwNioHh2+&;RC>
z;qN3ejwF&vA(b@jq?5sTCNPmqCXt1M$z(Hy9CDdT9@Ci44Dy-DESwZj$ZX~?mwC*m
z2p7eaP)Zr)EMOrOR8qwv7PEw<RI`lbtY9UpSj`&NQo}mdvw@9lVl!KCvz2YsvYj35
zWEXYRvztBarGZBFv7ZARq=`d#Xy!02csasRj^X1tCpbwfZM1U=KOLOr3}-pVc>?gT
z(`?sz+On^i-L+k=UezV4zSvVEk3#XHaI;~F_4|Eo-p1MDhD|RQ1wXnPME&JJr8zL%
z6|0&yx8YA7T@jTx1M!-#vDGIcHvO~cZ!xkXF}g!Mbp~GunamJgo1Q0X+(v=;*ks%?
z`<e|;(%-@<dZNhB)uY1EX=ICxGls*gK4&aV`D^#q1mi_tv2GCqr83ojRi-Yur2cV<
z{zo6tjX2R?s%MQ>^o&$oHlkMZ-sy>VETX>1{w{KHa+-KGJw4U*c!L)_VTV-{AChuB
nW<^=xt3^~Mr&~qh%d~v6t}1YQOvo7xN<xw@iEcWhM&_JfuSY5A

delta 1944
zcmd6l>rWI{7{<@Q?y`p4s?5%UtL%<YiU_PqVdW}_7HbuxSgHjUydk<Oq9Rfe-F*~x
zOTiZPwNVmdQj>}%XltfvYSpxfX-uPS)6{-x^+RiK8ly=yv9~k3LkF#YKu_|{{LXux
z_i`>*&Ym({;Wl#AAZ!>MGDrd&JZGro-&mt02=ApDOH6spoz>dJ^r3X_W!3L8CY;}4
zWb|2t%IZ-6<5KpqUq9e$A9f5LiM}c14tB+;Ne{*p7!K!catt1g$?=<Gd(5!{w+L>L
z+zi}|+)Ro&HtN8G|4l0o@4<rcn1G2$fCwuj*pP@MOoAPgF$KwRzzG>sk%Ck_gETyg
zbWB4ArXv$s$c76uFcY(ogXfToJh(9%`6xgkicpLa%t0y2Fc;;RhxvFO6<B~5un;d|
z5f-BoRak;*yo4Go#mlJ0D_Dl*colW1M*}=)L=#qEC01cI)}R?{(SmhY4=*-gBQ~KG
zo6&|X*otjv$98mJ2RiW@cA^Wr(2d>L10Vdr`+Jqn*p{V#f2v-in_p)pRo?bzblW2s
ztB49+Fk3Z_u_=764qr55eUV{~i)ZY0jo+TY*!PC8ze8f|=P<G+8)Fc{lOGZpD|duB
zJ)f~C&F?DUFGu4Ug&}`;NaZeKEJj->FV?xLL=Uc=!<b3a)R!_Ap|Ph-Pue(_KT*x!
zQqEJ4@;t^OHTKSDY(U%0qXoQvK$~C@W6{QN*8|nO35}1`>i!dTdeRg1W4K`qd-Ri=
zxl-qk*D&^mR%_upjn(~M-@sU^R_xC<o#hT*SnE1-hrR<>r`}KjPcYi_eCWI+pmSZn
z&dq~5w;g6IX*9TNNMGnZ&e&Tf<%_e<bOROFJ8V<Tyv_EOEsm|Trn|;#yryPTbF+8#
zyj3l<`KF^m=~tW&CJMQV(~SOjdNWP>MA>h{SIJcM*HjaAU-wyP<d}_<8->Ds#rcPG
zX98VIw}~`x*>0tW3*?K!9a>Ul%b>VeuKTe}ve1R)uqu{?@{mAPKP4s@GqN)sGiY<9
zlt6KLI6&WsvUpJJ9X^yMTmKt9u=cTNgBnej`XGjby}$THy6AHZ(^W5?65i*MM~f$)
zvn7~9#a()JA(_s6=@6;W*n5(^v!B+1r~Tg!)D+YeK$2R#o37puih_fL8hZj=w#b+0
z;&I7DxnEl?)EbjwqLRfZqz700XXwUusYcmdiF*-(Go)936J?8$?(CODI#r9`iAs}1
zvfJf5)Rrwv%16tvHIhEBz%nJi1Ze_Ua%73lJLO?2>VcIU#d2BbWU0|?yQ{cz<@Lf?
z`AIiVa(BfONh*rCx3BpL@5ZbiQR&H++s76Z(rJ7S-;#Q);cDtpKE0YSP1RbJx^0hV
z7Ba$qPm%oCW|T+$@R+D!lFg(@O~Gx^LN#5wCOhb~H<(Np@&hIsiVv98X%yW(=1)*=
zc!Sf$u*yawiF_^7H!4l_1>-5>FjqDD#;95=_nGNfejt-h6HgNo+@RozIAvs)eb`8i
zxze|X_B*Yi_p20E1^T@7-GmgcQc~c*ZKP|<CAZ=!^}iF@lXYt!w;pc2+yYA0t>EOD
F{{Rq98{Yr`

diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft
index 912a705c7097e982998b179d7bb847ecb6274f1f..9d49adf734b21570c76bbf6a7226610dc31033ea 100644
GIT binary patch
delta 456
zcmZ9^J5N(#9LMn<T5S&q1&V-L<!}`cET9DuK~U}&x!=@s2XE)0ARtOeVE863j*@3*
zVgM$RPU7Us3t;dCFq5<iiQzA744>(DIXyaYo{CKj;&9^P8rN~-!6cppZjeY4UXn>6
z6(4EbB%KU0xy5bn;O8#)$igC<9CFDcp91bvND;+6poCH$5}=H7DtN?Wf>ct)6RLSi
z4bP~hj_1_Vzzbf|NE6Mp&`KNabkIo`ujr<SUi#=~fI)^BW`t2*^M<#C7-O6XCYfTI
z8D^Q|9q;+TM?M|cp{Q<)+3WgO)D9b#E{)lK9g5l$kv}ne%&n6RwXR3wREiFt*<QVC
zsD!P3)#S1q4u{?eDF0T03PpYxYSOKbP3d--YC(PuO^I@4_RpibBSZ0$yDLka{{OST
zL6xZkhDy>!^D0~a_NgrGNmUz{r+dMR(<`C(yX8}2UWCPhSQMYdl2{fi;)_@nU&XhG
O<y-6d={i{3HqQaA`J>(d

delta 412
zcmXZSxlfZ}0D$q9e$bYy)FM#)z#<~|Q4~<9pd12nl^Y8!_hI>76jZJ>!tf+4jKKR>
zm@XzAnOGQz37fMMiHnkykvD<iH$Bhw#g*k+*~d%*7Bmt`!io($$)u1<8tFL5z{vw#
zWb%+KvdO_sE|1X3BcI23DBuZ&Jf(<d6jMSeWt3AvB~?^YgO^&K^MX3+Y2YQVXru`r
zuW6=*H@u~lHrnan9i4R1&3k(2rH_6F@H5B|!;CP>7~@RvfdG?C5hTPkGt4r_JPRzc
z#4;;<B+TkhBN*4b6_%*1`De7q=zk+!p2v;vW}oc7F?1P>8<E)AjS;fSOQ&!i`^BkB
z8D^m$7m7&i&@5)}ifpn8uk<AfhYZ-oo|=B!g)aZv)HRlTfBn*YCX-42s1t4(bBf4;
m$0d|C<&*MRSywicFUnWto3g2FDcj0U%;VbiA8CJ1!kxE#I+?Ek

diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index f53fbd69..87588b34 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -36,7 +36,7 @@ class LuiPagesGen(object):
         attr = entity.attributes
         default_color_on  = rgb_dec565([253, 216, 53])
         default_color_off = rgb_dec565([68, 115, 158])
-        icon_color = default_color_on if entity.state in ["on", "unlocked", "above_horizon", "home"] else default_color_off
+        icon_color = default_color_on if entity.state in ["on", "unlocked", "above_horizon", "home", "active"] else default_color_off
 
         if ha_type == "alarm_control_panel":
             if entity.state == "disarmed":
@@ -374,7 +374,7 @@ class LuiPagesGen(object):
             value += f"\r\n{currently_tanslation}: {current_temperature}{temperature_unit}"
         elif entityType == "timer":
             entityTypePanel = "timer"
-            value = entity.state
+            value = get_translation(self._locale, f"backend.component.timer.state._.{entity.state}")
         else:
             name = "unsupported"
         return f"~{entityTypePanel}~{entityId}~{icon_id}~{color}~{name}~{value}"
@@ -853,7 +853,7 @@ class LuiPagesGen(object):
         if isinstance(entity_id, dict):
             entity_id = entity_id["entity_id"]
         entity = apis.ha_api.get_entity(entity_id)
-        icon_color = 0
+        icon_color = self.get_entity_color(entity)
         if entity.state in ["idle", "paused"]:
             editable = 1
             if entity.state == "paused":