From da37740ef38bcd4fa56ff3bd6404751c920cd5ef Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:31:08 +0100 Subject: [PATCH] Change baud_rate without restart --- custom_configuration/nspanel_blank.HMI | Bin 7346184 -> 7359455 bytes custom_configuration/nspanel_blank.tft | Bin 267144 -> 273748 bytes .../nspanel_blank_code/blank.txt | 125 +++++++++++++++++- nspanel_eu.HMI | Bin 14899044 -> 14899044 bytes nspanel_eu.tft | Bin 7248036 -> 7248068 bytes nspanel_eu_code/boot.txt | 5 +- nspanel_us.HMI | Bin 14731244 -> 14731244 bytes nspanel_us.tft | Bin 7255648 -> 7255680 bytes nspanel_us_code/boot.txt | 5 +- nspanel_us_land.HMI | Bin 14595195 -> 14595195 bytes nspanel_us_land.tft | Bin 7248096 -> 7248128 bytes nspanel_us_land_code/boot.txt | 5 +- 12 files changed, 131 insertions(+), 9 deletions(-) diff --git a/custom_configuration/nspanel_blank.HMI b/custom_configuration/nspanel_blank.HMI index 15cdd9f75b585506d8de6204fa85631bb271533a..24ea099f6bc329e4699dade7a11fc7f6dfe1d469 100644 GIT binary patch delta 9579 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 GE&Bx`0xuT; diff --git a/custom_configuration/nspanel_blank.tft b/custom_configuration/nspanel_blank.tft index 8ea8016cd1f6a09fd2b1d25aa6b13ab140433e9e..e3c7fa32ce42f1f2d1d6cf756dd4b64ea2ca713e 100644 GIT binary patch delta 8400 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 delta 1565 zcmZ`(ZD?C%6n@|2bh|fA(%Y(ZwXCFNYr8HsAJf$qrFDL-g7b$CK_-%IaT}{?Y18@1 zQjo9@?3z*ABVvb$FnVQmo3|S<|m%?pG!6V ze7bFTs(tsxsQ`~Q&)C0re%|@l)R|<}i`SM;Jo3SwcaL9Kee7eO{me&ieKn@v$pq|< zLnpr5Gak}8nolGyO`p~MYvZ<^=49R<%@=gO;JZ}tAA5Z^k@wHPHrtc;Z#Q*(LQ{Qp z5Vd$Vdim5gJ<&pE_)j0*HF2FnZ^^!29>dcUMo zZsyw#AT+E(@pA?>*KI;<<0p^VIb;jO?+27NcXdR#QGh3N+!;e{&PNracHa3>MoWYG(oBiJIoh7yuk z(LXIu60C{ew&>wD>ENqyuSn!}+9tTzI?lfZsiDThMJJ{eSBL0$&cnTS3h!LMqgrpX z;L>K%FX4yRU%{Puz}oXKT>38h@&OUOGay*IwF;CbM^9GLv;h=vf=yW;2Px6(z5cUA2A2U(O=lK=n! diff --git a/custom_configuration/nspanel_blank_code/blank.txt b/custom_configuration/nspanel_blank_code/blank.txt index 07da53b..f4c073d 100644 --- a/custom_configuration/nspanel_blank_code/blank.txt +++ b/custom_configuration/nspanel_blank_code/blank.txt @@ -22,14 +22,113 @@ Page blank printh 92 prints "nspanelevent",0 printh 00 - prints "{\"page\": \"blank\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"version\": \"2023.09.19\"}",0 + prints "{\"page\": \"blank\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"version\": \"2023.11.0\"}",0 printh 00 printh FF FF FF + covx baud,baud_rate.txt,0,0 + baud_rate.txt+=" bps" Touch Press Event + dim=100 tm0.en=1 Touch Release Event + dim=100 + tm0.en=1 + +Text file_name + Attributes + ID : 4 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : nspanel_blank.tft + Max. Text Size : 20 + + Events + Touch Press Event + dim=100 + tm0.en=1 + + Touch Release Event + dim=100 + tm0.en=1 + +Text baud_rate + Attributes + ID : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 20 + + Events + Touch Press Event + dim=100 + tm0.en=1 + + Touch Release Event + dim=100 + tm0.en=1 + +Text tft_version + Attributes + ID : 6 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : TFT: v2023.11.0 + Max. Text Size : 20 + + Events + Touch Press Event + dim=100 + tm0.en=1 + + Touch Release Event + dim=100 + tm0.en=1 + +Text framework + Attributes + ID : 7 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 20 + + Events + Touch Press Event + dim=100 + tm0.en=1 + + Touch Release Event + dim=100 + tm0.en=1 + +Text esp_version + Attributes + ID : 8 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : ESP: Waiting... + Max. Text Size : 20 + + Events + Touch Press Event + dim=100 + tm0.en=1 + + Touch Release Event + dim=100 tm0.en=1 QR Code qr0 @@ -43,9 +142,11 @@ QR Code qr0 Events Touch Press Event + dim=100 tm0.en=1 Touch Release Event + dim=100 tm0.en=1 Timer tm0 @@ -57,7 +158,25 @@ Timer tm0 Events Timer Event + dim=15 tm0.en=0 - dim=0 - page screensaver + +Timer tm_esphome + Attributes + ID : 3 + Scope : local + Period (ms): 30000 + Enabled : yes + + Events + Timer Event + if(baud==115200) + { + bauds=921600 + }else + { + bauds=115200 + } + covx baud,baud_rate.txt,0,0 + baud_rate.txt+=" bps" diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index 5a750b4a10eb8f7f3c47c10854b9cd78ed3d2ea2..d058cbbc92d1f8774824b922f7bf38e3a6b00afd 100644 GIT binary patch delta 1452 zcmdVYX;4jJ7zgm@l-q_GGp?mEhKVtQ#2t;4?E9YVgmWW%X}NN_U3KfvwS@{N*|KjH zx#e23WlPp%%{spIC0~qh{L`UNzVpuf=KSAh-sL@d{TS)F#R!e$FejjVrQ922}m)_XSO=e{Co zdY;l;MALI^3z3_8E;NeR_1vwkNV=X2+KH^wv#CR4-4!5`qSt$N`Lj1w3c8A{@o2cX zOQ49K(vW-g;KS9kDM-Xu&tW|q>-~C(Nt) z)>0~^k%Q7HgFx$OJvnIuZKO@KnYK_SZKZ9row6vKa%czbq+O&@F72i~+CzJ3AMK|D zlurlg5FMr?bd-+KaXLXK=@gx&0xF~;Izwlvn9h-lN~o01lbbHkMY=?n=?Yz?GP*|B z=?2}TTU1WB=?>kcdvu>F=mAyILwZDy=?OihXH-ScshVEUOL|4G=?%T58hS_X=>vVF MPwtws&l_@o0_;UHnE(I) delta 1105 zcmd7N*;9>i9LMqJNh_C~8Jed5fJ`%8gtBERN)fVqLI|alM1}OBLbm86(UF}*PCBv_ zl6@;%h+?{H#+Zzm?s%Kw!hg_j<~6^Y&&BuMT~qAU4YRJ+j57m_grt14)inqf`a~Ev}9)+QK2lI zt%H7fxmVfS0!zO84srkXqc^;y!Z$eI+g9LhGvS5-aEAvxUEVgYzMlSnVZLQ6ut=~- zut=~-ut=~-uxwtAp8ha!TDGo4g=mCEYLr41rqLRsu^OlG3fBZp)Fe$-gd#OXQx&CX zO;e0wHC;0lrD(0XNRLtR#Io_l*hLcOcHH@!Thba-Z|tIN^kZ`y0((|ziPW%Rk(Gvjk(>?xi( zJ_Q|(S=fk8$VLuwu^C&i6?xc(dssYYhl@MJ(v5s diff --git a/nspanel_eu.tft b/nspanel_eu.tft index fcf531b4e007120f2d422cedb9640f4e5555a4d0..597e09bb6712eb53712420637b2b1184a58b8bef 100644 GIT binary patch delta 16655 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 diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt index 192eb38..22c5d00 100644 --- a/nspanel_eu_code/boot.txt +++ b/nspanel_eu_code/boot.txt @@ -21,7 +21,7 @@ Page boot dim=0 vis bt_reboot,0 covx baud,baud_rate.txt,0,0 - baud_rate.txt+="bps" + baud_rate.txt+=" bps" covx display_mode,aux2.txt,0,0 nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" printh 92 @@ -255,7 +255,8 @@ Timer tm_esphome { bauds=115200 } - rest + covx baud,baud_rate.txt,0,0 + baud_rate.txt+=" bps" Timer tm_pageid Attributes diff --git a/nspanel_us.HMI b/nspanel_us.HMI index c83566f3781fc9ef500f7a02f6c219d57080a348..9bac26a3ab11cc5b7a113648a577c2c80b8b11c5 100644 GIT binary patch delta 1380 zcmd7QSxi({90u_JnPC8}1`{q(qlt#3B&{+qA+e~Sbpy18Dx$TmN{6D>s;q;{$dv8# zPH9VRMZJg{RHYlX%2=jF+^9=cR7956N{xw$52cAb5@YnE+?JQVns}36@}2K4|8tYm zyS*%^msI0%m93Oi=Bm+3`O4K@HFkq@ZI(SLdA^ue zw9Rhu#4(%?Q}Qq-aN>(=tpBW8MfbZUK3qgy2vfeQ5lL1~x)(AqsXwIK8c^J$I?MV( zy?vpIEM%nsvQePFFEl8m*CNmV9!oV{Q@Uo+HLI=#=$cK}0_(J(-e=u6Xetx2n2Kqb zjyS|)24><_%))HU!CcHk0uqsg`B;G0@H&!_f;X@bi;#-NNW&5=#hX}$x9~RJ!E&s? zN~GgmIFW((kcm}TjWu{5Yw-crVLdh=3)#p)F7l8M7YeWuo3I&MPPl!|wqrfFD?LU{ zyZ%a1>cDZ~l@chTTL*K;Fp*+2r;QXb%>36Vkrp!_)kHjIetC>YshR7?iEJ~oW5Q7H z2Tj-Yt^)mqgr_!NC!eMTV=v939ESXl939WSE(!MGf`SqeZICzSAL+XXeBh zkuB!1vr|MynBQ-W9qReN;&d62S^0LO>F?8;e{_f5VF?Rko#8CVOwV(=R@q&fU6bO& zC;Fds=@oW0)u^y}7aFZy`h>Cn`&>p&ezI=kx{bpi0_FyJ$BVR7HEJ zn)cE@+D`}QAPwxTmcFDzbeN7%9eqV#(>L@jeMj|ll)k4Q=olTR2J+Df`jHyRPe0Mm z)I=w#nNHDZIzwma9JSCdbe=BIMY=@4(q+0rSE-e*(RI2(ZFG~`=@xZRCv{Ob{YJmj SZTf@mP!Ij-Z|lE1{`ynZ-Y}N{ delta 1033 zcmd7M*;9=H7{~GV?XRny4$IeJ`8h2A3M;_-uk&ilOx9q9DO^Jop`jY4;fmAZOO>K! zTCNqcD^+PqSB6$t5^ zF;08P24rI+HX#R_k&8U!L)ZcboY;y2Y{Pc!z)tK!A$DUA_M!;;upb9djDt9Y5*$V; zj^HScp$x}SjuSYEQ>egcoIxed;vA}Q9v5&Cm*7G*+^9hxQaSlLp`pe0XJ|H zjktx|Xu=)b#Xa0dGald}TJQ*u@dT}SiZ(pMbG*PywBr?C;|<>89p2*uIz0A}k2zI8 E0S*&;NdN!< diff --git a/nspanel_us.tft b/nspanel_us.tft index aa3c588a60205e69fd481c89a0ab9baed44298b8..8a2a2427e36e3e997dfa47871c2613c3b80b1b12 100644 GIT binary patch delta 15243 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 D9AU}e diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt index 192eb38..22c5d00 100644 --- a/nspanel_us_code/boot.txt +++ b/nspanel_us_code/boot.txt @@ -21,7 +21,7 @@ Page boot dim=0 vis bt_reboot,0 covx baud,baud_rate.txt,0,0 - baud_rate.txt+="bps" + baud_rate.txt+=" bps" covx display_mode,aux2.txt,0,0 nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" printh 92 @@ -255,7 +255,8 @@ Timer tm_esphome { bauds=115200 } - rest + covx baud,baud_rate.txt,0,0 + baud_rate.txt+=" bps" Timer tm_pageid Attributes diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index 03461068819497fcacb094e9246296395807a84b..eaaed663b1d36b0c1fe6dd61dc4dfc4648163be6 100644 GIT binary patch delta 1407 zcmd7QYfwyK7zgm@)b6T=VW$#<(S&BuZO4qZ6mrY0oJejdyDD<)wz@1^(Nin8Vq*!d z$h}fZ>n>3)S$!+0*w<8YqO5xjsG@*-Z$OE{93aui4NGS;w`mvaoq zavZPVl^oBjcr~x#wY-iKIFXY$nNwKD>p8VHtx_xR=twsj%-SIVlPJ@pzlqK#7B+x^enEGi#K zq_^qb*xiH3LFmptp17YT{ArXn&#o-;q%Y6%%$-uzUG9oRA*~`p}x+}+&(0w)%eqr2I-Iide{IP z!2p?%1=+9(HbV|DU*LmgP*0$hYka2c+^Rk#M% zp&o8P1KfmL&r6|9A}QG)OO9DYI;``# zWYapI&p8V@-g1>OE*LT6d+9&mnfcs2^UOTo_Rl|E?J%nw%r6ep2!3_MJ58ry_<|js z@um^(?(F2~YV^$U7=KNjx4=kEHVl(pFgxZ~uy;&c%(u)!BPEGVxHPue<;eI^p67R4 z0k>r$3LW5p6RwEcimq=9+E&6pdhNHZfK8iCn@yWdn@yWdn{7ph+Wv=wux1nx)yAqq&-=`C6cb%9c-yv{*UHRi2h;sg^0fv7pZDXie}mMOtb~DibT> z%JS19y}s9eimIsUR@5b8_bB$6f!I(1mSY79u@XgCg<_OoHA=Ateh6!^4gsvk29#kV zHeoZiU@Nwv9NQ7Z4(!A(RA4vupb~pgg=*BG79s4zejLC-9KvB7!BHH;ah$+OoI)My zaT*OcgD@I#7EOrY9M0ncF5(g{;|i|g8m{98ZsHbh;|}iP9`54-n(+{i@EA|<6wmM+ aFVKRQc!k$!#T&fEJG{q-NNnh1Zs$MUVtQ-< diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 66c0e1184a2897e2c24114a666a35d33e7a11326..fabdd1168d7a37e51c3fdfcdab9ed29d56f1e5b3 100644 GIT binary patch delta 15123 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 PDBqbAY+6p6di?(Z58Mq& delta 14923 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 diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt index 192eb38..22c5d00 100644 --- a/nspanel_us_land_code/boot.txt +++ b/nspanel_us_land_code/boot.txt @@ -21,7 +21,7 @@ Page boot dim=0 vis bt_reboot,0 covx baud,baud_rate.txt,0,0 - baud_rate.txt+="bps" + baud_rate.txt+=" bps" covx display_mode,aux2.txt,0,0 nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" printh 92 @@ -255,7 +255,8 @@ Timer tm_esphome { bauds=115200 } - rest + covx baud,baud_rate.txt,0,0 + baud_rate.txt+=" bps" Timer tm_pageid Attributes