From 264e9cd61c973de59e76a60ca6f5bf73dbdcf942 Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sun, 20 Mar 2022 19:27:59 +0100 Subject: [PATCH 01/14] increase cmd buffer --- HMI/nspanel.HMI | Bin 7356153 -> 7356153 bytes HMI/nspanel.tft | Bin 6282048 -> 6282448 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 92b6cfe27bab7244af208e7ad869777cc9ef4737..8c47e2b37d624b0b2698bae6df12f9d2c51dac38 100644 GIT binary patch delta 1433 zcmd_p+e;Kt90%|@yQ^-LusUA4X{RhLv#qUm-RxqiwcgFlGRwM!UApV@Pn^E>l9GrPDvWnBbP zJw|?7vfq12gh{fqyrx1}k5*TT&~8D;BE&`OgGSd;XO#V(#P5tl6ng8?c;h9)WKPoj z=zw*#kD<~IQ5YtIK;C+Z%k7jlEE7KaMIkthk*qt!9Z#`|IVF|ot(f!@3Ulk(`b*LT zO9HY~3UQyUkqGf8woF1^ytGYNX@WZOXl`;TAv(IedW1sjeYVK2s8z-wEH zO=Y$f$Tl0U2C->myv1h>bho6N^L3tD{AGM;kPaD;30q+sY=<4N z6S5#1b^(Rmum^HrFYJR{$bH!eKZ9E;tIu;5fL!1BKv)6Ho*v;S`*P zGf)g?;T)7eDU`u^xBxyVhYF~KDyW7UsD(PX2=#CY8sIWC!WFm*O>hmG;X2%a7HEYw fXa@!z;D-Qk2*OPWfdsdp6T%Py*&OsKcNTsDyI8bE delta 1075 zcmd_m&r4KM6u|NO-n@D9sH8XZM$I();jhw~QX4I8Du2|B)|8f(T8@s|4@(`Ft&FJw zK?sA1UZU%86C?$1F-#en3!!Kuv=o9iZ3CS}(04TZ3)*$z!#SM8x!ikFzvgWzNWnSj zr<^YfF&rKo@dScR;?D_{J4G*bu^fsUwkK^~&uDn7myS!iAyxt;Y41Z~{#{6XPIjom z{3K6z8e&otLQ40NFYU80KFR~FzkKJ3zL5bHZEtt zRp%BFbz>l2rnF1t@u-q5i8oV9!lr}=7r#G_YU5E&f(#oJ*r8fc&GB$8{#48OZ$28+ zW6qfCt+Ax56+@3IR|00ky0KI|VcXcgnD((r`({2WRA|d6mxZ?TQ{c?-2>0(b(cA_ zpzpB0^&4H!)S~6w#6NjNj>~GUb$cDw>dvZ&Iv(}Ak%=s1V;6F;8@b5C9^_*$_F+E` zpa6v^LNQ8k5Qk8TG91PccyJWQP>u>z;yAphLN!j{Bx+ELQ}E$5&fqNSP>%*Q;vCMy zj{us`j0?DkATHrDTF{CsxQaHk;~K7`1D)u?4ctUGLg+y+!stUk25<|vaR+xXh0iuxlD)_wzSGfm3? diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index a8393440bda7c2393ebaaae319e1ca5bb6eb6bcd..d3eebf5cd4665661a0eabe55300db857e25304e9 100644 GIT binary patch delta 8605 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 From 498f8bf234d61ec714e8312df15e6e49d385a5a6 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 20 Mar 2022 18:28:46 +0000 Subject: [PATCH 02/14] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/n2t-out/nspanel_Stats.txt | 8 ++++---- HMI/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out/popupNotify.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index f4ff3bc5..e52af402 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -14,14 +14,14 @@ cardMedia 22 Component(s) 210 Line(s) of event code 116 Unique line(s) of event code -popupNotify - 16 Component(s) - 167 Line(s) of event code - 111 Unique line(s) of event code pageStartup 19 Component(s) 146 Line(s) of event code 111 Unique line(s) of event code +popupNotify + 16 Component(s) + 167 Line(s) of event code + 111 Unique line(s) of event code pageSwipeTest 18 Component(s) 62 Line(s) of event code diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 33442e58..51a14330 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 6 + Text : 7 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 4bb3a2ee..cf5aebab 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -31,7 +31,7 @@ Variable (string) strCommand ID : 8 Scope : local Text : - Max. Text Size: 600 + Max. Text Size: 1000 Variable (string) entn Attributes @@ -214,7 +214,7 @@ Text tText Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text : + Text : There's an update avalible for the tasmota berry driver, do you want to start the update now? If you encounter issues after the update or this message appears frequently, please checkout the installation manual and repeat the installation steps for the tasmota berry driver. Max. Text Size : 500 Word wrap : enabled Horizontal Spacing : 0 From ae515df4c9b520cf7c9af0401af0b131d8e5c753 Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sun, 20 Mar 2022 19:37:17 +0100 Subject: [PATCH 03/14] remove dummy text --- HMI/nspanel.HMI | Bin 7356153 -> 7356153 bytes HMI/nspanel.tft | Bin 6282448 -> 6282448 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 8c47e2b37d624b0b2698bae6df12f9d2c51dac38..980741ceba75d21fc53f46d5ad7a1b2a6e7782ec 100644 GIT binary patch delta 872 zcmdtf%TE(g6bA5nJJWUul1w{AL`Qr9#aFe+47E_JMP)#%tq<@4NG+(SfQbuNVjEA= z*tjs6#EHQTtX!B7#bkm?(v>mB7+tWDg>GEB(?}O2eiL!ypWsb?Ip4jxCpR~zyj&8> zz?0ATPgkAFM>8X1AtTwvR@Ok+#|B;4yj8gw5bkqkP6;)fn{z^&S?`f6VoM53bTh`y zD)FZILy&{hUX3jnXmQM|Joj4VALfJJua9!Vt(3-|NVsjV*-5dMhr`XG8<~~2oRYhz zv)gF|$3M->pLOeco{S*d8ZN^|}u zTWt+wE3N#LKT?=UY4%J?{}d6wykDi+?_@KOP%JS!_zo5GeLU^k%wBhJ$|_<7?GViF}O+ zu@vn{HkJRoJ#BE&r2vue;^UmE%@pvEw>l{|6u$-ZEJrZG(tLxSl&JXmgG}${1pSc4 zrn~U;*3$eh-SF)!(P|OMlQ&GyZ5YGU-L)dyl`&&<%qV~cM9_i`^y-+=F#01lZcO

T)=kT%v;#OTX`E7auILm9bC*MT*^)^ z<8t1~6^~uh2JQJuPgs3rlEi>Ac)2|^xo9#+tt~Fq+9C&?x|q9$L&|HD)H6CF;UG}= z^N9@cLqR<%Aes;pxz<5+HJM))5=|v@UolZuGP85N-%_!j@41P_lRdJR=s_}nswSFE zWCz{!tq<7ih{Ewd7Im$j$f8T+JL<%B*_Wz@{p}l!O3g}}Lv4QFZ`Y{5y#q7i($0oxm$?(mt}B+2X;Xv zcwskGK{f1w8mI*y?1g=>AL`%$)I$R_!a-;PKOBO?&7!2oQ76t mgLdeEGtdb^=z?wt!C44H51fNu=!1S3fCvn#{^g;EU4H;l6+ndm diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index d3eebf5cd4665661a0eabe55300db857e25304e9..d1dce3bdec05a7406032b4000aaac0174ea9faf2 100644 GIT binary patch delta 245 zcmWN=HBLhT007Xm6nED`vEs$u-Cc_>y#WV+z_O%(w}Yrc9eLYtFm{i@2{S-LBL4-pb<_JeQMj!ng=L9D?MUeqYoaPK?ImdY}aFI(4a+xb! z$y!A*u3<`%cP!(Hxip9ef-ghxE)2~T;(b6zmYOI|U?Yu@m7ete+NH8@);j4zZ5 z8&%^~%#=yuiA1HAS@DsIH?E#}BdwTFYnxKF@s!%4R5NL2xlEhX zi_gS)W5XrX{OcuYHa)al*!i64obHqzskO8;tz>!X)k^GKu3_@p-$$Eh7`qidik;Ne zIWrktH5zKHlbY49xu!m87NwDBW}LQ(RU)l?$?|0naT@$2iScokO5LQnNy3_{Vl}kt u@Wpv;1cCpy*1oWk{2bNtkJ-7Ua^PLyec(gjW8l-m+|uX1-kv0ybbkOqI?dhy From 45b59d4d01905d5ea093735cd8e2cd317a786003 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 20 Mar 2022 18:37:40 +0000 Subject: [PATCH 04/14] remove dummy text (add nextion2text) --- HMI/n2t-out/nspanel_Stats.txt | 8 ++++---- HMI/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out/popupNotify.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index e52af402..a71dc1e9 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -14,10 +14,6 @@ cardMedia 22 Component(s) 210 Line(s) of event code 116 Unique line(s) of event code -pageStartup - 19 Component(s) - 146 Line(s) of event code - 111 Unique line(s) of event code popupNotify 16 Component(s) 167 Line(s) of event code @@ -34,6 +30,10 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code +pageStartup + 19 Component(s) + 146 Line(s) of event code + 111 Unique line(s) of event code screensaver 25 Component(s) 173 Line(s) of event code diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 51a14330..4adf97a2 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 7 + Text : 8 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index cf5aebab..4547a757 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -214,7 +214,7 @@ Text tText Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text : There's an update avalible for the tasmota berry driver, do you want to start the update now? If you encounter issues after the update or this message appears frequently, please checkout the installation manual and repeat the installation steps for the tasmota berry driver. + Text : Max. Text Size : 500 Word wrap : enabled Horizontal Spacing : 0 From 763dbb6ef8f4a35fdc194d1de11ca0ca51d181df Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sun, 20 Mar 2022 19:57:05 +0100 Subject: [PATCH 05/14] preserve sleep timeout on notify page --- HMI/nspanel.HMI | Bin 7356153 -> 7356153 bytes HMI/nspanel.tft | Bin 6282448 -> 6283020 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 980741ceba75d21fc53f46d5ad7a1b2a6e7782ec..8b5df33827bde6e40ea2126c15f090fa52a1e44b 100644 GIT binary patch delta 1426 zcmdthZ)^);90%~<^{(5+m}~E9Y*ROXHde}XUAxU@46DsHHS>R{wHWPI8$%*!EE$4~ zipNBRS46_b$i47yi^L1@Kk<%4;sqjN5y>ne@$Gh!@rKua$*1>wp8MVJp7wd#|D&7l zht5|9E);!jNK)xxE|IUU-tH-1NP4WzGSPYi5eHF)Kf+~2FYrkMc`>}ryIoFu*!Qb8 zb}jfO)8$em_t5K(BaYY!!@w9*@8&9WMnJFb+^9{cj(+8(XqzB%Tvxl`;y8*vHzr~5 z!Psh0A789E^W@HVW4Jw;A7|mnZ4Fb8if7R$^98*>5D{A=A_oTGK>#DfX%R6#+;>C# zKfhOt)M9Ee-;f_j!qw}C^0kMO%zK%7tj2$;TQalHuADe6|8q#-Soo4zU~lScB-VaQ zzkBw+G+cXIE3Y~^;$=r)Pi$k{_(4sqBi?D-_Xz1k9v_HaT&>viSR}>~wHXKVa|y`x z8v971Lwc^6i9QUL(0Q5YTx_Edg%+YKV+Qk&cA|KF{>yZtj zxG8MgG^gwdHwKyljm-hIA?R0!HqFFK)ZgNdw-gMmw#K?CnrL&TThp@twm{aC5tg;m zeC3nyuf=6WO16Q$$xuWlT?^U_QVQeNnB;^Zi(=jjp?YTD?JSSBi8v}5ii7RnS!2<9 zD|0IFcPdf90;3=aM#C6Lh7?GJv0#O9ph6mqhY2tdCP6x6z+{*LnP7vdFb(W59cDll z%mfEygA;PV1#ZZNJjjPxPymH68;W2K%!Oi@2lHV8lz;~oLMfENA}EInsD#Dfg(Xl0 zOQ9N;!E#suD`6F^hBZ(FYhfL%2On&JTJS>vHo_*@40W&twn7j>P_IQw8g}*l1i{mz AUH||9 delta 1307 zcmdVX%}W$v90%~3-C3QW!|JZCmDZDHR@$1C?q-^{S?g-PRla0yIqp8|ZqCkZGqak9 zP)YF8L78w6I@HZ$kuXpiLSRu4bT1G(b&xy+CKUAb4Mg$}=z-77^UUvg`~7D1&%AXN zo`12hjQ-W)BJBHYHZH^@cWpy}*=)B<(wJ@w28iiS>my8kW_5Aw8!xNRTD=~|oe;L> zuDvUNIT&9Z!?3{2d07IV=JHaPr-rRVJ||;?&oVEkI1kH~=$~ya z48GgOEL?lrQvSmUer$qg!2(v`zy>Mi1fMFe=ui2a8UFvi|EPU5Z8Uwxv0&$znz^X? z!S1lO81?Uh;mLV>y79wPmSTQf?BiG?F`dpCi&D^TOugQWK6z{3YkmtkIv=Mve!rUa z)fv;Nr3<+$+{Q2At59qde68)N!DFi*Fvt1Qt_sTo)@W{WIESc03sfRVB$)^c8YM!% zAjWz`N+PmCv?wK-pvGlQAnUD%D#{=UE3tm66p^q@2IV9f5G0LgGEp@_K?iF#_ac%! zP_?mex98Aqft}w2k@d5v6q1vYMimlM)g;BuBWr_ghvM4nO^e1<5~r#v^dhT7f(nXC zA_~2iq>?5M7LkNVks950P$)`6eR6UmhnR$XL{ZRUvP9y7loUjiDNGcKt^P4Z)o20- z?5NuIg1L!NQY~eg-ZEzvXB0P7a=K diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index d1dce3bdec05a7406032b4000aaac0174ea9faf2..25a153c35d1f4336a76fb58a14d7eaf112b3264a 100644 GIT binary patch delta 24567 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 MZVWv#S!@1(0GCsQ@Bjb+ delta 23493 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 From 7822782fc6cc4312986a1356aca2b56a344828da Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sun, 20 Mar 2022 19:58:19 +0100 Subject: [PATCH 06/14] preserve sleep also on page type command --- HMI/nspanel.HMI | Bin 7356153 -> 7356153 bytes HMI/nspanel.tft | Bin 6283020 -> 6283036 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 8b5df33827bde6e40ea2126c15f090fa52a1e44b..f8094323ecb6ddbdcaf8b9a09715158ebd345936 100644 GIT binary patch delta 906 zcmd7P-%FEG7zgm@-TS(&3&pujo2kw0hiT23ZMxMgvme{aw$#-sXRchi+NR<3q6-On z!WsqHd-3Ak5W1LMSQNZ;5p*G4bdg;K{U8Xs38IT2Cq#X9>!Sal2R@wddCuW*I4A$> zg_ws&?==F+A2e09!Ydagqw$o@+vB5R4YnF+NP~%N5Ic@J%l9Oy;Vn9}xJ2|kr~N)#Ca%rVy4LHU2U_f2TzaBP&qQe|_OR_nT0foE3!niJ zBq#x`n%3(^R{rD5-TBGoY~TtuvWd-H$yL0bEnLkTxQ1)FjyJNE>vdY?IN1 zdi|>-EGhQEh^%HmR;*}LU!!TRTF&Yvr7rCZDZ!hOF6EQou%HBLA}00sfbq37oeMj_ z3GL7UE^xyh*b5%$gnh6dy5InG!$CL%hv5i#!3Tag3df)ajza)~Z~}Uv5BeblC*c%? s;WV6qvoHV=7=&{$1W`B-7ho7-a1k!S2*lwsT!926A*JTRqroqK0I7N$x&QzG delta 955 zcmd7P+e=hI90%~Ydsc2T#yWMylmX<2Drl3MDmjDBF5 zg0T;WO1iz2B@|Q)L4waw5k+qnK~Y3hFF`2^4?W^dS3Km`qSh=Euc zHjUQF|M+nIzc_(iY_Xd?oXAO>%yT$}=kh#GXQOkT`OIE$C^GG5Nv zynQrQ^N=2Bj$8G#?(+_iMnH= z`B)s$pwpwyCOYrr3l`CrXbXkiL|2vQkCjMNn-a|}ULwO;Z_gpR=*% zv~yWp7~VBezSTMyH=4+2d0e!3-9GGeT$;gszW`_q0H#>J3=kgP_D{~lT@WJOo^>wn z*;GHvBLU5ra`tr+W?z87;GjTZ(w(5!7>@EbR0>)gZS7}&*wvckC)U!)Xsf?CWlxT_ z=7gZZN|to1x7e_%N4k}55?egmWP6WvTbB;0U#>(*HUi(m0>eT9rd1%+BY+Q>p=bbr z?H7c%3;>nR7 z1fe`Z9r(k$z6b-?n4r)M&{23m^azA#gBhCeg2IFs97#jCWA9RETlc`Z{G0$ytAWoc zKQy*Q_PloVbcIYYRWRI><|!Et)iihEBQ&j}$WHK}f^?Z< z&Oa}}Qb~hWN`H}0vsX&Hd3~jTx=I=|UN)ofRk9_nucWpMWwGm$3j*eTBH#rr`J_<-?_1Mq z#WP+*2Wr1gW?NVXPWgQS z(;o>0fHy%0$oxDXQ=uApZdxDXS`Yal`sZZIU^zv;HL@F9fWh z&AGgxSyYH0MeNR*_!qz$fmS^i(GE1sMEuOwmQP%x9Va4)~EJ-pO>e*nl=ZQqNXiFU0c)N z=Pi}~%IeF_Nk0J9(3nsA#9OJ13eDV$2AWX@0)! zED|X%pV49`gaT)Tk12i^qs63lNqZw_7lfB=1`7?{EjyvJ3(eUri=E@$5JomZm_UJh zcyv6)?BO{MHAUFj3}HVt-^=JB3g62pdLTS!tEYNK5k08mK3VKCz7;R9HNvPi2$UKr zJxSXqUBq~DDd3<&FV03=gk4lsz*7~{3mvU%k5KE4@BjR|?y~-lF6&#uGCm%L(2=f{@ZFA6 zeF@*cI-FNU$4_#{=&q(Ei`9aBZg9t>_LENJRw^@0F9#q@r=6u7_L8bfIjnUA!fIN5 zio^fAkZVbXN zG~*M7*!@E#kH;e19EWfyhC7&IFS1G=kA0<*it!9jKv**oVHrhUVya?1Ehv`7=IyZv z7)L&zN`KrQOOx%g()e>6=hp3n^fG>{d%sCyah2SK=WW#Oge*2)v>}90^<_S$boYNq z!uw4Yg)_G>K_8ebQdl>^q|&W(p|&mb6>GWu)$HepQ%>;5v(ZZp#khTN-kkg92u8AI;`&or5rjobGT? z00rJ*CW(>da}jJw2%G4c&LmOuyUZMAGnZ8tYkC`Qm{B04!%w&Xo%DT_Y5-PgSOc^6L79$*d z58)9dKVYVe@*c2A>lv9zu{B%_-PN?EhV=$b%QiS(VQTm(7?Z-UaZ3>*{)&)D!yj^N j49$MXvo2#KClz5{8vjzzBW9LS%p+N3(lQUs{l|X*(PdA} delta 5308 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 Date: Sun, 20 Mar 2022 18:58:43 +0000 Subject: [PATCH 07/14] preserve sleep also on page type command (add nextion2text) --- HMI/n2t-out/nspanel_Stats.txt | 20 ++++++++++---------- HMI/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out/popupNotify.txt | 12 ++++++++++++ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index a71dc1e9..7d962b9f 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -14,10 +14,14 @@ cardMedia 22 Component(s) 210 Line(s) of event code 116 Unique line(s) of event code -popupNotify - 16 Component(s) - 167 Line(s) of event code +pageStartup + 19 Component(s) + 146 Line(s) of event code 111 Unique line(s) of event code +popupNotify + 17 Component(s) + 172 Line(s) of event code + 114 Unique line(s) of event code pageSwipeTest 18 Component(s) 62 Line(s) of event code @@ -30,10 +34,6 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -pageStartup - 19 Component(s) - 146 Line(s) of event code - 111 Unique line(s) of event code screensaver 25 Component(s) 173 Line(s) of event code @@ -61,6 +61,6 @@ popupLight Total 14 Page(s) - 342 Component(s) - 3170 Line(s) of event code - 787 Unique line(s) of event code + 343 Component(s) + 3175 Line(s) of event code + 790 Unique line(s) of event code diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 4adf97a2..4893217f 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 8 + Text : 9 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 4547a757..f7dd7612 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -40,6 +40,12 @@ Variable (string) entn Text : Max. Text Size: 30 +Variable (int32) vaOldSleepT + Attributes + ID : 16 + Scope: local + Value: 0 + Text tSend Attributes ID : 3 @@ -271,6 +277,7 @@ Button b0 Events Touch Press Event + sleepTimeout=vaOldSleepT.val //page open event // event,pageOpen,cardEntities,pageNumber // craft command @@ -323,6 +330,7 @@ Button b2 Events Touch Press Event + sleepTimeout=vaOldSleepT.val //craft command tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,yes" //send calc crc @@ -371,6 +379,7 @@ Button b1 Events Touch Press Event + sleepTimeout=vaOldSleepT.val //craft command tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,no" //send calc crc @@ -493,6 +502,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"|",9 covx tTmp.txt,sys0,0,0 tText.pco=sys0 + //preserve old sleepTimeout + vaOldSleepT.val=sleepTimeout // sleep timeout spstr strCommand.txt,tTmp.txt,"|",9 covx tTmp.txt,sys0,0,0 @@ -523,6 +534,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepTimeout=vaOldSleepT.val //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,",",1 From b6b0249bfe22454689d6067bc9d7009f6d48dfcc Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sun, 20 Mar 2022 20:09:11 +0100 Subject: [PATCH 08/14] fix pagetype notify on startup page --- HMI/nspanel.HMI | Bin 7356153 -> 7356153 bytes HMI/nspanel.tft | Bin 6283036 -> 6283036 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index f8094323ecb6ddbdcaf8b9a09715158ebd345936..73e920266e55eaad8258ac6c4d29ae31d47e3a68 100644 GIT binary patch delta 1231 zcmd7PNlX)A7zW_4)0QIfFztv|l*(pV3sa zeN?aI^210fv`A?rt`qb7lSES)IC~X~>C$>Rjo9G1b1jrU7)nEaWa?CgSylMwT(pGi8W&Gxrj2g$^6t! zber*En_YfCB>l-|@vngawzy!s#6+)WOrDrC6seeaF{o$3&;EI~SkrH2@p(fjo0#*@ z$l-_5QW@*7*K62wqlf3LBKu(UTxQ>@rL@6jp8)G16V}59Fv3R2f=#d)vcUvfAO~_G z5AvY^wt^W7p$Lkh1WKU{EKm*=Ac7StVH;F|O>Xu{wnFWd$`_IFs@RVC-?k%<3`q{t z|1V{Yh2`AxbdAS(1Jg=&%>*a17i4mD5<4sgOQNc8KV9`-;3G{RnRK@;qQ zX4nsIH~&O$fzz&YrJ^Kb$D N5P+cUob8+H{0lb~dIbOg delta 1200 zcmdtf%}Z2a6vy#%XBVrJ?1l9o26Grp#!WonseS!Oe)jxSlM5wo=n1xq9p zql=IWTLlAA8VqEj6a>A{G9njA?$b?#g3xznF8D7*2R`sS_jwLn&a=L`XkN#Q-=>6* z1=7>n-J4ZeQzb?Z4wyqdZF!p}j}#GQAzzvOW{x)5 zgC|PpX1p@+CSLh6pJrWVV)MI8=C*~-X04IkrieQo{+vNy)UYo~feB_rz=FttFUopv zJfC?`)USV1wXVCP8f&56CW=_uOt3yAiHw`WxhYlTzL9^X zi%c7NFjFMX$WxB3`&qeLc_B|^%(zoqB;q&nMv2JFa84C}+15aDg-B=c8L6k0BC(cm z4g|(WTqOzmnA>L8tH1Wu>ubN9w{=IeXCg3`tz|g$ThD9}y86)Ld%URH^wm69r0#Ff zR`r2KXSzN)=V=dpfAUU^9$xWk*p682z)tMKZp2{^;;|PA*oXZ{L=x;sMha4qh66}P z1`gs7GLePDa3C8;kb_(}11nzFREp)t=V<4D_#Df<9#tQImKxPS&+#3eN1GMaD&Zg|j) gt7t(h+TcYyI?#zOTthdm;|6Y`2fcyPrM}nRzqA^3`Tzg` diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 6af03d873d58e876f413068c147b02ebc8122edc..a77540c9dd94398853c29bd312c4c74b67023a29 100644 GIT binary patch delta 11361 zcmeHNiF-{~*I)bGdlN|{F_a`SiG+|Cs?h{NR23}}#E?XsV=5{oF;r+`N)J&ng|HAq zi&iu>#E^?1lthV{3Sw%hP+Iy@L!&+4Z{MrW+vok>?=Sf3v5$4u@2s=eUejJ@U#kun z$|{US-}%uDy@MX5chuj~JLzxho%MJ0E_zqJ zoBpo;p59&Wq4(6I^%%XE-dpdZ$Lf9cetLg>z|Oc$7NyY4Yg#1)D%oZ}+cC~d8Eoe3 ztrF@foz48&%=k#f(ahTt5;`e|O&pLBA1x+W%N^o+2;piCsumY5mZ=HVl>5ZJ+r)?P z7fx||L_e$M9Cxag((-j~;Tsnt&RD1W#x;D?yrLr!*PkEfZ#~*4Zia{XMBHEZqesU% z1cq6yC)h1)dF8xkDDE6vj{Y6B#_~LVSIb<9@+W9N*3Q=tBJ3zQUasHAx6i zjtZU=ozTYmph-e@zDNKrG4ZFe?FLAVwm_AZv$NYEXme zRbE7uvlW_bCaO(t)U`Fy$Ri59REPq|fp)bg(q1Su+(Z;iuGA-*DAmnG^DIQIs1`+x zBr1OU}gEDVnd>dcp$8kGzC0Nx(2R(H>m) z^USYQ4|dq1=2&zWqF;IK7By7pT((8ET2@yla^cLaYN!b$?+@1sxWfePHBrK8+f;w^ zZdXLWq695GJEc0`+@_AVY<456#RCe|P-jURMhg)oxZ`8B9)DSYIrh5~HQ=c2m}5UD zZO0rZYY>HT@D4~w(lBObVKn4%gSDvalv=!Pux93H ztD5NQRhQ^J55xt=VYXV;K;gv|R!sQ4Cs7RZZZ*_Zl7=x_`B*WGX)N}@c6WBGIm${u zK6@g*E{7adYq;DL9mNf-d!--o)D~Ky*^lU7JaRA0cpa=UQ?*^LbNq>R)hB8nKs12| z6k)bGoK~b-T^E6KtN~HqK%#jZwGYT59<~q2CUC9<5e;idw337O1KGsg_XDwl^QaL~ zS}@Tjc0T~b%3%k9l!EiPF_0!i1^i4RrR-e{!0~HAl!sBlTMq%b$L9|Lc@9pKmY4(MG4nS-o^#PRs@1LL8$_ML zh>l}WE1q#!Z6Ip$`oj?NYeh8RO``8H>hQ=T5c1=!BS6B!i9U=VdWzA6V@iO8@q`l9 zsyMZ^Te?%J>M3u&-lG;;dbTAR!X8J}P^D*EPTU064zT>$088xP&~M?!agjtfxbj;( zG%k{x=BwMCCYnV=SUaN6`1CP67{*n{@Ze)`hOqTG{4GhtD55f4Pru5QGWdH#)W7}h z{FlGMl-fAljUsv(#iRDBA*|y zY{UajVMa+BMt2&Bt7f0^%TtKzV{a3+=BU$9^B5v$mVn*68!8eWF=`B56QsQ#J_GuNOw7h2{XG& zPu@6(2{YN{Je)GQ8_^f<68XGG6wjy6!zq*bu|y_;v#~p3qX$tUTQ2~a#1$7X(Z}H2 zWd05lNzyQuiZ2AJkA0#$-(jK=J!P0pzle!OaQ;R3cxNBGbrbU7W8Bz${JalQb&k0N z_dV}p_ifMzFD00Jw(@NL>BJ)14JbW|BKBK zEwGC&`vLP63?}m67Pl~80S~+dp>Ku|wPcUm5RxPuFANBo?6qvfZ3NA=p(upIh|iva z4gG$^gx5IqN60=IhT6lGKSEZLhVhot8+EXsUAA7jR*SpcQ8QfK-zVxeg6Iy07nk2b zG`Mrs9XNKtXuD&NSHiKlu{kz(G|^UGdlyRPa@k$ASj^})wPwLU&>0{(GhH+D%y3llavHcNbW6*dTKEa-A-`-c(2{%r9fW_4M zh-d}}|BS^*(lF-IN?g~x%ATKLy>63;3fcV^%+`$~e}T}nRBX@u3>;TU8pc(6fa@c> zP?v{lPPJ{5iF~JEU#z!S^IP^vbr##$<&j!xx;=$>&_wK@U;e7L5_h@cSG@26o{VGu z7hWhy!{{RV!yO5)(&Jyy!Z(d*E>C|9EqpouF@$=h6BYBwClHdPVJsJU5c=9KRQLo! znNx{=mIAJUR2Jy2SD;%r}_*pF!wX?*2@* zIy9b%h0Np{J5@ig+f+w5`f2*M|i~(`zvaULhx04sb)AvWD;%2BtBMz=-u)XIz({MOSRHzG{Etl~ z+@$4H^I_>}d+7M^FD6Xl!&N2-`>l|O)vSd&OA%%4fCYWIA948-?q>_eN0mTV!~!X7R_d^yqu$ce2)`?q2D+fFoy4T+rK!0JHKcAy2=iI#L1 z6ynP2K+@R76-Z+%>dJ1SHG7Em@M%{djrp-e%J-ta7NKF>Pc(|HZa~Vp!VSpm189JY zu`eH#t;Sk+EzkrOU+bn7)ExR6MTC8W&Gayqe1zx-XV!pZ80Xi3bJwzV89YM_-pM-9}G1UXq59VP0%DjAcBoj^@EnJ+%!Y zk#oH?e-Xn)UYgZm$uktq=RCQd7UC*t!zeVDLgKhxqO=}DW$_E?Rm~gIEaoh4x&A7m z^p`|`{y}t?V|;AupWp+;!9e-Jm?8vrj0j&K4m{9TE3(W|1XW{iKP}jCCP>3b z6-dJf;m?D#-s~Kt4R<(HM^G0Jo)@Uq;{`zo_x+q31fdHa0=0W!LkOJ#X&8g;LRT6> z=#H15ByYQr+6Y2Fa8e^U@HcPyymee1UU~0tpDU8Pd5^lwawAxv^NV<03pIh{L7UWF4(A&SdaDWN&C~q2Lrbl? z35=zKv|X0K5JB1O_y!&Z$<6ZB0>1Nx)=ErZ?=Zw-YN((exI7H8C`s(Fv<27g_ARqf zD@4|zrug{f;#P>PLwvuLb~M!YI9LICLYpG&}mMMz{HX?j3Chp)vvX^`jtj#Ij#lm1+D5J=))*M{dr_-1VjO6 zwMM8+?1;d93xU*0;431g4UmaEp$)wL*4qMKxM6LPlkIt6TPT~-*{*C~i`4OdD?7}F z@8i$6q1~SosjU;09NG@9yKe)|qeKA;CQ!u=`2>J;lm0NVi z(wcH?XCN!O37Ye+poI4XRkFuBKvr<%JFulw4}tFa**mbMBn@MhvJ{)|3j5~Ur3-AC z&{NR6(Sp2V1m$sM7YHY?OIHXV?!YdEb3CaS5)0E*~|i6m(lXHDN@q95%O z&F-lkLCfAf8de@LSi%lwXL}7E8v_T7X765r#@Zl1bAwmqxwke?Oy{!RsA%K)es9fc zav%LF^<)cdyR)TS>}Y{AjfJsTLo64?qW*^@A>lAya9Ur)S_rT23oSn#Bj_n>{qWqU zoYfDUy<-J6;;#Lnw*ba7PTt$13*I&zUzn3iNVv3-wafs~kf@>a7>u~e{ zRHl18Z~$I3W4xeW*dq=-h9u!8x=Z}oIehkvh|`w4S|G_2mPJQ1upuL^a%^X{*HN+lfy}akAz>Qmkoczc7Vjohaj7O=E$K?>eo4fRDL!TN=ec%-c{le=7V14$S^1sFjwHq z^2RVI6~HdTwW4P6S%Tc>VGEltsNDkl%=EXS*Pgbc;ciM<;u`hi$HTQs(VZ*aMK4Idt51^{!VnO3MVl-5h zq+xiP8Y9-5zKZqHT8^n?`KvgU-{7`88K;g;D+Kwj5ZrQ;+Qft#+vea{2yW0y!Cqg% zQEp?fJAh-`9g0^9YRctfuseXX?G81Enkk|*SI~}Cf;y}gRF{vAh4!U^&*`*>d9cJL9QI-y=ZBNDK;_Lm?lDIzbiezRpz?f_ zp05$Sn*|T4hW7cFRLI`ts#M74ZWc6mi=aANWhxaUXxm^3D)D zFa=^gxNM4Mbrjpt(QFrd=y%oEt0Qfo;Yh3XbciHi7_TcG5rv)YQF!rVlrbmHO+zJW zW&OK{<(_I|ui)m<{!Q!b!YJt;46Ge>KD_br1 z>2Syxj+_pg^)C`=qo0A}DoMjw0+n!*^6Eo*2E5aoZ_PkHzOzrl`|PJN;WM>W!KpTm zVNCo#95vd8m)bY~))`uc>E%Abe^jWxjt_0nSvyq!6K$Q-p~Ld^S8)b~{L z{ZoX;!(;q1Rol+j+i5XmUS4?RvvXORr|r(R zdvyFxP+#6S4_OA%mXnsz7X^LC3+ICel27i?3N7VmSTFJO=~{^Cr}DpLW6EXx+HghC zs0x7tfRPKKa0+KF#OkJA74$uKT?E5O@;|b1*&=*Nm^m_A^LKo9O~OCgP5)UoOyBo` z_atUUTB#bWJgz4MZO&^|vd>{N!c5

