From e96b45e2ba24fedee9e08482396b33c6e44f7abe Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sun, 29 Jan 2023 22:20:03 +0100 Subject: [PATCH] fix theme --- HMI/README.md | 10 +--------- HMI/US/landscape/nspanel_US_L.HMI | Bin 9475267 -> 9475267 bytes HMI/US/landscape/nspanel_US_L.tft | Bin 8096484 -> 8096484 bytes HMI/US/portrait/nspanel_US_P.HMI | Bin 11491767 -> 11491767 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 8139476 -> 8139476 bytes HMI/nspanel.HMI | Bin 9475267 -> 9475267 bytes HMI/nspanel.tft | Bin 8098568 -> 8098568 bytes apps/nspanel-lovelace-ui/luibackend/theme.py | 3 +-- docs/config-screensaver.md | 5 ----- 9 files changed, 2 insertions(+), 16 deletions(-) diff --git a/HMI/README.md b/HMI/README.md index 164155c8..39763e8e 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -348,7 +348,7 @@ Example alternative layout: `weatherUpdate~~~A~21130~~-0.7C~~~B~63469~Sat~3.6C~~ -`color~background~tTime~timeAMPM~tDate~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMainTextAlt2~tMR~tTimeAdd` +`color~background~tTime~timeAMPM~tDate~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMainTextAlt2~tTimeAdd` @@ -493,14 +493,6 @@ Example alternative layout: `weatherUpdate~~~A~21130~~-0.7C~~~B~63469~Sat~3.6C~~ - - - - - - - - diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index f2e98f1189e91f71b7d5c648385c9078a357aa67..63b11fd0b31ed3819d707649f378c467b4b2d631 100644 GIT binary patch delta 2066 zcmdVbYivtl9LMqhS=$XoW>_(5jBW0Bh8a`$>*h9dubI1Xq*i&{^uuQpI4)P`!KGHZB!Q=^c|*NNKYFZmN4JrV+M ztuKivLIpeEFK&wk#q4$IiEQt=L@Ih>^URnYiEfJ;(2bC%2%0kfoO}k@S98Wc$PPC zT(A2*e?={&y>7qXuv!(p_X}saL7Vc@5~h8)9TBX*jI$1n)J_hvhG}bZEKy2VZP7bR zq;`6=)ug-Qok`=h%w0~8=KEo3rDvqL_QYsMR=d(&o(d~8hDc}vO(6=JL34I=y z&=OifYiI*)p&hh`4$u)gL1*X!U7;JqL3ii@Js}=?K?3xKK9C4~!3O=HKMa6@FbD?2 z5Eu%>U^t9`k&pz*FbYP)7#IuVAO*%lDolWhFbO8Z6qpLrzz)+P4Q7D<{h0}~U^dKw zxiAmr!ve^Fg^&r0U@tN{I40UoExkJ(ICfRC&IdAtBMSOE^O0>rWc#IgdE zu>uUpli%(~tN?aa03R#BDpr7+ya3^>041ydy;uS6u>w3}1$fR1P{9h2&I;gT1;}Lu zILHfdlogTgrjLC%yp;U!x7>-S<_Pd&dIAle+JP)f+0q%g_V!P(Ph zm!+Qa?jNnO=1xUq-K@emtB`;cWFQASuoq_)4lZ;5XRF{MxC(BttXX-ivGTmb$d-mY;glFfcJiGVttm@}EV1Vb4K_VG@Pv{W8 z<;ZiQR<=0hC9h9fZFSN8r@q2fjQn7jR9JGRlx~)pah1I|72}ueFIFrVTrw>ELB?-l zak??e#}=yx4Z0=9kqJLo0sasGDX^Ef5QFuodDV0k*+*NQ51*6Lvuo?1nwC7xuw^NQM+R00-d^9EMa#12r504IG7Z zI0hMT95NvbvLOdfKrUz@4^BcpoPyI(0B7JV6haZ4gY!@f7oY@6p$sm;;7Z|_U=DEq}FOMYOO}7hX%L_ QjnD+m&?0KBro2zT0P)D+wg3PC diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index 5edf5db8ef0b8baa481a774576b4e9ffd7af065f..8c5be27c6129a2471bf74398e79a64ee4cf535d9 100644 GIT binary patch delta 303 zcmWN=*)kPi007|0QnFKa${`8KmLuA%B}*zPtq#uN#6b(P+;s8H^aPF9FpU|P=Ve^G z=n4A2neXh+dFEO8%LN%SWyyBYB{?q3l_y_;LPd&|D0RhEWy)2kRHa&tT6M0uu3kig zMmIFMso5pQ{hIq8E%DN h!*AjD@JF~E?u5JH&u}l?4-Zb$$-_uP*1vf4?|-M;d+z`M delta 300 zcmWN=*)kPi007`Qwqy$xEtVWvQWB|?C1fetDNB}!a7Zi4a?`~(Sf(JR* zp27dke94oG)MWTqM2b{t(q*_J(^Xlr<;a!intTNcU3bGxMT*^W+Z}h6C{?E1Jr$xV z-B+brjam=XdFYXPk2QFrQIn^dJ@Z`53oTl;Y4=ixPF-H<)}vRS*WT#&)__4nhK(3C zX555#-kUUK+Kdlo&6&60qeV+TS+?S{RcqG8ZP@hX-_~h75<5!7x5BUCxA1%TBm5cu e3b(_Za5wxN{t5TO{qW#_B7WEqO*=ksJi7!7fO&ra diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index 0217bc824641f6c1fe99fd8c630e17b2dfa14160..66c350399023d850b9507adfec8c9416402e97f6 100644 GIT binary patch delta 1540 zcmd7O>2Fk37{~GFc4nYPFw<7LIH(<#TDD;j*^~}Qq3oq)6)4L{0YNAgL?}{+u@~A> zU|NQ9sT67{P?oZo!CVp~5yERsfkb0sGK4qq1_5iLkp#aZ2hP9XNj{n1J?DAmJonnM zt1cTCvTF1O@DdNzG4NLkbd9>eG9(-|>`0dK` zNd7g#wc8?BJ6&B(PRD=GY>j&6k%y_YauzFnb)8{Iw6jNsVZpant39vDi2sFvQK5ZMCVD%b^V(*P z*Pf# zY|O!2%)@*vz(-h!MOcgyEWuJN!*T@iF;<`yE3pcz@d?&oEk4CMtVbC(pd6oJBR1i4 zY{nPZf~}~)HhhWgsKi$YVF$wa8dWf{6T4828q{Jp>aYiUu@4c{qXGL7#Q`+pAS@h0 q6TZP=G~)=4q6Ocg701wq<2ZqnXvZm>#u=PN2hQQV9Z0)SQSdKO>VLEV delta 1000 zcmd7M+i%Np7{~G7cWp;v7hTJ`>P9=%Y_zL6jA@NB8%EXH99HH~wi@Oz%xPb`IaBj< z+-5VIv!s&W1-%fL;=*5`F5M8(NW?C@7yJ*NG=PoDDHls1#1h_`N`xEezL z-UfGbz^3%SAxi`d@!DZ^LKMY5WLSg}|D5q%r~lcT>S#$Cqe-Jc8g$UZfb_nkamcs- zww*>h`&Vg{nbIW9a=08Jv!q34ORF6D(w6eZx-!jb%{yzc_Bxp7H|ah80l!w=<7f=3 zoiT?~Ei26})a*YTA0uk^E9VzAnPn=B`ph}V#VCx19S-DS48~#{oEVRMOh5q!|0iM+ zTyUcZ9!y3treG?jVLD1M12a*IS@6P#*(k#t%!MEGFdyYufC^M%Ar@gVs;~r05x_D8 zu^cO~605KpYp@pUP>uE2fQ{IM8icSJTTqLw*oN)cfiQMr7wS-t2zH|Zd$1S#(1`sw zfP*-MCLG2Q97QvZ;W$p}^QMR%xhY;D<9BHA#O&8xxFVIZa-l3UZMAxpm z?-BaHneY7XzsPy`O`3EO88TgxCEI0J|^0l z3olJcnl|H=S###SwqVg4OO~xzwPxLhOOYikazX$A delta 300 zcmWN=Ni)`Q007|OB}62Zt$1IAvX?C-m254PKiRU=VlAbTi^DV1$1!G_F?|m+j!y0_ z?tahAb98zZI|}zCNfwhL)g@`tWw0YZGRKdTDTr=gqz{l@LRYQ deh+_y+u_gfSNJ>J3I7}>qTT(Il=I_*{}HcXg5xZVgOcUm(yP^`JObZ+@eoBpJmi`B}No6Y$gx$)lo54^W)&*!@C@AtW` z>%Q=LzkR`po(|iR))RK3WwoBQJxLX1TPsu7WM_#!6}=NA$K@owgZ6(>X=$lD%7(8Z zUthXgt`9iScTMESt0V5V+pb5sQ}T*OCT5FReb;&?$5dEJ@`U-+on%>d$r1E+#oo8< zK(H%V*BMve8D}{W<%G)#+ldiQM29=$M*e^ADH^u)t{SW2)iWwVjZ@>*1eK^Jsw6c@ zO;%IX)bHHB^yq|t+HG@W;E@UkL!M!zRMWGRU(brkXh|?*8^qNJT}NLwMJiZ z(A4iJ)1bP+a7@5x+FFcvMyp7S<&W$rlG-M6TsOOTOysB@!q;y2R)%aGZDH5%d^IsXh__g87-G;AxWB9io!@r*q zaq0iu_*P_}J+xR+*laxbgGg|Axbs8x*obUQzjG0?`V-fM&o#Q2#9Q;iM;|0-dPB1Z z+zUf}-R^|Y&2#RA@V`H~a|(`Ud2WY)Rw%<$xn?yFTmRLvR5V=Gi@fML!_=vZOcZdRFJyA#$ z5gUkNqJ-E;loDmcyTm49Gw~krK2c6=A+{195Zj3DLpYRh0h=ar-qK;4miBE`nqJd~64iiU+0MSG=6D?;E%x`-L`siGg delta 928 zcmdVU+e?#i9LMqBvpt$^1Rb4Ad-k+-K1{7_w$?$drsdMIX=&wVN2_`0yfiKS**Yie z;_0Gb5d>aYJk}scLP5HVF1qb5f}*=1p)Putbrbyq{ouv#3!l#yzM}&p>L?!HQ(rKe!rNREvl_TDCTGNtHmc?lw`a#IxIEui9GDrgjq>EQYD19 zE&6Be=bx3(L|}|;__djv6;qtPzX}gOx_=df`C#%lMRku`hI>=?M9Qwf0xMKxATyn^ zPx?Oo9~~R{BB#n}a=M%$XUbVJTRLQpbjsN>SLVq%Lt5CM)Th`C{f$F4^e#{Q*^uUS z8U2IWhx9Ayd7@8@kw>0xTjty6MehS+MuT6gPg_5^-`)LJug8`MhFs7w7jAek5A(4A z3$X}`u>?!849np~J_=BX6eP3V=V$$hxOQijVM7W%CHHWu?0btqXJv8 z4V4ICJE~BP9oUH)>_Ql|sKajTK|LC<7yGaujffzMCLF*)9KvB7!BI5h7>?rvVrW4t z+R%=ZIEB+VgR?k?^N8aDI?#!W=t4Ix;WB#A3yD5lK>}BC4cBo4H*pKMaVH%N^>+q; E06J7HL;wH) diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index ac622cc5262c37b8e288da7efa07cc833708f93f..dcd12b5afcb9125de5168d45c2d8ea58e1891974 100644 GIT binary patch delta 303 zcmWN=M^Y0|007X@03y9tK`BaaM!*gTSP%i}od^g~L$gI?Ymr++UZr{Ql`TosWfU50BiU6&26)04sScy_)%2lXTrP>WOYTa~8oq7!# z-F8QlW-VH^Y1g4smu@}oin^y)pMLi}@X#ZVJ@M3lK|`JyHe%FsFTC{1nAgU=F=5h_ zx2DaQHD}&}MN5{gShZ%|hM0FYZQ1tTj$LsdeDvuoaUTDZj3x3b8BXE^W_-^ToWmLX-psqW zyo$dn~pj$BXWc_v?hLPd%_SE5vzauq67 zsaB&_oq7#kX!KH(SDL-n;*C~q+I8sErCX0)Z@u&02Ost6H(=0^Pd*zqV$_&%6DCcW zHe=SDc?%XTS+-);7i-pi_04x1B7WGkb+!FJ64i2k6WI=bhQGp{a5vlwe~0_wpYR|& X43EOU;c<9!eG@tDt&VN}cbj?-jre(u diff --git a/apps/nspanel-lovelace-ui/luibackend/theme.py b/apps/nspanel-lovelace-ui/luibackend/theme.py index 319b0986..67ced04a 100644 --- a/apps/nspanel-lovelace-ui/luibackend/theme.py +++ b/apps/nspanel-lovelace-ui/luibackend/theme.py @@ -17,8 +17,7 @@ default_screensaver_color_mapping = { "tForecast3Val": "65535", "tForecast4Val": "65535", "bar": "65535", - "tMRIcon": "65535", - "tMR": "65535", + "tMainTextAlt2": "65535", "tTimeAdd": "65535" } diff --git a/docs/config-screensaver.md b/docs/config-screensaver.md index b398b7b3..47b9ba95 100644 --- a/docs/config-screensaver.md +++ b/docs/config-screensaver.md @@ -52,7 +52,6 @@ key | option | type | default | description `time` | True | list | White | `[R, G, B]` `timeAMPM` | True | list | White | `[R, G, B]` `date` | True | list | White | `[R, G, B]` -`tMainIcon` | True | list | White | `[R, G, B]` `tMainText` | True | list | White | `[R, G, B]` `tForecast1` | True | list | White | `[R, G, B]` `tForecast2` | True | list | White | `[R, G, B]` @@ -63,13 +62,9 @@ key | option | type | default | description `tForecast3Val` | True | list | White | `[R, G, B]` `tForecast4Val` | True | list | White | `[R, G, B]` `bar` | True | list | White | `[R, G, B]` -`tMainIconAlt` | True | list | White | `[R, G, B]` `tMainTextAlt` | True | list | White | `[R, G, B]` -`tMRIcon` | True | list | White | `[R, G, B]` -`tMR` | True | list | White | `[R, G, B]` `tTimeAdd` | True | list | White | `[R, G, B]` - Specify colours as red green and blue values from 0-255 e.g. `[255, 0, 0]` for red or `[0, 0, 255]` for blue. These are translated internally to RGB565 (note that this has lower color depth so the colours may not appear the same). Also note that the screen has a low contrast ratio, so colors look sigificantly different at full display brightness and lowest brightness. Example for the theme config:
tMR
17 tTimeAdd