From dde38dc0f5fb1ad977a953b0025e9c931ea9e0e6 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sat, 23 Jul 2022 08:57:56 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 48 +++++------ HMI/US/portrait/diff-eu-version.txt | 76 ++++------------- HMI/US/portrait/diff-filtered.txt | 84 +++++-------------- HMI/US/portrait/n2t-out-visual/cardThermo.txt | 15 ++++ .../n2t-out-visual/nspanel_US_P_Stats.txt | 16 ++-- HMI/US/portrait/n2t-out-visual/popupLight.txt | 10 ++- HMI/US/portrait/n2t-out/cardThermo.txt | 15 ++++ HMI/US/portrait/n2t-out/popupLight.txt | 10 ++- 8 files changed, 112 insertions(+), 162 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 32bb89bf..65323c34 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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 08:57:51.439093859 +0000 @@ -11,9 +11,4 @@ // dim value int dimValue=40 @@ -12,8 +12,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-07-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-07-23 08:57:50.367086580 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 08:57:51.439093859 +0000 @@ -37,25 +37,6 @@ vis tCode,0 vis bPrev,0 @@ -60,8 +60,8 @@ 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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-23 08:57:50.367086580 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 08:57:51.439093859 +0000 @@ -65,26 +65,6 @@ vis nNum4,0 vis bPrev,0 @@ -153,8 +153,8 @@ 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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-23 08:57:50.367086580 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 08:57:51.439093859 +0000 @@ -36,15 +36,6 @@ vis tEntity6,0 vis bPrev,0 @@ -202,8 +202,8 @@ 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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 08:57:51.439093859 +0000 @@ -21,21 +21,6 @@ vis t5,0 vis bPrev,0 @@ -246,8 +246,8 @@ 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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/cardQR.txt 2022-07-23 08:57:50.367086580 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 08:57:51.439093859 +0000 @@ -32,25 +32,6 @@ vis bText2,0 tsw m0,0 @@ -294,8 +294,8 @@ 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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-07-23 08:57:50.367086580 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 08:57:51.439093859 +0000 @@ -41,21 +41,6 @@ vis xTempDest1,0 vis bPrev,0 @@ -338,8 +338,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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 08:57:51.439093859 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -370,8 +370,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt { 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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/popupLight.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 08:57:51.439093859 +0000 @@ -50,29 +50,6 @@ vis t0,0 vis pColorWheel,0 @@ -422,8 +422,8 @@ 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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 08:57:51.439093859 +0000 @@ -12,24 +12,12 @@ Events @@ -469,8 +469,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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 08:57:51.439093859 +0000 @@ -40,40 +40,6 @@ prints sys0,2 prints tSend.txt,0 @@ -638,8 +638,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-23 08:51:48.553338369 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 08:51:49.589361886 +0000 +--- HMI/n2t-out/screensaver.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 08:57:51.439093859 +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 3a0529c9..aa5f020d 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-23 08:51:48.553338369 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 08:51:49.061349901 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 08:57:50.911090274 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-07-23 08:51:48.553338369 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-23 08:51:49.065349991 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-07-23 08:57:50.367086580 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-23 08:57:50.915090301 +0000 @@ -12,6 +12,21 @@ Events @@ -62,8 +62,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Variable (string) strCommand Attributes diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-07-23 08:51:48.553338369 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 08:51:49.065349991 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-23 08:57:50.367086580 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 08:57:50.915090301 +0000 @@ -12,6 +12,22 @@ Events @@ -428,8 +428,8 @@ 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-23 08:51:48.553338369 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 08:51:49.065349991 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-23 08:57:50.367086580 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 08:57:50.915090301 +0000 @@ -12,6 +12,11 @@ Events @@ -470,8 +470,8 @@ 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-23 08:51:48.553338369 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 08:51:49.065349991 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 08:57:50.915090301 +0000 @@ -12,30 +12,26 @@ Events @@ -514,8 +514,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt Variable (string) strCommand Attributes diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-07-23 08:51:48.553338369 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 08:51:49.065349991 +0000 +--- HMI/n2t-out/cardQR.txt 2022-07-23 08:57:50.367086580 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 08:57:50.911090274 +0000 @@ -32,25 +32,6 @@ vis bText2,0 tsw m0,0 @@ -538,38 +538,13 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt - b[sys0].pic=10 - b[sys0].pic2=11 - } -- } - - Variable (string) strCommand - Attributes -diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-07-23 08:51:48.553338369 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-23 08:51:49.065349991 +0000 -@@ -41,21 +41,6 @@ - vis xTempDest1,0 - vis bPrev,0 - vis bNext,0 -- cardThermo.bco=defaultBcoColor -- for(sys0=0;sys0<53;sys0++) -- { -- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59) -- { -- b[sys0].bco=defaultBcoColor -- b[sys0].pco=defaultFontColor -- } -- if(b[sys0].type==53) -- { -- b[sys0].bco=defaultBcoColor -- b[sys0].bco2=defaultBcoColor -- b[sys0].pco=defaultFontColor -- } - } Variable (string) strCommand Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-07-23 08:51:48.553338369 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 08:51:49.065349991 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 08:57:50.915090301 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -588,28 +563,9 @@ 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 -diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-07-23 08:51:48.553338369 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-23 08:51:49.065349991 +0000 -@@ -50,14 +50,10 @@ - vis t0,0 - vis pColorWheel,0 - //vis t0,0 -- popupLight.bco=defaultBcoColor -- for(sys0=0;sys0<27;sys0++) -- { -- if(b[sys0].type==98||b[sys0].type==116) -+ for(sys0=0;sys0<40;sys0++) - { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor -- } - if(b[sys0].type==53&&defaultBcoColor==0) - { - b[sys0].pic=10 diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-07-23 08:51:48.553338369 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 08:51:49.065349991 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-23 08:57:50.363086553 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 08:57:50.911090274 +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 e80a9d95..93c2e40f 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,13 +1,13 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 08:51:49.077350264 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-07-23 08:51:48.553338369 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 08:51:49.061349901 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 08:57:50.931090410 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-07-23 08:57:50.363086553 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 08:57:50.911090274 +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-23 08:51:48.553338369 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-23 08:51:49.065349991 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-07-23 08:57:50.367086580 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-23 08:57:50.915090301 +0000 +@@ -12,6 +12,21 @@ + + Events @@ -56,8 +56,8 @@ + + Variable (string) strCommand + Attributes -+--- HMI/n2t-out/cardEntities.txt 2022-07-23 08:51:48.553338369 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 08:51:49.065349991 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-07-23 08:57:50.367086580 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 08:57:50.915090301 +0000 +@@ -12,6 +12,22 @@ + + Events @@ -118,21 +118,21 @@ +@@ -990,6 +1167,33 @@ +@@ -1028,10 +1232,6 @@ + //popupLight.tEntity.txt=tEntity3.txt ++ page popupLight ++ } +- if(type3.txt=="fan") +- { +- page popupFan +- } ++ + Hotspot m1 + Attributes +@@ -1054,10 +1254,6 @@ + //popupLight.tEntity.txt=tEntity2.txt -+ page popupLight -+ } +- if(type2.txt=="fan") +- { +- page popupFan +- } -+ + Hotspot m0 + Attributes +@@ -1080,10 +1276,6 @@ @@ -157,8 +157,8 @@ + } + +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-07-23 08:51:48.553338369 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 08:51:49.065349991 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-07-23 08:57:50.367086580 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 08:57:50.915090301 +0000 +@@ -12,6 +12,11 @@ + + Events @@ -197,8 +197,8 @@ + + TouchCap tc0 +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-07-23 08:51:48.553338369 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 08:51:49.065349991 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-07-23 08:57:50.363086553 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 08:57:50.915090301 +0000 +@@ -12,30 +12,26 @@ + Events + Preinitialize Event @@ -240,8 +240,8 @@ + Variable (string) strCommand + Attributes +diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt -+--- HMI/n2t-out/cardQR.txt 2022-07-23 08:51:48.553338369 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 08:51:49.065349991 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-07-23 08:57:50.367086580 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 08:57:50.911090274 +0000 +@@ -32,25 +32,6 @@ + vis bText2,0 + tsw m0,0 @@ -267,55 +267,11 @@ +- } + + Variable (string) strCommand -+ Attributes -+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-07-23 08:51:48.553338369 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-23 08:51:49.065349991 +0000 -+@@ -41,21 +41,6 @@ -+ vis xTempDest1,0 -+ vis bPrev,0 -+ vis bNext,0 -+- cardThermo.bco=defaultBcoColor -+- for(sys0=0;sys0<53;sys0++) -+- { -+- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59) -+- { -+- b[sys0].bco=defaultBcoColor -+- b[sys0].pco=defaultFontColor -+- } -+- if(b[sys0].type==53) -+- { -+- b[sys0].bco=defaultBcoColor -+- b[sys0].bco2=defaultBcoColor -+- b[sys0].pco=defaultFontColor -+- } -+- } -+ -+ Variable (string) strCommand -+--- HMI/n2t-out/pageStartup.txt 2022-07-23 08:51:48.553338369 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 08:51:49.065349991 +0000 -+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-07-23 08:51:48.553338369 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-23 08:51:49.065349991 +0000 -+@@ -50,14 +50,10 @@ -+ vis t0,0 -+ vis pColorWheel,0 -+ //vis t0,0 -+- popupLight.bco=defaultBcoColor -+- for(sys0=0;sys0<27;sys0++) -+- { -+- if(b[sys0].type==98||b[sys0].type==116) -++ for(sys0=0;sys0<40;sys0++) -+ { -+ b[sys0].bco=defaultBcoColor -+ b[sys0].pco=defaultFontColor -+- } -+ if(b[sys0].type==53&&defaultBcoColor==0) -+ { -+ b[sys0].pic=10 ++--- HMI/n2t-out/pageStartup.txt 2022-07-23 08:57:50.363086553 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 08:57:50.915090301 +0000 +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-07-23 08:51:48.553338369 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 08:51:49.065349991 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-07-23 08:57:50.363086553 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 08:57:50.911090274 +0000 +@@ -143,7 +143,7 @@ + Send Component ID : disabled + Associated Keyboard : none diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index d1c75e66..c9c4e60d 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -49,6 +49,21 @@ Page cardThermo vis xTempDest1,0 vis bPrev,0 vis bNext,0 + cardThermo.bco=defaultBcoColor + for(sys0=0;sys0<53;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53) + { + b[sys0].bco=defaultBcoColor + b[sys0].bco2=defaultBcoColor + b[sys0].pco=defaultFontColor + } + } Variable (string) strCommand Attributes 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 75ae0959..f85b5fbf 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 @@ -16,8 +16,8 @@ popupNotify 143 Unique line(s) of event code popupLight 27 Component(s) - 382 Line(s) of event code - 209 Unique line(s) of event code + 386 Line(s) of event code + 211 Unique line(s) of event code popupShutter 25 Component(s) 388 Line(s) of event code @@ -50,17 +50,17 @@ cardGrid 42 Component(s) 454 Line(s) of event code 267 Unique line(s) of event code -cardThermo - 53 Component(s) - 565 Line(s) of event code - 296 Unique line(s) of event code cardEntities 77 Component(s) 1245 Line(s) of event code 533 Unique line(s) of event code +cardThermo + 53 Component(s) + 580 Line(s) of event code + 303 Unique line(s) of event code Total 14 Page(s) 444 Component(s) - 5204 Line(s) of event code - 1344 Unique line(s) of event code + 5223 Line(s) of event code + 1351 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 4299aac8..a3cb4404 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -58,10 +58,14 @@ Page popupLight vis t0,0 vis pColorWheel,0 //vis t0,0 - for(sys0=0;sys0<40;sys0++) + popupLight.bco=defaultBcoColor + for(sys0=0;sys0<27;sys0++) { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } if(b[sys0].type==53&&defaultBcoColor==0) { b[sys0].pic=10 diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index dc0b63b1..bac9c333 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -41,6 +41,21 @@ Page cardThermo vis xTempDest1,0 vis bPrev,0 vis bNext,0 + cardThermo.bco=defaultBcoColor + for(sys0=0;sys0<53;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53) + { + b[sys0].bco=defaultBcoColor + b[sys0].bco2=defaultBcoColor + b[sys0].pco=defaultFontColor + } + } Variable (string) strCommand Attributes diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 4f94af4a..cb0959db 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -50,10 +50,14 @@ Page popupLight vis t0,0 vis pColorWheel,0 //vis t0,0 - for(sys0=0;sys0<40;sys0++) + popupLight.bco=defaultBcoColor + for(sys0=0;sys0<27;sys0++) { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } if(b[sys0].type==53&&defaultBcoColor==0) { b[sys0].pic=10