From f47360544ad906cdd29ca644b0ed48ce256bfbb7 Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Mon, 4 Apr 2022 23:25:34 +0200
Subject: [PATCH] fixed serial cardGrid

---
 HMI/US/landscape/nspanel_US_L.HMI    | Bin 9612768 -> 9612768 bytes
 HMI/US/landscape/nspanel_US_L.tft    | Bin 8513456 -> 8513456 bytes
 HMI/code_gen/pages/cardGridSerial.py |  12 ++++++------
 HMI/nspanel.HMI                      | Bin 9564634 -> 9564634 bytes
 HMI/nspanel.tft                      | Bin 8513396 -> 8513396 bytes
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI
index 5cbb9dc5dcaa26365022b2b5f8465f0962343225..2cff68f0ca7c63d694328d26669756829a976dd6 100644
GIT binary patch
delta 1156
zcmd7P*-ung90%}wVHQnYKyXkIN8HAWj=(4~lp<9TP;hHqT5;y!zEn}^GNpAW`c+Vr
z;}y-%xZt=(+qy-Qn?AIm`e34M%8O41#Rp$ZG{*SQ#s~clXk-5aZ}Q2x=lt$B-+Obr
z?%j5DkvYRMy{2JhrkSP{^rmmDUbo3#R#|Smxk_9~MsWf+3C7jhL(cr1fPZuK+acGk
z=CILtls7jz4db_`&Oa}YO6=bAXpK)9{xZWbZ+0535!ZRsXw7u9r#0xVbsTwKQL!W9
zZj881N}xn?kds_?#O-eS=ly;=Bq13Ckb+bUga>IDguxhsbPPoXhQW*B$ixVY#3+o$
z82B(2A7UJ`Fdh@&$3$c!2e}Af5+)-LQ;?4!3h)sM@iB@p6~*`j(=Z(~P=c8#MH$L5
z3$syyO3cAr%)@*vz^C{O3$X}`u>_yv3oJzymLYUK+|}&xrB~mz@856vJ=6Z{Xkc8T
zcu%SfX*;NLWqr{4S=t@?miSENk&Y9pul(fHA;~Ya{E{8hsnT&yxuuUNB@YU%;D6aH
zc_JLVtk=It?6A6JM&)8J-5^(dA&30EU1z<Mj`Y?_URGKK@pPHAEw!%4GhUhSfj-Zm
zbxgep)`hHhgH^{_J1qP*Sk%VG;#2x!PkK?m?)0mEtW8>OIplcF|I)Ynv-a1sy1RBR
zdumRqDl=*)Cu@)CjE)$e8<eZPv{z;i(4qJ~kSz}vSW~4wrd)FAv{KCUKckwsbf)Mk
zNBj|)ct{PA#i{yVp3Wbr8@RNbQx|%MISDF7V#fk5xpG9g?U+aZvBG{-pzfIVwvsSR
znRl(lBdUGBOEOBsh0>m<Ja$cKIFcwyj{_cw=Ba72H;sqSa@7mdF0YJ-I>zwd^o)v>
zr;#J7rscGPR?;e3O>1Z^t)um{fxe`Tw25kHGi{-*R7+pc*Ypj2OA-2x>gap=fwobU
m>gh*npzXASKs#v{HBuAprajb5duboFkf!})@e>a`t9uPnsJ;^b

delta 1126
zcmd_l+fz+p9LDi??e>8SV>`4fNe(3`wG(NRjyg#SIYs+jId4?RSq|x`q_o?NUd9aF
zxXWNNvu2pgHo2<w2Nc=d7;d=G3^S(jNH_ilYvwa+&HJ6-@0}GG={E;R%kycGT9t1>
zh$eil$Z%2VsZJ;;E)<hbuGKCwO+sjcuBWxPEtiGgB}!?iH^Wla*=P#1N)csd_i^Cm
zW06Tiy$>t}oo`I$4k<jrY)x#vW0t_3q@d<|e-~Fhlp;Bm?e%m`I1`RlPTu$D)%8w_
zG49iP2P`7_pLVOndN(ZT-!m~h+Ab#c-qLKf4c)fpZkt9X3L-OE$ZB-kY-K<Gzdwc@
zGcXggFdM;eAOxWZ!yJTTE+Q}wk(iGKScpZ4LNpd521^i&rHDg3mLUO&a3TrIk&G2s
zi4?3tDqL8NHAur+q$2~F$U-)9unxJ%Lp};ni1jGK1{7l>N>GYT*o-YG!&Yp=cI?1T
zlw%imqXO<{GSI4WBkiF|&ndU6&QBF~<s9)^Rdt;^P08>|hvBbt-w!f+#&l1x@u5f_
z(v1F8eIUhr_47!M@%5*Bc#3+I=yj;~CYfy%$F|p)REI_O8Pf;7{U#$~sthq1i7#}1
zk57~J(Mqq^tt#-V!rmFfsrlaWcq7#B<<#@6o3GU9TDOBC+vw`^j%cbhz1*Xoyqyte
z47ub%i?V-7cBrBZnXNeEFj{itcg;{)5}FE)vrneBbbTV74N|2&?GB~;JFF@qU#2O4
z3QJACWSQ7>DMg>$^liERU27h9>QqU4XfN%f{d9m1(joHDVLC!bsfwzphK|v3IzhE`
zl1|ZSIzwma9G#~NR7V%-5?!V%R8Lo_fk2JaM9p-KTIf2pQXAc%cJfjO`HXSr&5w1z
E0evx=CjbBd

diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft
index f4286eca683649fcb146aad1c00ea707c7224851..252c0de60d16ae05768985632777db93df503852 100644
GIT binary patch
delta 613
zcmY+8J5y6p6ov1Vpn$IkNgxD+##f>dNdjncZ*mhsQP7A8zQs4b@PRKv4#qh1&F}*(
zZeyX17B&>lV5wtglc8~}bS$*;FF51QO+~TJo;7=YXRn3IylX*JMrQ?exTt3(t7xE+
zCRVeCwX9=3ZZ^<N3m&}qXr&E5?F8sxBSAXZ#AZTlVJq9%&JMyv*vT%U?52x7bQ2>^
zf*yM5V=wzilET0wO$LiBIrh`f00%h8Acr{25W^hdD0z-C!f{49!5HJ5<P@hl!&%O8
zo(oKHkxN|W3Rk(tbtbvNO>S|UJ4|txd)(&%(>&x6k9opVW+*UA@q-#m>ZQf;q#Dxo
zlKncRT4j7pse+7{p~9|GDB5S2O%<>Uh6>u1uSKu@-cTOde=?l(cSFsJ8#Pr##+<3r
z_ViNGXID(+X%{@!>(w-^v93XX*{o?%-R+S#RI>k>4mXo_xHoB)7W}8Uut4$Ha;T#Q
z$s+Er{-(L~zb*E!Z^eK;oKYh}zRIXbeU<E~)%~53x?g@s5x?cs?Xpyx<OVJ0>}RVM
zPjuJfO<5I`Z6vEA)zXQ?^81~>TIs2*L;sPOq}{n{>G^z4iRMJlL{<M>R9?*IUQE1o
JO}<;w{{vXt(Bc39

delta 609
zcmY+8xl>bN6vf|@hXQU9!WsmPTcQsn382Y)+1yajhzRZ??i=n4As<Sd`OWYLSiHtU
z8yg!6XK<{vwb9D4V=T0C#=pQBZ@yPiobP=1-gE9f^Izwzc|jSIWmI8N&2m;yLoIcz
zWEHDf!&(BYqn-wWG}1&fEws``h<4V~K_?s7NSIA*W(!-{MuaHa*?~<L-Rz`?7;zHx
z(nmkL*iDiY4lZdjWXX|d4}00iehx6eK@Ks<5QjNJfujs_j1i7A$`~g&$tg~AhO?aG
zJmXwof{R?@GFQ0DHLi1mo800ylicAh_qfjk9`cCCJmD!*6q%;<UX3PAdtof822IoU
zUZ+&E(1(;N3dI~1vFxzj@0DE@@`{e?knXoHrJ(oDQ9=2Ca<u-3qo$=AaaB}k##L#d
zk5aXXJJ#1|7)EVXjrp?PFl;jrls9a9|6FaFN^8@bv^FhD6_IH?w$#+_n`97gt!y(a
z^G}2K^Lr`e4Q14@oO_i~(dvq`*H8N^qtjYhy}moET0}IE)i*y&v!YG(_}aRh)<$!F
w;zVNU@y;ec@nlZBe~V0Z1@e`|bA`MT%m|(do(pCL<%L52#rRumqU-PCe`7MkyZ`_I

diff --git a/HMI/code_gen/pages/cardGridSerial.py b/HMI/code_gen/pages/cardGridSerial.py
index 7ed2d5ac..ab3c6778 100644
--- a/HMI/code_gen/pages/cardGridSerial.py
+++ b/HMI/code_gen/pages/cardGridSerial.py
@@ -3,7 +3,7 @@ head = sharedhead + """
             if(tInstruction.txt=="entityUpd")
             {
               // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
-              spstr strCommand.txt,tHeading.txt,",",1
+              spstr strCommand.txt,tHeading.txt,"~",1
 """ + navigation
 print(head)
 start = 3
@@ -11,9 +11,9 @@ for i in range(1,7):
     idxstart = start + (i-1)*6
     item = f"""
               // get Type
-              spstr strCommand.txt,type{i}.txt,",",{idxstart}
+              spstr strCommand.txt,type{i}.txt,"~",{idxstart}
               // get internal name
-              spstr strCommand.txt,entn{i}.txt,",",{idxstart+1}
+              spstr strCommand.txt,entn{i}.txt,"~",{idxstart+1}
               if(type{i}.txt=="delete"||type{i}.txt=="")
               {{
                 vis tEntity{i},0
@@ -21,14 +21,14 @@ for i in range(1,7):
               }}else
               {{
                 // change icon
-                spstr strCommand.txt,bEntity{i}.txt,",",{idxstart+2}
+                spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
                 vis bEntity{i},1
                 // change icon color
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+3}
+                spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
                 covx tTmp.txt,sys0,0,0
                 bEntity{i}.pco=sys0
                 // set name
-                spstr strCommand.txt,tEntity{i}.txt,",",{idxstart+4}
+                spstr strCommand.txt,tEntity{i}.txt,"~",{idxstart+4}
                 vis tEntity{i},1
               }}
 """
diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI
index b55c629fabb0fe897e013b8455b4b94de47488b8..bf9ca02a7b6db9c6f133f1bb3ee40a1905f11767 100644
GIT binary patch
delta 1141
zcmd7O>rc&b90%~<uYTwJp14&=k(`7SaXPsaAtCqNFGup##a$=2+zY)al3%}BeaNM9
zNj4*6JM$oGW8(pv&9gR-Y{moQkueW=pL5n~{sO=4_2B#6@BRLK_U-=o%IGG2uC2%G
zn(c~q=wX_+*UpO8wa067jcIOAYS~t;_e(OpTJ<%aUp&*a&i9T)84w;k^Xkzpuhtc-
zY5L1&PyEJ8Jx2Q{+~8BeuzuO){A1L-Z9$dWtah6^g;6*e<RGWtZJJ#_|KH6p2oZ=x
z6b54mh9Vln5QA6@#|Xq>B;qj&E+k+y5-|p2F%C%>k7T4^0wy9AlQ0=>q``x9Ou<x4
z!*paI6EiRqS(t^{n1gK0MGod+J{BMs3$X}`u>?!849k&+6<CQ?SdBGUi*;C!4cPe9
zn`9a<e~gIpU-hZyE`Re(JJFDqD=J=^8dSTC)74Pv%DiMY-d0X2X;cN$vCm4CLC5SN
zQrW`0exj7r<=7b#->TxIqtr@~ucA!(U1>cCG`(_EBusF-#g%Qx1Y2savgO@GuS4FQ
zv6A~#d74;te~q0Ps9GpX3+<<&RX$%+?RtgS*VXAj(2%4OJEc!B{|19^N_v9613kfr
zX4M`TpXTWu|Dl=VzfVm!WJ!6SmTmH_JXDa!QNC7{?+gT|r;EMc8YW*_)vsVvMo&|*
zjJn}5<nb<hPUs~b-d2jyfp=7m<RsKbOUJqbQ~s1%{iW=t;;Y<Irom2+Wc#dGiM$(X
z^i1h#bjqYQ?iQ@I+f-ZVXLp#2l2hS)>W(I5`ZwKEuZ#TM54@J{|I}EY98>M<^wK8E
zr_EGATS(DXDx@MRrV`pl+i3^wq+PU|_RwA`B_Ea1KH5(Q=pY@Uaym>$=qMed<8*>f
nQUz7gDLPGOsER;m=^Ry44V|Y8R7)4BjxLc!^?qNcy*vFc`S!L@

delta 652
zcmc)E%QKa60LJm(tCx4$MREwqC7n_(xs=Pnn>Z!PCE=u^3zayO`=!XYj#NiyOe=qd
z(Ksv9#!O2KJKO#VJ3Xsr`~^KTpUpGR;@SW6+uj$;jaV7hP$bh6YhsKs5ueAhHah%v
zs>vVeQ}HieCt&<r##lS6n|pSvl~PoEbnzqDYeMVVuleE*?d;v-;U(7zxsD|<a!hQA
zmAI(uIKK|oTAcL%|9}(3lfX$5IYkm4l1bq-sicw488SFaCRt>Y!#Q#}kCzKvB#%p6
zCZ7TdDdGynlu$|;SGh(x6;x7%k7{bD#pOD6+@PKY{M_UgjohY*X6|s87FubeoqKd}
zpH8~y{u%H((cHAKe=8K+4#)%Pk%#g~9!szE$rE`h&*ZuE%YeL)m-0#m<+TjSumoj9
zM&*sXl`$EY37M2BnU)!ul{uN0ck*5qWKllIk{}=DlZ0ehKFf-Hk+1Si!m=vgqrvUS
GV98%tzU~MB

diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft
index a55df80f952baf9fe80597b5fb946689fef31dff..5f6926bf4e4159920339c499fb538d0f2276f6d2 100644
GIT binary patch
delta 611
zcmY+9$xjnu7>8%1ASePtsVueCDoV93T~Nwwt+>{;DuO72JK}=7&`(=To`gTZ#7Vq(
z^Di*r;8D*eoK4ht(u*e!9(`we>ftxPd^6AUe($V&T@0*97SLHm9RccTU^R_2v4*uY
zvyK*8X=6R@bP%MI5F6;Cn;v=zvyli<HnEu)Ti8k;+t^M&adxni1iRSH9`=$XMVbr)
z>|;NJWEsN1#KOiQN1g)=bC5$E<_JeQMuFp;;3TIw%^8ZE<s9c3;R2(KaglK@ahVCO
zFv%2GxyE&FaFbiyW|}+9aF=`B=K-@k<Pnc~!c(5{oEOY7PwAr?&FbZ)v8*cS-Q`#!
z9n>_fsjg9f)2?X={a=SXV`cZ#kebuWZpKjkQWJ(UrQXTObF!T^PC!O@&NoBN3pHY@
zxKzbdmRngah1?lawYWb`)zBkua-ddjtIBUJ-z`}xUhh$Z?v$Z=-OrYa$gE%TTB_Mr
zT~d9v&%U>-Y${V_f7>eJE`OH`!;T6Hmvnr*;Q06#$Di@nQI>p5<W$^SC!MZcCmO2$
t%WTe<{s<QEFn7{WVK<fc)>$m(mE@)5mBc$&BnwN${Ojn4z>n#1=RX|G%liNT

delta 610
zcmY+9IZsqk7>4ha%ch7346@1SD9Y${nFVFI+l;&8Ix2z-g1h2^yD$f2OrC_+#KfD}
z*!c@gC@h`Y#M;JKX=5xXEdB1CYKr%~IVaEa<vYt?7mZ~}37r+xU{FgP^)%4PN><Ut
zYMNO?3u|emjdmh*u#Qf;=%$BW*3(Cn4QwRFCN|U07Pc}#oNa8!WCuIh#cmQLNs(rd
zJ?v$O48vI1IJkIZ$+3_99N-{_ILr}_lIIx5Il)Ozahd{WILkRkIL|0!T;L*?xXd_L
zm|&8tT;n=7xXCSUbBDW3agX~v;33mI;xSKn$}^txf|txNOYxH$&FJRRSVrabE;DAP
z+BHpUtZC5SwrZNG|7(*oX8NCp)r@ZXX-f@Aja$l=dM~%Y$waCgLq-J7cT3F*HDar{
z)Pk)XsnWM%#GkTNv;V_Zb=|@x2CMa!ivG?C?V_XNwE;EcPg<(S|Kg}V8S_(~rJ7vT
zDb??W><72PCes!6mm9M6UdSfAkj;A`Tdq9*@xraltcnM_q*B$pL^~>9na+mNZ^4WJ
l^Cv9T>nC%;{KY~}N#-Q;l2?)iNolE&dma5~l*@1a{s$c$!Ce3V