From c5c04ae26261a524858d3b8af29ab7155671bbce Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Sat, 23 Dec 2023 00:30:40 +0100 Subject: [PATCH] Bump version to 4.2dev.2 --- advanced/esphome/nspanel_esphome_core.yaml | 2 +- advanced/hmi/nspanel_CJK_eu.HMI | Bin 21500183 -> 21500183 bytes advanced/hmi/nspanel_CJK_eu.tft | Bin 11961668 -> 11961668 bytes advanced/hmi/nspanel_CJK_eu_code/boot.txt | 2 +- advanced/hmi/nspanel_CJK_us.HMI | Bin 21314199 -> 21314199 bytes advanced/hmi/nspanel_CJK_us.tft | Bin 12035904 -> 12035904 bytes advanced/hmi/nspanel_CJK_us_code/boot.txt | 2 +- advanced/hmi/nspanel_CJK_us_land.HMI | Bin 21500183 -> 21500183 bytes advanced/hmi/nspanel_CJK_us_land.tft | Bin 11961668 -> 11961668 bytes .../hmi/nspanel_CJK_us_land_code/boot.txt | 2 +- advanced/hmi/nspanel_eu.HMI | Bin 15033379 -> 15033379 bytes advanced/hmi/nspanel_eu_code/boot.txt | 2 +- advanced/hmi/nspanel_us.HMI | Bin 14820802 -> 14820802 bytes advanced/hmi/nspanel_us_code/boot.txt | 2 +- advanced/hmi/nspanel_us_land.HMI | Bin 14679517 -> 14679517 bytes advanced/hmi/nspanel_us_land_code/boot.txt | 2 +- nspanel_blueprint.yaml | 4 ++-- nspanel_eu.tft | Bin 7308612 -> 7308612 bytes nspanel_us.tft | Bin 7382848 -> 7382848 bytes nspanel_us_land.tft | Bin 7308612 -> 7308612 bytes 20 files changed, 9 insertions(+), 9 deletions(-) diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml index d0cb767..20292e4 100644 --- a/advanced/esphome/nspanel_esphome_core.yaml +++ b/advanced/esphome/nspanel_esphome_core.yaml @@ -7,7 +7,7 @@ --- substitutions: ##### DON'T CHANGE THIS ##### - version: "4.2dev.1" + version: "4.2dev.2" temp_units: "°C" ############################# diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI index bbf14b7bc028f6364a58545939a73c20df05ec4c..f120b6d8949b0ad46d04920b86380b7fddb91fd8 100644 GIT binary patch delta 1676 zcmdtg`BzkB9LMo{VFpMshe86!!Zx)s60#6M1b0%4#cEoO(uzvGMNOra5g(<&3R7}g z(QJtFt zPIb-9oC%Z5oPVw9mb1&*U|Xd7tQ+f0otWrL=nT~? z4rJDs2O7!)E)tLkAN)v)mj{wpcKu)GsP_U59)o%e>M^LtpdN#I4C)1v7j^v?HpINZ zkV*|xfrhJ4MH-=EjZ}$BHA`4Jjh0l_`lJ2l*QUjr z28Fk!MO)WL(o=@!LJX>0yN+% zM9_$ZxEj~sS~Ou1uESz1K{Kw$QbchBZp2Nv8Mok8v|t&Q<2J0o?YIMX;x62cdvGuA zLo4pb19%W^Scz452r;b2!*~R7tihvr43FapwBt#v#X3BNr|}G)MF*b4^LPR4@giQr z%jm=_conbVb-aN$@fP032E2oJ@gCmC2iS;B_z)jqGd{*A_!L{P72B{KpW$oL|KVv6;!LRrYzvB=5iN6+>hTJAt5-f=ppT%!UvLstlEW25H zSbADgExjzeTY6gpmNd&AmOU-$mOhpY%U+gDOO~atC1~kq+1s*@CEL>9vae-7%l?)F zEC*T!SO!`KSq`!sY&pa-*m9^P$8wluh$YvOXF1$5)N+L7NK3wDn5Don+)`*MvW&14 dTSi(+ETxuFmeH0mma&#`?%LAOcz45^zX6|LK3V_( delta 17178 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 diff --git a/advanced/hmi/nspanel_CJK_eu.tft b/advanced/hmi/nspanel_CJK_eu.tft index 8275dc9dea1b02391d6796f7f899b5b22392a32f..486fa073e2cc633dba9c42a9230a6360a2c81398 100644 GIT binary patch delta 464 zcmWN`*IUg20D$36$_kN@m6e%MO7@<~%HAVeviGsV%Sl8sj+q%pgvfK;bXCveQrE8h zDSj94^Id!`6@Qak0%bxHwUH!QTkW*hK}RV%>8y)XU3HVDyB>P#C0%cQ^wm#)83q_= zkimw?G}JJ|jWE(ESw~}zkgGwE8*bzq^bKD6h zopRb4XPpyv-USz3a#@)xuDXWnZipy%Q-xb@t8~X*Rqm;F-vbXl67|>ALBzhn_O@(pw*W^^>W;0R|dm zuq@ez7;2c|M#wSJD5H&$Ypguu?1-a|Iqrm$ zPC4z2unK3LbKV7&F1qA0uDB}Vn(M0Ea8tEgZmV&}UH9Dgz(Y}wJody>&ph|SORv24 z##`^ydhbJHtf)CLzaU!N94ilw|7wmkq=Z7zvOlq!P+l~xHI@-cZ;b^$2I>Nz;_0oQ z!*!wTXmz+gH&hd83fBj|1il8o1sVe113%(T;l`4jvCpv^dx+KvO?~|XOS62GZR@U~q@?c{D zH!B;1ptUWtYme?3o1S^q+*BT{@0=Bcs~W2(WS8Uw|2jLVp=#6FFuf+bI3qs3cWZG) zDp{FIhKL~pabzN^K9x+YZuwt+bVZb`jF>87s)(r~riz#Gvou#uiNt1Ps$}~mi>O7sV3v{6_(#5(&m+CTI zt}B+5x7Wp2^jue1Kc%5+QEu3)K6gV^QKw3ND@;X%D=`ff5U#@2s6-X6!L^u<>o5Z| zF$=RX2iKz-HMjvcq82ydX54~XaT{*O9hi%GxD$6_J{I6^+=F{@AMVFOJb(xB5bCf9 z4`VSNK^jZ&C>}#S9>)`S5>Mf2EX6ZehUIt`&tV0g#|v1ARalJ|@e*FfD_Db9(SWsh z4X@)3yotBah_~?$-o<-(A0OaDe1wm&4xivte1`S-9ADr|e1)&^4Vv&Rn(-Z4(25QC z9zUQB?f4NtVIzLVFZdO|;dlIjKc_c0g|pzqoD3)KWI9<+!s*~_=5%y6ce0%=oGqQL zoTRh0vyHQ@vz@cOvxBpvvy+qK?Cf-MIy<{KyEDg&FSv!=Irk5;q-8NI(s^M zIeR<%IQu$z&VJ7RPQKI2Ilwv4Imqel^l?&7U#Fkb-zjhgI0KzQ&R}PVQ|Js0mo+yP Ig$u|21#;>nZ~y=R delta 17163 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 E2f3WPCjbBd delta 414 zcmWN=*H;d3007VvWo2(!l|7S@Y)XBUy?0i&B*`XRQX(=kQ&v7i2(LYOc8-Vd)qmmL z@1Aqpe*aBq3(Li6r@eRyI_RjA&bmm{RX5%B&{HqH_0d;9{S7eCAV~%rVyIz;OO_(l z2qTR$+8ASvGu{LfO)^=UDbh_f&2%$lm?_gNv&}KrJo7EE&>~r~EtVr!#1c#8$+ygM zE3CB2YHO^u&Uzbcw8>^$Y_-jHI~3Sym)-W*tI$6C9dOVghaGWLkz?)YKZecWr|@&w5`GE4hTp>0@cYk5?8m=9@%c5sqW=N7 CgSzDa diff --git a/advanced/hmi/nspanel_CJK_us_code/boot.txt b/advanced/hmi/nspanel_CJK_us_code/boot.txt index 4b319e4..8fe509d 100644 --- a/advanced/hmi/nspanel_CJK_us_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_us_code/boot.txt @@ -131,7 +131,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2dev.1 + Text : 4.2dev.2 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI index 027ce7d956e698d8c3f6e4e87bf2b2c43d6cd27b..e981407d0052adb2b84b55981974dc0330fa15d1 100644 GIT binary patch delta 1581 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 I#ea+b19z3o_W%F@ diff --git a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt index 4b319e4..8fe509d 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt @@ -131,7 +131,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2dev.1 + Text : 4.2dev.2 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index d4810669caf32ab3fa8e854955da91ba5e4dfc1b..aa595e92099a5761d1188b1d6dc011155b50841b 100644 GIT binary patch delta 1107 zcmd7M*;CD79LMqVOQ&XZ!DJkA*A3&Q8G{iD2`!{-Swpsja#Ea#NFS2*$0=E|9tojx z;>eQhC8fx|g>wd}X-*_$Br9PHzlraE93W=h|&~cAEh&^nf?4@F}(1e1CV_ zIuCW`uUylXXOeG{Z<244Z<24?d_1Pj*WN8IxJ_HLUBMcuQ5vlfg=&n(YMjC}Ug4Uc ziJGJcMJh_snye{`(Nx7MPSZ49Gc;4P6tCHuqq&-=`C6a^Ez}|{R-%?@sg`NERwzj; zm8?}-tu;zfs@BS`G_6y*GPGVBsvM#I-Zew3BRs)5ndN~+Elurxi?)t%6nIQmX7K<| zM|Mt`k=GXIKqfX~6SA-wTab;d*oGWzM=pdN*oi#sLOyn55B6do_TvCd9K<0wQGh}m zMiGwSD30Mcig5xbaSEq#24~^IIh5c$N^t=faS3I(j4QZ`a#Wxa*WgAKuHyzgxQS}q z!fo8aUDV(nYH=SA@DPvi7*FsNb*RTPG~hWJ(S#RhMhjlz6r+f&90%~{R9mBcQPLb5Ge$2=8AM{HRBnZe6q0Kwm+m>W>TGx0{#dylRt_mr zD7lr5bt%fVT*Jzpb(>*~!JEd5#`tE>@Gtbte9nB&?>zII?~A9Vz09cw8U&6@H)e7J zIc6&5TpT=Dd~$|QSY$X;R>W`(YgIAEnHp93Dx*d1>KW`NvhE;^I$|07p;5J}>+E{p zdzW97$h?hlYSF{j*GGuA4gWsJ>9p)u?=I6fb)vI_SA`|T7{m|K3%o(#Ij{qJZ~zrJ z)(X7S*FM|MjCRr&y~GDZPsuqx|L5Xp#>$m>e_zJ3 zl&l}iSg!5-A*^RSV`0h;fa~hBDX#GVFzYP!9W{0xIDE9E2)31l3Rjhv5hug<7bCV^9yr;RKw7Q*as@ zpb^f137X(6oC7nQhYN5KE;U3(F2ha%* p;SoFr3p{}?cnZ(pIlO?E@CshT8+Z#=cn9y{1AH`Fqd$cV_yepa_UHfr diff --git a/advanced/hmi/nspanel_eu_code/boot.txt b/advanced/hmi/nspanel_eu_code/boot.txt index 4b319e4..8fe509d 100644 --- a/advanced/hmi/nspanel_eu_code/boot.txt +++ b/advanced/hmi/nspanel_eu_code/boot.txt @@ -131,7 +131,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2dev.1 + Text : 4.2dev.2 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index 89d42c48b615661410de43057a36fecb9ca4f97a..ac31742a84208ec7e9edfa589e4440c0f3dd19f4 100644 GIT binary patch delta 1099 zcmdVU+f$5T90&0C*|*)Dtg)Ff^Niu9J6tqnT!b9TsijzlSf|*WDkN&xaZ!D}MN+J6 zp@UP-v^HL6*`mlXXNlb5%8Z*X%Qq^Rb zCXJdj)k*W`|Kpbhc3Ehbf()cm7#Yc=+oiew)4xy%*kxHRVlfoMFdT6hfsq)6(TGO^ z#$YVQVLT=v5jIT3BqSjjlQ9K$OvN-z#|)%kCT78b*_ea5n1}gD#R4pZ6KPn4#aM!+ zScY_DAQQ{60xOY)RmjF_tU(TP;es1$u@3980UNQY!DDe4n+9|xbo;7GT|T|q@0O8b zuumlA^wCrOuIPTg-jTIwdao}v-wcJ03J-0jEwq*LD4z-lw2d?>q$1i*JE)j;QVH#% zQYxd}w1>R3m&$1$`KW>_X+IsHgH%P;R716Nhz`>cI!ec=j*im_I!UMKG@YTdbdJtb zJ^ASZ1*m~8(k0UAGF_pobd9dl4Z2CUsF7|{keaBO?$BLop;o#__opm)?s@96_|>5htznI%5~lYXj9 delta 1343 zcmdtd>r+f&90%}oc5OT9MH*_irZK!Q1~bj{&MnIQ?&P|zm3ycbDtQzywT0B%&}0lQ9KTF%8o(12ZuTvoQyAF%R>hAsP#?5R0%F zORy9+EW>iFz)GybYQ!KGaae=3Scmo4fQ{IMcx=WNY()YRkpw%oVLNsp87bI_UD%C1 zNJSd<)}{N|WOPjOKDiMOB1=vNM1?{2g{C&C zgXHZk&4cuYGEwE7$nq*-mHtj))~8g667SFuG+2KAk`g2%+l7zrsS>3IX)p3L$)u9z zK=~+5m}OUzt3YN%>c%BG`~L%Ebk zPC7>Ubesz41f3*Fg>;IF=ro<7vviJ%$wlYs0+moHl~Fleq)Svmm2{b^=n7TSRjQ#{ zx<+oQqw7>pI^Cd~)Ig2YM7OA!TBwz7QyaCDhwji_xR|CRY6q+ zRTWfKP*p)yO>y;I;=rex3bPr;a7HkaG}5s!iVUobCX+FYWgJg>S^ExJ{q~nEp(b_<~DxraF+lr+#|?+T6w@j9?`~Q z+Uej4PkF|3UJ&9XuXxQH-tvz3eBdLW_{ZMnPBIyJE0z@WCAOHXW delta 762 zcmd7M+f&S89LMqJ(f-S;URs>y z&%1G z#*oZd#xb4=Ok@(1nL-LvnZ|TxFq2f$NGF3?%w`UAna6xG$zlNu@vw+&7Gsga5^~97 zDa*)bIV)JnDheoMHHtM9v6gkLX9FAA#Addzm2GTi2RkXIgi^df8Rhuc#cuXc!Cv;U zp955KkSc7dImBW79N{R(IL--9a*7%PoaPL*)KSk_&T*a#T;vj$xk3Y1xke+`2@>K4 zHwkl#+uR|-U7EPZeID?TM>O-8Cp_gDEj;H1t-Pd-SG3c?Yu@mdcf98VANfQlpZUU9 fqI?U*A|6LdZsM@8`+HMskzXYh_X`I)V(vjb{Ae+B diff --git a/advanced/hmi/nspanel_us_land_code/boot.txt b/advanced/hmi/nspanel_us_land_code/boot.txt index 4b319e4..8fe509d 100644 --- a/advanced/hmi/nspanel_us_land_code/boot.txt +++ b/advanced/hmi/nspanel_us_land_code/boot.txt @@ -131,7 +131,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2dev.1 + Text : 4.2dev.2 Max. Text Size : 9 Text esph_version diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index fd085a9..b16bbf5 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -37,7 +37,7 @@ blueprint: 🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap) - ℹ️ Version: v4.2dev.1 + ℹ️ Version: v4.2dev.2 source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml domain: automation @@ -3913,7 +3913,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '4.2dev.1' + blueprint_version: '4.2dev.2' date_format_temp: !input 'date_format' # Avoid breaking change for existing users with legacy type format date_format: > diff --git a/nspanel_eu.tft b/nspanel_eu.tft index b504a67fda95d80ffda8a4874e28e9ccefbce42e..79b10d12350fbdce7b9da9b7a38535b044515033 100644 GIT binary patch delta 275 zcmWN=M@|$_007X?tCXQ5(z`Gq9hKgDM}?sbQj~TE7B3;;0$c>cjum_6Jg)dJd9M#I zDX-z3B*{{wN|P=_rYzZVeOq{s7bRHt=hEv ztV5@$F5SN9(W_6t0fUAN`|6wTMvNLWZo;G~(`L+?GjGA7CCgTR delta 275 zcmWN=$1)vI007X@dwV)T^oZU|)F2@t5kzlK@84i?X3Ute_9HRbS=oC_-(uySne%-2 zl<*whh!ZbCq9n;uq)L-6L#8a*a^%Vrk*`3ZBE?FSDpT%*3YDsSRINs>I`tYf`lQKc z&04f-)2>6OF5PeFw)pdnuj8!>9kxCviPnlkO1?`F*U;iozCe)(;|AB&bO`)kFj zHS0EP+OloOuDyTJx0krihn!fn_%;%YhWp_`co-gq$KgqM8lHvc;YD~EUj2{6uG=0H JAMRfl-vPKKY8e0k diff --git a/nspanel_us.tft b/nspanel_us.tft index 331bcf9543b9675b49a16c547cbf57f7f521aa9b..c7f0ce4baff01a5009cda73e58233c3a5a75056c 100644 GIT binary patch delta 272 zcmWN=HBKI2007Y7P~6>G+`YKA{4MSjXmM?UUV-5y9D;$JnS_;a01}4(DC~SMdC#ve zanIq67_s8SOOPl@vJ{`BN|P=_rYzZV8My)#a8Z>Is ztVOFf?K*Vo(yd3YK40}4FlflI5u?V8n=on0H{VT*_~EA+v*yfOuxQD$6|2^)+py`E zE!%ed_Q$S0`wkutr=u}lw~^>!coZIoC*f&$7M_O};otCIco|-W*H4k?|M$1}g@?QQ E4{5P%?EnA( delta 272 zcmWN=MNS-0007V+EznY|6fG{rrNv5dnZey%TbwJ9@Dh%|MM%0O9DszyEI9^y{!8BD z^HaiOcq2}{1c^TQC`qyupL~|;i!|vnWXkeYwr_Ie%9F1^q3?008jWtShuES#%)xwX7sLa))v&cWGUf@C?TMW}4{*ya?l)Py5|IMGw&@ z|KH3n^Y<<%6JCgTBu7-PJoyR~daOvX5>LdGDic?(!c&zJs#L4-%yTciRI5(CR~j^G z(yT?RHtjle>XOv0M@p~P`n=KatpV>08ZvCed!xpTn=on0v=3&?n)A^o^A;>xvTVhw zHJ^R4Zo{T6+ji{w>YF{^uhakUBdM!cHl6qr&!)ru@E|-4kHX{dNBA@R6`q8@!_)BW PHl96C-bCjvWB(oiwa#ga