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) { diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 01bd2133..83cb8037 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 1fbb32b2..70584b44 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