diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index a804a446..118c179c 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-03 16:02:24.464717607 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 16:02:25.284722859 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-04 19:03:59.253171959 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-04 19:04:00.029180759 +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-03 16:02:24.464717607 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 16:02:25.288722884 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-04 19:03:59.253171959 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-04 19:04:00.029180759 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 4fe6baa0..7956b6d4 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -199,13 +199,13 @@ Text tCode Fill : solid color Style : flat Associated Keyboard : none - Font ID : 0 + Font ID : 2 Back. Color : 10565 Font Color : 40179 Horizontal Alignment : center Vertical Alignment : center Input Type : password - Text : + Text : 3333 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -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 @@ -378,7 +378,7 @@ Button b0 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -416,7 +416,7 @@ Button b1 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -454,7 +454,7 @@ Button b2 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -492,7 +492,7 @@ Button b3 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -530,7 +530,7 @@ Button b4 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -568,7 +568,7 @@ Button b5 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -606,7 +606,7 @@ Button b6 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -644,7 +644,7 @@ Button b7 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -682,7 +682,7 @@ Button b8 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -720,7 +720,7 @@ Button b9 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -758,7 +758,7 @@ Button b10 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 2 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/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 09d9531f..d40c4c5b 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -272,7 +272,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 @@ -1414,7 +1414,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 @@ -1468,7 +1468,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 @@ -2117,9 +2117,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 @@ -2241,9 +2239,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 @@ -2365,9 +2361,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 @@ -2489,9 +2483,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 diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 53b14852..f0054d20 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -152,7 +152,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 @@ -232,7 +232,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 439 + x coordinate : 415 y coordinate : 290 Width : 34 Height : 30 @@ -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 @@ -1011,7 +1011,7 @@ Timer tmSerial if(tInstruction.txt=="entityUpd") { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 - spstr strCommand.txt,tHeading.txt,"~",1 + spstr strCommand.txt,tHeading.txt,",",1 // navigation icons spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 @@ -1040,9 +1040,9 @@ Timer tmSerial bNext.txt="" } // get Type - spstr strCommand.txt,type1.txt,"~",3 + spstr strCommand.txt,type1.txt,",",3 // get internal name - spstr strCommand.txt,entn1.txt,"~",4 + spstr strCommand.txt,entn1.txt,",",4 if(type1.txt=="delete"||type1.txt=="") { vis tEntity1,0 @@ -1050,22 +1050,20 @@ 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 + spstr strCommand.txt,tTmp.txt,",",6 covx tTmp.txt,sys0,0,0 bEntity1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",7 + spstr strCommand.txt,tEntity1.txt,",",7 vis tEntity1,1 } // get Type - spstr strCommand.txt,type2.txt,"~",9 + spstr strCommand.txt,type2.txt,",",9 // get internal name - spstr strCommand.txt,entn2.txt,"~",10 + spstr strCommand.txt,entn2.txt,",",10 if(type2.txt=="delete"||type2.txt=="") { vis tEntity2,0 @@ -1073,22 +1071,20 @@ 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 + spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,sys0,0,0 bEntity2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",13 + spstr strCommand.txt,tEntity2.txt,",",13 vis tEntity2,1 } // get Type - spstr strCommand.txt,type3.txt,"~",15 + spstr strCommand.txt,type3.txt,",",15 // get internal name - spstr strCommand.txt,entn3.txt,"~",16 + spstr strCommand.txt,entn3.txt,",",16 if(type3.txt=="delete"||type3.txt=="") { vis tEntity3,0 @@ -1096,22 +1092,20 @@ 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 + spstr strCommand.txt,tTmp.txt,",",18 covx tTmp.txt,sys0,0,0 bEntity3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,"~",19 + spstr strCommand.txt,tEntity3.txt,",",19 vis tEntity3,1 } // get Type - spstr strCommand.txt,type4.txt,"~",21 + spstr strCommand.txt,type4.txt,",",21 // get internal name - spstr strCommand.txt,entn4.txt,"~",22 + spstr strCommand.txt,entn4.txt,",",22 if(type4.txt=="delete"||type4.txt=="") { vis tEntity4,0 @@ -1119,22 +1113,20 @@ 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 + spstr strCommand.txt,tTmp.txt,",",24 covx tTmp.txt,sys0,0,0 bEntity4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,"~",25 + spstr strCommand.txt,tEntity4.txt,",",25 vis tEntity4,1 } // get Type - spstr strCommand.txt,type5.txt,"~",27 + spstr strCommand.txt,type5.txt,",",27 // get internal name - spstr strCommand.txt,entn5.txt,"~",28 + spstr strCommand.txt,entn5.txt,",",28 if(type5.txt=="delete"||type5.txt=="") { vis tEntity5,0 @@ -1142,22 +1134,20 @@ 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 + spstr strCommand.txt,tTmp.txt,",",30 covx tTmp.txt,sys0,0,0 bEntity5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,"~",31 + spstr strCommand.txt,tEntity5.txt,",",31 vis tEntity5,1 } // get Type - spstr strCommand.txt,type6.txt,"~",33 + spstr strCommand.txt,type6.txt,",",33 // get internal name - spstr strCommand.txt,entn6.txt,"~",34 + spstr strCommand.txt,entn6.txt,",",34 if(type6.txt=="delete"||type6.txt=="") { vis tEntity6,0 @@ -1165,16 +1155,14 @@ 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 + spstr strCommand.txt,tTmp.txt,",",36 covx tTmp.txt,sys0,0,0 bEntity6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,"~",37 + spstr strCommand.txt,tEntity6.txt,",",37 vis tEntity6,1 } } diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index d2ec0c2a..19278f1f 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -94,7 +94,7 @@ Text tTmp Send Component ID : disabled Opacity : 127 x coordinate : 29 - y coordinate : 144 + y coordinate : 156 Width : 27 Height : 30 Effect : load @@ -153,8 +153,8 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 57 - y coordinate : 157 + x coordinate : 64 + y coordinate : 159 Width : 30 Height : 30 Effect : load @@ -193,7 +193,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 @@ -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/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 930e6cab..2235dc4f 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/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 @@ -405,7 +405,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 @@ -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 @@ -1199,7 +1199,7 @@ Timer tmSerial if(tInstruction.txt=="entityUpd") { //heading - spstr strCommand.txt,tHeading.txt,"~",1 + spstr strCommand.txt,tHeading.txt,",",1 // navigation icons spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 @@ -1228,23 +1228,23 @@ Timer tmSerial bNext.txt="" } //entity name - spstr strCommand.txt,entn.txt,"~",3 + spstr strCommand.txt,entn.txt,",",3 //currentTemp - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,",",4 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,",",6 //minTemp - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,",",7 covx tTmp.txt,xTempMin.val,0,0 //maxTemp - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,",",8 covx tTmp.txt,xTempMax.val,0,0 //tempStep - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,",",9 covx tTmp.txt,xTempStep.val,0,0 // disable all buttons vis bt0,0 @@ -1257,156 +1257,147 @@ Timer tmSerial vis bt7,0 vis bt8,0 //bt0 - spstr strCommand.txt,tTmp.txt,"~",10 + 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 + bt0.txt=tTmp.txt // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,",",11 covx tTmp.txt,bt0.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,bt0.val,0,0 // save action - spstr strCommand.txt,va0.txt,"~",13 + spstr strCommand.txt,va0.txt,",",13 //enable vis bt0,1 } //bt1 - spstr strCommand.txt,tTmp.txt,"~",14 + 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 + bt1.txt=tTmp.txt // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,",",15 covx tTmp.txt,bt1.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,",",16 covx tTmp.txt,bt1.val,0,0 // save action - spstr strCommand.txt,va1.txt,"~",17 + spstr strCommand.txt,va1.txt,",",17 //enable vis bt1,1 } //bt2 - spstr strCommand.txt,tTmp.txt,"~",18 + 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 + bt2.txt=tTmp.txt // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,",",19 covx tTmp.txt,bt2.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",20 + spstr strCommand.txt,tTmp.txt,",",20 covx tTmp.txt,bt2.val,0,0 // save action - spstr strCommand.txt,va2.txt,"~",21 + spstr strCommand.txt,va2.txt,",",21 //enable vis bt2,1 } //bt3 - spstr strCommand.txt,tTmp.txt,"~",22 + 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 + bt3.txt=tTmp.txt // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,",",23 covx tTmp.txt,bt3.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,",",24 covx tTmp.txt,bt3.val,0,0 // save action - spstr strCommand.txt,va3.txt,"~",25 + spstr strCommand.txt,va3.txt,",",25 //enable vis bt3,1 } //bt4 - spstr strCommand.txt,tTmp.txt,"~",26 + 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 + bt4.txt=tTmp.txt // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,",",27 covx tTmp.txt,bt4.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",28 + spstr strCommand.txt,tTmp.txt,",",28 covx tTmp.txt,bt4.val,0,0 // save action - spstr strCommand.txt,va4.txt,"~",29 + spstr strCommand.txt,va4.txt,",",29 //enable vis bt4,1 } //bt5 - spstr strCommand.txt,tTmp.txt,"~",30 + 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 + bt5.txt=tTmp.txt // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,",",31 covx tTmp.txt,bt5.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",32 + spstr strCommand.txt,tTmp.txt,",",32 covx tTmp.txt,bt5.val,0,0 // save action - spstr strCommand.txt,va5.txt,"~",33 + spstr strCommand.txt,va5.txt,",",33 //enable vis bt5,1 } //bt6 - spstr strCommand.txt,tTmp.txt,"~",34 + 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 + bt6.txt=tTmp.txt // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",35 + spstr strCommand.txt,tTmp.txt,",",35 covx tTmp.txt,bt6.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",36 + spstr strCommand.txt,tTmp.txt,",",36 covx tTmp.txt,bt6.val,0,0 // save action - spstr strCommand.txt,va6.txt,"~",37 + spstr strCommand.txt,va6.txt,",",37 //enable vis bt6,1 } //bt7 - spstr strCommand.txt,tTmp.txt,"~",38 + 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 + bt7.txt=tTmp.txt // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",39 + spstr strCommand.txt,tTmp.txt,",",39 covx tTmp.txt,bt7.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",40 + spstr strCommand.txt,tTmp.txt,",",40 covx tTmp.txt,bt7.val,0,0 // save action - spstr strCommand.txt,va7.txt,"~",41 + spstr strCommand.txt,va7.txt,",",41 //enable vis bt7,1 } //bt8 - spstr strCommand.txt,tTmp.txt,"~",42 + 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 + bt8.txt=tTmp.txt // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",43 + spstr strCommand.txt,tTmp.txt,",",43 covx tTmp.txt,bt8.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",44 + spstr strCommand.txt,tTmp.txt,",",44 covx tTmp.txt,bt8.val,0,0 // save action - spstr strCommand.txt,va8.txt,"~",45 + spstr strCommand.txt,va8.txt,",",45 //enable vis bt8,1 } diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index fe4f7c3a..12687eaa 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -3,17 +3,13 @@ Program.s 10 Line(s) of event code 10 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 pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -pageSerialTest - 13 Component(s) - 48 Line(s) of event code - 43 Unique line(s) of event code popupNotify 17 Component(s) 178 Line(s) of event code @@ -26,37 +22,37 @@ popupShutter 19 Component(s) 178 Line(s) of event code 101 Unique line(s) of event code -cardGrid - 39 Component(s) - 430 Line(s) of event code - 249 Unique line(s) of event code -popupLight - 27 Component(s) - 322 Line(s) of event code - 173 Unique line(s) of event code -screensaver - 33 Component(s) - 207 Line(s) of event code - 158 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 +popupLight + 27 Component(s) + 320 Line(s) of event code + 173 Unique line(s) of event code cardAlarm 35 Component(s) - 345 Line(s) of event code - 214 Unique line(s) of event code -cardThermo - 41 Component(s) - 460 Line(s) of event code - 284 Unique line(s) of event code + 343 Line(s) of event code + 213 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) + 195 Line(s) of event code + 152 Unique line(s) of event code cardEntities 62 Component(s) - 972 Line(s) of event code - 413 Unique line(s) of event code + 964 Line(s) of event code + 409 Unique line(s) of event code +cardThermo + 41 Component(s) + 451 Line(s) of event code + 274 Unique line(s) of event code Total - 13 Page(s) - 355 Component(s) - 3646 Line(s) of event code + 12 Page(s) + 341 Component(s) + 3549 Line(s) of event code 1039 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageIcons.txt b/HMI/US/landscape/n2t-out-visual/pageIcons.txt index 61188426..6b8d4451 100644 --- a/HMI/US/landscape/n2t-out-visual/pageIcons.txt +++ b/HMI/US/landscape/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 : 1 - y coordinate : 8 - Width : 298 - Height : 299 - 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/landscape/n2t-out-visual/pageSerialTest.txt b/HMI/US/landscape/n2t-out-visual/pageSerialTest.txt deleted file mode 100644 index f9eb65f7..00000000 --- a/HMI/US/landscape/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 : 480 - 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 : 160 - y coordinate : 0 - 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 : 159 - y coordinate : 31 - 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 : 378 - y coordinate : 234 - 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 : 15 - y coordinate : 215 - 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 : 160 - y coordinate : 60 - 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 : 160 - y coordinate : 151 - 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 : 7 - y coordinate : 270 - Width : 435 - 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 : 479 - Height : 319 - 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 : 334 - 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 : 392 - y coordinate : 10 - 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(bufferPos1) - { - bufferPos=0 - while(bufferPos1) - { - bufferPos=0 - while(bufferPos