From 3fae6adb972697003fae25c220c88788bd13ff3c Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Fri, 22 Apr 2022 16:48:22 +0200 Subject: [PATCH 01/16] Shutter Fix in GenerateDetailPage - Wrong delimiter in payload - Added RegisterDetailEntityWatcher --- ioBroker/NsPanelTs.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index 4f4cd542..d7ebbea8 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -659,11 +659,14 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] { } if (type == "popupShutter") { - if (existsState(id + ".ACTUAL")) + if (existsState(id + ".ACTUAL")) { val = getState(id + ".ACTUAL").val; - else if (existsState(id + ".SET")) + RegisterDetailEntityWatcher(id + ".ACTUAL", pageItem, type); + } else if (existsState(id + ".SET")) { val = getState(id + ".SET").val; - out_msgs.push({ payload: "entityUpdateDetail," + val }) + RegisterDetailEntityWatcher(id + ".SET", pageItem, type); + } + out_msgs.push({ payload: "entityUpdateDetail~" + val }) } } return out_msgs From 31d411dbd5cec2d36bf6a996259b620e057e3b4c Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Fri, 22 Apr 2022 16:57:09 +0200 Subject: [PATCH 02/16] Send message to screensaver Via the 2 ioBroker data points: var popupNotifyHeading = "0_userdata.0.NSPanel.1.popupNotifyHeading"; var popupNotifyText = "0_userdata.0.NSPanel.1.popupNotifyText"; messages can be sent directly to the screensaver --- ioBroker/NsPanelTs.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index 4f4cd542..3aaf3bc6 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -13,6 +13,10 @@ const On: RGB = { red: 253, green: 216, blue: 53 }; const BatteryFull: RGB = { red: 96, green: 176, blue: 62 } const BatteryEmpty: RGB = { red: 179, green: 45, blue: 25 } +//Datenpunkte für Nachricht an Screensaver +var popupNotifyHeading = "0_userdata.0.NSPanel.1.popupNotifyHeading"; +var popupNotifyText = "0_userdata.0.NSPanel.1.popupNotifyText"; + var Wohnen: PageEntities = { "type": "cardEntities", @@ -118,6 +122,10 @@ schedule("0 * * * *", function () { SendDate(); }); +//Send message to screensaver +on({id: [popupNotifyHeading, popupNotifyText], change: "ne"}, async function (obj) { + setState(config.panelSendTopic,(['notify~',getState(popupNotifyHeading).val,'~',getState(popupNotifyText).val].join(''))); +}); // Only monitor the extra nodes if present var updateArray: string[] = []; From 8a776e5cf2c61e253f810f29031049cc91681643 Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 22 Apr 2022 18:56:10 +0200 Subject: [PATCH 03/16] fix a bunch of wrong checksums --- HMI/nspanel.HMI | Bin 11173923 -> 11173923 bytes HMI/nspanel.tft | Bin 10156240 -> 10156240 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index ee267ddcf5e08836cbd86c3da2eddf0fa35e3c33..d514c108be39c273ddaa549046e070c4d819fd20 100644 GIT binary patch delta 2574 zcmeIydr(wW90%}o;qHozI?KI#VecvgMn2f(spyg-FM~xvu|%LWBvUhAE0Thxpoptj z2`zGb0V&F|j3qkQaVBM{(QKMgv&@-@6la?0J!+<*lTF{f7gU)3sOitTGoRi4oyYH- z-<~s&ie!mI2-og*GpxeC z(Nt)Y$feQBT;j0uw$j)EllPxCkf6+mlS4fVdty9pKbd?Hu1+4fzm+N+4G!TZ6$L;d&}FUvB{+Wa%9ySr}DpYju34i=XNA$hljXHPrA^hCQv`~rntx_ zNgOtOgk(%CE-%p93$z?~fj97=0WB-g4yw3Yv@uKS|=2$BJID~$cFWTtUT45y9m575i58|OT z@|F)zV@m!M55s*+lCnOA>8eDe|Cy+j%BsrV=z3qBKfT^#xXzk#q}!Iikr~+}Gso}-{K(DkyLsv~%ebR& z7a!(i?Y@%LtYo6~#V#Wq9MjywHdv%(-fDX6)T~xcv%-ufR+=R3RAL)lIm2nCbyU`~ z?o`Rj^G8z$9bui<(!N>SdtwwP_C4*;>U=y!vz~6ji(^G|t*%M*+^@nJ+WNC`Ii1f* zCYp6bf0BMY%P849uNYxCjDSE0g2x~jLSQ634x#V_jDpcH2F5}dn7|C-5CM@81M+c$fkSkO)bT3@I=bo`O`?c_r<4FWzd+yT^7V$e$%YQhp3| zU-pw|RG0Gr&AKOyqYa&Y{`CBph89{?CHvFPt#UFgE0O(KMui-g!H%!6`f&COMOH|M zX)ql!AQNW5Ovr*+@H9LFvmqPiKn~_U;V!_I$q zA&_VDrnt^Vs@GsxcypJ~dm|E?e^cHVZ7hA}gP-jUuJR8(18mg2xFwB6gt&6ld%_Uc u_g)#LYnrLA%X5WdsP3RaV!2T+ZWv#g-*oMtE}K!q#W1|LCq(?)<^Kc;KH6pg delta 2580 zcmeIydr(wW90%}om%A%Ifc4(Jz`X(i7MVO`K?Qt)NwUb(#1zVkFqAS`NHi&3Hoy%s z0v9>>LJV;Moxt&NoJy>joJOaC9H;)sG@Ph^%mEQAC#U-EUL@h4rkVPycIGp4&OPUM ze!qLpp4(E^p>2WM1$Kj*zAn|BBga>s(^#S-%(>)&-Mv6oN($q1#o;P#EZskRb z^W8X1H%5+~Umq`%TXpL6@$X%ENmlDWk3E5&vkqEUnQmcHF$Lt|yVC(`s&eqt+~stBn+Gc94J_&hQ|eKi6rG*G`jvc)%B>kDh zgB9KpOjFeSNE)gg&F{f_Cx~6{YB0Yu!!wWF+axT>rU^rB&9rZ~A(Tz(6>fTr2E?$Y ztHLlp+V@~y-w7w&ALz&bIJW;+xox^*BGVl+Y)z&`p9}faPcP>2)1z8%u&PUPx2SI5 zuiwk2Fd8_wt%pvGYU^MhipmBzXa6L-;-iGQ>N&+e@>6z?lvbGTFwt-0Oa|s3teAMd zdTEZ1wSMaR$s~1~w@uP}v&b)e`{SIeoMM@EQobv+sv%AerC3y=ksTsWYb`RhDO3V) z@L>w|wT1KUE5584cfx6t)mlruBw5{%f9bI2G>;s1;$^v?qnW(klT{8MIUY^-R0_+P zZHA*eiDoFK5IWc{hO!2;I>9m?%D@V5LOE1G zCF}qjyaiQI4R6Cvcn50WU8sdR*adc|huzQs6dGX9}Ykh9E4^#1n)r$9EMgn z!u%T@#cTQ5{nwVWHH+Fmo26b_&+xWy1hv_e(Dt*3+Dy(EZFV1Q&#rbor8Sd9iS^Cw zm^qQ*pkpG`Z_T-N9Z4)AsC|`s;Tif(BX{35v@G=g5XHA3is}#hN^EsxJLk!tzL<64 M?-r9<|IZ}<0|ZulUjP6A diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index b4e8184a777e4c907018a66df362f10e89a168fd..30f1fa5808f0dc8da502b02d9fbf3301aa788bbb 100644 GIT binary patch delta 914 zcmZ9JTTqN)7{{k<+O6GmP_ZnPN|8h4oUBu|EefURfSd_A<`AWRv=vhOe!jSnF}cx< zVFvF^W*UqeZZzY{7%p9?3>RGD^L;C;i)ZHj{h#OmJn!?q{oe*m{aVx$Kp>+q5yWVM zF=HWwP^{PpV+`R$5J?nci6(|v#xWi{6PSpDNlYe=coLXGB1t4Ol@wB$#&pt{!Axc` zn{?(dmkj1Hp9L&r5sO(uCQHd;8BUh7f|aadHQD5li;FzmtYIzd$ftnyY+xgW6tRh7 zO4!U6N-3k93bwM1?NqXZo$O*ad)Ui9_H%$L4swXYRC9!*9OF1AI7tnsIL#T(Qp-8c zQ%5})XrK|e$R(Qa&`b-hT;>W_Y2zC0bUgBYZ&$w-3XAIM^}402!&?yM$3wThJt2NP z*z-RRJn_EE8O}SU?U(nn-H)Ai(Hi)VRgE1o-60N*5bZKBP8=B_+T^PQaVO)C-KCy* zDH4U(q?X4DhuXGPm}NkT=+_-CRU2!T38mt#!7{5tq?rt#b_|xil_JStnX*UJ2I(m| zR3$$88t7FMs>K7}^7k4=w(2ZWtTMSybOak4XrlAa1{O7>Nj&t^^zl}Y$oDPq*BvS! zw}>}UewBaS^)5=!MrC&K|Wjc4d)tt9o2;WfD5v zn2b9fc;dwryz#*oKl}+GkRYZKObDTb5l#e=OheCfW)MX*G0Y^EIA$@McoLYyToReb zd={{fBo?ulWR|d$Wh`d}D_KPft4U=I2G+8U^=u%Gjii%7CPuQ@#Addzm29@LogL(` zlU?MJ$8PqJPXUD#QA`PYDPooUx+2Gfn z2{_tsev>|~W-6b*<}VR8XowIku2v{Ds8>mPQR(0j$~8(FzaMtsL;#SV&S1&^2D$;VRvZDJXB1+7;zF+YLQ6PIgQb{yBa7JaZaL&FB7$H z4wD)y7w?^hNNXsvO7vRq_LQHxMT+vT6W#8%&^VX=df_9zn#3cA)^8H|_Bqx_XS4Vi z8(FxAircrE1@b5c?1-|NKrAB+HUuOQsymw Date: Fri, 22 Apr 2022 16:56:34 +0000 Subject: [PATCH 04/16] fix a bunch of wrong checksums (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 319 ++++++++++++++++++++++-- HMI/US/portrait/diff-eu-version.txt | 347 ++++++++++++++++++++++++--- HMI/US/portrait/diff-filtered.txt | 340 ++++++++++++++++++++++++-- HMI/n2t-out-visual/cardAlarm.txt | 2 +- HMI/n2t-out-visual/cardEntities.txt | 18 +- HMI/n2t-out-visual/cardGrid.txt | 14 +- HMI/n2t-out-visual/cardMedia.txt | 2 +- HMI/n2t-out-visual/cardThermo.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 58 ++--- HMI/n2t-out-visual/popupLight.txt | 8 +- HMI/n2t-out-visual/popupNotify.txt | 6 +- HMI/n2t-out-visual/popupShutter.txt | 10 +- HMI/n2t-out/cardAlarm.txt | 2 +- HMI/n2t-out/cardEntities.txt | 18 +- HMI/n2t-out/cardGrid.txt | 14 +- HMI/n2t-out/cardMedia.txt | 2 +- HMI/n2t-out/cardThermo.txt | 2 +- HMI/n2t-out/popupLight.txt | 8 +- HMI/n2t-out/popupNotify.txt | 6 +- HMI/n2t-out/popupShutter.txt | 10 +- 20 files changed, 1021 insertions(+), 167 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 021ce806..4b16cd3f 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-04-21 23:04:24.398478719 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-21 23:04:25.342501224 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 16:56:33.761787321 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,9 +8,93 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 16:56:33.765787463 +0000 +@@ -735,7 +735,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-21 23:04:25.346501266 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 16:56:33.765787463 +0000 +@@ -310,7 +310,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -338,7 +338,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -366,7 +366,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -394,7 +394,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -419,7 +419,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -519,7 +519,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -594,7 +594,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -669,7 +669,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -726,7 +726,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -29,9 +113,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt crcputs tSend.txt,0 //send cmd printh 55 bb +@@ -1752,7 +1752,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-21 23:04:25.342501224 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 16:56:33.761787321 +0000 @@ -254,7 +254,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -50,9 +143,72 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt crcputs tSend.txt,0 //send cmd printh 55 bb +@@ -315,7 +315,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -351,7 +351,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -387,7 +387,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -423,7 +423,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -459,7 +459,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -495,7 +495,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -838,7 +838,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-21 23:04:25.346501266 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 16:56:33.765787463 +0000 @@ -24,7 +24,7 @@ Attributes Scope : local @@ -71,9 +227,30 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt Variable (int32) vaSpeakerPos Attributes +@@ -697,7 +697,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 16:56:33.765787463 +0000 +@@ -948,7 +948,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-21 23:04:25.346501266 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 16:56:33.765787463 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -84,20 +261,134 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-21 23:04:25.342501224 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 16:56:33.761787321 +0000 +@@ -213,7 +213,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -243,7 +243,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -273,7 +273,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -298,7 +298,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -361,7 +361,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt +--- HMI/n2t-out/popupNotify.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 16:56:33.761787321 +0000 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -147,7 +147,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -174,7 +174,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 16:56:33.761787321 +0000 +@@ -147,7 +147,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -172,7 +172,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -197,7 +197,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -222,7 +222,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -247,7 +247,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-21 23:04:25.346501266 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 16:56:33.765787463 +0000 @@ -664,7 +664,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index b3a6fbf9..a09a069e 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-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-21 23:04:24.850496133 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 16:56:33.357772992 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-21 23:04:24.850496133 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 16:56:33.357772992 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -22,9 +22,18 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Variable (string) tSend Attributes +@@ -735,7 +735,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-21 23:04:24.854496174 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 16:56:33.357772992 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -127,10 +136,46 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Picture p0 Attributes Scope : local -@@ -402,6 +453,34 @@ - prints tSend.txt,0 - prints crcval,2 - +@@ -310,7 +361,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -338,7 +389,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -366,7 +417,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -394,7 +445,35 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ +Slider hSlider5 + Attributes + Scope : local @@ -152,16 +197,45 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ - Button bDown1 - Attributes - Scope : local + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -419,7 +498,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -519,7 +598,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -594,7 +673,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -669,7 +748,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -726,7 +805,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -479,9 +553,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { +@@ -1752,7 +2102,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-21 23:04:24.850496133 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 16:56:33.357772992 +0000 @@ -69,25 +69,25 @@ Attributes Scope : local @@ -546,9 +629,72 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt crcputs tSend.txt,0 //send cmd printh 55 bb +@@ -315,7 +315,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -351,7 +351,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -387,7 +387,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -423,7 +423,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -459,7 +459,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -495,7 +495,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -838,7 +838,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-21 23:04:24.850496133 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 16:56:33.357772992 +0000 @@ -24,19 +24,19 @@ Attributes Scope : local @@ -572,9 +718,18 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt Variable (int32) vaSpeakerPos Attributes +@@ -697,7 +697,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-21 23:04:24.850496133 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 16:56:33.357772992 +0000 @@ -42,7 +42,7 @@ Attributes Scope : local @@ -584,9 +739,18 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Variable (string) va0 Attributes +@@ -948,7 +948,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-21 23:04:24.850496133 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 16:56:33.357772992 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -606,8 +770,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Picture p0 Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-21 23:04:24.850496133 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 16:56:33.357772992 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -627,8 +791,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-21 23:04:24.850496133 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 16:56:33.357772992 +0000 @@ -59,8 +59,8 @@ Variable (string) entn Attributes @@ -640,18 +804,84 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt Variable (int32) mode Attributes +@@ -213,7 +213,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -243,7 +243,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -273,7 +273,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -298,7 +298,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -361,7 +361,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt +--- HMI/n2t-out/popupNotify.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 16:56:33.357772992 +0000 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -147,7 +147,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -174,7 +174,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-21 23:04:24.850496133 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 16:56:33.357772992 +0000 @@ -46,8 +46,8 @@ Variable (string) entn Attributes @@ -663,9 +893,54 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt Text tEntity Attributes +@@ -147,7 +147,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -172,7 +172,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -197,7 +197,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -222,7 +222,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -247,7 +247,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-21 23:04:24.398478719 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-21 23:04:24.850496133 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 16:56:32.977767849 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 16:56:33.357772992 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 4e8e7c40..afa99ea7 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-21 23:04:24.866496298 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-21 23:04:24.850496133 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 16:56:33.369773418 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 16:56:33.357772992 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-21 23:04:24.850496133 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 16:56:33.357772992 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -13,16 +13,23 @@ + + Variable (string) tSend + Attributes -+--- HMI/n2t-out/cardEntities.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-21 23:04:24.854496174 +0000 ++@@ -735,7 +735,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++--- HMI/n2t-out/cardEntities.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 16:56:33.357772992 +0000 +@@ -62,6 +62,16 @@ +@@ -97,25 +107,37 @@ + Attributes + Scope : local -+ Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 -+ + Variable (string) entn2 + Attributes + Scope : local @@ -33,8 +40,10 @@ + Variable (string) entn3 + Attributes + Scope : local ++ Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 ++ + Variable (string) entn4 + Attributes + Scope : local @@ -45,7 +54,85 @@ + +@@ -153,6 +175,15 @@ +@@ -283,6 +314,26 @@ -+@@ -402,6 +453,34 @@ ++@@ -310,7 +361,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -338,7 +389,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -366,7 +417,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -394,7 +445,35 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 +++ crcputs tSend.txt,0 +++ //send cmd +++ printh 55 bb +++ prints sys0,2 +++ prints tSend.txt,0 +++ prints crcval,2 +++ ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -419,7 +498,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -519,7 +598,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -594,7 +673,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -669,7 +748,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -726,7 +805,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -71,9 +158,18 @@ + } + if(tInstruction.txt=="pageType") + { ++@@ -1752,7 +2102,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-21 23:04:24.850496133 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 16:56:33.357772992 +0000 +@@ -69,25 +69,25 @@ + Attributes + Scope : local @@ -138,9 +234,72 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -315,7 +315,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -351,7 +351,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -387,7 +387,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -423,7 +423,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -459,7 +459,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -495,7 +495,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -838,7 +838,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-21 23:04:24.850496133 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 16:56:33.357772992 +0000 +@@ -24,19 +24,19 @@ + Attributes + Scope : local @@ -164,9 +323,18 @@ + + Variable (int32) vaSpeakerPos + Attributes ++@@ -697,7 +697,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-21 23:04:24.850496133 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 16:56:33.357772992 +0000 +@@ -42,7 +42,7 @@ + Attributes + Scope : local @@ -176,9 +344,18 @@ + + Variable (string) va0 + Attributes ++@@ -948,7 +948,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt -+--- HMI/n2t-out/pageIcons.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-21 23:04:24.850496133 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 16:56:33.357772992 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -197,11 +374,11 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-21 23:04:24.850496133 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 16:56:33.357772992 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-21 23:04:24.850496133 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 16:56:33.357772992 +0000 +@@ -59,8 +59,8 @@ + Variable (string) entn + Attributes @@ -213,6 +390,33 @@ + + Variable (int32) mode + Attributes ++@@ -213,7 +213,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -243,7 +243,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -273,7 +273,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -298,7 +298,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -222,9 +426,48 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -361,7 +361,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ++--- HMI/n2t-out/popupNotify.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 16:56:33.357772992 +0000 ++@@ -120,7 +120,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -147,7 +147,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -174,7 +174,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-21 23:04:24.850496133 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 16:56:33.357772992 +0000 +@@ -46,8 +46,8 @@ + Variable (string) entn + Attributes @@ -236,9 +479,54 @@ + + Text tEntity + Attributes ++@@ -147,7 +147,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -172,7 +172,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -197,7 +197,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -222,7 +222,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -247,7 +247,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-21 23:04:24.398478719 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-21 23:04:24.850496133 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-22 16:56:32.977767849 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 16:56:33.357772992 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index d6d8bd96..c52d2cf2 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1266,7 +1266,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index c911d475..1caca43e 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -696,7 +696,7 @@ Slider hSlider1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -739,7 +739,7 @@ Slider hSlider2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -782,7 +782,7 @@ Slider hSlider3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -825,7 +825,7 @@ Slider hSlider4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -872,7 +872,7 @@ Button bDown1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1060,7 +1060,7 @@ Button bDown2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1201,7 +1201,7 @@ Button bDown3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1342,7 +1342,7 @@ Button bDown4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -2698,7 +2698,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index b27a2ce4..d8ab57da 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -632,7 +632,7 @@ Button bEntity1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -690,7 +690,7 @@ Button bEntity2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -748,7 +748,7 @@ Button bEntity3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -806,7 +806,7 @@ Button bEntity4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -864,7 +864,7 @@ Button bEntity5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -922,7 +922,7 @@ Button bEntity6 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1276,7 +1276,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index b4c426a1..fad0bd86 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -1120,7 +1120,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 9f2326ec..d985a252 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1502,7 +1502,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index a91942df..f2f346e3 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,42 +10,42 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -popupLight - 27 Component(s) - 338 Line(s) of event code - 183 Unique line(s) of event code cardGrid 39 Component(s) 418 Line(s) of event code - 245 Unique line(s) of event code -screensaver - 35 Component(s) - 292 Line(s) of event code - 235 Unique line(s) of event code -popupShutter - 19 Component(s) - 191 Line(s) of event code - 107 Unique line(s) of event code -popupNotify - 17 Component(s) - 196 Line(s) of event code - 123 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code -cardAlarm - 35 Component(s) - 343 Line(s) of event code - 214 Unique line(s) of event code -cardThermo - 41 Component(s) - 442 Line(s) of event code - 247 Unique line(s) of event code + 244 Unique line(s) of event code cardMedia 30 Component(s) 329 Line(s) of event code 169 Unique line(s) of event code +screensaver + 35 Component(s) + 292 Line(s) of event code + 235 Unique line(s) of event code +popupLight + 27 Component(s) + 338 Line(s) of event code + 183 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code +popupNotify + 17 Component(s) + 196 Line(s) of event code + 123 Unique line(s) of event code +popupShutter + 19 Component(s) + 191 Line(s) of event code + 108 Unique line(s) of event code +cardThermo + 41 Component(s) + 442 Line(s) of event code + 247 Unique line(s) of event code +cardAlarm + 35 Component(s) + 343 Line(s) of event code + 214 Unique line(s) of event code cardEntities 62 Component(s) 964 Line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 7a3866dd..069a9dcd 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -465,7 +465,7 @@ Picture pColorWheel btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -510,7 +510,7 @@ Slider hBrightness btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -555,7 +555,7 @@ Slider hTempSlider btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -705,7 +705,7 @@ Dual-state Button btOnOff1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index 51b50ebf..872f5921 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -283,7 +283,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -332,7 +332,7 @@ Button b2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -381,7 +381,7 @@ Button b1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 4ba66d24..5a91fd99 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -322,7 +322,7 @@ Slider hPosition btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -369,7 +369,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -416,7 +416,7 @@ Button bDown1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -463,7 +463,7 @@ Button bStop1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -510,7 +510,7 @@ Button bUp1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index d49e3e28..641f6222 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -735,7 +735,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 00b1b859..0dea8316 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -310,7 +310,7 @@ Slider hSlider1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -338,7 +338,7 @@ Slider hSlider2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -366,7 +366,7 @@ Slider hSlider3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -394,7 +394,7 @@ Slider hSlider4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -419,7 +419,7 @@ Button bDown1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -519,7 +519,7 @@ Button bDown2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -594,7 +594,7 @@ Button bDown3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -669,7 +669,7 @@ Button bDown4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1752,7 +1752,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 3f734ad1..b73dd476 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -315,7 +315,7 @@ Button bEntity1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -351,7 +351,7 @@ Button bEntity2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -387,7 +387,7 @@ Button bEntity3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -423,7 +423,7 @@ Button bEntity4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -459,7 +459,7 @@ Button bEntity5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -495,7 +495,7 @@ Button bEntity6 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -838,7 +838,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 3e857c3f..d4bba5d4 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -697,7 +697,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 274b229f..976b6f7e 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -948,7 +948,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 73b50ae0..361dd939 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -213,7 +213,7 @@ Picture pColorWheel btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -243,7 +243,7 @@ Slider hBrightness btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -273,7 +273,7 @@ Slider hTempSlider btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -361,7 +361,7 @@ Dual-state Button btOnOff1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 984ad5ee..af719e18 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -120,7 +120,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -147,7 +147,7 @@ Button b2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -174,7 +174,7 @@ Button b1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index a8c40451..1b4063b0 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -147,7 +147,7 @@ Slider hPosition btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -172,7 +172,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -197,7 +197,7 @@ Button bDown1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -222,7 +222,7 @@ Button bStop1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -247,7 +247,7 @@ Button bUp1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb From 00b310f56823171e3deb534d456524c4008b67db Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 22 Apr 2022 19:03:25 +0200 Subject: [PATCH 05/16] fixed more bad checksums --- HMI/nspanel.HMI | Bin 11173923 -> 11173923 bytes HMI/nspanel.tft | Bin 10156240 -> 10156240 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index d514c108be39c273ddaa549046e070c4d819fd20..bffcb367c3d1247a552cd6cb731be885b073887a 100644 GIT binary patch delta 1659 zcmeIxZ%j>b9LMo-7_S)I^_xb(4=j^xN&z*nA{C1LdDb}(duxsPIen*k=h{4$%K093bWz1{%U7Sz)!VbVGPD%9Ktak6A*!kn1o17Mii!CDyCsNqA>$AF$*!6jX9W$Sj@wGEI=F(HBzw#X;_POSdR_Zh)uA=fply}2DTs*Td@sU*p6)M zz)tMKZaA?Ady#{E*pCA^h(kDxBgn;39K&(sAs;7j5(Q9j3a3$sGblnaN^lnEa2};7 zLpdto!UbGJB~(=55~^_-S8x?Is6`#F;X2&7fty-eRef=)m{C*WqaXVpY5Li2QcHX| r>tjyH!9ADb-@OJ}dAb~A(guq1XM>s_*3ev-e76C&wB)=Tt%WFlVwvdSWwk1+;-reMrn}2@)bN(kMr*i9gVXgj>ygYoizOmKKn}_H#DUUhMEGY z_Kq>+Sb!nO+0x@PE7Fs2Nz&c$Nm69%rDY=(siBmtOJ`kFRO@WVLq&Q$g*{jo+d7gK zgxaOVYb{yRJehgTHD~B#d>AYJ)t~m>BL(ebPOaDYcb2!t+meyHLrk&q*JMjwq03a{ zGU=d)0Wyp*X)aTnx^MsQOZN}=b?Teyry5yC;?~?dCk&6#@a68@8hmDt2Heim(g2u?Ksx5BqTd#VA234#JHx9KvA; z9Klf>!*QHIIVx}xr*Il)P>Hjs(o$dyr0h|Itl4E>D%sa8*_YxWd+7gqad8dfX1oViGhI75 zG2`N7%;?}~#yiuY4&KA(@cli%&aR(Ho$;FV5z<$ZWc~D)B2}7n17sLzkW7PR8Dgkx z!wi>WgpqQMGFsReW91oVynGW(G)aNUrYJPkG)1N>R$_*kW|?h{x#lS~-vVXIEwo65 z#g~dUNvgf*{9xq2OMdU)#RaT@T`u$^DdaN!v@+H)Bj5Vc1LYX}~ z+E5!wi?-GTDY0)kk@vkmd&!U7MDi<~NdDv{lE3+hB)K4wWE3Wn?4tijJexOHTpWdg(1FM<0FlldHcx0}M3CU_;~^ zYM27UjZkQ$Q9?!=qsUm}6dP}XiAqc|S*a~Tb zEwR)x%dN1|Dyyxr);jBLP-&x0Hrt{~wXL?)#YSgN;PrdyPIOveWjyUR= z<4!o~l+(^Q>zwl%T+ryEOD?W&NGa!NkwJKeI9!txg1zEj96A z>Ptc5ZTJ5#b{1y9Z=nqMqbLLZD$an}B^fZcGy~?B{f`YF Date: Fri, 22 Apr 2022 17:03:53 +0000 Subject: [PATCH 06/16] fixed more bad checksums (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 161 ++++++++++++++++++++++---- HMI/US/portrait/diff-eu-version.txt | 165 ++++++++++++++++++++++---- HMI/US/portrait/diff-filtered.txt | 167 +++++++++++++++++++++++---- HMI/n2t-out-visual/cardThermo.txt | 22 ++-- HMI/n2t-out-visual/nspanel_Stats.txt | 18 +-- HMI/n2t-out-visual/popupLight.txt | 2 +- HMI/n2t-out-visual/popupShutter.txt | 2 +- HMI/n2t-out/cardThermo.txt | 22 ++-- HMI/n2t-out/popupLight.txt | 2 +- HMI/n2t-out/popupShutter.txt | 2 +- 10 files changed, 457 insertions(+), 106 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 4b16cd3f..1636c326 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-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 16:56:33.761787321 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:03:52.601826419 +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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 16:56:33.765787463 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:03:52.601826419 +0000 @@ -735,7 +735,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 16:56:33.765787463 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:03:52.601826419 +0000 @@ -310,7 +310,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -123,8 +123,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 16:56:33.761787321 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:03:52.601826419 +0000 @@ -254,7 +254,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -207,8 +207,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 16:56:33.765787463 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:03:52.601826419 +0000 @@ -24,7 +24,7 @@ Attributes Scope : local @@ -237,8 +237,107 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 16:56:33.765787463 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:03:52.601826419 +0000 +@@ -273,7 +273,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -309,7 +309,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -368,7 +368,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -395,7 +395,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -422,7 +422,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -449,7 +449,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -476,7 +476,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -503,7 +503,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -530,7 +530,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -557,7 +557,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -584,7 +584,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -948,7 +948,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -249,8 +348,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 16:56:33.765787463 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:03:52.601826419 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -261,8 +360,17 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 16:56:33.761787321 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:03:52.601826419 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -213,7 +213,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -309,8 +417,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 16:56:33.761787321 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:03:52.601826419 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -339,8 +447,17 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 16:56:33.761787321 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:03:52.601826419 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -147,7 +147,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -387,8 +504,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 16:56:33.765787463 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:03:52.601826419 +0000 @@ -664,7 +664,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index a09a069e..f799dd10 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-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:03:52.181823027 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:03:52.181823027 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -32,8 +32,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:03:52.181823027 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -563,8 +563,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:03:52.181823027 +0000 @@ -69,25 +69,25 @@ Attributes Scope : local @@ -693,8 +693,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:03:52.181823027 +0000 @@ -24,19 +24,19 @@ Attributes Scope : local @@ -728,8 +728,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:03:52.181823027 +0000 @@ -42,7 +42,7 @@ Attributes Scope : local @@ -739,6 +739,105 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Variable (string) va0 Attributes +@@ -273,7 +273,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -309,7 +309,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -368,7 +368,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -395,7 +395,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -422,7 +422,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -449,7 +449,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -476,7 +476,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -503,7 +503,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -530,7 +530,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -557,7 +557,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -584,7 +584,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -948,7 +948,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -749,8 +848,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:03:52.181823027 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -770,8 +869,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Picture p0 Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:03:52.181823027 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -791,8 +890,17 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:03:52.181823027 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -59,8 +59,8 @@ Variable (string) entn Attributes @@ -850,8 +958,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:03:52.181823027 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -880,8 +988,17 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:03:52.181823027 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -46,8 +46,8 @@ Variable (string) entn Attributes @@ -939,8 +1056,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 16:56:32.977767849 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 16:56:33.357772992 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:03:51.797819925 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:03:52.181823027 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index afa99ea7..1e133575 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 16:56:33.369773418 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 16:56:33.357772992 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:03:52.209823253 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:03:52.181823027 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:03:52.181823027 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -22,8 +22,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:03:52.181823027 +0000 +@@ -62,6 +62,16 @@ +@@ -97,25 +107,37 @@ + Attributes @@ -168,8 +168,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:03:52.181823027 +0000 +@@ -69,25 +69,25 @@ + Attributes + Scope : local @@ -298,8 +298,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:03:52.181823027 +0000 +@@ -24,19 +24,19 @@ + Attributes + Scope : local @@ -333,8 +333,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:03:52.181823027 +0000 +@@ -42,7 +42,7 @@ + Attributes + Scope : local @@ -344,6 +344,105 @@ + + Variable (string) va0 + Attributes ++@@ -273,7 +273,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -309,7 +309,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -368,7 +368,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -395,7 +395,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -422,7 +422,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -449,7 +449,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -476,7 +476,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -503,7 +503,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -530,7 +530,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -557,7 +557,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -584,7 +584,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -948,7 +948,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -354,8 +453,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt -+--- HMI/n2t-out/pageIcons.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:03:52.181823027 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -374,11 +473,20 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:03:52.181823027 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:03:52.181823027 +0000 ++@@ -29,7 +29,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -59,8 +59,8 @@ + Variable (string) entn + Attributes @@ -436,8 +544,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:03:52.181823027 +0000 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -466,8 +574,17 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:03:52.181823027 +0000 ++@@ -29,7 +29,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -46,8 +46,8 @@ + Variable (string) entn + Attributes @@ -525,8 +642,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-22 16:56:32.977767849 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 16:56:33.357772992 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-22 17:03:51.797819925 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:03:52.181823027 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index d985a252..4d19480e 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -587,7 +587,7 @@ Button bDown btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -641,7 +641,7 @@ Button bUp btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -744,7 +744,7 @@ Dual-state Button bt0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -793,7 +793,7 @@ Dual-state Button bt1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -842,7 +842,7 @@ Dual-state Button bt2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -891,7 +891,7 @@ Dual-state Button bt3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -940,7 +940,7 @@ Dual-state Button bt4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -989,7 +989,7 @@ Dual-state Button bt5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1038,7 +1038,7 @@ Dual-state Button bt6 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1087,7 +1087,7 @@ Dual-state Button bt7 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1136,7 +1136,7 @@ Dual-state Button bt8 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index f2f346e3..6cd6d60d 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,10 +22,6 @@ screensaver 35 Component(s) 292 Line(s) of event code 235 Unique line(s) of event code -popupLight - 27 Component(s) - 338 Line(s) of event code - 183 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code @@ -37,15 +33,19 @@ popupNotify popupShutter 19 Component(s) 191 Line(s) of event code - 108 Unique line(s) of event code -cardThermo - 41 Component(s) - 442 Line(s) of event code - 247 Unique line(s) of event code + 107 Unique line(s) of event code +popupLight + 27 Component(s) + 338 Line(s) of event code + 182 Unique line(s) of event code cardAlarm 35 Component(s) 343 Line(s) of event code 214 Unique line(s) of event code +cardThermo + 41 Component(s) + 442 Line(s) of event code + 248 Unique line(s) of event code cardEntities 62 Component(s) 964 Line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 069a9dcd..d57f9b5e 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -37,7 +37,7 @@ Page popupLight btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 5a91fd99..2a4cb3b9 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -37,7 +37,7 @@ Page popupShutter btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 976b6f7e..7dc823b6 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -273,7 +273,7 @@ Button bDown btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -309,7 +309,7 @@ Button bUp btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -368,7 +368,7 @@ Dual-state Button bt0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -395,7 +395,7 @@ Dual-state Button bt1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -422,7 +422,7 @@ Dual-state Button bt2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -449,7 +449,7 @@ Dual-state Button bt3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -476,7 +476,7 @@ Dual-state Button bt4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -503,7 +503,7 @@ Dual-state Button bt5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -530,7 +530,7 @@ Dual-state Button bt6 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -557,7 +557,7 @@ Dual-state Button bt7 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -584,7 +584,7 @@ Dual-state Button bt8 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 361dd939..9cd4e3cd 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -29,7 +29,7 @@ Page popupLight btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 1b4063b0..4d5aff2b 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -29,7 +29,7 @@ Page popupShutter btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb From fa5086cff6916a4a196662f60ca939fbf8963b88 Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 22 Apr 2022 19:07:37 +0200 Subject: [PATCH 07/16] fix more crcs --- HMI/nspanel.HMI | Bin 11173923 -> 11173923 bytes HMI/nspanel.tft | Bin 10156240 -> 10156240 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index bffcb367c3d1247a552cd6cb731be885b073887a..46ff57a1253d70f28ad6a9de13e6fc18fa891392 100644 GIT binary patch delta 1740 zcmeIwUrY#OsE|IFmro8P?)+Bo{qLvP)g&)na+ z=XcKe&F`MRw!^kQ$oV~TzLspY_xSFS<-xLJmb5y5ZGDcnXt6Z%e6`6T6f&ENkw>t8gh z!`|^gha=`}wJYCrukI7=c4xq$7gijK=@+*9X6I5*XKc6NLm z6II_DrRG#j)SNPwnBf8aTzOiGs6K6694po|J3UE>T;F-aJuVTtuNXhwYwj5CjW|Vb zB>Cq`k8<;dhaxS*&m*4;j8uT zG1mqJA6smC)1Ssc-CgZX(TCa`Tf+lgE~H>QQpG@5+HWhB{mxmb;_R^J`}@sKit?+T zPIH$;6ZKPyF(?*Y_uS{dd0weVUFFRfb8|d${`Iw^=ijxcYpQM!rpLs!W^bhuCd7lt zKqj&<0S{p!9>ye0#uPk)M==%C@EEf3IHn^9GvLNd#!cLpc*x(#Rj~J*HDLgY(xMJ*n~zj zp&6U;I=0{q1kr*w@fNnC6>SJ%8`{xkNJE<;^Gzbr&lV8u;jDRFkBKe Na0mmUBzX8o+YP7EVR!%l delta 1545 zcmeIx?Qc_69KiA0-rF*b(bBGr+c`nN4TO#HG$x=-dFUN(sAB^LvaW)I;eg8?a58lp zEfyFm{=eC4<6P(=O&PV&k9opXNY zckekTH`ey1Ee6ZHuw}lHE<3^{X%^{p#W|}g`D?f4X{E)|NIO&Sl!~m9WHEB(ah80e zRL)SOv*#pZldKm?dAk2;$|G(A0N_eHAFqN(;KHO*MLW3r)oHSBAZrfs|#zcFC9GhBg z`0N?BlTyjt=0J}<)MK~63KQH8fJ8DG0 z;nJPv_=5hp`QvVszFTx*{&o6-ocLN_o#0cw5A3)C;!cyeHsCh)K8y*~r0UOu@aFifPD29;PE7GcXggFdK7FfVn8deVB*&Sb+QS02ZPM z58@##!eT7JQgPYz{$8wTTIF9Nl2AXrBek)*A@3NGcSY5ee>ZNj@zcWkhkCm|b&ze9 z9{rY7SiRo!{cx&o5|)d!TF-%zK3V0FAJW~TYM0w-6Nj5UX%_RdMyU?o;zH7caoY3U%0mt=I+~+fk1OG@=PR@HCq740fUg&*C{ek5;sy z9lH=f5WDdLLfC`7*oO}6$BTFgFXI5hI0yrWa2OGoh~fx3@d}Qj3*C4Xub~I8BZgx* oF0!J%1*??}-5s~y=wEnibL#d^__b{Xq0Zhu^o!2kH}-!0HzmGLF8}}l diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 41914981e13158e966ea3d8a1b051ba95ec3b1f1..b6aa29d80271c84463a828bb72b255905fbd50fb 100644 GIT binary patch delta 669 zcmZ9HNl%ke6ovy-D6LkC;)FOcDvAR*S1h0iR8b~T8AL$_1;q)$0Z|{UACn3_{nW&z zCYqSAAl?KMuy_~mbDn!{&g7q;rb#0`gb_{zCgu@I6lS8a zU}ZiFu(6OB?8LH&#l*3Mr7UAPD~M+$39Mo@Ygo%V5=kPN6jDiJJsU`8Bb&%zGh5io zHZsX#J3H9PE_Snry*SuMHv4gsLoRt7;2`-NqJTn*aB-L;6myhglu$|;Qj?^vCWuM?%4}`9rEV?1%CLWOT6iGrb91$EAeXj pl_Z(`P#N&6|D{8(HD6IrirQi!N1gkFRK6m delta 654 zcmZ9H+f&SO7{;gCPP=R^B2lR5Hu>8$rqw|h;Y45}k|?5yAr>K_*#blfzopv7Qa&vXM>X zv6(GwWgFYcX9qheU>Ak##!eA?*vmeO+0Ow=DCHmy4sn@`iKMTbd9vY4oNxUr}Y_1ivVXu~Gl~*p`!-5-|a#YH2NN6^!eO`-lImI0njGL8S zG!cL+y*(`=1e&@QqyE&1JD^b`jq<}fL%KgmfiW(gIOT7V&;LJ|3xBnVFK3!mI&3%1 n4mp+Ui;T?iPQ^fw@9G~EEuWU5^;YYh>K}ZcSz?;ZP5JZ>r4l9o From 74d3826a98433b835311ec71aff5fda2d38f1950 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Fri, 22 Apr 2022 17:08:02 +0000 Subject: [PATCH 08/16] fix more crcs (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 197 ++++++++++++++++++++++--- HMI/US/portrait/diff-eu-version.txt | 201 ++++++++++++++++++++++---- HMI/US/portrait/diff-filtered.txt | 207 +++++++++++++++++++++++---- HMI/n2t-out-visual/cardAlarm.txt | 12 +- HMI/n2t-out-visual/cardMedia.txt | 18 +-- HMI/n2t-out-visual/cardThermo.txt | 4 +- HMI/n2t-out-visual/nspanel_Stats.txt | 10 +- HMI/n2t-out/cardAlarm.txt | 12 +- HMI/n2t-out/cardMedia.txt | 18 +-- HMI/n2t-out/cardThermo.txt | 4 +- 10 files changed, 571 insertions(+), 112 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 1636c326..f199ab0c 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-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:08:02.141326557 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,62 @@ 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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:08:02.145326608 +0000 +@@ -150,7 +150,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -182,7 +182,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -365,7 +365,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -395,7 +395,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -425,7 +425,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -455,7 +455,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -735,7 +735,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -21,8 +75,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:08:02.145326608 +0000 @@ -310,7 +310,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -123,8 +177,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:08:02.141326557 +0000 @@ -254,7 +254,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -207,8 +261,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:08:02.145326608 +0000 @@ -24,7 +24,7 @@ Attributes Scope : local @@ -227,6 +281,87 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt Variable (int32) vaSpeakerPos Attributes +@@ -134,7 +134,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -163,7 +163,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -192,7 +192,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -232,7 +232,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -262,7 +262,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -301,7 +301,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -352,7 +352,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -415,7 +415,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -447,7 +447,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -697,7 +697,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -237,8 +372,17 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:08:02.145326608 +0000 +@@ -237,7 +237,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -273,7 +273,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -253,6 +397,15 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -341,7 +341,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -348,8 +501,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:08:02.145326608 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -360,8 +513,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:08:02.145326608 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -417,8 +570,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:08:02.145326608 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -447,8 +600,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:08:02.145326608 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -504,8 +657,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:03:52.601826419 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:08:02.145326608 +0000 @@ -664,7 +664,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index f799dd10..0d14d583 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-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:08:01.645320299 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.645320299 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -22,6 +22,60 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Variable (string) tSend Attributes +@@ -150,7 +150,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -182,7 +182,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -365,7 +365,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -395,7 +395,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -425,7 +425,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -455,7 +455,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -735,7 +735,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -32,8 +86,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:08:01.649320349 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -563,8 +617,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:08:01.645320299 +0000 @@ -69,25 +69,25 @@ Attributes Scope : local @@ -693,8 +747,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:08:01.645320299 +0000 @@ -24,19 +24,19 @@ Attributes Scope : local @@ -718,6 +772,87 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt Variable (int32) vaSpeakerPos Attributes +@@ -134,7 +134,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -163,7 +163,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -192,7 +192,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -232,7 +232,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -262,7 +262,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -301,7 +301,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -352,7 +352,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -415,7 +415,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -447,7 +447,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -697,7 +697,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -728,8 +863,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:08:01.649320349 +0000 @@ -42,7 +42,7 @@ Attributes Scope : local @@ -739,6 +874,15 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Variable (string) va0 Attributes +@@ -237,7 +237,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -273,7 +273,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -753,6 +897,15 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -341,7 +341,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -848,8 +1001,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:08:01.645320299 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -869,8 +1022,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Picture p0 Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:08:01.645320299 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -890,8 +1043,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:08:01.645320299 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -958,8 +1111,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:08:01.645320299 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -988,8 +1141,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:08:01.645320299 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1056,8 +1209,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 17:03:51.797819925 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:03:52.181823027 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:08:01.265315504 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:08:01.645320299 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 1e133575..417d3515 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:03:52.209823253 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:03:52.181823027 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:08:01.749321611 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:08:01.645320299 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.645320299 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -13,6 +13,60 @@ + + Variable (string) tSend + Attributes ++@@ -150,7 +150,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -182,7 +182,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -365,7 +365,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -395,7 +395,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -425,7 +425,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -455,7 +455,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -735,7 +735,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -22,14 +76,16 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:08:01.649320349 +0000 +@@ -62,6 +62,16 @@ +@@ -97,25 +107,37 @@ + Attributes + Scope : local ++ Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 ++ + Variable (string) entn2 + Attributes + Scope : local @@ -40,10 +96,8 @@ + Variable (string) entn3 + Attributes + Scope : local -+ Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 -+ + Variable (string) entn4 + Attributes + Scope : local @@ -168,8 +222,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:08:01.645320299 +0000 +@@ -69,25 +69,25 @@ + Attributes + Scope : local @@ -298,8 +352,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:08:01.645320299 +0000 +@@ -24,19 +24,19 @@ + Attributes + Scope : local @@ -323,6 +377,87 @@ + + Variable (int32) vaSpeakerPos + Attributes ++@@ -134,7 +134,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -163,7 +163,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -192,7 +192,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -232,7 +232,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -262,7 +262,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -301,7 +301,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -352,7 +352,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -415,7 +415,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -447,7 +447,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -697,7 +697,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -333,8 +468,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:08:01.649320349 +0000 +@@ -42,7 +42,7 @@ + Attributes + Scope : local @@ -344,6 +479,15 @@ + + Variable (string) va0 + Attributes ++@@ -237,7 +237,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -273,7 +273,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -362,6 +506,15 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -341,7 +341,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -368,7 +368,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -453,8 +606,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt -+--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:08:01.645320299 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -473,11 +626,11 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:08:01.645320299 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:08:01.645320299 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -544,8 +697,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:08:01.645320299 +0000 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -574,8 +727,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:08:01.645320299 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -642,8 +795,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-22 17:03:51.797819925 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:03:52.181823027 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-22 17:08:01.265315504 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:08:01.645320299 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index c52d2cf2..4cf68b4d 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -297,7 +297,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -351,7 +351,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -822,7 +822,7 @@ Button arm1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -876,7 +876,7 @@ Button arm3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -930,7 +930,7 @@ Button arm2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -984,7 +984,7 @@ Button arm4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index fad0bd86..8bc46421 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -306,7 +306,7 @@ Text t2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -355,7 +355,7 @@ Text tPlayPause btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -404,7 +404,7 @@ Text t0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -484,7 +484,7 @@ Text t1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -534,7 +534,7 @@ Text t3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -613,7 +613,7 @@ Text tSpeaker btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -704,7 +704,7 @@ Text t5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -814,7 +814,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -868,7 +868,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 4d19480e..29fb82ef 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -533,7 +533,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -695,7 +695,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 6cd6d60d..4612d5e2 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,14 +14,14 @@ cardGrid 39 Component(s) 418 Line(s) of event code 244 Unique line(s) of event code -cardMedia - 30 Component(s) - 329 Line(s) of event code - 169 Unique line(s) of event code screensaver 35 Component(s) 292 Line(s) of event code 235 Unique line(s) of event code +cardMedia + 30 Component(s) + 329 Line(s) of event code + 170 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code @@ -45,7 +45,7 @@ cardAlarm cardThermo 41 Component(s) 442 Line(s) of event code - 248 Unique line(s) of event code + 247 Unique line(s) of event code cardEntities 62 Component(s) 964 Line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 641f6222..7f0ccd5c 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -150,7 +150,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -182,7 +182,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -365,7 +365,7 @@ Button arm1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -395,7 +395,7 @@ Button arm3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -425,7 +425,7 @@ Button arm2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -455,7 +455,7 @@ Button arm4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index d4bba5d4..280f853a 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -134,7 +134,7 @@ Text t2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -163,7 +163,7 @@ Text tPlayPause btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -192,7 +192,7 @@ Text t0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -232,7 +232,7 @@ Text t1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -262,7 +262,7 @@ Text t3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -301,7 +301,7 @@ Text tSpeaker btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -352,7 +352,7 @@ Text t5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -415,7 +415,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -447,7 +447,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 7dc823b6..ed4ebcee 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -237,7 +237,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -341,7 +341,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb From 37892b5708b4e15d4d5e55238341d987c6d4c80f Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 22 Apr 2022 19:12:52 +0200 Subject: [PATCH 09/16] fixed some more crcs --- HMI/nspanel.HMI | Bin 11173923 -> 11234297 bytes HMI/nspanel.tft | Bin 10156240 -> 10156240 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 46ff57a1253d70f28ad6a9de13e6fc18fa891392..8451318b9b1a61776fe8302978c3b47562312db3 100644 GIT binary patch delta 2960 zcmeIzUrbY190%~! zrW01?McKqnM_aOzY-@72C5!BBO0u{YeOW@Bo0$uVF6fNY#C_X)%W=Hy&Ao7w4}8x# z_jk^@H@T;0yC;y-|3-X*d1}i25o${X^ud3gx;vfVR zz=IN0qF1#f<=)~;{~um@uevw9H^QfJsQLZti)O^hme^~>!mWlVpIG>PY?VT=bjOAZ zXNIG)#mOIBDlRZ2{AkohiCq_6*?j+0qXr@&3ZfwfVj&K+5Dy8UgG5MzWOx#uf~O$` zo`Gi}6`q4MNQdQ+0V_ZcE5QIp$b?mp1=)}Tt05QiARkPy2G)WZo`-c%055VePT(cYhy;gZo~>j z@Dglk7K|dUU0eBbQ zgQIW^-iPBb2t)7zIAIt*gcBgZ2%LmdFbW^R$8Z|P;0$~MpTb!<2cN;Xs2g#0EmMxx zHjPdT+svN3j$e4`yy>$N{U+z8VwN|T5nYx0jTNjvx{Brd+u1!o*Apcvr8)2KW?5@v zIj?O#J7{Ys(Gux6q?!Xng9@qm=0TzXIkz7s%CDCCznmc&lKU;!h>pm4`a02CdEuqA zM8C?Lp1noXfFBkmdQ__ox-vu zjpb53%QdSwI);bQ`RiwMq=r9t2^;req(ZTp_(uh z*0t2x+FI?&_71xtBhxPYWU_uGItu5D^hZ4rp;CQ%`Fw9!r5nA0!(r^4XV0*7!}+|4 z9C@vo2kv0Jzn;mvv%%HD8j@bXlx6d)!(7vCrV@k6}-wk6-+}7C*1Y J{CVA(`v22qhxD+lGs8(dkm)2A(2!UoA6G&9i$jWIFVzU^hvvA4bKWjFcU`#bmd zJLjHz?#X@h(*5%RIGfI*y`M**A_{UH` zjyomi$iz^0jC(wn(@b;v_8X%2qDNmaBt57ie|5S%c^Vy$L(=sXvLt_dMOrdx1~o40zO&Xf3<)< zvoGG45K%p5fY5 z5doKT={}{wF&q{f?*(Uhw6X4ih$swNHz}IA$r=&s2A_mYp|Y$tTW={=V-3nsjtZ>B zI=qV4@H*C`5>?oMji^QqYEg%JG++}p;|(<8O}vFI*owEY4coB;?_ei(VK-cO7jEpq zUhKnr*pK(|0S@3Gns5k*(Toq_ffp?}f>!wO5ssn_ALAH~qa7!35~t9CPITcD_|c8i z=z)e_e2PANhR<;ZUm$=l@fE&CKhEMDg2L7tYJOhWRqHLI=$vQCOpfl%h;S8KDwSBM z{b09RMEe$XajYHC#_Ch1iSP4EM`CS#6Z6s4?@Y2?8&4h7deW^6gx6WxY|_W7ZB}!q z>S0m4`pa|Cu*G=mhE2Jy1%jc6qVe|mp@q?H5)ebSaETHNHLr-bh+oG-cD>zG&0{+= z!tu}Ql@9ygE8X`)33@8lbHovz=qPR$hcjZCh!|WO-pM~&FwNw021M7>4n5(Q2t(jkUI_-PmfUt)&=SYp9{9ecyLliXUU&{xcmFf<(fZG{l6f z=zTcA9hh)3bMPeJlP7tdMndMU;Xqqz(9ixR&I!p zp@tc5gpo$6FxnVnjWb@Q393vq$z)SZHO+K0gv~U|Y;(+2ZJzlSSZI;OmRM?;8nx;y zx57%R)LU(hwIbG8Z-b3CY0zl1s4cc?vQ5l(J2cyAm)%UT6z zlCB5^t!@9#)Vps%B>gKHL<_P!)fqHp`Nz69L2*{@_>h}xKjq})=iFTLB_}6-1mEkk z*52nQnzNpz8;Wv0uQbQwU1f=MS6Q+;@_!@TlB|h`W62C18B!TuX6Q_ZW3OJnEo`Z( GZ2SwdgYl^V delta 545 zcmY++$4-<17=_^g0|<&;#EQKaY}j=`1r-%h6i2|`d#|9Nk77g7e})mGF(xLuGenb# z-T^yqz$$3iT#wks(u-kZd_}^^+%Ge*+X4Xpq5%7;2c| zMkq8=kx@n)W2|w;D>lJIlT0?nRMSj1!%VZxHpg7^%vWN8g%(+CiBd}~v)l?Rt+Lu0 zYlW35x6XPSRH(GkCYx2+VykVcZC7K5ooel}Tb(^3_Nv#Q(LVbfaL^%#9dXn#$DMG} zDW{!r);Z^0aM2}~U2)Yl*WGZ_Ew?pkcE?>UTHSLW4?NW7k;k5R>X~-Wz0l#MSKord zqIi8zke4Vf3Ywbx&gyu_mmoXwI~LStrFgt6s7vurf6YR|80zg+e#v_B%Mj(NnR)E QN|Z$2ynP?)`B~Ba4}4kfmjD0& From 69c54f530ef99f9bd56ef8602443b6ddb9e3b2ec Mon Sep 17 00:00:00 2001 From: joBr99 Date: Fri, 22 Apr 2022 17:14:38 +0000 Subject: [PATCH 10/16] fixed some more crcs (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 169 +++++++++++++++++++---- HMI/US/portrait/diff-eu-version.txt | 194 +++++++++++++++++++++------ HMI/US/portrait/diff-filtered.txt | 177 ++++++++++++++++++++---- HMI/n2t-out-visual/cardEntities.txt | 24 ++-- HMI/n2t-out-visual/cardMedia.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 16 +-- HMI/n2t-out-visual/pageStartup.txt | 2 +- HMI/n2t-out/cardEntities.txt | 24 ++-- HMI/n2t-out/cardMedia.txt | 2 +- HMI/n2t-out/pageStartup.txt | 2 +- 10 files changed, 487 insertions(+), 125 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index f199ab0c..34b1ebe7 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-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:08:02.141326557 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:14:37.446210456 +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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:08:02.145326608 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:14:37.446210456 +0000 @@ -150,7 +150,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -75,8 +75,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:08:02.145326608 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:14:37.446210456 +0000 @@ -310,7 +310,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -118,6 +118,33 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -444,7 +444,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -469,7 +469,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -494,7 +494,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -127,6 +154,24 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -544,7 +544,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -569,7 +569,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -136,6 +181,24 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -619,7 +619,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -644,7 +644,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -145,6 +208,15 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -694,7 +694,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -163,6 +235,42 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -776,7 +776,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -801,7 +801,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -826,7 +826,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -851,7 +851,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -177,8 +285,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:08:02.141326557 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:14:37.446210456 +0000 @@ -254,7 +254,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -261,8 +369,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:08:02.145326608 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:14:37.446210456 +0000 @@ -24,7 +24,7 @@ Attributes Scope : local @@ -340,6 +448,15 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -390,7 +390,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -372,8 +489,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:08:02.145326608 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:14:37.446210456 +0000 @@ -237,7 +237,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -501,9 +618,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:08:02.145326608 +0000 -@@ -177,7 +177,7 @@ +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:14:37.446210456 +0000 +@@ -177,12 +177,12 @@ recmod=1 bauds=115200 // startup event @@ -512,9 +629,15 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:08:02.145326608 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:14:37.446210456 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -570,8 +693,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:08:02.145326608 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:14:37.446210456 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -600,8 +723,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:08:02.145326608 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:14:37.446210456 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -657,8 +780,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:08:02.145326608 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:14:37.446210456 +0000 @@ -664,7 +664,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 0d14d583..648ed345 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-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:08:01.645320299 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:14:37.038203389 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.645320299 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:14:37.038203389 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -86,8 +86,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:08:01.649320349 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:14:37.038203389 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -259,6 +259,33 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -444,7 +523,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -469,7 +548,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -494,7 +573,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -268,6 +295,24 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -544,7 +623,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -569,7 +648,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -277,6 +322,24 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -619,7 +698,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -644,7 +723,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -286,6 +349,15 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -694,7 +773,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -308,10 +380,46 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -859,6 +938,106 @@ - prints tSend.txt,0 - prints crcval,2 - +@@ -776,7 +855,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -801,7 +880,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -826,7 +905,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -851,7 +930,107 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ +Button bStop5 + Attributes + Scope : local @@ -405,16 +513,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ - Dual-state Button btOnOff1 - Attributes - Scope : local + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -967,6 +1146,33 @@ prints tSend.txt,0 prints crcval,2 @@ -617,8 +718,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:08:01.645320299 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:14:37.038203389 +0000 @@ -69,25 +69,25 @@ Attributes Scope : local @@ -747,8 +848,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:08:01.645320299 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:14:37.038203389 +0000 @@ -24,19 +24,19 @@ Attributes Scope : local @@ -831,6 +932,15 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -390,7 +390,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -863,8 +973,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:08:01.649320349 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:14:37.038203389 +0000 @@ -42,7 +42,7 @@ Attributes Scope : local @@ -1001,8 +1111,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:08:01.645320299 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:14:37.038203389 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -1022,8 +1132,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Picture p0 Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:08:01.645320299 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:14:37.038203389 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1033,7 +1143,7 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt Max. Text Size : 100 Text tVersion -@@ -177,7 +177,7 @@ +@@ -177,12 +177,12 @@ recmod=1 bauds=115200 // startup event @@ -1042,9 +1152,15 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:08:01.645320299 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:14:37.038203389 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1111,8 +1227,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:08:01.645320299 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:14:37.038203389 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1141,8 +1257,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:08:01.645320299 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:14:37.038203389 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1209,8 +1325,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:08:01.645320299 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:14:36.690197362 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:14:37.038203389 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 417d3515..1f3ad619 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:08:01.749321611 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:08:01.645320299 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:14:37.050203597 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:14:37.038203389 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.645320299 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:14:37.038203389 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -76,8 +76,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:08:01.649320349 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:14:37.038203389 +0000 +@@ -62,6 +62,16 @@ +@@ -97,25 +107,37 @@ + Attributes @@ -89,13 +89,13 @@ + Variable (string) entn2 + Attributes + Scope : local -+ Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn3 + Attributes + Scope : local ++ Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + Variable (string) entn4 @@ -160,6 +160,33 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -444,7 +523,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -469,7 +548,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -494,7 +573,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -519,7 +598,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -169,6 +196,24 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -544,7 +623,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -569,7 +648,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -594,7 +673,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -178,6 +223,24 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -619,7 +698,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -644,7 +723,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -669,7 +748,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -187,6 +250,15 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -694,7 +773,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -726,7 +805,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -205,7 +277,42 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -859,6 +938,106 @@ ++@@ -776,7 +855,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -801,7 +880,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -826,7 +905,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -851,7 +930,107 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -967,6 +1146,33 @@ +@@ -1072,6 +1278,28 @@ +@@ -1642,6 +1870,128 @@ @@ -222,8 +329,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:08:01.645320299 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:14:37.038203389 +0000 +@@ -69,25 +69,25 @@ + Attributes + Scope : local @@ -352,8 +459,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:08:01.645320299 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:14:37.038203389 +0000 +@@ -24,19 +24,19 @@ + Attributes + Scope : local @@ -440,6 +547,15 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -390,7 +390,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -415,7 +415,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -468,8 +584,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:08:01.649320349 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:14:37.038203389 +0000 +@@ -42,7 +42,7 @@ + Attributes + Scope : local @@ -606,8 +722,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt -+--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:08:01.645320299 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:14:37.038203389 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -626,11 +742,18 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:08:01.645320299 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:14:37.038203389 +0000 ++@@ -177,12 +177,12 @@ ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:08:01.645320299 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:14:37.038203389 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -697,8 +820,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:08:01.645320299 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:14:37.038203389 +0000 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -727,8 +850,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:08:01.645320299 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:14:37.038203389 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -795,8 +918,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:08:01.645320299 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-22 17:14:36.690197362 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:14:37.038203389 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 1caca43e..e4977f8f 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -919,7 +919,7 @@ Button bUp1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -966,7 +966,7 @@ Button bStop1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1013,7 +1013,7 @@ Button bStop2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1107,7 +1107,7 @@ Button bUp2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1154,7 +1154,7 @@ Button bStop3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1248,7 +1248,7 @@ Button bUp3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1295,7 +1295,7 @@ Button bStop4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1389,7 +1389,7 @@ Button bUp4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1537,7 +1537,7 @@ Button bText1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1584,7 +1584,7 @@ Button bText2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1631,7 +1631,7 @@ Button bText3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1678,7 +1678,7 @@ Button bText4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 8bc46421..10741cbb 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -767,7 +767,7 @@ Slider hVolume btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 4612d5e2..6b07fa90 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,18 +14,14 @@ cardGrid 39 Component(s) 418 Line(s) of event code 244 Unique line(s) of event code -screensaver - 35 Component(s) - 292 Line(s) of event code - 235 Unique line(s) of event code -cardMedia - 30 Component(s) - 329 Line(s) of event code - 170 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code +screensaver + 35 Component(s) + 292 Line(s) of event code + 235 Unique line(s) of event code popupNotify 17 Component(s) 196 Line(s) of event code @@ -42,6 +38,10 @@ cardAlarm 35 Component(s) 343 Line(s) of event code 214 Unique line(s) of event code +cardMedia + 30 Component(s) + 329 Line(s) of event code + 169 Unique line(s) of event code cardThermo 41 Component(s) 442 Line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index c1e9b71e..33ba1163 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -467,7 +467,7 @@ Button bSendStartup btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 0dea8316..4d3a6e12 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -444,7 +444,7 @@ Button bUp1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -469,7 +469,7 @@ Button bStop1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -494,7 +494,7 @@ Button bStop2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -544,7 +544,7 @@ Button bUp2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -569,7 +569,7 @@ Button bStop3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -619,7 +619,7 @@ Button bUp3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -644,7 +644,7 @@ Button bStop4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -694,7 +694,7 @@ Button bUp4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -776,7 +776,7 @@ Button bText1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -801,7 +801,7 @@ Button bText2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -826,7 +826,7 @@ Button bText3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -851,7 +851,7 @@ Button bText4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 280f853a..c5514cbc 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -390,7 +390,7 @@ Slider hVolume btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index b8a4c0bb..5edf638f 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -182,7 +182,7 @@ Button bSendStartup btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb From 46826399d7cbcb4188333ef09f387f649383cc0a Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 22 Apr 2022 19:17:58 +0200 Subject: [PATCH 11/16] fixed all crcs --- HMI/nspanel.HMI | Bin 11234297 -> 11234297 bytes HMI/nspanel.tft | Bin 10156240 -> 10156240 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 8451318b9b1a61776fe8302978c3b47562312db3..0e46fac6bbffd38481f4ed5a8fe1df47579534b0 100644 GIT binary patch delta 662 zcmchVNlz4U5J$Uly77ptiU@*;IOvGm2)MK(E+~q)fe5Ihpe!mQxFWdmWCRtL(P=~x zWEnab4-lZem?#$$Fd-8TdU=5k7ZRmm?ynsbtH($`UC#``B|z85n#YriCnB#%ybJZie-OY>k)gI{&~Rap=u zSRk+n6oG2`)!^{J|Gq~EiwGr*a3Y8#ip4A;nx(|Bj9B7WPCN;$Ad!_Mv5I6?V142#ZER-;8ar{Yi%fR2hrR40i~SrRn}Zx8hr{G@grgke zI48&>pOX}Dib9Gg<}_zGi<5Jlr-V{2aFH^~si2ZeT;>W@xVTC+HC*F5H@L|yZd1!0 z>Zs=~_qfjk9?}3jq7gTbX`-1YJmncJJm&>3d4-49yupi3D{pDz9q(!9108hokuJLF zp%>p!Uz<;9oU}W~^bTL&wCVh9443O6wb4T(p+==;KACY*b1~JGHEe1zM$%6uM^Bjg g_k{|J{;e#mN!Pp)DQ0oJvG9jme3EIiej0bo0-;|9$N&HU delta 569 zcmcJ{IZRUl0LJn6w0(?n35ducicpR!AP6c@4?sC8w}66G?#d~sC@9Kb$|aV|DwRW& z7D|wi5Z}rSyRIxIny_>-o$!T;u=^#y<@=J)^>an-Qiv&QVzU&wr4t2lLoX!6v>1ea zss6nvY$}_up&wtBl2m`pCEt3TlF2EFibIOS3Y9{wkYuOicEmO27V@8NamNEsyzu5I zKKSCtG5k4B04E3}h+slENhqf{O&DhgCjt$TL=jC4TF!EgSmKE1JP9Onfh3Z-$R#e5 zLMmzKxWZMgah-HB$m9k$$s(H^a?x{(Jn|`^kRpmH;Wnj|QO+IiQb8s6FmRs-R8dV0 zwbW5h14bUwNE6Mp&`KMRXs3h6JmD#wJmWcCbn}9j^ze$;^a5|_!$dy=3^K$pZyDho zW=0ufoCzj*kA)9>WC|;vm}Z7q=J?D!U--%bwsrfIO>H$8ty`8^oBgk>iFE7~S=@iw t*X7;RB_A(&d%_`__locHi&g0=eSqyZEe diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 8278233f44102848be15cfdc5e952819c19cbccb..80efbc687e84875a37ea59818bcce98375ca5063 100644 GIT binary patch delta 417 zcmZw5$y3b%007`oFCuA0im1>cg&q;|Y}q2A5J{Glok;eUj}Veq9{z|$h6oJOJ!LmTaM*c z$hFccdGZxlZH=`G6)9F?ol@(SDYwB!n^XwfY>P@;ZBu2t9d@d=OT=z_?6uE+H4ZrF zki(9sb<{C+j;nXVNvAYublMqbH96LYua_V?uMIgx$Ta-?zyki z0}pk1q}yXpJoU_TFTB*FSD${o^4fqm-g;-ydmnr>%%PG!z?Z w8A%-PoQSr?&(84Ve{$y6KRGZq6%C98Mgw00vB1~BxAC#5@44ln%GS8>Urr^nVE_OC delta 425 zcmZw5NmGsi007{rKFJboh)78)T0}^;vM(t`meN8B*^895pj45+q8JEX4{dt&(cBHPWoL zPP+9nWZEFhM%gyWkt@$;TjVQHsK{2uw%M-44m<5qYPT|b?6uE+2b8OD&>@E%anv!# zop91Al}@Wt?Ti|=&N`>gc^6!CNxcS_HEPnV#T8ezx~5IL>u$KI!!5Vnao0WfJz((;d@%0g*Kq1=RB@!@TevDxUN;$v zj5SZh&2-I%+hhLilJEcR-#`B9;pw?>U?MOX_!Ni)rUIX5rsuw-7lm4KvTOeU=~=W{ From 31e8b969e47a6a90139f553a2898893f58ef7b4f Mon Sep 17 00:00:00 2001 From: joBr99 Date: Fri, 22 Apr 2022 17:18:24 +0000 Subject: [PATCH 12/16] fixed all crcs (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 80 ++++++++++++++------ HMI/US/portrait/diff-eu-version.txt | 105 +++++++++++++++++---------- HMI/US/portrait/diff-filtered.txt | 89 ++++++++++++++++------- HMI/n2t-out-visual/cardEntities.txt | 8 +- HMI/n2t-out-visual/nspanel_Stats.txt | 4 +- HMI/n2t-out/cardEntities.txt | 8 +- 6 files changed, 197 insertions(+), 97 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 34b1ebe7..ed445a86 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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:18:23.266179428 +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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:18:23.266179428 +0000 @@ -150,7 +150,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -75,8 +75,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:18:23.266179428 +0000 @@ -310,7 +310,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -271,6 +271,42 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -878,7 +878,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -905,7 +905,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -932,7 +932,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -959,7 +959,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 + crcputs sys0,1 crcputs tSend.txt,0 //send cmd @@ -285,8 +321,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:18:23.266179428 +0000 @@ -254,7 +254,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -369,8 +405,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:18:23.266179428 +0000 @@ -24,7 +24,7 @@ Attributes Scope : local @@ -489,8 +525,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:18:23.266179428 +0000 @@ -237,7 +237,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -618,8 +654,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:18:23.266179428 +0000 @@ -177,12 +177,12 @@ recmod=1 bauds=115200 @@ -636,8 +672,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:18:23.266179428 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -693,8 +729,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:18:23.266179428 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -723,8 +759,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:18:23.266179428 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -780,8 +816,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:18:23.266179428 +0000 @@ -664,7 +664,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 648ed345..0623f083 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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:18:22.862183870 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.866183826 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -86,8 +86,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:18:22.866183826 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -516,10 +516,46 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -967,6 +1146,33 @@ - prints tSend.txt,0 - prints crcval,2 - +@@ -878,7 +1057,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -905,7 +1084,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -932,7 +1111,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -959,7 +1138,34 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb +- crcputs sys0,2 ++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ +Dual-state Button btOnOff5 + Attributes + Scope : local @@ -540,16 +576,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ - Hotspot mSpecial - Attributes - Scope : local + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -1072,6 +1278,28 @@ page popupLight } @@ -718,8 +747,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:18:22.866183826 +0000 @@ -69,25 +69,25 @@ Attributes Scope : local @@ -848,8 +877,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:18:22.866183826 +0000 @@ -24,19 +24,19 @@ Attributes Scope : local @@ -973,8 +1002,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:18:22.866183826 +0000 @@ -42,7 +42,7 @@ Attributes Scope : local @@ -1111,8 +1140,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:18:22.862183870 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -1132,8 +1161,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Picture p0 Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:18:22.866183826 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1159,8 +1188,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:18:22.866183826 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1227,8 +1256,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:18:22.862183870 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1257,8 +1286,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:18:22.862183870 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1325,8 +1354,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:18:22.866183826 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 1f3ad619..aaf9956e 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:14:37.050203597 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:14:37.038203389 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:18:22.878183694 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:18:22.862183870 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -76,8 +76,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:18:22.490187960 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -62,6 +62,16 @@ +@@ -97,25 +107,37 @@ + Attributes @@ -91,13 +91,13 @@ + Scope : local +- Max. Text Size: 80 ++ Max. Text Size: 70 -+ + Variable (string) entn3 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 ++ + Variable (string) entn4 + Attributes + Scope : local @@ -313,7 +313,42 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -967,6 +1146,33 @@ ++@@ -878,7 +1057,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -905,7 +1084,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -932,7 +1111,7 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++@@ -959,7 +1138,34 @@ ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++- crcputs sys0,2 +++ crcputs sys0,1 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb +@@ -1072,6 +1278,28 @@ +@@ -1642,6 +1870,128 @@ + } @@ -329,8 +364,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -69,25 +69,25 @@ + Attributes + Scope : local @@ -459,8 +494,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:18:22.490187960 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -24,19 +24,19 @@ + Attributes + Scope : local @@ -584,8 +619,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:18:22.490187960 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -42,7 +42,7 @@ + Attributes + Scope : local @@ -722,8 +757,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt -+--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:18:22.862183870 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -742,8 +777,8 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -177,12 +177,12 @@ + crcputh 55 bb +- crcputs sys0,2 @@ -752,8 +787,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -820,8 +855,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:18:22.862183870 +0000 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -850,8 +885,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:18:22.862183870 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -918,8 +953,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index e4977f8f..29475549 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -1723,7 +1723,7 @@ Dual-state Button btOnOff1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1768,7 +1768,7 @@ Dual-state Button btOnOff2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1813,7 +1813,7 @@ Dual-state Button btOnOff3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1858,7 +1858,7 @@ Dual-state Button btOnOff4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 6b07fa90..aa5ddb7c 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -49,10 +49,10 @@ cardThermo cardEntities 62 Component(s) 964 Line(s) of event code - 411 Unique line(s) of event code + 410 Unique line(s) of event code Total 12 Page(s) 343 Component(s) 3687 Line(s) of event code - 1019 Unique line(s) of event code + 1018 Unique line(s) of event code diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 4d3a6e12..ebed5804 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -878,7 +878,7 @@ Dual-state Button btOnOff1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -905,7 +905,7 @@ Dual-state Button btOnOff2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -932,7 +932,7 @@ Dual-state Button btOnOff3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -959,7 +959,7 @@ Dual-state Button btOnOff4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb From 6c8d684419913947d0f7eb608fafb8e1a2defa3c Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 22 Apr 2022 19:26:00 +0200 Subject: [PATCH 13/16] synced us-l version --- HMI/US/landscape/nspanel_US_L.HMI | Bin 11139702 -> 11273910 bytes HMI/US/landscape/nspanel_US_L.tft | Bin 10155856 -> 10156304 bytes 2 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 48a2e2f8d95b6f5d38a053192eca0d96562e0928..9268666a4aae0091742c377a5715434b64f94449 100644 GIT binary patch delta 8915 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 N_t3ofqvw`%_%GALR$>4E delta 13788 zcmeI2i+>bFw#TbG50W7~0wF+1LWBU31V}Ti& zRsE`FG6|KJzKDJAt1n_J2k2wJuNt(b)BC{>PFz|w_s0?U=U(@5;Fg%m)T=(+(0$nx zJx9zJKkq-*wfm^5b5FDSOF$Ss)8#Z&@V!$ZKS=>?`}pYh`~qKn|3H zn(Q=F&E62(4vP4dh6XmUPlAJ83$f@!+ zIZfU!r^`F!3^`NIlC$L;Iakh;^JS@AAn%lS$uhZ6-Ypl&a=BP8k@v`@a+$nW-Y1vK z`{e`jH*$r1P(CCpf=TWbBkw$%#E z`nLYBJLCCvfB%mYwF33&^ZpWZ;1>V*7~A+~z(2t;HU|BZ9OIfNT*jxn{1Y9|hTSet zpS>>Q?0#3+`kJuEMA3cD*fTGhz!dN#^`l{PVmd=V${l5wpa0n>*g} z|JuV|$Hnjclbs^lfAV*U7$a2HZAOCGs@~t%aqrNLX^t^E-evrn=rW#dX55&B{EIso z6IEu0(bAlnX56huhzatLZP1-${@T%40%Bso2fY|J%NU_n2K`OV?c1c!D(m1mLfw7TNL1%`80}QvS|e!FaJtlW#u%ovGHgJGS2q}c zYi-BaBM(M^d1j~4D$z2An%6vItkJYWb$Fk#5RcsbMo8%HCG^WH$nTd|)JN4E zG_usxYGb`tr0S}TyYVPFV9eKw%$E)ru^LhxdDgf`D^^7{#$9;qs=*9BC{z`_r8LNYgElEh`2^|eAOsb zS%;0;>TFYgqIw|3@3WFNKVsZ(C;j+{(M2mXwbzX7NSg4zr|5kPlssyb`T7>*6`mi+s&eqOQDUAyVcg!*Hi91;sqmQa z{H+CGL0q83{Le3qNqh}}aWzE`!)Fr$FHtENBh+o{0$t1xS_OX3tYP;jZ2~7FM&v>^ zX&*S?B`wk$leQfjla8GllWtualU_NENpWstGPtLU;Jznp?dOkGzmx{j&DjNk3C%F? zn)!jzDu1s(&TKk35ad)F$Pd>CS|wX#yn1z#Kf#<^5;#mH5HntNO!7A|S4?z~%qMV- zw@nJHio}G~YG#&C3G|I*wsuX`zhk7B-KPb9Xq0Sv;H*u|ni+u(-1u;w>@vb#a-|Qf2fGv@<_n5J=Z)XYrpjy}n*m z_Am-{O*0oR4D8iak3|8W`B{13bG#gw@827!$1KhF?+;wh`wx4B361Aw0KWEAU^Pz? zo_CnL_XUn{Jz?YZ11_WPVBoKD`j!Lg-=%?a)!htStsBeLL^F`3Km3Tg4|eR_8eOR8 ziUY&feqjdCx0+v=YE+pvUKM9=yF*JcRra>~Vzdm^A_wM3b5Rb>9qO}OnD3gy^R{h{ z(UR2%yftkX`);g z;#*C%yh#m7j}>C65TYKP&6iLwG);&y@C0>7YA{zXi&eW@2Op~-Du%1Ptq_&x>+2cX z6q(4`+&n45=YYT0M2P$!toUXTp3;ankMI!k*H^%~(uz-r@YVwRpAuZ0#$t#O;NjLV zUp1gjuxEIZjEQsk3nJ?&2d|GTl;a8`$?uNBmw>zL*m>@W!k5O1ityxEn+5Cv%P_!h z|vO|k0cw!xk{o-5iy zQN~?|!H#l>qoU+H8*wU1o(b+Kig+q|IZj2%Z%4eNDB`Io`O8preLE;h!=q@!WK-Hh zQTo{(Md9bhl2xKRih@&7^2eg^E#L?VH=iqyKMFTIin;~_Fu-n1L`7NHqbN8PC4Us% zQPh=(IUGg7dG#3Iz}4io!A^LM+?!Di?orie#gqF~i%eYA>R2_Q1B4}d2ss>K5lUgn z(;9IKOI`==2#a_MOYRXIoWhdN#8e$&!6__xF@&9&4q<6<&EVnYLlD=8NnS{Yu=KM# z!op8s$qu4B!h%y+@@J#)=fT}|>^#4Z!fQRkx(fdR1MJ2L55C$eoCD}wRd5Q+2^~P^ zBH0*k7pCn93vMl()aI&PCa&sPjQ5Dz)QUYDtA5VJRmC%}BNS!aY>agjMI03+AKi#k zQSwqu%uy8aRFu3u;@zBzlAl1lqbTC3DET}n+Aj-=(%@pj!_C()+1In6DE;h?qVRJ= z$m-A?MZu{k`9GrYbKveecAn3o@bex;U4=i#0K0L*gL_+r3jrNP!Ko-G^eH+Q$;NoQ zFl|Rsa4O392Cfo1My_f)cEF=*k`+&$q+acUtC}9CVmm`vqB+Rn2#Zh(OJ3H9Q&@73 zu!yIyj*!qVWH!NbjmAg&LS+@1|#>1W56Uc7RTQuXbin|-al#aqg+0Q8Q&{p0bS{#O@pc~Cj)6JH zb&XurGH{Qo&8>Ly=4w$7{s0`OYP&;NqK}Zn5fGsimfRyOIE5wm2n$YOFUKh?c~eZ) z5ftu;MT%PZLXI0z*Sv|@g7lI zSg|YP)U=+ss(5bd2}K#V2xA>Z5l2PIJ&J-;QF4!>;8gT-oQjg~;@m3m&q{oxK|B>D zKMF;Iy`U%!kD>_T!Z69~d?-pkJHEn=Nw^_o65UZ0oQjgKio(}`Bjo?&SsR6~^C;>n zydDGW#tBhT7WOC#PDRNdMt2l-f1gLjmY!S1fdj-d=wVq zhzU;7$cKYF;(${$@8|b^ylUSvLUn8OQF_Z)4Rb>l&|S3`DLR zeD68CsaCEWtYsi_;dx;o4ld(TFi+=zB8~@_{H;cu2bbLQ9)frt+{&aByjO4sOF_sSj1CUatizY z4G@+F*9;zRJ_K=nnB=q}5SD&+M_BkNEZKGFjj-6*n6h71=tgG-a z46qv~Okr8rBP=+DB_D{+MY1v8E==1I7Tj7msm;~8q4;rcEXI38ZD+-fjaOyEf<4to zU4zML|FB?11tYUD+R+q|)Ra6PQ*d)?O777V@znHkoSKqPDj^CZDXKoBG zR#S6=$%ze9EE*0S8Nlx72tT)hYy!HYBRF*=A0LI^3XYI)^SSa&ioz#*baV}vf&q48 zBI?M(9v#7{Bl$RVM@Ls4=5TZbr;dzo;A;6W>w>B~y9bk#+FLPm5Yt}ux*3;pPP|$= z5|@%_A;vjEA(R4=djtfhfaLs4<@}fcP65e1!h%yk^7|0)2nbFA$tmE&H{nv!;5xy> z&4(ba36o43h4c16UNE@=i~=&Y6x|UJoC1>1i^A^&cjvbA+!ckFfpb1=oD1V;vA{xf zyV1d4k&tuc&If963P?T|y>TLPHb+3jM;4oRbMWtJyWsa+zBJ3fD_*7Fg3So+Q7zTf zTY@Vq7`X}Q9qkZF?Z`dafm1tjk4E6s?sA;kksn5WM?1t*J926_Wi&2d+B2%9&j%0J zfH~HU#_eMSyL0>C=O&WvMt8&mr+DPQjl!P>M@YD_j-6*u6u#GU`&dUj6)L zV0s@Sma|K`Ll41cH}b)FzhwMzwfT5pNQT5;1TR;GJl(1yn}n-m60tR|LXMdHjazR> zTZivGCosdB^tvW0y#y!l#8IBW5}ZIrdfw6z$rDKK`MeL#6G-kkf#5uWm*YHvMA;m-!I08tUj=@cO&uH z?|7~ze7j@B#Y7?2if-bK#hRG4AXaQoz~7HV2l4gqG|}p0tjNJH@83d&wZ}B^j}CES zIqIDf$s+p`t+!}3F-}xtz?b4`F}pw)msZDxKQW|gnL;boMfV@$#C9yVNb4+K#{UjT zn`q`84R$@0I3B;XKZZY=rKsB;2%Tw>fp@DOFh`0F;_!Y=CBGK>gZlM1q3pyRS^~~i zp?Fv2t_Yn;OvZLh(^5s5YW*P0Jz5*B6UH4ke|j)f5!*ajbkgR)UMdD_HKsb^551rU ztwx$<5yyw>uGOJ4%|qIZaMriAD)HKjsxpAM=8qt5Uc{kP|3{F&Fk;SDo!7t|kK;K; z%N4s+)3q?iiQV|4M5d@UzgZjFIFSDZVCA1e=lF-?(l_wLpYX=Mi6{O#)%Q4__&Y(? zTX^DE;0Y)2#4jT+@`+zzefTz>_|43bcksmL=)Hdqol_?dh1#j7Pln#(C&G(=3Z|;Z z-i3jWaWmdS7(S+j;q>93(vI$p%z`x_j1 zVG55r`FD)MYs0P&0CB(8eHc0!)2v)qRi7Ab)GKwtc46zuzXbmfKMwyDVs5$m`PERS zntC*t6a%2f9fN1`VjU+(<$WCL9)s`I%=plAt!BlD;+K}_V&6Tws9dUxJC>>RQ=v}! zOH0&sr$R5Jtyrdu1^4P=^nLIx*KupDCN(vqQz%tmu}tNh4!xnTU#>2m4rS^qmaCSZ zgw7>CzKXHO#XFp1`>OIZRd^<}B7P@uv(>8hOsKoQbCo)KCiFtQE_G2Z)%LSsx>U!{ zVv%znQ3pQ_z2Up}5vycEOn4`nEC}0$s^F9=^gY>LPtB!72l~ShiIc)mv5V=kTpG)Q6wL zcLMCR(#5fDy7+OM+Ws&2PHa_2{smvVAo7KDk^HzWMm(`Q%(31zS<|$@-HF6PhbmnsiLnS!cRNZjIR)X z`;!pnx4O9Xce=Q3x61w+@wY#zMtlu{?%%EQFJjz-yLIue-Ri~AMMe_nZ4@NzcKFgQ(G^=^~+vewBCm$q1W$MuU~@em%ZvdeHqod=zRb$JkRQ) zV~wi*2EL4H_1-t3bH0IiL8`Cs7dtSvYG$Fj^lhkGzrIH8`VOvPVb{3WiDB2#|AuR1 njVk{hr)O%|RbT%zE-$WR!YyHY0Rji9?LUOdW7}u Date: Fri, 22 Apr 2022 17:26:34 +0000 Subject: [PATCH 14/16] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 817 +----------------- HMI/US/landscape/n2t-out-visual/cardAlarm.txt | 14 +- .../landscape/n2t-out-visual/cardEntities.txt | 54 +- HMI/US/landscape/n2t-out-visual/cardGrid.txt | 18 +- HMI/US/landscape/n2t-out-visual/cardMedia.txt | 26 +- .../landscape/n2t-out-visual/cardThermo.txt | 28 +- .../n2t-out-visual/nspanel_US_L_Stats.txt | 32 +- .../landscape/n2t-out-visual/pageStartup.txt | 2 +- .../landscape/n2t-out-visual/popupLight.txt | 12 +- .../landscape/n2t-out-visual/popupNotify.txt | 6 +- .../landscape/n2t-out-visual/popupShutter.txt | 36 +- .../landscape/n2t-out-visual/screensaver.txt | 2 +- HMI/US/landscape/n2t-out/cardAlarm.txt | 14 +- HMI/US/landscape/n2t-out/cardEntities.txt | 54 +- HMI/US/landscape/n2t-out/cardGrid.txt | 18 +- HMI/US/landscape/n2t-out/cardMedia.txt | 26 +- HMI/US/landscape/n2t-out/cardThermo.txt | 28 +- HMI/US/landscape/n2t-out/pageStartup.txt | 2 +- HMI/US/landscape/n2t-out/popupLight.txt | 12 +- HMI/US/landscape/n2t-out/popupNotify.txt | 6 +- HMI/US/landscape/n2t-out/popupShutter.txt | 12 +- HMI/US/landscape/n2t-out/screensaver.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 48 +- HMI/US/portrait/diff-filtered.txt | 50 +- 24 files changed, 256 insertions(+), 1063 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index ed445a86..92b2b277 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-04-22 17:18:22.486188004 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:18:23.266179428 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:26:34.016666187 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,655 +8,10 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:18:23.266179428 +0000 -@@ -150,7 +150,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -182,7 +182,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -365,7 +365,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -395,7 +395,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -425,7 +425,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -455,7 +455,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -735,7 +735,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 17:18:22.490187960 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:18:23.266179428 +0000 -@@ -310,7 +310,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -338,7 +338,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -366,7 +366,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -394,7 +394,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -419,7 +419,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -444,7 +444,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -469,7 +469,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -494,7 +494,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -519,7 +519,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -544,7 +544,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -569,7 +569,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -594,7 +594,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -619,7 +619,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -644,7 +644,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -669,7 +669,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -694,7 +694,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -726,7 +726,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -751,7 +751,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -776,7 +776,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -801,7 +801,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -826,7 +826,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -851,7 +851,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -878,7 +878,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -905,7 +905,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -932,7 +932,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -959,7 +959,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -1752,7 +1752,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:18:23.266179428 +0000 -@@ -254,7 +254,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -279,7 +279,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -315,7 +315,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -351,7 +351,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -387,7 +387,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -423,7 +423,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -459,7 +459,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -495,7 +495,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -838,7 +838,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 17:18:22.490187960 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:18:23.266179428 +0000 -@@ -24,7 +24,7 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 750 -+ Max. Text Size: 500 - - Variable (string) entn - Attributes -@@ -36,7 +36,7 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 400 -+ Max. Text Size: 200 - - Variable (int32) vaSpeakerPos - Attributes -@@ -134,7 +134,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -163,7 +163,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -192,7 +192,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -232,7 +232,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -262,7 +262,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -301,7 +301,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -352,7 +352,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -390,7 +390,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -415,7 +415,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -447,7 +447,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -697,7 +697,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 17:18:22.490187960 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:18:23.266179428 +0000 -@@ -237,7 +237,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -273,7 +273,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -309,7 +309,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -341,7 +341,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -368,7 +368,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -395,7 +395,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -422,7 +422,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -449,7 +449,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -476,7 +476,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -503,7 +503,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -530,7 +530,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -557,7 +557,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -584,7 +584,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -948,7 +948,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:18:23.266179428 +0000 -@@ -177,12 +177,12 @@ +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:26:34.016666187 +0000 +@@ -177,7 +177,7 @@ recmod=1 bauds=115200 // startup event @@ -665,165 +20,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:18:23.266179428 +0000 -@@ -29,7 +29,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -213,7 +213,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -243,7 +243,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -273,7 +273,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -298,7 +298,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -361,7 +361,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:18:23.266179428 +0000 -@@ -120,7 +120,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -147,7 +147,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -174,7 +174,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:18:23.266179428 +0000 -@@ -29,7 +29,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -147,7 +147,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -172,7 +172,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -197,7 +197,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -222,7 +222,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -247,7 +247,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:18:23.266179428 +0000 -@@ -664,7 +664,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 7808eba7..61a4f9bc 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -297,7 +297,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -351,7 +351,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -822,7 +822,7 @@ Button arm1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -876,7 +876,7 @@ Button arm3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -930,7 +930,7 @@ Button arm2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -984,7 +984,7 @@ Button arm4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1266,7 +1266,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index ce82ae64..a9820204 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -696,7 +696,7 @@ Slider hSlider1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -739,7 +739,7 @@ Slider hSlider2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -782,7 +782,7 @@ Slider hSlider3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -825,7 +825,7 @@ Slider hSlider4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -872,7 +872,7 @@ Button bDown1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -919,7 +919,7 @@ Button bUp1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -966,7 +966,7 @@ Button bStop1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1013,7 +1013,7 @@ Button bStop2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1060,7 +1060,7 @@ Button bDown2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1107,7 +1107,7 @@ Button bUp2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1154,7 +1154,7 @@ Button bStop3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1201,7 +1201,7 @@ Button bDown3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1248,7 +1248,7 @@ Button bUp3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1295,7 +1295,7 @@ Button bStop4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1342,7 +1342,7 @@ Button bDown4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1389,7 +1389,7 @@ Button bUp4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1443,7 +1443,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1490,7 +1490,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1537,7 +1537,7 @@ Button bText1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1584,7 +1584,7 @@ Button bText2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1631,7 +1631,7 @@ Button bText3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1678,7 +1678,7 @@ Button bText4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1723,7 +1723,7 @@ Dual-state Button btOnOff1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1768,7 +1768,7 @@ Dual-state Button btOnOff2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1813,7 +1813,7 @@ Dual-state Button btOnOff3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1858,7 +1858,7 @@ Dual-state Button btOnOff4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -2698,7 +2698,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 63b635bf..07e64468 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -527,7 +527,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -574,7 +574,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -632,7 +632,7 @@ Button bEntity1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -690,7 +690,7 @@ Button bEntity2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -748,7 +748,7 @@ Button bEntity3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -806,7 +806,7 @@ Button bEntity4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -864,7 +864,7 @@ Button bEntity5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -922,7 +922,7 @@ Button bEntity6 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1276,7 +1276,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 0a4107d9..ea47097d 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -33,7 +33,7 @@ Variable (string) strCommand ID : 7 Scope : local Text : - Max. Text Size: 500 + Max. Text Size: 750 Variable (string) entn Attributes @@ -47,7 +47,7 @@ Variable (string) vaSpeakerList ID : 27 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (int32) vaSpeakerPos Attributes @@ -306,7 +306,7 @@ Text t2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -355,7 +355,7 @@ Text tPlayPause btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -404,7 +404,7 @@ Text t0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -484,7 +484,7 @@ Text t1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -534,7 +534,7 @@ Text t3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -613,7 +613,7 @@ Text tSpeaker btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -704,7 +704,7 @@ Text t5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -767,7 +767,7 @@ Slider hVolume btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -814,7 +814,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -868,7 +868,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1120,7 +1120,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 02ee278c..9fa4fd5d 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -533,7 +533,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -587,7 +587,7 @@ Button bDown btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -641,7 +641,7 @@ Button bUp btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -695,7 +695,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -744,7 +744,7 @@ Dual-state Button bt0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -793,7 +793,7 @@ Dual-state Button bt1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -842,7 +842,7 @@ Dual-state Button bt2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -891,7 +891,7 @@ Dual-state Button bt3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -940,7 +940,7 @@ Dual-state Button bt4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -989,7 +989,7 @@ Dual-state Button bt5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1038,7 +1038,7 @@ Dual-state Button bt6 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1087,7 +1087,7 @@ Dual-state Button bt7 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1136,7 +1136,7 @@ Dual-state Button bt8 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1502,7 +1502,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb 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 27ad01ed..43f6668c 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 @@ -10,10 +10,6 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -cardGrid - 39 Component(s) - 418 Line(s) of event code - 244 Unique line(s) of event code popupLight 27 Component(s) 338 Line(s) of event code @@ -22,26 +18,30 @@ popupShutter 19 Component(s) 191 Line(s) of event code 107 Unique line(s) of event code -popupNotify - 17 Component(s) - 196 Line(s) of event code - 123 Unique line(s) of event code -cardMedia - 30 Component(s) - 329 Line(s) of event code - 169 Unique line(s) of event code -cardThermo - 41 Component(s) - 442 Line(s) of event code - 247 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code +popupNotify + 17 Component(s) + 196 Line(s) of event code + 123 Unique line(s) of event code +cardThermo + 41 Component(s) + 442 Line(s) of event code + 247 Unique line(s) of event code +cardMedia + 30 Component(s) + 329 Line(s) of event code + 169 Unique line(s) of event code cardAlarm 35 Component(s) 343 Line(s) of event code 214 Unique line(s) of event code +cardGrid + 39 Component(s) + 418 Line(s) of event code + 244 Unique line(s) of event code screensaver 35 Component(s) 292 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index e4cb4d18..4b2fad6c 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -467,7 +467,7 @@ Button bSendStartup btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 0bbe9501..d1333ece 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -37,7 +37,7 @@ Page popupLight btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -465,7 +465,7 @@ Picture pColorWheel btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -510,7 +510,7 @@ Slider hBrightness btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -555,7 +555,7 @@ Slider hTempSlider btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -602,7 +602,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -705,7 +705,7 @@ Dual-state Button btOnOff1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out-visual/popupNotify.txt b/HMI/US/landscape/n2t-out-visual/popupNotify.txt index 77b55b27..a152ad19 100644 --- a/HMI/US/landscape/n2t-out-visual/popupNotify.txt +++ b/HMI/US/landscape/n2t-out-visual/popupNotify.txt @@ -283,7 +283,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -332,7 +332,7 @@ Button b2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -381,7 +381,7 @@ Button b1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 7e4d3bd4..152292a0 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -37,7 +37,7 @@ Page popupShutter btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -67,7 +67,7 @@ Text tEntity Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 82 + x coordinate : 80 y coordinate : 108 Width : 195 Height : 30 @@ -97,7 +97,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 29 + x coordinate : 27 y coordinate : 109 Width : 45 Height : 30 @@ -127,7 +127,7 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 17 + x coordinate : 15 y coordinate : 0 Width : 348 Height : 22 @@ -157,7 +157,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 423 + x coordinate : 421 y coordinate : 277 Width : 34 Height : 30 @@ -187,7 +187,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 17 + x coordinate : 15 y coordinate : 290 Width : 100 Height : 30 @@ -217,7 +217,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 117 + x coordinate : 115 y coordinate : 290 Width : 100 Height : 30 @@ -247,7 +247,7 @@ Text t1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 81 + x coordinate : 79 y coordinate : 164 Width : 100 Height : 30 @@ -294,7 +294,7 @@ Slider hPosition Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 82 + x coordinate : 80 y coordinate : 194 Width : 335 Height : 43 @@ -322,7 +322,7 @@ Slider hPosition btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -338,7 +338,7 @@ Button b0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 414 + x coordinate : 412 y coordinate : 8 Width : 50 Height : 50 @@ -369,7 +369,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -385,7 +385,7 @@ Button bDown1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 410 + x coordinate : 408 y coordinate : 96 Width : 50 Height : 50 @@ -416,7 +416,7 @@ Button bDown1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -432,7 +432,7 @@ Button bStop1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 358 + x coordinate : 356 y coordinate : 96 Width : 50 Height : 50 @@ -463,7 +463,7 @@ Button bStop1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -479,7 +479,7 @@ Button bUp1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 306 + x coordinate : 304 y coordinate : 96 Width : 50 Height : 50 @@ -510,7 +510,7 @@ Button bUp1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 8155d2d7..92e8968c 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1190,7 +1190,7 @@ TouchCap tc0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index d49e3e28..7f0ccd5c 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -150,7 +150,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -182,7 +182,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -365,7 +365,7 @@ Button arm1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -395,7 +395,7 @@ Button arm3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -425,7 +425,7 @@ Button arm2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -455,7 +455,7 @@ Button arm4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -735,7 +735,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 7eca8770..ebed5804 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -310,7 +310,7 @@ Slider hSlider1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -338,7 +338,7 @@ Slider hSlider2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -366,7 +366,7 @@ Slider hSlider3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -394,7 +394,7 @@ Slider hSlider4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -419,7 +419,7 @@ Button bDown1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -444,7 +444,7 @@ Button bUp1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -469,7 +469,7 @@ Button bStop1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -494,7 +494,7 @@ Button bStop2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -519,7 +519,7 @@ Button bDown2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -544,7 +544,7 @@ Button bUp2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -569,7 +569,7 @@ Button bStop3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -594,7 +594,7 @@ Button bDown3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -619,7 +619,7 @@ Button bUp3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -644,7 +644,7 @@ Button bStop4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -669,7 +669,7 @@ Button bDown4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -694,7 +694,7 @@ Button bUp4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -726,7 +726,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -751,7 +751,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -776,7 +776,7 @@ Button bText1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -801,7 +801,7 @@ Button bText2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -826,7 +826,7 @@ Button bText3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -851,7 +851,7 @@ Button bText4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -878,7 +878,7 @@ Dual-state Button btOnOff1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -905,7 +905,7 @@ Dual-state Button btOnOff2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -932,7 +932,7 @@ Dual-state Button btOnOff3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -959,7 +959,7 @@ Dual-state Button btOnOff4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -1752,7 +1752,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index d080bab7..b73dd476 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -254,7 +254,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -279,7 +279,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -315,7 +315,7 @@ Button bEntity1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -351,7 +351,7 @@ Button bEntity2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -387,7 +387,7 @@ Button bEntity3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -423,7 +423,7 @@ Button bEntity4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -459,7 +459,7 @@ Button bEntity5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -495,7 +495,7 @@ Button bEntity6 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -838,7 +838,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index 828a8ce7..c5514cbc 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -24,7 +24,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 500 + Max. Text Size: 750 Variable (string) entn Attributes @@ -36,7 +36,7 @@ Variable (string) vaSpeakerList Attributes Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (int32) vaSpeakerPos Attributes @@ -134,7 +134,7 @@ Text t2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -163,7 +163,7 @@ Text tPlayPause btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -192,7 +192,7 @@ Text t0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -232,7 +232,7 @@ Text t1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -262,7 +262,7 @@ Text t3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -301,7 +301,7 @@ Text tSpeaker btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -352,7 +352,7 @@ Text t5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -390,7 +390,7 @@ Slider hVolume btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -415,7 +415,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -447,7 +447,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -697,7 +697,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index 274b229f..ed4ebcee 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -237,7 +237,7 @@ Button bNext btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -273,7 +273,7 @@ Button bDown btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -309,7 +309,7 @@ Button bUp btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -341,7 +341,7 @@ Button bPrev btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -368,7 +368,7 @@ Dual-state Button bt0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -395,7 +395,7 @@ Dual-state Button bt1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -422,7 +422,7 @@ Dual-state Button bt2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -449,7 +449,7 @@ Dual-state Button bt3 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -476,7 +476,7 @@ Dual-state Button bt4 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -503,7 +503,7 @@ Dual-state Button bt5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -530,7 +530,7 @@ Dual-state Button bt6 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -557,7 +557,7 @@ Dual-state Button bt7 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -584,7 +584,7 @@ Dual-state Button bt8 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -948,7 +948,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 7967ce9a..8d0db84f 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -182,7 +182,7 @@ Button bSendStartup btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 859517f6..9cd4e3cd 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -29,7 +29,7 @@ Page popupLight btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -213,7 +213,7 @@ Picture pColorWheel btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -243,7 +243,7 @@ Slider hBrightness btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -273,7 +273,7 @@ Slider hTempSlider btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -298,7 +298,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -361,7 +361,7 @@ Dual-state Button btOnOff1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out/popupNotify.txt b/HMI/US/landscape/n2t-out/popupNotify.txt index 984ad5ee..af719e18 100644 --- a/HMI/US/landscape/n2t-out/popupNotify.txt +++ b/HMI/US/landscape/n2t-out/popupNotify.txt @@ -120,7 +120,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -147,7 +147,7 @@ Button b2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -174,7 +174,7 @@ Button b1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index a8c40451..4d5aff2b 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -29,7 +29,7 @@ Page popupShutter btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -147,7 +147,7 @@ Slider hPosition btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -172,7 +172,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -197,7 +197,7 @@ Button bDown1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -222,7 +222,7 @@ Button bStop1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -247,7 +247,7 @@ Button bUp1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 7c2426f9..57c23fe5 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -664,7 +664,7 @@ TouchCap tc0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 0623f083..86725aea 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-04-22 17:18:22.486188004 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:18:22.862183870 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:26:33.600676061 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.866183826 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:26:33.604675966 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -86,8 +86,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 17:18:22.490187960 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:18:22.866183826 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:26:33.604675966 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -747,8 +747,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:18:22.866183826 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:26:33.604675966 +0000 @@ -69,25 +69,25 @@ Attributes Scope : local @@ -877,8 +877,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 17:18:22.490187960 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:18:22.866183826 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:26:33.604675966 +0000 @@ -24,19 +24,19 @@ Attributes Scope : local @@ -1002,8 +1002,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 17:18:22.490187960 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:18:22.866183826 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:26:33.604675966 +0000 @@ -42,7 +42,7 @@ Attributes Scope : local @@ -1140,8 +1140,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:18:22.862183870 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:26:33.600676061 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -1161,8 +1161,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Picture p0 Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:18:22.866183826 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:26:33.604675966 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1188,8 +1188,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:18:22.866183826 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:26:33.604675966 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1256,8 +1256,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:18:22.862183870 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:26:33.604675966 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1286,8 +1286,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:18:22.862183870 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:26:33.604675966 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1354,8 +1354,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 17:18:22.486188004 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:18:22.866183826 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:26:33.208685366 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:26:33.604675966 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index aaf9956e..7afd9813 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:18:22.878183694 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-22 17:18:22.486188004 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:18:22.862183870 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:26:33.620675586 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:26:33.600676061 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.486188004 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.866183826 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:26:33.604675966 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -76,8 +76,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:18:22.490187960 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:18:22.866183826 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:26:33.604675966 +0000 +@@ -62,6 +62,16 @@ +@@ -97,25 +107,37 @@ + Attributes @@ -364,8 +364,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:18:22.486188004 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:18:22.866183826 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:26:33.604675966 +0000 +@@ -69,25 +69,25 @@ + Attributes + Scope : local @@ -494,8 +494,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:18:22.490187960 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:18:22.866183826 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:26:33.604675966 +0000 +@@ -24,19 +24,19 @@ + Attributes + Scope : local @@ -619,8 +619,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:18:22.490187960 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:18:22.866183826 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:26:33.604675966 +0000 +@@ -42,7 +42,7 @@ + Attributes + Scope : local @@ -757,8 +757,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt -+--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:18:22.486188004 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:18:22.862183870 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:26:33.600676061 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -777,8 +777,8 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:18:22.486188004 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:18:22.866183826 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:26:33.604675966 +0000 +@@ -177,12 +177,12 @@ + crcputh 55 bb +- crcputs sys0,2 @@ -787,8 +787,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-04-22 17:18:22.486188004 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:18:22.866183826 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:26:33.604675966 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -855,8 +855,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:18:22.486188004 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:18:22.862183870 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:26:33.604675966 +0000 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -885,8 +885,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:18:22.486188004 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:18:22.862183870 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:26:33.604675966 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -953,8 +953,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-22 17:18:22.486188004 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:18:22.866183826 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-22 17:26:33.208685366 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:26:33.604675966 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 From a969fb5ad68db0dfc55004af73ad30020943f8e2 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 23 Apr 2022 00:11:39 +0200 Subject: [PATCH 15/16] Fix Timezone for Weather on Screensaver --- apps/nspanel-lovelace-ui/luibackend/pages.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 4ce283f1..2dc12359 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -68,8 +68,10 @@ class LuiPagesGen(object): text_cur = convert_temperature(we.attributes.temperature, unit) forecastSkip = self._config._config_screensaver.raw_config.get(f"forecastSkip")+1 - # check if the first 2 forecast items are on the same day - same_day = dp.parse(we.attributes.forecast[0]['datetime']).weekday() == dp.parse(we.attributes.forecast[forecastSkip]['datetime']).weekday() + # check if the difference between the first 2 forecast items is less than 24h + difference = (dp.parse(we.attributes.forecast[forecastSkip]['datetime']) - dp.parse(we.attributes.forecast[0]['datetime'])) + total_seconds = difference.total_seconds() + same_day = total_seconds < 86400 weather_res = "" for i in range(1,5): wOF = self._config._config_screensaver.raw_config.get(f"weatherOverrideForecast{i}") @@ -77,7 +79,7 @@ class LuiPagesGen(object): fid = (i-1)*forecastSkip if len(we.attributes.forecast) >= fid: up = we.attributes.forecast[fid]['datetime'] - up = dp.parse(up) + up = dp.parse(up).astimezone() if babel_spec is not None: if same_day: up = babel.dates.format_time(up, "H:mm", locale=self._locale) From fe64f2f822446b6077368c6cbfe813c2412b0e95 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 24 Apr 2022 09:28:08 +0200 Subject: [PATCH 16/16] Remove collapse stuff for config tables --- README.md | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index d638198e..644f4e0f 100644 --- a/README.md +++ b/README.md @@ -357,8 +357,7 @@ key | optional | type | default | description -
Possible configuration values for config key -

+### Possible configuration values for config key key | optional | type | default | description -- | -- | -- | -- | -- @@ -424,8 +423,8 @@ key | optional | type | default | description

-
Possible configuration values for a card in card config -

+#### Possible configuration values for a card in card config + key | optional | type | default | description -- | -- | -- | -- | -- @@ -436,11 +435,7 @@ key | optional | type | default | description `key` | True | string | `None` | Used by navigate items -

-
- -
Possible configuration values for screensaver config -

+#### Possible configuration values for screensaver config key | optional | type | default | description -- | -- | -- | -- | -- @@ -484,11 +479,6 @@ It is possible to schedule a brightness change for the screen at specific times. value: 0 ``` -

-
- -
Overrides and Navigation -

#### Override Icons or Names @@ -522,13 +512,6 @@ will allow you to navigate to a cardGrid page with the configured key testKey ``` -

-
- - -

- -