diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index f5d4a5bc..971d089f 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-27 15:10:39.613563222 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-27 15:10:40.625595070 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-29 16:07:16.137625205 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-29 16:07:17.201614908 +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-27 15:10:39.613563222 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-27 15:10:40.629595196 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-29 16:07:17.201614908 +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-27 15:10:39.613563222 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-27 15:10:40.629595196 +0000 +--- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-29 16:07:17.201614908 +0000 @@ -13,36 +13,6 @@ Events Preinitialize Event @@ -143,15 +143,3 @@ 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/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index eeecdbb8..8b130ad1 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,6 +10,14 @@ popupNotify 17 Component(s) 226 Line(s) of event code 143 Unique line(s) of event code +pageStartup + 19 Component(s) + 167 Line(s) of event code + 122 Unique line(s) of event code +popupFan + 20 Component(s) + 236 Line(s) of event code + 150 Unique line(s) of event code popupLight 27 Component(s) 386 Line(s) of event code @@ -34,14 +42,6 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -pageStartup - 19 Component(s) - 167 Line(s) of event code - 122 Unique line(s) of event code -popupFan - 20 Component(s) - 236 Line(s) of event code - 150 Unique line(s) of event code screensaver 38 Component(s) 332 Line(s) of event code @@ -63,4 +63,4 @@ Total 14 Page(s) 432 Component(s) 5141 Line(s) of event code - 1351 Unique line(s) of event code + 1352 Unique 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 237cd7f1..ef20ffdd 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 39 + Text : 40 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out-visual/popupFan.txt b/HMI/US/landscape/n2t-out-visual/popupFan.txt index 3414997a..c505d3c9 100644 --- a/HMI/US/landscape/n2t-out-visual/popupFan.txt +++ b/HMI/US/landscape/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/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 82d5d811..0c22d125 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 39 + Text : 40 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/landscape/n2t-out/popupFan.txt b/HMI/US/landscape/n2t-out/popupFan.txt index 8e796f65..bcce3670 100644 --- a/HMI/US/landscape/n2t-out/popupFan.txt +++ b/HMI/US/landscape/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) { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 06d36f67..fb67e680 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-27 15:10:39.613563222 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-27 15:10:40.101578579 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-29 16:07:16.137625205 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 16:07:16.677613901 +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-27 15:10:39.617563347 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-27 15:10:40.101578579 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-08-29 16:07:16.141624865 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 16:07:16.677613901 +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-27 15:10:39.613563222 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-27 15:10:40.101578579 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 16:07:16.677613901 +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-27 15:10:39.613563222 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-27 15:10:40.101578579 +0000 +--- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 16:07:16.677613901 +0000 @@ -13,36 +13,6 @@ Events Preinitialize Event @@ -601,15 +601,3 @@ 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 9ac31630..7378e27a 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-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 ++++ HMI/US/portrait/diff-eu-version.txt 2022-08-29 16:07:16.689613925 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-08-29 16:07:16.137625205 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 16:07:16.677613901 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 -+--- 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 ++--- HMI/n2t-out/cardEntities.txt 2022-08-29 16:07:16.141624865 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 16:07:16.677613901 +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-27 15:10:39.613563222 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-27 15:10:40.101578579 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 16:07:16.677613901 +0000 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- 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 ++--- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 16:07:16.677613901 +0000 +@@ -13,36 +13,6 @@ + Events + Preinitialize Event @@ -158,15 +158,3 @@ +- } +- } +- -+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/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 9b1d91c1..36350cc0 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -18,14 +18,18 @@ popupLight 27 Component(s) 386 Line(s) of event code 211 Unique line(s) of event code -cardMedia - 34 Component(s) - 388 Line(s) of event code - 209 Unique line(s) of event code pageStartup 19 Component(s) 167 Line(s) of event code 122 Unique line(s) of event code +cardMedia + 34 Component(s) + 388 Line(s) of event code + 209 Unique line(s) of event code +popupFan + 20 Component(s) + 236 Line(s) of event code + 150 Unique line(s) of event code cardEntities 77 Component(s) 1348 Line(s) of event code @@ -38,10 +42,6 @@ cardQR 32 Component(s) 403 Line(s) of event code 234 Unique line(s) of event code -popupFan - 20 Component(s) - 236 Line(s) of event code - 150 Unique line(s) of event code screensaver 38 Component(s) 332 Line(s) of event code @@ -63,4 +63,4 @@ Total 14 Page(s) 444 Component(s) 5363 Line(s) of event code - 1424 Unique line(s) of event code + 1425 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index f6dea82f..3357e6e6 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 39 + Text : 40 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupFan.txt b/HMI/US/portrait/n2t-out-visual/popupFan.txt index 1eddcd99..599e21a5 100644 --- a/HMI/US/portrait/n2t-out-visual/popupFan.txt +++ b/HMI/US/portrait/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/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 44181e93..3c3e4f21 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 39 + Text : 40 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/n2t-out/popupFan.txt b/HMI/US/portrait/n2t-out/popupFan.txt index 8e796f65..bcce3670 100644 --- a/HMI/US/portrait/n2t-out/popupFan.txt +++ b/HMI/US/portrait/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) { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 2b9e8556..9a257ba0 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,14 +10,14 @@ pageTest 19 Component(s) 64 Line(s) of event code 61 Unique line(s) of event code -popupShutter - 25 Component(s) - 388 Line(s) of event code - 211 Unique line(s) of event code pageStartup 19 Component(s) 167 Line(s) of event code 122 Unique line(s) of event code +popupShutter + 25 Component(s) + 388 Line(s) of event code + 211 Unique line(s) of event code screensaver 38 Component(s) 332 Line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index b8d2aaf7..caf259aa 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 39 + Text : 40 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index f1055728..26dffd85 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 39 + Text : 40 Max. Text Size : 10 Picture p0