From eb3a643f76ec4e752f8f859c2ecb26eae8376b71 Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:05:59 +0100 Subject: [PATCH] New blank tft --- custom_configuration/nspanel_blank.HMI | Bin 7359455 -> 7368710 bytes custom_configuration/nspanel_blank.tft | Bin 273748 -> 275288 bytes .../nspanel_blank_code/Program.s.txt | 1 - .../nspanel_blank_code/blank.txt | 40 +++++++++++++++++- nspanel_blueprint.yaml | 4 +- nspanel_esphome_core.yaml | 2 +- nspanel_eu.HMI | Bin 14899044 -> 14899044 bytes nspanel_eu.tft | Bin 7248068 -> 7248068 bytes nspanel_eu_code/boot.txt | 2 +- nspanel_us.HMI | Bin 14731244 -> 14731244 bytes nspanel_us.tft | Bin 7255680 -> 7255680 bytes nspanel_us_code/boot.txt | 2 +- nspanel_us_land.HMI | Bin 14595195 -> 14636231 bytes nspanel_us_land.tft | Bin 7248128 -> 7248128 bytes nspanel_us_land_code/boot.txt | 2 +- 15 files changed, 44 insertions(+), 9 deletions(-) diff --git a/custom_configuration/nspanel_blank.HMI b/custom_configuration/nspanel_blank.HMI index 24ea099f6bc329e4699dade7a11fc7f6dfe1d469..aff07893e73e7fdcce9102f07ce73ced570c914d 100644 GIT binary patch delta 2332 zcmeHH|4&<06u-Bnuu{=FS_os{^NDT?(7e|`pg2Gf-4KvYoyaWKXZt8+?dwV3lRyM9 z?o57A6PqR8xMaVX==O_SG}grU0}07~GVzDSM1L73CeD!X<+uG{(DT{?2L1pIdXw|s zIiGXx=iYnHJ@>9ycD}c|?DTsWV`(jE1kR2Ol3E-&wLYgD8Ruk$vzbIzO9#vy9|vaI zj-TFUZ1Y>!tY_U(un969!0wZe|4hDpoEOW0y+bkfRF=!ta-O?BI`E-H*2)Gk{pq^n z>2Vfpg08j!`|cP;+r9v31nrKoQD9$4MW3N~Lsum3yA^l^(-Fqz3Rjr1Yi`D}CH*04qi;$vw;yEevyyHc-NT=# z*~7oD+ruw6Fm}7dGyDi+ZqD-WcECwz{!T4~9DGQ?W8fFRo`!zDExZz3{kk3`$6^(2 zDVB-rrj<@K3%TaY9xtps$VTd}`iyQ^0c+Ok7I$l*ZlYjE9+w)^n znvu}s5xIqc89i$zGe*%XH(Qfdv;^4%&2mIukg048vPr|5l0rfMj$ul2DihPhFK(!* zr|J|#Olkin#D)`OsxV{aB${Qls;bC!fRDF{AAI0*R2~;wjZpo--zV;#uurV2;OAa( zZUCyq`WZ^Y$IM4WGg|73#{ELAhZFhZwXk)l>RyGP&tJ3O?0>MuelN9{@qdfiE!NrD jNY^fwnVF^M!Gx4H7fsV+(xSaN8?<|+MQKs~qfPi1q0C!? delta 1583 zcmd^;O-NKx6vyvMzb2{WJXy*g@@ck zIEy$$L@lBST4+(PS{U{LwW&qWMzElWAfmPrMd!^tl}e&j1RXfs|2_B5x$pk&eJ5Xy zs4rL`_@FBL0-3Yd!RFfY(M9 zZtyJYm*#s+MsxNxL?UTYM6T9X&CTTL{Q@a?%WHW@)aaZ`g&q)3%-rb#ujNA+{KepVU*~R5?wYW=@Odlh()IGXIZ*KK#}PvLBcPFbQB1z$Ac4 z0FwY|9rz~14?bK3h$B!II*oN@~l4vzj9VvK6{e2#INh7Tzt;87lWI;_nbWA$NYTtK3aVAt=^b zTi{kQz4n5Q#%dr{+nxuHq;!&PE!53)^S26rI1t=_02aDwCF@$@$#mM60m(GH0J3Bt+Ir59t#ur^Vr#Sh zx9U8tQJ!^8EY}%4FY}md@OfgL^wL9T+?|q-o zxu1LPmyG^VIex$LSd;QjvVYP3#RGTVSpKOIeB?D^Ew@g*rjD(jJANqo@!%^fE)DLv za>RIi=WhCHdSb9IQStuoe;rtMcFh+(!w*_7t|+b>I&!`5xGD~!Ix8+N_lwTrUfVuk z+k&BxZL6=IXvSMgLy7_d}Ahq$N$GWZdFgFS97`?x@%g6YXZMQ8W8wG?}ftx+E@~e0-#ynnbEtl zn{yd`VJM@&*OASCn9)rh=Cz+@Fk52CzjGjUYu)$KmTV_DKzar z-tK|GuJ+RaZC|Ip)4&+}^_mxszJ2?9gmQ(3yr?T%1&w&|y!wMCD85fULpw_FsyIva zJ`B}vPymALtkwF&%e-SVZ322>=L97$gHznlsLGFP93QC_c|t-e8i)i}C%Io3PvxJf z#0Ak&=IR+w{B0h{btNy)Z;E%FAbV_sVS*Jovi!mc))4$+kFnx z_j2FSBZBvWCO^&o>}AixxC`&?b>evnN*DLft^59+X%jf*!;QLNTHU9x84iv|3C} zsBu(?f(I$ZxVN!~C=rbp!GOU;526qS1ur#t@X*gm=Hr=x_j{RPruM^8`RqsyXz@UL z^VpW}M=QAQ`Lcg`k8kVy%r4y%chx4mr?SDpC)sK`*){sJ-ap^Jke!U$k5s>oZ@;_y z*17wCc03qdj87+vSEh8lOus9StWVQ;eDR`E<4U2Ru~K@-wgdpkWC7Tu!z;`LsI2vc zGm0YSzOX;if{O;)!xKo(c2m<$y0{}7^1T{8B;3e3Be_-$j7^Ogz;cW`MGc9|h=5N>viGQmcHdn>?80bT{RrhyXpp0pYCBbTz{%PJr{Rd>vx& zOx{k^5s^=Osf71kW~Na*Uu5<6M|LElCyxJ1W(|7?m!KFr^IYn`1ih EA9gLZhX4Qo diff --git a/custom_configuration/nspanel_blank_code/Program.s.txt b/custom_configuration/nspanel_blank_code/Program.s.txt index fb377bf..47bc91e 100644 --- a/custom_configuration/nspanel_blank_code/Program.s.txt +++ b/custom_configuration/nspanel_blank_code/Program.s.txt @@ -1,6 +1,5 @@ Program.s //The following code is only run once when power on, and is generally used for global variable definition and power on initialization data - bauds=115200//Configure baudrate dim=100//Configure backlight recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port diff --git a/custom_configuration/nspanel_blank_code/blank.txt b/custom_configuration/nspanel_blank_code/blank.txt index f4c073d..1526e0d 100644 --- a/custom_configuration/nspanel_blank_code/blank.txt +++ b/custom_configuration/nspanel_blank_code/blank.txt @@ -36,6 +36,13 @@ Page blank dim=100 tm0.en=1 +Variable (string) nspanelevent + Attributes + ID : 10 + Scope : local + Text : + Max. Text Size: 150 + Text file_name Attributes ID : 4 @@ -158,8 +165,20 @@ Timer tm0 Events Timer Event - dim=15 - tm0.en=0 + if(dim>50) + { + dim=50 + }else if(dim>25) + { + dim=25 + }else if(dim>10) + { + dim=10 + }else + { + dim=0 + tm0.en=0 + } Timer tm_esphome Attributes @@ -180,3 +199,20 @@ Timer tm_esphome covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" +Timer tm_pageid + Attributes + ID : 9 + Scope : local + Period (ms): 2500 + Enabled : yes + + Events + Timer Event + nspanelevent.txt="{\"page\": \"blank\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\"}" + printh 92 + prints "localevent",0 + printh 00 + prints nspanelevent.txt,0 + printh 00 + printh FF FF FF + diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 5697849..7875bd9 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -33,7 +33,7 @@ blueprint: 🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap) - ℹ️ Version: v4.1dev5 + ℹ️ Version: v4.1dev6 source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml domain: automation @@ -3604,7 +3604,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '4.1dev5' + blueprint_version: '4.1dev6' date_format_temp: !input 'date_format' #Avoid breaking change for existing users with legacy type format date_format: > diff --git a/nspanel_esphome_core.yaml b/nspanel_esphome_core.yaml index 81e22a6..4d76946 100644 --- a/nspanel_esphome_core.yaml +++ b/nspanel_esphome_core.yaml @@ -12,7 +12,7 @@ substitutions: ############################################## ##### DON'T CHANGE THIS ##### - version: "4.1dev5" + version: "4.1dev6" ############################# ##### ESPHOME CONFIGURATION ##### diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index d058cbbc92d1f8774824b922f7bf38e3a6b00afd..bb85dd9498b93cb3bb497ffeb10453e282a5f797 100644 GIT binary patch delta 1568 zcmeIu>r>287zglkvb$Yeo6Vgl!;DErZtD_4*eD8Fce`>+Vzaj2DxrE0; zb(_S>R0ydu*`ZB*pMbcsrDR9hR> z9NeH8C_o7+xl!%j=F9)J{ngsi^*&a;4+l4B1`1GuO4j?h+duyc9~^q0hQ&05hSD$^ zPQf&SM$#w>q0uyk#!@JaqwzF>v=l}YX%dA~1Wl$X6iHDum8Q{jil!N)qnR{|X44#+ zOY>+xEg(G^Xd%VWB3evKXelkDSXxeTw1VPkC9NVOCD3Xz(Hb&S;&~}lr!0$!s7Vob zl9M&EG1W5EpAQy(pAt{X>js#I)cZ@%MZY9zjL=t@0)&^{($?ym zC4mLjLJ}myI!J-_umLv8zFDa|wCNsI0FSx2t{xfilGF~fdkIN1t%HSeg zg3E9P%Hb+hz%{rIl~5&jH{2+ktW0j9?GP?X5}X=2=}hjo98tXAsS*XdoIkfHzEtOW zir9MdM^U6Rd6ovQiR9U}CJ#{;eJeoz+VWN#xm_o@PJ7Lbi{M_)Zr1WR zC)|Wva2u-O4%~%%Py@AaAL`%%JcLK^7@ojWsE23p9A3ancm=QF4ZMX0cqf;~z0d#r E9Ro}-bN~PV delta 2356 zcmeIzYfzL`7zglkmR(&U17WElaA>TVX5u0Qj@Q%z6%~>Kq9k#lHboE@mUThEh2_Z& zFKLk+B}JqgY1{%iKp`)%K$aqEH@hg7ITbUFeQ0W`ss0SB3yoj;)=cfpZ}@zyq!e&Py46d&D*?qTPc=+Uo$kKdPyb$%4L$`Qn{Mr4J%k?vCY}z`;c;8Pgmpse4 zUwGK$hDFC}S!~VN{?h4vJds`7p&8M3smzsF!s~RSgZaek2n5Z5T)nlT1OjNI%S~L1@XlT*vMhrBU=FxmwKnv*sT11O!2|Y*;Q4~efQd&mK zDTY?iN?Jv+6h{x!YKo^v=ut|bL`tH^D48CoCuj|&(37;5QfVFODUH(UDSDa=^bD=1 z4U|C}DU-5j6J^t8GExrZl8N%jOj}wl(aGxAjNgZ4^9LLn4EF>C`Xl*odr(#SHkWqC@QJbcx*%&T(NmP$EN)9ueiL$b-eEhI0V zi>5zJ5n@Q2=PT#@YRg$=?<}%G84x@R+rbXcK{@Pzov;gb!}G8Q_QDJBB2>Ujun#Ih zz@m%7Lb=7#T@L$%Z*_1o?wk~FD$eC?IIbcqax+HV9N{qDB2JFj+R8EL92%Scn zXvUz0R@!K%gHF2WriWg_^wCd*0S1XO#4sa_5@U>UCWtf16w}Nw%N+A8u*ee2tgy-& z>uj*e7TfHw%O3k2aL5tIBuH|?DQ91%mGT&hp=i9>zgEy8W&Qicu)RNhxKNQ$ZzFR8vDOb=1>< zi$AP z2==<_wJ#v{-o=I{mIu}#i4P_w#xIr!{{WwyOq&YZ~^|GJDoKMDPqm?Ok2cd`f- zig%?b6SbAZX|r4Q8PHexy;^*k5yStiHW!(@%P;(FQJOTzSf3w{je)uG(^b delta 1634 zcmdte{ZmwB6bJD8?2Dk{j_4X=<2YAyoH2Z3hAA~gC^26WG!fs@z_6kM))zJ@Ho!f) zzJy%c*astI4a2v!#D#sd^5VUSn~SEER%WFAQZunLQ8V#FHBMjL1@S*SfGg&F($b;u>{8ayV-3vx*#{daO#333#I5Y82^rCNp446 z0+amJacyjj)NLK)ov_&WQ+}j4yUrnvNS7oQ?2-J6CC)TMnrh4K>(u+6*riIv9#mY) zl%($UX77YbLvP&s)K;`giUqk)rsTdpB5QO~@`Ja7X`0mFMWs7!WYARJ$!<8~t*&@0 z0|OYr1ZEf{;;k{ib-88hxc~oOI%TU%#u{X-LB<+ntU<;aWUN89#@y-pFBJG?tCmMI zXeP~~Cula!p%j`+sgy=f(o-~#(rG?DO$%rtEuzKr3@xDy%A}>VjGm?Cltn8jn^w{) zT1{(cEj>r;XgxhoIh0Eq=mpB7jr1bDL@!f5y+W_jYg9mmR75t~M4M>~ZKYze)9bX2 zO6U!GlS-Q%*>$`uck58$-Q}CZMByX8&}@-9Q~Q|-xxDmY^Svame{74zlVDHhr;M$m z0s%+IU{_<<0dGMWltTq<2PY8hfSuriU9cPWz+QM8Dq$Z~fdc#C9dN_DPz@g7Py+|x zJ*b8Ep$-m0J$T^|d;kq_7(RqXI08rE7#xQa;DeL!5qu1%pb1WcADW>B0wCZFoP|%| zQ}|3YhR>DXHSG)Kl!%rr^=u-)HqZVLm-FnCc>(Pl%za_)sF;3ORT-b2bzu~j_p3vA zic>u?pm1!r))cL&I^7nj5xzgPgDi3?Vtcf6(QmF)s-XdQtN!Z0dv$f`y}K;~(q#=Q zrn#%tM*B}YP!j3iQls~^=jYq&ql3vc0|)b%_2^upC`Rv_K>Rx7{`W?UK53-zjy-8$ zLK(03n7K_9Yg|s&ZwmQQ-C~Hu%I{jcXr7{*qH%AYBR^EEOVSOILxICMGgpGGWu6W8 z0-k!&o+7em>Dz|&_c+6cXXs;uty2vQ3VZ=q;Tn7iU%}UK9d5uk@GX1?H{pA@1wTM1{0O&2 JqH;%j{9ma-uaE!$ diff --git a/nspanel_us.tft b/nspanel_us.tft index 8a2a2427e36e3e997dfa47871c2613c3b80b1b12..2c86612b1dc3a661716e294958924e4bd9e86622 100644 GIT binary patch delta 283 zcmWl|M@|A^7=U4Mz=FMDuQ)2$K|$ZqrIMw)QYObe~F(M|`QbkR)@z4YOv zADsaP8N!8|VMZ8bjBzHI#DkY9rt#rth5)n7G0y^vEV0ZAtE{ok2AgaVBt)2PcGzW) zeGWL}h+|HOaLO6yTyRO07*|{qe^XzkrWffiKf#34w7;t-x5f8t6qHQJ8<~_Tc`MU0 WBeOCm@8rFFFpa|F@26F%{Ocd-1#~L_ delta 289 zcmWl|w@v~99KhiKrvfTiQ0yHG7O0daM5 zad7bOmwfuyyG{R(1uHfb3MixqI}V%_Q$i^&+>}vH1(kTHq8cwX)KW)14K&h3GcB~z zMmrt&=%kBodhpXrAN>pvAjlv?3^PKAQN|c2%mkB6G0hCKM2IrSJPRzc#4<7BtdL-p zHP+c+lP$K{VV6CUq}boZhw90u@nu#1@*cBU~Inl96ADke;%2vJmoif-h%bdMBPtu~8qwn)*&NwzGd zlESv?NV!Caq9r11rgx1O#>*x()5DvFzo41U%;&}TcX?*cbI#=VpW^oN-(t2z%Z{44 zI5^nHM>2mO_ZTT7cf;JOW0;8^(b5%+@$`(PI*pX66*COmrc+Itxmq)`?p8)6Pv2#A z0p1I(8H;QMv(6hiZGni671cVajizTT`E)CoL7S=QK%K|jeq(E9?abSCas%V9 z!2y+>WZ@!*S-UAUU#EAcqQh6Fbz}rfl)(}fjKCO7Km=kTSYjGB{y)Ec)p!OcQF5q< zLp>bo;ZP5UdN|a>NlZ2W!~q>A$qA+P(mvWx2k0P$Q8*o<2;wM`q9~eT=rA3jqjZdp(+N6B zrzn=<=rqOC89GY|lt@W6Qui29ZFE4Foc|Ffa}ma(l3kau&U|F1EQ!~|CpZa~3R$0p zpvh0pG3Nz+eG6~-E76M2&60`*eRk@Ai1$`WR~0Nsa1`_-vUFA%R4#>NI0xrJ1}Sg> zVIyZWO#?q}_H?aaMe_Hen6Bn0FXV9Tz-RQpb6G-mqdhKiaD>6}X|| z3LB;Em;%xu9WsF65@doBF2fbbf^4`7IdBcGLoVdO4N$>N$cF;p;T9CaZ72dY+=07L z3>qkbQn&~Ap$s0tLwE$`@E9uK2|R^LsDf(H!ZXl84LpYzAV4j=ggSTyuc00qpb?tj z4KzawyoFY1gLZfa9ncBy;RAF*H+%#=^gu6sf@oo#%-4u-vd7P&RX2o~`~k|C7+(MY delta 1077 zcmd7M+f$4I7{~GVt+nZ*;hiqJD2!V(3^itiSfWs=5E3N{Ic_aQPOBakImFURwCikh zTwA@#q1Q2mBoeB@o#~=mGY&Jpm;41hGoPDheiz?n?=SO@uiwpTwNL#tFg$9MHCy@P zVsZ+Vv9UZ_(wt$z(drmyYH*mU`169h0>hQazt@Ax>`F+MqNs}EFAC`lWSyk3cIIls zObtopQKdf3;nP$EAP^=DfLZrxLCO72L(6u3cI2CUrk;NuQ)*}qgIa@HgIa@HgIa@H zLkqI>{|^Jdp$$)$aS|=#Wr9qU7?~uK#UfK=s>I4PnJ#e>FEeDO%#s92lq8ug$&w0Yh@>TjnWGm?H!>mTcu}2#SmMh-riGOqB>H% zg($*iY(X)$VjH$&ho0iy+4RL!6rWMA2e{mEgI%6ldzwD_o4YQ+<+0j^>ed=}Re~d; z&yHOvK`8{gu?G(9#Xjsu84lne4&gA$aRf)<#4#L41zb3RN}NO$PT@4F;f4oia2Drq z9v5&Cmv9+g)ZhxP;u@~w25!QKTkxY6b*P7q2HZv??%*!&;XayR-~k@u5gy|So}wAg n(1KPx#|ykf8(yIuuhD@wc#BTFLl@rT13sb~J$gi6Z&vGXKTXNx diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index fabdd1168d7a37e51c3fdfcdab9ed29d56f1e5b3..7f3253134012000ab2dfa219564ea4b66daf9420 100644 GIT binary patch delta 293 zcmWl|M@|9(7=Tf5u%n`4uOp5f8v=GzEP%aNbij(j9Z2{RU9vIUgP07_Gk64!VB*q+ z3x8kolG%49`5!X{C|D?@h+;}8rHpc{R8UD3Hma$i7CUv+(?BClG}A&WZM4%tCn{Yy z=tiT5Ui#=~fI)_EGRz30j4_Uj3EX(_GRYLv%rMIw^Y~a`ktO^rv%)HC1PBshoeehG zVw)Xy*<+sr4mskO6HYnfoD0HSa`mQ1bBbotGGG3P!+6Q*KXyemsYdEkx7y5}=X73| h5gC=&@cBpAo3-;WaZq$7>DQu+;9Z$p|1RW z$xFO`SQG!Tkb@N)x#W>g0fiJ%ObMlwVMn2y3Mz3>g-SIw)KW)14K&h3Gc7o2rHytv z=%kBodg!H(eg+t1h+#$;#l;wI#+hJ}DW;iWmO18Gz=M}XeE3;nnH5%9W1S5G1leSZ zZFbmYk9`g}yU&uQ)3VZ0}G)qKflKX!}zDV5b^ gNb2%h-pE^dC&Mx#qw-!p$e5YR#$%s0Z}Rc$4~a#4rT_o{ diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt index 22c5d00..13acd22 100644 --- a/nspanel_us_land_code/boot.txt +++ b/nspanel_us_land_code/boot.txt @@ -142,7 +142,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 4.1dev5 + Text : 4.1dev6 Max. Text Size : 9 Text esph_version