From 007e5ffaa7a08e73816545adaec4f63b18a477da Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 22 May 2022 10:01:22 +0200 Subject: [PATCH 1/8] remove icon override for now --- apps/nspanel-lovelace-ui/luibackend/pages.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 42747da4..ea8c2713 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -423,8 +423,7 @@ class LuiPagesGen(object): def generate_shutter_detail_page(self, entity): entity = self._ha_api.get_entity(entity) - icon = entity.iconOverride - icon_id = get_icon_id_ha("cover", state=entity.state, overwrite=icon) + icon_id = get_icon_id_ha("cover", state=entity.state) pos = entity.attributes.get("current_position") if pos is None: From 41cccaccc6231ef614924fa0fed3ac22059d0afc Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 22 May 2022 10:04:50 +0200 Subject: [PATCH 2/8] fix pos --- apps/nspanel-lovelace-ui/luibackend/pages.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index ea8c2713..835975ff 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -429,6 +429,9 @@ class LuiPagesGen(object): if pos is None: pos_status = entity.state pos = "disable" + else: + pos_status = pos + icon_up = get_icon_id("arrow-up") icon_stop = get_icon_id("stop") From 969940319147f50f6476de672c10411834d35ae8 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 22 May 2022 10:16:43 +0200 Subject: [PATCH 3/8] 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 Date: Sun, 22 May 2022 08:17:14 +0000 Subject: [PATCH 4/8] fix disable (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 ++--- .../landscape/n2t-out-visual/cardEntities.txt | 24 +++++++-------- .../landscape/n2t-out-visual/popupShutter.txt | 6 ++-- HMI/US/landscape/n2t-out/cardEntities.txt | 24 +++++++-------- HMI/US/landscape/n2t-out/popupShutter.txt | 6 ++-- HMI/US/portrait/diff-eu-version.txt | 18 +++++------ HMI/US/portrait/diff-filtered.txt | 20 ++++++------- .../portrait/n2t-out-visual/cardEntities.txt | 30 +++++++++---------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 8 ++--- .../portrait/n2t-out-visual/popupShutter.txt | 6 ++-- HMI/US/portrait/n2t-out/cardEntities.txt | 30 +++++++++---------- HMI/US/portrait/n2t-out/popupShutter.txt | 6 ++-- HMI/n2t-out-visual/cardEntities.txt | 24 +++++++-------- HMI/n2t-out-visual/nspanel_Stats.txt | 8 ++--- HMI/n2t-out-visual/popupShutter.txt | 6 ++-- HMI/n2t-out/cardEntities.txt | 24 +++++++-------- HMI/n2t-out/popupShutter.txt | 6 ++-- 17 files changed, 127 insertions(+), 127 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index ac260387..9c0283f1 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 07:55:05.103784355 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:17:12.774830515 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:17:13.906863322 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 07:55:04.215774434 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 07:55:05.107784400 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:17:12.774830515 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:17:13.906863322 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 56a0ecb7..251c14ef 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2257,7 +2257,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -2269,7 +2269,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -2281,7 +2281,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -2416,7 +2416,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -2428,7 +2428,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -2440,7 +2440,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -2575,7 +2575,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -2587,7 +2587,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -2599,7 +2599,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -2734,7 +2734,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -2746,7 +2746,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -2758,7 +2758,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 90b30a61..228dbbd8 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -652,7 +652,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -664,7 +664,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -676,7 +676,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 0e5aa036..8ae6de6c 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1285,7 +1285,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -1297,7 +1297,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -1309,7 +1309,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -1444,7 +1444,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -1456,7 +1456,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -1468,7 +1468,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -1603,7 +1603,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -1615,7 +1615,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -1627,7 +1627,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -1762,7 +1762,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -1774,7 +1774,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -1786,7 +1786,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 111d0037..e71bc768 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -367,7 +367,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -379,7 +379,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -391,7 +391,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index f9b1d2f1..3fcc3291 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:55:04.651779305 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:17:12.774830515 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:17:13.326846513 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-22 07:55:04.219774478 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:55:04.651779305 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:17:12.774830515 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:17:13.326846513 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -346,7 +346,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + { + bUp5.pco=65535 + tsw bUp5,1 -+ }else if(tTmp.txt!="disable") ++ }else if(tTmp.txt=="disable") + { + bUp5.pco=27501 + tsw bUp5,0 @@ -358,7 +358,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + bStop5.pco=65535 + bStop5.txt=tTmp.txt + tsw bStop5,1 -+ }else if(tTmp.txt!="disable") ++ }else if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 @@ -370,7 +370,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + bDown5.pco=65535 + bDown5.txt=tTmp.txt + tsw bDown5,1 -+ }else if(tTmp.txt!="disable") ++ }else if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 @@ -464,8 +464,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 07:55:04.215774434 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:55:04.651779305 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:17:12.774830515 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:17:13.326846513 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 98ee16f7..758d80ad 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,14 +1,14 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 07:55:04.663779439 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:55:04.651779305 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-22 07:55:04.219774478 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:55:04.651779305 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:17:13.346847092 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-22 08:17:12.774830515 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:17:13.326846513 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:17:12.774830515 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:17:13.326846513 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1876,6 +2104,165 @@ ++ // up button ++ if(tTmp.txt!="") -++ }else if(tTmp.txt!="disable") +++ }else if(tTmp.txt=="disable") ++ { ++ bUp5.pco=27501 ++ tsw bUp5,0 @@ -17,7 +17,7 @@ ++ bStop5.pco=65535 ++ bStop5.txt=tTmp.txt ++ tsw bStop5,1 -++ }else if(tTmp.txt!="disable") +++ }else if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 ++ tsw bStop5,0 @@ -26,9 +26,9 @@ ++ spstr tId.txt,tTmp.txt,"|",2 ++ if(tTmp.txt!="") ++ bDown5.txt=tTmp.txt -++ }else if(tTmp.txt!="disable") +++ }else if(tTmp.txt=="disable") ++ { ++ bDown5.pco=27501 ++ tsw bDown5,0 -+--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:55:04.215774434 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:55:04.651779305 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:17:12.774830515 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:17:13.326846513 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 6b6d2214..6d9896a5 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2678,7 +2678,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -2690,7 +2690,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -2702,7 +2702,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -2837,7 +2837,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -2849,7 +2849,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -2861,7 +2861,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -2996,7 +2996,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -3008,7 +3008,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -3020,7 +3020,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -3155,7 +3155,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -3167,7 +3167,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -3179,7 +3179,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 @@ -3314,7 +3314,7 @@ Timer tmSerial { bUp5.pco=65535 tsw bUp5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 @@ -3326,7 +3326,7 @@ Timer tmSerial bStop5.pco=65535 bStop5.txt=tTmp.txt tsw bStop5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop5.pco=27501 tsw bStop5,0 @@ -3338,7 +3338,7 @@ Timer tmSerial bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown5.pco=27501 tsw bDown5,0 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 6cbeb6d1..a42d9111 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -18,6 +18,10 @@ pageStartup 19 Component(s) 154 Line(s) of event code 115 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code popupLight 27 Component(s) 345 Line(s) of event code @@ -50,10 +54,6 @@ cardEntities 77 Component(s) 1343 Line(s) of event code 571 Unique line(s) of event code -popupShutter - 20 Component(s) - 241 Line(s) of event code - 138 Unique line(s) of event code Total 13 Page(s) diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index f2086576..a0cc18c3 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -652,7 +652,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -664,7 +664,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -676,7 +676,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 0ebaec42..75f099af 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1513,7 +1513,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -1525,7 +1525,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -1537,7 +1537,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -1672,7 +1672,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -1684,7 +1684,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -1696,7 +1696,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -1831,7 +1831,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -1843,7 +1843,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -1855,7 +1855,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -1990,7 +1990,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -2002,7 +2002,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -2014,7 +2014,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 @@ -2149,7 +2149,7 @@ Timer tmSerial { bUp5.pco=65535 tsw bUp5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 @@ -2161,7 +2161,7 @@ Timer tmSerial bStop5.pco=65535 bStop5.txt=tTmp.txt tsw bStop5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop5.pco=27501 tsw bStop5,0 @@ -2173,7 +2173,7 @@ Timer tmSerial bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown5.pco=27501 tsw bDown5,0 diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 111d0037..e71bc768 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -367,7 +367,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -379,7 +379,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -391,7 +391,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 636a3e22..ad556514 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2257,7 +2257,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -2269,7 +2269,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -2281,7 +2281,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -2416,7 +2416,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -2428,7 +2428,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -2440,7 +2440,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -2575,7 +2575,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -2587,7 +2587,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -2599,7 +2599,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -2734,7 +2734,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -2746,7 +2746,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -2758,7 +2758,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index b7a67eef..9d70aa00 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,6 +22,10 @@ popupNotify 17 Component(s) 200 Line(s) of event code 125 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code screensaver 35 Component(s) 296 Line(s) of event code @@ -34,10 +38,6 @@ cardQR 30 Component(s) 363 Line(s) of event code 205 Unique line(s) of event code -popupShutter - 20 Component(s) - 241 Line(s) of event code - 138 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 81bc0fd6..03c3f2c2 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -652,7 +652,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -664,7 +664,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -676,7 +676,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 0e5aa036..8ae6de6c 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1285,7 +1285,7 @@ Timer tmSerial { bUp1.pco=65535 tsw bUp1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 @@ -1297,7 +1297,7 @@ Timer tmSerial bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop1.pco=27501 tsw bStop1,0 @@ -1309,7 +1309,7 @@ Timer tmSerial bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown1.pco=27501 tsw bDown1,0 @@ -1444,7 +1444,7 @@ Timer tmSerial { bUp2.pco=65535 tsw bUp2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 @@ -1456,7 +1456,7 @@ Timer tmSerial bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop2.pco=27501 tsw bStop2,0 @@ -1468,7 +1468,7 @@ Timer tmSerial bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown2.pco=27501 tsw bDown2,0 @@ -1603,7 +1603,7 @@ Timer tmSerial { bUp3.pco=65535 tsw bUp3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 @@ -1615,7 +1615,7 @@ Timer tmSerial bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop3.pco=27501 tsw bStop3,0 @@ -1627,7 +1627,7 @@ Timer tmSerial bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown3.pco=27501 tsw bDown3,0 @@ -1762,7 +1762,7 @@ Timer tmSerial { bUp4.pco=65535 tsw bUp4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 @@ -1774,7 +1774,7 @@ Timer tmSerial bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bStop4.pco=27501 tsw bStop4,0 @@ -1786,7 +1786,7 @@ Timer tmSerial bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { bDown4.pco=27501 tsw bDown4,0 diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 111d0037..e71bc768 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -367,7 +367,7 @@ Timer tmSerial bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bUp1,0 bUp1.pco=27501 @@ -379,7 +379,7 @@ Timer tmSerial bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bStop1,0 bStop1.pco=27501 @@ -391,7 +391,7 @@ Timer tmSerial bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") + }else if(tTmp.txt=="disable") { tsw bDown1,0 bDown1.pco=27501 From 56904b8fe209cb9a411e17e6ade788443ab4cd10 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 22 May 2022 10:36:15 +0200 Subject: [PATCH 5/8] fix disable --- HMI/US/landscape/nspanel_US_L.HMI | Bin 11393176 -> 11393176 bytes HMI/US/landscape/nspanel_US_L.tft | Bin 10245696 -> 10245756 bytes HMI/US/portrait/nspanel_US_P.HMI | Bin 11407619 -> 11407619 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 10274932 -> 10275008 bytes HMI/code_gen/pages/cardEntitiesSerial.py | 42 +- HMI/code_gen/pages/out.txt | 1034 ++++++++++++++++++++++ HMI/nspanel.HMI | Bin 11393176 -> 11417217 bytes HMI/nspanel.tft | Bin 10245648 -> 10245708 bytes 8 files changed, 1057 insertions(+), 19 deletions(-) create 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 cdced43a3a1a090d61f97ae7ac014dd1e36ff091..c5e2627d059d59db3221480e36a34460387d6766 100644 GIT binary patch delta 5110 zcmeI$eNYr-90%}c;qE*HjFV%QeUH1?2L%6YbcUPx%=~trdv>4S z-txUY$`7jgayYO@7aJKFk(bT1SKT=iOP!DH#$1@LU)Egi(7ugbcSeeA>^#PVrreUV zx@`h0$<})b!r|3=SBI?rIYP&zUB}BE+P5+3&r=f1Tr5~8G1mE9Y?7sc-Lj5xC$nx_ zU$JEh%O2N$G8UGy)w#sqXx?BfHVVZ?hhn2+u~AoS)E65KM~!{<+<)@h*k|l>x5%x? zy~v};^N6YLobLQF#~;*B^UZrhDJ;x;47s^TCMwJp!|CKm#e=Fty!DiILw2PDS>hTJ z0_y@xABg>^y3!m+2fgYCkY$Ze5XI|7ZyFmS>F6s*F}RzlB5l`+BDGbS4dmk}W@tys zT_|=r(uAJoFICs;#U&P1U16RXdelL@9!(b2qwnU#QV|A#7ns2te83l;f`Kpy{Jp}NQE>=hYXkknJ^VzfN3xtX248%5oW<`m;-ZR9?XX<$c6>5 z5Ej8=$blvB61)trz*1NSufl7P3wf{{@?izM4sXDluo70mYFGnnVI8~$Z$kkT!g|;M z8=(j`K{0HGE$|M!3-7^J*aq*z2e2J>z)mQET~G>TKu``J!bh+h_CN(xLKRd)4SWor zz+R|@eXw6mEUlAH8z{HzO#dA9_M-Yqp`bRuJt^3{JB;mcwAHuoGPcEDue{G#yxz9| zh#;`5I$K?C5Lk|bt^UU-ux5MRC)+q!tE&UG zx^bvhe;+0=2V1!@MUaOra32d9aner5^4$RQ%LsPXn(L6(7t@g|1H%DOS?e$%?F+{E? z6k=7uw=Tt~y8K>$&`AiU6RAo7xg|)kO>P&2TM-0-$OBztA~`y9c~b{nItc3g1OR#CV6n@WBPQA_9g!& zIfLBCN=v%V_NBaLd000SeW^_+I@9h@$(Jr4mo4hgo=S~7CA7#H+%aOQwM8~i-dVXz zLkad?bPJ~CMUkWv18i;720f|`9c6rj!}a@C4(?`2?VYy2WqP;0BzH3>fM%Jb4E3jA zWxqRJ4w5=A-gT4`)_GDiVV}V;GA1TE#`bAgJBaS+z=aw{DPqqbgpTS$r0%Y#eeqjw z%H1s9?N>Q~Qp2Q&y2ikA^~PxH;(g;gEq+1QbvMRK9XF6$nxZFJC;Hnix{}u8MQ=@% zB0C?+e%oN6Z|T50U>573e(v^o+j62eoFlxVbwmCFd)Zfw-i?`Z3OIn+&`UlHK zpiS`SoD7mS5jJD!(i>W+&R=oNTh@Q-8{wYw{@jL+(Roj>$UmNK!mIKbeVi z*=&K7xu=<1UTp8X1pe=xOb}jqem)RBVierpz^Y zT0cieYs|SPDfqtOAF%N;#wibV_qYY3))=BsyEoC(i0*s3S06!7Mq=t~uMHAzskau@ zSM}zm?E$YhHy^i0LGACaH#cqnnCQ*T|9lnLO@aW_+&4 delta 5664 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 delta 11113 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%0DSKg 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 A_5c6? diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index f599290365baad05f04acd35ead11b778d0aa4ba..588f79f1384466331c3713873c7319957397c676 100644 GIT binary patch delta 6647 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 delta 10736 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 AMF0Q* diff --git a/HMI/code_gen/pages/cardEntitiesSerial.py b/HMI/code_gen/pages/cardEntitiesSerial.py index 9656cc45..8fcd077f 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,5): +for i in range(1,6): idxstart = start + (i-1)*6 item = f""" // get Type @@ -50,44 +50,48 @@ for i in range(1,5): vis nNum{i},0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",{idxstart+5} + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - {{ - bUp{i}.pco=65535 - tsw bUp{i},1 - }} - else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") {{ bUp{i}.pco=27501 tsw bUp{i},0 }} + else if(tTmp.txt!="") + {{ + bUp{i}.pco=65535 + bUp{i}.txt=tTmp.txt + tsw bUp{i},1 + }} + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + {{ + bStop{i}.pco=27501 + tsw bStop{i},0 + }} + else if(tTmp.txt!="") {{ bStop{i}.pco=65535 bStop{i}.txt=tTmp.txt tsw bStop{i},1 }} - else if(tTmp.txt=="disable") - {{ - bStop{i}.pco=27501 - tsw bStop{i},0 - }} + // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + {{ + bDown{i}.pco=27501 + tsw bDown{i},0 + }} + else if(tTmp.txt!="") {{ bDown{i}.pco=65535 bDown{i}.txt=tTmp.txt tsw bDown{i},1 }} - else if(tTmp.txt=="disable") - {{ - bDown{i}.pco=27501 - tsw bDown{i},0 - }} }} if(type{i}.txt=="light") {{ diff --git a/HMI/code_gen/pages/out.txt b/HMI/code_gen/pages/out.txt new file mode 100644 index 00000000..42c39fd9 --- /dev/null +++ b/HMI/code_gen/pages/out.txt @@ -0,0 +1,1034 @@ + +// data available +if(usize>1) +{ + bufferPos=0 + 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 DcgDH} delta 4371 zcmeI#eN0tl90%}o;GPQ?R6s9quBN;QVuE-9K}|96h43B3_cuTVDpPJ`76BshC|D`r zReuzL?_M}?2xsf~4-H*2=WKIxYq{o-Z3UdtF$tzSSC<^@$$N0;R!0haoViR0=DG7ng!??t znd`iQHGF4*aK6negI~kNnsRY{-)qI47Op6d=lHHdE~($x<&0L_7se{iRhe`=cz`EpKme^`(s|Y1`xmQ*107$3j>r3uEDIJd0qFYyyj76WP;j5{qUrY%+^w zQ<#y(v3Qoirm{qq#HO+7YzBLV&1AD!GMmkwWhpF`&0%xdJT{-DefZqx-I}}pR|A#y zA~83bw%@XZP)13!p1K-EowBG&%;fEFF6*`gD%X#R8=d|p{H-~9Mbgkue(6z4?Fq5K zST#O19TvbsSOkk<2`q(WkO7&n9I{{qtb|pt8rHyCSO@E218js%kPSJI3!7mJY=u0? zhXQyWUVs;28@vSDVFwg~30{UGcm;OCtFQ}RgV&)L-hdJ)g)-O;<*)}T;7zCm276&2 zR6#ZDhqvHucn1!^L8yURsDndbhQn|KjsihFybJF^1H2E7&;-ZeIGli!a0*Vt88{0T zXjaCjw!}%=O`1dNi}I9pcUqeGa$S-AxxDl%o@h^dob?;WRXgG@?{i$TV1Hl4v;B?6 z9zPIxF5lV)@Y?Lnb6t)&+?VHma9lIYUybkS)%dodFD~bY8*CE zjb}&moQJ(3a49irJZG{R&x=*#v?*$wZdBuian`upUcuscbzo@%&wX!yo0~S3=SDcH zpFcy5vu3Mt?p!r4Oy{`+j$$4xQse#0)Hoj^_5X>dC|;Un*=A1v;KD2h#DgvVl78wE9x&S$V8yTudDO zJg*H;YlVbsZ&`FStHtRuEseg@8cCNFLm-7(-mq7O~WlQZ0;vW@!D z7Zy2$kE1Td5Nyp8O#Y?vOuA?h`z71wCWVo%=gV4JmM=%yCzAcKVHACJMM5F_C2ys$ zKyD5gxL8xMtQC?H6B82cCC3j|GA@oDqS}rUOs2L(Ug2h{G1NP%q2VRH^Bt^UBTX)o zSGh@Lq;1+ZUkYiE!uwa9Q9s&SxmG5(4_vixLab>^VX{-%34@h=qh`pmvB?_B?vUKg z)wapDQ7xJ3hAcbBEW6+5S~Hf`&)l0p-REpWo3}FM@E{dOSU1;tiw$r$htRCE@=!N& zMzg%mO@bK0fDhfU^iFK>4gICX?S^htw^6~(TUo6QnKbO`|Lyg^(q03|uSpz69VEqC z8}Ji$Ry7M6@?~iZh5DsysblM-+?wh`=bU9v1G4;M9ajCOwU6Cb)z3O=J!oycPt;eP zQ=#B6YAfwsF}2J5<-V$ZODsK6OH~s%Dn`S7{FdsR#kRYDXJ1v5$5KxsexW}2L<${Z zYhC)Pn!r|Ldf#UUJQNtorKLJ2u$A}w3`_$jj4}96!ppVG?yV;M11U?{QPa9)0Y6O% z@M>A=Z9N|4>ZrR}oYZ%n05{nHAD{GOxCuh6Jkqqcxgxnnaz`>4Co8B8znQ zwCGR%6D>Z}wOb!Vr%LrB$*33vN;x>v7l|&m$nj2(luOD$>V4pRX?deKl6o!}G?a5f z^i?7Y1_WbP4Ch3TS_Lv98z1E{k=h_E8s0y+a?K))>NQzs1riUz=sg&0=8>jZXKa zOSWjbo7kqKj-)ohc3L1GiyZVQn>n3se=0?}F28*reWv!EvnaDs9M!j*Iweh#+pGTs D^1A~c diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 5cd5b051d2142321a51b0ea02a2508dfaeae7ea7..abbc00767dd1f1d5317e875288956b918d5393e4 100644 GIT binary patch delta 10217 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 XTHmI*Xzq4a9_eRHbonA^Q0e~yJI&5# From 731923a55a827a3db7873a4ddd6361af50809319 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 22 May 2022 08:36:43 +0000 Subject: [PATCH 6/8] fix disable (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +- .../landscape/n2t-out-visual/cardEntities.txt | 124 +++++++------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 +- .../landscape/n2t-out-visual/popupShutter.txt | 30 ++-- HMI/US/landscape/n2t-out/cardEntities.txt | 124 +++++++------- HMI/US/landscape/n2t-out/popupShutter.txt | 30 ++-- HMI/US/portrait/diff-eu-version.txt | 45 ++--- HMI/US/portrait/diff-filtered.txt | 42 +++-- .../portrait/n2t-out-visual/cardEntities.txt | 155 +++++++++--------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 8 +- .../portrait/n2t-out-visual/popupShutter.txt | 30 ++-- HMI/US/portrait/n2t-out/cardEntities.txt | 155 +++++++++--------- HMI/US/portrait/n2t-out/popupShutter.txt | 30 ++-- HMI/n2t-out-visual/cardEntities.txt | 124 +++++++------- HMI/n2t-out-visual/nspanel_Stats.txt | 16 +- HMI/n2t-out-visual/popupShutter.txt | 30 ++-- HMI/n2t-out/cardEntities.txt | 124 +++++++------- HMI/n2t-out/popupShutter.txt | 30 ++-- 18 files changed, 568 insertions(+), 545 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 9c0283f1..397507c8 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-22 08:17:12.774830515 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:17:13.906863322 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:36:43.131639685 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 08:17:12.774830515 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:17:13.906863322 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:36:43.131639685 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 251c14ef..764d0cad 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2253,38 +2253,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt=="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -2412,38 +2413,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt=="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -2571,38 +2573,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt=="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -2730,38 +2733,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt=="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 3589336f..c3223464 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -52,11 +52,11 @@ cardQR 205 Unique line(s) of event code cardEntities 65 Component(s) - 1117 Line(s) of event code - 487 Unique line(s) of event code + 1121 Line(s) of event code + 491 Unique line(s) of event code Total 13 Page(s) 402 Component(s) - 4439 Line(s) of event code - 1163 Unique line(s) of event code + 4443 Line(s) of event code + 1167 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 228dbbd8..3576b25a 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -647,39 +647,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 8ae6de6c..157f7426 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1281,38 +1281,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt=="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -1440,38 +1441,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt=="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -1599,38 +1601,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt=="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -1758,38 +1761,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt=="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index e71bc768..39c20ee3 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -362,39 +362,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3fcc3291..8c96df23 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-22 08:17:12.774830515 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:17:13.326846513 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:36:42.611635917 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-22 08:17:12.774830515 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:17:13.326846513 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:36:42.175632757 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:36:42.615635946 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -297,7 +297,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext Attributes Scope : local -@@ -1876,6 +2104,165 @@ +@@ -1880,6 +2108,166 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -342,38 +342,39 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + spstr strCommand.txt,tId.txt,"~",32 + // up button + spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt!="") -+ { -+ bUp5.pco=65535 -+ tsw bUp5,1 -+ }else if(tTmp.txt=="disable") ++ if(tTmp.txt=="disable") + { + bUp5.pco=27501 + tsw bUp5,0 ++ }else if(tTmp.txt!="") ++ { ++ bUp5.pco=65535 ++ bUp5.txt=tTmp.txt ++ tsw bUp5,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt!="") ++ if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 ++ tsw bStop5,0 ++ }else if(tTmp.txt!="") + { + bStop5.pco=65535 + bStop5.txt=tTmp.txt + tsw bStop5,1 -+ }else if(tTmp.txt=="disable") -+ { -+ bStop5.pco=27501 -+ tsw bStop5,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 -+ if(tTmp.txt!="") ++ if(tTmp.txt=="disable") ++ { ++ bDown5.pco=27501 ++ tsw bDown5,0 ++ }else if(tTmp.txt!="") + { + bDown5.pco=65535 + bDown5.txt=tTmp.txt + tsw bDown5,1 -+ }else if(tTmp.txt=="disable") -+ { -+ bDown5.pco=27501 -+ tsw bDown5,0 + } + } + if(type5.txt=="light") @@ -464,8 +465,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 08:17:12.774830515 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:17:13.326846513 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:36:42.611635917 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 758d80ad..fc89c850 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,34 +1,30 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:17:13.346847092 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-22 08:17:12.774830515 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:17:13.326846513 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:17:12.774830515 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:17:13.326846513 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:36:42.679636410 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:36:42.611635917 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:36:42.175632757 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:36:42.615635946 +0000 + Hotspot mSwipeNext + Scope : local -+@@ -1876,6 +2104,165 @@ ++@@ -1880,6 +2108,166 @@ ++ // up button -++ if(tTmp.txt!="") -++ }else if(tTmp.txt=="disable") -++ { -++ bUp5.pco=27501 -++ tsw bUp5,0 +++ if(tTmp.txt=="disable") +++ }else if(tTmp.txt!="") +++ bUp5.txt=tTmp.txt ++ // stop button -++ if(tTmp.txt!="") -++ bStop5.pco=65535 -++ bStop5.txt=tTmp.txt -++ tsw bStop5,1 -++ }else if(tTmp.txt=="disable") +++ if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 ++ tsw bStop5,0 +++ }else if(tTmp.txt!="") +++ { +++ bStop5.pco=65535 +++ bStop5.txt=tTmp.txt +++ tsw bStop5,1 ++ } ++ // down button ++ spstr tId.txt,tTmp.txt,"|",2 -++ if(tTmp.txt!="") +++ if(tTmp.txt=="disable") +++ }else if(tTmp.txt!="") ++ bDown5.txt=tTmp.txt -++ }else if(tTmp.txt=="disable") -++ { -++ bDown5.pco=27501 -++ tsw bDown5,0 -+--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:17:12.774830515 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:17:13.326846513 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:36:42.611635917 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 6d9896a5..b911f7cb 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2674,38 +2674,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt=="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -2833,38 +2834,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt=="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -2992,38 +2994,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt=="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -3151,38 +3154,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt=="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") @@ -3310,38 +3314,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",32 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp5.pco=65535 - tsw bUp5,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 + }else if(tTmp.txt!="") + { + bUp5.pco=65535 + bUp5.txt=tTmp.txt + tsw bUp5,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + }else if(tTmp.txt!="") { bStop5.pco=65535 bStop5.txt=tTmp.txt tsw bStop5,1 - }else if(tTmp.txt=="disable") - { - bStop5.pco=27501 - tsw bStop5,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 + }else if(tTmp.txt!="") { bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 - }else if(tTmp.txt=="disable") - { - bDown5.pco=27501 - tsw bDown5,0 } } if(type5.txt=="light") diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index a42d9111..16421cb3 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -52,11 +52,11 @@ screensaver 237 Unique line(s) of event code cardEntities 77 Component(s) - 1343 Line(s) of event code - 571 Unique line(s) of event code + 1348 Line(s) of event code + 576 Unique line(s) of event code Total 13 Page(s) 414 Component(s) - 4665 Line(s) of event code - 1234 Unique line(s) of event code + 4670 Line(s) of event code + 1239 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index a0cc18c3..c88262c5 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -647,39 +647,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 75f099af..c25f8fdc 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1509,38 +1509,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt=="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -1668,38 +1669,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt=="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -1827,38 +1829,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt=="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -1986,38 +1989,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt=="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") @@ -2145,38 +2149,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",32 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp5.pco=65535 - tsw bUp5,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 + }else if(tTmp.txt!="") + { + bUp5.pco=65535 + bUp5.txt=tTmp.txt + tsw bUp5,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + }else if(tTmp.txt!="") { bStop5.pco=65535 bStop5.txt=tTmp.txt tsw bStop5,1 - }else if(tTmp.txt=="disable") - { - bStop5.pco=27501 - tsw bStop5,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 + }else if(tTmp.txt!="") { bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 - }else if(tTmp.txt=="disable") - { - bDown5.pco=27501 - tsw bDown5,0 } } if(type5.txt=="light") diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index e71bc768..39c20ee3 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -362,39 +362,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index ad556514..9ca0e570 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2253,38 +2253,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt=="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -2412,38 +2413,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt=="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -2571,38 +2573,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt=="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -2730,38 +2733,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt=="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 9d70aa00..da26d1be 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,10 +22,6 @@ popupNotify 17 Component(s) 200 Line(s) of event code 125 Unique line(s) of event code -popupShutter - 20 Component(s) - 241 Line(s) of event code - 138 Unique line(s) of event code screensaver 35 Component(s) 296 Line(s) of event code @@ -38,6 +34,10 @@ cardQR 30 Component(s) 363 Line(s) of event code 205 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code @@ -52,11 +52,11 @@ cardThermo 290 Unique line(s) of event code cardEntities 65 Component(s) - 1117 Line(s) of event code - 487 Unique line(s) of event code + 1121 Line(s) of event code + 491 Unique line(s) of event code Total 13 Page(s) 402 Component(s) - 4440 Line(s) of event code - 1164 Unique line(s) of event code + 4444 Line(s) of event code + 1168 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 03c3f2c2..12852a06 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -647,39 +647,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 8ae6de6c..157f7426 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1281,38 +1281,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt=="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt=="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -1440,38 +1441,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt=="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt=="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -1599,38 +1601,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt=="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt=="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -1758,38 +1761,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt=="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt=="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index e71bc768..39c20ee3 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -362,39 +362,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt=="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") From 5ab429a02670b6cdf3ade83f04b1c43b32842096 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 22 May 2022 10:51:39 +0200 Subject: [PATCH 7/8] fix cmd length on shutter page --- HMI/US/landscape/nspanel_US_L.HMI | Bin 11393176 -> 11393176 bytes HMI/US/landscape/nspanel_US_L.tft | Bin 10245756 -> 10245908 bytes HMI/US/portrait/nspanel_US_P.HMI | Bin 11407619 -> 11407619 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 10275008 -> 10275160 bytes HMI/nspanel.HMI | Bin 11417217 -> 11417217 bytes HMI/nspanel.tft | Bin 10245708 -> 10245860 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index c5e2627d059d59db3221480e36a34460387d6766..a33bc8a03a4df638a8a05c6f1cf97af2405dba90 100644 GIT binary patch delta 1693 zcmdVZT~JhI9LMqhS$3C`jVAlT9$cZtO$<>2Uy>Bkpn^gQLWH0cC41*3q$0CGS{KDM z2;~9O#58#`8`AMyMNN$tOB2cJOuF^L`#acZ7B4Wj#JH^Z$G8b9($tXkjQJN2@^_YV;uOmSPPP)?6CykyAbLN8a*An|chySX1q1iaQ z+$^^$q@9iRp;L#@}qScL61ncHGk13a?q-C{USd{A0tZ_i-fF` z86k~-61izZB$2jA+rpSgPRB%&UN9HK{Fq4oh>2t}CX$qxNG``jV$MY(`TV60TQBMq zrB4^G`VR?JtWlq)dseIOj(fanS5?xOmaNJ?O7N;d&v~cX`h_d4ufmt3PSzjl?V+AOzAd5en@Ra5!U=bc^G3?yL@{8)@+q~KNrkcuS; z;x;Tr8kXU9q+>ZUumUTQi93*mY^=g+tif8`iFL@qU09C|$VDFR#zt(yJ;+A^?!|q$ zAB8Bw19%X{*o+c9gojazGCYEEY(WLKq7qej6xFD~V|X0fupPD7ft{$s6WE0(@f4oM zGk6xy;d#`f0gY(F3uwk}wBSX&gqP8ZSFi`KVlQ69>u5te_MroBAcXx0qZ0>k5M4Ng zH*pw8@D{q!gSXL(qd0~>DD-0h$MFtM;3VF~DGcH?-oqK3#rrsiAq-;#qZq?^v+LRi H3v7P_3o%Wi delta 1507 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 delta 10605 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 z
  • %N3@X^RUMl@)4usfch*zgjfa?u!C7;r${S{9ED%xa+XVykQdBmKt89d-vghei z7Yxvg)JV*9CO!)+GplSlzEyneM290W)0rkJiNqe;52BH`RyI}Hm}V-jv^$>GgZRp(boFUH zr(sxgm9_L%*^elzTd4Ha5v`31kY4uHx4Lg?p|W*8DjU#JWus|jj2@r@q5-Y+13bx> z68q?W>U3X>>!%;5Nqu#1m$G1KOGmu!>I-|_45lglU@tX9a$s#A8UB6}RM}*0zx-mz z`iwr;)HM{#7~+Ne9o`?->OfKbkv|6mHH=Dj*Pau`4$zYmT(Z=~kr=}w#J~v38;M}jH$_h{@BNlQe2O*R6rt^a^Mr63`I|7Fo zazP|Libam@PFc@_in39Yl(+5FiRbi0OAN5d;WR7`=X?x(5QkjUHbP}75!53dTUoXZ zBTZS4^Z9H0`Mf9|2h5;OD%;YD{0Bp95XB9aA=O!BFLzOyQ>4nyM3Uza8B(38>kyn< zRlxRlRoRrM==KmCkX4c7I~1X|x|_;4{XP_z5!u9f#N%+34YeO-fy4Av^Y-p4>p;7Q zAsV-Lr;=d^mPgy~ zdT&r!$kn=%mJ)4dA~Qo9^CS{l^jjiDZwOjzl!%gQMJASF8EjaNEUdsvWFrT;$U{C> zp#X(gjWt+{by$xg*x^7ioY;U8Y{VwGuoSiV>pfzIEhm@jWh6}0e+mtIh;o$F5n_AA%M$h!WA^5 z1+8eqRRnPj*Kq?kaSI{b#vR;6JMN(ao#;Y0?jsBpJ?KRQeRzO=Jj5dmU=TxyB8JC^ v;|YfG6dIo4IbPr;M(_%w7{hD4!8j)H7Vj{LDNN%%X7B+CeAJcHPe0{9`LXse delta 1102 zcmci5+cVU09LDkAk6kXfSZjUP`BYNGk`krTIil!92kkCNlCYh&v)Xm&h{U&aAQaYi zFq&Ccs9dL;?z*Typczd!Zkl?}G}TPgb)T8n#dGmIA4l())`8Y&wYn|Fs463wVQRa< zTjw`p(kUrkilTZcqcv)|cSLGxa;;VQa~bJE$v2b7O{&uVMPu|ODQH#E?~$7A>P9i08o51VJ5I%j}W?+kProIx)|Lx-l_on-Q4rHlRq`Q987 zBvULRT7E1M2H6_t(#jWBk*6lgk%|x@Cntr!{ALkmX?v>=ls#o4N+y?zOf^z|vWRe* zALk10oDxB@Al{{y)9;22GQ}#i^7(6#`1eMXoOvbI{T?coLtUYInO$V``!!Sb&q|2Q zo)SK?=Z%Q_S*{;926$Sg#8-c*`!G=GX|##&v9f+lpC(;>!9lV+$L*G_6K)@m#b(SE zO~T)ZV1ytPVF*VAA`yjX#2^-PFc)!{hj`4#0wf?23z39mn2>^0EJ7L#+eFu?acI#b)FoA6u{$1t`QeY{w4l#4Z$}7`w3td$A8C z*bg%-u%Z-YIDm2-LYeMcHBk>Iw5ffchQA=xQ_>Th;H=Y5qi;wemuq# U3}6sLaA6p3JoO0wXP-4c06r2sWB>pF diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 9b113d4adb78c6df1ce77a220c176adae6563438..e5dd5368b3e9e33232bfdebe84434334c545f28c 100644 GIT binary patch delta 10888 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 Tg^TWPKdGKK=DJ*Nd8gpNn&hKH delta 10856 zcmeHMiC^&=OFfH@pv**it#_zlC<=%HG`3ruY&)wX6zH9BZ*WTan-e>Q_ zN*VhRuRYW3^x?g5eiD2~_vcFq0rTL1Z517oI$yW3>f zC*CQ#zSk)<)hDSabz)Iw(xcC#5qLBLk4E6p2s|2rM>Z<&dzY0*@RCg7qdZ-}PQw6JDs<(PdJ+1nv5EZKWs(va=g{%H5LPe?p>KQdq zMX6`iAQi1*RID1ThNw6duZF7URDv3&hO0!Cq(-Rc)ku}BMyb(ij2f%Psqt!pN>QmQ zO-)qkYLc3)rl_eZLrqiD)eJRL%~G>frpi)t)Lb=B%~uQ5LbXU`tHo-G%27+zGL@_H zRK8lSRw$)bsu$EMwOXxFYgK_NRO{4wwLxuEMQW4UtX_PxILB8ON-Byk@uYX+OBzwJ zEbc}h`WD}&^;$_7ZR}dSl+Ldz8CNmQuQo%7RYMmm5n1?iKQTTFcTq`t9h!o0+H22U_=wPIILoR!nV9jhL#Ks%7 zwd~ax7~`ezcEp?1;pywl?6J!9@+$mt&kM4d7Fy$Q7I$ zUycT z$H#Ix##z+>zPcW_4h^rdMX5`Ox#foIaSMOumhpTPJGTyTI1@X!z^xs()(nNh}rf!il5{F%{*;mj!G zJ2?*WS(4z+0<&B$_GGR1P7lF3fSqCZGsBGSLa{RpoEc_(PXqW~ zX6#`V${MJ!A2>diixagqe4qh*CvZEH4*rL1K|~TX3PVI=Yo?75+CJTZvn03&2O9{) znb;)(f0hK(JjDE&=TX#2bF_O{?ME?J;vfTj$Hzei>=y<be8 z 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 W{JUpC*Qy-adCoZO6!*>3>;4b<9lK@# diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index c3a991ffac5f3e0daccafbef0f6e4036a1c86ec7..e1c3a28dae221b69b1fa50299e91cd0f4698c1f2 100644 GIT binary patch delta 837 zcmcJ{M^jT_0EOZENiLbpu%HMDMF~Z!C@4iyq$46FmVgyRss#-Z1yM@i!_d@(pivM| z1O*gE2WKvOcJBBgY?;Z9*B{~HS-oeDV|Pn+z-1O4?ii!0{0$L`JI^S@Z)>6|GCX~% z(NAemHodA(2*u;plQviN+d{W)$qyU08JsqQzybI{2NnLB&7l9a_di};dooZ4$zT~G z56Vy(CXIhgYj)jY{qnB1VK*(MX#D}@)*!EWE;zw!@efbcwz@(^oYS{sLO3E2i6|Vx zVMN1>7{ub=J|0JqfJ7uA87WA`QKaD*jw2lzIDwPML>97O2us!;#9cI@87*i< z8`^OX_wfJ^(Sb*J3>!LO#}jnnDW0JlJ$Q~@yueHJp&tVngabnuhQtV7!HH3fVH^{f z#B034Te#rH6g-&5JG_S%AMg<~n8hc|VIB+kj4xQkS1e%}-|!tPSj8HC;HT!>Ss!iQ E2RWA8)&Kwi delta 1057 zcmcJ}TTqN~7=ZEpYPYp!nzr4|er-w-(SePMkWysj(1u!vC`odNEoTYoBd5}K@F!|F zs;zV~nOS4TFpT?dabw1{nJ$`!D;|Rj#;uFr)%(8BytSX7X=>3FDXCmhW{u>hQdPLp z%#!L!evC#^wbW?L{?h9gV?y&)k`h~7T1I32+BcHAMCdFh@Hutb z(W(DYZJJW_O0Z&3jEYGKQD!LSr}99RI`{dfLf>$e+#M@&-g!erMx$Yx2oJQ?h=Pbg zgU}~gOhR8aq!a1wvQgNp`%I#^OV$W)ha4lCWv@|q8Vm+u53&UcPp6zJ^4|Zh1a`>@ zV!|y4h!MAJ|GW1x$QCcgONX=~*)2!^naUPn)qTHyp;GscTgT6fiEc}<@1x$9WffMR zVY(Qp)N6#(V=5O`n=wv|4hO5nt8cw+BC^L6CyH7_%wqgY=#VeWMK`~A{*;q!+PXk12$q4HX|2yN00*{X2X*2k1a2-0+|a5Ag`y=s_>M=tDmS@EC(W J$K+6K=6A-G<&*#b diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index abbc00767dd1f1d5317e875288956b918d5393e4..c18f381432dfeda4dcdcad27aaa7824dc56c13e8 100644 GIT binary patch delta 10456 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 LZ!H~8f06fp2i#j} From 71818c491ccc1b5ae7568b21dd2d7968ca21ad6d Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 22 May 2022 08:52:07 +0000 Subject: [PATCH 8/8] fix cmd length on shutter page (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 ++++---- HMI/US/landscape/n2t-out-visual/popupShutter.txt | 2 +- HMI/US/landscape/n2t-out/popupShutter.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 12 ++++++------ HMI/US/portrait/diff-filtered.txt | 14 +++++++------- HMI/US/portrait/n2t-out-visual/popupShutter.txt | 2 +- HMI/US/portrait/n2t-out/popupShutter.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 8 ++++---- HMI/n2t-out-visual/popupShutter.txt | 2 +- HMI/n2t-out/popupShutter.txt | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 397507c8..aebc8351 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:36:43.131639685 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:52:06.663941704 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:36:43.131639685 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:52:06.667941783 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 3576b25a..bc4f5fff 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 39c20ee3..5fca3dc8 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 8c96df23..aeac48ab 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:36:42.611635917 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-22 08:36:42.175632757 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:36:42.615635946 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -465,8 +465,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:36:42.611635917 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:52:05.927852627 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index fc89c850..9b0ffe96 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:36:42.679636410 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:36:42.611635917 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:36:42.175632757 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:36:42.615635946 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:52:06.071870294 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:52:05.367816736 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1880,6 +2108,166 @@ @@ -26,5 +26,5 @@ ++ if(tTmp.txt=="disable") ++ }else if(tTmp.txt!="") ++ bDown5.txt=tTmp.txt -+--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:36:42.611635917 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:52:05.927852627 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index c88262c5..2cfd938c 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 39c20ee3..5fca3dc8 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index da26d1be..254fe31b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,6 +22,10 @@ popupNotify 17 Component(s) 200 Line(s) of event code 125 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code screensaver 35 Component(s) 296 Line(s) of event code @@ -34,10 +38,6 @@ cardQR 30 Component(s) 363 Line(s) of event code 205 Unique line(s) of event code -popupShutter - 20 Component(s) - 241 Line(s) of event code - 138 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 12852a06..baddcd3a 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 39c20ee3..5fca3dc8 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes