diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 4fa322ec..9a247276 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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-03-31 22:17:43.214551653 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:17:44.138561902 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 22:28:25.894497033 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:28:26.694539183 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt vis arm2,0 vis arm3,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 22:17:43.214551653 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:17:44.138561902 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:28:25.898497244 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:28:26.698539394 +0000 @@ -1125,33 +1125,6 @@ { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 @@ -47,8 +47,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-31 22:17:43.214551653 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:17:44.138561902 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 22:28:25.898497244 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:28:26.698539394 +0000 @@ -12,28 +12,307 @@ Events @@ -408,8 +408,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-31 22:17:43.214551653 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:17:44.138561902 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:28:25.894497033 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:28:26.694539183 +0000 @@ -20,7 +20,7 @@ Attributes Scope : global @@ -420,8 +420,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt Text tIcons Attributes diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-03-31 22:17:43.214551653 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:17:44.138561902 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-31 22:28:25.894497033 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:28:26.694539183 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index b80681f9..6c7ab3a2 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-03-31 22:17:43.214551653 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:17:43.670556711 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-31 22:28:25.894497033 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:28:26.298518319 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 22:17:43.214551653 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:17:43.670556711 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:28:25.898497244 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:28:26.298518319 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -780,339 +780,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-31 22:17:43.218551697 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 22:17:43.670556711 +0000 -@@ -643,53 +643,26 @@ - spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpd") - { -- //heading -- spstr strCommand.txt,tHeading.txt,",",1 -- // navigation icons -- spstr strCommand.txt,tId.txt,",",2 -- spstr tId.txt,tTmp.txt,"|",0 -- if(tTmp.txt=="0") -- { -- vis bPrev,0 -- } -- if(tTmp.txt=="1") -- { -- vis bPrev,1 -- bPrev.txt="" -- } -- if(tTmp.txt=="2") -- { -- vis bPrev,1 -- bPrev.txt="" -- } -- spstr tId.txt,tTmp.txt,"|",1 -- if(tTmp.txt=="0") -- { -- vis bNext,0 -- } -- if(tTmp.txt=="1") -- { -- vis bPrev,1 -- bNext.txt="" -- } - //entity name -- spstr strCommand.txt,entn.txt,",",3 -+ spstr strCommand.txt,entn.txt,",",1 -+ //heading -+ spstr strCommand.txt,tHeading.txt,",",2 - //currentTemp -- spstr strCommand.txt,tTmp.txt,",",4 -+ spstr strCommand.txt,tTmp.txt,",",3 - covx tTmp.txt,xTempCurr.val,0,0 - //dstTemp -- spstr strCommand.txt,tTmp.txt,",",5 -+ spstr strCommand.txt,tTmp.txt,",",4 - covx tTmp.txt,xTempDest.val,0,0 - //status -- spstr strCommand.txt,tStatus.txt,",",6 -+ spstr strCommand.txt,tStatus.txt,",",5 - //minTemp -- spstr strCommand.txt,tTmp.txt,",",7 -+ spstr strCommand.txt,tTmp.txt,",",6 - covx tTmp.txt,xTempMin.val,0,0 - //maxTemp -- spstr strCommand.txt,tTmp.txt,",",8 -+ spstr strCommand.txt,tTmp.txt,",",7 - covx tTmp.txt,xTempMax.val,0,0 - //tempStep -- spstr strCommand.txt,tTmp.txt,",",9 -+ spstr strCommand.txt,tTmp.txt,",",8 - covx tTmp.txt,xTempStep.val,0,0 - // disable all buttons - vis bt0,0 -@@ -702,160 +675,190 @@ - vis bt7,0 - vis bt8,0 - //bt0 -- spstr strCommand.txt,tTmp.txt,",",10 -+ spstr strCommand.txt,tTmp.txt,",",9 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt0.txt,sys0,1 - // set text color on active state -- spstr strCommand.txt,tTmp.txt,",",11 -+ spstr strCommand.txt,tTmp.txt,",",10 - covx tTmp.txt,bt0.pco2,0,0 - // set state -- spstr strCommand.txt,tTmp.txt,",",12 -+ spstr strCommand.txt,tTmp.txt,",",11 - covx tTmp.txt,bt0.val,0,0 - // save action -- spstr strCommand.txt,va0.txt,",",13 -+ spstr strCommand.txt,va0.txt,",",12 - //enable - vis bt0,1 -- } //bt1 -- spstr strCommand.txt,tTmp.txt,",",14 -+ } -+ //bt1 -+ spstr strCommand.txt,tTmp.txt,",",13 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt1.txt,sys0,1 - // set text color on active state -- spstr strCommand.txt,tTmp.txt,",",15 -+ spstr strCommand.txt,tTmp.txt,",",14 - covx tTmp.txt,bt1.pco2,0,0 - // set state -- spstr strCommand.txt,tTmp.txt,",",16 -+ spstr strCommand.txt,tTmp.txt,",",15 - covx tTmp.txt,bt1.val,0,0 - // save action -- spstr strCommand.txt,va1.txt,",",17 -+ spstr strCommand.txt,va1.txt,",",16 - //enable - vis bt1,1 -- } //bt2 -- spstr strCommand.txt,tTmp.txt,",",18 -+ } -+ //bt2 -+ spstr strCommand.txt,tTmp.txt,",",17 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt2.txt,sys0,1 - // set text color on active state -- spstr strCommand.txt,tTmp.txt,",",19 -+ spstr strCommand.txt,tTmp.txt,",",18 - covx tTmp.txt,bt2.pco2,0,0 - // set state -- spstr strCommand.txt,tTmp.txt,",",20 -+ spstr strCommand.txt,tTmp.txt,",",19 - covx tTmp.txt,bt2.val,0,0 - // save action -- spstr strCommand.txt,va2.txt,",",21 -+ spstr strCommand.txt,va2.txt,",",20 - //enable - vis bt2,1 -- } //bt3 -- spstr strCommand.txt,tTmp.txt,",",22 -+ } -+ //bt3 -+ spstr strCommand.txt,tTmp.txt,",",21 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt3.txt,sys0,1 - // set text color on active state -- spstr strCommand.txt,tTmp.txt,",",23 -+ spstr strCommand.txt,tTmp.txt,",",22 - covx tTmp.txt,bt3.pco2,0,0 - // set state -- spstr strCommand.txt,tTmp.txt,",",24 -+ spstr strCommand.txt,tTmp.txt,",",23 - covx tTmp.txt,bt3.val,0,0 - // save action -- spstr strCommand.txt,va3.txt,",",25 -+ spstr strCommand.txt,va3.txt,",",24 - //enable - vis bt3,1 -- } //bt4 -- spstr strCommand.txt,tTmp.txt,",",26 -+ } -+ //bt4 -+ spstr strCommand.txt,tTmp.txt,",",25 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt4.txt,sys0,1 - // set text color on active state -- spstr strCommand.txt,tTmp.txt,",",27 -+ spstr strCommand.txt,tTmp.txt,",",26 - covx tTmp.txt,bt4.pco2,0,0 - // set state -- spstr strCommand.txt,tTmp.txt,",",28 -+ spstr strCommand.txt,tTmp.txt,",",27 - covx tTmp.txt,bt4.val,0,0 - // save action -- spstr strCommand.txt,va4.txt,",",29 -+ spstr strCommand.txt,va4.txt,",",28 - //enable - vis bt4,1 -- } //bt5 -- spstr strCommand.txt,tTmp.txt,",",30 -+ } -+ //bt5 -+ spstr strCommand.txt,tTmp.txt,",",29 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt5.txt,sys0,1 - // set text color on active state -- spstr strCommand.txt,tTmp.txt,",",31 -+ spstr strCommand.txt,tTmp.txt,",",30 - covx tTmp.txt,bt5.pco2,0,0 - // set state -- spstr strCommand.txt,tTmp.txt,",",32 -+ spstr strCommand.txt,tTmp.txt,",",31 - covx tTmp.txt,bt5.val,0,0 - // save action -- spstr strCommand.txt,va5.txt,",",33 -+ spstr strCommand.txt,va5.txt,",",32 - //enable - vis bt5,1 -- } //bt6 -- spstr strCommand.txt,tTmp.txt,",",34 -+ } -+ //bt6 -+ spstr strCommand.txt,tTmp.txt,",",33 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt6.txt,sys0,1 - // set text color on active state -- spstr strCommand.txt,tTmp.txt,",",35 -+ spstr strCommand.txt,tTmp.txt,",",34 - covx tTmp.txt,bt6.pco2,0,0 - // set state -- spstr strCommand.txt,tTmp.txt,",",36 -+ spstr strCommand.txt,tTmp.txt,",",35 - covx tTmp.txt,bt6.val,0,0 - // save action -- spstr strCommand.txt,va6.txt,",",37 -+ spstr strCommand.txt,va6.txt,",",36 - //enable - vis bt6,1 -- } //bt7 -- spstr strCommand.txt,tTmp.txt,",",38 -+ } -+ //bt7 -+ spstr strCommand.txt,tTmp.txt,",",37 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt7.txt,sys0,1 - // set text color on active state -- spstr strCommand.txt,tTmp.txt,",",39 -+ spstr strCommand.txt,tTmp.txt,",",38 - covx tTmp.txt,bt7.pco2,0,0 - // set state -- spstr strCommand.txt,tTmp.txt,",",40 -+ spstr strCommand.txt,tTmp.txt,",",39 - covx tTmp.txt,bt7.val,0,0 - // save action -- spstr strCommand.txt,va7.txt,",",41 -+ spstr strCommand.txt,va7.txt,",",40 - //enable - vis bt7,1 -- } //bt8 -- spstr strCommand.txt,tTmp.txt,",",42 -+ } -+ //bt8 -+ spstr strCommand.txt,tTmp.txt,",",41 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt8.txt,sys0,1 - // set text color on active state -- spstr strCommand.txt,tTmp.txt,",",43 -+ spstr strCommand.txt,tTmp.txt,",",42 - covx tTmp.txt,bt8.pco2,0,0 - // set state -- spstr strCommand.txt,tTmp.txt,",",44 -+ spstr strCommand.txt,tTmp.txt,",",43 - covx tTmp.txt,bt8.val,0,0 - // save action -- spstr strCommand.txt,va8.txt,",",45 -+ spstr strCommand.txt,va8.txt,",",44 - //enable - vis bt8,1 - } - } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 -+ } -+ if(tInstruction.txt=="date") -+ { -+ // get set date to global variable -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 -+ } -+ if(tInstruction.txt=="dimmode") -+ { -+ // get value -+ spstr strCommand.txt,tTmp.txt,",",1 -+ covx tTmp.txt,dimValue,0,0 -+ } -+ if(tInstruction.txt=="timeout") -+ { -+ //set timeout to global var -+ spstr strCommand.txt,tTmp.txt,",",1 -+ covx tTmp.txt,sleepTimeout,0,0 -+ } - if(tInstruction.txt=="pageType") - { - //command format pageType,specialPageName -@@ -911,28 +914,6 @@ - page cardAlarm - } - } -- if(tInstruction.txt=="time") -- { -- // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 -- } -- if(tInstruction.txt=="date") -- { -- // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 -- } -- if(tInstruction.txt=="dimmode") -- { -- // get value -- spstr strCommand.txt,tTmp.txt,",",1 -- covx tTmp.txt,dimValue,0,0 -- } -- if(tInstruction.txt=="timeout") -- { -- //set timeout to global var -- spstr strCommand.txt,tTmp.txt,",",1 -- covx tTmp.txt,sleepTimeout,0,0 -- } - // end of user code - udelete payloadLength-1 - bufferPos=0 diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-31 22:17:43.214551653 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 22:17:43.670556711 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:28:25.894497033 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 22:28:26.298518319 +0000 @@ -20,7 +20,7 @@ Attributes Scope : global @@ -1123,8 +793,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Text tIcons Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-31 22:17:43.214551653 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:17:43.670556711 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 22:28:25.894497033 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:28:26.298518319 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index ec6ea2ea..64e30b28 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -1196,26 +1196,53 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") { - //entity name - spstr strCommand.txt,entn.txt,",",1 //heading - spstr strCommand.txt,tHeading.txt,",",2 + spstr strCommand.txt,tHeading.txt,",",1 + // navigation icons + spstr strCommand.txt,tId.txt,",",2 + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="0") + { + vis bPrev,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bPrev.txt="" + } + if(tTmp.txt=="2") + { + vis bPrev,1 + bPrev.txt="" + } + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="0") + { + vis bNext,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bNext.txt="" + } + //entity name + spstr strCommand.txt,entn.txt,",",3 //currentTemp - spstr strCommand.txt,tTmp.txt,",",3 + spstr strCommand.txt,tTmp.txt,",",4 covx tTmp.txt,xTempCurr.val,0,0 //dstTemp - spstr strCommand.txt,tTmp.txt,",",4 + spstr strCommand.txt,tTmp.txt,",",5 covx tTmp.txt,xTempDest.val,0,0 //status - spstr strCommand.txt,tStatus.txt,",",5 + spstr strCommand.txt,tStatus.txt,",",6 //minTemp - spstr strCommand.txt,tTmp.txt,",",6 + spstr strCommand.txt,tTmp.txt,",",7 covx tTmp.txt,xTempMin.val,0,0 //maxTemp - spstr strCommand.txt,tTmp.txt,",",7 + spstr strCommand.txt,tTmp.txt,",",8 covx tTmp.txt,xTempMax.val,0,0 //tempStep - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,",",9 covx tTmp.txt,xTempStep.val,0,0 // disable all buttons vis bt0,0 @@ -1228,256 +1255,248 @@ Timer tmSerial vis bt7,0 vis bt8,0 //bt0 - spstr strCommand.txt,tTmp.txt,",",9 + spstr strCommand.txt,tTmp.txt,",",10 if(tTmp.txt!="") { // set icon covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bt0.txt,sys0,1 // set text color on active state - spstr strCommand.txt,tTmp.txt,",",10 + spstr strCommand.txt,tTmp.txt,",",11 covx tTmp.txt,bt0.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,",",11 + spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,bt0.val,0,0 // save action - spstr strCommand.txt,va0.txt,",",12 + spstr strCommand.txt,va0.txt,",",13 //enable vis bt0,1 - } - //bt1 - spstr strCommand.txt,tTmp.txt,",",13 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt1.txt,sys0,1 - // set text color on active state + } //bt1 spstr strCommand.txt,tTmp.txt,",",14 - covx tTmp.txt,bt1.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",15 - covx tTmp.txt,bt1.val,0,0 - // save action - spstr strCommand.txt,va1.txt,",",16 - //enable - vis bt1,1 - } - //bt2 - spstr strCommand.txt,tTmp.txt,",",17 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt2.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",18 - covx tTmp.txt,bt2.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",19 - covx tTmp.txt,bt2.val,0,0 - // save action - spstr strCommand.txt,va2.txt,",",20 - //enable - vis bt2,1 - } - //bt3 - spstr strCommand.txt,tTmp.txt,",",21 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt3.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",22 - covx tTmp.txt,bt3.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",23 - covx tTmp.txt,bt3.val,0,0 - // save action - spstr strCommand.txt,va3.txt,",",24 - //enable - vis bt3,1 - } - //bt4 - spstr strCommand.txt,tTmp.txt,",",25 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt4.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",26 - covx tTmp.txt,bt4.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",27 - covx tTmp.txt,bt4.val,0,0 - // save action - spstr strCommand.txt,va4.txt,",",28 - //enable - vis bt4,1 - } - //bt5 - spstr strCommand.txt,tTmp.txt,",",29 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt5.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",30 - covx tTmp.txt,bt5.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",31 - covx tTmp.txt,bt5.val,0,0 - // save action - spstr strCommand.txt,va5.txt,",",32 - //enable - vis bt5,1 - } - //bt6 - spstr strCommand.txt,tTmp.txt,",",33 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt6.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",34 - covx tTmp.txt,bt6.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",35 - covx tTmp.txt,bt6.val,0,0 - // save action - spstr strCommand.txt,va6.txt,",",36 - //enable - vis bt6,1 - } - //bt7 - spstr strCommand.txt,tTmp.txt,",",37 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt7.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",38 - covx tTmp.txt,bt7.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",39 - covx tTmp.txt,bt7.val,0,0 - // save action - spstr strCommand.txt,va7.txt,",",40 - //enable - vis bt7,1 - } - //bt8 - spstr strCommand.txt,tTmp.txt,",",41 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt8.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",42 - covx tTmp.txt,bt8.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",43 - covx tTmp.txt,bt8.val,0,0 - // save action - spstr strCommand.txt,va8.txt,",",44 - //enable - vis bt8,1 - } - } - if(tInstruction.txt=="time") - { - // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value - spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,dimValue,0,0 - } - if(tInstruction.txt=="timeout") - { - //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - if(tInstruction.txt=="pageType") - { - //command format pageType,specialPageName - //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 - //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... - udelete payloadLength-1 - bufferPos=0 - if(tId.txt=="pageStartup") - { - page pageStartup - } - if(tId.txt=="screensaver") - { - page screensaver - } - if(tId.txt=="cardEntities") - { - page cardEntities - } - if(tId.txt=="cardGrid") - { - page cardGrid - } - if(tId.txt=="popupLight") - { - pageIcons.tTmp1.txt=tTmp.txt - page popupLight - } - if(tId.txt=="popupShutter") - { - pageIcons.tTmp1.txt=tTmp.txt - page popupShutter - } - if(tId.txt=="popupNotify") - { - page popupNotify - } - if(tId.txt=="cardThermo") - { - page cardThermo - } - if(tId.txt=="cardMedia") - { - page cardMedia - } - if(tId.txt=="cardAlarm") - { - page cardAlarm - } - } - // end of user code - udelete payloadLength-1 - bufferPos=0 - } - } - } - } - // next character - bufferPos++ - } - } + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt1.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",15 + covx tTmp.txt,bt1.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",16 + covx tTmp.txt,bt1.val,0,0 + // save action + spstr strCommand.txt,va1.txt,",",17 + //enable + vis bt1,1 + } //bt2 + spstr strCommand.txt,tTmp.txt,",",18 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt2.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",19 + covx tTmp.txt,bt2.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",20 + covx tTmp.txt,bt2.val,0,0 + // save action + spstr strCommand.txt,va2.txt,",",21 + //enable + vis bt2,1 + } //bt3 + spstr strCommand.txt,tTmp.txt,",",22 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt3.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",23 + covx tTmp.txt,bt3.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",24 + covx tTmp.txt,bt3.val,0,0 + // save action + spstr strCommand.txt,va3.txt,",",25 + //enable + vis bt3,1 + } //bt4 + spstr strCommand.txt,tTmp.txt,",",26 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt4.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",27 + covx tTmp.txt,bt4.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",28 + covx tTmp.txt,bt4.val,0,0 + // save action + spstr strCommand.txt,va4.txt,",",29 + //enable + vis bt4,1 + } //bt5 + spstr strCommand.txt,tTmp.txt,",",30 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt5.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",31 + covx tTmp.txt,bt5.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",32 + covx tTmp.txt,bt5.val,0,0 + // save action + spstr strCommand.txt,va5.txt,",",33 + //enable + vis bt5,1 + } //bt6 + spstr strCommand.txt,tTmp.txt,",",34 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt6.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",35 + covx tTmp.txt,bt6.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",36 + covx tTmp.txt,bt6.val,0,0 + // save action + spstr strCommand.txt,va6.txt,",",37 + //enable + vis bt6,1 + } //bt7 + spstr strCommand.txt,tTmp.txt,",",38 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt7.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",39 + covx tTmp.txt,bt7.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",40 + covx tTmp.txt,bt7.val,0,0 + // save action + spstr strCommand.txt,va7.txt,",",41 + //enable + vis bt7,1 + } //bt8 + spstr strCommand.txt,tTmp.txt,",",42 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt8.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",43 + covx tTmp.txt,bt8.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",44 + covx tTmp.txt,bt8.val,0,0 + // save action + spstr strCommand.txt,va8.txt,",",45 + //enable + vis bt8,1 + } + } + if(tInstruction.txt=="pageType") + { + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,",",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,",",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardThermo") + { + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia + } + if(tId.txt=="cardAlarm") + { + page cardAlarm + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,",",1 + covx tTmp.txt,dimValue,0,0 + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,",",1 + covx tTmp.txt,sleepTimeout,0,0 + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } Timer tmSleep 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 39d9a2fa..7e8212d2 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 @@ -52,11 +52,11 @@ cardGrid 248 Unique line(s) of event code cardThermo 41 Component(s) - 432 Line(s) of event code - 235 Unique line(s) of event code + 458 Line(s) of event code + 283 Unique line(s) of event code Total 13 Page(s) 379 Component(s) - 4000 Line(s) of event code - 1086 Unique line(s) of event code + 4026 Line(s) of event code + 1169 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index dbdf993a..d3adea0e 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -643,26 +643,53 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") { - //entity name - spstr strCommand.txt,entn.txt,",",1 //heading - spstr strCommand.txt,tHeading.txt,",",2 + spstr strCommand.txt,tHeading.txt,",",1 + // navigation icons + spstr strCommand.txt,tId.txt,",",2 + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="0") + { + vis bPrev,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bPrev.txt="" + } + if(tTmp.txt=="2") + { + vis bPrev,1 + bPrev.txt="" + } + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="0") + { + vis bNext,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bNext.txt="" + } + //entity name + spstr strCommand.txt,entn.txt,",",3 //currentTemp - spstr strCommand.txt,tTmp.txt,",",3 + spstr strCommand.txt,tTmp.txt,",",4 covx tTmp.txt,xTempCurr.val,0,0 //dstTemp - spstr strCommand.txt,tTmp.txt,",",4 + spstr strCommand.txt,tTmp.txt,",",5 covx tTmp.txt,xTempDest.val,0,0 //status - spstr strCommand.txt,tStatus.txt,",",5 + spstr strCommand.txt,tStatus.txt,",",6 //minTemp - spstr strCommand.txt,tTmp.txt,",",6 + spstr strCommand.txt,tTmp.txt,",",7 covx tTmp.txt,xTempMin.val,0,0 //maxTemp - spstr strCommand.txt,tTmp.txt,",",7 + spstr strCommand.txt,tTmp.txt,",",8 covx tTmp.txt,xTempMax.val,0,0 //tempStep - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,",",9 covx tTmp.txt,xTempStep.val,0,0 // disable all buttons vis bt0,0 @@ -675,256 +702,248 @@ Timer tmSerial vis bt7,0 vis bt8,0 //bt0 - spstr strCommand.txt,tTmp.txt,",",9 + spstr strCommand.txt,tTmp.txt,",",10 if(tTmp.txt!="") { // set icon covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bt0.txt,sys0,1 // set text color on active state - spstr strCommand.txt,tTmp.txt,",",10 + spstr strCommand.txt,tTmp.txt,",",11 covx tTmp.txt,bt0.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,",",11 + spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,bt0.val,0,0 // save action - spstr strCommand.txt,va0.txt,",",12 + spstr strCommand.txt,va0.txt,",",13 //enable vis bt0,1 - } - //bt1 - spstr strCommand.txt,tTmp.txt,",",13 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt1.txt,sys0,1 - // set text color on active state + } //bt1 spstr strCommand.txt,tTmp.txt,",",14 - covx tTmp.txt,bt1.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",15 - covx tTmp.txt,bt1.val,0,0 - // save action - spstr strCommand.txt,va1.txt,",",16 - //enable - vis bt1,1 - } - //bt2 - spstr strCommand.txt,tTmp.txt,",",17 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt2.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",18 - covx tTmp.txt,bt2.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",19 - covx tTmp.txt,bt2.val,0,0 - // save action - spstr strCommand.txt,va2.txt,",",20 - //enable - vis bt2,1 - } - //bt3 - spstr strCommand.txt,tTmp.txt,",",21 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt3.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",22 - covx tTmp.txt,bt3.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",23 - covx tTmp.txt,bt3.val,0,0 - // save action - spstr strCommand.txt,va3.txt,",",24 - //enable - vis bt3,1 - } - //bt4 - spstr strCommand.txt,tTmp.txt,",",25 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt4.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",26 - covx tTmp.txt,bt4.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",27 - covx tTmp.txt,bt4.val,0,0 - // save action - spstr strCommand.txt,va4.txt,",",28 - //enable - vis bt4,1 - } - //bt5 - spstr strCommand.txt,tTmp.txt,",",29 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt5.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",30 - covx tTmp.txt,bt5.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",31 - covx tTmp.txt,bt5.val,0,0 - // save action - spstr strCommand.txt,va5.txt,",",32 - //enable - vis bt5,1 - } - //bt6 - spstr strCommand.txt,tTmp.txt,",",33 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt6.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",34 - covx tTmp.txt,bt6.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",35 - covx tTmp.txt,bt6.val,0,0 - // save action - spstr strCommand.txt,va6.txt,",",36 - //enable - vis bt6,1 - } - //bt7 - spstr strCommand.txt,tTmp.txt,",",37 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt7.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",38 - covx tTmp.txt,bt7.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",39 - covx tTmp.txt,bt7.val,0,0 - // save action - spstr strCommand.txt,va7.txt,",",40 - //enable - vis bt7,1 - } - //bt8 - spstr strCommand.txt,tTmp.txt,",",41 - if(tTmp.txt!="") - { - // set icon - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bt8.txt,sys0,1 - // set text color on active state - spstr strCommand.txt,tTmp.txt,",",42 - covx tTmp.txt,bt8.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,",",43 - covx tTmp.txt,bt8.val,0,0 - // save action - spstr strCommand.txt,va8.txt,",",44 - //enable - vis bt8,1 - } - } - if(tInstruction.txt=="time") - { - // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value - spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,dimValue,0,0 - } - if(tInstruction.txt=="timeout") - { - //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - if(tInstruction.txt=="pageType") - { - //command format pageType,specialPageName - //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 - //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... - udelete payloadLength-1 - bufferPos=0 - if(tId.txt=="pageStartup") - { - page pageStartup - } - if(tId.txt=="screensaver") - { - page screensaver - } - if(tId.txt=="cardEntities") - { - page cardEntities - } - if(tId.txt=="cardGrid") - { - page cardGrid - } - if(tId.txt=="popupLight") - { - pageIcons.tTmp1.txt=tTmp.txt - page popupLight - } - if(tId.txt=="popupShutter") - { - pageIcons.tTmp1.txt=tTmp.txt - page popupShutter - } - if(tId.txt=="popupNotify") - { - page popupNotify - } - if(tId.txt=="cardThermo") - { - page cardThermo - } - if(tId.txt=="cardMedia") - { - page cardMedia - } - if(tId.txt=="cardAlarm") - { - page cardAlarm - } - } - // end of user code - udelete payloadLength-1 - bufferPos=0 - } - } - } - } - // next character - bufferPos++ - } - } + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt1.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",15 + covx tTmp.txt,bt1.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",16 + covx tTmp.txt,bt1.val,0,0 + // save action + spstr strCommand.txt,va1.txt,",",17 + //enable + vis bt1,1 + } //bt2 + spstr strCommand.txt,tTmp.txt,",",18 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt2.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",19 + covx tTmp.txt,bt2.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",20 + covx tTmp.txt,bt2.val,0,0 + // save action + spstr strCommand.txt,va2.txt,",",21 + //enable + vis bt2,1 + } //bt3 + spstr strCommand.txt,tTmp.txt,",",22 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt3.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",23 + covx tTmp.txt,bt3.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",24 + covx tTmp.txt,bt3.val,0,0 + // save action + spstr strCommand.txt,va3.txt,",",25 + //enable + vis bt3,1 + } //bt4 + spstr strCommand.txt,tTmp.txt,",",26 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt4.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",27 + covx tTmp.txt,bt4.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",28 + covx tTmp.txt,bt4.val,0,0 + // save action + spstr strCommand.txt,va4.txt,",",29 + //enable + vis bt4,1 + } //bt5 + spstr strCommand.txt,tTmp.txt,",",30 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt5.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",31 + covx tTmp.txt,bt5.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",32 + covx tTmp.txt,bt5.val,0,0 + // save action + spstr strCommand.txt,va5.txt,",",33 + //enable + vis bt5,1 + } //bt6 + spstr strCommand.txt,tTmp.txt,",",34 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt6.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",35 + covx tTmp.txt,bt6.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",36 + covx tTmp.txt,bt6.val,0,0 + // save action + spstr strCommand.txt,va6.txt,",",37 + //enable + vis bt6,1 + } //bt7 + spstr strCommand.txt,tTmp.txt,",",38 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt7.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",39 + covx tTmp.txt,bt7.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",40 + covx tTmp.txt,bt7.val,0,0 + // save action + spstr strCommand.txt,va7.txt,",",41 + //enable + vis bt7,1 + } //bt8 + spstr strCommand.txt,tTmp.txt,",",42 + if(tTmp.txt!="") + { + // set icon + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bt8.txt,sys0,1 + // set text color on active state + spstr strCommand.txt,tTmp.txt,",",43 + covx tTmp.txt,bt8.pco2,0,0 + // set state + spstr strCommand.txt,tTmp.txt,",",44 + covx tTmp.txt,bt8.val,0,0 + // save action + spstr strCommand.txt,va8.txt,",",45 + //enable + vis bt8,1 + } + } + if(tInstruction.txt=="pageType") + { + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,",",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,",",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardThermo") + { + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia + } + if(tId.txt=="cardAlarm") + { + page cardAlarm + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,",",1 + covx tTmp.txt,dimValue,0,0 + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,",",1 + covx tTmp.txt,sleepTimeout,0,0 + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } Timer tmSleep Attributes