From 9a33b39b7ea18b50da0f90648d54ded7001c8dd5 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 27 Aug 2022 17:10:17 +0200 Subject: [PATCH 1/2] fix theme loop --- HMI/nspanel.HMI | Bin 11147230 -> 11147230 bytes HMI/nspanel.tft | Bin 7673060 -> 7673060 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 01bd21337361b393afd91bef6227ce5586a73f79..83cb803773b23e3b11a356ca5be54e8e1406a919 100644 GIT binary patch delta 1003 zcmdVU*>g)_9LDjJoTN>1BWkH5jab?SC9R01_A1q)u~qF$tPM_*s@V6wq}GV2LkTTP zGG;K-&YTNlMi^IIxap<-14i9&JK>NPo`@@1IQSO3AO~WSzzCwz?crNj-TsEJ<&g%)a-}jRP|)U(_LW z_^5gpPR4UTD3T`<_*d0`e@!_D-Ws}8OTN+6)*`aa30o{-Gr$NLCYX_F2%X5t0GOh2E64%sLcToH2 zR|@s2PUmO8RuM1$qDLc2+Mxf+It#q9o{R$paAFi(7>zL)i*YDK5sKl)cuc@VlwcAj z!-GDr^1J6n2s5kiE_-sY|O!2%)@*vKm`_}5{s}HRak;*)L_r2D*oXZ%02LvG5kVskq6vo( z#bF%5Q5?f@oWMz(!fBkrS)9XpG(+G5E+U2&T*75s!Bt$tb;NN43EV^yx6q2)&~OKL f(T01tj}#u@A==S_M|g}U=)_YzLt5|2WUQgz2p7$G delta 1908 zcmdVa`%jx?6bJD0wiGCCuDpfPQp#PZT+7B3fgwYXu{p+N+$K7}RVhkgpmS^vn0u97 zfdYEi5W(99Su!vqdreF>VkByefh^gw#bsk&W{in5oBm>q`fd9rApe0+@=4Fz=RBt; z&wJ9FQxlq-Fx{wL-(2r-rfk|;M9TU#Ris%J9^6*!om=bO6V8vSKUEKI_t(X1Bh2JV zClY{CTI-c6o{v-IX3DC>-ldC!eSUMMj1~L8j9MrW`*gn9KSbp-Z#ZB-VgL`g3NNx_mq3XzPGNeZ1YYa>=`lNW66Ys|oH zJjjuS`oyjYgty%<0qcmGC|rrpXo!BovwQVwiGEPxw$(&;l(;&O=sP9O3?}+si7h77 zRN}wGh<;b%dyz|ZuEu)K#&~|<6D!f8k~EyO^aGtXqHopg`pT5aB{e1=d7)CQQLRez z$EiJz_Q+OSl3ZFNR;aloDa@BIROxiQkYV)YIN2J~Lga-Uta z2^`@v2FYV3dWUA|oRG^=vNdt}AzsXnn|2@hQpNv#X7S})CyhGpY=~N3zsXad^6|WRn#0^2SH3UB+@xae+^ajB zC|!wXVu<>cocwt2oVs(qNg(>!9bjEZB$5PgoS95CjJdnFt9*4L_j1&K{UibEIb5p5D!*(7!n{6k{}sUAQfzo25Vs*q{Di61RjM9 zcnmTj3*3EdfE;)na$zIn!4r@V1@I&k!X_w!&9DWYf~`;t+n@wWp$y7lJ5)d=R6#Y= zzz%pCYT+4p7Is1%)I$S22fM%y&%+DQ2o7k17vUvn1}C&YE9{0gXor{K71#r>!d~cr zeXt*1g9FeBUC<2&;dM9!61)L#LJu5g< g1m1yBco)WC9NvTX;RE;(K7!M51}5YylapHKzvMfj9RL6T diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 1fbb32b278d2c3272314615308869031b8361668..70584b4402d64ae581e7014969728e4ee76b4dd0 100644 GIT binary patch delta 291 zcmWN=%Qln&007{_jF^?&N?cH?OvFXyF1f5ir7G2;YFtt4syf%yYtSgB z$#pk0YtgDryPIz5(CM~2y2N$6DJG?>KXwC`~2fsd(sL sZa9+7<}z!0>0In68~vS6W`fz^*WiBeAowkKc#=$B+lrqR5gE$XJWl#azUj+}q;w2owMbF^g z#EY18<*tbr@Bsdoy!wydv3m5t5l6+uHE7i2n1p66TD3Xugmxz-opM@-GdguS>zwma zF6egAB|R?d)#r+S0|s4n&2?!v+%zOGEF&xDmfP;gyKBU#d&b=Nz_@}5lcr32XvVBL z^B!5SXvwn2Ry^_4Gta&7(krjM@z$z$))c+BZo{T6AAI!5wjH}ZEB!408*0i0=}bEI rr&>saVYOT=tyWXt!{lKtC`ZF+CHf`$HM$qw|5XdVCF=1?KKu7S{o-(x From 06ac2b890a4a67d92499e3160fc36e05043083e0 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 27 Aug 2022 15:10:45 +0000 Subject: [PATCH 2/2] fix theme loop (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 24 ++++++++++++++++------ HMI/US/portrait/diff-eu-version.txt | 28 ++++++++++++++++++-------- HMI/US/portrait/diff-filtered.txt | 30 +++++++++++++++++++--------- HMI/n2t-out-visual/nspanel_Stats.txt | 10 +++++----- HMI/n2t-out-visual/popupFan.txt | 2 +- HMI/n2t-out/popupFan.txt | 2 +- 6 files changed, 66 insertions(+), 30 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 01e538b7..f5d4a5bc 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-08-17 15:05:03.933958595 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-17 15:05:05.245664384 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-27 15:10:39.613563222 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-27 15:10:40.625595070 +0000 @@ -14,6 +14,3 @@ //color vars int defaultFontColor=65535 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 - page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-08-17 15:05:03.933958595 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-17 15:05:05.249664584 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-27 15:10:39.613563222 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-27 15:10:40.629595196 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -21,8 +21,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/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-08-17 15:05:03.933958595 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-17 15:05:05.249664584 +0000 +--- HMI/n2t-out/pageTest.txt 2022-08-27 15:10:39.613563222 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-27 15:10:40.629595196 +0000 @@ -13,36 +13,6 @@ Events Preinitialize Event @@ -143,3 +143,15 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt - } - } - +diff -bur HMI/n2t-out/popupFan.txt HMI/US/landscape/n2t-out/popupFan.txt +--- HMI/n2t-out/popupFan.txt 2022-08-27 15:10:39.617563347 +0000 ++++ HMI/US/landscape/n2t-out/popupFan.txt 2022-08-27 15:10:40.629595196 +0000 +@@ -39,7 +39,7 @@ + prints crcval,2 + vis hSpeed,0 + popupFan.bco=defaultBcoColor +- for(sys0=0;sys0<20;sys0++) ++ for(sys0=0;sys0<40;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 1fee3bb3..06d36f67 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-08-17 15:05:03.933958595 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-17 15:05:04.569667901 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-27 15:10:39.613563222 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-27 15:10:40.101578579 +0000 @@ -14,6 +14,6 @@ //color vars int defaultFontColor=65535 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-08-17 15:05:03.937956767 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-17 15:05:04.573666073 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-08-27 15:10:39.617563347 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-27 15:10:40.101578579 +0000 @@ -65,6 +65,16 @@ vis nNum4,0 vis bPrev,0 @@ -458,8 +458,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-08-17 15:05:03.933958595 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-17 15:05:04.573666073 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-27 15:10:39.613563222 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-27 15:10:40.101578579 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -479,8 +479,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-08-17 15:05:03.933958595 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-17 15:05:04.569667901 +0000 +--- HMI/n2t-out/pageTest.txt 2022-08-27 15:10:39.613563222 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-27 15:10:40.101578579 +0000 @@ -13,36 +13,6 @@ Events Preinitialize Event @@ -601,3 +601,15 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt - } - } - +diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt +--- HMI/n2t-out/popupFan.txt 2022-08-27 15:10:39.617563347 +0000 ++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-08-27 15:10:40.101578579 +0000 +@@ -39,7 +39,7 @@ + prints crcval,2 + vis hSpeed,0 + popupFan.bco=defaultBcoColor +- for(sys0=0;sys0<20;sys0++) ++ for(sys0=0;sys0<40;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 2b071bcb..9ac31630 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-08-17 15:05:04.589658760 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-08-17 15:05:03.933958595 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-17 15:05:04.569667901 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-08-27 15:10:40.121579209 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-08-27 15:10:39.613563222 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-27 15:10:40.101578579 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 -+--- HMI/n2t-out/cardEntities.txt 2022-08-17 15:05:03.937956767 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-17 15:05:04.573666073 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-08-27 15:10:39.617563347 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-27 15:10:40.101578579 +0000 +@@ -65,6 +65,16 @@ + vis bPrev,0 + vis bNext,0 @@ -33,11 +33,11 @@ ++ spstr strCommand.txt,tTmp.txt,"~",32 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff5.val=sys0 -+--- HMI/n2t-out/pageStartup.txt 2022-08-17 15:05:03.933958595 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-17 15:05:04.573666073 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-08-27 15:10:39.613563222 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-27 15:10:40.101578579 +0000 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-08-17 15:05:03.933958595 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-17 15:05:04.569667901 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-08-27 15:10:39.613563222 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-27 15:10:40.101578579 +0000 +@@ -13,36 +13,6 @@ + Events + Preinitialize Event @@ -158,3 +158,15 @@ +- } +- } +- ++diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt ++--- HMI/n2t-out/popupFan.txt 2022-08-27 15:10:39.617563347 +0000 +++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-08-27 15:10:40.101578579 +0000 ++@@ -39,7 +39,7 @@ ++ prints crcval,2 ++ vis hSpeed,0 ++ popupFan.bco=defaultBcoColor ++- for(sys0=0;sys0<20;sys0++) +++ for(sys0=0;sys0<40;sys0++) ++ { ++ if(b[sys0].type==98||b[sys0].type==116) ++ { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 91c9c09f..2b9e8556 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -38,6 +38,10 @@ cardGrid 42 Component(s) 462 Line(s) of event code 271 Unique line(s) of event code +popupFan + 20 Component(s) + 236 Line(s) of event code + 150 Unique line(s) of event code cardQR 32 Component(s) 403 Line(s) of event code @@ -46,10 +50,6 @@ cardAlarm 40 Component(s) 421 Line(s) of event code 254 Unique line(s) of event code -popupFan - 20 Component(s) - 236 Line(s) of event code - 150 Unique line(s) of event code cardThermo 53 Component(s) 580 Line(s) of event code @@ -63,4 +63,4 @@ Total 14 Page(s) 437 Component(s) 5193 Line(s) of event code - 1365 Unique line(s) of event code + 1366 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt index 1f10aacd..8fec99b0 100644 --- a/HMI/n2t-out-visual/popupFan.txt +++ b/HMI/n2t-out-visual/popupFan.txt @@ -47,7 +47,7 @@ Page popupFan prints crcval,2 vis hSpeed,0 popupFan.bco=defaultBcoColor - for(sys0=0;sys0<40;sys0++) + for(sys0=0;sys0<20;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { diff --git a/HMI/n2t-out/popupFan.txt b/HMI/n2t-out/popupFan.txt index 8e796f65..bcce3670 100644 --- a/HMI/n2t-out/popupFan.txt +++ b/HMI/n2t-out/popupFan.txt @@ -39,7 +39,7 @@ Page popupFan prints crcval,2 vis hSpeed,0 popupFan.bco=defaultBcoColor - for(sys0=0;sys0<40;sys0++) + for(sys0=0;sys0<20;sys0++) { if(b[sys0].type==98||b[sys0].type==116) {