diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 94bb8dd2..28fc3d5d 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-04-05 21:14:09.784439783 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-05 21:14:10.888441480 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-06 21:34:50.751296428 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-06 21:34:51.675351557 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-05 21:14:10.888441480 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-06 21:34:50.751296428 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-06 21:34:51.675351557 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3d2b102f..6d364417 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-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-05 21:14:10.308440588 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-06 21:34:50.751296428 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-06 21:34:51.215324112 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-05 21:14:10.312440595 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-06 21:34:50.751296428 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-06 21:34:51.215324112 +0000 @@ -113,7 +113,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -22,20 +22,9 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Max. Text Size : 10 Text tIcon -@@ -579,7 +579,9 @@ - //id arm4 - spstr strCommand.txt,va4.txt,"~",10 - //icon -- spstr strCommand.txt,tIcon.txt,"~",11 -+ spstr strCommand.txt,tTmp.txt,"~",11 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 - //icon color - spstr strCommand.txt,tTmp.txt,"~",12 - covx tTmp.txt,sys0,0,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-05 21:14:10.312440595 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-06 21:34:50.751296428 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-06 21:34:51.215324112 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -548,51 +537,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Timer tmSerial Attributes Scope : local -@@ -1172,7 +1628,9 @@ - }else - { - // change icon -- spstr strCommand.txt,tIcon1.txt,"~",5 -+ spstr strCommand.txt,tTmp.txt,"~",5 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 - vis tIcon1,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",6 -@@ -1294,7 +1752,9 @@ - }else - { - // change icon -- spstr strCommand.txt,tIcon2.txt,"~",11 -+ spstr strCommand.txt,tTmp.txt,"~",11 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1 - vis tIcon2,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",12 -@@ -1416,7 +1876,9 @@ - }else - { - // change icon -- spstr strCommand.txt,tIcon3.txt,"~",17 -+ spstr strCommand.txt,tTmp.txt,"~",17 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1 - vis tIcon3,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",18 -@@ -1538,7 +2000,9 @@ - }else - { - // change icon -- spstr strCommand.txt,tIcon4.txt,"~",23 -+ spstr strCommand.txt,tTmp.txt,"~",23 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1 - vis tIcon4,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",24 -@@ -1642,6 +2106,254 @@ +@@ -1642,6 +2098,250 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -614,9 +559,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + }else + { + // change icon -+ spstr strCommand.txt,tTmp.txt,"~",29 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1 ++ spstr strCommand.txt,tIcon5.txt,"~",29 + vis tIcon5,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",30 @@ -738,9 +681,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + }else + { + // change icon -+ spstr strCommand.txt,tTmp.txt,"~",35 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1 ++ spstr strCommand.txt,tIcon6.txt,"~",35 + vis tIcon6,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",36 @@ -847,294 +788,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-05 21:14:10.312440595 +0000 -@@ -613,7 +613,9 @@ - }else - { - // change icon -- spstr strCommand.txt,bEntity1.txt,"~",5 -+ spstr strCommand.txt,tTmp.txt,"~",5 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1 - vis bEntity1,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",6 -@@ -634,7 +636,9 @@ - }else - { - // change icon -- spstr strCommand.txt,bEntity2.txt,"~",11 -+ spstr strCommand.txt,tTmp.txt,"~",11 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1 - vis bEntity2,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",12 -@@ -655,7 +659,9 @@ - }else - { - // change icon -- spstr strCommand.txt,bEntity3.txt,"~",17 -+ spstr strCommand.txt,tTmp.txt,"~",17 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1 - vis bEntity3,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",18 -@@ -676,7 +682,9 @@ - }else - { - // change icon -- spstr strCommand.txt,bEntity4.txt,"~",23 -+ spstr strCommand.txt,tTmp.txt,"~",23 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1 - vis bEntity4,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",24 -@@ -697,7 +705,9 @@ - }else - { - // change icon -- spstr strCommand.txt,bEntity5.txt,"~",29 -+ spstr strCommand.txt,tTmp.txt,"~",29 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1 - vis bEntity5,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",30 -@@ -718,7 +728,9 @@ - }else - { - // change icon -- spstr strCommand.txt,bEntity6.txt,"~",35 -+ spstr strCommand.txt,tTmp.txt,"~",35 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1 - vis bEntity6,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",36 -diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-05 21:14:10.312440595 +0000 -@@ -540,7 +540,9 @@ - //entity name - spstr strCommand.txt,entn.txt,"~",3 - //icon -- spstr strCommand.txt,tIcon.txt,"~",4 -+ spstr strCommand.txt,tTmp.txt,"~",4 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 - //title - spstr strCommand.txt,tTitle.txt,"~",5 - //author -@@ -550,7 +552,9 @@ - covx tTmp.txt,sys0,0,0 - hVolume.val=sys0 - //icon -- spstr strCommand.txt,tPlayPause.txt,"~",8 -+ spstr strCommand.txt,tTmp.txt,"~",8 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 - //speaker current - spstr strCommand.txt,tSpeaker.txt,"~",9 - if(tSpeaker.txt!="") -diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-05 21:14:10.312440595 +0000 -@@ -704,9 +704,12 @@ - vis bt7,0 - vis bt8,0 - //bt0 -- spstr strCommand.txt,bt0.txt,"~",10 -- if(bt0.txt!="") -+ 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,"~",11 - covx tTmp.txt,bt0.pco2,0,0 -@@ -717,11 +720,13 @@ - spstr strCommand.txt,va0.txt,"~",13 - //enable - vis bt0,1 -- } -- //bt1 -- spstr strCommand.txt,bt1.txt,"~",14 -- if(bt1.txt!="") -- { -+ } //bt1 -+ spstr strCommand.txt,tTmp.txt,"~",14 -+ 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 -@@ -732,11 +737,13 @@ - spstr strCommand.txt,va1.txt,"~",17 - //enable - vis bt1,1 -- } -- //bt2 -- spstr strCommand.txt,bt2.txt,"~",18 -- if(bt2.txt!="") -- { -+ } //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 -@@ -747,11 +754,13 @@ - spstr strCommand.txt,va2.txt,"~",21 - //enable - vis bt2,1 -- } -- //bt3 -- spstr strCommand.txt,bt3.txt,"~",22 -- if(bt3.txt!="") -- { -+ } //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 -@@ -762,11 +771,13 @@ - spstr strCommand.txt,va3.txt,"~",25 - //enable - vis bt3,1 -- } -- //bt4 -- spstr strCommand.txt,bt4.txt,"~",26 -- if(bt4.txt!="") -- { -+ } //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 -@@ -777,11 +788,13 @@ - spstr strCommand.txt,va4.txt,"~",29 - //enable - vis bt4,1 -- } -- //bt5 -- spstr strCommand.txt,bt5.txt,"~",30 -- if(bt5.txt!="") -- { -+ } //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 -@@ -792,11 +805,13 @@ - spstr strCommand.txt,va5.txt,"~",33 - //enable - vis bt5,1 -- } -- //bt6 -- spstr strCommand.txt,bt6.txt,"~",34 -- if(bt6.txt!="") -- { -+ } //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 -@@ -807,11 +822,13 @@ - spstr strCommand.txt,va6.txt,"~",37 - //enable - vis bt6,1 -- } -- //bt7 -- spstr strCommand.txt,bt7.txt,"~",38 -- if(bt7.txt!="") -- { -+ } //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 -@@ -822,11 +839,13 @@ - spstr strCommand.txt,va7.txt,"~",41 - //enable - vis bt7,1 -- } -- //bt8 -- spstr strCommand.txt,bt8.txt,"~",42 -- if(bt8.txt!="") -- { -+ } //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 -diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-05 21:14:10.308440588 +0000 -@@ -22,6 +22,16 @@ - Text : - Max. Text Size: 35 - -+Text tIcons -+ Attributes -+ Scope : global -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text :  -+ Max. Text Size : 185 -+ - Text tTmp1 - Attributes - Scope : global -Only in HMI/US/portrait/n2t-out: pageSerialTest.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-05 21:14:10.308440588 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-06 21:34:50.751296428 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-06 21:34:51.215324112 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1144,15 +800,6 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt Max. Text Size : 100 Text tVersion -@@ -152,7 +152,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : 30 -+ Text : 29 - Max. Text Size : 10 - - Picture p0 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -1162,65 +809,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-04-05 21:14:10.312440595 +0000 -@@ -35,6 +35,20 @@ - Touch Press Event - page cardEntities - -+Button b1 -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : serial -+ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event -+ page pageSerialTest -+ - Button b3 - Attributes - Scope : local -@@ -162,17 +176,3 @@ - Touch Press Event - page cardGrid - --Button b1 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- State : unpressed -- Text : bauds=115200 -- Max. Text Size : 20 -- -- Events -- Touch Press Event -- bauds=115200 -- -diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-05 21:14:10.312440595 +0000 -@@ -442,7 +442,9 @@ - if(tInstruction.txt=="entityUpdateDetail") - { - // change icon -- spstr strCommand.txt,tIcon1.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,"~",1 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 - vis tIcon1,1 - // change icon color - spstr strCommand.txt,tTmp.txt,"~",2 diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-05 21:14:09.784439783 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-05 21:14:10.312440595 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-06 21:34:50.751296428 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-06 21:34:51.215324112 +0000 @@ -48,6 +48,26 @@ Scope: local Value: 0 @@ -1275,62 +866,3 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt Picture p0 Attributes Scope : local -@@ -400,7 +400,9 @@ - vis tMRIcon,0 - vis tMR,0 - //tMainIcon -- spstr strCommand.txt,tMainIcon.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,"~",1 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 - tMainIconAlt.txt=tMainIcon.txt - //tMainText - spstr strCommand.txt,tMainText.txt,"~",2 -@@ -408,31 +410,41 @@ - //tForecast1 - spstr strCommand.txt,tForecast1.txt,"~",3 - //tF1Icon -- spstr strCommand.txt,tF1Icon.txt,"~",4 -+ spstr strCommand.txt,tTmp.txt,"~",4 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1 - //tForecast1Val - spstr strCommand.txt,tForecast1Val.txt,"~",5 - //tForecast2 - spstr strCommand.txt,tForecast2.txt,"~",6 - //tF2Icon -- spstr strCommand.txt,tF2Icon.txt,"~",7 -+ spstr strCommand.txt,tTmp.txt,"~",7 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1 - //tForecast2Val - spstr strCommand.txt,tForecast2Val.txt,"~",8 - //tForecast3 - spstr strCommand.txt,tForecast3.txt,"~",9 - //tF3Icon -- spstr strCommand.txt,tF3Icon.txt,"~",10 -+ spstr strCommand.txt,tTmp.txt,"~",10 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1 - //tForecast3Val - spstr strCommand.txt,tForecast3Val.txt,"~",11 - //tForecast4 - spstr strCommand.txt,tForecast4.txt,"~",12 - //tF4Icon -- spstr strCommand.txt,tF4Icon.txt,"~",13 -+ spstr strCommand.txt,tTmp.txt,"~",13 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 - //tForecast4Val - spstr strCommand.txt,tForecast4Val.txt,"~",14 - //alternative layout - //tMRIcon -- spstr strCommand.txt,tMRIcon.txt,"~",15 -- if(tMRIcon.txt!="") -+ spstr strCommand.txt,tTmp.txt,"~",15 -+ covx tTmp.txt,sys0,0,0 -+ substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 -+ if(tTmp.txt!="") - { - //value for tMRIcon, activate alternative layout - vis tMainIcon,0 diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 697fe099..2a6914fb 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -229,7 +229,7 @@ Text tIcon Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 3 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : center @@ -275,7 +275,7 @@ Button bNext Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 3 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -322,7 +322,7 @@ Button bPrev Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 3 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -1109,9 +1109,7 @@ Timer tmSerial //id arm4 spstr strCommand.txt,va4.txt,"~",10 //icon - spstr strCommand.txt,tTmp.txt,"~",11 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 + spstr strCommand.txt,tIcon.txt,"~",11 //icon color spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 440a8e06..e71029de 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -371,7 +371,7 @@ Text tHeading Send Component ID : disabled Opacity : 127 x coordinate : 60 - y coordinate : 24 + y coordinate : 22 Width : 200 Height : 30 Effect : load @@ -380,7 +380,7 @@ Text tHeading Fill : solid color Style : flat Associated Keyboard : none - Font ID : 1 + Font ID : 2 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : center @@ -1728,7 +1728,7 @@ Button bPrev Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 3 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -1782,7 +1782,7 @@ Button bNext Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 3 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -2959,9 +2959,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 + spstr strCommand.txt,tIcon1.txt,"~",5 vis tIcon1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",6 @@ -3083,9 +3081,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",11 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1 + spstr strCommand.txt,tIcon2.txt,"~",11 vis tIcon2,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",12 @@ -3207,9 +3203,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",17 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1 + spstr strCommand.txt,tIcon3.txt,"~",17 vis tIcon3,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",18 @@ -3331,9 +3325,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",23 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1 + spstr strCommand.txt,tIcon4.txt,"~",23 vis tIcon4,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",24 @@ -3455,9 +3447,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",29 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1 + spstr strCommand.txt,tIcon5.txt,"~",29 vis tIcon5,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",30 @@ -3579,9 +3569,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",35 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1 + spstr strCommand.txt,tIcon6.txt,"~",35 vis tIcon6,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",36 diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 66cc2249..45491375 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -498,7 +498,7 @@ Button bPrev Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 3 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -552,7 +552,7 @@ Button bNext Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 3 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -599,7 +599,7 @@ Button bEntity1 Effect Time : 300 Fill : solid color Style : flat - Font ID : 3 + Font ID : 4 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -657,7 +657,7 @@ Button bEntity2 Effect Time : 300 Fill : solid color Style : flat - Font ID : 3 + Font ID : 4 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -715,7 +715,7 @@ Button bEntity3 Effect Time : 300 Fill : solid color Style : flat - Font ID : 3 + Font ID : 4 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -773,7 +773,7 @@ Button bEntity4 Effect Time : 300 Fill : solid color Style : flat - Font ID : 3 + Font ID : 4 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -831,7 +831,7 @@ Button bEntity5 Effect Time : 300 Fill : solid color Style : flat - Font ID : 3 + Font ID : 4 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -889,7 +889,7 @@ Button bEntity6 Effect Time : 300 Fill : solid color Style : flat - Font ID : 3 + Font ID : 4 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -1050,9 +1050,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1 + spstr strCommand.txt,bEntity1.txt,"~",5 vis bEntity1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",6 @@ -1073,9 +1071,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",11 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1 + spstr strCommand.txt,bEntity2.txt,"~",11 vis bEntity2,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",12 @@ -1096,9 +1092,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",17 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1 + spstr strCommand.txt,bEntity3.txt,"~",17 vis bEntity3,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",18 @@ -1119,9 +1113,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",23 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1 + spstr strCommand.txt,bEntity4.txt,"~",23 vis bEntity4,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",24 @@ -1142,9 +1134,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",29 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1 + spstr strCommand.txt,bEntity5.txt,"~",29 vis bEntity5,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",30 @@ -1165,9 +1155,7 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",35 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1 + spstr strCommand.txt,bEntity6.txt,"~",35 vis bEntity6,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",36 diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 0b11010e..b0461454 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -283,7 +283,7 @@ Text t2 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 3 Back. Color : 6371 Font Color : 50712 Horizontal Alignment : center @@ -332,7 +332,7 @@ Text tPlayPause Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 3 Back. Color : 6371 Font Color : 50712 Horizontal Alignment : center @@ -381,7 +381,7 @@ Text t0 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 3 Back. Color : 6371 Font Color : 50712 Horizontal Alignment : center @@ -430,7 +430,7 @@ Text tIcon Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 3 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : center @@ -460,7 +460,7 @@ Text t1 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 3 Back. Color : 6371 Font Color : 50712 Horizontal Alignment : center @@ -510,7 +510,7 @@ Text t3 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 3 Back. Color : 6371 Font Color : 50712 Horizontal Alignment : center @@ -560,7 +560,7 @@ Text t4 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 3 Back. Color : 6371 Font Color : 50712 Horizontal Alignment : center @@ -639,7 +639,7 @@ Text t6 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 3 Back. Color : 6371 Font Color : 50712 Horizontal Alignment : center @@ -681,7 +681,7 @@ Text t5 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 3 Back. Color : 6371 Font Color : 50712 Horizontal Alignment : center @@ -792,7 +792,7 @@ Button bNext Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 3 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -839,7 +839,7 @@ Button bPrev Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 3 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -962,9 +962,7 @@ Timer tmSerial //entity name spstr strCommand.txt,entn.txt,"~",3 //icon - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 + spstr strCommand.txt,tIcon.txt,"~",4 //title spstr strCommand.txt,tTitle.txt,"~",5 //author @@ -974,9 +972,7 @@ Timer tmSerial covx tTmp.txt,sys0,0,0 hVolume.val=sys0 //icon - spstr strCommand.txt,tTmp.txt,"~",8 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 + spstr strCommand.txt,tPlayPause.txt,"~",8 //speaker current spstr strCommand.txt,tSpeaker.txt,"~",9 if(tSpeaker.txt!="") diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 38305cd8..a6395a2c 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -135,7 +135,7 @@ XFloat xTempCurr Fill : solid color Style : flat Associated Keyboard : none - Font ID : 3 + Font ID : 4 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : center @@ -511,7 +511,7 @@ Button bNext Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 3 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -666,7 +666,7 @@ Button bPrev Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 3 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -1257,12 +1257,9 @@ Timer tmSerial vis bt7,0 vis bt8,0 //bt0 - spstr strCommand.txt,tTmp.txt,"~",10 - if(tTmp.txt!="") + spstr strCommand.txt,bt0.txt,"~",10 + if(bt0.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 covx tTmp.txt,bt0.pco2,0,0 @@ -1273,232 +1270,216 @@ Timer tmSerial spstr strCommand.txt,va0.txt,"~",13 //enable vis bt0,1 - } //bt1 - spstr strCommand.txt,tTmp.txt,"~",14 - 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++ - } - } + } + //bt1 + spstr strCommand.txt,bt1.txt,"~",14 + if(bt1.txt!="") + { + // 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,bt2.txt,"~",18 + if(bt2.txt!="") + { + // 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,bt3.txt,"~",22 + if(bt3.txt!="") + { + // 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,bt4.txt,"~",26 + if(bt4.txt!="") + { + // 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,bt5.txt,"~",30 + if(bt5.txt!="") + { + // 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,bt6.txt,"~",34 + if(bt6.txt!="") + { + // 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,bt7.txt,"~",38 + if(bt7.txt!="") + { + // 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,bt8.txt,"~",42 + if(bt8.txt!="") + { + // 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 205f8f4e..37962e34 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 @@ -2,61 +2,57 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code -pageSerialTest +pageTest 13 Component(s) - 48 Line(s) of event code - 43 Unique line(s) of event code + 13 Line(s) of event code + 13 Unique line(s) of event code pageIcons - 7 Component(s) + 6 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code -popupNotify - 17 Component(s) - 178 Line(s) of event code - 117 Unique line(s) of event code -pageTest - 13 Component(s) - 13 Line(s) of event code - 13 Unique line(s) of event code -popupLight - 27 Component(s) - 322 Line(s) of event code - 173 Unique line(s) of event code +cardGrid + 39 Component(s) + 418 Line(s) of event code + 243 Unique line(s) of event code screensaver 33 Component(s) - 207 Line(s) of event code - 158 Unique line(s) of event code + 195 Line(s) of event code + 152 Unique line(s) of event code +cardThermo + 41 Component(s) + 442 Line(s) of event code + 246 Unique line(s) of event code cardMedia 30 Component(s) - 333 Line(s) of event code - 170 Unique line(s) of event code + 329 Line(s) of event code + 168 Unique line(s) of event code +cardAlarm + 35 Component(s) + 343 Line(s) of event code + 213 Unique line(s) of event code +cardEntities + 86 Component(s) + 1350 Line(s) of event code + 547 Unique line(s) of event code popupShutter 19 Component(s) 178 Line(s) of event code 101 Unique line(s) of event code -cardAlarm - 35 Component(s) - 345 Line(s) of event code - 214 Unique line(s) of event code -cardGrid - 39 Component(s) - 430 Line(s) of event code - 249 Unique line(s) of event code -cardThermo - 41 Component(s) - 460 Line(s) of event code - 284 Unique line(s) of event code -cardEntities - 86 Component(s) - 1362 Line(s) of event code - 553 Unique line(s) of event code +popupNotify + 17 Component(s) + 178 Line(s) of event code + 117 Unique line(s) of event code +popupLight + 27 Component(s) + 320 Line(s) of event code + 173 Unique line(s) of event code Total - 13 Page(s) - 379 Component(s) - 4036 Line(s) of event code - 1153 Unique line(s) of event code + 12 Page(s) + 365 Component(s) + 3926 Line(s) of event code + 1059 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageIcons.txt b/HMI/US/portrait/n2t-out-visual/pageIcons.txt index fb302ac7..90aaf938 100644 --- a/HMI/US/portrait/n2t-out-visual/pageIcons.txt +++ b/HMI/US/portrait/n2t-out-visual/pageIcons.txt @@ -20,51 +20,21 @@ Page pageIcons Variable (string) vaTime Attributes - ID : 5 + ID : 4 Scope : global Text : Max. Text Size: 15 Variable (string) vaDate Attributes - ID : 6 + ID : 5 Scope : global Text : Max. Text Size: 35 -Text tIcons - Attributes - ID : 2 - Scope : global - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 15 - y coordinate : 161 - Width : 295 - Height : 285 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : left - Vertical Alignment : top - Input Type : character - Text :  - Max. Text Size : 185 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp1 Attributes - ID : 3 + ID : 2 Scope : global Dragging : 0 Disable release event after dragging: 0 @@ -94,7 +64,7 @@ Text tTmp1 Text tTmp2 Attributes - ID : 4 + ID : 3 Scope : global Dragging : 0 Disable release event after dragging: 0 diff --git a/HMI/US/portrait/n2t-out-visual/pageSerialTest.txt b/HMI/US/portrait/n2t-out-visual/pageSerialTest.txt deleted file mode 100644 index ac813664..00000000 --- a/HMI/US/portrait/n2t-out-visual/pageSerialTest.txt +++ /dev/null @@ -1,434 +0,0 @@ -Page pageSerialTest - Attributes - ID : 0 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - Width : 320 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled - Fill : solid color - Back. Color : 65535 - - Events - Preinitialize Event - //vis p0,0 - //recmod=1 - //bauds=115200 - -Number nCrcRecv - Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 5 - y coordinate : 205 - Width : 88 - Height : 29 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 4 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits shown : all - Format : decimal with digit grouping - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Number nCrcCalc - Attributes - ID : 6 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 4 - y coordinate : 236 - Width : 90 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 4 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits shown : all - Format : decimal with digit grouping - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Number nIt - Attributes - ID : 11 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 181 - y coordinate : 168 - Width : 52 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 4 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits shown : all - Format : decimal - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Number nLength - Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 181 - y coordinate : 78 - Width : 100 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits shown : all - Format : decimal - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tStatus - Attributes - ID : 3 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 5 - y coordinate : 267 - Width : 271 - Height : 90 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 4 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tCmd - Attributes - ID : 4 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 5 - y coordinate : 358 - Width : 272 - Height : 80 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 4 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 500 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tBuffer - Attributes - ID : 7 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 5 - y coordinate : 443 - Width : 310 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 4 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tDesc - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 159 - Height : 204 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 4 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand - Max. Text Size : 60 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Picture p0 - Attributes - ID : 1 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 319 - Height : 479 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Picture ID : 0 - -Button b0 - Attributes - ID : 9 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 181 - y coordinate : 9 - Width : 46 - Height : 46 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : 3D auto - Font ID : 4 - Back. Color : 50712 - Back. Picture ID (Pressed) : 0 - Back. Color (Pressed) : 1024 - Font Color (Unpressed) : 0 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : bck - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - recmod=0 - page pageTest - -Button b1 - Attributes - ID : 10 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 249 - y coordinate : 9 - Width : 48 - Height : 48 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : 3D auto - Font ID : 4 - Back. Color : 50712 - Back. Picture ID (Pressed) : 0 - Back. Color (Pressed) : 1024 - Font Color (Unpressed) : 0 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : ON - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - recmod=1 - bauds=115200 - -Timer tmSerial - Attributes - ID : 2 - Scope : local - Period (ms): 400 - Enabled : yes - - Events - Timer Event - // data available - if(usize>1) - { - bufferPos=0 - while(bufferPos1) - { - bufferPos=0 - while(bufferPos