From 9c7dabee6bc4e7e776060cf8a2c8c625532fd30a Mon Sep 17 00:00:00 2001 From: joBr99 Date: Thu, 23 Jun 2022 20:32:25 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 52 +- HMI/US/portrait/diff-eu-version.txt | 558 +----------------- HMI/US/portrait/diff-filtered.txt | 387 +----------- HMI/US/portrait/n2t-out-visual/Program.s.txt | 3 + HMI/US/portrait/n2t-out-visual/cardAlarm.txt | 12 + .../portrait/n2t-out-visual/cardEntities.txt | 175 +----- HMI/US/portrait/n2t-out-visual/cardGrid.txt | 17 + HMI/US/portrait/n2t-out-visual/cardMedia.txt | 12 + HMI/US/portrait/n2t-out-visual/cardQR.txt | 12 + HMI/US/portrait/n2t-out-visual/cardThermo.txt | 12 + .../n2t-out-visual/nspanel_US_P_Stats.txt | 84 +-- .../portrait/n2t-out-visual/pageStartup.txt | 12 + HMI/US/portrait/n2t-out-visual/popupLight.txt | 12 + .../portrait/n2t-out-visual/popupNotify.txt | 12 + .../portrait/n2t-out-visual/popupShutter.txt | 62 +- .../portrait/n2t-out-visual/screensaver.txt | 14 +- HMI/US/portrait/n2t-out/Program.s.txt | 3 + HMI/US/portrait/n2t-out/cardAlarm.txt | 12 + HMI/US/portrait/n2t-out/cardEntities.txt | 175 +----- HMI/US/portrait/n2t-out/cardGrid.txt | 17 + HMI/US/portrait/n2t-out/cardMedia.txt | 12 + HMI/US/portrait/n2t-out/cardQR.txt | 12 + HMI/US/portrait/n2t-out/cardThermo.txt | 12 + HMI/US/portrait/n2t-out/pageStartup.txt | 12 + HMI/US/portrait/n2t-out/popupLight.txt | 12 + HMI/US/portrait/n2t-out/popupNotify.txt | 12 + HMI/US/portrait/n2t-out/popupShutter.txt | 62 +- HMI/US/portrait/n2t-out/screensaver.txt | 14 +- 28 files changed, 509 insertions(+), 1282 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index ea4b5c79..68521323 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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-23 20:12:05.612935077 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-23 20:32:24.367053524 +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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 20:12:05.616935142 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 20:32:24.367053524 +0000 @@ -12,21 +12,6 @@ Events @@ -65,8 +65,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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 20:12:05.616935142 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 20:32:24.367053524 +0000 @@ -12,22 +12,6 @@ Events @@ -110,8 +110,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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 20:12:05.612935077 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 20:32:24.367053524 +0000 @@ -12,11 +12,6 @@ Events @@ -144,8 +144,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 20:12:05.612935077 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 20:32:24.367053524 +0000 @@ -12,17 +12,6 @@ Events @@ -184,8 +184,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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 20:12:05.612935077 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 20:32:24.367053524 +0000 @@ -12,21 +12,6 @@ Events @@ -228,8 +228,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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 20:12:05.616935142 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 20:32:24.367053524 +0000 @@ -12,11 +12,6 @@ Events @@ -262,8 +262,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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 20:12:05.612935077 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 20:32:24.367053524 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -293,8 +293,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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 20:12:05.612935077 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 20:32:24.367053524 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -343,8 +343,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt Picture p0 Attributes diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 20:12:05.616935142 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 20:32:24.367053524 +0000 @@ -12,25 +12,6 @@ Events @@ -391,8 +391,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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 20:12:05.616935142 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 20:32:24.367053524 +0000 @@ -12,11 +12,6 @@ Events @@ -425,8 +425,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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 20:12:05.616935142 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 20:32:24.367053524 +0000 @@ -12,40 +12,6 @@ Events @@ -576,8 +576,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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 20:12:05.616935142 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 20:32:24.367053524 +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 66032ace..c0d47269 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,21 +1,18 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:12:05.148927555 +0000 -@@ -11,9 +11,6 @@ - // dim value - int dimValue=40 - int dimValueNormal=100 -- //color vars -- int defaultFontColor=65535 -- int defaultBcoColor=6371 +--- HMI/n2t-out/Program.s.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:32:23.907044828 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 - // fix touch offset - lcd_dev fffb 0002 0000 0020 + // fix touch offset (Removed for US version) + //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-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:12:05.152927620 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:32:23.907044828 +0000 @@ -12,21 +12,6 @@ Events @@ -47,28 +44,9 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Max. Text Size : 10 Text tIcon -@@ -755,18 +740,6 @@ - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:12:05.152927620 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:32:23.911044863 +0000 @@ -12,22 +12,6 @@ Events @@ -376,232 +354,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext Attributes Scope : local -@@ -1866,6 +2078,169 @@ - covx tTmp.txt,sys0,0,0 - hSlider4.maxval=sys0 - } -+ // get Type -+ spstr strCommand.txt,type5.txt,"~",27 -+ // get internal name -+ spstr strCommand.txt,entn5.txt,"~",28 -+ if(type5.txt=="delete"||type5.txt=="") -+ { -+ vis bUp5,0 -+ vis bStop5,0 -+ vis bDown5,0 -+ vis btOnOff5,0 -+ vis tEntity5,0 -+ vis tIcon5,0 -+ vis bText5,0 -+ vis hSlider5,0 -+ vis nNum5,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,tIcon5.txt,"~",29 -+ vis tIcon5,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",30 -+ covx tTmp.txt,sys0,0,0 -+ tIcon5.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity5.txt,"~",31 -+ vis tEntity5,1 -+ } -+ if(type5.txt=="shutter") -+ { -+ vis bUp5,1 -+ vis bStop5,1 -+ vis bDown5,1 -+ vis btOnOff5,0 -+ vis bText5,0 -+ vis hSlider5,0 -+ vis nNum5,0 -+ // get Button State (optional Value) -+ spstr strCommand.txt,tId.txt,"~",32 -+ // up button -+ spstr tId.txt,tTmp.txt,"|",3 -+ if(tTmp.txt=="disable") -+ { -+ bUp5.pco=27501 -+ spstr tId.txt,bUp5.txt,"|",0 -+ tsw bUp5,0 -+ }else if(tTmp.txt=="enable") -+ { -+ bUp5.pco=65535 -+ spstr tId.txt,bUp5.txt,"|",0 -+ tsw bUp5,1 -+ } -+ // stop button -+ spstr tId.txt,tTmp.txt,"|",4 -+ if(tTmp.txt=="disable") -+ { -+ bStop5.pco=27501 -+ spstr tId.txt,bStop5.txt,"|",1 -+ tsw bStop5,0 -+ }else if(tTmp.txt=="enable") -+ { -+ bStop5.pco=65535 -+ spstr tId.txt,bStop5.txt,"|",1 -+ tsw bStop5,1 -+ } -+ // down button -+ spstr tId.txt,tTmp.txt,"|",5 -+ if(tTmp.txt=="disable") -+ { -+ bDown5.pco=27501 -+ spstr tId.txt,bDown5.txt,"|",2 -+ tsw bDown5,0 -+ }else if(tTmp.txt=="enable") -+ { -+ bDown5.pco=65535 -+ spstr tId.txt,bDown5.txt,"|",2 -+ tsw bDown5,1 -+ } -+ } -+ if(type5.txt=="light") -+ { -+ vis bUp5,0 -+ vis bStop5,0 -+ vis bDown5,0 -+ vis btOnOff5,1 -+ vis bText5,0 -+ vis hSlider5,0 -+ vis nNum5,0 -+ // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,"~",32 -+ covx tTmp.txt,sys0,0,0 -+ btOnOff5.val=sys0 -+ } -+ if(type5.txt=="switch") -+ { -+ vis bUp5,0 -+ vis bStop5,0 -+ vis bDown5,0 -+ vis btOnOff5,1 -+ vis bText5,0 -+ vis hSlider5,0 -+ vis nNum5,0 -+ // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,"~",32 -+ covx tTmp.txt,sys0,0,0 -+ btOnOff5.val=sys0 -+ } -+ if(type5.txt=="text") -+ { -+ vis bUp5,0 -+ vis bStop5,0 -+ vis bDown5,0 -+ vis btOnOff5,0 -+ vis bText5,1 -+ tsw bText5,0 -+ vis hSlider5,0 -+ vis nNum5,0 -+ bText5.pco=65535 -+ bText5.pco2=65535 -+ // get Text (optional Value) -+ spstr strCommand.txt,bText5.txt,"~",32 -+ } -+ if(type5.txt=="button") -+ { -+ vis bUp5,0 -+ vis bStop5,0 -+ vis bDown5,0 -+ vis btOnOff5,0 -+ vis bText5,1 -+ tsw bText5,1 -+ vis hSlider5,0 -+ vis nNum5,0 -+ bText5.pco=1374 -+ bText5.pco2=1374 -+ // get Text (optional Value) -+ spstr strCommand.txt,bText5.txt,"~",32 -+ } -+ if(type5.txt=="number") -+ { -+ vis bUp5,0 -+ vis bStop5,0 -+ vis bDown5,0 -+ vis btOnOff5,0 -+ vis bText5,0 -+ tsw bText5,0 -+ vis hSlider5,1 -+ vis nNum5,1 -+ // get config (optional Value) (use bText as variable) -+ spstr strCommand.txt,bText5.txt,"~",32 -+ //first value is current value -+ spstr bText5.txt,tTmp.txt,"|",0 -+ covx tTmp.txt,sys0,0,0 -+ hSlider5.val=sys0 -+ nNum5.val=sys0 -+ //second value is min value -+ spstr bText5.txt,tTmp.txt,"|",1 -+ covx tTmp.txt,sys0,0,0 -+ hSlider5.minval=sys0 -+ //third value is max value -+ spstr bText5.txt,tTmp.txt,"|",2 -+ covx tTmp.txt,sys0,0,0 -+ hSlider5.maxval=sys0 -+ } - } - if(tInstruction.txt=="pageType") - { -@@ -1945,18 +2320,6 @@ - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="timeout") - { -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-23 20:12:05.152927620 +0000 -@@ -12,11 +12,6 @@ - - Events - Preinitialize Event -- for(sys0=0;sys0<40;sys0++) -- { -- b[sys0].bco=defaultBcoColor -- b[sys0].pco=defaultFontColor -- } - dim=dimValueNormal - //remove background & activate reparse mode - vis p0,0 -@@ -855,18 +850,6 @@ - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-23 20:12:05.148927555 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-23 20:32:23.907044828 +0000 @@ -12,17 +12,6 @@ Events @@ -620,28 +375,9 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt dim=dimValueNormal vis p0,0 vis tSend,0 -@@ -677,18 +666,6 @@ - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:12:05.148927555 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:32:23.907044828 +0000 @@ -12,21 +12,6 @@ Events @@ -664,28 +400,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt dim=dimValueNormal vis p0,0 vis tSend,0 -@@ -624,18 +609,6 @@ - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:12:05.148927555 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:32:23.907044828 +0000 @@ -12,11 +12,6 @@ Events @@ -698,28 +415,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt dim=dimValueNormal vis p0,0 vis tSend,0 -@@ -1161,18 +1156,6 @@ - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:12:05.148927555 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:32:23.907044828 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -738,28 +436,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 -@@ -277,18 +277,6 @@ - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:12:05.148927555 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:32:23.907044828 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -808,8 +487,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt Picture p0 Attributes diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:12:05.148927555 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:32:23.907044828 +0000 @@ -12,25 +12,6 @@ Events @@ -836,28 +515,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt -@@ -585,18 +566,6 @@ - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:12:05.148927555 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:32:23.467040958 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:32:23.907044828 +0000 @@ -12,11 +12,6 @@ Events @@ -870,70 +530,10 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt dim=dimValueNormal vis p0,0 vis tSend,0 -@@ -320,18 +315,6 @@ - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:12:05.148927555 +0000 -@@ -12,40 +12,6 @@ - - Events - Preinitialize Event -- popupShutter.bco=defaultBcoColor -- b0.bco=defaultBcoColor -- tIcon1.bco=defaultBcoColor -- tEntity.bco=defaultBcoColor -- tInfo1.bco=defaultBcoColor -- tPosHeading.bco=defaultBcoColor -- tTiltHeading.bco=defaultBcoColor -- bUp1.bco=defaultBcoColor -- bStop1.bco=defaultBcoColor -- bDown1.bco=defaultBcoColor -- bTLeft.bco=defaultBcoColor -- bTStop.bco=defaultBcoColor -- bTRight.bco=defaultBcoColor -- b0.pco=defaultFontColor -- tIcon1.pco=defaultFontColor -- tEntity.pco=defaultFontColor -- tInfo1.pco=defaultFontColor -- tPosHeading.pco=defaultFontColor -- tTiltHeading.pco=defaultFontColor -- bUp1.pco=defaultFontColor -- bStop1.pco=defaultFontColor -- bDown1.pco=defaultFontColor -- bTLeft.pco=defaultFontColor -- bTStop.pco=defaultFontColor -- bTRight.pco=defaultFontColor -- if(defaultBcoColor==0) -- { -- hTilt.pic=14 -- hTilt.pic1=13 -- hTilt.pic2=15 -- hPosition.pic=14 -- hPosition.pic1=13 -- hPosition.pic2=15 -- } - dim=dimValueNormal - //get entitiy name - tEntity.txt=pageIcons.tTmp1.txt -@@ -215,7 +181,7 @@ +--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:32:23.907044828 +0000 +@@ -215,7 +215,7 @@ Touch Release Event // event,buttonPress2,internalNameEntity,positionSlider,50 //craft command @@ -942,7 +542,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt covx hPosition.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc -@@ -342,7 +308,7 @@ +@@ -342,7 +342,7 @@ Events Touch Press Event @@ -951,7 +551,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -367,7 +333,7 @@ +@@ -367,7 +367,7 @@ Events Touch Press Event @@ -960,7 +560,7 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -392,7 +358,7 @@ +@@ -392,7 +392,7 @@ Events Touch Press Event @@ -969,101 +569,3 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -549,13 +515,11 @@ - tsw bTLeft,0 - spstr strCommand.txt,bTLeft.txt,"~",13 - bTLeft.pco=27501 -- vis bTLeft,1 - }else if(tTmp.txt=="enable") - { - spstr strCommand.txt,bTLeft.txt,"~",13 - tsw bTLeft,1 - bTLeft.pco=65535 -- vis bTLeft,1 - } - // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",17 -@@ -564,36 +528,24 @@ - tsw bTStop,0 - spstr strCommand.txt,bTStop.txt,"~",14 - bTStop.pco=27501 -- vis bTStop,1 - }else if(tTmp.txt=="enable") - { - spstr strCommand.txt,bTStop.txt,"~",14 - tsw bTStop,1 - bTStop.pco=65535 -- vis bTStop,1 - } - // set icon bDown -- spstr strCommand.txt,tTmp.txt,"~",18 -+ spstr strCommand.txt,tTmp.txt,"~",10 - if(tTmp.txt=="disable") - { - spstr strCommand.txt,bTRight.txt,"~",15 - tsw bTRight,0 - bTRight.pco=27501 -- vis bTRight,1 - }else if(tTmp.txt=="enable") - { - spstr strCommand.txt,bTRight.txt,"~",15 - tsw bTRight,1 - bTRight.pco=65535 -- vis bTRight,1 -- } -- // set tilt slider -- spstr strCommand.txt,tTmp.txt,"~",19 -- if(tTmp.txt!="disable") -- { -- vis hTilt,1 -- covx tTmp.txt,sys0,0,0 -- hTilt.val=sys0 - } - } - if(tInstruction.txt=="dimmode") -@@ -605,18 +557,6 @@ - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="time") - { -diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-06-23 20:12:04.708920422 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-23 20:12:05.148927555 +0000 -@@ -406,22 +406,10 @@ - // get value - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,dimValue,0,0 -+ dim=dimValue - // get value normal - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 -- dim=dimValueNormal -- // get background color -- spstr strCommand.txt,tTmp.txt,"~",3 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultBcoColor,0,0 -- } -- // get font color -- spstr strCommand.txt,tTmp.txt,"~",4 -- if(tTmp.txt!="") -- { -- covx tTmp.txt,defaultFontColor,0,0 -- } - } - if(tInstruction.txt=="time") - { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 8e45896b..95249504 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-06-23 20:12:05.164927814 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:12:05.148927555 +0000 -+@@ -11,9 +11,6 @@ -+- //color vars -+- int defaultFontColor=65535 -+- int defaultBcoColor=6371 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-23 20:32:23.923044969 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-23 20:32:23.467040958 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:32:23.907044828 +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-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:12:05.152927620 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:32:23.471040993 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:32:23.907044828 +0000 +@@ -12,21 +12,6 @@ + + Events @@ -39,27 +39,8 @@ + Max. Text Size : 10 + + Text tIcon -+@@ -755,18 +740,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="timeout") -+ { -+--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:12:05.152927620 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:32:23.471040993 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:32:23.911044863 +0000 +@@ -12,22 +12,6 @@ + + Events @@ -93,63 +74,9 @@ ++ Max. Text Size : 20 +@@ -986,6 +1149,33 @@ +@@ -1091,6 +1281,28 @@ -+@@ -1866,6 +2078,169 @@ -+@@ -1945,18 +2320,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="timeout") -+ { -+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-23 20:12:05.152927620 +0000 -+@@ -12,11 +12,6 @@ -+ -+ Events -+ Preinitialize Event -+- for(sys0=0;sys0<40;sys0++) -+- { -+- b[sys0].bco=defaultBcoColor -+- b[sys0].pco=defaultFontColor -+- } -+ dim=dimValueNormal -+ //remove background & activate reparse mode -+ vis p0,0 -+@@ -855,18 +850,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="timeout") -+ { +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-23 20:12:05.148927555 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:32:23.471040993 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-23 20:32:23.907044828 +0000 +@@ -12,17 +12,6 @@ + + Events @@ -168,27 +95,8 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 -+@@ -677,18 +666,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="timeout") -+ { -+--- HMI/n2t-out/cardQR.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:12:05.148927555 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-06-23 20:32:23.467040958 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:32:23.907044828 +0000 +@@ -12,21 +12,6 @@ + Events + Preinitialize Event @@ -210,28 +118,9 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 -+@@ -624,18 +609,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="timeout") -+ { +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:12:05.148927555 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:32:23.471040993 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:32:23.907044828 +0000 +@@ -12,11 +12,6 @@ + + Events @@ -244,49 +133,11 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 -+@@ -1161,18 +1156,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="timeout") -+ { -+--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:12:05.148927555 +0000 -+@@ -277,18 +277,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="timeout") -+ { ++--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:32:23.467040958 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:32:23.907044828 +0000 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:12:05.148927555 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-06-23 20:32:23.467040958 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:32:23.907044828 +0000 +@@ -13,46 +13,6 @@ + Events + Preinitialize Event @@ -335,8 +186,8 @@ + Picture p0 + Attributes +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:12:05.148927555 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-06-23 20:32:23.467040958 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:32:23.907044828 +0000 +@@ -12,25 +12,6 @@ + + Events @@ -363,28 +214,9 @@ + dim=dimValueNormal + //get entitiy name + tEntity.txt=pageIcons.tTmp1.txt -+@@ -585,18 +566,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="timeout") -+ { +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:12:05.148927555 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:32:23.467040958 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:32:23.907044828 +0000 +@@ -12,11 +12,6 @@ + + Events @@ -397,70 +229,10 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 -+@@ -320,18 +315,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="timeout") -+ { +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:12:05.148927555 +0000 -+@@ -12,40 +12,6 @@ -+ -+ Events -+ Preinitialize Event -+- popupShutter.bco=defaultBcoColor -+- b0.bco=defaultBcoColor -+- tIcon1.bco=defaultBcoColor -+- tEntity.bco=defaultBcoColor -+- tInfo1.bco=defaultBcoColor -+- tPosHeading.bco=defaultBcoColor -+- tTiltHeading.bco=defaultBcoColor -+- bUp1.bco=defaultBcoColor -+- bStop1.bco=defaultBcoColor -+- bDown1.bco=defaultBcoColor -+- bTLeft.bco=defaultBcoColor -+- bTStop.bco=defaultBcoColor -+- bTRight.bco=defaultBcoColor -+- b0.pco=defaultFontColor -+- tIcon1.pco=defaultFontColor -+- tEntity.pco=defaultFontColor -+- tInfo1.pco=defaultFontColor -+- tPosHeading.pco=defaultFontColor -+- tTiltHeading.pco=defaultFontColor -+- bUp1.pco=defaultFontColor -+- bStop1.pco=defaultFontColor -+- bDown1.pco=defaultFontColor -+- bTLeft.pco=defaultFontColor -+- bTStop.pco=defaultFontColor -+- bTRight.pco=defaultFontColor -+- if(defaultBcoColor==0) -+- { -+- hTilt.pic=14 -+- hTilt.pic1=13 -+- hTilt.pic2=15 -+- hPosition.pic=14 -+- hPosition.pic1=13 -+- hPosition.pic2=15 -+- } -+ dim=dimValueNormal -+ //get entitiy name -+ tEntity.txt=pageIcons.tTmp1.txt -+@@ -215,7 +181,7 @@ ++--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:32:23.471040993 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:32:23.907044828 +0000 ++@@ -215,7 +215,7 @@ + Touch Release Event + // event,buttonPress2,internalNameEntity,positionSlider,50 + //craft command @@ -469,7 +241,7 @@ + covx hPosition.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc -+@@ -342,7 +308,7 @@ ++@@ -342,7 +342,7 @@ + + Events + Touch Press Event @@ -478,7 +250,7 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -367,7 +333,7 @@ ++@@ -367,7 +367,7 @@ + + Events + Touch Press Event @@ -487,7 +259,7 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -392,7 +358,7 @@ ++@@ -392,7 +392,7 @@ + + Events + Touch Press Event @@ -496,100 +268,3 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -549,13 +515,11 @@ -+ tsw bTLeft,0 -+ spstr strCommand.txt,bTLeft.txt,"~",13 -+ bTLeft.pco=27501 -+- vis bTLeft,1 -+ }else if(tTmp.txt=="enable") -+ { -+ spstr strCommand.txt,bTLeft.txt,"~",13 -+ tsw bTLeft,1 -+ bTLeft.pco=65535 -+- vis bTLeft,1 -+ } -+ // set icon bStop -+ spstr strCommand.txt,tTmp.txt,"~",17 -+@@ -564,36 +528,24 @@ -+ tsw bTStop,0 -+ spstr strCommand.txt,bTStop.txt,"~",14 -+ bTStop.pco=27501 -+- vis bTStop,1 -+ }else if(tTmp.txt=="enable") -+ { -+ spstr strCommand.txt,bTStop.txt,"~",14 -+ tsw bTStop,1 -+ bTStop.pco=65535 -+- vis bTStop,1 -+ // set icon bDown -+- spstr strCommand.txt,tTmp.txt,"~",18 -++ spstr strCommand.txt,tTmp.txt,"~",10 -+ if(tTmp.txt=="disable") -+ { -+ spstr strCommand.txt,bTRight.txt,"~",15 -+ tsw bTRight,0 -+ bTRight.pco=27501 -+- vis bTRight,1 -+ }else if(tTmp.txt=="enable") -+ { -+ spstr strCommand.txt,bTRight.txt,"~",15 -+ tsw bTRight,1 -+ bTRight.pco=65535 -+- vis bTRight,1 -+- } -+- // set tilt slider -+- spstr strCommand.txt,tTmp.txt,"~",19 -+- if(tTmp.txt!="disable") -+- { -+- vis hTilt,1 -+- covx tTmp.txt,sys0,0,0 -+- hTilt.val=sys0 -+ } -+ } -+ if(tInstruction.txt=="dimmode") -+@@ -605,18 +557,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="time") -+ { -+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-06-23 20:12:04.708920422 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-23 20:12:05.148927555 +0000 -+@@ -406,22 +406,10 @@ -+ // get value -+ spstr strCommand.txt,tTmp.txt,"~",1 -+ covx tTmp.txt,dimValue,0,0 -++ dim=dimValue -+ // get value normal -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+- dim=dimValueNormal -+- // get background color -+- spstr strCommand.txt,tTmp.txt,"~",3 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultBcoColor,0,0 -+- } -+- // get font color -+- spstr strCommand.txt,tTmp.txt,"~",4 -+- if(tTmp.txt!="") -+- { -+- covx tTmp.txt,defaultFontColor,0,0 -+- } -+ } -+ if(tInstruction.txt=="time") -+ { diff --git a/HMI/US/portrait/n2t-out-visual/Program.s.txt b/HMI/US/portrait/n2t-out-visual/Program.s.txt index 63a448ff..9f8fa6dd 100644 --- a/HMI/US/portrait/n2t-out-visual/Program.s.txt +++ b/HMI/US/portrait/n2t-out-visual/Program.s.txt @@ -11,6 +11,9 @@ Program.s // dim value int dimValue=40 int dimValueNormal=100 + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 // fix touch offset (Removed for US version) //lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 0a9d695d..4efb068c 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -1322,6 +1322,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 8785252a..f2816616 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -3243,169 +3243,6 @@ Timer tmSerial covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } - // get Type - spstr strCommand.txt,type5.txt,"~",27 - // get internal name - spstr strCommand.txt,entn5.txt,"~",28 - if(type5.txt=="delete"||type5.txt=="") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,0 - vis tEntity5,0 - vis tIcon5,0 - vis bText5,0 - vis hSlider5,0 - vis nNum5,0 - }else - { - // change icon - spstr strCommand.txt,tIcon5.txt,"~",29 - vis tIcon5,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",30 - covx tTmp.txt,sys0,0,0 - tIcon5.pco=sys0 - // set name - spstr strCommand.txt,tEntity5.txt,"~",31 - vis tEntity5,1 - } - if(type5.txt=="shutter") - { - vis bUp5,1 - vis bStop5,1 - vis bDown5,1 - vis btOnOff5,0 - vis bText5,0 - vis hSlider5,0 - vis nNum5,0 - // get Button State (optional Value) - spstr strCommand.txt,tId.txt,"~",32 - // up button - spstr tId.txt,tTmp.txt,"|",3 - if(tTmp.txt=="disable") - { - bUp5.pco=27501 - spstr tId.txt,bUp5.txt,"|",0 - tsw bUp5,0 - }else if(tTmp.txt=="enable") - { - bUp5.pco=65535 - spstr tId.txt,bUp5.txt,"|",0 - tsw bUp5,1 - } - // stop button - spstr tId.txt,tTmp.txt,"|",4 - if(tTmp.txt=="disable") - { - bStop5.pco=27501 - spstr tId.txt,bStop5.txt,"|",1 - tsw bStop5,0 - }else if(tTmp.txt=="enable") - { - bStop5.pco=65535 - spstr tId.txt,bStop5.txt,"|",1 - tsw bStop5,1 - } - // down button - spstr tId.txt,tTmp.txt,"|",5 - if(tTmp.txt=="disable") - { - bDown5.pco=27501 - spstr tId.txt,bDown5.txt,"|",2 - tsw bDown5,0 - }else if(tTmp.txt=="enable") - { - bDown5.pco=65535 - spstr tId.txt,bDown5.txt,"|",2 - tsw bDown5,1 - } - } - if(type5.txt=="light") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,1 - vis bText5,0 - vis hSlider5,0 - vis nNum5,0 - // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",32 - covx tTmp.txt,sys0,0,0 - btOnOff5.val=sys0 - } - if(type5.txt=="switch") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,1 - vis bText5,0 - vis hSlider5,0 - vis nNum5,0 - // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",32 - covx tTmp.txt,sys0,0,0 - btOnOff5.val=sys0 - } - if(type5.txt=="text") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,0 - vis bText5,1 - tsw bText5,0 - vis hSlider5,0 - vis nNum5,0 - bText5.pco=65535 - bText5.pco2=65535 - // get Text (optional Value) - spstr strCommand.txt,bText5.txt,"~",32 - } - if(type5.txt=="button") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,0 - vis bText5,1 - tsw bText5,1 - vis hSlider5,0 - vis nNum5,0 - bText5.pco=1374 - bText5.pco2=1374 - // get Text (optional Value) - spstr strCommand.txt,bText5.txt,"~",32 - } - if(type5.txt=="number") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,0 - vis bText5,0 - tsw bText5,0 - vis hSlider5,1 - vis nNum5,1 - // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText5.txt,"~",32 - //first value is current value - spstr bText5.txt,tTmp.txt,"|",0 - covx tTmp.txt,sys0,0,0 - hSlider5.val=sys0 - nNum5.val=sys0 - //second value is min value - spstr bText5.txt,tTmp.txt,"|",1 - covx tTmp.txt,sys0,0,0 - hSlider5.minval=sys0 - //third value is max value - spstr bText5.txt,tTmp.txt,"|",2 - covx tTmp.txt,sys0,0,0 - hSlider5.maxval=sys0 - } } if(tInstruction.txt=="pageType") { @@ -3485,6 +3322,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 3e6d47b0..2b4b2e84 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -20,6 +20,11 @@ Page cardGrid Events Preinitialize Event + for(sys0=0;sys0<40;sys0++) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } dim=dimValueNormal //remove background & activate reparse mode vis p0,0 @@ -1314,6 +1319,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 1b973cb5..f1e02539 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -1116,6 +1116,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 909c978e..e913c7f0 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -908,6 +908,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 60be2e98..5e61ba95 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -1874,6 +1874,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { 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 26f0b5fb..c84259eb 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 @@ -1,11 +1,7 @@ Program.s 0 Component(s) - 10 Line(s) of event code - 10 Unique line(s) of event code -popupShutter - 25 Component(s) - 331 Line(s) of event code - 163 Unique line(s) of event code + 12 Line(s) of event code + 12 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -14,49 +10,53 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -cardQR - 32 Component(s) - 374 Line(s) of event code - 218 Unique line(s) of event code -popupLight - 27 Component(s) - 353 Line(s) of event code - 193 Unique line(s) of event code popupNotify 17 Component(s) - 204 Line(s) of event code - 128 Unique line(s) of event code -cardThermo - 53 Component(s) - 555 Line(s) of event code - 292 Unique line(s) of event code -pageStartup - 19 Component(s) - 157 Line(s) of event code - 117 Unique line(s) of event code + 214 Line(s) of event code + 132 Unique line(s) of event code +popupShutter + 25 Component(s) + 388 Line(s) of event code + 207 Unique line(s) of event code cardMedia 34 Component(s) - 363 Line(s) of event code - 195 Unique line(s) of event code -screensaver - 38 Component(s) - 322 Line(s) of event code - 254 Unique line(s) of event code -cardEntities - 77 Component(s) - 1363 Line(s) of event code - 581 Unique line(s) of event code -cardGrid - 42 Component(s) - 439 Line(s) of event code - 259 Unique line(s) of event code + 373 Line(s) of event code + 200 Unique line(s) of event code cardAlarm 40 Component(s) - 392 Line(s) of event code - 239 Unique line(s) of event code + 402 Line(s) of event code + 244 Unique line(s) of event code +cardQR + 32 Component(s) + 384 Line(s) of event code + 223 Unique line(s) of event code +popupLight + 27 Component(s) + 363 Line(s) of event code + 196 Unique line(s) of event code +pageStartup + 19 Component(s) + 167 Line(s) of event code + 122 Unique line(s) of event code +screensaver + 38 Component(s) + 332 Line(s) of event code + 257 Unique line(s) of event code +cardThermo + 53 Component(s) + 565 Line(s) of event code + 296 Unique line(s) of event code +cardGrid + 42 Component(s) + 454 Line(s) of event code + 267 Unique line(s) of event code +cardEntities + 77 Component(s) + 1227 Line(s) of event code + 523 Unique line(s) of event code Total 13 Page(s) 424 Component(s) - 4877 Line(s) of event code - 1308 Unique line(s) of event code + 4895 Line(s) of event code + 1296 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 99d68ec7..41d549af 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -572,6 +572,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index ee115234..a885cbd4 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -912,6 +912,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/popupNotify.txt b/HMI/US/portrait/n2t-out-visual/popupNotify.txt index c7351ab5..aa50b984 100644 --- a/HMI/US/portrait/n2t-out-visual/popupNotify.txt +++ b/HMI/US/portrait/n2t-out-visual/popupNotify.txt @@ -524,6 +524,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index 40c07549..ad3229d9 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -20,6 +20,40 @@ Page popupShutter Events Preinitialize Event + popupShutter.bco=defaultBcoColor + b0.bco=defaultBcoColor + tIcon1.bco=defaultBcoColor + tEntity.bco=defaultBcoColor + tInfo1.bco=defaultBcoColor + tPosHeading.bco=defaultBcoColor + tTiltHeading.bco=defaultBcoColor + bUp1.bco=defaultBcoColor + bStop1.bco=defaultBcoColor + bDown1.bco=defaultBcoColor + bTLeft.bco=defaultBcoColor + bTStop.bco=defaultBcoColor + bTRight.bco=defaultBcoColor + b0.pco=defaultFontColor + tIcon1.pco=defaultFontColor + tEntity.pco=defaultFontColor + tInfo1.pco=defaultFontColor + tPosHeading.pco=defaultFontColor + tTiltHeading.pco=defaultFontColor + bUp1.pco=defaultFontColor + bStop1.pco=defaultFontColor + bDown1.pco=defaultFontColor + bTLeft.pco=defaultFontColor + bTStop.pco=defaultFontColor + bTRight.pco=defaultFontColor + if(defaultBcoColor==0) + { + hTilt.pic=14 + hTilt.pic1=13 + hTilt.pic2=15 + hPosition.pic=14 + hPosition.pic1=13 + hPosition.pic2=15 + } dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt @@ -844,11 +878,13 @@ Timer tmSerial tsw bTLeft,0 spstr strCommand.txt,bTLeft.txt,"~",13 bTLeft.pco=27501 + vis bTLeft,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTLeft.txt,"~",13 tsw bTLeft,1 bTLeft.pco=65535 + vis bTLeft,1 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",17 @@ -857,24 +893,36 @@ Timer tmSerial tsw bTStop,0 spstr strCommand.txt,bTStop.txt,"~",14 bTStop.pco=27501 + vis bTStop,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTStop.txt,"~",14 tsw bTStop,1 bTStop.pco=65535 + vis bTStop,1 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",18 if(tTmp.txt=="disable") { spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,0 bTRight.pco=27501 + vis bTRight,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,1 bTRight.pco=65535 + vis bTRight,1 + } + // set tilt slider + spstr strCommand.txt,tTmp.txt,"~",19 + if(tTmp.txt!="disable") + { + vis hTilt,1 + covx tTmp.txt,sys0,0,0 + hTilt.val=sys0 } } if(tInstruction.txt=="dimmode") @@ -886,6 +934,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index b6645b21..dfbb27f8 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -971,10 +971,22 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue // get value normal spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/Program.s.txt b/HMI/US/portrait/n2t-out/Program.s.txt index 63a448ff..9f8fa6dd 100644 --- a/HMI/US/portrait/n2t-out/Program.s.txt +++ b/HMI/US/portrait/n2t-out/Program.s.txt @@ -11,6 +11,9 @@ Program.s // dim value int dimValue=40 int dimValueNormal=100 + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 // fix touch offset (Removed for US version) //lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 4a8cdb66..137bcbc9 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -740,6 +740,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 980a1a2c..6b38db68 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -2078,169 +2078,6 @@ Timer tmSerial covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } - // get Type - spstr strCommand.txt,type5.txt,"~",27 - // get internal name - spstr strCommand.txt,entn5.txt,"~",28 - if(type5.txt=="delete"||type5.txt=="") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,0 - vis tEntity5,0 - vis tIcon5,0 - vis bText5,0 - vis hSlider5,0 - vis nNum5,0 - }else - { - // change icon - spstr strCommand.txt,tIcon5.txt,"~",29 - vis tIcon5,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",30 - covx tTmp.txt,sys0,0,0 - tIcon5.pco=sys0 - // set name - spstr strCommand.txt,tEntity5.txt,"~",31 - vis tEntity5,1 - } - if(type5.txt=="shutter") - { - vis bUp5,1 - vis bStop5,1 - vis bDown5,1 - vis btOnOff5,0 - vis bText5,0 - vis hSlider5,0 - vis nNum5,0 - // get Button State (optional Value) - spstr strCommand.txt,tId.txt,"~",32 - // up button - spstr tId.txt,tTmp.txt,"|",3 - if(tTmp.txt=="disable") - { - bUp5.pco=27501 - spstr tId.txt,bUp5.txt,"|",0 - tsw bUp5,0 - }else if(tTmp.txt=="enable") - { - bUp5.pco=65535 - spstr tId.txt,bUp5.txt,"|",0 - tsw bUp5,1 - } - // stop button - spstr tId.txt,tTmp.txt,"|",4 - if(tTmp.txt=="disable") - { - bStop5.pco=27501 - spstr tId.txt,bStop5.txt,"|",1 - tsw bStop5,0 - }else if(tTmp.txt=="enable") - { - bStop5.pco=65535 - spstr tId.txt,bStop5.txt,"|",1 - tsw bStop5,1 - } - // down button - spstr tId.txt,tTmp.txt,"|",5 - if(tTmp.txt=="disable") - { - bDown5.pco=27501 - spstr tId.txt,bDown5.txt,"|",2 - tsw bDown5,0 - }else if(tTmp.txt=="enable") - { - bDown5.pco=65535 - spstr tId.txt,bDown5.txt,"|",2 - tsw bDown5,1 - } - } - if(type5.txt=="light") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,1 - vis bText5,0 - vis hSlider5,0 - vis nNum5,0 - // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",32 - covx tTmp.txt,sys0,0,0 - btOnOff5.val=sys0 - } - if(type5.txt=="switch") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,1 - vis bText5,0 - vis hSlider5,0 - vis nNum5,0 - // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",32 - covx tTmp.txt,sys0,0,0 - btOnOff5.val=sys0 - } - if(type5.txt=="text") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,0 - vis bText5,1 - tsw bText5,0 - vis hSlider5,0 - vis nNum5,0 - bText5.pco=65535 - bText5.pco2=65535 - // get Text (optional Value) - spstr strCommand.txt,bText5.txt,"~",32 - } - if(type5.txt=="button") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,0 - vis bText5,1 - tsw bText5,1 - vis hSlider5,0 - vis nNum5,0 - bText5.pco=1374 - bText5.pco2=1374 - // get Text (optional Value) - spstr strCommand.txt,bText5.txt,"~",32 - } - if(type5.txt=="number") - { - vis bUp5,0 - vis bStop5,0 - vis bDown5,0 - vis btOnOff5,0 - vis bText5,0 - tsw bText5,0 - vis hSlider5,1 - vis nNum5,1 - // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText5.txt,"~",32 - //first value is current value - spstr bText5.txt,tTmp.txt,"|",0 - covx tTmp.txt,sys0,0,0 - hSlider5.val=sys0 - nNum5.val=sys0 - //second value is min value - spstr bText5.txt,tTmp.txt,"|",1 - covx tTmp.txt,sys0,0,0 - hSlider5.minval=sys0 - //third value is max value - spstr bText5.txt,tTmp.txt,"|",2 - covx tTmp.txt,sys0,0,0 - hSlider5.maxval=sys0 - } } if(tInstruction.txt=="pageType") { @@ -2320,6 +2157,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 55ceab06..61dfe780 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -12,6 +12,11 @@ Page cardGrid Events Preinitialize Event + for(sys0=0;sys0<40;sys0++) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } dim=dimValueNormal //remove background & activate reparse mode vis p0,0 @@ -850,6 +855,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 78c331ce..259b8425 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -666,6 +666,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 22c20e9a..3dc5d4ca 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -609,6 +609,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 49596016..dc0b63b1 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -1156,6 +1156,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index fa7d1f1c..08a00ddb 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -277,6 +277,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index e0c25405..27367c73 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -566,6 +566,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/popupNotify.txt b/HMI/US/portrait/n2t-out/popupNotify.txt index 68fc143d..d8289067 100644 --- a/HMI/US/portrait/n2t-out/popupNotify.txt +++ b/HMI/US/portrait/n2t-out/popupNotify.txt @@ -315,6 +315,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index f4bf96d5..2220e907 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -12,6 +12,40 @@ Page popupShutter Events Preinitialize Event + popupShutter.bco=defaultBcoColor + b0.bco=defaultBcoColor + tIcon1.bco=defaultBcoColor + tEntity.bco=defaultBcoColor + tInfo1.bco=defaultBcoColor + tPosHeading.bco=defaultBcoColor + tTiltHeading.bco=defaultBcoColor + bUp1.bco=defaultBcoColor + bStop1.bco=defaultBcoColor + bDown1.bco=defaultBcoColor + bTLeft.bco=defaultBcoColor + bTStop.bco=defaultBcoColor + bTRight.bco=defaultBcoColor + b0.pco=defaultFontColor + tIcon1.pco=defaultFontColor + tEntity.pco=defaultFontColor + tInfo1.pco=defaultFontColor + tPosHeading.pco=defaultFontColor + tTiltHeading.pco=defaultFontColor + bUp1.pco=defaultFontColor + bStop1.pco=defaultFontColor + bDown1.pco=defaultFontColor + bTLeft.pco=defaultFontColor + bTStop.pco=defaultFontColor + bTRight.pco=defaultFontColor + if(defaultBcoColor==0) + { + hTilt.pic=14 + hTilt.pic1=13 + hTilt.pic2=15 + hPosition.pic=14 + hPosition.pic1=13 + hPosition.pic2=15 + } dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt @@ -515,11 +549,13 @@ Timer tmSerial tsw bTLeft,0 spstr strCommand.txt,bTLeft.txt,"~",13 bTLeft.pco=27501 + vis bTLeft,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTLeft.txt,"~",13 tsw bTLeft,1 bTLeft.pco=65535 + vis bTLeft,1 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",17 @@ -528,24 +564,36 @@ Timer tmSerial tsw bTStop,0 spstr strCommand.txt,bTStop.txt,"~",14 bTStop.pco=27501 + vis bTStop,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTStop.txt,"~",14 tsw bTStop,1 bTStop.pco=65535 + vis bTStop,1 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",18 if(tTmp.txt=="disable") { spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,0 bTRight.pco=27501 + vis bTRight,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,1 bTRight.pco=65535 + vis bTRight,1 + } + // set tilt slider + spstr strCommand.txt,tTmp.txt,"~",19 + if(tTmp.txt!="disable") + { + vis hTilt,1 + covx tTmp.txt,sys0,0,0 + hTilt.val=sys0 } } if(tInstruction.txt=="dimmode") @@ -557,6 +605,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 73ec7e00..31f53fd5 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -406,10 +406,22 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue // get value normal spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } } if(tInstruction.txt=="time") {