diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index b997ef5a..514367e8 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,2120 +1,24 @@ -diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 17:33:34.670973573 +0000 -@@ -17,6 +17,7 @@ - vis tInstruction,0 - vis tTmp,0 - vis tId,0 -+ //vis nPageDisp,0 - vis arm1,0 - vis arm2,0 - vis arm3,0 -@@ -512,13 +513,13 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpd") - { - //entn -- spstr strCommand.txt,entn.txt,"~",1 -+ spstr strCommand.txt,entn.txt,",",1 - // navigation icons -- spstr strCommand.txt,tId.txt,"~",2 -+ spstr strCommand.txt,tId.txt,",",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { -@@ -545,47 +546,47 @@ - bNext.txt="" - } - //text arm1 -- spstr strCommand.txt,arm1.txt,"~",3 -+ spstr strCommand.txt,arm1.txt,",",3 - if(arm1.txt!="") - { - vis arm1,1 - } - //id arm1 -- spstr strCommand.txt,va1.txt,"~",4 -+ spstr strCommand.txt,va1.txt,",",4 - //text arm2 -- spstr strCommand.txt,arm2.txt,"~",5 -+ spstr strCommand.txt,arm2.txt,",",5 - if(arm2.txt!="") - { - vis arm2,1 - } - //id arm2 -- spstr strCommand.txt,va2.txt,"~",6 -+ spstr strCommand.txt,va2.txt,",",6 - //text arm3 -- spstr strCommand.txt,arm3.txt,"~",7 -+ spstr strCommand.txt,arm3.txt,",",7 - if(arm3.txt!="") - { - vis arm3,1 - } - //id arm3 -- spstr strCommand.txt,va3.txt,"~",8 -+ spstr strCommand.txt,va3.txt,",",8 - //text arm4 -- spstr strCommand.txt,arm4.txt,"~",9 -+ spstr strCommand.txt,arm4.txt,",",9 - if(arm4.txt!="") - { - vis arm4,1 - } - //id arm4 -- spstr strCommand.txt,va4.txt,"~",10 -+ spstr strCommand.txt,va4.txt,",",10 - //icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",12 - covx tTmp.txt,sys0,0,0 - tIcon.pco=sys0 - //numpad status -- spstr strCommand.txt,tTmp.txt,"~",13 -+ spstr strCommand.txt,tTmp.txt,",",13 - if(tTmp.txt!="disable") - { - vis b0,1 -@@ -616,7 +617,7 @@ - vis tCode,0 - } - //flashing status -- spstr strCommand.txt,tTmp.txt,"~",14 -+ spstr strCommand.txt,tTmp.txt,",",14 - if(tTmp.txt=="enable") - { - tmFlash.en=1 -@@ -628,35 +629,35 @@ - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,dimValue,0,0 - dim=dimValue - } - if(tInstruction.txt=="timeout") - { - //set timeout to global var -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-01 17:33:33.870969251 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 17:33:34.670973573 +0000 -@@ -211,7 +211,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text :  -- Max. Text Size : 5 -+ Max. Text Size : 10 - - Text tIcon2 - Attributes -@@ -221,7 +221,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text :  -- Max. Text Size : 5 -+ Max. Text Size : 30 - - Text tIcon3 - Attributes -@@ -231,7 +231,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text :  -- Max. Text Size : 5 -+ Max. Text Size : 10 - - Text tIcon4 - Attributes -@@ -241,7 +241,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text :  -- Max. Text Size : 5 -+ Max. Text Size : 30 - - Text tSend - Attributes -@@ -1120,42 +1120,15 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpd") - { - // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 -- 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="" -- } -+ spstr strCommand.txt,tHeading.txt,",",1 - // 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 bUp1,0 -@@ -1170,16 +1143,16 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",6 - covx tTmp.txt,sys0,0,0 - tIcon1.pco=sys0 - // set name -- spstr strCommand.txt,tEntity1.txt,"~",7 -+ spstr strCommand.txt,tEntity1.txt,",",7 - vis tEntity1,1 - } - if(type1.txt=="shutter") -@@ -1202,7 +1175,7 @@ - vis hSlider1,0 - vis nNum1,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",8 -+ spstr strCommand.txt,tTmp.txt,",",8 - covx tTmp.txt,sys0,0,0 - btOnOff1.val=sys0 - } -@@ -1216,7 +1189,7 @@ - vis hSlider1,0 - vis nNum1,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",8 -+ spstr strCommand.txt,tTmp.txt,",",8 - covx tTmp.txt,sys0,0,0 - btOnOff1.val=sys0 - } -@@ -1233,7 +1206,7 @@ - bText1.pco=65535 - bText1.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText1.txt,"~",8 -+ spstr strCommand.txt,bText1.txt,",",8 - } - if(type1.txt=="button") - { -@@ -1248,7 +1221,7 @@ - bText1.pco=1374 - bText1.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText1.txt,"~",8 -+ spstr strCommand.txt,bText1.txt,",",8 - } - if(type1.txt=="number") - { -@@ -1261,7 +1234,7 @@ - vis hSlider1,1 - vis nNum1,1 - // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText1.txt,"~",8 -+ spstr strCommand.txt,bText1.txt,",",8 - //first value is current value - spstr bText1.txt,tTmp.txt,"|",0 - covx tTmp.txt,sys0,0,0 -@@ -1277,9 +1250,9 @@ - hSlider1.maxval=sys0 - } - // 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 bUp2,0 -@@ -1294,16 +1267,16 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",12 - covx tTmp.txt,sys0,0,0 - tIcon2.pco=sys0 - // set name -- spstr strCommand.txt,tEntity2.txt,"~",13 -+ spstr strCommand.txt,tEntity2.txt,",",13 - vis tEntity2,1 - } - if(type2.txt=="shutter") -@@ -1326,7 +1299,7 @@ - vis hSlider2,0 - vis nNum2,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",14 -+ spstr strCommand.txt,tTmp.txt,",",14 - covx tTmp.txt,sys0,0,0 - btOnOff2.val=sys0 - } -@@ -1340,7 +1313,7 @@ - vis hSlider2,0 - vis nNum2,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",14 -+ spstr strCommand.txt,tTmp.txt,",",14 - covx tTmp.txt,sys0,0,0 - btOnOff2.val=sys0 - } -@@ -1357,7 +1330,7 @@ - bText2.pco=65535 - bText2.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText2.txt,"~",14 -+ spstr strCommand.txt,bText2.txt,",",14 - } - if(type2.txt=="button") - { -@@ -1372,7 +1345,7 @@ - bText2.pco=1374 - bText2.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText2.txt,"~",14 -+ spstr strCommand.txt,bText2.txt,",",14 - } - if(type2.txt=="number") - { -@@ -1385,7 +1358,7 @@ - vis hSlider2,1 - vis nNum2,1 - // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText2.txt,"~",14 -+ spstr strCommand.txt,bText2.txt,",",14 - //first value is current value - spstr bText2.txt,tTmp.txt,"|",0 - covx tTmp.txt,sys0,0,0 -@@ -1401,9 +1374,9 @@ - hSlider2.maxval=sys0 - } - // 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 bUp3,0 -@@ -1418,16 +1391,16 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",18 - covx tTmp.txt,sys0,0,0 - tIcon3.pco=sys0 - // set name -- spstr strCommand.txt,tEntity3.txt,"~",19 -+ spstr strCommand.txt,tEntity3.txt,",",19 - vis tEntity3,1 - } - if(type3.txt=="shutter") -@@ -1450,7 +1423,7 @@ - vis hSlider3,0 - vis nNum3,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",20 -+ spstr strCommand.txt,tTmp.txt,",",20 - covx tTmp.txt,sys0,0,0 - btOnOff3.val=sys0 - } -@@ -1464,7 +1437,7 @@ - vis hSlider3,0 - vis nNum3,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",20 -+ spstr strCommand.txt,tTmp.txt,",",20 - covx tTmp.txt,sys0,0,0 - btOnOff3.val=sys0 - } -@@ -1481,7 +1454,7 @@ - bText3.pco=65535 - bText3.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText3.txt,"~",20 -+ spstr strCommand.txt,bText3.txt,",",20 - } - if(type3.txt=="button") - { -@@ -1496,7 +1469,7 @@ - bText3.pco=1374 - bText3.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText3.txt,"~",20 -+ spstr strCommand.txt,bText3.txt,",",20 - } - if(type3.txt=="number") - { -@@ -1509,7 +1482,7 @@ - vis hSlider3,1 - vis nNum3,1 - // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText3.txt,"~",20 -+ spstr strCommand.txt,bText3.txt,",",20 - //first value is current value - spstr bText3.txt,tTmp.txt,"|",0 - covx tTmp.txt,sys0,0,0 -@@ -1525,9 +1498,9 @@ - hSlider3.maxval=sys0 - } - // 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 bUp4,0 -@@ -1542,16 +1515,16 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",24 - covx tTmp.txt,sys0,0,0 - tIcon4.pco=sys0 - // set name -- spstr strCommand.txt,tEntity4.txt,"~",25 -+ spstr strCommand.txt,tEntity4.txt,",",25 - vis tEntity4,1 - } - if(type4.txt=="shutter") -@@ -1574,7 +1547,7 @@ - vis hSlider4,0 - vis nNum4,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",26 -+ spstr strCommand.txt,tTmp.txt,",",26 - covx tTmp.txt,sys0,0,0 - btOnOff4.val=sys0 - } -@@ -1588,7 +1561,7 @@ - vis hSlider4,0 - vis nNum4,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",26 -+ spstr strCommand.txt,tTmp.txt,",",26 - covx tTmp.txt,sys0,0,0 - btOnOff4.val=sys0 - } -@@ -1605,7 +1578,7 @@ - bText4.pco=65535 - bText4.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText4.txt,"~",26 -+ spstr strCommand.txt,bText4.txt,",",26 - } - if(type4.txt=="button") - { -@@ -1620,7 +1593,7 @@ - bText4.pco=1374 - bText4.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText4.txt,"~",26 -+ spstr strCommand.txt,bText4.txt,",",26 - } - if(type4.txt=="number") - { -@@ -1633,7 +1606,7 @@ - vis hSlider4,1 - vis nNum4,1 - // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText4.txt,"~",26 -+ spstr strCommand.txt,bText4.txt,",",26 - //first value is current value - spstr bText4.txt,tTmp.txt,"|",0 - covx tTmp.txt,sys0,0,0 -@@ -1653,11 +1626,11 @@ - { - //command format pageType,specialPageName - //write name of speical page to tId -- spstr strCommand.txt,tId.txt,"~",1 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -@@ -1707,23 +1680,23 @@ - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - // end of user code -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 17:33:34.670973573 +0000 -@@ -12,28 +12,307 @@ - - Events - Preinitialize Event -- //wup=cardEntities -- //remove background & activate reparse mode -- vis p0,0 -- recmod=1 -- bauds=115200 -- //debug stuff -- vis tTmp,0 -- vis tSend,0 -- vis tInstruction,0 -- vis tId,0 -- vis bEntity1,0 -- vis bEntity2,0 -- vis bEntity3,0 -- vis bEntity4,0 -- vis bEntity5,0 -- vis bEntity6,0 -+ // data available -+ if(usize>1) -+ { -+ bufferPos=0 -+ while(bufferPos isn't supported - if(tTmp.txt=="disable") - { -@@ -541,34 +541,34 @@ - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ 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 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-01 17:33:34.670973573 +0000 -@@ -251,70 +251,70 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpdateDetail") - { - // get entn -- spstr strCommand.txt,entn.txt,"~",1 -+ spstr strCommand.txt,entn.txt,"|",1 - // get Heading -- spstr strCommand.txt,tHeading.txt,"~",2 -+ spstr strCommand.txt,tHeading.txt,"|",2 - // heading color -- spstr strCommand.txt,tTmp.txt,"~",3 -+ spstr strCommand.txt,tTmp.txt,"|",3 - covx tTmp.txt,sys0,0,0 - tHeading.pco=sys0 - // get b1 -- spstr strCommand.txt,b1.txt,"~",4 -+ spstr strCommand.txt,b1.txt,"|",4 - if(b1.txt!="") - { - vis b1,1 - } - // b1 color -- spstr strCommand.txt,tTmp.txt,"~",5 -+ spstr strCommand.txt,tTmp.txt,"|",5 - covx tTmp.txt,sys0,0,0 - b1.pco=sys0 - // get b2 -- spstr strCommand.txt,b2.txt,"~",6 -+ spstr strCommand.txt,b2.txt,"|",6 - if(b2.txt!="") - { - vis b2,1 - } - // b2 color -- spstr strCommand.txt,tTmp.txt,"~",7 -+ spstr strCommand.txt,tTmp.txt,"|",7 - covx tTmp.txt,sys0,0,0 - b2.pco=sys0 - // get tText -- spstr strCommand.txt,tText.txt,"~",8 -+ spstr strCommand.txt,tText.txt,"|",8 - // tText color -- spstr strCommand.txt,tTmp.txt,"~",9 -+ spstr strCommand.txt,tTmp.txt,"|",9 - covx tTmp.txt,sys0,0,0 - tText.pco=sys0 - //preserve old sleepTimeout - vaOldSleepT.val=sleepTimeout - // sleep timeout -- spstr strCommand.txt,tTmp.txt,"~",10 -+ spstr strCommand.txt,tTmp.txt,"|",10 - covx tTmp.txt,sys0,0,0 - sleepTimeout=sys0 - } - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - if(tInstruction.txt=="exitPopup") -@@ -326,11 +326,11 @@ - sleepTimeout=vaOldSleepT.val - //command format pageType,specialPageName - //write name of speical page to tId -- spstr strCommand.txt,tId.txt,"~",1 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-01 17:33:34.670973573 +0000 -@@ -324,45 +324,45 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpdateDetail") - { - // get Position value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,dimValue,0,0 - } - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="timeout") - { - //set timeout to global var -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 17:33:34.670973573 +0000 -@@ -30,6 +30,26 @@ - vis tSend,0 - //page open event - // clear weather elements, to keep example content in HMI -+ tMainIcon.txt="" -+ tMainText.txt="" -+ tForecast1.txt="" -+ tF1Icon.txt="" -+ tForecast1Val.txt="" -+ tForecast2.txt="" -+ tF2Icon.txt="" -+ tForecast2Val.txt="" -+ //tSend.txt="event,screensaverOpen" -+ //send calc crc -+ //btlen tSend.txt,sys0 -+ //crcrest 1,0xffff // reset CRC -+ //crcputh 55 bb -+ //crcputs sys0,1 -+ //crcputs tSend.txt,0 -+ //send cmd -+ //printh 55 bb -+ //prints sys0,2 -+ //prints tSend.txt,0 -+ //prints crcval,2 - - Variable (string) strCommand - Attributes -@@ -86,7 +106,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text : Tuesday, 08. March 2022 -- Max. Text Size : 35 -+ Max. Text Size : 30 - - Text tSend - Attributes -@@ -105,7 +125,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text :  - Max. Text Size : 10 - - Text tMainText -@@ -115,7 +135,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : 2,3 °C - Max. Text Size : 10 - - Text tForecast1 -@@ -125,7 +145,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : Mi - Max. Text Size : 10 - - Text tForecast1Val -@@ -135,7 +155,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : 9,3 °C - Max. Text Size : 10 - - Text tF1Icon -@@ -145,7 +165,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text :  - Max. Text Size : 10 - - Text tForecast2 -@@ -155,7 +175,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : Do - Max. Text Size : 10 - - Text tF2Icon -@@ -165,7 +185,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text :  - Max. Text Size : 10 - - Text tForecast2Val -@@ -175,7 +195,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : 11,9 °C - Max. Text Size : 10 - - Text t10 -@@ -246,49 +266,9 @@ - Send Component ID : disabled - Associated Keyboard : none - Text : -- Max. Text Size : 5 -- --Text tForecast4Val -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 10 -- --Text tMainTextAlt -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 10 -- --Text tMainIconAlt -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 10 -- --Text tMRIcon -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : - Max. Text Size : 10 - --Text tMR -+Text tForecast4Val - Attributes - Scope : local - Dragging : 0 -@@ -355,7 +335,7 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="wake") - { - //dim=100 -@@ -364,14 +344,14 @@ - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,dimValue,0,0 - dim=dimValue - } - if(tInstruction.txt=="time") - { - //get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - spstr pageIcons.vaTime.txt,tTime.txt,"?",0 - spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 - if(tAMPM.txt=="") -@@ -382,104 +362,66 @@ - if(tInstruction.txt=="date") - { - //get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - tDate.txt=pageIcons.vaDate.txt - } - if(tInstruction.txt=="timeout") - { - //set timeout to global var -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - if(tInstruction.txt=="weatherUpdate") - { -- vis tMainIcon,1 -- vis tMainIconAlt,0 -- vis tMainText,1 -- vis tMainTextAlt,0 -- vis tMRIcon,0 -- vis tMR,0 - //tMainIcon -- spstr strCommand.txt,tTmp.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 -- tMainTextAlt.txt=tMainText.txt -+ spstr strCommand.txt,tMainText.txt,"?",2 - //tForecast1 -- spstr strCommand.txt,tForecast1.txt,"~",3 -+ spstr strCommand.txt,tForecast1.txt,"?",3 - //tF1Icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tForecast1Val.txt,"?",5 - //tForecast2 -- spstr strCommand.txt,tForecast2.txt,"~",6 -+ spstr strCommand.txt,tForecast2.txt,"?",6 - //tF2Icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tForecast2Val.txt,"?",8 - //tForecast3 -- spstr strCommand.txt,tForecast3.txt,"~",9 -+ spstr strCommand.txt,tForecast3.txt,"?",9 - //tF3Icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tForecast3Val.txt,"?",11 - //tForecast4 -- spstr strCommand.txt,tForecast4.txt,"~",12 -+ spstr strCommand.txt,tForecast4.txt,"?",12 - //tF4Icon -- spstr strCommand.txt,tTmp.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,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 -- vis tMainText,0 -- vis tMainTextAlt,1 -- vis tMainIconAlt,1 -- vis tMRIcon,1 -- vis tMR,1 -- vis tForecast1,0 -- vis tF1Icon,0 -- vis tForecast1Val,0 -- //move forecast values to the right -- tForecast4.txt=tForecast3.txt -- tForecast3.txt=tForecast2.txt -- tForecast2.txt=tForecast1.txt -- tForecast4Val.txt=tForecast3Val.txt -- tForecast3Val.txt=tForecast2Val.txt -- tForecast2Val.txt=tForecast1Val.txt -- tF4Icon.txt=tF3Icon.txt -- tF3Icon.txt=tF2Icon.txt -- tF2Icon.txt=tF1Icon.txt -- } -- //tMR -- spstr strCommand.txt,tMR.txt,"~",16 -+ spstr strCommand.txt,tForecast4Val.txt,"?",14 - } - if(tInstruction.txt=="pageType") - { - dim=100 - //command format pageType,specialPageName - //write name of speical page to tId -- spstr strCommand.txt,tId.txt,"~",1 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 u[2]+3 - bufferPos=0 +--- HMI/n2t-out/pageStartup.txt 2022-04-01 18:14:32.819231663 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-01 18:14:33.747246705 +0000 +@@ -177,7 +177,7 @@ + recmod=1 + bauds=115200 + // startup event +- tSend.txt="event,startup,"+tVersion.txt+",eu" ++ tSend.txt="event,startup,"+tVersion.txt+",us-l" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/Program.s.txt b/HMI/US/landscape/n2t-out-visual/Program.s.txt index d9463ac7..63a448ff 100644 --- a/HMI/US/landscape/n2t-out-visual/Program.s.txt +++ b/HMI/US/landscape/n2t-out-visual/Program.s.txt @@ -11,6 +11,6 @@ Program.s // dim value int dimValue=40 int dimValueNormal=100 - // fix touch offset - lcd_dev fffb 0002 0000 0020 + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 5dd71f23..3385487b 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -25,7 +25,6 @@ Page cardAlarm vis tInstruction,0 vis tTmp,0 vis tId,0 - //vis nPageDisp,0 vis arm1,0 vis arm2,0 vis arm3,0 @@ -1043,13 +1042,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { //entn - spstr strCommand.txt,entn.txt,",",1 + spstr strCommand.txt,entn.txt,"~",1 // navigation icons - spstr strCommand.txt,tId.txt,",",2 + spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -1076,47 +1075,47 @@ Timer tmSerial bNext.txt="" } //text arm1 - spstr strCommand.txt,arm1.txt,",",3 + spstr strCommand.txt,arm1.txt,"~",3 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,",",4 + spstr strCommand.txt,va1.txt,"~",4 //text arm2 - spstr strCommand.txt,arm2.txt,",",5 + spstr strCommand.txt,arm2.txt,"~",5 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,",",6 + spstr strCommand.txt,va2.txt,"~",6 //text arm3 - spstr strCommand.txt,arm3.txt,",",7 + spstr strCommand.txt,arm3.txt,"~",7 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,",",8 + spstr strCommand.txt,va3.txt,"~",8 //text arm4 - spstr strCommand.txt,arm4.txt,",",9 + spstr strCommand.txt,arm4.txt,"~",9 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,",",10 + spstr strCommand.txt,va4.txt,"~",10 //icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,",",13 + spstr strCommand.txt,tTmp.txt,"~",13 if(tTmp.txt!="disable") { vis b0,1 @@ -1147,7 +1146,7 @@ Timer tmSerial vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -1159,35 +1158,35 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 3d67bd4b..1326e69a 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -429,7 +429,7 @@ Text tIcon1 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 10 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -459,7 +459,7 @@ Text tIcon2 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 30 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -489,7 +489,7 @@ Text tIcon3 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 10 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -519,7 +519,7 @@ Text tIcon4 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 30 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -2065,15 +2065,42 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 - 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 + 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="" + } // 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 bUp1,0 @@ -2088,16 +2115,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,",",7 + spstr strCommand.txt,tEntity1.txt,"~",7 vis tEntity1,1 } if(type1.txt=="shutter") @@ -2120,7 +2147,7 @@ Timer tmSerial vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -2134,7 +2161,7 @@ Timer tmSerial vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -2151,7 +2178,7 @@ Timer tmSerial bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 } if(type1.txt=="button") { @@ -2166,7 +2193,7 @@ Timer tmSerial bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 } if(type1.txt=="number") { @@ -2179,7 +2206,7 @@ Timer tmSerial vis hSlider1,1 vis nNum1,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 //first value is current value spstr bText1.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2195,9 +2222,9 @@ Timer tmSerial hSlider1.maxval=sys0 } // 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 bUp2,0 @@ -2212,16 +2239,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,",",13 + spstr strCommand.txt,tEntity2.txt,"~",13 vis tEntity2,1 } if(type2.txt=="shutter") @@ -2244,7 +2271,7 @@ Timer tmSerial vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -2258,7 +2285,7 @@ Timer tmSerial vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -2275,7 +2302,7 @@ Timer tmSerial bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 } if(type2.txt=="button") { @@ -2290,7 +2317,7 @@ Timer tmSerial bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 } if(type2.txt=="number") { @@ -2303,7 +2330,7 @@ Timer tmSerial vis hSlider2,1 vis nNum2,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 //first value is current value spstr bText2.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2319,9 +2346,9 @@ Timer tmSerial hSlider2.maxval=sys0 } // 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 bUp3,0 @@ -2336,16 +2363,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",18 covx tTmp.txt,sys0,0,0 tIcon3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,",",19 + spstr strCommand.txt,tEntity3.txt,"~",19 vis tEntity3,1 } if(type3.txt=="shutter") @@ -2368,7 +2395,7 @@ Timer tmSerial vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",20 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -2382,7 +2409,7 @@ Timer tmSerial vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",20 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -2399,7 +2426,7 @@ Timer tmSerial bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 } if(type3.txt=="button") { @@ -2414,7 +2441,7 @@ Timer tmSerial bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 } if(type3.txt=="number") { @@ -2427,7 +2454,7 @@ Timer tmSerial vis hSlider3,1 vis nNum3,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 //first value is current value spstr bText3.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2443,9 +2470,9 @@ Timer tmSerial hSlider3.maxval=sys0 } // 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 bUp4,0 @@ -2460,16 +2487,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,sys0,0,0 tIcon4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,",",25 + spstr strCommand.txt,tEntity4.txt,"~",25 vis tEntity4,1 } if(type4.txt=="shutter") @@ -2492,7 +2519,7 @@ Timer tmSerial vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",26 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -2506,7 +2533,7 @@ Timer tmSerial vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",26 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -2523,7 +2550,7 @@ Timer tmSerial bText4.pco=65535 bText4.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 } if(type4.txt=="button") { @@ -2538,7 +2565,7 @@ Timer tmSerial bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 } if(type4.txt=="number") { @@ -2551,7 +2578,7 @@ Timer tmSerial vis hSlider4,1 vis nNum4,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 //first value is current value spstr bText4.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2571,11 +2598,11 @@ Timer tmSerial { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 @@ -2625,23 +2652,23 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } // end of user code diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index dedd15e8..90650ff4 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -20,307 +20,28 @@ Page cardGrid Events Preinitialize Event - // data available - if(usize>1) - { - bufferPos=0 - while(bufferPos isn't supported if(tTmp.txt=="disable") { @@ -887,34 +887,34 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/landscape/n2t-out-visual/popupNotify.txt b/HMI/US/landscape/n2t-out-visual/popupNotify.txt index be6810a6..d14a23e4 100644 --- a/HMI/US/landscape/n2t-out-visual/popupNotify.txt +++ b/HMI/US/landscape/n2t-out-visual/popupNotify.txt @@ -460,70 +460,70 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpdateDetail") { // get entn - spstr strCommand.txt,entn.txt,"|",1 + spstr strCommand.txt,entn.txt,"~",1 // get Heading - spstr strCommand.txt,tHeading.txt,"|",2 + spstr strCommand.txt,tHeading.txt,"~",2 // heading color - spstr strCommand.txt,tTmp.txt,"|",3 + spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 tHeading.pco=sys0 // get b1 - spstr strCommand.txt,b1.txt,"|",4 + spstr strCommand.txt,b1.txt,"~",4 if(b1.txt!="") { vis b1,1 } // b1 color - spstr strCommand.txt,tTmp.txt,"|",5 + spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,sys0,0,0 b1.pco=sys0 // get b2 - spstr strCommand.txt,b2.txt,"|",6 + spstr strCommand.txt,b2.txt,"~",6 if(b2.txt!="") { vis b2,1 } // b2 color - spstr strCommand.txt,tTmp.txt,"|",7 + spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,sys0,0,0 b2.pco=sys0 // get tText - spstr strCommand.txt,tText.txt,"|",8 + spstr strCommand.txt,tText.txt,"~",8 // tText color - spstr strCommand.txt,tTmp.txt,"|",9 + spstr strCommand.txt,tTmp.txt,"~",9 covx tTmp.txt,sys0,0,0 tText.pco=sys0 //preserve old sleepTimeout vaOldSleepT.val=sleepTimeout // sleep timeout - spstr strCommand.txt,tTmp.txt,"|",10 + spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 } if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="exitPopup") @@ -535,11 +535,11 @@ Timer tmSerial sleepTimeout=vaOldSleepT.val //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 597f7036..1f648b91 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -589,45 +589,45 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpdateDetail") { // get Position value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sys0,0,0 hPosition.val=sys0 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 } if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 9c6cec82..fa78986c 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -38,26 +38,6 @@ Page screensaver vis tSend,0 //page open event // clear weather elements, to keep example content in HMI - tMainIcon.txt="" - tMainText.txt="" - tForecast1.txt="" - tF1Icon.txt="" - tForecast1Val.txt="" - tForecast2.txt="" - tF2Icon.txt="" - tForecast2Val.txt="" - //tSend.txt="event,screensaverOpen" - //send calc crc - //btlen tSend.txt,sys0 - //crcrest 1,0xffff // reset CRC - //crcputh 55 bb - //crcputs sys0,1 - //crcputs tSend.txt,0 - //send cmd - //printh 55 bb - //prints sys0,2 - //prints tSend.txt,0 - //prints crcval,2 Variable (string) strCommand Attributes @@ -194,7 +174,7 @@ Text tDate Vertical Alignment : center Input Type : character Text : Tuesday, 08. March 2022 - Max. Text Size : 30 + Max. Text Size : 35 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -253,7 +233,7 @@ Text tMainIcon Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -283,7 +263,7 @@ Text tMainText Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 2,3 °C + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -313,7 +293,7 @@ Text tForecast1 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : Mi + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -327,10 +307,10 @@ Text tForecast1Val Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 141 - y coordinate : 277 - Width : 72 - Height : 26 + x coordinate : 140 + y coordinate : 276 + Width : 71 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -343,7 +323,7 @@ Text tForecast1Val Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 9,3 °C + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -373,7 +353,7 @@ Text tF1Icon Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -403,7 +383,7 @@ Text tForecast2 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : Do + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -433,7 +413,7 @@ Text tF2Icon Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -463,7 +443,7 @@ Text tForecast2Val Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 11,9 °C + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -477,7 +457,7 @@ Text t10 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 61 + x coordinate : 62 y coordinate : 195 Width : 360 Height : 2 @@ -674,7 +654,7 @@ Text tF4Icon Vertical Alignment : center Input Type : character Text : - Max. Text Size : 10 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -709,6 +689,126 @@ Text tForecast4Val Horizontal Spacing : 0 Vertical Spacing : 0 +Text tMainTextAlt + Attributes + ID : 29 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 119 + y coordinate : 210 + Width : 106 + Height : 42 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 2 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tMainIconAlt + Attributes + ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 15 + y coordinate : 221 + Width : 100 + Height : 66 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tMRIcon + Attributes + ID : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 116 + y coordinate : 266 + Width : 40 + Height : 35 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tMR + Attributes + ID : 32 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 159 + y coordinate : 270 + Width : 62 + Height : 21 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -777,7 +877,7 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="wake") { //dim=100 @@ -786,14 +886,14 @@ Timer tmSerial if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="time") { //get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 if(tAMPM.txt=="") @@ -804,66 +904,104 @@ Timer tmSerial if(tInstruction.txt=="date") { //get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 tDate.txt=pageIcons.vaDate.txt } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="weatherUpdate") { + vis tMainIcon,1 + vis tMainIconAlt,0 + vis tMainText,1 + vis tMainTextAlt,0 + vis tMRIcon,0 + vis tMR,0 //tMainIcon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tMainText.txt,"~",2 + tMainTextAlt.txt=tMainText.txt //tForecast1 - spstr strCommand.txt,tForecast1.txt,"?",3 + spstr strCommand.txt,tForecast1.txt,"~",3 //tF1Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast1Val.txt,"~",5 //tForecast2 - spstr strCommand.txt,tForecast2.txt,"?",6 + spstr strCommand.txt,tForecast2.txt,"~",6 //tF2Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast2Val.txt,"~",8 //tForecast3 - spstr strCommand.txt,tForecast3.txt,"?",9 + spstr strCommand.txt,tForecast3.txt,"~",9 //tF3Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast3Val.txt,"~",11 //tForecast4 - spstr strCommand.txt,tForecast4.txt,"?",12 + spstr strCommand.txt,tForecast4.txt,"~",12 //tF4Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast4Val.txt,"~",14 + //alternative layout + //tMRIcon + 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 + vis tMainText,0 + vis tMainTextAlt,1 + vis tMainIconAlt,1 + vis tMRIcon,1 + vis tMR,1 + vis tForecast1,0 + vis tF1Icon,0 + vis tForecast1Val,0 + //move forecast values to the right + tForecast4.txt=tForecast3.txt + tForecast3.txt=tForecast2.txt + tForecast2.txt=tForecast1.txt + tForecast4Val.txt=tForecast3Val.txt + tForecast3Val.txt=tForecast2Val.txt + tForecast2Val.txt=tForecast1Val.txt + tF4Icon.txt=tF3Icon.txt + tF3Icon.txt=tF2Icon.txt + tF2Icon.txt=tF1Icon.txt + } + //tMR + spstr strCommand.txt,tMR.txt,"~",16 } if(tInstruction.txt=="pageType") { dim=100 //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 u[2]+3 bufferPos=0 diff --git a/HMI/US/landscape/n2t-out/Program.s.txt b/HMI/US/landscape/n2t-out/Program.s.txt index d9463ac7..63a448ff 100644 --- a/HMI/US/landscape/n2t-out/Program.s.txt +++ b/HMI/US/landscape/n2t-out/Program.s.txt @@ -11,6 +11,6 @@ Program.s // dim value int dimValue=40 int dimValueNormal=100 - // fix touch offset - lcd_dev fffb 0002 0000 0020 + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 78570b5d..8b5083f4 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -17,7 +17,6 @@ Page cardAlarm vis tInstruction,0 vis tTmp,0 vis tId,0 - //vis nPageDisp,0 vis arm1,0 vis arm2,0 vis arm3,0 @@ -513,13 +512,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { //entn - spstr strCommand.txt,entn.txt,",",1 + spstr strCommand.txt,entn.txt,"~",1 // navigation icons - spstr strCommand.txt,tId.txt,",",2 + spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -546,47 +545,47 @@ Timer tmSerial bNext.txt="" } //text arm1 - spstr strCommand.txt,arm1.txt,",",3 + spstr strCommand.txt,arm1.txt,"~",3 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,",",4 + spstr strCommand.txt,va1.txt,"~",4 //text arm2 - spstr strCommand.txt,arm2.txt,",",5 + spstr strCommand.txt,arm2.txt,"~",5 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,",",6 + spstr strCommand.txt,va2.txt,"~",6 //text arm3 - spstr strCommand.txt,arm3.txt,",",7 + spstr strCommand.txt,arm3.txt,"~",7 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,",",8 + spstr strCommand.txt,va3.txt,"~",8 //text arm4 - spstr strCommand.txt,arm4.txt,",",9 + spstr strCommand.txt,arm4.txt,"~",9 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,",",10 + spstr strCommand.txt,va4.txt,"~",10 //icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,",",13 + spstr strCommand.txt,tTmp.txt,"~",13 if(tTmp.txt!="disable") { vis b0,1 @@ -617,7 +616,7 @@ Timer tmSerial vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -629,35 +628,35 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 663a3a14..886381ad 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -211,7 +211,7 @@ Text tIcon1 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 10 + Max. Text Size : 5 Text tIcon2 Attributes @@ -221,7 +221,7 @@ Text tIcon2 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 30 + Max. Text Size : 5 Text tIcon3 Attributes @@ -231,7 +231,7 @@ Text tIcon3 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 10 + Max. Text Size : 5 Text tIcon4 Attributes @@ -241,7 +241,7 @@ Text tIcon4 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 30 + Max. Text Size : 5 Text tSend Attributes @@ -1120,15 +1120,42 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 - 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 + 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="" + } // 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 bUp1,0 @@ -1143,16 +1170,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,",",7 + spstr strCommand.txt,tEntity1.txt,"~",7 vis tEntity1,1 } if(type1.txt=="shutter") @@ -1175,7 +1202,7 @@ Timer tmSerial vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1189,7 +1216,7 @@ Timer tmSerial vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1206,7 +1233,7 @@ Timer tmSerial bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 } if(type1.txt=="button") { @@ -1221,7 +1248,7 @@ Timer tmSerial bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 } if(type1.txt=="number") { @@ -1234,7 +1261,7 @@ Timer tmSerial vis hSlider1,1 vis nNum1,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 //first value is current value spstr bText1.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1250,9 +1277,9 @@ Timer tmSerial hSlider1.maxval=sys0 } // 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 bUp2,0 @@ -1267,16 +1294,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,",",13 + spstr strCommand.txt,tEntity2.txt,"~",13 vis tEntity2,1 } if(type2.txt=="shutter") @@ -1299,7 +1326,7 @@ Timer tmSerial vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1313,7 +1340,7 @@ Timer tmSerial vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1330,7 +1357,7 @@ Timer tmSerial bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 } if(type2.txt=="button") { @@ -1345,7 +1372,7 @@ Timer tmSerial bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 } if(type2.txt=="number") { @@ -1358,7 +1385,7 @@ Timer tmSerial vis hSlider2,1 vis nNum2,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 //first value is current value spstr bText2.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1374,9 +1401,9 @@ Timer tmSerial hSlider2.maxval=sys0 } // 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 bUp3,0 @@ -1391,16 +1418,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",18 covx tTmp.txt,sys0,0,0 tIcon3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,",",19 + spstr strCommand.txt,tEntity3.txt,"~",19 vis tEntity3,1 } if(type3.txt=="shutter") @@ -1423,7 +1450,7 @@ Timer tmSerial vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",20 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1437,7 +1464,7 @@ Timer tmSerial vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",20 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1454,7 +1481,7 @@ Timer tmSerial bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 } if(type3.txt=="button") { @@ -1469,7 +1496,7 @@ Timer tmSerial bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 } if(type3.txt=="number") { @@ -1482,7 +1509,7 @@ Timer tmSerial vis hSlider3,1 vis nNum3,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 //first value is current value spstr bText3.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1498,9 +1525,9 @@ Timer tmSerial hSlider3.maxval=sys0 } // 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 bUp4,0 @@ -1515,16 +1542,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,sys0,0,0 tIcon4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,",",25 + spstr strCommand.txt,tEntity4.txt,"~",25 vis tEntity4,1 } if(type4.txt=="shutter") @@ -1547,7 +1574,7 @@ Timer tmSerial vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",26 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -1561,7 +1588,7 @@ Timer tmSerial vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",26 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -1578,7 +1605,7 @@ Timer tmSerial bText4.pco=65535 bText4.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 } if(type4.txt=="button") { @@ -1593,7 +1620,7 @@ Timer tmSerial bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 } if(type4.txt=="number") { @@ -1606,7 +1633,7 @@ Timer tmSerial vis hSlider4,1 vis nNum4,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 //first value is current value spstr bText4.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1626,11 +1653,11 @@ Timer tmSerial { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 @@ -1680,23 +1707,23 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } // end of user code diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 742991f5..523fd3f0 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -12,307 +12,28 @@ Page cardGrid Events Preinitialize Event - // data available - if(usize>1) - { - bufferPos=0 - while(bufferPos isn't supported if(tTmp.txt=="disable") { @@ -541,34 +541,34 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/landscape/n2t-out/popupNotify.txt b/HMI/US/landscape/n2t-out/popupNotify.txt index 7510b64a..d744b49f 100644 --- a/HMI/US/landscape/n2t-out/popupNotify.txt +++ b/HMI/US/landscape/n2t-out/popupNotify.txt @@ -251,70 +251,70 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpdateDetail") { // get entn - spstr strCommand.txt,entn.txt,"|",1 + spstr strCommand.txt,entn.txt,"~",1 // get Heading - spstr strCommand.txt,tHeading.txt,"|",2 + spstr strCommand.txt,tHeading.txt,"~",2 // heading color - spstr strCommand.txt,tTmp.txt,"|",3 + spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 tHeading.pco=sys0 // get b1 - spstr strCommand.txt,b1.txt,"|",4 + spstr strCommand.txt,b1.txt,"~",4 if(b1.txt!="") { vis b1,1 } // b1 color - spstr strCommand.txt,tTmp.txt,"|",5 + spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,sys0,0,0 b1.pco=sys0 // get b2 - spstr strCommand.txt,b2.txt,"|",6 + spstr strCommand.txt,b2.txt,"~",6 if(b2.txt!="") { vis b2,1 } // b2 color - spstr strCommand.txt,tTmp.txt,"|",7 + spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,sys0,0,0 b2.pco=sys0 // get tText - spstr strCommand.txt,tText.txt,"|",8 + spstr strCommand.txt,tText.txt,"~",8 // tText color - spstr strCommand.txt,tTmp.txt,"|",9 + spstr strCommand.txt,tTmp.txt,"~",9 covx tTmp.txt,sys0,0,0 tText.pco=sys0 //preserve old sleepTimeout vaOldSleepT.val=sleepTimeout // sleep timeout - spstr strCommand.txt,tTmp.txt,"|",10 + spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 } if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="exitPopup") @@ -326,11 +326,11 @@ Timer tmSerial sleepTimeout=vaOldSleepT.val //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index ae194231..f4cb4de8 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -324,45 +324,45 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpdateDetail") { // get Position value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sys0,0,0 hPosition.val=sys0 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 } if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index e255db2c..07b0baaf 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -30,26 +30,6 @@ Page screensaver vis tSend,0 //page open event // clear weather elements, to keep example content in HMI - tMainIcon.txt="" - tMainText.txt="" - tForecast1.txt="" - tF1Icon.txt="" - tForecast1Val.txt="" - tForecast2.txt="" - tF2Icon.txt="" - tForecast2Val.txt="" - //tSend.txt="event,screensaverOpen" - //send calc crc - //btlen tSend.txt,sys0 - //crcrest 1,0xffff // reset CRC - //crcputh 55 bb - //crcputs sys0,1 - //crcputs tSend.txt,0 - //send cmd - //printh 55 bb - //prints sys0,2 - //prints tSend.txt,0 - //prints crcval,2 Variable (string) strCommand Attributes @@ -106,7 +86,7 @@ Text tDate Send Component ID : disabled Associated Keyboard : none Text : Tuesday, 08. March 2022 - Max. Text Size : 30 + Max. Text Size : 35 Text tSend Attributes @@ -125,7 +105,7 @@ Text tMainIcon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 10 Text tMainText @@ -135,7 +115,7 @@ Text tMainText Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 2,3 °C + Text : Max. Text Size : 10 Text tForecast1 @@ -145,7 +125,7 @@ Text tForecast1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : Mi + Text : Max. Text Size : 10 Text tForecast1Val @@ -155,7 +135,7 @@ Text tForecast1Val Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 9,3 °C + Text : Max. Text Size : 10 Text tF1Icon @@ -165,7 +145,7 @@ Text tF1Icon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 10 Text tForecast2 @@ -175,7 +155,7 @@ Text tForecast2 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : Do + Text : Max. Text Size : 10 Text tF2Icon @@ -185,7 +165,7 @@ Text tF2Icon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 10 Text tForecast2Val @@ -195,7 +175,7 @@ Text tForecast2Val Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 11,9 °C + Text : Max. Text Size : 10 Text t10 @@ -266,7 +246,7 @@ Text tF4Icon Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 10 + Max. Text Size : 5 Text tForecast4Val Attributes @@ -278,6 +258,46 @@ Text tForecast4Val Text : Max. Text Size : 10 +Text tMainTextAlt + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text tMainIconAlt + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text tMRIcon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text tMR + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + Picture p0 Attributes Scope : local @@ -335,7 +355,7 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="wake") { //dim=100 @@ -344,14 +364,14 @@ Timer tmSerial if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="time") { //get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 if(tAMPM.txt=="") @@ -362,66 +382,104 @@ Timer tmSerial if(tInstruction.txt=="date") { //get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 tDate.txt=pageIcons.vaDate.txt } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="weatherUpdate") { + vis tMainIcon,1 + vis tMainIconAlt,0 + vis tMainText,1 + vis tMainTextAlt,0 + vis tMRIcon,0 + vis tMR,0 //tMainIcon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tMainText.txt,"~",2 + tMainTextAlt.txt=tMainText.txt //tForecast1 - spstr strCommand.txt,tForecast1.txt,"?",3 + spstr strCommand.txt,tForecast1.txt,"~",3 //tF1Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast1Val.txt,"~",5 //tForecast2 - spstr strCommand.txt,tForecast2.txt,"?",6 + spstr strCommand.txt,tForecast2.txt,"~",6 //tF2Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast2Val.txt,"~",8 //tForecast3 - spstr strCommand.txt,tForecast3.txt,"?",9 + spstr strCommand.txt,tForecast3.txt,"~",9 //tF3Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast3Val.txt,"~",11 //tForecast4 - spstr strCommand.txt,tForecast4.txt,"?",12 + spstr strCommand.txt,tForecast4.txt,"~",12 //tF4Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast4Val.txt,"~",14 + //alternative layout + //tMRIcon + 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 + vis tMainText,0 + vis tMainTextAlt,1 + vis tMainIconAlt,1 + vis tMRIcon,1 + vis tMR,1 + vis tForecast1,0 + vis tF1Icon,0 + vis tForecast1Val,0 + //move forecast values to the right + tForecast4.txt=tForecast3.txt + tForecast3.txt=tForecast2.txt + tForecast2.txt=tForecast1.txt + tForecast4Val.txt=tForecast3Val.txt + tForecast3Val.txt=tForecast2Val.txt + tForecast2Val.txt=tForecast1Val.txt + tF4Icon.txt=tF3Icon.txt + tF3Icon.txt=tF2Icon.txt + tF2Icon.txt=tF1Icon.txt + } + //tMR + spstr strCommand.txt,tMR.txt,"~",16 } if(tInstruction.txt=="pageType") { dim=100 //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 u[2]+3 bufferPos=0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index eb7fde51..8d74f031 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-01 17:33:33.866969230 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 17:33:34.270971412 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-01 18:14:32.819231663 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 18:14:33.291239313 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,140 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-01 17:33:34.270971412 +0000 -@@ -512,13 +512,13 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpd") - { - //entn -- spstr strCommand.txt,entn.txt,"~",1 -+ spstr strCommand.txt,entn.txt,",",1 - // navigation icons -- spstr strCommand.txt,tId.txt,"~",2 -+ spstr strCommand.txt,tId.txt,",",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { -@@ -545,47 +545,47 @@ - bNext.txt="" - } - //text arm1 -- spstr strCommand.txt,arm1.txt,"~",3 -+ spstr strCommand.txt,arm1.txt,",",3 - if(arm1.txt!="") - { - vis arm1,1 - } - //id arm1 -- spstr strCommand.txt,va1.txt,"~",4 -+ spstr strCommand.txt,va1.txt,",",4 - //text arm2 -- spstr strCommand.txt,arm2.txt,"~",5 -+ spstr strCommand.txt,arm2.txt,",",5 - if(arm2.txt!="") - { - vis arm2,1 - } - //id arm2 -- spstr strCommand.txt,va2.txt,"~",6 -+ spstr strCommand.txt,va2.txt,",",6 - //text arm3 -- spstr strCommand.txt,arm3.txt,"~",7 -+ spstr strCommand.txt,arm3.txt,",",7 - if(arm3.txt!="") - { - vis arm3,1 - } - //id arm3 -- spstr strCommand.txt,va3.txt,"~",8 -+ spstr strCommand.txt,va3.txt,",",8 - //text arm4 -- spstr strCommand.txt,arm4.txt,"~",9 -+ spstr strCommand.txt,arm4.txt,",",9 - if(arm4.txt!="") - { - vis arm4,1 - } - //id arm4 -- spstr strCommand.txt,va4.txt,"~",10 -+ spstr strCommand.txt,va4.txt,",",10 - //icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",12 - covx tTmp.txt,sys0,0,0 - tIcon.pco=sys0 - //numpad status -- spstr strCommand.txt,tTmp.txt,"~",13 -+ spstr strCommand.txt,tTmp.txt,",",13 - if(tTmp.txt!="disable") - { - vis b0,1 -@@ -616,7 +616,7 @@ - vis tCode,0 - } - //flashing status -- spstr strCommand.txt,tTmp.txt,"~",14 -+ spstr strCommand.txt,tTmp.txt,",",14 - if(tTmp.txt=="enable") - { - tmFlash.en=1 -@@ -628,35 +628,35 @@ - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,dimValue,0,0 - dim=dimValue - } - if(tInstruction.txt=="timeout") - { - //set timeout to global var -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-01 17:33:33.870969251 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 17:33:34.270971412 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-01 18:14:32.819231663 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 18:14:33.291239313 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -656,339 +525,14 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Timer tmSerial Attributes Scope : local -@@ -1120,13 +1576,13 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpd") - { - // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 -- spstr strCommand.txt,tHeading.txt,"~",1 -+ spstr strCommand.txt,tHeading.txt,",",1 - // navigation icons -- spstr strCommand.txt,tId.txt,"~",2 -+ spstr strCommand.txt,tId.txt,",",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { -@@ -1153,9 +1609,9 @@ - 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 bUp1,0 -@@ -1170,16 +1626,16 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",6 - covx tTmp.txt,sys0,0,0 - tIcon1.pco=sys0 - // set name -- spstr strCommand.txt,tEntity1.txt,"~",7 -+ spstr strCommand.txt,tEntity1.txt,",",7 - vis tEntity1,1 - } - if(type1.txt=="shutter") -@@ -1202,7 +1658,7 @@ - vis hSlider1,0 - vis nNum1,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",8 -+ spstr strCommand.txt,tTmp.txt,",",8 - covx tTmp.txt,sys0,0,0 - btOnOff1.val=sys0 - } -@@ -1216,7 +1672,7 @@ - vis hSlider1,0 - vis nNum1,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",8 -+ spstr strCommand.txt,tTmp.txt,",",8 - covx tTmp.txt,sys0,0,0 - btOnOff1.val=sys0 - } -@@ -1233,7 +1689,7 @@ - bText1.pco=65535 - bText1.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText1.txt,"~",8 -+ spstr strCommand.txt,bText1.txt,",",8 - } - if(type1.txt=="button") - { -@@ -1248,7 +1704,7 @@ - bText1.pco=1374 - bText1.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText1.txt,"~",8 -+ spstr strCommand.txt,bText1.txt,",",8 - } - if(type1.txt=="number") - { -@@ -1261,7 +1717,7 @@ - vis hSlider1,1 - vis nNum1,1 - // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText1.txt,"~",8 -+ spstr strCommand.txt,bText1.txt,",",8 - //first value is current value - spstr bText1.txt,tTmp.txt,"|",0 - covx tTmp.txt,sys0,0,0 -@@ -1277,9 +1733,9 @@ - hSlider1.maxval=sys0 - } - // 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 bUp2,0 -@@ -1294,16 +1750,16 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",12 - covx tTmp.txt,sys0,0,0 - tIcon2.pco=sys0 - // set name -- spstr strCommand.txt,tEntity2.txt,"~",13 -+ spstr strCommand.txt,tEntity2.txt,",",13 - vis tEntity2,1 - } - if(type2.txt=="shutter") -@@ -1326,7 +1782,7 @@ - vis hSlider2,0 - vis nNum2,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",14 -+ spstr strCommand.txt,tTmp.txt,",",14 - covx tTmp.txt,sys0,0,0 - btOnOff2.val=sys0 - } -@@ -1340,7 +1796,7 @@ - vis hSlider2,0 - vis nNum2,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",14 -+ spstr strCommand.txt,tTmp.txt,",",14 - covx tTmp.txt,sys0,0,0 - btOnOff2.val=sys0 - } -@@ -1357,7 +1813,7 @@ - bText2.pco=65535 - bText2.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText2.txt,"~",14 -+ spstr strCommand.txt,bText2.txt,",",14 - } - if(type2.txt=="button") - { -@@ -1372,7 +1828,7 @@ - bText2.pco=1374 - bText2.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText2.txt,"~",14 -+ spstr strCommand.txt,bText2.txt,",",14 - } - if(type2.txt=="number") - { -@@ -1385,7 +1841,7 @@ - vis hSlider2,1 - vis nNum2,1 - // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText2.txt,"~",14 -+ spstr strCommand.txt,bText2.txt,",",14 - //first value is current value - spstr bText2.txt,tTmp.txt,"|",0 - covx tTmp.txt,sys0,0,0 -@@ -1401,9 +1857,9 @@ - hSlider2.maxval=sys0 - } - // 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 bUp3,0 -@@ -1418,16 +1874,16 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",18 - covx tTmp.txt,sys0,0,0 - tIcon3.pco=sys0 - // set name -- spstr strCommand.txt,tEntity3.txt,"~",19 -+ spstr strCommand.txt,tEntity3.txt,",",19 - vis tEntity3,1 - } - if(type3.txt=="shutter") -@@ -1450,7 +1906,7 @@ - vis hSlider3,0 - vis nNum3,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",20 -+ spstr strCommand.txt,tTmp.txt,",",20 - covx tTmp.txt,sys0,0,0 - btOnOff3.val=sys0 - } -@@ -1464,7 +1920,7 @@ - vis hSlider3,0 - vis nNum3,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",20 -+ spstr strCommand.txt,tTmp.txt,",",20 - covx tTmp.txt,sys0,0,0 - btOnOff3.val=sys0 - } -@@ -1481,7 +1937,7 @@ - bText3.pco=65535 - bText3.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText3.txt,"~",20 -+ spstr strCommand.txt,bText3.txt,",",20 - } - if(type3.txt=="button") - { -@@ -1496,7 +1952,7 @@ - bText3.pco=1374 - bText3.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText3.txt,"~",20 -+ spstr strCommand.txt,bText3.txt,",",20 - } - if(type3.txt=="number") - { -@@ -1509,7 +1965,7 @@ - vis hSlider3,1 - vis nNum3,1 - // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText3.txt,"~",20 -+ spstr strCommand.txt,bText3.txt,",",20 - //first value is current value - spstr bText3.txt,tTmp.txt,"|",0 - covx tTmp.txt,sys0,0,0 -@@ -1525,9 +1981,9 @@ - hSlider3.maxval=sys0 - } - // 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 bUp4,0 -@@ -1542,16 +1998,16 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",24 - covx tTmp.txt,sys0,0,0 - tIcon4.pco=sys0 - // set name -- spstr strCommand.txt,tEntity4.txt,"~",25 -+ spstr strCommand.txt,tEntity4.txt,",",25 - vis tEntity4,1 - } - if(type4.txt=="shutter") -@@ -1574,7 +2030,7 @@ - vis hSlider4,0 - vis nNum4,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",26 -+ spstr strCommand.txt,tTmp.txt,",",26 - covx tTmp.txt,sys0,0,0 - btOnOff4.val=sys0 - } -@@ -1588,7 +2044,7 @@ - vis hSlider4,0 - vis nNum4,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",26 -+ spstr strCommand.txt,tTmp.txt,",",26 - covx tTmp.txt,sys0,0,0 - btOnOff4.val=sys0 - } -@@ -1605,7 +2061,7 @@ - bText4.pco=65535 - bText4.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText4.txt,"~",26 -+ spstr strCommand.txt,bText4.txt,",",26 - } - if(type4.txt=="button") - { -@@ -1620,7 +2076,7 @@ - bText4.pco=1374 - bText4.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText4.txt,"~",26 -+ spstr strCommand.txt,bText4.txt,",",26 - } - if(type4.txt=="number") - { -@@ -1633,7 +2089,7 @@ - vis hSlider4,1 - vis nNum4,1 - // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText4.txt,"~",26 -+ spstr strCommand.txt,bText4.txt,",",26 - //first value is current value - spstr bText4.txt,tTmp.txt,"|",0 - covx tTmp.txt,sys0,0,0 -@@ -1648,16 +2104,264 @@ +@@ -1648,6 +2104,254 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } + // 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 bUp5,0 @@ -1003,16 +547,16 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + }else + { + // change icon -+ spstr strCommand.txt,tTmp.txt,",",29 ++ spstr strCommand.txt,tTmp.txt,"~",29 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1 + vis tIcon5,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,",",30 ++ spstr strCommand.txt,tTmp.txt,"~",30 + covx tTmp.txt,sys0,0,0 + tIcon5.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity5.txt,",",31 ++ spstr strCommand.txt,tEntity5.txt,"~",31 + vis tEntity5,1 + } + if(type5.txt=="shutter") @@ -1035,7 +579,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis hSlider5,0 + vis nNum5,0 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",32 ++ spstr strCommand.txt,tTmp.txt,"~",32 + covx tTmp.txt,sys0,0,0 + btOnOff5.val=sys0 + } @@ -1049,7 +593,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis hSlider5,0 + vis nNum5,0 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",32 ++ spstr strCommand.txt,tTmp.txt,"~",32 + covx tTmp.txt,sys0,0,0 + btOnOff5.val=sys0 + } @@ -1066,7 +610,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + bText5.pco=65535 + bText5.pco2=65535 + // get Text (optional Value) -+ spstr strCommand.txt,bText5.txt,",",32 ++ spstr strCommand.txt,bText5.txt,"~",32 + } + if(type5.txt=="button") + { @@ -1081,7 +625,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + bText5.pco=1374 + bText5.pco2=1374 + // get Text (optional Value) -+ spstr strCommand.txt,bText5.txt,",",32 ++ spstr strCommand.txt,bText5.txt,"~",32 + } + if(type5.txt=="number") + { @@ -1094,7 +638,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis hSlider5,1 + vis nNum5,1 + // get config (optional Value) (use bText as variable) -+ spstr strCommand.txt,bText5.txt,",",32 ++ spstr strCommand.txt,bText5.txt,"~",32 + //first value is current value + spstr bText5.txt,tTmp.txt,"|",0 + covx tTmp.txt,sys0,0,0 @@ -1110,9 +654,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + hSlider5.maxval=sys0 + } + // 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 bUp6,0 @@ -1127,16 +671,16 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + }else + { + // change icon -+ spstr strCommand.txt,tTmp.txt,",",35 ++ spstr strCommand.txt,tTmp.txt,"~",35 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1 + vis tIcon6,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,",",36 ++ spstr strCommand.txt,tTmp.txt,"~",36 + covx tTmp.txt,sys0,0,0 + tIcon6.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity6.txt,",",37 ++ spstr strCommand.txt,tEntity6.txt,"~",37 + vis tEntity6,1 + } + if(type6.txt=="shutter") @@ -1159,7 +703,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis hSlider6,0 + vis nNum6,0 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",38 ++ spstr strCommand.txt,tTmp.txt,"~",38 + covx tTmp.txt,sys0,0,0 + btOnOff6.val=sys0 + } @@ -1173,7 +717,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis hSlider6,0 + vis nNum6,0 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",38 ++ spstr strCommand.txt,tTmp.txt,"~",38 + covx tTmp.txt,sys0,0,0 + btOnOff6.val=sys0 + } @@ -1190,7 +734,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + bText6.pco=65535 + bText6.pco2=65535 + // get Text (optional Value) -+ spstr strCommand.txt,bText6.txt,",",38 ++ spstr strCommand.txt,bText6.txt,"~",38 + } + if(type6.txt=="button") + { @@ -1205,7 +749,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + bText6.pco=1374 + bText6.pco2=1374 + // get Text (optional Value) -+ spstr strCommand.txt,bText6.txt,",",38 ++ spstr strCommand.txt,bText6.txt,"~",38 + } + if(type6.txt=="number") + { @@ -1218,7 +762,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis hSlider6,1 + vis nNum6,1 + // get config (optional Value) (use bText as variable) -+ spstr strCommand.txt,bText6.txt,",",38 ++ spstr strCommand.txt,bText6.txt,"~",38 + //first value is current value + spstr bText6.txt,tTmp.txt,"|",0 + covx tTmp.txt,sys0,0,0 @@ -1236,634 +780,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { - //command format pageType,specialPageName - //write name of speical page to tId -- spstr strCommand.txt,tId.txt,"~",1 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -@@ -1707,23 +2411,23 @@ - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - // end of user code -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-01 17:33:34.270971412 +0000 -@@ -568,13 +568,13 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - 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 strCommand.txt,tId.txt,",",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { -@@ -601,9 +601,9 @@ - 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 -@@ -611,22 +611,22 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ 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 -@@ -634,22 +634,22 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ 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 -@@ -657,22 +657,22 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ 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 -@@ -680,22 +680,22 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ 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 -@@ -703,22 +703,22 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ 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 -@@ -726,16 +726,16 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ 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 - } - } -@@ -743,11 +743,11 @@ - { - //command format pageType,specialPageName - //write name of speical page to tId -- spstr strCommand.txt,tId.txt,"~",1 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -@@ -797,23 +797,23 @@ - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - // end of user code -diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-01 17:33:34.270971412 +0000 -@@ -503,13 +503,13 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ 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 strCommand.txt,tId.txt,",",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { -@@ -583,35 +583,35 @@ - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,dimValue,0,0 - dim=dimValue - } - if(tInstruction.txt=="timeout") - { - //set timeout to global var -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-01 17:33:34.270971412 +0000 -@@ -640,13 +640,13 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - 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 strCommand.txt,tId.txt,",",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { -@@ -673,23 +673,23 @@ - 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,",",5 - 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 -@@ -702,156 +702,156 @@ - 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 - // 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 - // 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 - // 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 - // 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 - // 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 - // 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 - // 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 - // 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 - // 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 - } -@@ -860,11 +860,11 @@ - { - //command format pageType,specialPageName - //write name of speical page to tId -- spstr strCommand.txt,tId.txt,"~",1 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -@@ -914,23 +914,23 @@ - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - // end of user code diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 17:33:34.270971412 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-01 18:14:32.819231663 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 18:14:33.291239313 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1882,438 +801,3 @@ 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 -@@ -257,27 +257,27 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - if(tInstruction.txt=="pageType") -@@ -285,11 +285,11 @@ - dim=100 - //command format pageType,specialPageName - //write name of speical page to tId -- spstr strCommand.txt,tId.txt,"~",1 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-01 17:33:34.270971412 +0000 -@@ -438,24 +438,24 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpdateDetail") - { - // change icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tTmp.txt,",",2 - covx tTmp.txt,sys0,0,0 - tIcon1.pco=sys0 - // get Button State -- spstr strCommand.txt,tTmp.txt,"~",3 -+ spstr strCommand.txt,tTmp.txt,",",3 - covx tTmp.txt,sys0,0,0 - btOnOff1.val=sys0 - // get Brightness value -- spstr strCommand.txt,tTmp.txt,"~",4 -+ spstr strCommand.txt,tTmp.txt,",",4 - if(tTmp.txt=="disable") - { - vis t1,0 -@@ -473,7 +473,7 @@ - } - } - // get ColorTemp value -- spstr strCommand.txt,tTmp.txt,"~",5 -+ spstr strCommand.txt,tTmp.txt,",",5 - if(tTmp.txt=="disable") - { - vis hTempSlider,0 -@@ -517,7 +517,7 @@ - } - } - // get Color value -- spstr strCommand.txt,tTmp.txt,"~",6 -+ spstr strCommand.txt,tTmp.txt,",",6 - // disable -> isn't supported - if(tTmp.txt=="disable") - { -@@ -541,34 +541,34 @@ - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ 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 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-01 17:33:34.270971412 +0000 -@@ -251,70 +251,70 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpdateDetail") - { - // get entn -- spstr strCommand.txt,entn.txt,"~",1 -+ spstr strCommand.txt,entn.txt,"|",1 - // get Heading -- spstr strCommand.txt,tHeading.txt,"~",2 -+ spstr strCommand.txt,tHeading.txt,"|",2 - // heading color -- spstr strCommand.txt,tTmp.txt,"~",3 -+ spstr strCommand.txt,tTmp.txt,"|",3 - covx tTmp.txt,sys0,0,0 - tHeading.pco=sys0 - // get b1 -- spstr strCommand.txt,b1.txt,"~",4 -+ spstr strCommand.txt,b1.txt,"|",4 - if(b1.txt!="") - { - vis b1,1 - } - // b1 color -- spstr strCommand.txt,tTmp.txt,"~",5 -+ spstr strCommand.txt,tTmp.txt,"|",5 - covx tTmp.txt,sys0,0,0 - b1.pco=sys0 - // get b2 -- spstr strCommand.txt,b2.txt,"~",6 -+ spstr strCommand.txt,b2.txt,"|",6 - if(b2.txt!="") - { - vis b2,1 - } - // b2 color -- spstr strCommand.txt,tTmp.txt,"~",7 -+ spstr strCommand.txt,tTmp.txt,"|",7 - covx tTmp.txt,sys0,0,0 - b2.pco=sys0 - // get tText -- spstr strCommand.txt,tText.txt,"~",8 -+ spstr strCommand.txt,tText.txt,"|",8 - // tText color -- spstr strCommand.txt,tTmp.txt,"~",9 -+ spstr strCommand.txt,tTmp.txt,"|",9 - covx tTmp.txt,sys0,0,0 - tText.pco=sys0 - //preserve old sleepTimeout - vaOldSleepT.val=sleepTimeout - // sleep timeout -- spstr strCommand.txt,tTmp.txt,"~",10 -+ spstr strCommand.txt,tTmp.txt,"|",10 - covx tTmp.txt,sys0,0,0 - sleepTimeout=sys0 - } - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - if(tInstruction.txt=="exitPopup") -@@ -326,11 +326,11 @@ - sleepTimeout=vaOldSleepT.val - //command format pageType,specialPageName - //write name of speical page to tId -- spstr strCommand.txt,tId.txt,"~",1 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-01 17:33:34.270971412 +0000 -@@ -324,45 +324,45 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpdateDetail") - { - // get Position value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 - } - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,dimValue,0,0 - } - if(tInstruction.txt=="time") - { - // get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - } - if(tInstruction.txt=="timeout") - { - //set timeout to global var -- spstr strCommand.txt,tTmp.txt,"~",1 -+ 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 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 -diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-01 17:33:33.866969230 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-01 17:33:34.270971412 +0000 -@@ -355,7 +355,7 @@ - // write command to variable strCommand - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -- spstr strCommand.txt,tInstruction.txt,"~",0 -+ spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="wake") - { - //dim=100 -@@ -364,14 +364,14 @@ - if(tInstruction.txt=="dimmode") - { - // get value -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,dimValue,0,0 - dim=dimValue - } - if(tInstruction.txt=="time") - { - //get set time to global variable -- spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 - spstr pageIcons.vaTime.txt,tTime.txt,"?",0 - spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 - if(tAMPM.txt=="") -@@ -382,13 +382,13 @@ - if(tInstruction.txt=="date") - { - //get set date to global variable -- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 - tDate.txt=pageIcons.vaDate.txt - } - if(tInstruction.txt=="timeout") - { - //set timeout to global var -- spstr strCommand.txt,tTmp.txt,"~",1 -+ spstr strCommand.txt,tTmp.txt,",",1 - covx tTmp.txt,sleepTimeout,0,0 - } - if(tInstruction.txt=="weatherUpdate") -@@ -400,48 +400,48 @@ - vis tMRIcon,0 - vis tMR,0 - //tMainIcon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tMainText.txt,"?",2 - tMainTextAlt.txt=tMainText.txt - //tForecast1 -- spstr strCommand.txt,tForecast1.txt,"~",3 -+ spstr strCommand.txt,tForecast1.txt,"?",3 - //tF1Icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tForecast1Val.txt,"?",5 - //tForecast2 -- spstr strCommand.txt,tForecast2.txt,"~",6 -+ spstr strCommand.txt,tForecast2.txt,"?",6 - //tF2Icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tForecast2Val.txt,"?",8 - //tForecast3 -- spstr strCommand.txt,tForecast3.txt,"~",9 -+ spstr strCommand.txt,tForecast3.txt,"?",9 - //tF3Icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tForecast3Val.txt,"?",11 - //tForecast4 -- spstr strCommand.txt,tForecast4.txt,"~",12 -+ spstr strCommand.txt,tForecast4.txt,"?",12 - //tF4Icon -- spstr strCommand.txt,tTmp.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 -+ spstr strCommand.txt,tForecast4Val.txt,"?",14 - //alternative layout - //tMRIcon -- spstr strCommand.txt,tTmp.txt,"~",15 -+ spstr strCommand.txt,tTmp.txt,"?",15 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 - if(tTmp.txt!="") -@@ -468,18 +468,18 @@ - tF2Icon.txt=tF1Icon.txt - } - //tMR -- spstr strCommand.txt,tMR.txt,"~",16 -+ spstr strCommand.txt,tMR.txt,"?",16 - } - if(tInstruction.txt=="pageType") - { - dim=100 - //command format pageType,specialPageName - //write name of speical page to tId -- spstr strCommand.txt,tId.txt,"~",1 -+ spstr strCommand.txt,tId.txt,",",1 - //save second arg if there's one -- spstr strCommand.txt,tTmp.txt,"~",2 -+ spstr strCommand.txt,tTmp.txt,",",2 - //save third arg if there's one -- spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ 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 u[2]+3 - bufferPos=0 diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 3dc1dcad..c421a4f5 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -1042,13 +1042,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { //entn - spstr strCommand.txt,entn.txt,",",1 + spstr strCommand.txt,entn.txt,"~",1 // navigation icons - spstr strCommand.txt,tId.txt,",",2 + spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -1075,47 +1075,47 @@ Timer tmSerial bNext.txt="" } //text arm1 - spstr strCommand.txt,arm1.txt,",",3 + spstr strCommand.txt,arm1.txt,"~",3 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,",",4 + spstr strCommand.txt,va1.txt,"~",4 //text arm2 - spstr strCommand.txt,arm2.txt,",",5 + spstr strCommand.txt,arm2.txt,"~",5 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,",",6 + spstr strCommand.txt,va2.txt,"~",6 //text arm3 - spstr strCommand.txt,arm3.txt,",",7 + spstr strCommand.txt,arm3.txt,"~",7 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,",",8 + spstr strCommand.txt,va3.txt,"~",8 //text arm4 - spstr strCommand.txt,arm4.txt,",",9 + spstr strCommand.txt,arm4.txt,"~",9 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,",",10 + spstr strCommand.txt,va4.txt,"~",10 //icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,",",13 + spstr strCommand.txt,tTmp.txt,"~",13 if(tTmp.txt!="disable") { vis b0,1 @@ -1146,7 +1146,7 @@ Timer tmSerial vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -1158,35 +1158,35 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index d7f0734c..d9f4e408 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2907,13 +2907,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 - spstr strCommand.txt,tHeading.txt,",",1 + spstr strCommand.txt,tHeading.txt,"~",1 // navigation icons - spstr strCommand.txt,tId.txt,",",2 + spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -2940,9 +2940,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 bUp1,0 @@ -2957,16 +2957,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,",",7 + spstr strCommand.txt,tEntity1.txt,"~",7 vis tEntity1,1 } if(type1.txt=="shutter") @@ -2989,7 +2989,7 @@ Timer tmSerial vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -3003,7 +3003,7 @@ Timer tmSerial vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -3020,7 +3020,7 @@ Timer tmSerial bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 } if(type1.txt=="button") { @@ -3035,7 +3035,7 @@ Timer tmSerial bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 } if(type1.txt=="number") { @@ -3048,7 +3048,7 @@ Timer tmSerial vis hSlider1,1 vis nNum1,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 //first value is current value spstr bText1.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -3064,9 +3064,9 @@ Timer tmSerial hSlider1.maxval=sys0 } // 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 bUp2,0 @@ -3081,16 +3081,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,",",13 + spstr strCommand.txt,tEntity2.txt,"~",13 vis tEntity2,1 } if(type2.txt=="shutter") @@ -3113,7 +3113,7 @@ Timer tmSerial vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -3127,7 +3127,7 @@ Timer tmSerial vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -3144,7 +3144,7 @@ Timer tmSerial bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 } if(type2.txt=="button") { @@ -3159,7 +3159,7 @@ Timer tmSerial bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 } if(type2.txt=="number") { @@ -3172,7 +3172,7 @@ Timer tmSerial vis hSlider2,1 vis nNum2,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 //first value is current value spstr bText2.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -3188,9 +3188,9 @@ Timer tmSerial hSlider2.maxval=sys0 } // 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 bUp3,0 @@ -3205,16 +3205,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",18 covx tTmp.txt,sys0,0,0 tIcon3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,",",19 + spstr strCommand.txt,tEntity3.txt,"~",19 vis tEntity3,1 } if(type3.txt=="shutter") @@ -3237,7 +3237,7 @@ Timer tmSerial vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",20 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -3251,7 +3251,7 @@ Timer tmSerial vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",20 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -3268,7 +3268,7 @@ Timer tmSerial bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 } if(type3.txt=="button") { @@ -3283,7 +3283,7 @@ Timer tmSerial bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 } if(type3.txt=="number") { @@ -3296,7 +3296,7 @@ Timer tmSerial vis hSlider3,1 vis nNum3,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 //first value is current value spstr bText3.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -3312,9 +3312,9 @@ Timer tmSerial hSlider3.maxval=sys0 } // 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 bUp4,0 @@ -3329,16 +3329,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,sys0,0,0 tIcon4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,",",25 + spstr strCommand.txt,tEntity4.txt,"~",25 vis tEntity4,1 } if(type4.txt=="shutter") @@ -3361,7 +3361,7 @@ Timer tmSerial vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",26 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -3375,7 +3375,7 @@ Timer tmSerial vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",26 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -3392,7 +3392,7 @@ Timer tmSerial bText4.pco=65535 bText4.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 } if(type4.txt=="button") { @@ -3407,7 +3407,7 @@ Timer tmSerial bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 } if(type4.txt=="number") { @@ -3420,7 +3420,7 @@ Timer tmSerial vis hSlider4,1 vis nNum4,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 //first value is current value spstr bText4.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -3436,9 +3436,9 @@ Timer tmSerial hSlider4.maxval=sys0 } // 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 bUp5,0 @@ -3453,16 +3453,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",29 + spstr strCommand.txt,tTmp.txt,"~",29 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1 vis tIcon5,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",30 + spstr strCommand.txt,tTmp.txt,"~",30 covx tTmp.txt,sys0,0,0 tIcon5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,",",31 + spstr strCommand.txt,tEntity5.txt,"~",31 vis tEntity5,1 } if(type5.txt=="shutter") @@ -3485,7 +3485,7 @@ Timer tmSerial vis hSlider5,0 vis nNum5,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",32 + spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,sys0,0,0 btOnOff5.val=sys0 } @@ -3499,7 +3499,7 @@ Timer tmSerial vis hSlider5,0 vis nNum5,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",32 + spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,sys0,0,0 btOnOff5.val=sys0 } @@ -3516,7 +3516,7 @@ Timer tmSerial bText5.pco=65535 bText5.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText5.txt,",",32 + spstr strCommand.txt,bText5.txt,"~",32 } if(type5.txt=="button") { @@ -3531,7 +3531,7 @@ Timer tmSerial bText5.pco=1374 bText5.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText5.txt,",",32 + spstr strCommand.txt,bText5.txt,"~",32 } if(type5.txt=="number") { @@ -3544,7 +3544,7 @@ Timer tmSerial vis hSlider5,1 vis nNum5,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText5.txt,",",32 + spstr strCommand.txt,bText5.txt,"~",32 //first value is current value spstr bText5.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -3560,9 +3560,9 @@ Timer tmSerial hSlider5.maxval=sys0 } // 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 bUp6,0 @@ -3577,16 +3577,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",35 + spstr strCommand.txt,tTmp.txt,"~",35 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1 vis tIcon6,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",36 + spstr strCommand.txt,tTmp.txt,"~",36 covx tTmp.txt,sys0,0,0 tIcon6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,",",37 + spstr strCommand.txt,tEntity6.txt,"~",37 vis tEntity6,1 } if(type6.txt=="shutter") @@ -3609,7 +3609,7 @@ Timer tmSerial vis hSlider6,0 vis nNum6,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",38 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,sys0,0,0 btOnOff6.val=sys0 } @@ -3623,7 +3623,7 @@ Timer tmSerial vis hSlider6,0 vis nNum6,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",38 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,sys0,0,0 btOnOff6.val=sys0 } @@ -3640,7 +3640,7 @@ Timer tmSerial bText6.pco=65535 bText6.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText6.txt,",",38 + spstr strCommand.txt,bText6.txt,"~",38 } if(type6.txt=="button") { @@ -3655,7 +3655,7 @@ Timer tmSerial bText6.pco=1374 bText6.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText6.txt,",",38 + spstr strCommand.txt,bText6.txt,"~",38 } if(type6.txt=="number") { @@ -3668,7 +3668,7 @@ Timer tmSerial vis hSlider6,1 vis nNum6,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText6.txt,",",38 + spstr strCommand.txt,bText6.txt,"~",38 //first value is current value spstr bText6.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -3688,11 +3688,11 @@ Timer tmSerial { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 @@ -3742,23 +3742,23 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } // end of user code diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 7361a042..593dfa9b 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -1005,13 +1005,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 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 strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -1038,9 +1038,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 @@ -1048,22 +1048,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 @@ -1071,22 +1071,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 @@ -1094,22 +1094,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 @@ -1117,22 +1117,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 @@ -1140,22 +1140,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 @@ -1163,16 +1163,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 } } @@ -1180,11 +1180,11 @@ Timer tmSerial { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 @@ -1234,23 +1234,23 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } // end of user code diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index b5fe6955..f0858920 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -925,13 +925,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + 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 strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -1005,35 +1005,35 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 64e30b28..d1a13df6 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -1193,13 +1193,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 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 strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -1226,23 +1226,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,"~",5 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 @@ -1255,156 +1255,156 @@ 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 // 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 // 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 // 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 // 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 // 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 // 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 // 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 // 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 // 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 } @@ -1413,11 +1413,11 @@ Timer tmSerial { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 @@ -1467,23 +1467,23 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } // end of user code 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 803fe5b3..f46c0e2f 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 @@ -6,46 +6,42 @@ 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 - 117 Unique line(s) of event code pageIcons 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code -cardMedia - 30 Component(s) - 331 Line(s) of event code - 169 Unique line(s) of event code -pageTest - 13 Component(s) - 13 Line(s) of event code - 13 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code -popupShutter - 19 Component(s) - 178 Line(s) of event code - 101 Unique line(s) of event code -screensaver - 33 Component(s) - 207 Line(s) of event code - 159 Unique line(s) of event code -popupLight - 27 Component(s) - 322 Line(s) of event code - 173 Unique line(s) of event code cardAlarm 35 Component(s) 343 Line(s) of event code 214 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 +screensaver + 33 Component(s) + 207 Line(s) of event code + 158 Unique line(s) of event code cardGrid 39 Component(s) 428 Line(s) of event code 248 Unique line(s) of event code +popupShutter + 19 Component(s) + 178 Line(s) of event code + 101 Unique line(s) of event code cardThermo 41 Component(s) 458 Line(s) of event code @@ -54,9 +50,13 @@ cardEntities 86 Component(s) 1360 Line(s) of event code 552 Unique line(s) of event code +cardMedia + 30 Component(s) + 331 Line(s) of event code + 169 Unique line(s) of event code Total 13 Page(s) 379 Component(s) 4026 Line(s) of event code - 1169 Unique line(s) of event code + 1159 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index eb3e57de..e140ccf8 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 25 + Text : 26 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -552,27 +552,27 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="pageType") @@ -580,11 +580,11 @@ Timer tmSerial dim=100 //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 8297e28d..67cf6fe0 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -784,24 +784,24 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpdateDetail") { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // get Button State - spstr strCommand.txt,tTmp.txt,",",3 + spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 // get Brightness value - spstr strCommand.txt,tTmp.txt,",",4 + spstr strCommand.txt,tTmp.txt,"~",4 if(tTmp.txt=="disable") { vis t1,0 @@ -819,7 +819,7 @@ Timer tmSerial } } // get ColorTemp value - spstr strCommand.txt,tTmp.txt,",",5 + spstr strCommand.txt,tTmp.txt,"~",5 if(tTmp.txt=="disable") { vis hTempSlider,0 @@ -863,7 +863,7 @@ Timer tmSerial } } // get Color value - spstr strCommand.txt,tTmp.txt,",",6 + spstr strCommand.txt,tTmp.txt,"~",6 // disable -> isn't supported if(tTmp.txt=="disable") { @@ -887,34 +887,34 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out-visual/popupNotify.txt b/HMI/US/portrait/n2t-out-visual/popupNotify.txt index 1f158916..f6dd402a 100644 --- a/HMI/US/portrait/n2t-out-visual/popupNotify.txt +++ b/HMI/US/portrait/n2t-out-visual/popupNotify.txt @@ -460,70 +460,70 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpdateDetail") { // get entn - spstr strCommand.txt,entn.txt,"|",1 + spstr strCommand.txt,entn.txt,"~",1 // get Heading - spstr strCommand.txt,tHeading.txt,"|",2 + spstr strCommand.txt,tHeading.txt,"~",2 // heading color - spstr strCommand.txt,tTmp.txt,"|",3 + spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 tHeading.pco=sys0 // get b1 - spstr strCommand.txt,b1.txt,"|",4 + spstr strCommand.txt,b1.txt,"~",4 if(b1.txt!="") { vis b1,1 } // b1 color - spstr strCommand.txt,tTmp.txt,"|",5 + spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,sys0,0,0 b1.pco=sys0 // get b2 - spstr strCommand.txt,b2.txt,"|",6 + spstr strCommand.txt,b2.txt,"~",6 if(b2.txt!="") { vis b2,1 } // b2 color - spstr strCommand.txt,tTmp.txt,"|",7 + spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,sys0,0,0 b2.pco=sys0 // get tText - spstr strCommand.txt,tText.txt,"|",8 + spstr strCommand.txt,tText.txt,"~",8 // tText color - spstr strCommand.txt,tTmp.txt,"|",9 + spstr strCommand.txt,tTmp.txt,"~",9 covx tTmp.txt,sys0,0,0 tText.pco=sys0 //preserve old sleepTimeout vaOldSleepT.val=sleepTimeout // sleep timeout - spstr strCommand.txt,tTmp.txt,"|",10 + spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 } if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="exitPopup") @@ -535,11 +535,11 @@ Timer tmSerial sleepTimeout=vaOldSleepT.val //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index c36645a8..22fba939 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -589,45 +589,45 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpdateDetail") { // get Position value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sys0,0,0 hPosition.val=sys0 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 } if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index b9a2c8e5..4b035fd5 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -877,7 +877,7 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="wake") { //dim=100 @@ -886,14 +886,14 @@ Timer tmSerial if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="time") { //get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 if(tAMPM.txt=="") @@ -904,13 +904,13 @@ Timer tmSerial if(tInstruction.txt=="date") { //get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 tDate.txt=pageIcons.vaDate.txt } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="weatherUpdate") @@ -922,48 +922,48 @@ Timer tmSerial vis tMRIcon,0 vis tMR,0 //tMainIcon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tMainText.txt,"~",2 tMainTextAlt.txt=tMainText.txt //tForecast1 - spstr strCommand.txt,tForecast1.txt,"?",3 + spstr strCommand.txt,tForecast1.txt,"~",3 //tF1Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast1Val.txt,"~",5 //tForecast2 - spstr strCommand.txt,tForecast2.txt,"?",6 + spstr strCommand.txt,tForecast2.txt,"~",6 //tF2Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast2Val.txt,"~",8 //tForecast3 - spstr strCommand.txt,tForecast3.txt,"?",9 + spstr strCommand.txt,tForecast3.txt,"~",9 //tF3Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast3Val.txt,"~",11 //tForecast4 - spstr strCommand.txt,tForecast4.txt,"?",12 + spstr strCommand.txt,tForecast4.txt,"~",12 //tF4Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast4Val.txt,"~",14 //alternative layout //tMRIcon - spstr strCommand.txt,tTmp.txt,"?",15 + spstr strCommand.txt,tTmp.txt,"~",15 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 if(tTmp.txt!="") @@ -990,18 +990,18 @@ Timer tmSerial tF2Icon.txt=tF1Icon.txt } //tMR - spstr strCommand.txt,tMR.txt,"?",16 + spstr strCommand.txt,tMR.txt,"~",16 } if(tInstruction.txt=="pageType") { dim=100 //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 u[2]+3 bufferPos=0 diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 00771f02..8b5083f4 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -512,13 +512,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { //entn - spstr strCommand.txt,entn.txt,",",1 + spstr strCommand.txt,entn.txt,"~",1 // navigation icons - spstr strCommand.txt,tId.txt,",",2 + spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -545,47 +545,47 @@ Timer tmSerial bNext.txt="" } //text arm1 - spstr strCommand.txt,arm1.txt,",",3 + spstr strCommand.txt,arm1.txt,"~",3 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,",",4 + spstr strCommand.txt,va1.txt,"~",4 //text arm2 - spstr strCommand.txt,arm2.txt,",",5 + spstr strCommand.txt,arm2.txt,"~",5 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,",",6 + spstr strCommand.txt,va2.txt,"~",6 //text arm3 - spstr strCommand.txt,arm3.txt,",",7 + spstr strCommand.txt,arm3.txt,"~",7 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,",",8 + spstr strCommand.txt,va3.txt,"~",8 //text arm4 - spstr strCommand.txt,arm4.txt,",",9 + spstr strCommand.txt,arm4.txt,"~",9 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,",",10 + spstr strCommand.txt,va4.txt,"~",10 //icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,",",13 + spstr strCommand.txt,tTmp.txt,"~",13 if(tTmp.txt!="disable") { vis b0,1 @@ -616,7 +616,7 @@ Timer tmSerial vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -628,35 +628,35 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 114467a9..32da68c7 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1576,13 +1576,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 - spstr strCommand.txt,tHeading.txt,",",1 + spstr strCommand.txt,tHeading.txt,"~",1 // navigation icons - spstr strCommand.txt,tId.txt,",",2 + spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -1609,9 +1609,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 bUp1,0 @@ -1626,16 +1626,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,",",7 + spstr strCommand.txt,tEntity1.txt,"~",7 vis tEntity1,1 } if(type1.txt=="shutter") @@ -1658,7 +1658,7 @@ Timer tmSerial vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1672,7 +1672,7 @@ Timer tmSerial vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1689,7 +1689,7 @@ Timer tmSerial bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 } if(type1.txt=="button") { @@ -1704,7 +1704,7 @@ Timer tmSerial bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 } if(type1.txt=="number") { @@ -1717,7 +1717,7 @@ Timer tmSerial vis hSlider1,1 vis nNum1,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,"~",8 //first value is current value spstr bText1.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1733,9 +1733,9 @@ Timer tmSerial hSlider1.maxval=sys0 } // 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 bUp2,0 @@ -1750,16 +1750,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,",",13 + spstr strCommand.txt,tEntity2.txt,"~",13 vis tEntity2,1 } if(type2.txt=="shutter") @@ -1782,7 +1782,7 @@ Timer tmSerial vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1796,7 +1796,7 @@ Timer tmSerial vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1813,7 +1813,7 @@ Timer tmSerial bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 } if(type2.txt=="button") { @@ -1828,7 +1828,7 @@ Timer tmSerial bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 } if(type2.txt=="number") { @@ -1841,7 +1841,7 @@ Timer tmSerial vis hSlider2,1 vis nNum2,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,"~",14 //first value is current value spstr bText2.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1857,9 +1857,9 @@ Timer tmSerial hSlider2.maxval=sys0 } // 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 bUp3,0 @@ -1874,16 +1874,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",18 covx tTmp.txt,sys0,0,0 tIcon3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,",",19 + spstr strCommand.txt,tEntity3.txt,"~",19 vis tEntity3,1 } if(type3.txt=="shutter") @@ -1906,7 +1906,7 @@ Timer tmSerial vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",20 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1920,7 +1920,7 @@ Timer tmSerial vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",20 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1937,7 +1937,7 @@ Timer tmSerial bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 } if(type3.txt=="button") { @@ -1952,7 +1952,7 @@ Timer tmSerial bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 } if(type3.txt=="number") { @@ -1965,7 +1965,7 @@ Timer tmSerial vis hSlider3,1 vis nNum3,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,"~",20 //first value is current value spstr bText3.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1981,9 +1981,9 @@ Timer tmSerial hSlider3.maxval=sys0 } // 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 bUp4,0 @@ -1998,16 +1998,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,sys0,0,0 tIcon4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,",",25 + spstr strCommand.txt,tEntity4.txt,"~",25 vis tEntity4,1 } if(type4.txt=="shutter") @@ -2030,7 +2030,7 @@ Timer tmSerial vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",26 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -2044,7 +2044,7 @@ Timer tmSerial vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",26 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -2061,7 +2061,7 @@ Timer tmSerial bText4.pco=65535 bText4.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 } if(type4.txt=="button") { @@ -2076,7 +2076,7 @@ Timer tmSerial bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 } if(type4.txt=="number") { @@ -2089,7 +2089,7 @@ Timer tmSerial vis hSlider4,1 vis nNum4,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,"~",26 //first value is current value spstr bText4.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2105,9 +2105,9 @@ Timer tmSerial hSlider4.maxval=sys0 } // 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 bUp5,0 @@ -2122,16 +2122,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",29 + spstr strCommand.txt,tTmp.txt,"~",29 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1 vis tIcon5,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",30 + spstr strCommand.txt,tTmp.txt,"~",30 covx tTmp.txt,sys0,0,0 tIcon5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,",",31 + spstr strCommand.txt,tEntity5.txt,"~",31 vis tEntity5,1 } if(type5.txt=="shutter") @@ -2154,7 +2154,7 @@ Timer tmSerial vis hSlider5,0 vis nNum5,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",32 + spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,sys0,0,0 btOnOff5.val=sys0 } @@ -2168,7 +2168,7 @@ Timer tmSerial vis hSlider5,0 vis nNum5,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",32 + spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,sys0,0,0 btOnOff5.val=sys0 } @@ -2185,7 +2185,7 @@ Timer tmSerial bText5.pco=65535 bText5.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText5.txt,",",32 + spstr strCommand.txt,bText5.txt,"~",32 } if(type5.txt=="button") { @@ -2200,7 +2200,7 @@ Timer tmSerial bText5.pco=1374 bText5.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText5.txt,",",32 + spstr strCommand.txt,bText5.txt,"~",32 } if(type5.txt=="number") { @@ -2213,7 +2213,7 @@ Timer tmSerial vis hSlider5,1 vis nNum5,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText5.txt,",",32 + spstr strCommand.txt,bText5.txt,"~",32 //first value is current value spstr bText5.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2229,9 +2229,9 @@ Timer tmSerial hSlider5.maxval=sys0 } // 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 bUp6,0 @@ -2246,16 +2246,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",35 + spstr strCommand.txt,tTmp.txt,"~",35 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1 vis tIcon6,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",36 + spstr strCommand.txt,tTmp.txt,"~",36 covx tTmp.txt,sys0,0,0 tIcon6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,",",37 + spstr strCommand.txt,tEntity6.txt,"~",37 vis tEntity6,1 } if(type6.txt=="shutter") @@ -2278,7 +2278,7 @@ Timer tmSerial vis hSlider6,0 vis nNum6,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",38 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,sys0,0,0 btOnOff6.val=sys0 } @@ -2292,7 +2292,7 @@ Timer tmSerial vis hSlider6,0 vis nNum6,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",38 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,sys0,0,0 btOnOff6.val=sys0 } @@ -2309,7 +2309,7 @@ Timer tmSerial bText6.pco=65535 bText6.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText6.txt,",",38 + spstr strCommand.txt,bText6.txt,"~",38 } if(type6.txt=="button") { @@ -2324,7 +2324,7 @@ Timer tmSerial bText6.pco=1374 bText6.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText6.txt,",",38 + spstr strCommand.txt,bText6.txt,"~",38 } if(type6.txt=="number") { @@ -2337,7 +2337,7 @@ Timer tmSerial vis hSlider6,1 vis nNum6,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText6.txt,",",38 + spstr strCommand.txt,bText6.txt,"~",38 //first value is current value spstr bText6.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2357,11 +2357,11 @@ Timer tmSerial { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 @@ -2411,23 +2411,23 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } // end of user code diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index e19d2127..523fd3f0 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -568,13 +568,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 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 strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -601,9 +601,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 @@ -611,22 +611,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 @@ -634,22 +634,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 @@ -657,22 +657,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 @@ -680,22 +680,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 @@ -703,22 +703,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 @@ -726,16 +726,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.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 + 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 } } @@ -743,11 +743,11 @@ Timer tmSerial { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 @@ -797,23 +797,23 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } // end of user code diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 91e9970b..39b5a16f 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -503,13 +503,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + 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 strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -583,35 +583,35 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index d3adea0e..89912833 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -640,13 +640,13 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 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 strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -673,23 +673,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,"~",5 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 @@ -702,156 +702,156 @@ 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 // 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 // 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 // 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 // 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 // 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 // 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 // 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 // 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 // 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 } @@ -860,11 +860,11 @@ Timer tmSerial { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 @@ -914,23 +914,23 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } // end of user code diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 7e4a8616..132b3fdf 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 25 + Text : 26 Max. Text Size : 10 Picture p0 @@ -257,27 +257,27 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="pageType") @@ -285,11 +285,11 @@ Timer tmSerial dim=100 //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 8eeb9fee..6dc5a976 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -438,24 +438,24 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpdateDetail") { // change icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // get Button State - spstr strCommand.txt,tTmp.txt,",",3 + spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 // get Brightness value - spstr strCommand.txt,tTmp.txt,",",4 + spstr strCommand.txt,tTmp.txt,"~",4 if(tTmp.txt=="disable") { vis t1,0 @@ -473,7 +473,7 @@ Timer tmSerial } } // get ColorTemp value - spstr strCommand.txt,tTmp.txt,",",5 + spstr strCommand.txt,tTmp.txt,"~",5 if(tTmp.txt=="disable") { vis hTempSlider,0 @@ -517,7 +517,7 @@ Timer tmSerial } } // get Color value - spstr strCommand.txt,tTmp.txt,",",6 + spstr strCommand.txt,tTmp.txt,"~",6 // disable -> isn't supported if(tTmp.txt=="disable") { @@ -541,34 +541,34 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out/popupNotify.txt b/HMI/US/portrait/n2t-out/popupNotify.txt index 7510b64a..d744b49f 100644 --- a/HMI/US/portrait/n2t-out/popupNotify.txt +++ b/HMI/US/portrait/n2t-out/popupNotify.txt @@ -251,70 +251,70 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpdateDetail") { // get entn - spstr strCommand.txt,entn.txt,"|",1 + spstr strCommand.txt,entn.txt,"~",1 // get Heading - spstr strCommand.txt,tHeading.txt,"|",2 + spstr strCommand.txt,tHeading.txt,"~",2 // heading color - spstr strCommand.txt,tTmp.txt,"|",3 + spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 tHeading.pco=sys0 // get b1 - spstr strCommand.txt,b1.txt,"|",4 + spstr strCommand.txt,b1.txt,"~",4 if(b1.txt!="") { vis b1,1 } // b1 color - spstr strCommand.txt,tTmp.txt,"|",5 + spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,sys0,0,0 b1.pco=sys0 // get b2 - spstr strCommand.txt,b2.txt,"|",6 + spstr strCommand.txt,b2.txt,"~",6 if(b2.txt!="") { vis b2,1 } // b2 color - spstr strCommand.txt,tTmp.txt,"|",7 + spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,sys0,0,0 b2.pco=sys0 // get tText - spstr strCommand.txt,tText.txt,"|",8 + spstr strCommand.txt,tText.txt,"~",8 // tText color - spstr strCommand.txt,tTmp.txt,"|",9 + spstr strCommand.txt,tTmp.txt,"~",9 covx tTmp.txt,sys0,0,0 tText.pco=sys0 //preserve old sleepTimeout vaOldSleepT.val=sleepTimeout // sleep timeout - spstr strCommand.txt,tTmp.txt,"|",10 + spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 } if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="exitPopup") @@ -326,11 +326,11 @@ Timer tmSerial sleepTimeout=vaOldSleepT.val //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index ae194231..f4cb4de8 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -324,45 +324,45 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpdateDetail") { // get Position value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sys0,0,0 hPosition.val=sys0 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 } if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + 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 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index f7803de6..07b0baaf 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -355,7 +355,7 @@ Timer tmSerial // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="wake") { //dim=100 @@ -364,14 +364,14 @@ Timer tmSerial if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="time") { //get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 if(tAMPM.txt=="") @@ -382,13 +382,13 @@ Timer tmSerial if(tInstruction.txt=="date") { //get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 tDate.txt=pageIcons.vaDate.txt } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="weatherUpdate") @@ -400,48 +400,48 @@ Timer tmSerial vis tMRIcon,0 vis tMR,0 //tMainIcon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tMainText.txt,"~",2 tMainTextAlt.txt=tMainText.txt //tForecast1 - spstr strCommand.txt,tForecast1.txt,"?",3 + spstr strCommand.txt,tForecast1.txt,"~",3 //tF1Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast1Val.txt,"~",5 //tForecast2 - spstr strCommand.txt,tForecast2.txt,"?",6 + spstr strCommand.txt,tForecast2.txt,"~",6 //tF2Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast2Val.txt,"~",8 //tForecast3 - spstr strCommand.txt,tForecast3.txt,"?",9 + spstr strCommand.txt,tForecast3.txt,"~",9 //tF3Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast3Val.txt,"~",11 //tForecast4 - spstr strCommand.txt,tForecast4.txt,"?",12 + spstr strCommand.txt,tForecast4.txt,"~",12 //tF4Icon - spstr strCommand.txt,tTmp.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 + spstr strCommand.txt,tForecast4Val.txt,"~",14 //alternative layout //tMRIcon - spstr strCommand.txt,tTmp.txt,"?",15 + spstr strCommand.txt,tTmp.txt,"~",15 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 if(tTmp.txt!="") @@ -468,18 +468,18 @@ Timer tmSerial tF2Icon.txt=tF1Icon.txt } //tMR - spstr strCommand.txt,tMR.txt,"?",16 + spstr strCommand.txt,tMR.txt,"~",16 } if(tInstruction.txt=="pageType") { dim=100 //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 u[2]+3 bufferPos=0 diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 8e56c87f..15e4469c 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 25 + Text : 26 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 1873d986..6339035e 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 25 + Text : 26 Max. Text Size : 10 Picture p0