From 80f61ea9d1038dbb28fdf1c4eba2c43821437fff Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 18 Sep 2022 19:45:55 +0200 Subject: [PATCH] add back 6 entitites to power page, remove upper text box --- HMI/code_gen/pages/cardPower.py | 10 ++++------ HMI/nspanel.HMI | Bin 8986130 -> 8986130 bytes HMI/nspanel.tft | Bin 7730524 -> 7736356 bytes 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/HMI/code_gen/pages/cardPower.py b/HMI/code_gen/pages/cardPower.py index 14f98de1..a77c639a 100644 --- a/HMI/code_gen/pages/cardPower.py +++ b/HMI/code_gen/pages/cardPower.py @@ -10,9 +10,11 @@ head = sharedhead + """ covx tTmp.txt,t1.pco,0,0 // icon home spstr strCommand.txt,t1.txt,"~",4 + // text home + spstr strCommand.txt,tHome.txt,"~",5 """ print(head) -start = 5 +start = 6 for i in range(0,6): idxstart = start + (i)*5 item = f""" @@ -24,21 +26,17 @@ for i in range(0,6): // speed spstr strCommand.txt,tTmp.txt,"~",{idxstart+2} covx tTmp.txt,t{i}Speed.val,0,0 - // upper text - spstr strCommand.txt,t{i}o.txt,"~",{idxstart+3} // lower text - spstr strCommand.txt,t{i}u.txt,"~",{idxstart+4} + spstr strCommand.txt,t{i}u.txt,"~",{idxstart+3} if(t{i}Icon.txt!="") {{ vis t{i}Icon,1 - vis t{i}o,1 vis t{i}u,1 vis h{i},1 }}else {{ vis t{i}Icon,0 - vis t{i}o,0 vis t{i}u,0 vis h{i},0 }} diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 79920c14deed68b82325d5db11fff4cee7c689f7..8b0a9ba834cc9e6e156816d81cbad773749a4cc4 100644 GIT binary patch delta 5249 zcmeH}dr(y88OFbFcL7C^Mcl)lBiD1PMnUDaUJ-$y5>Z&SY85G9!An%|g7FIKvRua4 z1Z2Y7#2cxaR7)ci^^B<~8*OZ7GHMewNn?oAj+0CqturRZYHOdpkaJ@CNB?Z6oSEP7 z?0)a%yY1oGbLOyV58%b^{5+3bUA&@fboQ+0nD0rLZ)P_Q`0)FD#+rI~xRJk`-|>hK z_2Y?6u>oO=zdVFNH)r$N-#YWzrOwCxt><1hG{#EIu#hqC9_yUpA9P{8(Qz6YPtz8O znPM?^!NyrGtjFZlKM!JTBF5a$jZntgMtk+{bjAX>S2tzgn)q_{FH}V+!sc+KBa~XTdr(N?k zowrESpB89(Wiey>eewND(Z4sjdAT-_yo#}1zM#%>Orlq>(_$9ApyhtPS^K`GQq%HI zO`mfzR`07bz22wY>%aV>Hn8AjO@FpW)61GQefL$y0)0F2@HI^v_h~wKzox?vXgcv?N5ZkRCG|Bz{k_tcf!Ny<^eIJ*(S-B&X8h93Ue5k~1IF@);JNd<-^E#I$sykw(7KT)Oy<0ZwNozy%*s-nFU zq-vTpQK~^x*F>pG-_(=T+qmHf%3gU-_H<67MX5;sDiz7EOqOaW_KwrnIW_I6&a~#J zXyeJ=>6`nD18Kk%?+n@~FC7K$rb|gQ<$Zascipjc;(fW`JM-|C@a=%7MD+))K{W^b)grspIf$oFOPF$=%BpGvYAciCn=e@f{vq}JRXDC*-X~}CV$b>htQ|>&1L_PId!d;1giX}{1&BuEDGOiK%ZR_wGOSEV)`o<3N$D#euP4A zi3|7@^`2d^a<$MY&F2)4 zHQf%$>@Ar=3DuJDRNdk`QGyzCLtJm974xbsbT&vKL-JTPoJ%X4sNOjP(8%2mxZJ z+wyeOwG9q|1~?tQUbn}6+iT6&;uKB=n=wA>DCXjsue-)m^KGQACFVGq^lP-6+$P

yCOl zqmEJ6Z*X~TCy2xFZkb(Vw$REyM)jxDLRc_=LX8<#i+X%1c7-rg7uhF9=g_^yVls7Q zS~LHbe*h|e0Hcln+F@VQ)||tvsaV!_UgROUghZQ)dxCz zm9Mi`w{-UEOP#%XuvfEATxYKa=?YYFab;ilRzq%4AQ_9kPb3HCU_QPfvI2`m=3bRb6^I@ z0W-lYkPGsF9n1!Ez+CV{Fb~WJ3&4-SLa+$rgTqvMz9IE_jU`|3buhtPzAPw9bhMLfNJ0bHJ}#M Lspqrn^RE31ksY%t delta 6393 zcmeI0i&IqB9mmgIo)S@X-DS^31$L{Vpu(a;j8R0R#uun5(TElwiHaf%!9)$hx-2X< zQ-fms`5e}FBi5|ddNUObKJutd6=!0{q>bX(F=Aq<6Efo%Yx~{Zdp+0w0qJA7GoRVt zp7T4u^E>x4eD8NRH|-DI45Wf%(s`-ABP1p|H7|y>8W@u38N2y-?XoCuL^xZ-}|$brFjt>ycgf23S)&bDU~tmr(HpR_(~LvC$L!bI0vnR!X72`(ybR z^(&%=RW(I!M3e z{Wzf#0?rHs|8g)DD~*tB=ChnTl?$FQg6^PgSm5bR~vU z^BSv_3O4d6Wy1z;j4-68DVuK9OpR3TZsRw@$lJg}Dd#W`qof8t%rJZqNfA7ODjImc zG=fSFaG8F<1o_G>M#>81-D!%K+d@`398}`vsa=bQl&vmHu~t}9GUMpjKh3?U`(L z)AD`1B3L($?(F04VDUXP`fHckp78)G2RhG@GU)69K0eTFpsZb2R@bhbG7gHeCk|?5 z<0#`0uc3htEmpd5NNaey!EX20O{Am0*7uw)iraNP`?PkQ?}@r0hk5!|6YrroLaK*! zS9YG^r+ZS_HGYAztj2J3)WsK_3p5&6E&pYo-<}52w6VK2zGR+|RXHB&B$yoF`Fxt_ux!@QP2HF%jf9zaHE+TrsH-f%KiNK3lcTUv0G@_>?#v|G7Sk0qmb`UP~J^&mrCS}?)^0_ zn}g|`8JPBslf&ucIZI5iNW8MZXW1oDLf_aXa=wZ-uDv9mrIu@+aQbRvteSOIzttrJ zHYk`aH`16g8@5vSOOYIb^Xa#puGE_8&Ri{3>s?EI`Uuy%pl)3eb{9QfUW9`_)#J2M zmzgXjPxTnc()GBEnis|-lc{ICnY?9k2emBqn5i#E^f(rqjM?Jqph%9$G1k^Wxmh^I z;0cJLUqCdETxX*%-fJ1?e+lT+p@96cfDWxzb?6_9gvRX9=}?kRhd$Ej&_bOK-CZT* zqg1Cu56i{4OQ%CodL7!V(;-=>Lwj{PbVR2^Cv`g1tka>3Ivx7FzEg*^f9#z)1j+iz zb%+f1Oo9;QQ%E~+?G&RRY11>CFDB%AnN$H|eBO6uBV|uONQ89aGr51+6|q z4zn?oeDBC3C}yZDnTq?_Oti7o(@0VKs?1yWy79Jl3NInPQ*wXBIp6hh2%T9R)79fW zErU4F8}tEvK|DxMyr&bV-;Uln(zwF!v;R$$8&r!^sWXSWBZN7u(3!&zU=9=QK~4K& zoG^#2FngLg+&xj4!xB^4Y2u4>SZc+%SJPgl5f|(baUp(V z5$4blV;J7)`urX>?LY1MYMwak#>1LVg`o@>)kIp`C=6w4w9ZdH)%NAafLTpDBE0qG zBRX&W=5K^mO;@ezgrlPJ&~C#;>2#e{wbRa{!UtR4_rKOC&iDC>Nb(uEP4PZc{W$!8 z)U1-SX}C;=PJ`NMQ2hp#=9hT-Q2U>2A5;6aT22LVHElGdPYtKaeAgLrj5H?Gl5!8n zPb;1_%89Qrk@I6qC^^gVb$JCQy8X4bjjj`Z3UO9=?oqK5V>ttQw|UM_vVot0exN@X z0FuB!FbE`r6fhVJ0YgD5NCS3|4u*l@Uy3CV>~hWH1Fx1=GNEkOOkT3@{VS0xyA|gFNsum<{HDSHN7559WdS;1{3(EC36^ zBCr^|3SI+Cz*4Xb6oTbo1tN_W2W4Otcmuo%R)aNQEqDu*gLR++R01bh V4_u%MxIs0j0UqW2q}rUT{{l9v1Zn^P diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 91716046584f3485376c17bc8ee08031bd4a2c92..e671becd6c80f6e42d799411b22286b51bbf37f7 100644 GIT binary patch delta 21694 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 L-WWcAfBOFe{1?w7 delta 19036 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