diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index ba54c402..653907a4 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-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-07 21:52:21.071078168 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-09 09:14:32.604055011 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-09 09:14:33.488043688 +0000 @@ -11,9 +11,4 @@ // dim value int dimValue=40 @@ -12,12 +12,13 @@ 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-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-07 21:52:21.071078168 +0000 -@@ -12,24 +12,6 @@ +--- HMI/n2t-out/cardAlarm.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-09 09:14:33.492043637 +0000 +@@ -12,25 +12,6 @@ Events Preinitialize Event +- cardAlarm.bco=defaultBcoColor - for(sys0=0;sys0<40;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) @@ -39,7 +40,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt dim=dimValueNormal vis p0,0 vis tSend,0 -@@ -141,7 +123,7 @@ +@@ -142,7 +123,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none @@ -48,7 +49,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt Max. Text Size : 10 Text tIcon -@@ -758,18 +740,6 @@ +@@ -759,18 +740,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal @@ -68,12 +69,13 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-07-07 21:52:20.175064730 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-07 21:52:21.071078168 +0000 -@@ -12,25 +12,6 @@ +--- HMI/n2t-out/cardEntities.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-09 09:14:33.488043688 +0000 +@@ -12,26 +12,6 @@ Events Preinitialize Event +- cardEntities.bco=defaultBcoColor - for(sys0=0;sys0<65;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) @@ -96,7 +98,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt dim=dimValueNormal //wup=cardEntities //remove background & activate reparse mode -@@ -1027,10 +1008,6 @@ +@@ -1028,10 +1008,6 @@ //popupLight.tEntity.txt=tEntity3.txt page popupLight } @@ -107,7 +109,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt Hotspot m1 Attributes -@@ -1053,10 +1030,6 @@ +@@ -1054,10 +1030,6 @@ //popupLight.tEntity.txt=tEntity2.txt page popupLight } @@ -118,7 +120,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt Hotspot m0 Attributes -@@ -1079,10 +1052,6 @@ +@@ -1080,10 +1052,6 @@ //popupLight.tEntity.txt=tEntity1.txt page popupLight } @@ -129,7 +131,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt Hotspot m3 Attributes -@@ -1105,10 +1074,6 @@ +@@ -1106,10 +1074,6 @@ //popupLight.tEntity.txt=tEntity4.txt page popupLight } @@ -140,7 +142,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt Hotspot mSwipeNext Attributes -@@ -1964,18 +1929,6 @@ +@@ -1965,18 +1929,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal @@ -160,12 +162,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-07 21:52:21.071078168 +0000 -@@ -12,14 +12,6 @@ +--- HMI/n2t-out/cardGrid.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-09 09:14:33.488043688 +0000 +@@ -12,15 +12,6 @@ Events Preinitialize Event +- cardGrid.bco=defaultBcoColor - for(sys0=0;sys0<42;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) @@ -177,7 +180,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt dim=dimValueNormal //remove background & activate reparse mode vis p0,0 -@@ -858,18 +850,6 @@ +@@ -859,18 +850,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal @@ -196,7 +199,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt } if(tInstruction.txt=="timeout") { -@@ -931,10 +911,6 @@ +@@ -932,10 +911,6 @@ { page popupLight } @@ -208,12 +211,13 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt TouchCap tc0 Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-07 21:52:21.071078168 +0000 -@@ -12,20 +12,6 @@ +--- HMI/n2t-out/cardMedia.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-09 09:14:33.488043688 +0000 +@@ -12,21 +12,6 @@ Events Preinitialize Event +- cardMedia.bco=defaultBcoColor - for(sys0=0;sys0<34;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) @@ -231,7 +235,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt dim=dimValueNormal vis p0,0 vis tSend,0 -@@ -680,18 +666,6 @@ +@@ -681,18 +666,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal @@ -251,12 +255,13 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-07 21:52:21.071078168 +0000 -@@ -12,24 +12,6 @@ +--- HMI/n2t-out/cardQR.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-09 09:14:33.488043688 +0000 +@@ -12,25 +12,6 @@ Events Preinitialize Event +- cardQR.bco=defaultBcoColor - for(sys0=0;sys0<32;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) @@ -278,7 +283,7 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt dim=dimValueNormal vis p0,0 vis tSend,0 -@@ -627,18 +609,6 @@ +@@ -628,18 +609,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal @@ -298,12 +303,13 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-07-07 21:52:20.175064730 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-07 21:52:21.071078168 +0000 -@@ -12,20 +12,6 @@ +--- HMI/n2t-out/cardThermo.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-09 09:14:33.492043637 +0000 +@@ -12,21 +12,6 @@ Events Preinitialize Event +- cardThermo.bco=defaultBcoColor - for(sys0=0;sys0<53;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59) @@ -321,7 +327,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt dim=dimValueNormal vis p0,0 vis tSend,0 -@@ -1170,18 +1156,6 @@ +@@ -1171,18 +1156,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal @@ -341,8 +347,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-07 21:52:21.071078168 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-09 09:14:33.488043688 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -372,8 +378,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-07 21:52:21.071078168 +0000 +--- HMI/n2t-out/pageTest.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-09 09:14:33.488043688 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -423,12 +429,13 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt Attributes Only in HMI/n2t-out: popupFan.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-07 21:52:21.071078168 +0000 -@@ -12,28 +12,6 @@ +--- HMI/n2t-out/popupLight.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-09 09:14:33.488043688 +0000 +@@ -12,29 +12,6 @@ Events Preinitialize Event +- popupLight.bco=defaultBcoColor - for(sys0=0;sys0<27;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) @@ -454,7 +461,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt -@@ -588,18 +566,6 @@ +@@ -589,18 +566,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal @@ -474,9 +481,16 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-07 21:52:21.071078168 +0000 -@@ -18,17 +18,6 @@ +--- HMI/n2t-out/popupNotify.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-09 09:14:33.488043688 +0000 +@@ -12,24 +12,12 @@ + + Events + Preinitialize Event +- popupNotify.bco=defaultBcoColor + dim=dimValueNormal + vis p0,0 + vis tSend,0 vis tTmp,0 vis tInstruction,0 vis tId,0 @@ -494,7 +508,7 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt Variable (string) strCommand Attributes -@@ -326,18 +315,6 @@ +@@ -327,18 +315,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal @@ -514,8 +528,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-07 21:52:21.071078168 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-09 09:14:33.488043688 +0000 @@ -12,40 +12,6 @@ Events @@ -683,8 +697,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-07 21:52:21.071078168 +0000 +--- HMI/n2t-out/screensaver.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-09 09:14:33.488043688 +0000 @@ -406,22 +406,10 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index d7743e28..c35f3a7c 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-07-07 21:52:20.171064670 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-07 21:52:20.607071209 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-09 09:14:32.604055011 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-09 09:14:33.040049343 +0000 @@ -14,6 +14,6 @@ //color vars int defaultFontColor=65535 @@ -11,10 +11,13 @@ 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-07-07 21:52:20.171064670 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.607071209 +0000 -@@ -14,12 +14,9 @@ +--- HMI/n2t-out/cardAlarm.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -12,15 +12,11 @@ + + Events Preinitialize Event +- cardAlarm.bco=defaultBcoColor for(sys0=0;sys0<40;sys0++) { - if(b[sys0].type==98||b[sys0].type==116) @@ -26,7 +29,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt if(defaultBcoColor==0) { tCode.bco=6371 -@@ -141,7 +138,7 @@ +@@ -142,7 +138,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none @@ -36,12 +39,13 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Text tIcon diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-07-07 21:52:20.175064730 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-07 21:52:20.611071269 +0000 -@@ -12,13 +12,10 @@ +--- HMI/n2t-out/cardEntities.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -12,14 +12,10 @@ Events Preinitialize Event +- cardEntities.bco=defaultBcoColor - for(sys0=0;sys0<65;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) @@ -53,7 +57,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(b[sys0].type==53&&defaultBcoColor==0) { b[sys0].pic=10 -@@ -84,6 +81,18 @@ +@@ -85,6 +81,18 @@ vis nNum4,0 vis bPrev,0 vis bNext,0 @@ -72,7 +76,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Variable (string) strCommand Attributes -@@ -139,6 +148,18 @@ +@@ -140,6 +148,18 @@ Text : Max. Text Size: 80 @@ -91,7 +95,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Number nNum1 Attributes Scope : local -@@ -175,6 +196,15 @@ +@@ -176,6 +196,15 @@ Associated Keyboard : none Value : 0 @@ -107,7 +111,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Text tHeading Attributes Scope : local -@@ -305,6 +335,26 @@ +@@ -306,6 +335,26 @@ Text : Max. Text Size : 50 @@ -134,7 +138,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Picture p0 Attributes Scope : local -@@ -424,6 +474,34 @@ +@@ -425,6 +474,34 @@ prints tSend.txt,0 prints crcval,2 @@ -169,7 +173,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Button bDown1 Attributes Scope : local -@@ -881,6 +959,106 @@ +@@ -882,6 +959,106 @@ prints tSend.txt,0 prints crcval,2 @@ -276,7 +280,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Dual-state Button btOnOff1 Attributes Scope : local -@@ -989,6 +1167,33 @@ +@@ -990,6 +1167,33 @@ prints tSend.txt,0 prints crcval,2 @@ -310,7 +314,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSpecial Attributes Scope : local -@@ -1027,10 +1232,6 @@ +@@ -1028,10 +1232,6 @@ //popupLight.tEntity.txt=tEntity3.txt page popupLight } @@ -321,7 +325,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot m1 Attributes -@@ -1053,10 +1254,6 @@ +@@ -1054,10 +1254,6 @@ //popupLight.tEntity.txt=tEntity2.txt page popupLight } @@ -332,7 +336,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot m0 Attributes -@@ -1079,10 +1276,6 @@ +@@ -1080,10 +1276,6 @@ //popupLight.tEntity.txt=tEntity1.txt page popupLight } @@ -343,7 +347,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot m3 Attributes -@@ -1105,9 +1298,27 @@ +@@ -1106,9 +1298,27 @@ //popupLight.tEntity.txt=tEntity4.txt page popupLight } @@ -374,12 +378,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-07 21:52:20.611071269 +0000 -@@ -12,14 +12,11 @@ +--- HMI/n2t-out/cardGrid.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -12,15 +12,11 @@ Events Preinitialize Event +- cardGrid.bco=defaultBcoColor - for(sys0=0;sys0<42;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) @@ -392,7 +397,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt dim=dimValueNormal //remove background & activate reparse mode vis p0,0 -@@ -931,10 +928,6 @@ +@@ -932,10 +928,6 @@ { page popupLight } @@ -404,12 +409,13 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt TouchCap tc0 Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-07 21:52:20.607071209 +0000 -@@ -12,14 +12,11 @@ +--- HMI/n2t-out/cardMedia.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -12,15 +12,11 @@ Events Preinitialize Event +- cardMedia.bco=defaultBcoColor - for(sys0=0;sys0<34;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) @@ -423,12 +429,13 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt { hVolume.pic=14 diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-07 21:52:20.607071209 +0000 -@@ -12,24 +12,6 @@ +--- HMI/n2t-out/cardQR.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -12,25 +12,6 @@ Events Preinitialize Event +- cardQR.bco=defaultBcoColor - for(sys0=0;sys0<32;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) @@ -451,12 +458,13 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt vis p0,0 vis tSend,0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-07-07 21:52:20.175064730 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-07 21:52:20.611071269 +0000 -@@ -12,20 +12,6 @@ +--- HMI/n2t-out/cardThermo.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -12,21 +12,6 @@ Events Preinitialize Event +- cardThermo.bco=defaultBcoColor - for(sys0=0;sys0<53;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59) @@ -475,8 +483,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt vis p0,0 vis tSend,0 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-07 21:52:20.607071209 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-09 09:14:33.040049343 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -496,8 +504,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-07-07 21:52:20.171064670 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-07 21:52:20.607071209 +0000 +--- HMI/n2t-out/pageTest.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-09 09:14:33.040049343 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -547,12 +555,13 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt Attributes Only in HMI/n2t-out: popupFan.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-07 21:52:20.607071209 +0000 -@@ -12,13 +12,10 @@ +--- HMI/n2t-out/popupLight.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -12,14 +12,10 @@ Events Preinitialize Event +- popupLight.bco=defaultBcoColor - for(sys0=0;sys0<27;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) @@ -565,9 +574,16 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt { b[sys0].pic=10 diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-07 21:52:20.607071209 +0000 -@@ -18,17 +18,6 @@ +--- HMI/n2t-out/popupNotify.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -12,24 +12,12 @@ + + Events + Preinitialize Event +- popupNotify.bco=defaultBcoColor + dim=dimValueNormal + vis p0,0 + vis tSend,0 vis tTmp,0 vis tInstruction,0 vis tId,0 @@ -586,8 +602,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt Variable (string) strCommand Attributes diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-07-07 21:52:20.171064670 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-07 21:52:20.607071209 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-09 09:14:32.608054957 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-09 09:14:33.040049343 +0000 @@ -143,7 +143,7 @@ Send Component ID : disabled Associated Keyboard : none diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 45cd18ad..af18b21d 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,15 +1,18 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-07-07 21:52:20.623071449 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-07-07 21:52:20.171064670 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-07 21:52:20.607071209 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-07-09 09:14:33.052049192 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-07-09 09:14:32.604055011 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.171064670 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.607071209 +0000 -+@@ -14,12 +14,9 @@ ++--- HMI/n2t-out/cardAlarm.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-09 09:14:33.040049343 +0000 ++@@ -12,15 +12,11 @@ ++ ++ Events + Preinitialize Event ++- cardAlarm.bco=defaultBcoColor + for(sys0=0;sys0<40;sys0++) + { +- if(b[sys0].type==98||b[sys0].type==116) @@ -21,7 +24,7 @@ + if(defaultBcoColor==0) + { + tCode.bco=6371 -+@@ -141,7 +138,7 @@ ++@@ -142,7 +138,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none @@ -30,12 +33,13 @@ + Max. Text Size : 10 + + Text tIcon -+--- HMI/n2t-out/cardEntities.txt 2022-07-07 21:52:20.175064730 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-07 21:52:20.611071269 +0000 -+@@ -12,13 +12,10 @@ ++--- HMI/n2t-out/cardEntities.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-09 09:14:33.040049343 +0000 ++@@ -12,14 +12,10 @@ + + Events + Preinitialize Event ++- cardEntities.bco=defaultBcoColor +- for(sys0=0;sys0<65;sys0++) +- { +- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) @@ -47,33 +51,30 @@ + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 -+@@ -84,6 +81,18 @@ ++@@ -85,6 +81,18 @@ + vis bPrev,0 + vis bNext,0 ++ vis bPrev,0 ++ vis bNext,0 + Variable (string) strCommand + Attributes -+@@ -139,6 +148,18 @@ -+@@ -175,6 +196,15 @@ -+@@ -305,6 +335,26 @@ -+@@ -424,6 +474,34 @@ -+@@ -881,6 +959,106 @@ ++@@ -140,6 +148,18 @@ ++@@ -176,6 +196,15 @@ ++@@ -306,6 +335,26 @@ ++@@ -425,6 +474,34 @@ ++@@ -882,6 +959,106 @@ ++ Text : ++ Max. Text Size : 20 -+@@ -989,6 +1167,33 @@ -+@@ -1027,10 +1232,6 @@ ++@@ -990,6 +1167,33 @@ ++@@ -1028,10 +1232,6 @@ + //popupLight.tEntity.txt=tEntity3.txt -+ page popupLight -+ } +- if(type3.txt=="fan") +- { +- page popupFan +- } -+ + Hotspot m1 + Attributes -+@@ -1053,10 +1254,6 @@ ++@@ -1054,10 +1254,6 @@ + //popupLight.tEntity.txt=tEntity2.txt + page popupLight + } @@ -84,15 +85,18 @@ + + Hotspot m0 + Attributes -+@@ -1079,10 +1276,6 @@ ++@@ -1080,10 +1276,6 @@ + //popupLight.tEntity.txt=tEntity1.txt ++ page popupLight ++ } +- if(type1.txt=="fan") +- { +- page popupFan +- } ++ + Hotspot m3 + Attributes -+@@ -1105,9 +1298,27 @@ ++@@ -1106,9 +1298,27 @@ + //popupLight.tEntity.txt=tEntity4.txt + page popupLight + } @@ -103,12 +107,13 @@ + } + +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-07-07 21:52:20.171064670 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-07 21:52:20.611071269 +0000 -+@@ -12,14 +12,11 @@ ++--- HMI/n2t-out/cardGrid.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-09 09:14:33.040049343 +0000 ++@@ -12,15 +12,11 @@ + + Events + Preinitialize Event ++- cardGrid.bco=defaultBcoColor +- for(sys0=0;sys0<42;sys0++) +- { +- if(b[sys0].type==98||b[sys0].type==116) @@ -121,7 +126,7 @@ + dim=dimValueNormal + //remove background & activate reparse mode + vis p0,0 -+@@ -931,10 +928,6 @@ ++@@ -932,10 +928,6 @@ + { + page popupLight + } @@ -132,12 +137,13 @@ + + TouchCap tc0 +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-07-07 21:52:20.171064670 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-07 21:52:20.607071209 +0000 -+@@ -12,14 +12,11 @@ ++--- HMI/n2t-out/cardMedia.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-09 09:14:33.040049343 +0000 ++@@ -12,15 +12,11 @@ + + Events + Preinitialize Event ++- cardMedia.bco=defaultBcoColor +- for(sys0=0;sys0<34;sys0++) +- { +- if(b[sys0].type==98||b[sys0].type==116) @@ -150,11 +156,12 @@ + if(defaultBcoColor==0) + { + hVolume.pic=14 -+--- HMI/n2t-out/cardQR.txt 2022-07-07 21:52:20.171064670 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-07 21:52:20.607071209 +0000 -+@@ -12,24 +12,6 @@ ++--- HMI/n2t-out/cardQR.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-09 09:14:33.040049343 +0000 ++@@ -12,25 +12,6 @@ + Events + Preinitialize Event ++- cardQR.bco=defaultBcoColor +- for(sys0=0;sys0<32;sys0++) +- { +- if(b[sys0].type==98||b[sys0].type==116) @@ -177,12 +184,13 @@ + vis p0,0 + vis tSend,0 +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-07-07 21:52:20.175064730 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-07 21:52:20.611071269 +0000 -+@@ -12,20 +12,6 @@ ++--- HMI/n2t-out/cardThermo.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-09 09:14:33.040049343 +0000 ++@@ -12,21 +12,6 @@ + + Events + Preinitialize Event ++- cardThermo.bco=defaultBcoColor +- for(sys0=0;sys0<53;sys0++) +- { +- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59) @@ -200,11 +208,11 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 -+--- HMI/n2t-out/pageStartup.txt 2022-07-07 21:52:20.171064670 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-07 21:52:20.607071209 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-09 09:14:33.040049343 +0000 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-07-07 21:52:20.171064670 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-07 21:52:20.607071209 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -13,46 +13,6 @@ + Events + Preinitialize Event @@ -254,12 +262,13 @@ + Attributes +Only in HMI/n2t-out: popupFan.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-07-07 21:52:20.171064670 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-07 21:52:20.607071209 +0000 -+@@ -12,13 +12,10 @@ ++--- HMI/n2t-out/popupLight.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-09 09:14:33.040049343 +0000 ++@@ -12,14 +12,10 @@ + + Events + Preinitialize Event ++- popupLight.bco=defaultBcoColor +- for(sys0=0;sys0<27;sys0++) +- { +- if(b[sys0].type==98||b[sys0].type==116) @@ -272,9 +281,16 @@ + { + b[sys0].pic=10 +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-07-07 21:52:20.171064670 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-07 21:52:20.607071209 +0000 -+@@ -18,17 +18,6 @@ ++--- HMI/n2t-out/popupNotify.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-09 09:14:33.040049343 +0000 ++@@ -12,24 +12,12 @@ ++ ++ Events ++ Preinitialize Event ++- popupNotify.bco=defaultBcoColor ++ dim=dimValueNormal ++ vis p0,0 ++ vis tSend,0 + vis tTmp,0 + vis tInstruction,0 + vis tId,0 @@ -293,8 +309,8 @@ + Variable (string) strCommand + Attributes +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-07-07 21:52:20.171064670 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-07 21:52:20.607071209 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-07-09 09:14:32.608054957 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-09 09:14:33.040049343 +0000 +@@ -143,7 +143,7 @@ + Send Component ID : disabled + Associated Keyboard : none diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 46c0ab59..36ded3ce 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -20,6 +20,7 @@ Page cardAlarm Events Preinitialize Event + cardAlarm.bco=defaultBcoColor for(sys0=0;sys0<40;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index da052ce6..37358fc4 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -20,6 +20,7 @@ Page cardEntities Events Preinitialize Event + cardEntities.bco=defaultBcoColor for(sys0=0;sys0<65;sys0++) { if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index bafcd9ab..a0977a00 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -20,6 +20,7 @@ Page cardGrid Events Preinitialize Event + cardGrid.bco=defaultBcoColor for(sys0=0;sys0<42;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 10ab4f5f..2ec4cc20 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -20,6 +20,7 @@ Page cardMedia Events Preinitialize Event + cardMedia.bco=defaultBcoColor for(sys0=0;sys0<34;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index 9f510c4c..02601aac 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -20,6 +20,7 @@ Page cardQR Events Preinitialize Event + cardQR.bco=defaultBcoColor for(sys0=0;sys0<32;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index d37512a2..e054f48c 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -20,6 +20,7 @@ Page cardThermo Events Preinitialize Event + cardThermo.bco=defaultBcoColor for(sys0=0;sys0<53;sys0++) { if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59) diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 9743d398..95b6f55c 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,53 +14,53 @@ pageStartup 19 Component(s) 167 Line(s) of event code 122 Unique line(s) of event code -popupNotify - 17 Component(s) - 225 Line(s) of event code - 143 Unique line(s) of event code -cardGrid - 42 Component(s) - 461 Line(s) of event code - 270 Unique line(s) of event code +popupLight + 27 Component(s) + 386 Line(s) of event code + 211 Unique line(s) of event code screensaver 38 Component(s) 332 Line(s) of event code 257 Unique line(s) of event code -cardQR - 32 Component(s) - 402 Line(s) of event code - 233 Unique line(s) of event code +popupNotify + 17 Component(s) + 226 Line(s) of event code + 143 Unique line(s) of event code popupFan 20 Component(s) - 233 Line(s) of event code - 147 Unique line(s) of event code -popupLight - 27 Component(s) - 385 Line(s) of event code - 210 Unique line(s) of event code + 234 Line(s) of event code + 148 Unique line(s) of event code popupShutter 25 Component(s) 388 Line(s) of event code 211 Unique line(s) of event code -cardAlarm - 40 Component(s) - 420 Line(s) of event code - 253 Unique line(s) of event code +cardQR + 32 Component(s) + 403 Line(s) of event code + 234 Unique line(s) of event code cardMedia 34 Component(s) - 387 Line(s) of event code - 208 Unique line(s) of event code + 388 Line(s) of event code + 209 Unique line(s) of event code +cardGrid + 42 Component(s) + 462 Line(s) of event code + 271 Unique line(s) of event code cardThermo 53 Component(s) - 579 Line(s) of event code - 302 Unique line(s) of event code + 580 Line(s) of event code + 303 Unique line(s) of event code +cardAlarm + 40 Component(s) + 421 Line(s) of event code + 254 Unique line(s) of event code cardEntities 65 Component(s) - 1178 Line(s) of event code - 517 Unique line(s) of event code + 1179 Line(s) of event code + 518 Unique line(s) of event code Total 14 Page(s) 436 Component(s) - 5186 Line(s) of event code - 1346 Unique line(s) of event code + 5195 Line(s) of event code + 1354 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt index e62aa90a..2f0eea47 100644 --- a/HMI/n2t-out-visual/popupFan.txt +++ b/HMI/n2t-out-visual/popupFan.txt @@ -20,6 +20,7 @@ Page popupFan Events Preinitialize Event + popupFan.bco=defaultBcoColor for(sys0=0;sys0<40;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 62c9a91a..4953d697 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -20,6 +20,7 @@ Page popupLight Events Preinitialize Event + popupLight.bco=defaultBcoColor for(sys0=0;sys0<27;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index d68c6987..134e3589 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -20,6 +20,7 @@ Page popupNotify Events Preinitialize Event + popupNotify.bco=defaultBcoColor dim=dimValueNormal vis p0,0 vis tSend,0 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 79187c97..6ca40476 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -12,6 +12,7 @@ Page cardAlarm Events Preinitialize Event + cardAlarm.bco=defaultBcoColor for(sys0=0;sys0<40;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 30c58a0b..768577c1 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -12,6 +12,7 @@ Page cardEntities Events Preinitialize Event + cardEntities.bco=defaultBcoColor for(sys0=0;sys0<65;sys0++) { if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index df3e1ad0..9a56a4ef 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -12,6 +12,7 @@ Page cardGrid Events Preinitialize Event + cardGrid.bco=defaultBcoColor for(sys0=0;sys0<42;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 84db2129..9c406e35 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -12,6 +12,7 @@ Page cardMedia Events Preinitialize Event + cardMedia.bco=defaultBcoColor for(sys0=0;sys0<34;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 9a8a4d48..ef65b734 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -12,6 +12,7 @@ Page cardQR Events Preinitialize Event + cardQR.bco=defaultBcoColor for(sys0=0;sys0<32;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 2820e3b6..0f990088 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -12,6 +12,7 @@ Page cardThermo Events Preinitialize Event + cardThermo.bco=defaultBcoColor for(sys0=0;sys0<53;sys0++) { if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59) diff --git a/HMI/n2t-out/popupFan.txt b/HMI/n2t-out/popupFan.txt index 900513a0..af90ee28 100644 --- a/HMI/n2t-out/popupFan.txt +++ b/HMI/n2t-out/popupFan.txt @@ -12,6 +12,7 @@ Page popupFan Events Preinitialize Event + popupFan.bco=defaultBcoColor for(sys0=0;sys0<40;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 12913382..69c84d9d 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -12,6 +12,7 @@ Page popupLight Events Preinitialize Event + popupLight.bco=defaultBcoColor for(sys0=0;sys0<27;sys0++) { if(b[sys0].type==98||b[sys0].type==116) diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index f20b550e..393b540a 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -12,6 +12,7 @@ Page popupNotify Events Preinitialize Event + popupNotify.bco=defaultBcoColor dim=dimValueNormal vis p0,0 vis tSend,0