It?i-na~F`jE?(!3pbr zgL|H0%X%hgBQIni>v#v_wI$C5g>v$8TVUia2dC5T$Yma|0-K^FWpfp(@R=d_6xclk zM-IDJ;LE$DN{U6Tw239HlwyC#R|n@pKS>(K7-cH5aHc&AC*@*M`~Q?7=e`O;`#EwI zgu+R|vHmk~TqS83#mZ?2oqx4~tcI=k@%`1PXj|E34XR!gm#sktg(>pk$Mzk~Z!OAv z99OKxLK6XWH7V57tWXzT`xzFR$cI0}jy>F>P(KF+`_(6(W5*uO`JaPpt)@_(lY-v~ zlGcH1Z6^5B(*MsZKY3soq}Y1N;-H$rBU4~*ff z(0Z=e2$@Z6$^-YMzd}FPSI`0-&I9))-_Jv)#NfvkBh6$07KpA;gL62lZa$Wc}V zS0X1_vHQ(vC0A=08~%@?IsrJ(IH=lw%3Ho0yI&4R?!l{;w^eY;{A>@RQj&(zNQ5KR z+S*gC%U*=?o=62P=#9OYZ4bK?LFjTjXvIg1kT#MujLBk-;MdQ|FX%Q}HLib7bLPhT zkULfF6`a&;-3Qq!uGj}z?{~ahl_EG3UtU}xRB8_?EF$DOJeR$O_>_{d3 z!0xZm+yM$@aLjQ)CH+`0L@Tp4P9amg!Y_V7D-&I&Rae%=@rPEe)chhI*7e(?`IsL_ z>aXCKb3$9El&air4|bH}szMQ5c@oZ&mC2N%l6@B_eEZJuk;P=#6zQ^R(3dN4VGFdwhWH^6v9!MTIMI*6-Q3{>nt`~shanc1K55Rf(fkNe@6>{Si-vN2R zvEKn{nuL`45P3UB!Ev3(MIcQ%@*d*NJW`MJFx+N|zpXdDx-uSq$>#pzq?qRL9*Iwt` z{6mJ4kGA?`%VoI}pFS+;7Ea_pGT`3FMVFkxm{q*o0QijXYBZ# z)YyOi{bPZDEbxy7{;|M67Wl^k|5)JvdkZwxg|6rp-KyJk2fcyrs5|M-`g6LA?y9@# z4Rv?jLvN%v)|==}^=7)K?xi=^z4aElkKR&mrTglBdTYIn-d6Y5+v(5i0eXAAgC3{{ z>A`wOy_5ce-dXRWhv;4PQ2j+cOz))rL2^d5SI-c#?TN9s{}Z~bMxkN%4Os@_-c zr}x(f=mYiF^k{vM9-|M|hv-A~Vft`ARv)2{)JN@&+iFvat^7e~LR+z#zqG}9E1H#W zgeG_^eXP7WBff{?VC7v22``Hy{OjiU!D5E}ibGtq5H5Cq$G8~53ueYSI{!pO!EI8< zPMXN0yT`ZYkDcQ7i;?yu=eRE#Dcy-Xw~QMszO*lD8Q1Pb>$)f+Zk-+HYd<+GZjq<; zblhLx-<%TX&{|nBl?~50AN#6z;*PBsuk(m@@vTLwJ*{1Q!#<)tFQ1IB^LXpz_&~A3 zesOZVUnlV?Kgxr)v)z;9&$JTr`F3%U+&;$!n0J+l8 z7^2y37Rs^_g;FC5n?!WEhlTvX?@P^TY9`UNxfZHLe~rSZyN{sXj$0_viD)fGIFKZ0 z`!p*}b|fmJ79%NSjUe@cm2xq_6)eGJkDyMiZS)-m_>nwlVkPhd8--(lXB0>?+A7p* zg^dawh}wx}6f;nv7>fhBV?jNH5A9y0&}Dmgp?cH`>(>>jcH0zZ49z9m)F3x08pc-I zkI#dYGqxEw*skWWYYE481r|(pK zt#((qJtsj6%Sm+lJ5dO?-vfpe4I@M32=;gcM%o@Qu6qzgv-@5!u5-j*FrGAmclZf3&Qdgt3*uYB zw|)boUojYsnh?$5o5f%>VwZhtsjYoeq7z)XPYtm8L*y^}Xg)cq;ryCiO>*^WMl`?^ z0f2UdOYCY};l~k2%8EF0tBw8LsRLVCG13AOiav)XExORk%&`$Ho zav)V)E0G##TE0M3fc7=-{0vA9U;GTnV`$oU!5nD!dEF5pkGbrKYIk!FA?n?g=oFgK zl{1d2ZG=02bQGkPp+qBJB)W;#geO;k)RMC*fP{n*z1fZE5n6j5atufa&pM{s6~~wA z4c+Is>LtHy+pq4kMZZLp#9k-VASL=G9xkU5k2B+ch z4ohUwz<&Uh-Qy- zn62oN>M7=O#U<={;vgARi!NjIiClCU9^Esn-jbsW;Zb}sJ^FYU(Q`bc3Lbqttlp!= z!)4wG{|c(&;cLfe`)sFUiNe|MYm9Z8qrX-U+wP7aN@Mq{YFo!|AsWWJu!uivSJiw` z&UIH|`#tPajdiq+CtAf-)$p$r4WoeU#Jdh5g9KcI6?!BPZRYZ87`q48UISy$XdGEC zybf#Tq@vaF&a$G zWS+PQrmjkxC*1;5=d4?pZKFnH<^JDbHYvixVjDQSOb&ko&dwyFX59H(aCUOyx0vm- zu|%E6$q;YlT}Ah33vRBt!d*x`94!nCU@>#nr0+05^*Cg`yxZVcbMS5OAB;zGnNYvl zy4zT-R2W8YWhj!}2$R?%U2DVxzE>B!x=lnhy-su+&5NtPhwI(A?t3_N|CZROM-(W?*V|EQj5 z|Mpb51jD!~5WTceewcrPOa)Ch@tJUQFFy5?x<$BhaxM1a@fLc&#a+IY=j3PXMJfzq zC2hdx`}ODKXBeU1Y@%Xz{{=Jl9TjYaYK78{o2H3$a_tZOMo7&{KgAj->NkG?SZ=dbI4x_Pc4TAHVzn_k`<)ajhrZ zJ?Ofuy9&MFZYdhZV(YtB!^i`t89(;YJ`$rjzq#fsVz{iiW_Nh^F*-fwx!zi!n<*Rn ztj9t4+$5avMttP_Ei+H%GY;rCi;skqZ! ze6i*@4)(<))fncCP0+9gf>QXNFD9wxCVoJ&9R)3N66EllptfA)2PB*8B+}bOP^hb* z18xEjE9I?$^ycqc19{X?P>s8wX^jLb);85OF(5s%D-4-WrmA~eKhmL%Ia4vWXB;>?);Cu1Y*U5pJ5z#_}oNZ z2m<2B)j>d9Oys)5Hzr~P199h~j@n`2$H|?rt|n%O-vImb;Z9nXvLS#y4yeuey&qKf z=l&`>Hv|aYF00@GLH7grT&~ubqdRM!mg@l2t!lCDe0xDr?AJvLvOrv`YQ?rTfr3`E zV+d3bxznfWF1{0@g^C&M(-qMaSGBu|%d4{&HxJWh*c$Z^w2)VaVTeXt7KR{CiV*Zg z1h?*jJ!Ey$Je{S&F#JWR;K=)^%}#XFa$R@!6!cy%L2pJ18o`sp5ePduD;yy*GYZk% z8v*pPpjJGjJCKf{J~2X#T>1llx#3K~Q-074!qzZ0`IDHW9?JuK-!s zU(oUag5n1X`kuXB1+tDKUWMTtqXnf!^U!5lE7t;gkLFM-Y9&g@k^TFE7(Yl*{}@5u zg9R0EO*`*(dr-ld$AIcsJVe#sInx~so7)F&+gKN0fyoNpd!{*+@1UU^CbQNtf zm-NR7-dx=up|Wy>peMX;076BIh7n}xVKIzI+|GD79)M8!Y9waoMFZjIuefL+))N>f zs71V>U(n`r>T4J+kaJ%HvT?MaeCsrJyM}1d3OJ@CEn)Bp-5ZP zxpt^#SKOx5A2V6NTHL0X$E(;jY>L1;htbf!PdGgman*r8iiJHg zrwV$+Nh8oNle0!ZvwxbPcHDm?EF?t(mCjmxt|#u&SM%ibZK?-v9jPsLtw|AdDOJ$Q z>1I+Mh0WJ+;wTKUaE73t*((m^gcRW*sv+Kd9!FwQoVLz&-%LSMX9-&JmY{rgiN|K} z+#8QY7NsFF<_PM@weeVF5jRP|cp3AgdCw+bkr`YEjl=Hwf_&3CCsk|Z?M%hg5fKzd z=Sk`fW3E_%S|r=7MH(c+r{AOt8qAv#F~B!mDQl@lZwpH2%rV%d6b<9FxC+hFE*uol4PC{a7mmy))pqBrh zSiDR;1oU3Kek_h|Ek}&Qitc3!8pBVM2^TQn9W+B;`Z0rD9!uNIE#K7v!^^doR!eEs*Q8eKC}6`Cc+oJ47?vAKD-& zh^wYT1<}m*9^@v|L)2fN#1;*{&nL1nee3_C(c56`hP4a=i~Z375tXwsrY})3zp#}KwyEO^?9?g zj6e>a4L^hyV*gw5b`|Xu-mS<&x|GcWU#I0Ao7*Sk)R1Q#0H_;`8 zjU^~Gai*&55f{S#RXIF(FKc2i4=8>Xdc!<`>1?|jSU|)*x*?bJ=jE5`(XEUcS z!+x@l3wm~($BvNseK|aweVjYahS%nwfUQrW9zi?H?K9zp`5c`Iqy2J9(2dUp4LvO= zlHFIp)xVtLKhm__d?P~hVarO*ON?Qkm00)KO1X|&aSv-~!!Nvpa_ZT|df!}lNAt2g zyZFC{D)N$`;g@6$(yE~h(!c5~=<5&I8~xPFnl4!QE?h7Qs*1cdu;wTZUIPzY{aN0*HPE<8QQH1Rc%ZxKfo{3*fOZ$P z7N5-pN8`F&aK67Mkkd-mf+I!4NE6G!dB@~5$U_zI=6yk74+Qmkh^vMR^RSaQxiSx~ z*!&1i`VCjjV?iJDY6h~I_cBJUcp@l}Q`ec%k-rX_-cNBlIc_~JGbze?C`jRRV^N{+ zAB*=(``2rWZ57WXEoy^FOWq)9f5@TRzlY^X(J-be3vlK#%rlqv9=25Wrwlvyd~nJ* zA|IR=Nx{4FC(yV_(J&4xUxIU?{tDO#)0T4WMwoUxyS$Ga){86O$AuK4$i5HI%b$He zK%ySS)gNG&qoMC>Q7GD~(5t*@6LvY8D>mVp9dA=8)zMQL8#umBG)BiN?^oI)R% zqNPGxxViwGLbet{`^;CNT0aF9OGP2H&$zY_5f+0VmkeW@b(dKpHT(p{6KbAMfQ&Se zW7bn9a^q7V37k~~L^Y9X)>|gBV;hihoVXpx>n8HZ`n!oN+yP_?2k!(j%|u*n9(aO8 zalK1Rw;l;p5Y|n2{(=8^#(`2k;}qK*f)w)RlHE9a5bMw58R)`!(;ny`@}X>PpEX#) zo9fKHQ2iLJ{CyH#JHcjXTV7CT1J5aj|6Do07@oCvhPDgr7lNPFIB6dcJL~%pLZiDX zbeN;;2&&PXY{!$s!cb`)!}v(ysXwWn7JTK5a@G6^Y<&sttTi05A54Bp!8_b1`w@In zG>qp(7|zp6=6ULO00CRlLqTPD^8m&!VV6>Hsv@ukK3R&hAw|QOBQgbdIWM1HyK9c@ zTc%~%p7vDm=459XXivGi3^eaZ1+RwI9Ry8^cr75l7QApJXm<{3xh@e=3Vnh$q&L?3 zL5b?c9~?qxL~zj|1i|Q+6*`5M!pVoV05|#7Fnp9?oRrSyNwFW+a-HVCqEHQ5HpiAD zROWMfIqt{&zOu7nM03<s|`=0#*cJt%9FJQOXV`axVA{|i^ z!oFu=x8+=P7IvG*m1ki$XU;kYyZveQTZLZ!eB+#!<=S?fLS4rz0$>jmM^hDg zf4V}KxJDv-*rf`{185v(D)bFnb3R)Igac90fnwZ2B6=e6IK!$YE&C&sAvqJcX`v=2akvx#%k5vksamJh>X4kfLEMuw GefvKQKeU Date: Sun, 20 Mar 2022 19:09:32 +0000 Subject: [PATCH 09/14] fix pagetype notify on startup page (add nextion2text) --- HMI/n2t-out/nspanel_Stats.txt | 2 +- HMI/n2t-out/pageStartup.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index 7d962b9f..677503f8 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -63,4 +63,4 @@ Total 14 Page(s) 343 Component(s) 3175 Line(s) of event code - 790 Unique line(s) of event code + 789 Unique line(s) of event code diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 4893217f..113fb3b8 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 9 + Text : 10 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -605,7 +605,7 @@ Timer tmSerial { page pageStartup } - if(tId.txt=="pageNotify") + if(tId.txt=="popupNotify") { page popupNotify } From b0027d4c3c41e3a92af7c03e2aa9f7bda7bdc30d Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sun, 20 Mar 2022 20:15:53 +0100 Subject: [PATCH 10/14] fixed dimmode on popup pages --- HMI/nspanel.HMI | Bin 7356153 -> 7356153 bytes HMI/nspanel.tft | Bin 6283036 -> 6282992 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 73e920266e55eaad8258ac6c4d29ae31d47e3a68..d1725252790fd269da0bec02d355db5cf25fe44c 100644 GIT binary patch delta 1759 zcmeIy?@v=_6bJBg+uI-e5!RMg#X4-+z)c-c@VP}8oyr6RN9`0g+^Pc8fyK6oIN^o- z2*GY_hOnFXU|baSg-bNigvCcq2z6#JG?|kS-z^z0WIvN>G81sqbl=izD*gj|vnTnq z=bq=DC(Svx_u=EX{vlkn>UB5$YNq~(MCvL1Vo6f3=*zq;KiWi3t@61{x>|!o+)p%q z(m49nfNuU8so4#78kC8oxL;i**Lyuh3yV*i81)2jW7345TyP6#EW;V@Mn>BVs11-h zCD&(>XJKvk1f$6Y?5pbyLtf7_yS<+&G=|-$f7SdoQpM8>4J1#F`^QYiYf_+i;mI`h zeVAGfEi9hDMoOuTkPF`^CVHl>0egL@lhnti{jOhrTl?Lu@kfT}v8DRu4v9*#qjU|W z5~|Nl9&hU(Hphm|66in=G8n)phRvqPtVkqGw*P04eysk38N?Eam%sv6%){oJGaRnV zabD$TP3-gVcot@f^-n&LDLGdxT_Mr1J{7CQM4xK0(@S(ji@z=<8r0$_=7#RT;6*y z=n(h)N}U|*tFnUw7Qtdz0$H#WoUjaDhHO|4E^tE*yaKO6F66-qcnw~Mm9Pp{!yAwf z1yBecD1u_qSGC3+mv4u=I>k*(rXe7C_~eq{ff)YW!riFsEHsQ-d*WwwxVTQDhcZi`ltIQTn z)!`S+V)|!xUE*k>mEYeN&J$biga##!PnrLa&;Ay@f3T^QJX&Fud33h@cRt#$$A7%eTE*z$(2a6ki6Ta8Y_w$**{skpy60HCL delta 1734 zcmeIyZ%i9y90%~<^?Gf`6iQo|z=Xnvo2xCW&B6CKlFlxU`@@xdiz#cU?V=#0i>amg}Y5NAjhqsGAk;`iE`R^v-w`Xryr zbN74hxy$#S=N6XY;sSh-E9%b0RI7MIs8Uaes{~R%5gXOD2J^a&^H!Q{ClXHA6HV6` zh#l2w=UV%*#YV5`QH$5B4t=Nkn`rjDX_V=_RzGtNJeDmc&T;95?J`XmFg{WH z33Jtn1KYHjh)TL;>XK0V^rFi3op_JyCG9=RrB`aHx+1hQIV^EJFzli*?i0?$@Qf_u z;^-BfcCNKQzIV~7EY!}%Vsp}rAk*LPrEk9sP-FlDrr(xo{!#1N8l*wgNL?~MV|Q*+ zUjJ%(Q3{O}iY0jh)fIiYCyTh~ zKTdXNc{vBnkc*TpP4m)sC$G*-vX*)4;lTR^+9QePDu|5Q*FyWHk|-)B`;i)=L#h7C zTB0MV{;>w4ms0(*CZbZTN3D50MD|p_uMG3H{g+jt@C9S&r%_zxBb|N4TfPd_x+YJ)t;hgEO`6hI*q z!D_e>ilGGTPzq(R2G&A3+yv`jJ=_c%zyY_wtxy4#;Djouh8jNDdRu8+8Xl{fJf95j zLMprh1ol^Wc4s=g4>Q86&j|0cjPN=#!h0$syl6&vNBSP@+DsFbEJ@+K@u2yUxE7ntb7JA2`XO{wsnFS6i{iAWS zg`HTkyf^xh(wa(puTSQCeXf-bXZ27*aq9-UbqiBp$qPZ2cR1sgdNZW3izNG9)g{)3;LiRcEiK)2s{dp z!QI0 z-xVTi!~b7vZ#9QXhL diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index a77540c9dd94398853c29bd312c4c74b67023a29..ea684339f6c314d2ac77ac6a2f61af1aa255be15 100644 GIT binary patch delta 6439 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 J`R2_<{|0RK*X#fQ delta 6127 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 Date: Sun, 20 Mar 2022 19:16:13 +0000 Subject: [PATCH 11/14] fixed dimmode on popup pages (add nextion2text) --- HMI/n2t-out/nspanel_Stats.txt | 22 +++++++++++----------- HMI/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out/popupLight.txt | 1 - HMI/n2t-out/popupNotify.txt | 1 - HMI/n2t-out/popupShutter.txt | 1 - 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index 677503f8..2ac5ccf7 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -14,26 +14,26 @@ cardMedia 22 Component(s) 210 Line(s) of event code 116 Unique line(s) of event code +popupNotify + 17 Component(s) + 171 Line(s) of event code + 113 Unique line(s) of event code pageStartup 19 Component(s) 146 Line(s) of event code 111 Unique line(s) of event code -popupNotify - 17 Component(s) - 172 Line(s) of event code - 114 Unique line(s) of event code pageSwipeTest 18 Component(s) 62 Line(s) of event code 44 Unique line(s) of event code -popupShutter - 19 Component(s) - 195 Line(s) of event code - 107 Unique line(s) of event code pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code +popupShutter + 19 Component(s) + 194 Line(s) of event code + 106 Unique line(s) of event code screensaver 25 Component(s) 173 Line(s) of event code @@ -56,11 +56,11 @@ cardGrid 224 Unique line(s) of event code popupLight 27 Component(s) - 339 Line(s) of event code - 171 Unique line(s) of event code + 338 Line(s) of event code + 170 Unique line(s) of event code Total 14 Page(s) 343 Component(s) - 3175 Line(s) of event code + 3172 Line(s) of event code 789 Unique line(s) of event code diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 113fb3b8..f5145f54 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 10 + Text : 11 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index f3b1f895..ecd2d2d7 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -942,7 +942,6 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index f7dd7612..f55c0010 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -524,7 +524,6 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 72fc2b4e..c2735289 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -631,7 +631,6 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue } if(tInstruction.txt=="time") { From 6983ff1532a3343da61e6b483de0ccb9e2db2d5f Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sun, 20 Mar 2022 20:20:44 +0100 Subject: [PATCH 12/14] implemented auto update --- .../nspanel-lovelace-ui.py | 72 ++++++++++++------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index 5204202a..6ebda9ee 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -18,48 +18,65 @@ class NsPanelLovelaceUIManager(hass.Hass): class Updater: def __init__(self, nsplui, mode): - self.desired_display_firmware_version = 6 - self.desired_display_firmware_url = "http://nspanel.pky.eu/lovelace-ui/github/nspanel-a023d2e.tft" + self.desired_display_firmware_version = 11 + self.desired_display_firmware_url = "http://nspanel.pky.eu/lovelace-ui/github/nspanel-b0027d4.tft" self.desired_tasmota_driver_version = 3 self.desired_tasmota_driver_url = "https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be" self.mode = mode self.nsplui = nsplui - self.current_tasmota_driver_version = None - self.current_panel_version = None + self.current_tasmota_driver_version = None + self.current_display_firmware_version = None def set_tasmota_driver_version(self, driver_version): self.current_tasmota_driver_version = driver_version - def set_current_panel_version(self, panel_version): - self.current_panel_version = panel_version + def set_current_display_firmware_version(self, panel_version): + self.current_display_firmware_version = panel_version def check_pre_req(self): # we need to know both versions to continue - if self.current_tasmota_driver_version is not None and self.current_panel_version is not None: + if self.current_tasmota_driver_version is not None and self.current_display_firmware_version is not None: # tasmota driver has to be at least version 2 for Update command and panel has to be at version 5 for notify commands - if self.current_tasmota_driver_version >= 2 and self.current_panel_version >= 5: + if self.current_tasmota_driver_version >= 2 and self.current_display_firmware_version >= 5: return True return False def check_updates(self): + # return's true if a notification was send to the panel # run pre req check if self.check_pre_req(): - self.nsplui.api.log("Update Pre-Check sucessful Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_panel_version, level="DEBUG") - # tasmota driver needs update + self.nsplui.api.log("Update Pre-Check sucessful Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_display_firmware_version, level="DEBUG") + # check if tasmota driver needs update if self.current_tasmota_driver_version < self.desired_tasmota_driver_version: self.nsplui.api.log("Update of Tasmota Driver needed") # in auto mode just do the update if self.mode == "auto": self.update_berry_driver() - return + return False # send notification about the update if self.mode == "auto-notify": - self.nsplui.send_message_page("updateBerryNoYes", "Driver Update available!", "There's an update avalible for the tasmota berry driver, do you want to start the update now?", "Dismiss", "Yes") - return + update_msg = "There's an update avalible for the tasmota berry driver, do you want to start the update now? If you encounter issues after the update or this message appears frequently, please checkthe manual and repeat the installation steps for the tasmota berry driver. " + self.nsplui.send_message_page("updateBerryNoYes", "Driver Update available!", update_msg, "Dismiss", "Yes") + return True + return False + # check if display firmware needs an update + if self.current_display_firmware_version < self.desired_display_firmware_version: + self.nsplui.api.log("Update of Display Firmware needed") + # in auto mode just do the update + if self.mode == "auto": + self.update_panel_driver() + return False + # send notification about the update + if self.mode == "auto-notify": + update_msg = "There's a firmware update avalible for the nextion sceen inside of nspanel, do you want to start the update now? If the update fails check the installation manual and flash again over the tasmota console. Be pationed the update will take a while." + self.nsplui.send_message_page("updateDisplayNoYes", "Display Update available!", update_msg, "Dismiss", "Yes") + return True + return False else: - self.nsplui.api.log("Update Pre-Check failed Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_panel_version) + self.nsplui.api.log("Update Pre-Check failed Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_display_firmware_version) + return False def update_berry_driver(self): - self.nsplui.mqtt.mqtt_publish(self.config["panelSendTopic"].replace("CustomSend", "UpdateDriverVersion"), desired_tasmota_driver_url) + self.nsplui.mqtt.mqtt_publish(self.nsplui.config["panelSendTopic"].replace("CustomSend", "UpdateDriverVersion"), self.desired_tasmota_driver_url) def update_panel_driver(self): - self.nsplui.mqtt.mqtt_publish(self.config["panelSendTopic"].replace("CustomSend", "FlashNextion"), desired_display_firmware_url) + self.nsplui.mqtt.mqtt_publish(self.nsplui.config["panelSendTopic"].replace("CustomSend", "FlashNextion"), self.desired_display_firmware_url) class NsPanelLovelaceUI: def __init__(self, api, config): self.api = api @@ -123,7 +140,7 @@ class NsPanelLovelaceUI: self.register_callbacks() def send_mqtt_msg(self,msg): - self.api.log("Send Message from Tasmota: %s", msg) #, level="DEBUG" + self.api.log("Send Message to Tasmota: %s", msg) #, level="DEBUG" self.mqtt.mqtt_publish(self.config["panelSendTopic"], msg) def handle_mqtt_incoming_message(self, event_name, data, kwargs): @@ -151,7 +168,7 @@ class NsPanelLovelaceUI: self.api.log("Handling startup event", level="DEBUG") # grab version from screen and pass to updater class - self.updater.set_current_panel_version(int(msg[2])) + self.updater.set_current_display_firmware_version(int(msg[2])) # send date and time self.update_time("") @@ -164,11 +181,12 @@ class NsPanelLovelaceUI: # send screensaver brightness self.update_screensaver_brightness(kwargs={"value": self.current_screensaver_brightness}) - # send messages for current page - self.generate_page(self.current_page_nr) - # check for updates - self.updater.check_updates() + msg_send = self.updater.check_updates() + + # send messages for current page + if not msg_send: + self.generate_page(self.current_page_nr) if msg[1] == "pageOpen": # Calculate current page @@ -263,14 +281,15 @@ class NsPanelLovelaceUI: def handle_button_press(self, entity_id, btype, optVal=None): if entity_id == "updateBerryNoYes" and optVal == "yes": - self.update.update_berry_driver() + # go back to main page before starting the update self.generate_page(self.current_page_nr) + self.updater.update_berry_driver() elif entity_id == "updateBerryNoYes" and optVal == "no": self.generate_page(self.current_page_nr) - if entity_id == "updatePanelNoYes" and optVal == "yes": - self.update.update_panel_driver() - elif entity_id == "updatePanelNoYes" and optVal == "no": + if entity_id == "updateDisplayNoYes" and optVal == "yes": + self.updater.update_panel_driver() + elif entity_id == "updateDisplayNoYes" and optVal == "no": self.generate_page(self.current_page_nr) if btype == "OnOff": @@ -462,7 +481,6 @@ class NsPanelLovelaceUI: if item_type == "switch" or item_type == "input_boolean": switch_val = 1 if entity.state == "on" else 0 icon_id = get_icon_id("flash") - self.api.log("test_test: %s", item_type) if item_type == "input_boolean": if switch_val == 1: icon_id = get_icon_id("check-circle-outline") From 0b58f16a0e98dd924570c5f218f75684b31106d8 Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sun, 20 Mar 2022 20:27:02 +0100 Subject: [PATCH 13/14] added auto update to config examples --- README.md | 3 ++- appdaemon/apps.yaml | 3 ++- apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py | 7 ++++--- info.md | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2ef085fc..fb337f13 100644 --- a/README.md +++ b/README.md @@ -250,7 +250,8 @@ nspanel-1: config: panelRecvTopic: "tele/tasmota_your_mqtt_topic/RESULT" panelSendTopic: "cmnd/tasmota_your_mqtt_topic/CustomSend" - timeoutScreensaver: 15 #in seconds, values between 5 and 60 are allowed + updateMode: auto-notify # possible values are auto, auto-notify and manual + timeoutScreensaver: 15 #in seconds #brightnessScreensaver: 10 brightnessScreensaver: - time: "7:00:00" diff --git a/appdaemon/apps.yaml b/appdaemon/apps.yaml index fc5b85ef..524f35bb 100644 --- a/appdaemon/apps.yaml +++ b/appdaemon/apps.yaml @@ -5,7 +5,8 @@ nspanel: config: panelRecvTopic: "tele/tasmota_your_mqtt_topic/RESULT" panelSendTopic: "cmnd/tasmota_your_mqtt_topic/CustomSend" - timeoutScreensaver: 15 #in seconds, values between 5 and 60 are allowed + updateMode: auto-notify # possible values are auto, auto-notify and manual + timeoutScreensaver: 15 #in seconds #brightnessScreensaver: 10 brightnessScreensaver: - time: "7:00:00" diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index 6ebda9ee..c36c97d6 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -77,6 +77,7 @@ class Updater: self.nsplui.mqtt.mqtt_publish(self.nsplui.config["panelSendTopic"].replace("CustomSend", "UpdateDriverVersion"), self.desired_tasmota_driver_url) def update_panel_driver(self): self.nsplui.mqtt.mqtt_publish(self.nsplui.config["panelSendTopic"].replace("CustomSend", "FlashNextion"), self.desired_display_firmware_url) + class NsPanelLovelaceUI: def __init__(self, api, config): self.api = api @@ -92,10 +93,10 @@ class NsPanelLovelaceUI: self.mqtt.mqtt_subscribe(topic=self.config["panelRecvTopic"]) self.mqtt.listen_event(self.handle_mqtt_incoming_message, "MQTT_MESSAGE", topic=self.config["panelRecvTopic"], namespace='mqtt') - if "update_mode" in self.config: - update_mode = self.config["update_mode"] + if "updateMode" in self.config: + update_mode = self.config["updateMode"] else: - update_mode = "manual" + update_mode = "auto-notify" self.updater = Updater(self, update_mode) diff --git a/info.md b/info.md index 4b3e2ade..05834e98 100644 --- a/info.md +++ b/info.md @@ -11,7 +11,8 @@ nspanel-1: config: panelRecvTopic: "tele/tasmota_your_mqtt_topic/RESULT" panelSendTopic: "cmnd/tasmota_your_mqtt_topic/CustomSend" - timeoutScreensaver: 15 #in seconds, values between 5 and 60 are allowed + updateMode: auto-notify # possible values are auto, auto-notify and manual + timeoutScreensaver: 15 #in seconds #brightnessScreensaver: 10 brightnessScreensaver: - time: "7:00:00" From 4ce16095b5aba80ecc09df271390ec1e90e6c3a5 Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sun, 20 Mar 2022 20:35:25 +0100 Subject: [PATCH 14/14] change requirements for auto update --- apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index c36c97d6..1979f6e9 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -35,8 +35,8 @@ class Updater: def check_pre_req(self): # we need to know both versions to continue if self.current_tasmota_driver_version is not None and self.current_display_firmware_version is not None: - # tasmota driver has to be at least version 2 for Update command and panel has to be at version 5 for notify commands - if self.current_tasmota_driver_version >= 2 and self.current_display_firmware_version >= 5: + # tasmota driver has to be at least version 2 for Update command and panel has to be at version 11 for notify commands + if self.current_tasmota_driver_version >= 2 and self.current_display_firmware_version >= 11: return True return False def check_updates(self):