diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 25a97549..c43c9aef 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-01 04:54:12.888152138 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 04:54:13.840218589 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 14:58:12.364010551 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -9,9 +9,134 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt 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,7 +629,7 @@ + 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") + { +@@ -638,25 +639,25 @@ + 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 04:54:12.888152138 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 04:54:13.844218868 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 14:58:12.364010551 +0000 @@ -211,7 +211,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -48,12 +173,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt Text tSend Attributes -@@ -1125,33 +1125,6 @@ +@@ -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 +- 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") - { @@ -79,12 +210,355 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt - 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 ++ 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,7 +1680,7 @@ + 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") + { +@@ -1717,13 +1690,13 @@ + 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 04:54:12.888152138 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 04:54:13.844218868 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 14:58:12.364010551 +0000 @@ -12,28 +12,307 @@ Events @@ -409,12 +883,18 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt Variable (string) strCommand Attributes -@@ -573,33 +852,6 @@ +@@ -568,42 +847,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,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") - { @@ -440,12 +920,562 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt - 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 ++ 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 +863,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 +886,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 +909,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 +932,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 +955,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 +978,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 +995,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,7 +1049,7 @@ + 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") + { +@@ -807,13 +1059,13 @@ + 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/landscape/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-01 14:58:12.364010551 +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,7 +583,7 @@ + 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") + { +@@ -593,25 +593,25 @@ + 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/landscape/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-01 14:58:12.364010551 +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,7 +914,7 @@ + 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") + { +@@ -924,13 +924,13 @@ + 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/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-01 04:54:12.884151859 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 04:54:13.840218589 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 14:58:12.364010551 +0000 @@ -20,7 +20,7 @@ Attributes Scope : global @@ -455,9 +1485,254 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt Text tIcons Attributes +diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt +--- HMI/n2t-out/pageStartup.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-01 14:58:12.364010551 +0000 +@@ -257,11 +257,11 @@ + // 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") + { +@@ -271,13 +271,13 @@ + 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/landscape/n2t-out/popupLight.txt +--- HMI/n2t-out/popupLight.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-01 14:58:12.364010551 +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,7 +541,7 @@ + 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") + { +@@ -551,24 +551,24 @@ + 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 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-01 14:58:12.364010551 +0000 +@@ -251,7 +251,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=="entityUpdateDetail") + { + // get entn +@@ -298,7 +298,7 @@ + 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") + { +@@ -308,13 +308,13 @@ + 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 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-01 14:58:12.364010551 +0000 +@@ -324,24 +324,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") + { + // 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") + { +@@ -351,18 +351,18 @@ + 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 04:54:12.884151859 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 04:54:13.840218589 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 14:58:12.364010551 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event @@ -617,7 +1892,39 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt Attributes Scope : local Dragging : 0 -@@ -393,20 +373,12 @@ +@@ -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=="") +@@ -388,25 +368,17 @@ + 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") { @@ -638,7 +1945,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt //tForecast1 spstr strCommand.txt,tForecast1.txt,"?",3 //tF1Icon -@@ -439,36 +411,6 @@ +@@ -439,47 +411,17 @@ substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 //tForecast4Val spstr strCommand.txt,tForecast4Val.txt,"?",14 @@ -675,3 +1982,17 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt } 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 b67f80b1..b2a05bb4 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 04:54:12.884151859 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 04:54:13.372185922 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 14:58:11.972012802 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,9 +10,137 @@ 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 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-01 14:58:11.972012802 +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,7 +628,7 @@ + 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") + { +@@ -638,25 +638,25 @@ + 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 04:54:12.888152138 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 04:54:13.372185922 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 14:58:11.972012802 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -525,7 +653,332 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Timer tmSerial Attributes Scope : local -@@ -1648,6 +2104,254 @@ +@@ -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 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -780,9 +1233,622 @@ 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,7 +2411,7 @@ + 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") + { +@@ -1717,13 +2421,13 @@ + 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 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-01 14:58:11.972012802 +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,7 +797,7 @@ + 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") + { +@@ -807,13 +807,13 @@ + 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 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-01 14:58:11.972012802 +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,7 +583,7 @@ + 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") + { +@@ -593,25 +593,25 @@ + 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 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-01 14:58:11.972012802 +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,7 +914,7 @@ + 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") + { +@@ -924,13 +924,13 @@ + 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 04:54:12.884151859 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 04:54:13.372185922 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-01 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 14:58:11.972012802 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -801,3 +1867,298 @@ 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,11 +257,11 @@ + // 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") + { +@@ -271,13 +271,13 @@ + 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 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-01 14:58:11.972012802 +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,7 +541,7 @@ + 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") + { +@@ -551,24 +551,24 @@ + 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 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-01 14:58:11.972012802 +0000 +@@ -251,7 +251,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=="entityUpdateDetail") + { + // get entn +@@ -298,7 +298,7 @@ + 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") + { +@@ -308,13 +308,13 @@ + 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 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-01 14:58:11.972012802 +0000 +@@ -324,24 +324,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") + { + // 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") + { +@@ -351,18 +351,18 @@ + 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 14:58:11.568015122 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-01 14:58:11.972012802 +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=="") +@@ -388,7 +388,7 @@ + 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") +@@ -475,11 +475,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 u[2]+3 + bufferPos=0 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index a40e1ec2..b215f6a8 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/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,7 +1158,7 @@ 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") { @@ -1168,25 +1168,25 @@ 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=="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/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index be22671f..9cf859b3 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2065,13 +2065,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") { @@ -2098,9 +2098,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 @@ -2115,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") @@ -2147,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 } @@ -2161,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 } @@ -2178,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") { @@ -2193,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") { @@ -2206,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 @@ -2222,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 @@ -2239,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") @@ -2271,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 } @@ -2285,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 } @@ -2302,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") { @@ -2317,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") { @@ -2330,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 @@ -2346,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 @@ -2363,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") @@ -2395,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 } @@ -2409,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 } @@ -2426,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") { @@ -2441,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") { @@ -2454,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 @@ -2470,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 @@ -2487,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") @@ -2519,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 } @@ -2533,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 } @@ -2550,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") { @@ -2565,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") { @@ -2578,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 @@ -2598,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 @@ -2652,7 +2652,7 @@ 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") { @@ -2662,13 +2662,13 @@ 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 } 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/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 3c803733..47e62d70 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/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,7 +1234,7 @@ 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") { @@ -1244,13 +1244,13 @@ 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 } 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/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index c0ad31b2..74bd53c9 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/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,7 +1005,7 @@ 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") { @@ -1015,25 +1015,25 @@ 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=="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/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index fda215ce..8a81eb9e 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/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,7 +1467,7 @@ 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") { @@ -1477,13 +1477,13 @@ 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 } 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/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 26eac4f3..e6d6a121 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,22 +14,14 @@ pageIcons 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code -popupNotify - 17 Component(s) - 178 Line(s) of event code - 117 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 -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code +popupNotify + 17 Component(s) + 178 Line(s) of event code + 117 Unique line(s) of event code popupLight 27 Component(s) 322 Line(s) of event code @@ -38,10 +30,10 @@ cardMedia 30 Component(s) 331 Line(s) of event code 169 Unique line(s) of event code -cardAlarm - 35 Component(s) - 343 Line(s) of event code - 214 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code cardGrid 39 Component(s) 428 Line(s) of event code @@ -50,13 +42,21 @@ cardThermo 41 Component(s) 458 Line(s) of event code 283 Unique line(s) of event code +screensaver + 33 Component(s) + 207 Line(s) of event code + 159 Unique line(s) of event code +cardAlarm + 35 Component(s) + 343 Line(s) of event code + 214 Unique line(s) of event code cardEntities 62 Component(s) 970 Line(s) of event code 412 Unique line(s) of event code Total - 14 Page(s) + 13 Page(s) 355 Component(s) 3637 Line(s) of event code - 1056 Unique line(s) of event code + 1064 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index fa264955..be6adfbe 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -552,11 +552,11 @@ 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") { @@ -566,13 +566,13 @@ 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 } 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/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 6c8b8a0d..4839a501 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/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,7 +887,7 @@ 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") { @@ -897,24 +897,24 @@ 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 } 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/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index b64b201b..ba6f6bf3 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -460,7 +460,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=="entityUpdateDetail") { // get entn @@ -507,7 +507,7 @@ 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") { @@ -517,13 +517,13 @@ 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 } 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/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index cf0b1610..66decfd7 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -589,24 +589,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") { // 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") { @@ -616,18 +616,18 @@ Timer tmSerial 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/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 5866e161..3baf3f89 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/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=="") @@ -910,7 +910,7 @@ Timer tmSerial 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") @@ -997,11 +997,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 u[2]+3 bufferPos=0 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 00771f02..a6613c03 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/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,7 +628,7 @@ 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") { @@ -638,25 +638,25 @@ 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=="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/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 3b92b12e..5e0f8ae0 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1120,13 +1120,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") { @@ -1153,9 +1153,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 @@ -1170,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") @@ -1202,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 } @@ -1216,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 } @@ -1233,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") { @@ -1248,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") { @@ -1261,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 @@ -1277,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 @@ -1294,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") @@ -1326,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 } @@ -1340,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 } @@ -1357,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") { @@ -1372,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") { @@ -1385,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 @@ -1401,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 @@ -1418,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") @@ -1450,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 } @@ -1464,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 } @@ -1481,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") { @@ -1496,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") { @@ -1509,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 @@ -1525,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 @@ -1542,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") @@ -1574,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 } @@ -1588,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 } @@ -1605,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") { @@ -1620,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") { @@ -1633,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 @@ -1653,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 @@ -1707,7 +1707,7 @@ 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") { @@ -1717,13 +1717,13 @@ 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 } 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/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index e19d2127..2c4de6b2 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/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,7 +797,7 @@ 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") { @@ -807,13 +807,13 @@ 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 } 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/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 91e9970b..8bcee39e 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/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,7 +583,7 @@ 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") { @@ -593,25 +593,25 @@ 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=="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/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index d3adea0e..b5c89aea 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/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,7 +914,7 @@ 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") { @@ -924,13 +924,13 @@ 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 } 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/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 8f057a6c..d67f52cf 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -257,11 +257,11 @@ 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") { @@ -271,13 +271,13 @@ 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 } 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/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 8eeb9fee..913cad49 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/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,7 +541,7 @@ 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") { @@ -551,24 +551,24 @@ 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 } 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/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 7510b64a..cd663f76 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -251,7 +251,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=="entityUpdateDetail") { // get entn @@ -298,7 +298,7 @@ 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") { @@ -308,13 +308,13 @@ 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 } 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/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index ae194231..54c09187 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -324,24 +324,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") { // 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") { @@ -351,18 +351,18 @@ Timer tmSerial 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/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index f7803de6..d9233059 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/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=="") @@ -388,7 +388,7 @@ Timer tmSerial 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") @@ -475,11 +475,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 u[2]+3 bufferPos=0