From ac3be262fd5152636dc58d942aa88e7e2f8eb592 Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Sun, 17 Mar 2024 20:21:38 +0100 Subject: [PATCH] Boot page increased spacing on versions labels --- esphome/nspanel_esphome_core.yaml | 5 +++-- hmi/nspanel_eu.HMI | Bin 15263259 -> 15263259 bytes hmi/nspanel_eu.tft | Bin 7497832 -> 7497832 bytes hmi/nspanel_us.HMI | Bin 15048136 -> 15048136 bytes hmi/nspanel_us.tft | Bin 7502148 -> 7502148 bytes hmi/nspanel_us_land.HMI | Bin 14759084 -> 14759084 bytes hmi/nspanel_us_land.tft | Bin 7497896 -> 7497896 bytes 7 files changed, 3 insertions(+), 2 deletions(-) diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml index 3a3ef29..16a3c42 100644 --- a/esphome/nspanel_esphome_core.yaml +++ b/esphome/nspanel_esphome_core.yaml @@ -2142,13 +2142,14 @@ script: disp1->set_component_font_color("home.chip_relay1", id(home_relay1_icon_color)); disp1->set_component_font_color("home.chip_relay2", id(home_relay2_icon_color)); boot_progress->execute(8); - boot_progress->execute(9); - wait_until: condition: - lambda: return (wifi_component->is_connected() and api_server->is_connected() and blueprint_status->state > 99); timeout: 10s + - lambda: boot_progress->execute(9); + - delay: 4s - lambda: boot_progress->execute(10); - - delay: 5s + - delay: 4s - lambda: |- if (notification_sound->state) buzzer->play("two short:d=4,o=5,b=100:16e6,16e6"); set_brightness->execute(display_brightness->state); diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index 93fcfa04b13f2d00f9226fbc57f5be946e492a59..c8956269287c343684227ee05078839f1bc43e27 100644 GIT binary patch delta 1203 zcmd7M*;9>i9LMoaoys)L)P>@Van~IaxgpuI7D~1@kvLLPPUTlpT^P1o9_x*jp&+{p2D044@!_RGKYC>|Fe@IxU zQ{U?J$#DAZ%B6=r*lm!(P#NRqWgHR^;BQIj?_%%LtWFhy9O|rz_v`?#NS3HkFJj8C5c>WK_wh zl2J9etN%qqrD{?Y86$x*R)S=ljF$;AQ6@>SOqMA!Ri?>wnIRz(Dl=u4%$6_-mpKw4 zb7h{)mj$v=A|*zldLL`bt-iXY zM0GW25fxd5dO@sG-S-q5r}!HF=;?7vv`cSuYdjUc6p$0yUrAK@#&yOco%{NzGRYrD zJ8Nop?l3JpS!ve1>a#~_j@))1Ej2~Swzbt+u?|`2xv$3tY{VwyU^5h`*n(W-L6DEF zuwfgvqX0Xw6T7e*d$1S#upf3Dz(E{>hC&?15fq^qM{x|taRMbMMHx=w6i(v|&f*-- z;{qTnnLa32rw5RXug$9RILXuvZ( v#|t##C0^k*-k=F@(TsO^j~0BuM|{F(w4x1P@D=U&hVSUW5529fGsy2R$qT=8Lj*4zl>;Z5^y#ExjT#lK-yw+f0w8Jd$B`o!=W48|+I7>*#B=w`c#& zo@lpvN)vkfoQ^JDwDR$~<>m&R$lCTOB2 zX|kqhs^XQPX_~GXnyEx3DOs~LTW-zKT+LI8QZ-)-v`}eE*CJ(Tv6d)PODjBWW}vAc zyFAkD-ZRH;I!%w&bpFf=FU&XMOlM8D`}aM}Ol-*PV7giiSHP8vcx3ahaOIWUlmweUh%hxN$A2IONSHeoXgumxMO4coB;KJ3IU6vD)A?7?0Xp&0wH z9|v#{hj17rID(@%hT}MalQ@ObID@k|hfHM1 diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft index f62ab712f5477223a48d3817677cbd498232cb2d..cfcc0f6fe31c45c73af86ed278f9ea7e5306c31e 100644 GIT binary patch delta 601 zcmXwxJ8V*67=}3lVr%OSEux^HRIwg~Lwlf9YiqqwwHLgLMbT5Ms71j+V`8GilXP_R z#Kc4=2NMSq6V|S7t{68ib}>fwrhXpi@Z^90=YQXS>H9bPlJE+JHP~_BWGyb%(LpEc z>7ttrY-AIg*@By`Y@-Jc+wro4o%ryxi`@hWvWLBd=w%=K33Grx4x)01!$gRp5u=|0 zbmAl!B*_p*ILa``7-5v-jB$dKoZ>Vo#yP`T&N0CxQ%sZQJQujgB`$M?t6U?)b!NzN zgPY{I#qF;~s;cPbc-5G9=xQusey$rK^TW&8j!soe_Nz&ey7@<*rIoE2NjcusR?EsS zDW?O5t1A&xwfJDWK3uozpX$bt)a!Ml;M7$uHelvz(hrOpu5P)hF>Q75x?vO)ePOv_ z2(!W+VNSSPUT)l*i7Q?+YF<~)w~jo*F$ E0IBodtpET3 delta 601 zcmXwxyKhoq9EL$aY;C=P#VRN$Rjfxj=d^`Vt*!M!)n2G~EQ+35MJ);r8WR&8o`liO z6B7p~2NMU42}Az^H-|17H!gM|#y_B`KM!t{hMQ1c!iyHIB?=(J#IG8 zMmrnnpp#8(W(!-{h6gX(>B7ejy4lGt`~=v|9)g6}%Ra*Nu%81&I7lytP&mvHqNr%- z^wG}%G2#r8V2Gm}W0>QNFvT)gkjj21_7v{V$-ej)vLZnb4LW?y^sBEEfORnWuqNlE1M29HZ zNhCKeO4((}mc1y^j5iH0nlZx*zFo{1e*tIaGw1jGp5>gUx;)pT8cIv4GSApADQud0r2O|eCpIThWzWq6wHo@NE@ zV1ygo(cbB4_GoSXPk%c@HQQD8QrSyoFO|Ji_EOnPHG4ER{|f~U)m*qv28h25lmH2o zK{8l|NRR}}PzjM?GF(Dsgp8Ch86~4-jD$;sL`sy5m2om&CdfpYB+)WirpQ#8CNVNy zX2?v5l{kr)Su$JZ$XuBx2{K<6$U;e!BuSPrG z&E$+u)WZK55c{CYH6UNn(~oC)>-nLYU5`qz`RX&ZN*~?gueH~$sak2<_@AG2by(u7 z+!Z}2Kr43AVd|=X{kUX<-I8L%QY^!Atbm4?v!h3vhT2h+xdj9}`ZQKn2 delta 1511 zcmd7Q|5H>|7{~E*cNe!6a)6mtD; zq?K7D$1DU(v+pe}bt?#vtk5Ja`(hHg6#QmWKRDAb&Da~fjWhiP-kI0EpE=KY<~(=i z^mR1(`(T`DGgf(TQpKg^X>%9OQ|@zaphEo>r<8%R|JD8+I$u-KX75t}mF-r4=B1IrNMQ6@WN`_S z^{GrNb@NGLy_XlyGT((f>{qJBT`!4OYL}b;nV{6Ln`6mJh22~jRI1j^rza}4#myy? zl-lR!ORiFClbdDoSnuMogN-RljW@=kiob?y>*j>1N_DvnN3K(9qnq>6FXYY)rEGWo zW`1nHN3Yx3GEEolZt*#REbH%N-807y>W*SN==996n~l*@iZi&t+H0IIWv`$fX>VEU z9M83HFq|_h?d^uHFR+4o$7*}FlV2H*Gn`pDcCTMYvNuf8Gb`;<9m}^;^>VxGGHouh z#_5XncH3yrwGPJ}HpVtOY)tj)?xCKbj-^y3dNQte&J|fn9;cwnzA;{#xvhbnY2m3x zk{&9nPjT|ftwN7Jc%XMpQ<9zN?3o zG~g+0#Wp;RXYeex<2mfW^LPP`co93%1dUyI3A^z!UO_YVpareii&ya)_F+F>#{s;7 zH}MwU#yfZy@8Nw!(1s5XMLRykM{w{lKEbExKqo#!7rN1dgXqQQID{|oCB8x*4&w;E x#!>X+8yv%Ne2edJ0^j2Y{D_}$5i~|TLf&zlTAS&q9*AMOx$?bf|o3^ z$zdzGS-WGBTd9PN;54Sqm|>F;3TIw%^A*ej`LjLBA2*K8&|l>HQKq(4Q_Ia+jMY; zyWFFbF1qOs~X*!P~O~N$c%(zW@E?< zMRmopqfah7`e)fhkH&QClB&`l>s6k9zo?4z)3hp-x)*6REaOjF#brcR)UZd&g8@CY zEbW0vpL-&;qJ#%Ruh1v-+o_f0yB1fe9;>zd`7TpG9TBT+ zT^MT+VQyndwo_sk$Ei~|TLG71W^i3)mk?kvE-2;#n@;)cpHek^lk6AjT)iYFn#1RIl& z#LB|L4h_jIjR_W$7}Sa%V1S_|78WLWxUnDr31Sf< zOoS+P)YCwWMw*Cof@WGcNh_x~%^A*ej`LjLBA2+#6|QoPHm-Ano3wL_+uY$U_vqk0 z4|qr?U3Ak!f=6@e`;y1fKbF+6jOJz4DC5Pl8unUdD6IdcRkdzSD1UA!Y(^t7voUOj zEnT+a>aSK@{i|%E*Tr<}vZ~OZ>s6lqu%rU|d0G`p-BenQ$oP|1aT(E7HR6-zXD+g}I7@&0GMaQcqISuK zFy0`-?BTpfDs13nRj)@Wfe+k4;zj0!GBpda!fs xm&8G1R=0P#F=?c9Q@0yuM5yX<<2Mm<68~draxF0?JayI*&)SN;pQa+c{{Sk%`(6M5 diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI index ad6e2390ccfe3cd97303dff2cebfd058d3a6b185..9199752ac9cd79913b5a44f6101dfa783397182c 100644 GIT binary patch delta 1368 zcmdVa>r+f&90%}oYS+FnW^34;X)?wOGiGFJ8Z)wPT}XwLTTzK9YEv!SNutF5Smc)C z3DL!^RFvW*y18^i+hS7+Ph-Z&tDXJ=-)?633pg{MdCqhDp838xmBXZ}1TnWploc*Q zOhU4IU~rHy@kFYOf?X*HVy#ut?BM0;>28Rb+{2jfDG4UYytT~uSLkVS%kKUkd7uUv@XD9rI44S)+v4lG|e(u z)n=<&1P5>g1t?*PY*njf+W-F!9(EH~n>k8yl;kMMQIex1M@g<$&Hg72)N*xj2rVKV zEv6;3l$OzQ@+KehB|ln0E6JZ$Q2+%}5Ur*)w3dQt9feRRt)~sNkv7q03Zrn^LR%?< zA}NZtQ8aC*9TY=5X&1#(9POq(6i*4Hr$pLINt8?}WT1VtpNy1RC*^x8oTJ0L`{!imXR%P_RZ*rjz`mo0niddZMU@Yvs&}ETzb*U4{x|pXoyl z6I)K2A+0zvdbwJZhi$xUVqG_%{|=QS`uXJfc>{k$F`JFgVCkHj880=uv8=cZ4VxAw zeH;Jq=;`rvF9#MnobAR8RYr~MJ;XztS$VuPm4&9HY0UaW3DV#Iq{BhTfJ1N?G9e3& zKsFqOV_*V;<8T7Za1u_zX~=;ya2C$NdAI<%a1rt#A1=XVU{C;8;3`~$Lbwh$pa_bg z1WMs1+=AP12kt@{l*2u!fJ&%>`|tp&p#~m8E!4pycnmVs!xLzLr|=9Kp$VFy1zO=b zynvVR3fiC@I-nD};5EE~x6ln1=m9IdgZJ=1>NP~@8X>BaDNj;F?q8J~t1?;h-#-|V&4f6bcpu&TboQbl5Jji?*_QXEOC zf#FdR!tXEM;uJh4PU^ai%|5}xU%9}h^k?zcmaZUiB(-_M%&h}53s%pvp#7HmS0?OtyIb^?I#rjmB7nU>wF{0wy99lQ0=m5QeFkhUu7rnFvP& zW??oW5rsLJi)hS44CZ4279tjLSOhy3BOXhz6w8o+ZpE#hSa+8K5P^Dt-M$ONnEy9Nt?Z>dgLw L_3Ur%VPQW3y2GFo diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft index 61a8f512a5d88c85e299cf5aceff9f8d605ebab6..9b08771dc4ddcebfdbddfbfbd5d96115fb3283b0 100644 GIT binary patch delta 571 zcmXwwPi%{E9EbaAYnzSvzm=7hm6eyZ@A|guSg~Qn{fzi z2S-^XZsNVkj&l@=m}~zyI7oV5;_GdDc=G!^-#oviZ(p5D!b=p^;lzcT^)%2(6B}rz zg^g^YmCbBnE8E!44tCN;J05nin-09}VK1Hd*vEdl@N3 zIuWAu5u=}D9A|(yCpgI|1{vZsXE@6+3C?kz3yd(z7~>>Kagj@0<_Z&BWs+-L=LS>U zy2A!0Ldb34?KMuMVbhbs_Qb+793RpI`F%FMt2$UY1^?(105cUN+E36U}U- zg;qAPnJsK(8{64|kDctIjdpgkhrM**XCM3NB)|a<(nXL%9HyHPM>vYgF^d@Mn7=|IKfEO z=gO}-kLhYS+F#>?w!=T##(;3!HnLt#4eJqex+MPX@0sS7h^mL{e4%V)6)nGBHl!Kp zf%H(Cwbsjz-bWRmx#-XIC@a>gKeOPLIT?_-W)%X}*&dWxv68{+{L$^;rciY*st#UN zYk#%>IA72*(qrj~^i-OYveLZt%qnQPP>0v&8gi|eUq*68IbXTf%%xH1eCeu~Z^oSS hgMj&Q=lm&PB2_yp`9wM=J+~6+7qe}iuS