diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt --- HMI/n2t-out/cardAlarm.txt 2022-04-01 17:25:58.645575442 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 17:25:59.457580623 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 vis tId,0 + //vis nPageDisp,0 vis arm1,0 vis arm2,0 vis arm3,0 @@ -512,13 +513,13 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,"~",0 + spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") { //entn - spstr strCommand.txt,entn.txt,"~",1 + spstr strCommand.txt,entn.txt,",",1 // navigation icons - spstr strCommand.txt,tId.txt,"~",2 + spstr strCommand.txt,tId.txt,",",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { @@ -545,47 +546,47 @@ bNext.txt="" } //text arm1 - spstr strCommand.txt,arm1.txt,"~",3 + spstr strCommand.txt,arm1.txt,",",3 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,"~",4 + spstr strCommand.txt,va1.txt,",",4 //text arm2 - spstr strCommand.txt,arm2.txt,"~",5 + spstr strCommand.txt,arm2.txt,",",5 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,"~",6 + spstr strCommand.txt,va2.txt,",",6 //text arm3 - spstr strCommand.txt,arm3.txt,"~",7 + spstr strCommand.txt,arm3.txt,",",7 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,"~",8 + spstr strCommand.txt,va3.txt,",",8 //text arm4 - spstr strCommand.txt,arm4.txt,"~",9 + spstr strCommand.txt,arm4.txt,",",9 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,"~",10 + spstr strCommand.txt,va4.txt,",",10 //icon - spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,",",11 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 //icon color - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,"~",13 + spstr strCommand.txt,tTmp.txt,",",13 if(tTmp.txt!="disable") { vis b0,1 @@ -616,7 +617,7 @@ vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,",",14 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -628,35 +629,35 @@ if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="pageType") { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,"~",1 + spstr strCommand.txt,tId.txt,",",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,",",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt --- HMI/n2t-out/cardEntities.txt 2022-04-01 17:25:58.649575467 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 17:25:59.457580623 +0000 @@ -211,7 +211,7 @@ Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 5 + Max. Text Size : 10 Text tIcon2 Attributes @@ -221,7 +221,7 @@ Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 5 + Max. Text Size : 30 Text tIcon3 Attributes @@ -231,7 +231,7 @@ Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 5 + Max. Text Size : 10 Text tIcon4 Attributes @@ -241,7 +241,7 @@ Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 5 + Max. Text Size : 30 Text tSend Attributes @@ -1120,42 +1120,15 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,"~",0 + spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 - spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") - { - vis bPrev,0 - } - if(tTmp.txt=="1") - { - vis bPrev,1 - bPrev.txt="" - } - if(tTmp.txt=="2") - { - vis bPrev,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") - { - vis bNext,0 - } - if(tTmp.txt=="1") - { - vis bPrev,1 - bNext.txt="" - } + spstr strCommand.txt,tHeading.txt,",",1 // get Type - spstr strCommand.txt,type1.txt,"~",3 + spstr strCommand.txt,type1.txt,",",3 // get internal name - spstr strCommand.txt,entn1.txt,"~",4 + spstr strCommand.txt,entn1.txt,",",4 if(type1.txt=="delete"||type1.txt=="") { vis bUp1,0 @@ -1170,16 +1143,16 @@ }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,",",5 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 vis tIcon1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,",",6 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",7 + spstr strCommand.txt,tEntity1.txt,",",7 vis tEntity1,1 } if(type1.txt=="shutter") @@ -1202,7 +1175,7 @@ vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,",",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1216,7 +1189,7 @@ vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,",",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1233,7 +1206,7 @@ bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,"~",8 + spstr strCommand.txt,bText1.txt,",",8 } if(type1.txt=="button") { @@ -1248,7 +1221,7 @@ bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,"~",8 + spstr strCommand.txt,bText1.txt,",",8 } if(type1.txt=="number") { @@ -1261,7 +1234,7 @@ vis hSlider1,1 vis nNum1,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText1.txt,"~",8 + spstr strCommand.txt,bText1.txt,",",8 //first value is current value spstr bText1.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1277,9 +1250,9 @@ hSlider1.maxval=sys0 } // get Type - spstr strCommand.txt,type2.txt,"~",9 + spstr strCommand.txt,type2.txt,",",9 // get internal name - spstr strCommand.txt,entn2.txt,"~",10 + spstr strCommand.txt,entn2.txt,",",10 if(type2.txt=="delete"||type2.txt=="") { vis bUp2,0 @@ -1294,16 +1267,16 @@ }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,",",11 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1 vis tIcon2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",13 + spstr strCommand.txt,tEntity2.txt,",",13 vis tEntity2,1 } if(type2.txt=="shutter") @@ -1326,7 +1299,7 @@ vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,",",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1340,7 +1313,7 @@ vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,",",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1357,7 +1330,7 @@ bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",14 + spstr strCommand.txt,bText2.txt,",",14 } if(type2.txt=="button") { @@ -1372,7 +1345,7 @@ bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",14 + spstr strCommand.txt,bText2.txt,",",14 } if(type2.txt=="number") { @@ -1385,7 +1358,7 @@ vis hSlider2,1 vis nNum2,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText2.txt,"~",14 + spstr strCommand.txt,bText2.txt,",",14 //first value is current value spstr bText2.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1401,9 +1374,9 @@ hSlider2.maxval=sys0 } // get Type - spstr strCommand.txt,type3.txt,"~",15 + spstr strCommand.txt,type3.txt,",",15 // get internal name - spstr strCommand.txt,entn3.txt,"~",16 + spstr strCommand.txt,entn3.txt,",",16 if(type3.txt=="delete"||type3.txt=="") { vis bUp3,0 @@ -1418,16 +1391,16 @@ }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,",",17 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1 vis tIcon3,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,",",18 covx tTmp.txt,sys0,0,0 tIcon3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,"~",19 + spstr strCommand.txt,tEntity3.txt,",",19 vis tEntity3,1 } if(type3.txt=="shutter") @@ -1450,7 +1423,7 @@ vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",20 + spstr strCommand.txt,tTmp.txt,",",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1464,7 +1437,7 @@ vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",20 + spstr strCommand.txt,tTmp.txt,",",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1481,7 +1454,7 @@ bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,"~",20 + spstr strCommand.txt,bText3.txt,",",20 } if(type3.txt=="button") { @@ -1496,7 +1469,7 @@ bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,"~",20 + spstr strCommand.txt,bText3.txt,",",20 } if(type3.txt=="number") { @@ -1509,7 +1482,7 @@ vis hSlider3,1 vis nNum3,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText3.txt,"~",20 + spstr strCommand.txt,bText3.txt,",",20 //first value is current value spstr bText3.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1525,9 +1498,9 @@ hSlider3.maxval=sys0 } // get Type - spstr strCommand.txt,type4.txt,"~",21 + spstr strCommand.txt,type4.txt,",",21 // get internal name - spstr strCommand.txt,entn4.txt,"~",22 + spstr strCommand.txt,entn4.txt,",",22 if(type4.txt=="delete"||type4.txt=="") { vis bUp4,0 @@ -1542,16 +1515,16 @@ }else { // change icon - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,",",23 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1 vis tIcon4,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,",",24 covx tTmp.txt,sys0,0,0 tIcon4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,"~",25 + spstr strCommand.txt,tEntity4.txt,",",25 vis tEntity4,1 } if(type4.txt=="shutter") @@ -1574,7 +1547,7 @@ vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",26 + spstr strCommand.txt,tTmp.txt,",",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -1588,7 +1561,7 @@ vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",26 + spstr strCommand.txt,tTmp.txt,",",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -1605,7 +1578,7 @@ bText4.pco=65535 bText4.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,"~",26 + spstr strCommand.txt,bText4.txt,",",26 } if(type4.txt=="button") { @@ -1620,7 +1593,7 @@ bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,"~",26 + spstr strCommand.txt,bText4.txt,",",26 } if(type4.txt=="number") { @@ -1633,7 +1606,7 @@ vis hSlider4,1 vis nNum4,1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText4.txt,"~",26 + spstr strCommand.txt,bText4.txt,",",26 //first value is current value spstr bText4.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1653,11 +1626,11 @@ { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,"~",1 + spstr strCommand.txt,tId.txt,",",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,",",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -1707,23 +1680,23 @@ if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,dimValue,0,0 } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sleepTimeout,0,0 } // end of user code diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt --- HMI/n2t-out/cardGrid.txt 2022-04-01 17:25:58.649575467 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 17:25:59.457580623 +0000 @@ -12,28 +12,307 @@ Events Preinitialize Event - //wup=cardEntities - //remove background & activate reparse mode - vis p0,0 - recmod=1 - bauds=115200 - //debug stuff - vis tTmp,0 - vis tSend,0 - vis tInstruction,0 - vis tId,0 - vis bEntity1,0 - vis bEntity2,0 - vis bEntity3,0 - vis bEntity4,0 - vis bEntity5,0 - vis bEntity6,0 + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos isn't supported if(tTmp.txt=="disable") { @@ -541,34 +541,34 @@ if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,dimValue,0,0 } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="pageType") { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,"~",1 + spstr strCommand.txt,tId.txt,",",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,",",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt --- HMI/n2t-out/popupNotify.txt 2022-04-01 17:25:58.645575442 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-01 17:25:59.457580623 +0000 @@ -251,70 +251,70 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,"~",0 + spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpdateDetail") { // get entn - spstr strCommand.txt,entn.txt,"~",1 + spstr strCommand.txt,entn.txt,"|",1 // get Heading - spstr strCommand.txt,tHeading.txt,"~",2 + spstr strCommand.txt,tHeading.txt,"|",2 // heading color - spstr strCommand.txt,tTmp.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"|",3 covx tTmp.txt,sys0,0,0 tHeading.pco=sys0 // get b1 - spstr strCommand.txt,b1.txt,"~",4 + spstr strCommand.txt,b1.txt,"|",4 if(b1.txt!="") { vis b1,1 } // b1 color - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"|",5 covx tTmp.txt,sys0,0,0 b1.pco=sys0 // get b2 - spstr strCommand.txt,b2.txt,"~",6 + spstr strCommand.txt,b2.txt,"|",6 if(b2.txt!="") { vis b2,1 } // b2 color - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"|",7 covx tTmp.txt,sys0,0,0 b2.pco=sys0 // get tText - spstr strCommand.txt,tText.txt,"~",8 + spstr strCommand.txt,tText.txt,"|",8 // tText color - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"|",9 covx tTmp.txt,sys0,0,0 tText.pco=sys0 //preserve old sleepTimeout vaOldSleepT.val=sleepTimeout // sleep timeout - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"|",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 } if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,dimValue,0,0 } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="exitPopup") @@ -326,11 +326,11 @@ sleepTimeout=vaOldSleepT.val //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,"~",1 + spstr strCommand.txt,tId.txt,",",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,",",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt --- HMI/n2t-out/popupShutter.txt 2022-04-01 17:25:58.645575442 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-01 17:25:59.457580623 +0000 @@ -324,45 +324,45 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,"~",0 + spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpdateDetail") { // get Position value - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sys0,0,0 hPosition.val=sys0 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,dimValue,0,0 } if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="pageType") { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,"~",1 + spstr strCommand.txt,tId.txt,",",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,",",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt --- HMI/n2t-out/screensaver.txt 2022-04-01 17:25:58.649575467 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 17:25:59.457580623 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event // clear weather elements, to keep example content in HMI + tMainIcon.txt="" + tMainText.txt="" + tForecast1.txt="" + tF1Icon.txt="" + tForecast1Val.txt="" + tForecast2.txt="" + tF2Icon.txt="" + tForecast2Val.txt="" + //tSend.txt="event,screensaverOpen" + //send calc crc + //btlen tSend.txt,sys0 + //crcrest 1,0xffff // reset CRC + //crcputh 55 bb + //crcputs sys0,1 + //crcputs tSend.txt,0 + //send cmd + //printh 55 bb + //prints sys0,2 + //prints tSend.txt,0 + //prints crcval,2 Variable (string) strCommand Attributes @@ -86,7 +106,7 @@ Send Component ID : disabled Associated Keyboard : none Text : Tuesday, 08. March 2022 - Max. Text Size : 35 + Max. Text Size : 30 Text tSend Attributes @@ -105,7 +125,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text :  Max. Text Size : 10 Text tMainText @@ -115,7 +135,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text : 2,3 °C Max. Text Size : 10 Text tForecast1 @@ -125,7 +145,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text : Mi Max. Text Size : 10 Text tForecast1Val @@ -135,7 +155,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text : 9,3 °C Max. Text Size : 10 Text tF1Icon @@ -145,7 +165,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text :  Max. Text Size : 10 Text tForecast2 @@ -155,7 +175,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text : Do Max. Text Size : 10 Text tF2Icon @@ -165,7 +185,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text :  Max. Text Size : 10 Text tForecast2Val @@ -175,7 +195,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text : 11,9 °C Max. Text Size : 10 Text t10 @@ -246,49 +266,9 @@ Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 5 - -Text tForecast4Val - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tMainTextAlt - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tMainIconAlt - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tMRIcon - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Max. Text Size : 10 -Text tMR +Text tForecast4Val Attributes Scope : local Dragging : 0 @@ -355,7 +335,7 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,"~",0 + spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="wake") { //dim=100 @@ -364,14 +344,14 @@ if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,dimValue,0,0 dim=dimValue } if(tInstruction.txt=="time") { //get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 if(tAMPM.txt=="") @@ -382,104 +362,66 @@ if(tInstruction.txt=="date") { //get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 tDate.txt=pageIcons.vaDate.txt } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="weatherUpdate") { - vis tMainIcon,1 - vis tMainIconAlt,0 - vis tMainText,1 - vis tMainTextAlt,0 - vis tMRIcon,0 - vis tMR,0 //tMainIcon - spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"?",1 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 - tMainIconAlt.txt=tMainIcon.txt //tMainText - spstr strCommand.txt,tMainText.txt,"~",2 - tMainTextAlt.txt=tMainText.txt + spstr strCommand.txt,tMainText.txt,"?",2 //tForecast1 - spstr strCommand.txt,tForecast1.txt,"~",3 + spstr strCommand.txt,tForecast1.txt,"?",3 //tF1Icon - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"?",4 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1 //tForecast1Val - spstr strCommand.txt,tForecast1Val.txt,"~",5 + spstr strCommand.txt,tForecast1Val.txt,"?",5 //tForecast2 - spstr strCommand.txt,tForecast2.txt,"~",6 + spstr strCommand.txt,tForecast2.txt,"?",6 //tF2Icon - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"?",7 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1 //tForecast2Val - spstr strCommand.txt,tForecast2Val.txt,"~",8 + spstr strCommand.txt,tForecast2Val.txt,"?",8 //tForecast3 - spstr strCommand.txt,tForecast3.txt,"~",9 + spstr strCommand.txt,tForecast3.txt,"?",9 //tF3Icon - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"?",10 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1 //tForecast3Val - spstr strCommand.txt,tForecast3Val.txt,"~",11 + spstr strCommand.txt,tForecast3Val.txt,"?",11 //tForecast4 - spstr strCommand.txt,tForecast4.txt,"~",12 + spstr strCommand.txt,tForecast4.txt,"?",12 //tF4Icon - spstr strCommand.txt,tTmp.txt,"~",13 + spstr strCommand.txt,tTmp.txt,"?",13 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 //tForecast4Val - spstr strCommand.txt,tForecast4Val.txt,"~",14 - //alternative layout - //tMRIcon - spstr strCommand.txt,tTmp.txt,"~",15 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 - if(tTmp.txt!="") - { - //value for tMRIcon, activate alternative layout - vis tMainIcon,0 - vis tMainText,0 - vis tMainTextAlt,1 - vis tMainIconAlt,1 - vis tMRIcon,1 - vis tMR,1 - vis tForecast1,0 - vis tF1Icon,0 - vis tForecast1Val,0 - //move forecast values to the right - tForecast4.txt=tForecast3.txt - tForecast3.txt=tForecast2.txt - tForecast2.txt=tForecast1.txt - tForecast4Val.txt=tForecast3Val.txt - tForecast3Val.txt=tForecast2Val.txt - tForecast2Val.txt=tForecast1Val.txt - tF4Icon.txt=tF3Icon.txt - tF3Icon.txt=tF2Icon.txt - tF2Icon.txt=tF1Icon.txt - } - //tMR - spstr strCommand.txt,tMR.txt,"~",16 + spstr strCommand.txt,tForecast4Val.txt,"?",14 } if(tInstruction.txt=="pageType") { dim=100 //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,"~",1 + spstr strCommand.txt,tId.txt,",",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,",",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete u[2]+3 bufferPos=0