From 969940319147f50f6476de672c10411834d35ae8 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 22 May 2022 10:16:43 +0200 Subject: [PATCH] fix disable --- HMI/US/landscape/nspanel_US_L.HMI | Bin 11393176 -> 11393176 bytes HMI/US/landscape/nspanel_US_L.tft | Bin 10245696 -> 10245696 bytes HMI/US/portrait/nspanel_US_P.HMI | Bin 11407619 -> 11407619 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 10274932 -> 10274932 bytes HMI/code_gen/pages/cardEntitiesSerial.py | 8 +- HMI/code_gen/pages/out.txt | 1014 ---------------------- HMI/nspanel.HMI | Bin 11393176 -> 11393176 bytes HMI/nspanel.tft | Bin 10245648 -> 10245648 bytes 8 files changed, 4 insertions(+), 1018 deletions(-) delete mode 100644 HMI/code_gen/pages/out.txt diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 9933a4979561e6dab89ce9a22430d151bab0418a..cdced43a3a1a090d61f97ae7ac014dd1e36ff091 100644 GIT binary patch delta 1401 zcmdtg>r>289LMqBuXeZJ7%AzeO<31lB875Eau*`^d$J;TvhH#TKU=PqrIY(T?Aaa| z%$Z@B29NZJ@W>zFIv(<%8Q$%V+xicjnb(7JzUTXy@0mHZca*&rdhQ)v*%Gz%)DpM$ zd%eprwW)=gru$ylDu@tgkPeTE{kYQoFm`{#GBB z`FFJTe)(<9vqIPY><;efUi93r^;sP1)_m1b3A*mP9p$neeb%qp*TrxiFuaEDH6px5 zq}Q-{4ZGKH)EQCV{*z}|u~u6v&T41HTc*|CO1S6rdu&^Z3-+i_8Kyf$tV>UHiP&O) zyee~>3-!=G+ioU`oJiB58Y9hFp+m)?OcP`4;>U=MMYo=oH@|cu5gm|(j_8EWaG?vj zq8qxS2YMnIz0ezd&=)D_hyF;#0Hh%u12G7Lk%3GM!B7mtaAaWwvM~}l7=_UogRvNg z@tA;#$i*Z~#uVgXDyAVH(=h`xF$=RX2XiqG^RWO6u?UM%fF&rzQn;}UMOcm%D8@>x z!fLF+TCBr*Y`{j8U=uvpj4jxTZP<<-*oj>z#cu4uUhG2|_TvB!!oneVQH}~6#t|IF zF&xJURH6#iI0+w4;WTO>P>VA-i*q=S3%H0&xQr{fifg!z8>qug)%^0-=W1JSR(_SL zNS2erNO#iVBc7 delta 27680 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 ThSgj2gAbE3qkixa&v*YHB$vdD z8F9k}`2&3WIsE3G_nCLz+V{WXwP6)vT4*V*mDX~!(N;SN?RC&mC!KZCRX5%B&{HqH z_0d;9{S7eCAh`w`VyIz;8)2kTMjK;ktTlq*V4aP%``{&t~tnj s4Nvpy(%H9P>eAucs#JYC>}gmgtUByj*z>R#HL3cSA1mV}e{vK5091X$5dZ)H delta 447 zcmXBM*Kf^n7{K8i4n^&~_g*!NqV`s+_NuM5sjZHdhuZ6RoSKPn>r&D?=^dAn_NJ9c z)E#c5{R4c@aq-EU_sN^L=EL83O{iQ<3oXU9(pr`_+G;0TdmVJtNoQSj)lGLj^wdjl zee~5&e*+9O$Y4VZHOz1$j5NwGR$z^_)>&_ZLK|(e*%n)Ev)v9m?Xp{uJ@(pXzXJ|B_Z|60_P)>Lx_-#168 r@8LABHkp3=tu`6nRwn9_p=Y5~s4Db4^dj`KI#KuPQ$@V2D9y;3S{q%>2&p zH}jh_bw^J*>TvRR`;?+mO|$iWujS?CR+MRXpZZo^Gh-Stt>>JhIOZ3%UY9mkmish8+$#RnX;Hbn}5|W8HuL!TyK+Y5qt2L;UWq z^uhvr_wsMYs=mf>S+F8a4gm%99Qc;P*f6m_IW-{TWCr_%C8etI)K=MvnR}C=VvoQ0<`s zJ5r=q-J7X?j>vQIBt;udiE*og=o#r$mA!IVV#HdrG%B5<=&X??j`vEpxD=FL@n=>f zMeXjB#fkgSe;lw6>ts~dPXpWVT{LC~s$)`B$HEP6XJtis^LP#ePEFqPEx2)$~UBPg0=1%|NHBZ~L-p^KB;>FE9WA delta 2398 zcmdVbdr(wW90%}oU>}U2$p-gEf(X6}1w{oHl!vCG38sajq6>tm`6d<9#6?+RO?kR{ z6rWkj-MupEq#l_G!C*!Q$7se$>kkXcCTm7%YAR>Uq3?FDdnWs*f4eiEneRR4+;h+G z?%s3DPhK{b!@2v04kr5+AprfQaK^jYQII-o7qETCN#uTSNW5=iVdkp+xRS zd>n0jObzIc-xp<;lgQNu3~V(Tu0Hb1%F_n+d*CKF{3xN`zJJb7zUcLkoa5-**JF+} z6jrGV%U$M5mzjbe_=5qAVB#*bIs3`~Xt8S^IR-j{9Tvy)ju1!a1<9Idih0!2d1(<# zO_WaB6g(-R0WQ!QsE5>n@{<-19QIQ3kVLdZRX);?>h$gvrObnET?GYQEuYGW49 zBjlid?JwE*1@-xVolnRft)1VicGpMvB_#0k*^T`I*pnqvBWrI}E$rtFjRV-Zo0b4} zt6Z_LyDgH1eR>+{xjgAIk1vueLEQGWC7g15v1A%%y4)M1q}#Nj#)WGO=)&Tk7IiyW z6tyB%6xBOL6mn~Z$b7aaip>>8-NWLa7PZ~`m(`0ZUHoiOR_lK*ileA%KbHQ9JCfB_ zdqVi<1=7XwJnAzkhO)9Na`2_=ZUg0Xt?V9DDFw;!0))Yf;B5utOQ_gk4Y$4yb_l zpc0(08{UUKuotSJ8fu^x>YyI>feZG-0bp|-t*_P6SLBGHIR3=D7j*`v8?TiV&bK( z%2Ls&-y*L~F|n);btLcW^!)2S{N`QHnP%Qn<<83E{fZT50B@6;3U{%5*(33@k!t4_ zQ;qsZU(Rtp@PYdnwa1of+eHZ8<){1JDFgNGd$9qOr09Fvs{Yis2hOojvfNL*_Cg3H zZF=4$Q}UC(AKJo2o*5QAmD*Hv?aM^oSwzVI{oJlBKK5?yl%IaM|lfqNfO*pwE`dgUf7>)fg&vbx)9Ia^;KnHXNB;cWb2HN$%v$eOk(L)dpVIh5J+ zWD6_1CmbO_5 fU}vMP&(Pq?iUt+V@QQ|}9VLGOVlIC= diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 8762255f6e695f28e14b6df22cc77dfa1af05854..293b0ed913e33fb7795b523ffd2e56f60ba2646e 100644 GIT binary patch delta 474 zcmXBMM^DoM7{K9F3w7YY);(}f9940PxJAWIQsAG;h;iOYeJL9Z# zs+@PhMb&Cta@iGET~q728*aMgwma(FRqr0|d!WHXk39CoQ_np2LZg?Oz9y<$Lh*1Wcyes0TY`R_z!RzGBNTH2n|pY5Gm(vj2e9XYN2*Qwv~ zlG(pi`N`mKLt!MDE{vp#3j!*Qrm~kG(Ny+QA4>(j3Th5|9rPyXZP2@PeeC_8FX3d< GucH4txx}3S delta 474 zcmXBMM^DoM7{K9FDRtnet$Xi$h#g%j(exJBEFGcg|g0-E$wc+{iD zz!AI%M~wfL!!K{%=S|+$`oDRtLA63U=`2rJzKAZm>ZZE_J@nK|Z&7{3#P!ure*+9O z$Y4VZHOz1$j5NwGwnnM7)>*I21{-a%*%sxt+Ge{7JM6T}ZhP#t&wd9SbjV>x9CgfbC!BQ3X=j{O z>74T}s8a2sOD?FgyDPY1mUY6yBA^d{(S(7Q|`{{GLGyzf6N GTK)rJQ^mjl diff --git a/HMI/code_gen/pages/cardEntitiesSerial.py b/HMI/code_gen/pages/cardEntitiesSerial.py index 35864780..9656cc45 100644 --- a/HMI/code_gen/pages/cardEntitiesSerial.py +++ b/HMI/code_gen/pages/cardEntitiesSerial.py @@ -7,7 +7,7 @@ head = sharedhead + """ """ + navigation print(head) start = 3 -for i in range(1,6): +for i in range(1,5): idxstart = start + (i-1)*6 item = f""" // get Type @@ -57,7 +57,7 @@ for i in range(1,6): bUp{i}.pco=65535 tsw bUp{i},1 }} - else if(tTmp.txt!="disable") + else if(tTmp.txt=="disable") {{ bUp{i}.pco=27501 tsw bUp{i},0 @@ -70,7 +70,7 @@ for i in range(1,6): bStop{i}.txt=tTmp.txt tsw bStop{i},1 }} - else if(tTmp.txt!="disable") + else if(tTmp.txt=="disable") {{ bStop{i}.pco=27501 tsw bStop{i},0 @@ -83,7 +83,7 @@ for i in range(1,6): bDown{i}.txt=tTmp.txt tsw bDown{i},1 }} - else if(tTmp.txt!="disable") + else if(tTmp.txt=="disable") {{ bDown{i}.pco=27501 tsw bDown{i},0 diff --git a/HMI/code_gen/pages/out.txt b/HMI/code_gen/pages/out.txt deleted file mode 100644 index 0d56cb46..00000000 --- a/HMI/code_gen/pages/out.txt +++ /dev/null @@ -1,1014 +0,0 @@ - -// data available -if(usize>1) -{ - bufferPos=0 - while(bufferPos$vwNQK@*&@tbMJ%CARs|RH0VzyT@!42ce1t6F8fFgw%Hfz;i6~gY>G&{ zCS&>%+@%qp^Nj z<@`L#HKxAgo*k(e1qVjs6}*Zx46hlBbd1AzOu$5B;5AG_CY*R3Zy*bAA{&$O7N+2B zOoa>6FdaFVfn3bQJ9rnfkcWJ{hxaiXA7Bm&;Kp3c!+aE?2n*mrF&5%OEW%a2&1p4&S2< zC(w?QIE4bAYfAz|ia4+Go z3z5f*jZ6g#)7Yu3V!2oFI$lsy`lf{cz_I-;sL| delta 1646 zcmdVa|5Fro9LMqZo}A}7O%rqncM55W0%{5sr$ELR3(mJ>!C+bPZ zeX)r1Y~u0#WyaBnuP<7VV(t8eToISGk#Z?dq;s5AZ^{>Gwex6^$fY=|{>x&OPc0Mq z*{&a4E>h~WuDQBeq{p7SXDz#LuisW7(q`3-;x+x*#+g3`JZA5o2}@GGY%i&CYiUNq z_E@@OYNk8n18-t0wqZM> zXvPlg#4hOAjknN(R=kZpXu~_$i+9nE4s>E4y3mdH@IDOmU_TDv1AK^&(2I}p2|mSV z=)>nYh(kDxehiqw>#Pi-RwViZG3!1!^wS>=9%)rUM-qYZ++#z z{;s;E@rvq}zpsicv^!zJE!8c_qat+X%U-9GZo`F{X|&?EE! diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index a6c7a124059fd93099eb40d478e9169be6ca099e..5cd5b051d2142321a51b0ea02a2508dfaeae7ea7 100644 GIT binary patch delta 448 zcmXBMM{|t<6oBEmTtf5`C8F2pSC1M!O0?)iZ^2cfi;(aT-Q~MPSuhrC*qMpnU}us| z?jnoWNj64)fG?lLJ7>-_XHM$NpLi;)N=yeG#dXqImM*%=)=hUk^wdjlee~5&e>nyi zXpq5j4UuQ4VTK!Fq)|p2W2|w;n;_prlT0?nRMSkCFvCo<%r?hd^AwnGfrS=XY>7fk zEwkJTE3L9xku}y@XT4$@Y_!Q{Ta?&po9%YkX_wvh*sIh&`yFu5A%`7t)G^1MQ0Aml zPD?uDtaHvQcfm!MTz17(*IZZOhDtZxQl;8$cW~D|HST-hp+_Ej;;Cm+o_p~v_|zCn z)P8OZK7^wv6MT#%>RK{EaaOn%G)J0gjPeI_yo@+qz`KyZ6=c@42O|{{Uxf!ubFI delta 448 zcmXBMM{|t<6oBEmTtf5`UGx&YUZO^i5-nQvPH>eVL4<^d=q}$S%7U?A!!9%V4|XQm zZ$oH?n_f8wdIYB3#j6xT^-S-R*dTQ}YH&{HqH_0d;9{pA>7 zpg{&3VyIz;%QeDCql`AjSmTU0!9;l`nQV%wrkQSrnP!=7j=2)%nJ?c03oWwP5=#|W zX1NtsT4l903az!ydK(nkXp_yh*s9nz+wHK^E+ux`W3PSoJK&&04m;wgV~#uFq*AAx zc1F@!=bU#znTsyDtXzdFuDYhubyaS-salO&ZsU%-YTa|+0}nm&*b`5sJoCIh_}Cmv z)O~6W-iM