diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 3d0cb8c7..56e2fb66 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -13,6 +13,2802 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup +│ --- HMI/n2t-out/cardAlarm.txt +├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt +│ @@ -59,26 +59,14 @@ +│ +│ Variable (string) entn +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 200 +│ +│ Variable (string) tSend +│ @@ -490,15 +478,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardAlarm," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -515,15 +510,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardAlarm," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -634,88 +636,94 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ //entn +│ spstr strCommand.txt,entn.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ //text arm1 +│ - spstr strCommand.txt,arm1.txt,"~",14 +│ + spstr strCommand.txt,arm1.txt,"~",3 +│ if(arm1.txt!="") +│ { +│ vis arm1,1 +│ } +│ //id arm1 +│ - spstr strCommand.txt,va1.txt,"~",15 +│ + spstr strCommand.txt,va1.txt,"~",4 +│ //text arm2 +│ - spstr strCommand.txt,arm2.txt,"~",16 +│ + spstr strCommand.txt,arm2.txt,"~",5 +│ if(arm2.txt!="") +│ { +│ vis arm2,1 +│ } +│ //id arm2 +│ - spstr strCommand.txt,va2.txt,"~",17 +│ + spstr strCommand.txt,va2.txt,"~",6 +│ //text arm3 +│ - spstr strCommand.txt,arm3.txt,"~",18 +│ + spstr strCommand.txt,arm3.txt,"~",7 +│ if(arm3.txt!="") +│ { +│ vis arm3,1 +│ } +│ //id arm3 +│ - spstr strCommand.txt,va3.txt,"~",19 +│ + spstr strCommand.txt,va3.txt,"~",8 +│ //text arm4 +│ - spstr strCommand.txt,arm4.txt,"~",20 +│ + spstr strCommand.txt,arm4.txt,"~",9 +│ if(arm4.txt!="") +│ { +│ vis arm4,1 +│ } +│ //id arm4 +│ - spstr strCommand.txt,va4.txt,"~",21 +│ + spstr strCommand.txt,va4.txt,"~",10 +│ //icon +│ - spstr strCommand.txt,tIcon.txt,"~",22 +│ + spstr strCommand.txt,tIcon.txt,"~",11 +│ //icon color +│ - spstr strCommand.txt,tTmp.txt,"~",23 +│ + spstr strCommand.txt,tTmp.txt,"~",12 +│ covx tTmp.txt,sys0,0,0 +│ tIcon.pco=sys0 +│ //numpad status +│ - spstr strCommand.txt,tTmp.txt,"~",24 +│ + spstr strCommand.txt,tTmp.txt,"~",13 +│ if(tTmp.txt!="disable") +│ { +│ vis b0,1 +│ vis b1,1 +│ vis b2,1 +│ vis b3,1 +│ vis b4,1 +│ @@ -740,30 +748,30 @@ +│ vis b8,0 +│ vis b9,0 +│ vis b10,0 +│ vis b11,0 +│ vis tCode,0 +│ } +│ //flashing status +│ - spstr strCommand.txt,tTmp.txt,"~",25 +│ + spstr strCommand.txt,tTmp.txt,"~",14 +│ if(tTmp.txt=="enable") +│ { +│ tmFlash.en=1 +│ }else +│ { +│ tmFlash.en=0 +│ } +│ // extra button +│ - spstr strCommand.txt,b9.txt,"~",26 +│ + spstr strCommand.txt,b9.txt,"~",15 +│ if(b9.txt!="") +│ { +│ vis b9,1 +│ - spstr strCommand.txt,tTmp.txt,"~",27 +│ + spstr strCommand.txt,tTmp.txt,"~",16 +│ covx tTmp.txt,b9.pco,0,0 +│ - spstr strCommand.txt,vaAddBtn.txt,"~",28 +│ + spstr strCommand.txt,vaAddBtn.txt,"~",17 +│ } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ --- HMI/n2t-out/cardChart.txt +├── +++ HMI/US/landscape/n2t-out/cardChart.txt +│ @@ -45,26 +45,14 @@ +│ +│ Variable (string) entn +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 275 +│ +│ Variable (string) strTmp +│ @@ -187,15 +175,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardChart," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -212,15 +207,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardChart," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -393,88 +395,94 @@ +│ // here is the location where acual code should be +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + if(tTmp.txt=="2") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ + } +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ // extract color +│ - spstr strCommand.txt,tTmp.txt,"~",14 +│ + spstr strCommand.txt,tTmp.txt,"~",3 +│ covx tTmp.txt,vaColorL.val,0,0 +│ // prepare dark color +│ sys0=vaColorL.val>>11 // red +│ vaColorD.val=sys0*8/10<<11 // store and shift +│ sys0=vaColorL.val>>5%64 // green +│ vaColorD.val=sys0*8/10<<5+vaColorD.val // store and shift +│ sys0=vaColorL.val%32 +│ vaColorD.val=sys0*8/10+vaColorD.val // store and add +│ // +│ // detect nValues and maxValue +│ vNValues.val=0 +│ - spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17 +│ + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 +│ strlen tTmp.txt,sya0 +│ while(sya0>0) +│ { +│ covx tTmp.txt,sya1,0,0 +│ if(sya1>vMax.val) +│ { +│ vMax.val=sya1 +│ } +│ // next +│ vNValues.val++ +│ - spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17 +│ + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 +│ strlen tTmp.txt,sya0 +│ } +│ // +│ // calculate unit width +│ sys0=vNValues.val*4 +│ sys0+=vNValues.val-1 +│ vaUnit.val=m0.w-25-40*100 +│ vaUnit.val/=sys0 +│ vaBottom.val=m0.y+m0.h-24 +│ vaLeft.val=m0.x+25+40*100 +│ vaYUnit.val=m0.h-24/vMax.val +│ // +│ line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 +│ line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 +│ - spstr strCommand.txt,strTmp.txt,"~",16 +│ + spstr strCommand.txt,strTmp.txt,"~",5 +│ sya1=0 +│ spstr strTmp.txt,tTmp.txt,":",sya1 +│ strlen tTmp.txt,sya0 +│ while(sya0>0) +│ { +│ covx tTmp.txt,sys1,0,0 +│ if(sys1<=vMax.val) +│ @@ -499,15 +507,15 @@ +│ // next +│ sya1++ +│ spstr strTmp.txt,tTmp.txt,":",sya1 +│ strlen tTmp.txt,sya0 +│ } +│ // +│ // y achis label +│ - spstr strCommand.txt,tTmp.txt,"~",15 +│ + spstr strCommand.txt,tTmp.txt,"~",4 +│ // tTmp.txt="Gas [kW]" +│ strlen tTmp.txt,sys1 +│ sya1=sys1*12+m0.h-48/2 +│ for(sys0=0;sys00) +│ { +│ vaValues.txt+="~" +│ } +│ // extract next entry +│ - spstr strCommand.txt,tTmp.txt,"~",sys0+17 +│ + spstr strCommand.txt,tTmp.txt,"~",sys0+6 +│ // calculate left +│ sys1=sys0*5*vaUnit.val +│ sys1+=vaLeft.val +│ // if there is a colon in the obtained value we have a label/and gridline +│ spstr tTmp.txt,strTmp.txt,"^",1 +│ strlen strTmp.txt,sya0 +│ if(sya0>0) +│ --- HMI/n2t-out/cardEntities.txt +├── +++ HMI/US/landscape/n2t-out/cardEntities.txt +│ @@ -106,26 +106,14 @@ +│ +│ Variable (string) entn4 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 500 +│ +│ Variable (string) tSend +│ @@ -541,15 +529,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardEntities," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -566,15 +561,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardEntities," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -1232,87 +1234,93 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ // get Type +│ - spstr strCommand.txt,type1.txt,"~",14 +│ + spstr strCommand.txt,type1.txt,"~",3 +│ // get internal name +│ - spstr strCommand.txt,entn1.txt,"~",15 +│ + spstr strCommand.txt,entn1.txt,"~",4 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ vis bUp1,0 +│ vis bStop1,0 +│ vis bDown1,0 +│ vis btOnOff1,0 +│ vis tEntity1,0 +│ vis tIcon1,0 +│ vis bText1,0 +│ vis hSlider1,0 +│ vis nNum1,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon1.txt,"~",16 +│ + spstr strCommand.txt,tIcon1.txt,"~",5 +│ vis tIcon1,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",17 +│ + spstr strCommand.txt,tTmp.txt,"~",6 +│ covx tTmp.txt,sys0,0,0 +│ tIcon1.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity1.txt,"~",18 +│ + spstr strCommand.txt,tEntity1.txt,"~",7 +│ vis tEntity1,1 +│ } +│ if(type1.txt=="shutter") +│ { +│ vis bUp1,1 +│ vis bStop1,1 +│ vis bDown1,1 +│ vis btOnOff1,0 +│ vis bText1,0 +│ vis hSlider1,0 +│ vis nNum1,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tId.txt,"~",19 +│ + spstr strCommand.txt,tId.txt,"~",8 +│ // up button +│ spstr tId.txt,tTmp.txt,"|",3 +│ if(tTmp.txt=="disable") +│ { +│ bUp1.pco=27501 +│ spstr tId.txt,bUp1.txt,"|",0 +│ tsw bUp1,0 +│ @@ -1355,15 +1363,15 @@ +│ vis bStop1,0 +│ vis bDown1,0 +│ vis btOnOff1,1 +│ vis bText1,0 +│ vis hSlider1,0 +│ vis nNum1,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",19 +│ + spstr strCommand.txt,tTmp.txt,"~",8 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff1.val=sys0 +│ } +│ if(type1.txt=="text"||type1.txt=="timer") +│ { +│ vis bUp1,0 +│ vis bStop1,0 +│ @@ -1372,43 +1380,43 @@ +│ vis bText1,1 +│ tsw bText1,0 +│ vis hSlider1,0 +│ vis nNum1,0 +│ bText1.pco=65535 +│ bText1.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText1.txt,"~",19 +│ + spstr strCommand.txt,bText1.txt,"~",8 +│ } +│ if(type1.txt=="button"||type1.txt=="input_sel") +│ { +│ vis bUp1,0 +│ vis bStop1,0 +│ vis bDown1,0 +│ vis btOnOff1,0 +│ vis bText1,1 +│ tsw bText1,1 +│ vis hSlider1,0 +│ vis nNum1,0 +│ bText1.pco=1374 +│ bText1.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText1.txt,"~",19 +│ + spstr strCommand.txt,bText1.txt,"~",8 +│ } +│ if(type1.txt=="number") +│ { +│ vis bUp1,0 +│ vis bStop1,0 +│ vis bDown1,0 +│ vis btOnOff1,0 +│ vis bText1,0 +│ tsw bText1,0 +│ vis hSlider1,1 +│ vis nNum1,1 +│ // get config (optional Value) (use bText as variable) +│ - spstr strCommand.txt,bText1.txt,"~",19 +│ + spstr strCommand.txt,bText1.txt,"~",8 +│ //first value is current value +│ spstr bText1.txt,tTmp.txt,"|",0 +│ covx tTmp.txt,sys0,0,0 +│ hSlider1.val=sys0 +│ nNum1.val=sys0 +│ //second value is min value +│ spstr bText1.txt,tTmp.txt,"|",1 +│ @@ -1416,52 +1424,52 @@ +│ hSlider1.minval=sys0 +│ //third value is max value +│ spstr bText1.txt,tTmp.txt,"|",2 +│ covx tTmp.txt,sys0,0,0 +│ hSlider1.maxval=sys0 +│ } +│ // get Type +│ - spstr strCommand.txt,type2.txt,"~",20 +│ + spstr strCommand.txt,type2.txt,"~",9 +│ // get internal name +│ - spstr strCommand.txt,entn2.txt,"~",21 +│ + spstr strCommand.txt,entn2.txt,"~",10 +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ vis bUp2,0 +│ vis bStop2,0 +│ vis bDown2,0 +│ vis btOnOff2,0 +│ vis tEntity2,0 +│ vis tIcon2,0 +│ vis bText2,0 +│ vis hSlider2,0 +│ vis nNum2,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon2.txt,"~",22 +│ + spstr strCommand.txt,tIcon2.txt,"~",11 +│ vis tIcon2,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",23 +│ + spstr strCommand.txt,tTmp.txt,"~",12 +│ covx tTmp.txt,sys0,0,0 +│ tIcon2.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity2.txt,"~",24 +│ + spstr strCommand.txt,tEntity2.txt,"~",13 +│ vis tEntity2,1 +│ } +│ if(type2.txt=="shutter") +│ { +│ vis bUp2,1 +│ vis bStop2,1 +│ vis bDown2,1 +│ vis btOnOff2,0 +│ vis bText2,0 +│ vis hSlider2,0 +│ vis nNum2,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tId.txt,"~",25 +│ + spstr strCommand.txt,tId.txt,"~",14 +│ // up button +│ spstr tId.txt,tTmp.txt,"|",3 +│ if(tTmp.txt=="disable") +│ { +│ bUp2.pco=27501 +│ spstr tId.txt,bUp2.txt,"|",0 +│ tsw bUp2,0 +│ @@ -1504,15 +1512,15 @@ +│ vis bStop2,0 +│ vis bDown2,0 +│ vis btOnOff2,1 +│ vis bText2,0 +│ vis hSlider2,0 +│ vis nNum2,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",25 +│ + spstr strCommand.txt,tTmp.txt,"~",14 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff2.val=sys0 +│ } +│ if(type2.txt=="text"||type2.txt=="timer") +│ { +│ vis bUp2,0 +│ vis bStop2,0 +│ @@ -1521,43 +1529,43 @@ +│ vis bText2,1 +│ tsw bText2,0 +│ vis hSlider2,0 +│ vis nNum2,0 +│ bText2.pco=65535 +│ bText2.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText2.txt,"~",25 +│ + spstr strCommand.txt,bText2.txt,"~",14 +│ } +│ if(type2.txt=="button"||type2.txt=="input_sel") +│ { +│ vis bUp2,0 +│ vis bStop2,0 +│ vis bDown2,0 +│ vis btOnOff2,0 +│ vis bText2,1 +│ tsw bText2,1 +│ vis hSlider2,0 +│ vis nNum2,0 +│ bText2.pco=1374 +│ bText2.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText2.txt,"~",25 +│ + spstr strCommand.txt,bText2.txt,"~",14 +│ } +│ if(type2.txt=="number") +│ { +│ vis bUp2,0 +│ vis bStop2,0 +│ vis bDown2,0 +│ vis btOnOff2,0 +│ vis bText2,0 +│ tsw bText2,0 +│ vis hSlider2,1 +│ vis nNum2,1 +│ // get config (optional Value) (use bText as variable) +│ - spstr strCommand.txt,bText2.txt,"~",25 +│ + spstr strCommand.txt,bText2.txt,"~",14 +│ //first value is current value +│ spstr bText2.txt,tTmp.txt,"|",0 +│ covx tTmp.txt,sys0,0,0 +│ hSlider2.val=sys0 +│ nNum2.val=sys0 +│ //second value is min value +│ spstr bText2.txt,tTmp.txt,"|",1 +│ @@ -1565,52 +1573,52 @@ +│ hSlider2.minval=sys0 +│ //third value is max value +│ spstr bText2.txt,tTmp.txt,"|",2 +│ covx tTmp.txt,sys0,0,0 +│ hSlider2.maxval=sys0 +│ } +│ // get Type +│ - spstr strCommand.txt,type3.txt,"~",26 +│ + spstr strCommand.txt,type3.txt,"~",15 +│ // get internal name +│ - spstr strCommand.txt,entn3.txt,"~",27 +│ + spstr strCommand.txt,entn3.txt,"~",16 +│ if(type3.txt=="delete"||type3.txt=="") +│ { +│ vis bUp3,0 +│ vis bStop3,0 +│ vis bDown3,0 +│ vis btOnOff3,0 +│ vis tEntity3,0 +│ vis tIcon3,0 +│ vis bText3,0 +│ vis hSlider3,0 +│ vis nNum3,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon3.txt,"~",28 +│ + spstr strCommand.txt,tIcon3.txt,"~",17 +│ vis tIcon3,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",29 +│ + spstr strCommand.txt,tTmp.txt,"~",18 +│ covx tTmp.txt,sys0,0,0 +│ tIcon3.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity3.txt,"~",30 +│ + spstr strCommand.txt,tEntity3.txt,"~",19 +│ vis tEntity3,1 +│ } +│ if(type3.txt=="shutter") +│ { +│ vis bUp3,1 +│ vis bStop3,1 +│ vis bDown3,1 +│ vis btOnOff3,0 +│ vis bText3,0 +│ vis hSlider3,0 +│ vis nNum3,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tId.txt,"~",31 +│ + spstr strCommand.txt,tId.txt,"~",20 +│ // up button +│ spstr tId.txt,tTmp.txt,"|",3 +│ if(tTmp.txt=="disable") +│ { +│ bUp3.pco=27501 +│ spstr tId.txt,bUp3.txt,"|",0 +│ tsw bUp3,0 +│ @@ -1653,15 +1661,15 @@ +│ vis bStop3,0 +│ vis bDown3,0 +│ vis btOnOff3,1 +│ vis bText3,0 +│ vis hSlider3,0 +│ vis nNum3,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",31 +│ + spstr strCommand.txt,tTmp.txt,"~",20 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff3.val=sys0 +│ } +│ if(type3.txt=="text"||type3.txt=="timer") +│ { +│ vis bUp3,0 +│ vis bStop3,0 +│ @@ -1670,43 +1678,43 @@ +│ vis bText3,1 +│ tsw bText3,0 +│ vis hSlider3,0 +│ vis nNum3,0 +│ bText3.pco=65535 +│ bText3.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText3.txt,"~",31 +│ + spstr strCommand.txt,bText3.txt,"~",20 +│ } +│ if(type3.txt=="button"||type3.txt=="input_sel") +│ { +│ vis bUp3,0 +│ vis bStop3,0 +│ vis bDown3,0 +│ vis btOnOff3,0 +│ vis bText3,1 +│ tsw bText3,1 +│ vis hSlider3,0 +│ vis nNum3,0 +│ bText3.pco=1374 +│ bText3.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText3.txt,"~",31 +│ + spstr strCommand.txt,bText3.txt,"~",20 +│ } +│ if(type3.txt=="number") +│ { +│ vis bUp3,0 +│ vis bStop3,0 +│ vis bDown3,0 +│ vis btOnOff3,0 +│ vis bText3,0 +│ tsw bText3,0 +│ vis hSlider3,1 +│ vis nNum3,1 +│ // get config (optional Value) (use bText as variable) +│ - spstr strCommand.txt,bText3.txt,"~",31 +│ + spstr strCommand.txt,bText3.txt,"~",20 +│ //first value is current value +│ spstr bText3.txt,tTmp.txt,"|",0 +│ covx tTmp.txt,sys0,0,0 +│ hSlider3.val=sys0 +│ nNum3.val=sys0 +│ //second value is min value +│ spstr bText3.txt,tTmp.txt,"|",1 +│ @@ -1714,52 +1722,52 @@ +│ hSlider3.minval=sys0 +│ //third value is max value +│ spstr bText3.txt,tTmp.txt,"|",2 +│ covx tTmp.txt,sys0,0,0 +│ hSlider3.maxval=sys0 +│ } +│ // get Type +│ - spstr strCommand.txt,type4.txt,"~",32 +│ + spstr strCommand.txt,type4.txt,"~",21 +│ // get internal name +│ - spstr strCommand.txt,entn4.txt,"~",33 +│ + spstr strCommand.txt,entn4.txt,"~",22 +│ if(type4.txt=="delete"||type4.txt=="") +│ { +│ vis bUp4,0 +│ vis bStop4,0 +│ vis bDown4,0 +│ vis btOnOff4,0 +│ vis tEntity4,0 +│ vis tIcon4,0 +│ vis bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon4.txt,"~",34 +│ + spstr strCommand.txt,tIcon4.txt,"~",23 +│ vis tIcon4,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",35 +│ + spstr strCommand.txt,tTmp.txt,"~",24 +│ covx tTmp.txt,sys0,0,0 +│ tIcon4.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity4.txt,"~",36 +│ + spstr strCommand.txt,tEntity4.txt,"~",25 +│ vis tEntity4,1 +│ } +│ if(type4.txt=="shutter") +│ { +│ vis bUp4,1 +│ vis bStop4,1 +│ vis bDown4,1 +│ vis btOnOff4,0 +│ vis bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tId.txt,"~",37 +│ + spstr strCommand.txt,tId.txt,"~",26 +│ // up button +│ spstr tId.txt,tTmp.txt,"|",3 +│ if(tTmp.txt=="disable") +│ { +│ bUp4.pco=27501 +│ spstr tId.txt,bUp4.txt,"|",0 +│ tsw bUp4,0 +│ @@ -1802,15 +1810,15 @@ +│ vis bStop4,0 +│ vis bDown4,0 +│ vis btOnOff4,1 +│ vis bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",37 +│ + spstr strCommand.txt,tTmp.txt,"~",26 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff4.val=sys0 +│ } +│ if(type4.txt=="text"||type4.txt=="timer") +│ { +│ vis bUp4,0 +│ vis bStop4,0 +│ @@ -1819,43 +1827,43 @@ +│ vis bText4,1 +│ tsw bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ bText4.pco=65535 +│ bText4.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText4.txt,"~",37 +│ + spstr strCommand.txt,bText4.txt,"~",26 +│ } +│ if(type4.txt=="button"||type4.txt=="input_sel") +│ { +│ vis bUp4,0 +│ vis bStop4,0 +│ vis bDown4,0 +│ vis btOnOff4,0 +│ vis bText4,1 +│ tsw bText4,1 +│ vis hSlider4,0 +│ vis nNum4,0 +│ bText4.pco=1374 +│ bText4.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText4.txt,"~",37 +│ + spstr strCommand.txt,bText4.txt,"~",26 +│ } +│ if(type4.txt=="number") +│ { +│ vis bUp4,0 +│ vis bStop4,0 +│ vis bDown4,0 +│ vis btOnOff4,0 +│ vis bText4,0 +│ tsw bText4,0 +│ vis hSlider4,1 +│ vis nNum4,1 +│ // get config (optional Value) (use bText as variable) +│ - spstr strCommand.txt,bText4.txt,"~",37 +│ + spstr strCommand.txt,bText4.txt,"~",26 +│ //first value is current value +│ spstr bText4.txt,tTmp.txt,"|",0 +│ covx tTmp.txt,sys0,0,0 +│ hSlider4.val=sys0 +│ nNum4.val=sys0 +│ //second value is min value +│ spstr bText4.txt,tTmp.txt,"|",1 +│ --- HMI/n2t-out/cardGrid.txt +├── +++ HMI/US/landscape/n2t-out/cardGrid.txt +│ @@ -78,31 +78,19 @@ +│ +│ Variable (string) entn6 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 700 +│ + Max. Text Size: 500 +│ +│ Variable (string) tSend +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 200 +│ +│ @@ -527,15 +515,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardGrid," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -552,15 +547,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardGrid," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -687,172 +689,178 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ // get Type +│ - spstr strCommand.txt,type1.txt,"~",14 +│ + spstr strCommand.txt,type1.txt,"~",3 +│ // get internal name +│ - spstr strCommand.txt,entn1.txt,"~",15 +│ + spstr strCommand.txt,entn1.txt,"~",4 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ vis tEntity1,0 +│ vis bEntity1,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity1.txt,"~",16 +│ + spstr strCommand.txt,bEntity1.txt,"~",5 +│ vis bEntity1,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",17 +│ + spstr strCommand.txt,tTmp.txt,"~",6 +│ covx tTmp.txt,sys0,0,0 +│ bEntity1.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity1.txt,"~",18 +│ + spstr strCommand.txt,tEntity1.txt,"~",7 +│ vis tEntity1,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type2.txt,"~",20 +│ + spstr strCommand.txt,type2.txt,"~",9 +│ // get internal name +│ - spstr strCommand.txt,entn2.txt,"~",21 +│ + spstr strCommand.txt,entn2.txt,"~",10 +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ vis tEntity2,0 +│ vis bEntity2,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity2.txt,"~",22 +│ + spstr strCommand.txt,bEntity2.txt,"~",11 +│ vis bEntity2,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",23 +│ + spstr strCommand.txt,tTmp.txt,"~",12 +│ covx tTmp.txt,sys0,0,0 +│ bEntity2.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity2.txt,"~",24 +│ + spstr strCommand.txt,tEntity2.txt,"~",13 +│ vis tEntity2,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type3.txt,"~",26 +│ + spstr strCommand.txt,type3.txt,"~",15 +│ // get internal name +│ - spstr strCommand.txt,entn3.txt,"~",27 +│ + spstr strCommand.txt,entn3.txt,"~",16 +│ if(type3.txt=="delete"||type3.txt=="") +│ { +│ vis tEntity3,0 +│ vis bEntity3,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity3.txt,"~",28 +│ + spstr strCommand.txt,bEntity3.txt,"~",17 +│ vis bEntity3,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",29 +│ + spstr strCommand.txt,tTmp.txt,"~",18 +│ covx tTmp.txt,sys0,0,0 +│ bEntity3.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity3.txt,"~",30 +│ + spstr strCommand.txt,tEntity3.txt,"~",19 +│ vis tEntity3,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type4.txt,"~",32 +│ + spstr strCommand.txt,type4.txt,"~",21 +│ // get internal name +│ - spstr strCommand.txt,entn4.txt,"~",33 +│ + spstr strCommand.txt,entn4.txt,"~",22 +│ if(type4.txt=="delete"||type4.txt=="") +│ { +│ vis tEntity4,0 +│ vis bEntity4,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity4.txt,"~",34 +│ + spstr strCommand.txt,bEntity4.txt,"~",23 +│ vis bEntity4,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",35 +│ + spstr strCommand.txt,tTmp.txt,"~",24 +│ covx tTmp.txt,sys0,0,0 +│ bEntity4.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity4.txt,"~",36 +│ + spstr strCommand.txt,tEntity4.txt,"~",25 +│ vis tEntity4,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type5.txt,"~",38 +│ + spstr strCommand.txt,type5.txt,"~",27 +│ // get internal name +│ - spstr strCommand.txt,entn5.txt,"~",39 +│ + spstr strCommand.txt,entn5.txt,"~",28 +│ if(type5.txt=="delete"||type5.txt=="") +│ { +│ vis tEntity5,0 +│ vis bEntity5,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity5.txt,"~",40 +│ + spstr strCommand.txt,bEntity5.txt,"~",29 +│ vis bEntity5,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",41 +│ + spstr strCommand.txt,tTmp.txt,"~",30 +│ covx tTmp.txt,sys0,0,0 +│ bEntity5.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity5.txt,"~",42 +│ + spstr strCommand.txt,tEntity5.txt,"~",31 +│ vis tEntity5,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type6.txt,"~",44 +│ + spstr strCommand.txt,type6.txt,"~",33 +│ // get internal name +│ - spstr strCommand.txt,entn6.txt,"~",45 +│ + spstr strCommand.txt,entn6.txt,"~",34 +│ if(type6.txt=="delete"||type6.txt=="") +│ { +│ vis tEntity6,0 +│ vis bEntity6,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity6.txt,"~",46 +│ + spstr strCommand.txt,bEntity6.txt,"~",35 +│ vis bEntity6,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",47 +│ + spstr strCommand.txt,tTmp.txt,"~",36 +│ covx tTmp.txt,sys0,0,0 +│ bEntity6.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity6.txt,"~",48 +│ + spstr strCommand.txt,tEntity6.txt,"~",37 +│ vis tEntity6,1 +│ } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ sleepValue=0 +│ //command format pageType,specialPageName +│ --- HMI/n2t-out/cardMedia.txt +├── +++ HMI/US/landscape/n2t-out/cardMedia.txt +│ @@ -82,26 +82,14 @@ +│ +│ Variable (string) entn6 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 750 +│ +│ Variable (string) tEntity1 +│ @@ -774,15 +762,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardMedia," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -799,15 +794,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardMedia," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -927,216 +929,222 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + if(tTmp.txt=="2") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ + } +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ //entity name +│ - spstr strCommand.txt,entn.txt,"~",14 +│ + spstr strCommand.txt,entn.txt,"~",3 +│ //title +│ - spstr strCommand.txt,tTitle.txt,"~",15 +│ + spstr strCommand.txt,tTitle.txt,"~",4 +│ //title farbe +│ - spstr strCommand.txt,tTmp.txt,"~",16 +│ + spstr strCommand.txt,tTmp.txt,"~",5 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,tTitle.pco,0,0 +│ } +│ //author +│ - spstr strCommand.txt,tAuthor.txt,"~",17 +│ + spstr strCommand.txt,tAuthor.txt,"~",6 +│ //author farbe +│ - spstr strCommand.txt,tTmp.txt,"~",18 +│ + spstr strCommand.txt,tTmp.txt,"~",7 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,tAuthor.pco,0,0 +│ } +│ //volume +│ - spstr strCommand.txt,tTmp.txt,"~",19 +│ + spstr strCommand.txt,tTmp.txt,"~",8 +│ covx tTmp.txt,sys0,0,0 +│ hVolume.val=sys0 +│ //icon +│ - spstr strCommand.txt,tPlayPause.txt,"~",20 +│ + spstr strCommand.txt,tPlayPause.txt,"~",9 +│ // on off button +│ - spstr strCommand.txt,tTmp.txt,"~",21 +│ + spstr strCommand.txt,tTmp.txt,"~",10 +│ if(tTmp.txt=="disable") +│ { +│ vis t5,0 +│ }else +│ { +│ vis t5,1 +│ covx tTmp.txt,t5.pco,0,0 +│ } +│ // shuffel btn +│ - spstr strCommand.txt,tTmp.txt,"~",22 +│ + spstr strCommand.txt,tTmp.txt,"~",11 +│ if(tTmp.txt=="disable") +│ { +│ vis tShuffle,0 +│ }else +│ { +│ vis tShuffle,1 +│ tShuffle.txt=tTmp.txt +│ } +│ // get Type +│ - spstr strCommand.txt,type1.txt,"~",23 +│ + spstr strCommand.txt,type1.txt,"~",12 +│ // get internal name +│ - spstr strCommand.txt,entn1.txt,"~",24 +│ + spstr strCommand.txt,entn1.txt,"~",13 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ vis tEntity1,0 +│ vis bEntity1,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity1.txt,"~",25 +│ + spstr strCommand.txt,bEntity1.txt,"~",14 +│ vis bEntity1,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",15 +│ covx tTmp.txt,sys0,0,0 +│ bEntity1.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity1.txt,"~",27 +│ + spstr strCommand.txt,tEntity1.txt,"~",16 +│ vis tEntity1,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type2.txt,"~",29 +│ + spstr strCommand.txt,type2.txt,"~",18 +│ // get internal name +│ - spstr strCommand.txt,entn2.txt,"~",30 +│ + spstr strCommand.txt,entn2.txt,"~",19 +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ vis tEntity2,0 +│ vis bEntity2,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity2.txt,"~",31 +│ + spstr strCommand.txt,bEntity2.txt,"~",20 +│ vis bEntity2,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",32 +│ + spstr strCommand.txt,tTmp.txt,"~",21 +│ covx tTmp.txt,sys0,0,0 +│ bEntity2.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity2.txt,"~",33 +│ + spstr strCommand.txt,tEntity2.txt,"~",22 +│ vis tEntity2,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type3.txt,"~",35 +│ + spstr strCommand.txt,type3.txt,"~",24 +│ // get internal name +│ - spstr strCommand.txt,entn3.txt,"~",36 +│ + spstr strCommand.txt,entn3.txt,"~",25 +│ if(type3.txt=="delete"||type3.txt=="") +│ { +│ vis tEntity3,0 +│ vis bEntity3,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity3.txt,"~",37 +│ + spstr strCommand.txt,bEntity3.txt,"~",26 +│ vis bEntity3,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",38 +│ + spstr strCommand.txt,tTmp.txt,"~",27 +│ covx tTmp.txt,sys0,0,0 +│ bEntity3.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity3.txt,"~",39 +│ + spstr strCommand.txt,tEntity3.txt,"~",28 +│ vis tEntity3,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type4.txt,"~",41 +│ + spstr strCommand.txt,type4.txt,"~",30 +│ // get internal name +│ - spstr strCommand.txt,entn4.txt,"~",42 +│ + spstr strCommand.txt,entn4.txt,"~",31 +│ if(type4.txt=="delete"||type4.txt=="") +│ { +│ vis tEntity4,0 +│ vis bEntity4,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity4.txt,"~",43 +│ + spstr strCommand.txt,bEntity4.txt,"~",32 +│ vis bEntity4,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",44 +│ + spstr strCommand.txt,tTmp.txt,"~",33 +│ covx tTmp.txt,sys0,0,0 +│ bEntity4.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity4.txt,"~",45 +│ + spstr strCommand.txt,tEntity4.txt,"~",34 +│ vis tEntity4,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type5.txt,"~",47 +│ + spstr strCommand.txt,type5.txt,"~",36 +│ // get internal name +│ - spstr strCommand.txt,entn5.txt,"~",48 +│ + spstr strCommand.txt,entn5.txt,"~",37 +│ if(type5.txt=="delete"||type5.txt=="") +│ { +│ vis tEntity5,0 +│ vis bEntity5,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity5.txt,"~",49 +│ + spstr strCommand.txt,bEntity5.txt,"~",38 +│ vis bEntity5,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",50 +│ + spstr strCommand.txt,tTmp.txt,"~",39 +│ covx tTmp.txt,sys0,0,0 +│ bEntity5.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity5.txt,"~",51 +│ + spstr strCommand.txt,tEntity5.txt,"~",40 +│ vis tEntity5,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type6.txt,"~",53 +│ + spstr strCommand.txt,type6.txt,"~",42 +│ // get internal name +│ - spstr strCommand.txt,entn6.txt,"~",54 +│ + spstr strCommand.txt,entn6.txt,"~",43 +│ if(type6.txt=="delete"||type6.txt=="") +│ { +│ vis tEntity6,0 +│ vis bEntity6,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity6.txt,"~",55 +│ + spstr strCommand.txt,bEntity6.txt,"~",44 +│ vis bEntity6,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",56 +│ + spstr strCommand.txt,tTmp.txt,"~",45 +│ covx tTmp.txt,sys0,0,0 +│ bEntity6.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity6.txt,"~",57 +│ + spstr strCommand.txt,tEntity6.txt,"~",46 +│ vis tEntity6,1 +│ } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ sleepValue=0 +│ //command format pageType,specialPageName +│ @@ -1196,18 +1204,14 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ - if(tId.txt=="cardChart") +│ - { +│ - page cardChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardPower.txt +├── +++ HMI/US/landscape/n2t-out/cardPower.txt +│ @@ -53,26 +53,14 @@ +│ b[sys0].pic=19 +│ b[sys0].pic1=19 +│ b[sys0].pic2=15 +│ } +│ } +│ } +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 275 +│ +│ Variable (int32) t0Speed +│ @@ -354,15 +342,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardPower," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -379,15 +374,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardAlarm," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -549,170 +551,176 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ // command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6 +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + if(tTmp.txt=="2") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ + } +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ // icon color home +│ - spstr strCommand.txt,tTmp.txt,"~",14 +│ + spstr strCommand.txt,tTmp.txt,"~",3 +│ covx tTmp.txt,t1.pco,0,0 +│ // icon home +│ - spstr strCommand.txt,t1.txt,"~",15 +│ + spstr strCommand.txt,t1.txt,"~",4 +│ // text home +│ - spstr strCommand.txt,tHome.txt,"~",16 +│ + spstr strCommand.txt,tHome.txt,"~",5 +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",17 +│ + spstr strCommand.txt,tTmp.txt,"~",6 +│ covx tTmp.txt,t0Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t0Icon.txt,"~",18 +│ + spstr strCommand.txt,t0Icon.txt,"~",7 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",19 +│ + spstr strCommand.txt,tTmp.txt,"~",8 +│ covx tTmp.txt,t0Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t0u.txt,"~",20 +│ + spstr strCommand.txt,t0u.txt,"~",9 +│ if(t0Icon.txt!="") +│ { +│ vis t0Icon,1 +│ vis t0u,1 +│ vis h0,1 +│ }else +│ { +│ vis t0Icon,0 +│ vis t0u,0 +│ vis h0,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",21 +│ + spstr strCommand.txt,tTmp.txt,"~",10 +│ covx tTmp.txt,t1Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t1Icon.txt,"~",22 +│ + spstr strCommand.txt,t1Icon.txt,"~",11 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",23 +│ + spstr strCommand.txt,tTmp.txt,"~",12 +│ covx tTmp.txt,t1Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t1u.txt,"~",24 +│ + spstr strCommand.txt,t1u.txt,"~",13 +│ if(t1Icon.txt!="") +│ { +│ vis t1Icon,1 +│ vis t1u,1 +│ vis h1,1 +│ }else +│ { +│ vis t1Icon,0 +│ vis t1u,0 +│ vis h1,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",25 +│ + spstr strCommand.txt,tTmp.txt,"~",14 +│ covx tTmp.txt,t2Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t2Icon.txt,"~",26 +│ + spstr strCommand.txt,t2Icon.txt,"~",15 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",27 +│ + spstr strCommand.txt,tTmp.txt,"~",16 +│ covx tTmp.txt,t2Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t2u.txt,"~",28 +│ + spstr strCommand.txt,t2u.txt,"~",17 +│ if(t2Icon.txt!="") +│ { +│ vis t2Icon,1 +│ vis t2u,1 +│ vis h2,1 +│ }else +│ { +│ vis t2Icon,0 +│ vis t2u,0 +│ vis h2,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",29 +│ + spstr strCommand.txt,tTmp.txt,"~",18 +│ covx tTmp.txt,t3Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t3Icon.txt,"~",30 +│ + spstr strCommand.txt,t3Icon.txt,"~",19 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",31 +│ + spstr strCommand.txt,tTmp.txt,"~",20 +│ covx tTmp.txt,t3Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t3u.txt,"~",32 +│ + spstr strCommand.txt,t3u.txt,"~",21 +│ if(t3Icon.txt!="") +│ { +│ vis t3Icon,1 +│ vis t3u,1 +│ vis h3,1 +│ }else +│ { +│ vis t3Icon,0 +│ vis t3u,0 +│ vis h3,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",33 +│ + spstr strCommand.txt,tTmp.txt,"~",22 +│ covx tTmp.txt,t4Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t4Icon.txt,"~",34 +│ + spstr strCommand.txt,t4Icon.txt,"~",23 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",35 +│ + spstr strCommand.txt,tTmp.txt,"~",24 +│ covx tTmp.txt,t4Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t4u.txt,"~",36 +│ + spstr strCommand.txt,t4u.txt,"~",25 +│ if(t4Icon.txt!="") +│ { +│ vis t4Icon,1 +│ vis t4u,1 +│ vis h4,1 +│ }else +│ { +│ vis t4Icon,0 +│ vis t4u,0 +│ vis h4,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",37 +│ + spstr strCommand.txt,tTmp.txt,"~",26 +│ covx tTmp.txt,t5Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t5Icon.txt,"~",38 +│ + spstr strCommand.txt,t5Icon.txt,"~",27 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",39 +│ + spstr strCommand.txt,tTmp.txt,"~",28 +│ covx tTmp.txt,t5Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t5u.txt,"~",40 +│ + spstr strCommand.txt,t5u.txt,"~",29 +│ if(t5Icon.txt!="") +│ { +│ vis t5Icon,1 +│ vis t5u,1 +│ vis h5,1 +│ }else +│ { +│ --- HMI/n2t-out/cardQR.txt +├── +++ HMI/US/landscape/n2t-out/cardQR.txt +│ @@ -66,31 +66,19 @@ +│ +│ Variable (string) entn2 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 50 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 50 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 400 +│ + Max. Text Size: 275 +│ +│ Variable (string) tId +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 20 +│ +│ @@ -195,15 +183,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardQR," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -220,15 +215,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardAlarm," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -440,171 +442,177 @@ +│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) +│ spstr strCommand.txt,tInstruction.txt,"~",0 +│ if(tInstruction.txt=="entityUpd") +│ { +│ // command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2 +│ //tHeading +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + if(tTmp.txt=="2") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ + } +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ //text qrcode +│ - spstr strCommand.txt,vaQR.txt,"~",14 +│ + spstr strCommand.txt,vaQR.txt,"~",3 +│ // get Type +│ - spstr strCommand.txt,type1.txt,"~",15 +│ + spstr strCommand.txt,type1.txt,"~",4 +│ // get internal name +│ - spstr strCommand.txt,entn1.txt,"~",16 +│ + spstr strCommand.txt,entn1.txt,"~",5 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ vis btOnOff1,0 +│ vis tEntity1,0 +│ vis tIcon1,0 +│ vis bText1,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon1.txt,"~",17 +│ + spstr strCommand.txt,tIcon1.txt,"~",6 +│ vis tIcon1,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",18 +│ + spstr strCommand.txt,tTmp.txt,"~",7 +│ covx tTmp.txt,sys0,0,0 +│ tIcon1.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity1.txt,"~",19 +│ + spstr strCommand.txt,tEntity1.txt,"~",8 +│ vis tEntity1,1 +│ } +│ if(type1.txt=="light") +│ { +│ vis btOnOff1,1 +│ vis bText1,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",20 +│ + spstr strCommand.txt,tTmp.txt,"~",9 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff1.val=sys0 +│ } +│ if(type1.txt=="switch") +│ { +│ vis btOnOff1,1 +│ vis bText1,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",20 +│ + spstr strCommand.txt,tTmp.txt,"~",9 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff1.val=sys0 +│ } +│ if(type1.txt=="text") +│ { +│ vis btOnOff1,0 +│ vis bText1,1 +│ tsw bText1,0 +│ bText1.pco=65535 +│ bText1.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText1.txt,"~",20 +│ + spstr strCommand.txt,bText1.txt,"~",9 +│ } +│ if(type1.txt=="button") +│ { +│ vis btOnOff1,0 +│ vis bText1,1 +│ tsw bText1,1 +│ bText1.pco=1374 +│ bText1.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText1.txt,"~",20 +│ + spstr strCommand.txt,bText1.txt,"~",9 +│ } +│ // get Type +│ - spstr strCommand.txt,type2.txt,"~",21 +│ + spstr strCommand.txt,type2.txt,"~",10 +│ // get internal name +│ - spstr strCommand.txt,entn2.txt,"~",22 +│ + spstr strCommand.txt,entn2.txt,"~",11 +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ vis btOnOff2,0 +│ vis tEntity2,0 +│ vis tIcon2,0 +│ vis bText2,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon2.txt,"~",23 +│ + spstr strCommand.txt,tIcon2.txt,"~",12 +│ vis tIcon2,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",24 +│ + spstr strCommand.txt,tTmp.txt,"~",13 +│ covx tTmp.txt,sys0,0,0 +│ tIcon2.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity2.txt,"~",25 +│ + spstr strCommand.txt,tEntity2.txt,"~",14 +│ vis tEntity2,1 +│ } +│ if(type2.txt=="light") +│ { +│ vis btOnOff2,1 +│ vis bText2,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",15 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff2.val=sys0 +│ } +│ if(type2.txt=="switch") +│ { +│ vis btOnOff2,1 +│ vis bText2,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",15 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff2.val=sys0 +│ } +│ if(type2.txt=="text") +│ { +│ vis btOnOff2,0 +│ vis bText2,1 +│ tsw bText2,0 +│ bText2.pco=65535 +│ bText2.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText2.txt,"~",26 +│ + spstr strCommand.txt,bText2.txt,"~",15 +│ } +│ if(type2.txt=="button") +│ { +│ vis btOnOff2,0 +│ vis bText2,1 +│ tsw bText2,1 +│ bText2.pco=1374 +│ bText2.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText2.txt,"~",26 +│ + spstr strCommand.txt,bText2.txt,"~",15 +│ } +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt +│ } +│ --- HMI/n2t-out/cardThermo.txt +├── +++ HMI/US/landscape/n2t-out/cardThermo.txt +│ @@ -59,26 +59,14 @@ +│ +│ Variable (string) entn +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 250 +│ +│ Variable (string) tId +│ @@ -302,15 +290,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardThermo," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -327,15 +322,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardThermo," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -829,208 +831,214 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ //heading +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ + { +│ + vis bNext,1 +│ + bNext.txt="" +│ } +│ //entity name +│ - spstr strCommand.txt,entn.txt,"~",14 +│ + spstr strCommand.txt,entn.txt,"~",3 +│ //currentTemp +│ - spstr strCommand.txt,tCurTemp.txt,"~",15 +│ + spstr strCommand.txt,tCurTemp.txt,"~",4 +│ //dstTemp +│ - spstr strCommand.txt,tTmp.txt,"~",16 +│ + spstr strCommand.txt,tTmp.txt,"~",5 +│ covx tTmp.txt,xTempDest1.val,0,0 +│ xTempDest.val=xTempDest1.val +│ //status +│ - spstr strCommand.txt,tStatus.txt,"~",17 +│ + spstr strCommand.txt,tStatus.txt,"~",6 +│ //minTemp +│ - spstr strCommand.txt,tTmp.txt,"~",18 +│ + spstr strCommand.txt,tTmp.txt,"~",7 +│ covx tTmp.txt,xTempMin1.val,0,0 +│ //maxTemp +│ - spstr strCommand.txt,tTmp.txt,"~",19 +│ + spstr strCommand.txt,tTmp.txt,"~",8 +│ covx tTmp.txt,xTempMax1.val,0,0 +│ //tempStep +│ - spstr strCommand.txt,tTmp.txt,"~",20 +│ + spstr strCommand.txt,tTmp.txt,"~",9 +│ covx tTmp.txt,xTempStep1.val,0,0 +│ // disable all buttons +│ vis bt0,0 +│ vis bt1,0 +│ vis bt2,0 +│ vis bt3,0 +│ vis bt4,0 +│ vis bt5,0 +│ vis bt6,0 +│ vis bt7,0 +│ //bt0 +│ - spstr strCommand.txt,bt0.txt,"~",21 +│ + spstr strCommand.txt,bt0.txt,"~",10 +│ if(bt0.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",22 +│ + spstr strCommand.txt,tTmp.txt,"~",11 +│ covx tTmp.txt,bt0.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",23 +│ + spstr strCommand.txt,tTmp.txt,"~",12 +│ covx tTmp.txt,bt0.val,0,0 +│ // save action +│ - spstr strCommand.txt,va0.txt,"~",24 +│ + spstr strCommand.txt,va0.txt,"~",13 +│ //enable +│ vis bt0,1 +│ } +│ //bt1 +│ - spstr strCommand.txt,bt1.txt,"~",25 +│ + spstr strCommand.txt,bt1.txt,"~",14 +│ if(bt1.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",15 +│ covx tTmp.txt,bt1.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",27 +│ + spstr strCommand.txt,tTmp.txt,"~",16 +│ covx tTmp.txt,bt1.val,0,0 +│ // save action +│ - spstr strCommand.txt,va1.txt,"~",28 +│ + spstr strCommand.txt,va1.txt,"~",17 +│ //enable +│ vis bt1,1 +│ } +│ //bt2 +│ - spstr strCommand.txt,bt2.txt,"~",29 +│ + spstr strCommand.txt,bt2.txt,"~",18 +│ if(bt2.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",30 +│ + spstr strCommand.txt,tTmp.txt,"~",19 +│ covx tTmp.txt,bt2.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",31 +│ + spstr strCommand.txt,tTmp.txt,"~",20 +│ covx tTmp.txt,bt2.val,0,0 +│ // save action +│ - spstr strCommand.txt,va2.txt,"~",32 +│ + spstr strCommand.txt,va2.txt,"~",21 +│ //enable +│ vis bt2,1 +│ } +│ //bt3 +│ - spstr strCommand.txt,bt3.txt,"~",33 +│ + spstr strCommand.txt,bt3.txt,"~",22 +│ if(bt3.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",34 +│ + spstr strCommand.txt,tTmp.txt,"~",23 +│ covx tTmp.txt,bt3.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",35 +│ + spstr strCommand.txt,tTmp.txt,"~",24 +│ covx tTmp.txt,bt3.val,0,0 +│ // save action +│ - spstr strCommand.txt,va3.txt,"~",36 +│ + spstr strCommand.txt,va3.txt,"~",25 +│ //enable +│ vis bt3,1 +│ } +│ //bt4 +│ - spstr strCommand.txt,bt4.txt,"~",37 +│ + spstr strCommand.txt,bt4.txt,"~",26 +│ if(bt4.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",38 +│ + spstr strCommand.txt,tTmp.txt,"~",27 +│ covx tTmp.txt,bt4.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",39 +│ + spstr strCommand.txt,tTmp.txt,"~",28 +│ covx tTmp.txt,bt4.val,0,0 +│ // save action +│ - spstr strCommand.txt,va4.txt,"~",40 +│ + spstr strCommand.txt,va4.txt,"~",29 +│ //enable +│ vis bt4,1 +│ } +│ //bt5 +│ - spstr strCommand.txt,bt5.txt,"~",41 +│ + spstr strCommand.txt,bt5.txt,"~",30 +│ if(bt5.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",42 +│ + spstr strCommand.txt,tTmp.txt,"~",31 +│ covx tTmp.txt,bt5.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",43 +│ + spstr strCommand.txt,tTmp.txt,"~",32 +│ covx tTmp.txt,bt5.val,0,0 +│ // save action +│ - spstr strCommand.txt,va5.txt,"~",44 +│ + spstr strCommand.txt,va5.txt,"~",33 +│ //enable +│ vis bt5,1 +│ } +│ //bt6 +│ - spstr strCommand.txt,bt6.txt,"~",45 +│ + spstr strCommand.txt,bt6.txt,"~",34 +│ if(bt6.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",46 +│ + spstr strCommand.txt,tTmp.txt,"~",35 +│ covx tTmp.txt,bt6.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",47 +│ + spstr strCommand.txt,tTmp.txt,"~",36 +│ covx tTmp.txt,bt6.val,0,0 +│ // save action +│ - spstr strCommand.txt,va6.txt,"~",48 +│ + spstr strCommand.txt,va6.txt,"~",37 +│ //enable +│ vis bt6,1 +│ } +│ //bt7 +│ - spstr strCommand.txt,bt7.txt,"~",49 +│ + spstr strCommand.txt,bt7.txt,"~",38 +│ if(bt7.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",50 +│ + spstr strCommand.txt,tTmp.txt,"~",39 +│ covx tTmp.txt,bt7.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",51 +│ + spstr strCommand.txt,tTmp.txt,"~",40 +│ covx tTmp.txt,bt7.val,0,0 +│ // save action +│ - spstr strCommand.txt,va7.txt,"~",52 +│ + spstr strCommand.txt,va7.txt,"~",41 +│ //enable +│ vis bt7,1 +│ } +│ //Text tCurTempLbl +│ - spstr strCommand.txt,tCurTempLbl.txt,"~",53 +│ + spstr strCommand.txt,tCurTempLbl.txt,"~",42 +│ //Text tStateLbl +│ - spstr strCommand.txt,tStateLbl.txt,"~",54 +│ + spstr strCommand.txt,tStateLbl.txt,"~",43 +│ //Text tALbl +│ - //spstr strCommand.txt,tALbl.txt,"~",55 +│ + //spstr strCommand.txt,tALbl.txt,"~",44 +│ //Text tCF +│ - spstr strCommand.txt,tCF.txt,"~",56 +│ + spstr strCommand.txt,tCF.txt,"~",45 +│ tCF1.txt=tCF.txt +│ tCF2.txt=tCF.txt +│ //Second Temperature +│ - spstr strCommand.txt,tTmp.txt,"~",57 +│ + spstr strCommand.txt,tTmp.txt,"~",46 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,xTempDest2.val,0,0 +│ vis btUp,0 +│ vis xTempDest,0 +│ vis btDown,0 +│ vis tCF,0 +│ @@ -1040,16 +1048,16 @@ +│ vis tCF1,1 +│ vis bUp2,1 +│ vis xTempDest2,1 +│ vis bDown2,1 +│ vis tCF2,1 +│ } +│ //Show btDetail +│ - spstr strCommand.txt,tTmp.txt,"~",58 +│ - if(tTmp.txt!="1") +│ + spstr strCommand.txt,tTmp.txt,"~",47 +│ + if(tTmp.txt=="1") +│ { +│ vis btDetail,1 +│ }else +│ { +│ vis btDetail,0 +│ } +│ } │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -173,15 +173,15 @@ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 2dd12a42..50b73821 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -15,6 +15,482 @@ │ + // fix touch offset (Removed for US version) │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup +│ --- HMI/n2t-out/cardAlarm.txt +├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt +│ @@ -59,26 +59,14 @@ +│ +│ Variable (string) entn +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 200 +│ +│ Variable (string) tSend +│ @@ -490,15 +478,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardAlarm," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -515,15 +510,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardAlarm," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -634,88 +636,94 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ //entn +│ spstr strCommand.txt,entn.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ //text arm1 +│ - spstr strCommand.txt,arm1.txt,"~",14 +│ + spstr strCommand.txt,arm1.txt,"~",3 +│ if(arm1.txt!="") +│ { +│ vis arm1,1 +│ } +│ //id arm1 +│ - spstr strCommand.txt,va1.txt,"~",15 +│ + spstr strCommand.txt,va1.txt,"~",4 +│ //text arm2 +│ - spstr strCommand.txt,arm2.txt,"~",16 +│ + spstr strCommand.txt,arm2.txt,"~",5 +│ if(arm2.txt!="") +│ { +│ vis arm2,1 +│ } +│ //id arm2 +│ - spstr strCommand.txt,va2.txt,"~",17 +│ + spstr strCommand.txt,va2.txt,"~",6 +│ //text arm3 +│ - spstr strCommand.txt,arm3.txt,"~",18 +│ + spstr strCommand.txt,arm3.txt,"~",7 +│ if(arm3.txt!="") +│ { +│ vis arm3,1 +│ } +│ //id arm3 +│ - spstr strCommand.txt,va3.txt,"~",19 +│ + spstr strCommand.txt,va3.txt,"~",8 +│ //text arm4 +│ - spstr strCommand.txt,arm4.txt,"~",20 +│ + spstr strCommand.txt,arm4.txt,"~",9 +│ if(arm4.txt!="") +│ { +│ vis arm4,1 +│ } +│ //id arm4 +│ - spstr strCommand.txt,va4.txt,"~",21 +│ + spstr strCommand.txt,va4.txt,"~",10 +│ //icon +│ - spstr strCommand.txt,tIcon.txt,"~",22 +│ + spstr strCommand.txt,tIcon.txt,"~",11 +│ //icon color +│ - spstr strCommand.txt,tTmp.txt,"~",23 +│ + spstr strCommand.txt,tTmp.txt,"~",12 +│ covx tTmp.txt,sys0,0,0 +│ tIcon.pco=sys0 +│ //numpad status +│ - spstr strCommand.txt,tTmp.txt,"~",24 +│ + spstr strCommand.txt,tTmp.txt,"~",13 +│ if(tTmp.txt!="disable") +│ { +│ vis b0,1 +│ vis b1,1 +│ vis b2,1 +│ vis b3,1 +│ vis b4,1 +│ @@ -740,30 +748,30 @@ +│ vis b8,0 +│ vis b9,0 +│ vis b10,0 +│ vis b11,0 +│ vis tCode,0 +│ } +│ //flashing status +│ - spstr strCommand.txt,tTmp.txt,"~",25 +│ + spstr strCommand.txt,tTmp.txt,"~",14 +│ if(tTmp.txt=="enable") +│ { +│ tmFlash.en=1 +│ }else +│ { +│ tmFlash.en=0 +│ } +│ // extra button +│ - spstr strCommand.txt,b9.txt,"~",26 +│ + spstr strCommand.txt,b9.txt,"~",15 +│ if(b9.txt!="") +│ { +│ vis b9,1 +│ - spstr strCommand.txt,tTmp.txt,"~",27 +│ + spstr strCommand.txt,tTmp.txt,"~",16 +│ covx tTmp.txt,b9.pco,0,0 +│ - spstr strCommand.txt,vaAddBtn.txt,"~",28 +│ + spstr strCommand.txt,vaAddBtn.txt,"~",17 +│ } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ --- HMI/n2t-out/cardChart.txt +├── +++ HMI/US/portrait/n2t-out/cardChart.txt +│ @@ -45,26 +45,14 @@ +│ +│ Variable (string) entn +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 275 +│ +│ Variable (string) strTmp +│ @@ -187,15 +175,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardChart," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -212,15 +207,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardChart," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -393,88 +395,94 @@ +│ // here is the location where acual code should be +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + if(tTmp.txt=="2") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ + } +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ // extract color +│ - spstr strCommand.txt,tTmp.txt,"~",14 +│ + spstr strCommand.txt,tTmp.txt,"~",3 +│ covx tTmp.txt,vaColorL.val,0,0 +│ // prepare dark color +│ sys0=vaColorL.val>>11 // red +│ vaColorD.val=sys0*8/10<<11 // store and shift +│ sys0=vaColorL.val>>5%64 // green +│ vaColorD.val=sys0*8/10<<5+vaColorD.val // store and shift +│ sys0=vaColorL.val%32 +│ vaColorD.val=sys0*8/10+vaColorD.val // store and add +│ // +│ // detect nValues and maxValue +│ vNValues.val=0 +│ - spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17 +│ + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 +│ strlen tTmp.txt,sya0 +│ while(sya0>0) +│ { +│ covx tTmp.txt,sya1,0,0 +│ if(sya1>vMax.val) +│ { +│ vMax.val=sya1 +│ } +│ // next +│ vNValues.val++ +│ - spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17 +│ + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 +│ strlen tTmp.txt,sya0 +│ } +│ // +│ // calculate unit width +│ sys0=vNValues.val*4 +│ sys0+=vNValues.val-1 +│ vaUnit.val=m0.w-25-40*100 +│ vaUnit.val/=sys0 +│ vaBottom.val=m0.y+m0.h-24 +│ vaLeft.val=m0.x+25+40*100 +│ vaYUnit.val=m0.h-24/vMax.val +│ // +│ line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 +│ line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 +│ - spstr strCommand.txt,strTmp.txt,"~",16 +│ + spstr strCommand.txt,strTmp.txt,"~",5 +│ sya1=0 +│ spstr strTmp.txt,tTmp.txt,":",sya1 +│ strlen tTmp.txt,sya0 +│ while(sya0>0) +│ { +│ covx tTmp.txt,sys1,0,0 +│ if(sys1<=vMax.val) +│ @@ -499,15 +507,15 @@ +│ // next +│ sya1++ +│ spstr strTmp.txt,tTmp.txt,":",sya1 +│ strlen tTmp.txt,sya0 +│ } +│ // +│ // y achis label +│ - spstr strCommand.txt,tTmp.txt,"~",15 +│ + spstr strCommand.txt,tTmp.txt,"~",4 +│ // tTmp.txt="Gas [kW]" +│ strlen tTmp.txt,sys1 +│ sya1=sys1*12+m0.h-48/2 +│ for(sys0=0;sys00) +│ { +│ vaValues.txt+="~" +│ } +│ // extract next entry +│ - spstr strCommand.txt,tTmp.txt,"~",sys0+17 +│ + spstr strCommand.txt,tTmp.txt,"~",sys0+6 +│ // calculate left +│ sys1=sys0*5*vaUnit.val +│ sys1+=vaLeft.val +│ // if there is a colon in the obtained value we have a label/and gridline +│ spstr tTmp.txt,strTmp.txt,"^",1 +│ strlen strTmp.txt,sya0 +│ if(sya0>0) │ --- HMI/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt │ @@ -61,14 +61,24 @@ @@ -42,7 +518,7 @@ │ { │ b[sys0].bco=defaultBcoColor │ b[sys0].pco=defaultFontColor -│ @@ -106,14 +116,26 @@ +│ @@ -106,21 +116,21 @@ │ │ Variable (string) entn4 │ Attributes @@ -50,26 +526,23 @@ │ Text : │ Max. Text Size: 80 │ +│ -Variable (string) nent1 │ +Variable (string) entn5 -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 80 -│ + -│ +Variable (string) entn6 -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 80 -│ + -│ Variable (string) strCommand │ Attributes │ Scope : local │ Text : -│ Max. Text Size: 500 +│ Max. Text Size: 80 │ -│ Variable (string) tSend -│ @@ -142,14 +164,26 @@ +│ -Variable (string) nent2 +│ +Variable (string) entn6 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ Variable (string) strCommand +│ Attributes +│ @@ -154,14 +164,26 @@ │ │ Variable (string) type4 │ Attributes @@ -96,7 +569,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -178,14 +212,32 @@ +│ @@ -190,14 +212,32 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 @@ -129,7 +602,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -218,14 +270,34 @@ +│ @@ -230,14 +270,34 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled @@ -164,7 +637,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -268,14 +340,34 @@ +│ @@ -280,14 +340,34 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled @@ -199,7 +672,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -417,14 +509,70 @@ +│ @@ -429,14 +509,70 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -270,7 +743,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -517,14 +665,64 @@ +│ @@ -529,27 +665,84 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -335,7 +808,52 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -681,14 +879,64 @@ +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardEntities," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -566,15 +759,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardEntities," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -679,14 +879,64 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -400,7 +918,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -781,14 +1029,64 @@ +│ @@ -779,14 +1029,64 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -465,7 +983,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -881,14 +1179,64 @@ +│ @@ -879,14 +1179,64 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -530,7 +1048,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -989,14 +1337,68 @@ +│ @@ -987,14 +1337,68 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -599,7 +1117,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -1129,14 +1531,84 @@ +│ @@ -1127,14 +1531,84 @@ │ page popupInSel │ } │ if(type4.txt=="timer") @@ -684,7 +1202,563 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -1870,14 +2342,312 @@ +│ @@ -1232,87 +1706,93 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ // get Type +│ - spstr strCommand.txt,type1.txt,"~",14 +│ + spstr strCommand.txt,type1.txt,"~",3 +│ // get internal name +│ - spstr strCommand.txt,entn1.txt,"~",15 +│ + spstr strCommand.txt,entn1.txt,"~",4 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ vis bUp1,0 +│ vis bStop1,0 +│ vis bDown1,0 +│ vis btOnOff1,0 +│ vis tEntity1,0 +│ vis tIcon1,0 +│ vis bText1,0 +│ vis hSlider1,0 +│ vis nNum1,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon1.txt,"~",16 +│ + spstr strCommand.txt,tIcon1.txt,"~",5 +│ vis tIcon1,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",17 +│ + spstr strCommand.txt,tTmp.txt,"~",6 +│ covx tTmp.txt,sys0,0,0 +│ tIcon1.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity1.txt,"~",18 +│ + spstr strCommand.txt,tEntity1.txt,"~",7 +│ vis tEntity1,1 +│ } +│ if(type1.txt=="shutter") +│ { +│ vis bUp1,1 +│ vis bStop1,1 +│ vis bDown1,1 +│ vis btOnOff1,0 +│ vis bText1,0 +│ vis hSlider1,0 +│ vis nNum1,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tId.txt,"~",19 +│ + spstr strCommand.txt,tId.txt,"~",8 +│ // up button +│ spstr tId.txt,tTmp.txt,"|",3 +│ if(tTmp.txt=="disable") +│ { +│ bUp1.pco=27501 +│ spstr tId.txt,bUp1.txt,"|",0 +│ tsw bUp1,0 +│ @@ -1355,15 +1835,15 @@ +│ vis bStop1,0 +│ vis bDown1,0 +│ vis btOnOff1,1 +│ vis bText1,0 +│ vis hSlider1,0 +│ vis nNum1,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",19 +│ + spstr strCommand.txt,tTmp.txt,"~",8 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff1.val=sys0 +│ } +│ if(type1.txt=="text"||type1.txt=="timer") +│ { +│ vis bUp1,0 +│ vis bStop1,0 +│ @@ -1372,43 +1852,43 @@ +│ vis bText1,1 +│ tsw bText1,0 +│ vis hSlider1,0 +│ vis nNum1,0 +│ bText1.pco=65535 +│ bText1.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText1.txt,"~",19 +│ + spstr strCommand.txt,bText1.txt,"~",8 +│ } +│ if(type1.txt=="button"||type1.txt=="input_sel") +│ { +│ vis bUp1,0 +│ vis bStop1,0 +│ vis bDown1,0 +│ vis btOnOff1,0 +│ vis bText1,1 +│ tsw bText1,1 +│ vis hSlider1,0 +│ vis nNum1,0 +│ bText1.pco=1374 +│ bText1.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText1.txt,"~",19 +│ + spstr strCommand.txt,bText1.txt,"~",8 +│ } +│ if(type1.txt=="number") +│ { +│ vis bUp1,0 +│ vis bStop1,0 +│ vis bDown1,0 +│ vis btOnOff1,0 +│ vis bText1,0 +│ tsw bText1,0 +│ vis hSlider1,1 +│ vis nNum1,1 +│ // get config (optional Value) (use bText as variable) +│ - spstr strCommand.txt,bText1.txt,"~",19 +│ + spstr strCommand.txt,bText1.txt,"~",8 +│ //first value is current value +│ spstr bText1.txt,tTmp.txt,"|",0 +│ covx tTmp.txt,sys0,0,0 +│ hSlider1.val=sys0 +│ nNum1.val=sys0 +│ //second value is min value +│ spstr bText1.txt,tTmp.txt,"|",1 +│ @@ -1416,52 +1896,52 @@ +│ hSlider1.minval=sys0 +│ //third value is max value +│ spstr bText1.txt,tTmp.txt,"|",2 +│ covx tTmp.txt,sys0,0,0 +│ hSlider1.maxval=sys0 +│ } +│ // get Type +│ - spstr strCommand.txt,type2.txt,"~",20 +│ + spstr strCommand.txt,type2.txt,"~",9 +│ // get internal name +│ - spstr strCommand.txt,entn2.txt,"~",21 +│ + spstr strCommand.txt,entn2.txt,"~",10 +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ vis bUp2,0 +│ vis bStop2,0 +│ vis bDown2,0 +│ vis btOnOff2,0 +│ vis tEntity2,0 +│ vis tIcon2,0 +│ vis bText2,0 +│ vis hSlider2,0 +│ vis nNum2,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon2.txt,"~",22 +│ + spstr strCommand.txt,tIcon2.txt,"~",11 +│ vis tIcon2,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",23 +│ + spstr strCommand.txt,tTmp.txt,"~",12 +│ covx tTmp.txt,sys0,0,0 +│ tIcon2.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity2.txt,"~",24 +│ + spstr strCommand.txt,tEntity2.txt,"~",13 +│ vis tEntity2,1 +│ } +│ if(type2.txt=="shutter") +│ { +│ vis bUp2,1 +│ vis bStop2,1 +│ vis bDown2,1 +│ vis btOnOff2,0 +│ vis bText2,0 +│ vis hSlider2,0 +│ vis nNum2,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tId.txt,"~",25 +│ + spstr strCommand.txt,tId.txt,"~",14 +│ // up button +│ spstr tId.txt,tTmp.txt,"|",3 +│ if(tTmp.txt=="disable") +│ { +│ bUp2.pco=27501 +│ spstr tId.txt,bUp2.txt,"|",0 +│ tsw bUp2,0 +│ @@ -1504,15 +1984,15 @@ +│ vis bStop2,0 +│ vis bDown2,0 +│ vis btOnOff2,1 +│ vis bText2,0 +│ vis hSlider2,0 +│ vis nNum2,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",25 +│ + spstr strCommand.txt,tTmp.txt,"~",14 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff2.val=sys0 +│ } +│ if(type2.txt=="text"||type2.txt=="timer") +│ { +│ vis bUp2,0 +│ vis bStop2,0 +│ @@ -1521,43 +2001,43 @@ +│ vis bText2,1 +│ tsw bText2,0 +│ vis hSlider2,0 +│ vis nNum2,0 +│ bText2.pco=65535 +│ bText2.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText2.txt,"~",25 +│ + spstr strCommand.txt,bText2.txt,"~",14 +│ } +│ if(type2.txt=="button"||type2.txt=="input_sel") +│ { +│ vis bUp2,0 +│ vis bStop2,0 +│ vis bDown2,0 +│ vis btOnOff2,0 +│ vis bText2,1 +│ tsw bText2,1 +│ vis hSlider2,0 +│ vis nNum2,0 +│ bText2.pco=1374 +│ bText2.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText2.txt,"~",25 +│ + spstr strCommand.txt,bText2.txt,"~",14 +│ } +│ if(type2.txt=="number") +│ { +│ vis bUp2,0 +│ vis bStop2,0 +│ vis bDown2,0 +│ vis btOnOff2,0 +│ vis bText2,0 +│ tsw bText2,0 +│ vis hSlider2,1 +│ vis nNum2,1 +│ // get config (optional Value) (use bText as variable) +│ - spstr strCommand.txt,bText2.txt,"~",25 +│ + spstr strCommand.txt,bText2.txt,"~",14 +│ //first value is current value +│ spstr bText2.txt,tTmp.txt,"|",0 +│ covx tTmp.txt,sys0,0,0 +│ hSlider2.val=sys0 +│ nNum2.val=sys0 +│ //second value is min value +│ spstr bText2.txt,tTmp.txt,"|",1 +│ @@ -1565,52 +2045,52 @@ +│ hSlider2.minval=sys0 +│ //third value is max value +│ spstr bText2.txt,tTmp.txt,"|",2 +│ covx tTmp.txt,sys0,0,0 +│ hSlider2.maxval=sys0 +│ } +│ // get Type +│ - spstr strCommand.txt,type3.txt,"~",26 +│ + spstr strCommand.txt,type3.txt,"~",15 +│ // get internal name +│ - spstr strCommand.txt,entn3.txt,"~",27 +│ + spstr strCommand.txt,entn3.txt,"~",16 +│ if(type3.txt=="delete"||type3.txt=="") +│ { +│ vis bUp3,0 +│ vis bStop3,0 +│ vis bDown3,0 +│ vis btOnOff3,0 +│ vis tEntity3,0 +│ vis tIcon3,0 +│ vis bText3,0 +│ vis hSlider3,0 +│ vis nNum3,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon3.txt,"~",28 +│ + spstr strCommand.txt,tIcon3.txt,"~",17 +│ vis tIcon3,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",29 +│ + spstr strCommand.txt,tTmp.txt,"~",18 +│ covx tTmp.txt,sys0,0,0 +│ tIcon3.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity3.txt,"~",30 +│ + spstr strCommand.txt,tEntity3.txt,"~",19 +│ vis tEntity3,1 +│ } +│ if(type3.txt=="shutter") +│ { +│ vis bUp3,1 +│ vis bStop3,1 +│ vis bDown3,1 +│ vis btOnOff3,0 +│ vis bText3,0 +│ vis hSlider3,0 +│ vis nNum3,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tId.txt,"~",31 +│ + spstr strCommand.txt,tId.txt,"~",20 +│ // up button +│ spstr tId.txt,tTmp.txt,"|",3 +│ if(tTmp.txt=="disable") +│ { +│ bUp3.pco=27501 +│ spstr tId.txt,bUp3.txt,"|",0 +│ tsw bUp3,0 +│ @@ -1653,15 +2133,15 @@ +│ vis bStop3,0 +│ vis bDown3,0 +│ vis btOnOff3,1 +│ vis bText3,0 +│ vis hSlider3,0 +│ vis nNum3,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",31 +│ + spstr strCommand.txt,tTmp.txt,"~",20 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff3.val=sys0 +│ } +│ if(type3.txt=="text"||type3.txt=="timer") +│ { +│ vis bUp3,0 +│ vis bStop3,0 +│ @@ -1670,43 +2150,43 @@ +│ vis bText3,1 +│ tsw bText3,0 +│ vis hSlider3,0 +│ vis nNum3,0 +│ bText3.pco=65535 +│ bText3.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText3.txt,"~",31 +│ + spstr strCommand.txt,bText3.txt,"~",20 +│ } +│ if(type3.txt=="button"||type3.txt=="input_sel") +│ { +│ vis bUp3,0 +│ vis bStop3,0 +│ vis bDown3,0 +│ vis btOnOff3,0 +│ vis bText3,1 +│ tsw bText3,1 +│ vis hSlider3,0 +│ vis nNum3,0 +│ bText3.pco=1374 +│ bText3.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText3.txt,"~",31 +│ + spstr strCommand.txt,bText3.txt,"~",20 +│ } +│ if(type3.txt=="number") +│ { +│ vis bUp3,0 +│ vis bStop3,0 +│ vis bDown3,0 +│ vis btOnOff3,0 +│ vis bText3,0 +│ tsw bText3,0 +│ vis hSlider3,1 +│ vis nNum3,1 +│ // get config (optional Value) (use bText as variable) +│ - spstr strCommand.txt,bText3.txt,"~",31 +│ + spstr strCommand.txt,bText3.txt,"~",20 +│ //first value is current value +│ spstr bText3.txt,tTmp.txt,"|",0 +│ covx tTmp.txt,sys0,0,0 +│ hSlider3.val=sys0 +│ nNum3.val=sys0 +│ //second value is min value +│ spstr bText3.txt,tTmp.txt,"|",1 +│ @@ -1714,52 +2194,52 @@ +│ hSlider3.minval=sys0 +│ //third value is max value +│ spstr bText3.txt,tTmp.txt,"|",2 +│ covx tTmp.txt,sys0,0,0 +│ hSlider3.maxval=sys0 +│ } +│ // get Type +│ - spstr strCommand.txt,type4.txt,"~",32 +│ + spstr strCommand.txt,type4.txt,"~",21 +│ // get internal name +│ - spstr strCommand.txt,entn4.txt,"~",33 +│ + spstr strCommand.txt,entn4.txt,"~",22 +│ if(type4.txt=="delete"||type4.txt=="") +│ { +│ vis bUp4,0 +│ vis bStop4,0 +│ vis bDown4,0 +│ vis btOnOff4,0 +│ vis tEntity4,0 +│ vis tIcon4,0 +│ vis bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon4.txt,"~",34 +│ + spstr strCommand.txt,tIcon4.txt,"~",23 +│ vis tIcon4,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",35 +│ + spstr strCommand.txt,tTmp.txt,"~",24 +│ covx tTmp.txt,sys0,0,0 +│ tIcon4.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity4.txt,"~",36 +│ + spstr strCommand.txt,tEntity4.txt,"~",25 +│ vis tEntity4,1 +│ } +│ if(type4.txt=="shutter") +│ { +│ vis bUp4,1 +│ vis bStop4,1 +│ vis bDown4,1 +│ vis btOnOff4,0 +│ vis bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tId.txt,"~",37 +│ + spstr strCommand.txt,tId.txt,"~",26 +│ // up button +│ spstr tId.txt,tTmp.txt,"|",3 +│ if(tTmp.txt=="disable") +│ { +│ bUp4.pco=27501 +│ spstr tId.txt,bUp4.txt,"|",0 +│ tsw bUp4,0 +│ @@ -1802,15 +2282,15 @@ +│ vis bStop4,0 +│ vis bDown4,0 +│ vis btOnOff4,1 +│ vis bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",37 +│ + spstr strCommand.txt,tTmp.txt,"~",26 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff4.val=sys0 +│ } +│ if(type4.txt=="text"||type4.txt=="timer") +│ { +│ vis bUp4,0 +│ vis bStop4,0 +│ @@ -1819,57 +2299,355 @@ +│ vis bText4,1 +│ tsw bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ bText4.pco=65535 +│ bText4.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText4.txt,"~",37 +│ + spstr strCommand.txt,bText4.txt,"~",26 +│ } +│ if(type4.txt=="button"||type4.txt=="input_sel") +│ { +│ vis bUp4,0 +│ vis bStop4,0 +│ vis bDown4,0 +│ vis btOnOff4,0 +│ vis bText4,1 +│ tsw bText4,1 +│ vis hSlider4,0 +│ vis nNum4,0 +│ bText4.pco=1374 +│ bText4.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText4.txt,"~",37 +│ + spstr strCommand.txt,bText4.txt,"~",26 +│ } +│ if(type4.txt=="number") +│ { +│ vis bUp4,0 +│ vis bStop4,0 +│ vis bDown4,0 +│ vis btOnOff4,0 +│ vis bText4,0 +│ tsw bText4,0 +│ vis hSlider4,1 +│ vis nNum4,1 +│ // get config (optional Value) (use bText as variable) +│ - spstr strCommand.txt,bText4.txt,"~",37 +│ + spstr strCommand.txt,bText4.txt,"~",26 +│ //first value is current value +│ spstr bText4.txt,tTmp.txt,"|",0 +│ covx tTmp.txt,sys0,0,0 +│ hSlider4.val=sys0 +│ nNum4.val=sys0 +│ //second value is min value +│ spstr bText4.txt,tTmp.txt,"|",1 │ covx tTmp.txt,sys0,0,0 │ hSlider4.minval=sys0 │ //third value is max value @@ -999,7 +2073,88 @@ │ spstr strCommand.txt,tId.txt,"~",1 │ --- HMI/n2t-out/cardGrid.txt ├── +++ HMI/US/portrait/n2t-out/cardGrid.txt -│ @@ -633,14 +633,18 @@ +│ @@ -78,31 +78,19 @@ +│ +│ Variable (string) entn6 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 700 +│ + Max. Text Size: 500 +│ +│ Variable (string) tSend +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 200 +│ +│ @@ -527,15 +515,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardGrid," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -552,15 +547,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardGrid," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -631,14 +633,18 @@ │ { │ page popupLight │ } @@ -1017,6 +2172,1610 @@ │ Scope : local │ Period (ms): 50 │ Enabled : yes +│ +│ @@ -687,172 +693,178 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ // get Type +│ - spstr strCommand.txt,type1.txt,"~",14 +│ + spstr strCommand.txt,type1.txt,"~",3 +│ // get internal name +│ - spstr strCommand.txt,entn1.txt,"~",15 +│ + spstr strCommand.txt,entn1.txt,"~",4 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ vis tEntity1,0 +│ vis bEntity1,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity1.txt,"~",16 +│ + spstr strCommand.txt,bEntity1.txt,"~",5 +│ vis bEntity1,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",17 +│ + spstr strCommand.txt,tTmp.txt,"~",6 +│ covx tTmp.txt,sys0,0,0 +│ bEntity1.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity1.txt,"~",18 +│ + spstr strCommand.txt,tEntity1.txt,"~",7 +│ vis tEntity1,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type2.txt,"~",20 +│ + spstr strCommand.txt,type2.txt,"~",9 +│ // get internal name +│ - spstr strCommand.txt,entn2.txt,"~",21 +│ + spstr strCommand.txt,entn2.txt,"~",10 +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ vis tEntity2,0 +│ vis bEntity2,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity2.txt,"~",22 +│ + spstr strCommand.txt,bEntity2.txt,"~",11 +│ vis bEntity2,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",23 +│ + spstr strCommand.txt,tTmp.txt,"~",12 +│ covx tTmp.txt,sys0,0,0 +│ bEntity2.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity2.txt,"~",24 +│ + spstr strCommand.txt,tEntity2.txt,"~",13 +│ vis tEntity2,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type3.txt,"~",26 +│ + spstr strCommand.txt,type3.txt,"~",15 +│ // get internal name +│ - spstr strCommand.txt,entn3.txt,"~",27 +│ + spstr strCommand.txt,entn3.txt,"~",16 +│ if(type3.txt=="delete"||type3.txt=="") +│ { +│ vis tEntity3,0 +│ vis bEntity3,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity3.txt,"~",28 +│ + spstr strCommand.txt,bEntity3.txt,"~",17 +│ vis bEntity3,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",29 +│ + spstr strCommand.txt,tTmp.txt,"~",18 +│ covx tTmp.txt,sys0,0,0 +│ bEntity3.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity3.txt,"~",30 +│ + spstr strCommand.txt,tEntity3.txt,"~",19 +│ vis tEntity3,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type4.txt,"~",32 +│ + spstr strCommand.txt,type4.txt,"~",21 +│ // get internal name +│ - spstr strCommand.txt,entn4.txt,"~",33 +│ + spstr strCommand.txt,entn4.txt,"~",22 +│ if(type4.txt=="delete"||type4.txt=="") +│ { +│ vis tEntity4,0 +│ vis bEntity4,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity4.txt,"~",34 +│ + spstr strCommand.txt,bEntity4.txt,"~",23 +│ vis bEntity4,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",35 +│ + spstr strCommand.txt,tTmp.txt,"~",24 +│ covx tTmp.txt,sys0,0,0 +│ bEntity4.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity4.txt,"~",36 +│ + spstr strCommand.txt,tEntity4.txt,"~",25 +│ vis tEntity4,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type5.txt,"~",38 +│ + spstr strCommand.txt,type5.txt,"~",27 +│ // get internal name +│ - spstr strCommand.txt,entn5.txt,"~",39 +│ + spstr strCommand.txt,entn5.txt,"~",28 +│ if(type5.txt=="delete"||type5.txt=="") +│ { +│ vis tEntity5,0 +│ vis bEntity5,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity5.txt,"~",40 +│ + spstr strCommand.txt,bEntity5.txt,"~",29 +│ vis bEntity5,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",41 +│ + spstr strCommand.txt,tTmp.txt,"~",30 +│ covx tTmp.txt,sys0,0,0 +│ bEntity5.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity5.txt,"~",42 +│ + spstr strCommand.txt,tEntity5.txt,"~",31 +│ vis tEntity5,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type6.txt,"~",44 +│ + spstr strCommand.txt,type6.txt,"~",33 +│ // get internal name +│ - spstr strCommand.txt,entn6.txt,"~",45 +│ + spstr strCommand.txt,entn6.txt,"~",34 +│ if(type6.txt=="delete"||type6.txt=="") +│ { +│ vis tEntity6,0 +│ vis bEntity6,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity6.txt,"~",46 +│ + spstr strCommand.txt,bEntity6.txt,"~",35 +│ vis bEntity6,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",47 +│ + spstr strCommand.txt,tTmp.txt,"~",36 +│ covx tTmp.txt,sys0,0,0 +│ bEntity6.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity6.txt,"~",48 +│ + spstr strCommand.txt,tEntity6.txt,"~",37 +│ vis tEntity6,1 +│ } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ sleepValue=0 +│ //command format pageType,specialPageName +│ --- HMI/n2t-out/cardMedia.txt +├── +++ HMI/US/portrait/n2t-out/cardMedia.txt +│ @@ -82,26 +82,14 @@ +│ +│ Variable (string) entn6 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 750 +│ +│ Variable (string) tEntity1 +│ @@ -774,15 +762,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardMedia," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -799,15 +794,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardMedia," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -927,216 +929,222 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + if(tTmp.txt=="2") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ + } +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ //entity name +│ - spstr strCommand.txt,entn.txt,"~",14 +│ + spstr strCommand.txt,entn.txt,"~",3 +│ //title +│ - spstr strCommand.txt,tTitle.txt,"~",15 +│ + spstr strCommand.txt,tTitle.txt,"~",4 +│ //title farbe +│ - spstr strCommand.txt,tTmp.txt,"~",16 +│ + spstr strCommand.txt,tTmp.txt,"~",5 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,tTitle.pco,0,0 +│ } +│ //author +│ - spstr strCommand.txt,tAuthor.txt,"~",17 +│ + spstr strCommand.txt,tAuthor.txt,"~",6 +│ //author farbe +│ - spstr strCommand.txt,tTmp.txt,"~",18 +│ + spstr strCommand.txt,tTmp.txt,"~",7 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,tAuthor.pco,0,0 +│ } +│ //volume +│ - spstr strCommand.txt,tTmp.txt,"~",19 +│ + spstr strCommand.txt,tTmp.txt,"~",8 +│ covx tTmp.txt,sys0,0,0 +│ hVolume.val=sys0 +│ //icon +│ - spstr strCommand.txt,tPlayPause.txt,"~",20 +│ + spstr strCommand.txt,tPlayPause.txt,"~",9 +│ // on off button +│ - spstr strCommand.txt,tTmp.txt,"~",21 +│ + spstr strCommand.txt,tTmp.txt,"~",10 +│ if(tTmp.txt=="disable") +│ { +│ vis t5,0 +│ }else +│ { +│ vis t5,1 +│ covx tTmp.txt,t5.pco,0,0 +│ } +│ // shuffel btn +│ - spstr strCommand.txt,tTmp.txt,"~",22 +│ + spstr strCommand.txt,tTmp.txt,"~",11 +│ if(tTmp.txt=="disable") +│ { +│ vis tShuffle,0 +│ }else +│ { +│ vis tShuffle,1 +│ tShuffle.txt=tTmp.txt +│ } +│ // get Type +│ - spstr strCommand.txt,type1.txt,"~",23 +│ + spstr strCommand.txt,type1.txt,"~",12 +│ // get internal name +│ - spstr strCommand.txt,entn1.txt,"~",24 +│ + spstr strCommand.txt,entn1.txt,"~",13 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ vis tEntity1,0 +│ vis bEntity1,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity1.txt,"~",25 +│ + spstr strCommand.txt,bEntity1.txt,"~",14 +│ vis bEntity1,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",15 +│ covx tTmp.txt,sys0,0,0 +│ bEntity1.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity1.txt,"~",27 +│ + spstr strCommand.txt,tEntity1.txt,"~",16 +│ vis tEntity1,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type2.txt,"~",29 +│ + spstr strCommand.txt,type2.txt,"~",18 +│ // get internal name +│ - spstr strCommand.txt,entn2.txt,"~",30 +│ + spstr strCommand.txt,entn2.txt,"~",19 +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ vis tEntity2,0 +│ vis bEntity2,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity2.txt,"~",31 +│ + spstr strCommand.txt,bEntity2.txt,"~",20 +│ vis bEntity2,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",32 +│ + spstr strCommand.txt,tTmp.txt,"~",21 +│ covx tTmp.txt,sys0,0,0 +│ bEntity2.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity2.txt,"~",33 +│ + spstr strCommand.txt,tEntity2.txt,"~",22 +│ vis tEntity2,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type3.txt,"~",35 +│ + spstr strCommand.txt,type3.txt,"~",24 +│ // get internal name +│ - spstr strCommand.txt,entn3.txt,"~",36 +│ + spstr strCommand.txt,entn3.txt,"~",25 +│ if(type3.txt=="delete"||type3.txt=="") +│ { +│ vis tEntity3,0 +│ vis bEntity3,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity3.txt,"~",37 +│ + spstr strCommand.txt,bEntity3.txt,"~",26 +│ vis bEntity3,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",38 +│ + spstr strCommand.txt,tTmp.txt,"~",27 +│ covx tTmp.txt,sys0,0,0 +│ bEntity3.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity3.txt,"~",39 +│ + spstr strCommand.txt,tEntity3.txt,"~",28 +│ vis tEntity3,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type4.txt,"~",41 +│ + spstr strCommand.txt,type4.txt,"~",30 +│ // get internal name +│ - spstr strCommand.txt,entn4.txt,"~",42 +│ + spstr strCommand.txt,entn4.txt,"~",31 +│ if(type4.txt=="delete"||type4.txt=="") +│ { +│ vis tEntity4,0 +│ vis bEntity4,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity4.txt,"~",43 +│ + spstr strCommand.txt,bEntity4.txt,"~",32 +│ vis bEntity4,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",44 +│ + spstr strCommand.txt,tTmp.txt,"~",33 +│ covx tTmp.txt,sys0,0,0 +│ bEntity4.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity4.txt,"~",45 +│ + spstr strCommand.txt,tEntity4.txt,"~",34 +│ vis tEntity4,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type5.txt,"~",47 +│ + spstr strCommand.txt,type5.txt,"~",36 +│ // get internal name +│ - spstr strCommand.txt,entn5.txt,"~",48 +│ + spstr strCommand.txt,entn5.txt,"~",37 +│ if(type5.txt=="delete"||type5.txt=="") +│ { +│ vis tEntity5,0 +│ vis bEntity5,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity5.txt,"~",49 +│ + spstr strCommand.txt,bEntity5.txt,"~",38 +│ vis bEntity5,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",50 +│ + spstr strCommand.txt,tTmp.txt,"~",39 +│ covx tTmp.txt,sys0,0,0 +│ bEntity5.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity5.txt,"~",51 +│ + spstr strCommand.txt,tEntity5.txt,"~",40 +│ vis tEntity5,1 +│ } +│ // get Type +│ - spstr strCommand.txt,type6.txt,"~",53 +│ + spstr strCommand.txt,type6.txt,"~",42 +│ // get internal name +│ - spstr strCommand.txt,entn6.txt,"~",54 +│ + spstr strCommand.txt,entn6.txt,"~",43 +│ if(type6.txt=="delete"||type6.txt=="") +│ { +│ vis tEntity6,0 +│ vis bEntity6,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,bEntity6.txt,"~",55 +│ + spstr strCommand.txt,bEntity6.txt,"~",44 +│ vis bEntity6,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",56 +│ + spstr strCommand.txt,tTmp.txt,"~",45 +│ covx tTmp.txt,sys0,0,0 +│ bEntity6.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity6.txt,"~",57 +│ + spstr strCommand.txt,tEntity6.txt,"~",46 +│ vis tEntity6,1 +│ } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ sleepValue=0 +│ //command format pageType,specialPageName +│ @@ -1196,18 +1204,14 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ - if(tId.txt=="cardChart") +│ - { +│ - page cardChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardPower.txt +├── +++ HMI/US/portrait/n2t-out/cardPower.txt +│ @@ -53,26 +53,14 @@ +│ b[sys0].pic=19 +│ b[sys0].pic1=19 +│ b[sys0].pic2=15 +│ } +│ } +│ } +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 275 +│ +│ Variable (int32) t0Speed +│ @@ -354,15 +342,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardPower," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -379,15 +374,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardAlarm," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -549,170 +551,176 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ // command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6 +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + if(tTmp.txt=="2") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ + } +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ // icon color home +│ - spstr strCommand.txt,tTmp.txt,"~",14 +│ + spstr strCommand.txt,tTmp.txt,"~",3 +│ covx tTmp.txt,t1.pco,0,0 +│ // icon home +│ - spstr strCommand.txt,t1.txt,"~",15 +│ + spstr strCommand.txt,t1.txt,"~",4 +│ // text home +│ - spstr strCommand.txt,tHome.txt,"~",16 +│ + spstr strCommand.txt,tHome.txt,"~",5 +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",17 +│ + spstr strCommand.txt,tTmp.txt,"~",6 +│ covx tTmp.txt,t0Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t0Icon.txt,"~",18 +│ + spstr strCommand.txt,t0Icon.txt,"~",7 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",19 +│ + spstr strCommand.txt,tTmp.txt,"~",8 +│ covx tTmp.txt,t0Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t0u.txt,"~",20 +│ + spstr strCommand.txt,t0u.txt,"~",9 +│ if(t0Icon.txt!="") +│ { +│ vis t0Icon,1 +│ vis t0u,1 +│ vis h0,1 +│ }else +│ { +│ vis t0Icon,0 +│ vis t0u,0 +│ vis h0,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",21 +│ + spstr strCommand.txt,tTmp.txt,"~",10 +│ covx tTmp.txt,t1Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t1Icon.txt,"~",22 +│ + spstr strCommand.txt,t1Icon.txt,"~",11 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",23 +│ + spstr strCommand.txt,tTmp.txt,"~",12 +│ covx tTmp.txt,t1Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t1u.txt,"~",24 +│ + spstr strCommand.txt,t1u.txt,"~",13 +│ if(t1Icon.txt!="") +│ { +│ vis t1Icon,1 +│ vis t1u,1 +│ vis h1,1 +│ }else +│ { +│ vis t1Icon,0 +│ vis t1u,0 +│ vis h1,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",25 +│ + spstr strCommand.txt,tTmp.txt,"~",14 +│ covx tTmp.txt,t2Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t2Icon.txt,"~",26 +│ + spstr strCommand.txt,t2Icon.txt,"~",15 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",27 +│ + spstr strCommand.txt,tTmp.txt,"~",16 +│ covx tTmp.txt,t2Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t2u.txt,"~",28 +│ + spstr strCommand.txt,t2u.txt,"~",17 +│ if(t2Icon.txt!="") +│ { +│ vis t2Icon,1 +│ vis t2u,1 +│ vis h2,1 +│ }else +│ { +│ vis t2Icon,0 +│ vis t2u,0 +│ vis h2,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",29 +│ + spstr strCommand.txt,tTmp.txt,"~",18 +│ covx tTmp.txt,t3Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t3Icon.txt,"~",30 +│ + spstr strCommand.txt,t3Icon.txt,"~",19 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",31 +│ + spstr strCommand.txt,tTmp.txt,"~",20 +│ covx tTmp.txt,t3Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t3u.txt,"~",32 +│ + spstr strCommand.txt,t3u.txt,"~",21 +│ if(t3Icon.txt!="") +│ { +│ vis t3Icon,1 +│ vis t3u,1 +│ vis h3,1 +│ }else +│ { +│ vis t3Icon,0 +│ vis t3u,0 +│ vis h3,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",33 +│ + spstr strCommand.txt,tTmp.txt,"~",22 +│ covx tTmp.txt,t4Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t4Icon.txt,"~",34 +│ + spstr strCommand.txt,t4Icon.txt,"~",23 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",35 +│ + spstr strCommand.txt,tTmp.txt,"~",24 +│ covx tTmp.txt,t4Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t4u.txt,"~",36 +│ + spstr strCommand.txt,t4u.txt,"~",25 +│ if(t4Icon.txt!="") +│ { +│ vis t4Icon,1 +│ vis t4u,1 +│ vis h4,1 +│ }else +│ { +│ vis t4Icon,0 +│ vis t4u,0 +│ vis h4,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",37 +│ + spstr strCommand.txt,tTmp.txt,"~",26 +│ covx tTmp.txt,t5Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t5Icon.txt,"~",38 +│ + spstr strCommand.txt,t5Icon.txt,"~",27 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",39 +│ + spstr strCommand.txt,tTmp.txt,"~",28 +│ covx tTmp.txt,t5Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t5u.txt,"~",40 +│ + spstr strCommand.txt,t5u.txt,"~",29 +│ if(t5Icon.txt!="") +│ { +│ vis t5Icon,1 +│ vis t5u,1 +│ vis h5,1 +│ }else +│ { +│ --- HMI/n2t-out/cardQR.txt +├── +++ HMI/US/portrait/n2t-out/cardQR.txt +│ @@ -66,31 +66,19 @@ +│ +│ Variable (string) entn2 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 50 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 50 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 400 +│ + Max. Text Size: 275 +│ +│ Variable (string) tId +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 20 +│ +│ @@ -195,15 +183,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardQR," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -220,15 +215,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardAlarm," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -440,171 +442,177 @@ +│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) +│ spstr strCommand.txt,tInstruction.txt,"~",0 +│ if(tInstruction.txt=="entityUpd") +│ { +│ // command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2 +│ //tHeading +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + if(tTmp.txt=="2") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ + } +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + bNext.txt="" +│ } +│ //text qrcode +│ - spstr strCommand.txt,vaQR.txt,"~",14 +│ + spstr strCommand.txt,vaQR.txt,"~",3 +│ // get Type +│ - spstr strCommand.txt,type1.txt,"~",15 +│ + spstr strCommand.txt,type1.txt,"~",4 +│ // get internal name +│ - spstr strCommand.txt,entn1.txt,"~",16 +│ + spstr strCommand.txt,entn1.txt,"~",5 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ vis btOnOff1,0 +│ vis tEntity1,0 +│ vis tIcon1,0 +│ vis bText1,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon1.txt,"~",17 +│ + spstr strCommand.txt,tIcon1.txt,"~",6 +│ vis tIcon1,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",18 +│ + spstr strCommand.txt,tTmp.txt,"~",7 +│ covx tTmp.txt,sys0,0,0 +│ tIcon1.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity1.txt,"~",19 +│ + spstr strCommand.txt,tEntity1.txt,"~",8 +│ vis tEntity1,1 +│ } +│ if(type1.txt=="light") +│ { +│ vis btOnOff1,1 +│ vis bText1,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",20 +│ + spstr strCommand.txt,tTmp.txt,"~",9 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff1.val=sys0 +│ } +│ if(type1.txt=="switch") +│ { +│ vis btOnOff1,1 +│ vis bText1,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",20 +│ + spstr strCommand.txt,tTmp.txt,"~",9 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff1.val=sys0 +│ } +│ if(type1.txt=="text") +│ { +│ vis btOnOff1,0 +│ vis bText1,1 +│ tsw bText1,0 +│ bText1.pco=65535 +│ bText1.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText1.txt,"~",20 +│ + spstr strCommand.txt,bText1.txt,"~",9 +│ } +│ if(type1.txt=="button") +│ { +│ vis btOnOff1,0 +│ vis bText1,1 +│ tsw bText1,1 +│ bText1.pco=1374 +│ bText1.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText1.txt,"~",20 +│ + spstr strCommand.txt,bText1.txt,"~",9 +│ } +│ // get Type +│ - spstr strCommand.txt,type2.txt,"~",21 +│ + spstr strCommand.txt,type2.txt,"~",10 +│ // get internal name +│ - spstr strCommand.txt,entn2.txt,"~",22 +│ + spstr strCommand.txt,entn2.txt,"~",11 +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ vis btOnOff2,0 +│ vis tEntity2,0 +│ vis tIcon2,0 +│ vis bText2,0 +│ }else +│ { +│ // change icon +│ - spstr strCommand.txt,tIcon2.txt,"~",23 +│ + spstr strCommand.txt,tIcon2.txt,"~",12 +│ vis tIcon2,1 +│ // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",24 +│ + spstr strCommand.txt,tTmp.txt,"~",13 +│ covx tTmp.txt,sys0,0,0 +│ tIcon2.pco=sys0 +│ // set name +│ - spstr strCommand.txt,tEntity2.txt,"~",25 +│ + spstr strCommand.txt,tEntity2.txt,"~",14 +│ vis tEntity2,1 +│ } +│ if(type2.txt=="light") +│ { +│ vis btOnOff2,1 +│ vis bText2,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",15 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff2.val=sys0 +│ } +│ if(type2.txt=="switch") +│ { +│ vis btOnOff2,1 +│ vis bText2,0 +│ // get Button State (optional Value) +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",15 +│ covx tTmp.txt,sys0,0,0 +│ btOnOff2.val=sys0 +│ } +│ if(type2.txt=="text") +│ { +│ vis btOnOff2,0 +│ vis bText2,1 +│ tsw bText2,0 +│ bText2.pco=65535 +│ bText2.pco2=65535 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText2.txt,"~",26 +│ + spstr strCommand.txt,bText2.txt,"~",15 +│ } +│ if(type2.txt=="button") +│ { +│ vis btOnOff2,0 +│ vis bText2,1 +│ tsw bText2,1 +│ bText2.pco=1374 +│ bText2.pco2=1374 +│ // get Text (optional Value) +│ - spstr strCommand.txt,bText2.txt,"~",26 +│ + spstr strCommand.txt,bText2.txt,"~",15 +│ } +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt +│ } +│ --- HMI/n2t-out/cardThermo.txt +├── +++ HMI/US/portrait/n2t-out/cardThermo.txt +│ @@ -59,26 +59,14 @@ +│ +│ Variable (string) entn +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ -Variable (string) nent1 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ -Variable (string) nent2 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 250 +│ +│ Variable (string) tId +│ @@ -302,15 +290,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent2.txt+",button" +│ + tSend.txt="event,buttonPress2,cardThermo," +│ + if(bNext.txt=="") +│ + { +│ + tSend.txt+="bHome" +│ + }else +│ + { +│ + tSend.txt+="bNext" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -327,15 +322,22 @@ +│ Send Component ID : disabled +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ - tSend.txt="event,buttonPress2,"+nent1.txt+",button" +│ + tSend.txt="event,buttonPress2,cardThermo," +│ + if(bPrev.txt=="") +│ + { +│ + tSend.txt+="bUp" +│ + }else +│ + { +│ + tSend.txt+="bPrev" +│ + } +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -829,208 +831,214 @@ +│ 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 +│ if(tInstruction.txt=="entityUpd") +│ { +│ //heading +│ spstr strCommand.txt,tHeading.txt,"~",1 +│ - // navigation icon left +│ - spstr strCommand.txt,tTmp.txt,"~",2 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + // navigation icons +│ + spstr strCommand.txt,tId.txt,"~",2 +│ + spstr tId.txt,tTmp.txt,"|",0 +│ + if(tTmp.txt=="0") +│ { +│ vis bPrev,0 +│ - }else +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,0 +│ + } +│ + if(tTmp.txt=="1") +│ + { +│ + vis bPrev,1 +│ + tsw mSwipePrev,1 +│ + tsw mSwipeUp,0 +│ + bPrev.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent1.txt,"~",3 +│ - // change icon +│ - spstr strCommand.txt,bPrev.txt,"~",4 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - covx tTmp.txt,sys0,0,0 +│ - bPrev.pco=sys0 +│ vis bPrev,1 +│ + tsw mSwipePrev,0 +│ + tsw mSwipeUp,1 +│ + bPrev.txt="" +│ } +│ - // navigation icon right +│ - spstr strCommand.txt,tTmp.txt,"~",8 //type +│ - if(tTmp.txt=="delete"||tTmp.txt=="") +│ + spstr tId.txt,tTmp.txt,"|",1 +│ + if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ - }else +│ + tsw mSwipeNext,0 +│ + } +│ + if(tTmp.txt=="1") +│ { +│ - // get internal name +│ - spstr strCommand.txt,nent2.txt,"~",9 +│ - // change icon +│ - spstr strCommand.txt,bNext.txt,"~",10 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - bNext.pco=sys0 +│ vis bNext,1 +│ + tsw mSwipeNext,1 +│ + bNext.txt="" +│ + } +│ + if(tTmp.txt=="2") +│ + { +│ + vis bNext,1 +│ + bNext.txt="" +│ } +│ //entity name +│ - spstr strCommand.txt,entn.txt,"~",14 +│ + spstr strCommand.txt,entn.txt,"~",3 +│ //currentTemp +│ - spstr strCommand.txt,tCurTemp.txt,"~",15 +│ + spstr strCommand.txt,tCurTemp.txt,"~",4 +│ //dstTemp +│ - spstr strCommand.txt,tTmp.txt,"~",16 +│ + spstr strCommand.txt,tTmp.txt,"~",5 +│ covx tTmp.txt,xTempDest1.val,0,0 +│ xTempDest.val=xTempDest1.val +│ //status +│ - spstr strCommand.txt,tStatus.txt,"~",17 +│ + spstr strCommand.txt,tStatus.txt,"~",6 +│ //minTemp +│ - spstr strCommand.txt,tTmp.txt,"~",18 +│ + spstr strCommand.txt,tTmp.txt,"~",7 +│ covx tTmp.txt,xTempMin1.val,0,0 +│ //maxTemp +│ - spstr strCommand.txt,tTmp.txt,"~",19 +│ + spstr strCommand.txt,tTmp.txt,"~",8 +│ covx tTmp.txt,xTempMax1.val,0,0 +│ //tempStep +│ - spstr strCommand.txt,tTmp.txt,"~",20 +│ + spstr strCommand.txt,tTmp.txt,"~",9 +│ covx tTmp.txt,xTempStep1.val,0,0 +│ // disable all buttons +│ vis bt0,0 +│ vis bt1,0 +│ vis bt2,0 +│ vis bt3,0 +│ vis bt4,0 +│ vis bt5,0 +│ vis bt6,0 +│ vis bt7,0 +│ //bt0 +│ - spstr strCommand.txt,bt0.txt,"~",21 +│ + spstr strCommand.txt,bt0.txt,"~",10 +│ if(bt0.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",22 +│ + spstr strCommand.txt,tTmp.txt,"~",11 +│ covx tTmp.txt,bt0.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",23 +│ + spstr strCommand.txt,tTmp.txt,"~",12 +│ covx tTmp.txt,bt0.val,0,0 +│ // save action +│ - spstr strCommand.txt,va0.txt,"~",24 +│ + spstr strCommand.txt,va0.txt,"~",13 +│ //enable +│ vis bt0,1 +│ } +│ //bt1 +│ - spstr strCommand.txt,bt1.txt,"~",25 +│ + spstr strCommand.txt,bt1.txt,"~",14 +│ if(bt1.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",15 +│ covx tTmp.txt,bt1.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",27 +│ + spstr strCommand.txt,tTmp.txt,"~",16 +│ covx tTmp.txt,bt1.val,0,0 +│ // save action +│ - spstr strCommand.txt,va1.txt,"~",28 +│ + spstr strCommand.txt,va1.txt,"~",17 +│ //enable +│ vis bt1,1 +│ } +│ //bt2 +│ - spstr strCommand.txt,bt2.txt,"~",29 +│ + spstr strCommand.txt,bt2.txt,"~",18 +│ if(bt2.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",30 +│ + spstr strCommand.txt,tTmp.txt,"~",19 +│ covx tTmp.txt,bt2.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",31 +│ + spstr strCommand.txt,tTmp.txt,"~",20 +│ covx tTmp.txt,bt2.val,0,0 +│ // save action +│ - spstr strCommand.txt,va2.txt,"~",32 +│ + spstr strCommand.txt,va2.txt,"~",21 +│ //enable +│ vis bt2,1 +│ } +│ //bt3 +│ - spstr strCommand.txt,bt3.txt,"~",33 +│ + spstr strCommand.txt,bt3.txt,"~",22 +│ if(bt3.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",34 +│ + spstr strCommand.txt,tTmp.txt,"~",23 +│ covx tTmp.txt,bt3.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",35 +│ + spstr strCommand.txt,tTmp.txt,"~",24 +│ covx tTmp.txt,bt3.val,0,0 +│ // save action +│ - spstr strCommand.txt,va3.txt,"~",36 +│ + spstr strCommand.txt,va3.txt,"~",25 +│ //enable +│ vis bt3,1 +│ } +│ //bt4 +│ - spstr strCommand.txt,bt4.txt,"~",37 +│ + spstr strCommand.txt,bt4.txt,"~",26 +│ if(bt4.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",38 +│ + spstr strCommand.txt,tTmp.txt,"~",27 +│ covx tTmp.txt,bt4.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",39 +│ + spstr strCommand.txt,tTmp.txt,"~",28 +│ covx tTmp.txt,bt4.val,0,0 +│ // save action +│ - spstr strCommand.txt,va4.txt,"~",40 +│ + spstr strCommand.txt,va4.txt,"~",29 +│ //enable +│ vis bt4,1 +│ } +│ //bt5 +│ - spstr strCommand.txt,bt5.txt,"~",41 +│ + spstr strCommand.txt,bt5.txt,"~",30 +│ if(bt5.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",42 +│ + spstr strCommand.txt,tTmp.txt,"~",31 +│ covx tTmp.txt,bt5.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",43 +│ + spstr strCommand.txt,tTmp.txt,"~",32 +│ covx tTmp.txt,bt5.val,0,0 +│ // save action +│ - spstr strCommand.txt,va5.txt,"~",44 +│ + spstr strCommand.txt,va5.txt,"~",33 +│ //enable +│ vis bt5,1 +│ } +│ //bt6 +│ - spstr strCommand.txt,bt6.txt,"~",45 +│ + spstr strCommand.txt,bt6.txt,"~",34 +│ if(bt6.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",46 +│ + spstr strCommand.txt,tTmp.txt,"~",35 +│ covx tTmp.txt,bt6.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",47 +│ + spstr strCommand.txt,tTmp.txt,"~",36 +│ covx tTmp.txt,bt6.val,0,0 +│ // save action +│ - spstr strCommand.txt,va6.txt,"~",48 +│ + spstr strCommand.txt,va6.txt,"~",37 +│ //enable +│ vis bt6,1 +│ } +│ //bt7 +│ - spstr strCommand.txt,bt7.txt,"~",49 +│ + spstr strCommand.txt,bt7.txt,"~",38 +│ if(bt7.txt!="") +│ { +│ // set text color on active state +│ - spstr strCommand.txt,tTmp.txt,"~",50 +│ + spstr strCommand.txt,tTmp.txt,"~",39 +│ covx tTmp.txt,bt7.pco2,0,0 +│ // set state +│ - spstr strCommand.txt,tTmp.txt,"~",51 +│ + spstr strCommand.txt,tTmp.txt,"~",40 +│ covx tTmp.txt,bt7.val,0,0 +│ // save action +│ - spstr strCommand.txt,va7.txt,"~",52 +│ + spstr strCommand.txt,va7.txt,"~",41 +│ //enable +│ vis bt7,1 +│ } +│ //Text tCurTempLbl +│ - spstr strCommand.txt,tCurTempLbl.txt,"~",53 +│ + spstr strCommand.txt,tCurTempLbl.txt,"~",42 +│ //Text tStateLbl +│ - spstr strCommand.txt,tStateLbl.txt,"~",54 +│ + spstr strCommand.txt,tStateLbl.txt,"~",43 +│ //Text tALbl +│ - //spstr strCommand.txt,tALbl.txt,"~",55 +│ + //spstr strCommand.txt,tALbl.txt,"~",44 +│ //Text tCF +│ - spstr strCommand.txt,tCF.txt,"~",56 +│ + spstr strCommand.txt,tCF.txt,"~",45 +│ tCF1.txt=tCF.txt +│ tCF2.txt=tCF.txt +│ //Second Temperature +│ - spstr strCommand.txt,tTmp.txt,"~",57 +│ + spstr strCommand.txt,tTmp.txt,"~",46 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,xTempDest2.val,0,0 +│ vis btUp,0 +│ vis xTempDest,0 +│ vis btDown,0 +│ vis tCF,0 +│ @@ -1040,16 +1048,16 @@ +│ vis tCF1,1 +│ vis bUp2,1 +│ vis xTempDest2,1 +│ vis bDown2,1 +│ vis tCF2,1 +│ } +│ //Show btDetail +│ - spstr strCommand.txt,tTmp.txt,"~",58 +│ - if(tTmp.txt!="1") +│ + spstr strCommand.txt,tTmp.txt,"~",47 +│ + if(tTmp.txt=="1") +│ { +│ vis btDetail,1 +│ }else +│ { +│ vis btDetail,0 +│ } +│ } │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt │ @@ -118,15 +118,15 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 46bb1a2d..efa20603 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,15 +1,491 @@ -+++ /dev/fd/62 2022-12-23 15:58:39.712878570 +0000 ++++ /dev/fd/62 2022-12-28 19:03:47.763413658 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt -+I/n2t-out/cardEntities.txt -++ HMI/US/portrait/n2t-out/cardEntities.txt -+14 +116,26 @@ -+e (string) entn6 ++I/n2t-out/cardAlarm.txt +++ HMI/US/portrait/n2t-out/cardAlarm.txt ++6 +59,14 @@ ++ ++e (string) entn +ributes + Scope : local + Text : + Max. Text Size: 80 + ++e (string) nent1 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent2 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) strCommand ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 200 ++ ++e (string) tSend ++15 +478,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent2.txt+",button" ++ tSend.txt="event,buttonPress2,cardAlarm," ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++15 +510,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent1.txt+",button" ++ tSend.txt="event,buttonPress2,cardAlarm," ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++88 +636,94 @@ ++ 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 ++ if(tInstruction.txt=="entityUpd") ++ { ++ //entn ++ spstr strCommand.txt,entn.txt,"~",1 ++ // navigation icon left ++ spstr strCommand.txt,tTmp.txt,"~",2 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ // navigation icons ++ spstr strCommand.txt,tId.txt,"~",2 ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="0") ++ { ++ vis bPrev,0 ++ }else ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent1.txt,"~",3 ++ // change icon ++ spstr strCommand.txt,bPrev.txt,"~",4 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ covx tTmp.txt,sys0,0,0 ++ bPrev.pco=sys0 ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="" ++ } ++ // navigation icon right ++ spstr strCommand.txt,tTmp.txt,"~",8 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ }else ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent2.txt,"~",9 ++ // change icon ++ spstr strCommand.txt,bNext.txt,"~",10 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,sys0,0,0 ++ bNext.pco=sys0 ++ vis bNext,1 ++ bNext.txt="" ++ } ++ //text arm1 ++ spstr strCommand.txt,arm1.txt,"~",14 ++ spstr strCommand.txt,arm1.txt,"~",3 ++ if(arm1.txt!="") ++ { ++ vis arm1,1 ++ } ++ //id arm1 ++ spstr strCommand.txt,va1.txt,"~",15 ++ spstr strCommand.txt,va1.txt,"~",4 ++ //text arm2 ++ spstr strCommand.txt,arm2.txt,"~",16 ++ spstr strCommand.txt,arm2.txt,"~",5 ++ if(arm2.txt!="") ++ { ++ vis arm2,1 ++ } ++ //id arm2 ++ spstr strCommand.txt,va2.txt,"~",17 ++ spstr strCommand.txt,va2.txt,"~",6 ++ //text arm3 ++ spstr strCommand.txt,arm3.txt,"~",18 ++ spstr strCommand.txt,arm3.txt,"~",7 ++ if(arm3.txt!="") ++ { ++ vis arm3,1 ++ } ++ //id arm3 ++ spstr strCommand.txt,va3.txt,"~",19 ++ spstr strCommand.txt,va3.txt,"~",8 ++ //text arm4 ++ spstr strCommand.txt,arm4.txt,"~",20 ++ spstr strCommand.txt,arm4.txt,"~",9 ++ if(arm4.txt!="") ++ { ++ vis arm4,1 ++ } ++ //id arm4 ++ spstr strCommand.txt,va4.txt,"~",21 ++ spstr strCommand.txt,va4.txt,"~",10 ++ //icon ++ spstr strCommand.txt,tIcon.txt,"~",22 ++ spstr strCommand.txt,tIcon.txt,"~",11 ++ //icon color ++ spstr strCommand.txt,tTmp.txt,"~",23 ++ spstr strCommand.txt,tTmp.txt,"~",12 ++ covx tTmp.txt,sys0,0,0 ++ tIcon.pco=sys0 ++ //numpad status ++ spstr strCommand.txt,tTmp.txt,"~",24 ++ spstr strCommand.txt,tTmp.txt,"~",13 ++ if(tTmp.txt!="disable") ++ { ++ vis b0,1 ++ vis b1,1 ++ vis b2,1 ++ vis b3,1 ++ vis b4,1 ++30 +748,30 @@ ++ vis b8,0 ++ vis b9,0 ++ vis b10,0 ++ vis b11,0 ++ vis tCode,0 ++ } ++ //flashing status ++ spstr strCommand.txt,tTmp.txt,"~",25 ++ spstr strCommand.txt,tTmp.txt,"~",14 ++ if(tTmp.txt=="enable") ++ { ++ tmFlash.en=1 ++ }else ++ { ++ tmFlash.en=0 ++ } ++ // extra button ++ spstr strCommand.txt,b9.txt,"~",26 ++ spstr strCommand.txt,b9.txt,"~",15 ++ if(b9.txt!="") ++ { ++ vis b9,1 ++ spstr strCommand.txt,tTmp.txt,"~",27 ++ spstr strCommand.txt,tTmp.txt,"~",16 ++ covx tTmp.txt,b9.pco,0,0 ++ spstr strCommand.txt,vaAddBtn.txt,"~",28 ++ spstr strCommand.txt,vaAddBtn.txt,"~",17 ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } ++I/n2t-out/cardChart.txt +++ HMI/US/portrait/n2t-out/cardChart.txt ++6 +45,14 @@ ++ ++e (string) entn ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent1 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent2 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) strCommand ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 275 ++ ++e (string) strTmp ++15 +175,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent2.txt+",button" ++ tSend.txt="event,buttonPress2,cardChart," ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++15 +207,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent1.txt+",button" ++ tSend.txt="event,buttonPress2,cardChart," ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++88 +395,94 @@ ++ // here is the location where acual code should be ++ 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 ++ if(tInstruction.txt=="entityUpd") ++ { ++ spstr strCommand.txt,tHeading.txt,"~",1 ++ // navigation icon left ++ spstr strCommand.txt,tTmp.txt,"~",2 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ // navigation icons ++ spstr strCommand.txt,tId.txt,"~",2 ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="0") ++ { ++ vis bPrev,0 ++ }else ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ // get internal name ++ spstr strCommand.txt,nent1.txt,"~",3 ++ // change icon ++ spstr strCommand.txt,bPrev.txt,"~",4 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ covx tTmp.txt,sys0,0,0 ++ bPrev.pco=sys0 ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="" ++ } ++ // navigation icon right ++ spstr strCommand.txt,tTmp.txt,"~",8 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ }else ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent2.txt,"~",9 ++ // change icon ++ spstr strCommand.txt,bNext.txt,"~",10 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,sys0,0,0 ++ bNext.pco=sys0 ++ vis bNext,1 ++ bNext.txt="" ++ } ++ // extract color ++ spstr strCommand.txt,tTmp.txt,"~",14 ++ spstr strCommand.txt,tTmp.txt,"~",3 ++ covx tTmp.txt,vaColorL.val,0,0 ++ // prepare dark color ++ sys0=vaColorL.val>>11 // red ++ vaColorD.val=sys0*8/10<<11 // store and shift ++ sys0=vaColorL.val>>5%64 // green ++ vaColorD.val=sys0*8/10<<5+vaColorD.val // store and shift ++ sys0=vaColorL.val%32 ++ vaColorD.val=sys0*8/10+vaColorD.val // store and add ++ // ++ // detect nValues and maxValue ++ vNValues.val=0 ++ spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17 ++ spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 ++ strlen tTmp.txt,sya0 ++ while(sya0>0) ++ { ++ covx tTmp.txt,sya1,0,0 ++ if(sya1>vMax.val) ++ { ++ vMax.val=sya1 ++ } ++ // next ++ vNValues.val++ ++ spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17 ++ spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 ++ strlen tTmp.txt,sya0 ++ } ++ // ++ // calculate unit width ++ sys0=vNValues.val*4 ++ sys0+=vNValues.val-1 ++ vaUnit.val=m0.w-25-40*100 ++ vaUnit.val/=sys0 ++ vaBottom.val=m0.y+m0.h-24 ++ vaLeft.val=m0.x+25+40*100 ++ vaYUnit.val=m0.h-24/vMax.val ++ // ++ line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 ++ line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 ++ spstr strCommand.txt,strTmp.txt,"~",16 ++ spstr strCommand.txt,strTmp.txt,"~",5 ++ sya1=0 ++ spstr strTmp.txt,tTmp.txt,":",sya1 ++ strlen tTmp.txt,sya0 ++ while(sya0>0) ++ { ++ covx tTmp.txt,sys1,0,0 ++ if(sys1<=vMax.val) ++15 +507,15 @@ ++ // next ++ sya1++ ++ spstr strTmp.txt,tTmp.txt,":",sya1 ++ strlen tTmp.txt,sya0 ++ } ++ // ++ // y achis label ++ spstr strCommand.txt,tTmp.txt,"~",15 ++ spstr strCommand.txt,tTmp.txt,"~",4 ++ // tTmp.txt="Gas [kW]" ++ strlen tTmp.txt,sys1 ++ sya1=sys1*12+m0.h-48/2 ++ for(sys0=0;sys00) ++ { ++ vaValues.txt+="~" ++ } ++ // extract next entry ++ spstr strCommand.txt,tTmp.txt,"~",sys0+17 ++ spstr strCommand.txt,tTmp.txt,"~",sys0+6 ++ // calculate left ++ sys1=sys0*5*vaUnit.val ++ sys1+=vaLeft.val ++ // if there is a colon in the obtained value we have a label/and gridline ++ spstr tTmp.txt,strTmp.txt,"^",1 ++ strlen strTmp.txt,sya0 ++ if(sya0>0) ++I/n2t-out/cardEntities.txt +++ HMI/US/portrait/n2t-out/cardEntities.txt ++21 +116,21 @@ ++e (string) nent1 ++e (string) nent2 ++e (string) entn6 ++ Max. Text Size: 80 ++e (string) strCommand ++ributes +14 +164,26 @@ +e (string) type6 +ributes @@ -78,7 +554,7 @@ + prints tSend.txt,0 + prints crcval,2 + -+14 +665,64 @@ ++27 +665,84 @@ +bDown6 +ributes + Scope : local @@ -104,6 +580,51 @@ + prints tSend.txt,0 + prints crcval,2 + ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent2.txt+",button" ++ tSend.txt="event,buttonPress2,cardEntities," ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++15 +759,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent1.txt+",button" ++ tSend.txt="event,buttonPress2,cardEntities," ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd +14 +879,64 @@ +bStop6 +ributes @@ -253,7 +774,563 @@ + { + page popupTimer + } -+,14 +2342,312 @@ ++,87 +1706,93 @@ ++ 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 ++ if(tInstruction.txt=="entityUpd") ++ { ++ // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 ++ spstr strCommand.txt,tHeading.txt,"~",1 ++ // navigation icon left ++ spstr strCommand.txt,tTmp.txt,"~",2 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ // navigation icons ++ spstr strCommand.txt,tId.txt,"~",2 ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="0") ++ { ++ vis bPrev,0 ++ }else ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent1.txt,"~",3 ++ // change icon ++ spstr strCommand.txt,bPrev.txt,"~",4 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ covx tTmp.txt,sys0,0,0 ++ bPrev.pco=sys0 ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="" ++ } ++ // navigation icon right ++ spstr strCommand.txt,tTmp.txt,"~",8 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ }else ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent2.txt,"~",9 ++ // change icon ++ spstr strCommand.txt,bNext.txt,"~",10 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,sys0,0,0 ++ bNext.pco=sys0 ++ vis bNext,1 ++ bNext.txt="" ++ } ++ // get Type ++ spstr strCommand.txt,type1.txt,"~",14 ++ spstr strCommand.txt,type1.txt,"~",3 ++ // get internal name ++ spstr strCommand.txt,entn1.txt,"~",15 ++ spstr strCommand.txt,entn1.txt,"~",4 ++ if(type1.txt=="delete"||type1.txt=="") ++ { ++ vis bUp1,0 ++ vis bStop1,0 ++ vis bDown1,0 ++ vis btOnOff1,0 ++ vis tEntity1,0 ++ vis tIcon1,0 ++ vis bText1,0 ++ vis hSlider1,0 ++ vis nNum1,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,tIcon1.txt,"~",16 ++ spstr strCommand.txt,tIcon1.txt,"~",5 ++ vis tIcon1,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",17 ++ spstr strCommand.txt,tTmp.txt,"~",6 ++ covx tTmp.txt,sys0,0,0 ++ tIcon1.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity1.txt,"~",18 ++ spstr strCommand.txt,tEntity1.txt,"~",7 ++ vis tEntity1,1 ++ } ++ if(type1.txt=="shutter") ++ { ++ vis bUp1,1 ++ vis bStop1,1 ++ vis bDown1,1 ++ vis btOnOff1,0 ++ vis bText1,0 ++ vis hSlider1,0 ++ vis nNum1,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tId.txt,"~",19 ++ spstr strCommand.txt,tId.txt,"~",8 ++ // up button ++ spstr tId.txt,tTmp.txt,"|",3 ++ if(tTmp.txt=="disable") ++ { ++ bUp1.pco=27501 ++ spstr tId.txt,bUp1.txt,"|",0 ++ tsw bUp1,0 ++,15 +1835,15 @@ ++ vis bStop1,0 ++ vis bDown1,0 ++ vis btOnOff1,1 ++ vis bText1,0 ++ vis hSlider1,0 ++ vis nNum1,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",19 ++ spstr strCommand.txt,tTmp.txt,"~",8 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff1.val=sys0 ++ } ++ if(type1.txt=="text"||type1.txt=="timer") ++ { ++ vis bUp1,0 ++ vis bStop1,0 ++,43 +1852,43 @@ ++ vis bText1,1 ++ tsw bText1,0 ++ vis hSlider1,0 ++ vis nNum1,0 ++ bText1.pco=65535 ++ bText1.pco2=65535 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText1.txt,"~",19 ++ spstr strCommand.txt,bText1.txt,"~",8 ++ } ++ if(type1.txt=="button"||type1.txt=="input_sel") ++ { ++ vis bUp1,0 ++ vis bStop1,0 ++ vis bDown1,0 ++ vis btOnOff1,0 ++ vis bText1,1 ++ tsw bText1,1 ++ vis hSlider1,0 ++ vis nNum1,0 ++ bText1.pco=1374 ++ bText1.pco2=1374 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText1.txt,"~",19 ++ spstr strCommand.txt,bText1.txt,"~",8 ++ } ++ if(type1.txt=="number") ++ { ++ vis bUp1,0 ++ vis bStop1,0 ++ vis bDown1,0 ++ vis btOnOff1,0 ++ vis bText1,0 ++ tsw bText1,0 ++ vis hSlider1,1 ++ vis nNum1,1 ++ // get config (optional Value) (use bText as variable) ++ spstr strCommand.txt,bText1.txt,"~",19 ++ spstr strCommand.txt,bText1.txt,"~",8 ++ //first value is current value ++ spstr bText1.txt,tTmp.txt,"|",0 ++ covx tTmp.txt,sys0,0,0 ++ hSlider1.val=sys0 ++ nNum1.val=sys0 ++ //second value is min value ++ spstr bText1.txt,tTmp.txt,"|",1 ++,52 +1896,52 @@ ++ hSlider1.minval=sys0 ++ //third value is max value ++ spstr bText1.txt,tTmp.txt,"|",2 ++ covx tTmp.txt,sys0,0,0 ++ hSlider1.maxval=sys0 ++ } ++ // get Type ++ spstr strCommand.txt,type2.txt,"~",20 ++ spstr strCommand.txt,type2.txt,"~",9 ++ // get internal name ++ spstr strCommand.txt,entn2.txt,"~",21 ++ spstr strCommand.txt,entn2.txt,"~",10 ++ if(type2.txt=="delete"||type2.txt=="") ++ { ++ vis bUp2,0 ++ vis bStop2,0 ++ vis bDown2,0 ++ vis btOnOff2,0 ++ vis tEntity2,0 ++ vis tIcon2,0 ++ vis bText2,0 ++ vis hSlider2,0 ++ vis nNum2,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,tIcon2.txt,"~",22 ++ spstr strCommand.txt,tIcon2.txt,"~",11 ++ vis tIcon2,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",23 ++ spstr strCommand.txt,tTmp.txt,"~",12 ++ covx tTmp.txt,sys0,0,0 ++ tIcon2.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity2.txt,"~",24 ++ spstr strCommand.txt,tEntity2.txt,"~",13 ++ vis tEntity2,1 ++ } ++ if(type2.txt=="shutter") ++ { ++ vis bUp2,1 ++ vis bStop2,1 ++ vis bDown2,1 ++ vis btOnOff2,0 ++ vis bText2,0 ++ vis hSlider2,0 ++ vis nNum2,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tId.txt,"~",25 ++ spstr strCommand.txt,tId.txt,"~",14 ++ // up button ++ spstr tId.txt,tTmp.txt,"|",3 ++ if(tTmp.txt=="disable") ++ { ++ bUp2.pco=27501 ++ spstr tId.txt,bUp2.txt,"|",0 ++ tsw bUp2,0 ++,15 +1984,15 @@ ++ vis bStop2,0 ++ vis bDown2,0 ++ vis btOnOff2,1 ++ vis bText2,0 ++ vis hSlider2,0 ++ vis nNum2,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",25 ++ spstr strCommand.txt,tTmp.txt,"~",14 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff2.val=sys0 ++ } ++ if(type2.txt=="text"||type2.txt=="timer") ++ { ++ vis bUp2,0 ++ vis bStop2,0 ++,43 +2001,43 @@ ++ vis bText2,1 ++ tsw bText2,0 ++ vis hSlider2,0 ++ vis nNum2,0 ++ bText2.pco=65535 ++ bText2.pco2=65535 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText2.txt,"~",25 ++ spstr strCommand.txt,bText2.txt,"~",14 ++ } ++ if(type2.txt=="button"||type2.txt=="input_sel") ++ { ++ vis bUp2,0 ++ vis bStop2,0 ++ vis bDown2,0 ++ vis btOnOff2,0 ++ vis bText2,1 ++ tsw bText2,1 ++ vis hSlider2,0 ++ vis nNum2,0 ++ bText2.pco=1374 ++ bText2.pco2=1374 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText2.txt,"~",25 ++ spstr strCommand.txt,bText2.txt,"~",14 ++ } ++ if(type2.txt=="number") ++ { ++ vis bUp2,0 ++ vis bStop2,0 ++ vis bDown2,0 ++ vis btOnOff2,0 ++ vis bText2,0 ++ tsw bText2,0 ++ vis hSlider2,1 ++ vis nNum2,1 ++ // get config (optional Value) (use bText as variable) ++ spstr strCommand.txt,bText2.txt,"~",25 ++ spstr strCommand.txt,bText2.txt,"~",14 ++ //first value is current value ++ spstr bText2.txt,tTmp.txt,"|",0 ++ covx tTmp.txt,sys0,0,0 ++ hSlider2.val=sys0 ++ nNum2.val=sys0 ++ //second value is min value ++ spstr bText2.txt,tTmp.txt,"|",1 ++,52 +2045,52 @@ ++ hSlider2.minval=sys0 ++ //third value is max value ++ spstr bText2.txt,tTmp.txt,"|",2 ++ covx tTmp.txt,sys0,0,0 ++ hSlider2.maxval=sys0 ++ } ++ // get Type ++ spstr strCommand.txt,type3.txt,"~",26 ++ spstr strCommand.txt,type3.txt,"~",15 ++ // get internal name ++ spstr strCommand.txt,entn3.txt,"~",27 ++ spstr strCommand.txt,entn3.txt,"~",16 ++ if(type3.txt=="delete"||type3.txt=="") ++ { ++ vis bUp3,0 ++ vis bStop3,0 ++ vis bDown3,0 ++ vis btOnOff3,0 ++ vis tEntity3,0 ++ vis tIcon3,0 ++ vis bText3,0 ++ vis hSlider3,0 ++ vis nNum3,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,tIcon3.txt,"~",28 ++ spstr strCommand.txt,tIcon3.txt,"~",17 ++ vis tIcon3,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",29 ++ spstr strCommand.txt,tTmp.txt,"~",18 ++ covx tTmp.txt,sys0,0,0 ++ tIcon3.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity3.txt,"~",30 ++ spstr strCommand.txt,tEntity3.txt,"~",19 ++ vis tEntity3,1 ++ } ++ if(type3.txt=="shutter") ++ { ++ vis bUp3,1 ++ vis bStop3,1 ++ vis bDown3,1 ++ vis btOnOff3,0 ++ vis bText3,0 ++ vis hSlider3,0 ++ vis nNum3,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tId.txt,"~",31 ++ spstr strCommand.txt,tId.txt,"~",20 ++ // up button ++ spstr tId.txt,tTmp.txt,"|",3 ++ if(tTmp.txt=="disable") ++ { ++ bUp3.pco=27501 ++ spstr tId.txt,bUp3.txt,"|",0 ++ tsw bUp3,0 ++,15 +2133,15 @@ ++ vis bStop3,0 ++ vis bDown3,0 ++ vis btOnOff3,1 ++ vis bText3,0 ++ vis hSlider3,0 ++ vis nNum3,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",31 ++ spstr strCommand.txt,tTmp.txt,"~",20 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff3.val=sys0 ++ } ++ if(type3.txt=="text"||type3.txt=="timer") ++ { ++ vis bUp3,0 ++ vis bStop3,0 ++,43 +2150,43 @@ ++ vis bText3,1 ++ tsw bText3,0 ++ vis hSlider3,0 ++ vis nNum3,0 ++ bText3.pco=65535 ++ bText3.pco2=65535 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText3.txt,"~",31 ++ spstr strCommand.txt,bText3.txt,"~",20 ++ } ++ if(type3.txt=="button"||type3.txt=="input_sel") ++ { ++ vis bUp3,0 ++ vis bStop3,0 ++ vis bDown3,0 ++ vis btOnOff3,0 ++ vis bText3,1 ++ tsw bText3,1 ++ vis hSlider3,0 ++ vis nNum3,0 ++ bText3.pco=1374 ++ bText3.pco2=1374 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText3.txt,"~",31 ++ spstr strCommand.txt,bText3.txt,"~",20 ++ } ++ if(type3.txt=="number") ++ { ++ vis bUp3,0 ++ vis bStop3,0 ++ vis bDown3,0 ++ vis btOnOff3,0 ++ vis bText3,0 ++ tsw bText3,0 ++ vis hSlider3,1 ++ vis nNum3,1 ++ // get config (optional Value) (use bText as variable) ++ spstr strCommand.txt,bText3.txt,"~",31 ++ spstr strCommand.txt,bText3.txt,"~",20 ++ //first value is current value ++ spstr bText3.txt,tTmp.txt,"|",0 ++ covx tTmp.txt,sys0,0,0 ++ hSlider3.val=sys0 ++ nNum3.val=sys0 ++ //second value is min value ++ spstr bText3.txt,tTmp.txt,"|",1 ++,52 +2194,52 @@ ++ hSlider3.minval=sys0 ++ //third value is max value ++ spstr bText3.txt,tTmp.txt,"|",2 ++ covx tTmp.txt,sys0,0,0 ++ hSlider3.maxval=sys0 ++ } ++ // get Type ++ spstr strCommand.txt,type4.txt,"~",32 ++ spstr strCommand.txt,type4.txt,"~",21 ++ // get internal name ++ spstr strCommand.txt,entn4.txt,"~",33 ++ spstr strCommand.txt,entn4.txt,"~",22 ++ if(type4.txt=="delete"||type4.txt=="") ++ { ++ vis bUp4,0 ++ vis bStop4,0 ++ vis bDown4,0 ++ vis btOnOff4,0 ++ vis tEntity4,0 ++ vis tIcon4,0 ++ vis bText4,0 ++ vis hSlider4,0 ++ vis nNum4,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,tIcon4.txt,"~",34 ++ spstr strCommand.txt,tIcon4.txt,"~",23 ++ vis tIcon4,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",35 ++ spstr strCommand.txt,tTmp.txt,"~",24 ++ covx tTmp.txt,sys0,0,0 ++ tIcon4.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity4.txt,"~",36 ++ spstr strCommand.txt,tEntity4.txt,"~",25 ++ vis tEntity4,1 ++ } ++ if(type4.txt=="shutter") ++ { ++ vis bUp4,1 ++ vis bStop4,1 ++ vis bDown4,1 ++ vis btOnOff4,0 ++ vis bText4,0 ++ vis hSlider4,0 ++ vis nNum4,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tId.txt,"~",37 ++ spstr strCommand.txt,tId.txt,"~",26 ++ // up button ++ spstr tId.txt,tTmp.txt,"|",3 ++ if(tTmp.txt=="disable") ++ { ++ bUp4.pco=27501 ++ spstr tId.txt,bUp4.txt,"|",0 ++ tsw bUp4,0 ++,15 +2282,15 @@ ++ vis bStop4,0 ++ vis bDown4,0 ++ vis btOnOff4,1 ++ vis bText4,0 ++ vis hSlider4,0 ++ vis nNum4,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",37 ++ spstr strCommand.txt,tTmp.txt,"~",26 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff4.val=sys0 ++ } ++ if(type4.txt=="text"||type4.txt=="timer") ++ { ++ vis bUp4,0 ++ vis bStop4,0 ++,57 +2299,355 @@ ++ vis bText4,1 ++ tsw bText4,0 ++ vis hSlider4,0 ++ vis nNum4,0 ++ bText4.pco=65535 ++ bText4.pco2=65535 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText4.txt,"~",37 ++ spstr strCommand.txt,bText4.txt,"~",26 ++ } ++ if(type4.txt=="button"||type4.txt=="input_sel") ++ { ++ vis bUp4,0 ++ vis bStop4,0 ++ vis bDown4,0 ++ vis btOnOff4,0 ++ vis bText4,1 ++ tsw bText4,1 ++ vis hSlider4,0 ++ vis nNum4,0 ++ bText4.pco=1374 ++ bText4.pco2=1374 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText4.txt,"~",37 ++ spstr strCommand.txt,bText4.txt,"~",26 ++ } ++ if(type4.txt=="number") ++ { ++ vis bUp4,0 ++ vis bStop4,0 ++ vis bDown4,0 ++ vis btOnOff4,0 ++ vis bText4,0 ++ tsw bText4,0 ++ vis hSlider4,1 ++ vis nNum4,1 ++ // get config (optional Value) (use bText as variable) ++ spstr strCommand.txt,bText4.txt,"~",37 ++ spstr strCommand.txt,bText4.txt,"~",26 ++ //first value is current value ++ spstr bText4.txt,tTmp.txt,"|",0 ++ covx tTmp.txt,sys0,0,0 ++ hSlider4.val=sys0 ++ nNum4.val=sys0 ++ //second value is min value ++ spstr bText4.txt,tTmp.txt,"|",1 + if(type5.txt=="text"||type5.txt=="timer") + // get Type + spstr strCommand.txt,type6.txt,"~",33 @@ -406,6 +1483,87 @@ + } +I/n2t-out/cardGrid.txt ++ HMI/US/portrait/n2t-out/cardGrid.txt ++1 +78,19 @@ ++ ++e (string) entn6 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent1 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent2 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) strCommand ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 700 ++ Max. Text Size: 500 ++ ++e (string) tSend ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 200 ++ ++15 +515,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent2.txt+",button" ++ tSend.txt="event,buttonPress2,cardGrid," ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++15 +547,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent1.txt+",button" ++ tSend.txt="event,buttonPress2,cardGrid," ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd +14 +633,18 @@ + { + page popupLight @@ -424,6 +1582,1610 @@ + Scope : local + Period (ms): 50 + Enabled : yes ++ ++172 +693,178 @@ ++ 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 ++ if(tInstruction.txt=="entityUpd") ++ { ++ // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 ++ spstr strCommand.txt,tHeading.txt,"~",1 ++ // navigation icon left ++ spstr strCommand.txt,tTmp.txt,"~",2 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ // navigation icons ++ spstr strCommand.txt,tId.txt,"~",2 ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="0") ++ { ++ vis bPrev,0 ++ }else ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent1.txt,"~",3 ++ // change icon ++ spstr strCommand.txt,bPrev.txt,"~",4 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ covx tTmp.txt,sys0,0,0 ++ bPrev.pco=sys0 ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="" ++ } ++ // navigation icon right ++ spstr strCommand.txt,tTmp.txt,"~",8 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ }else ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent2.txt,"~",9 ++ // change icon ++ spstr strCommand.txt,bNext.txt,"~",10 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,sys0,0,0 ++ bNext.pco=sys0 ++ vis bNext,1 ++ bNext.txt="" ++ } ++ // get Type ++ spstr strCommand.txt,type1.txt,"~",14 ++ spstr strCommand.txt,type1.txt,"~",3 ++ // get internal name ++ spstr strCommand.txt,entn1.txt,"~",15 ++ spstr strCommand.txt,entn1.txt,"~",4 ++ if(type1.txt=="delete"||type1.txt=="") ++ { ++ vis tEntity1,0 ++ vis bEntity1,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity1.txt,"~",16 ++ spstr strCommand.txt,bEntity1.txt,"~",5 ++ vis bEntity1,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",17 ++ spstr strCommand.txt,tTmp.txt,"~",6 ++ covx tTmp.txt,sys0,0,0 ++ bEntity1.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity1.txt,"~",18 ++ spstr strCommand.txt,tEntity1.txt,"~",7 ++ vis tEntity1,1 ++ } ++ // get Type ++ spstr strCommand.txt,type2.txt,"~",20 ++ spstr strCommand.txt,type2.txt,"~",9 ++ // get internal name ++ spstr strCommand.txt,entn2.txt,"~",21 ++ spstr strCommand.txt,entn2.txt,"~",10 ++ if(type2.txt=="delete"||type2.txt=="") ++ { ++ vis tEntity2,0 ++ vis bEntity2,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity2.txt,"~",22 ++ spstr strCommand.txt,bEntity2.txt,"~",11 ++ vis bEntity2,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",23 ++ spstr strCommand.txt,tTmp.txt,"~",12 ++ covx tTmp.txt,sys0,0,0 ++ bEntity2.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity2.txt,"~",24 ++ spstr strCommand.txt,tEntity2.txt,"~",13 ++ vis tEntity2,1 ++ } ++ // get Type ++ spstr strCommand.txt,type3.txt,"~",26 ++ spstr strCommand.txt,type3.txt,"~",15 ++ // get internal name ++ spstr strCommand.txt,entn3.txt,"~",27 ++ spstr strCommand.txt,entn3.txt,"~",16 ++ if(type3.txt=="delete"||type3.txt=="") ++ { ++ vis tEntity3,0 ++ vis bEntity3,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity3.txt,"~",28 ++ spstr strCommand.txt,bEntity3.txt,"~",17 ++ vis bEntity3,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",29 ++ spstr strCommand.txt,tTmp.txt,"~",18 ++ covx tTmp.txt,sys0,0,0 ++ bEntity3.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity3.txt,"~",30 ++ spstr strCommand.txt,tEntity3.txt,"~",19 ++ vis tEntity3,1 ++ } ++ // get Type ++ spstr strCommand.txt,type4.txt,"~",32 ++ spstr strCommand.txt,type4.txt,"~",21 ++ // get internal name ++ spstr strCommand.txt,entn4.txt,"~",33 ++ spstr strCommand.txt,entn4.txt,"~",22 ++ if(type4.txt=="delete"||type4.txt=="") ++ { ++ vis tEntity4,0 ++ vis bEntity4,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity4.txt,"~",34 ++ spstr strCommand.txt,bEntity4.txt,"~",23 ++ vis bEntity4,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",35 ++ spstr strCommand.txt,tTmp.txt,"~",24 ++ covx tTmp.txt,sys0,0,0 ++ bEntity4.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity4.txt,"~",36 ++ spstr strCommand.txt,tEntity4.txt,"~",25 ++ vis tEntity4,1 ++ } ++ // get Type ++ spstr strCommand.txt,type5.txt,"~",38 ++ spstr strCommand.txt,type5.txt,"~",27 ++ // get internal name ++ spstr strCommand.txt,entn5.txt,"~",39 ++ spstr strCommand.txt,entn5.txt,"~",28 ++ if(type5.txt=="delete"||type5.txt=="") ++ { ++ vis tEntity5,0 ++ vis bEntity5,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity5.txt,"~",40 ++ spstr strCommand.txt,bEntity5.txt,"~",29 ++ vis bEntity5,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",41 ++ spstr strCommand.txt,tTmp.txt,"~",30 ++ covx tTmp.txt,sys0,0,0 ++ bEntity5.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity5.txt,"~",42 ++ spstr strCommand.txt,tEntity5.txt,"~",31 ++ vis tEntity5,1 ++ } ++ // get Type ++ spstr strCommand.txt,type6.txt,"~",44 ++ spstr strCommand.txt,type6.txt,"~",33 ++ // get internal name ++ spstr strCommand.txt,entn6.txt,"~",45 ++ spstr strCommand.txt,entn6.txt,"~",34 ++ if(type6.txt=="delete"||type6.txt=="") ++ { ++ vis tEntity6,0 ++ vis bEntity6,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity6.txt,"~",46 ++ spstr strCommand.txt,bEntity6.txt,"~",35 ++ vis bEntity6,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",47 ++ spstr strCommand.txt,tTmp.txt,"~",36 ++ covx tTmp.txt,sys0,0,0 ++ bEntity6.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity6.txt,"~",48 ++ spstr strCommand.txt,tEntity6.txt,"~",37 ++ vis tEntity6,1 ++ } ++ } ++ if(tInstruction.txt=="pageType") ++ { ++ sleepValue=0 ++ //command format pageType,specialPageName ++I/n2t-out/cardMedia.txt +++ HMI/US/portrait/n2t-out/cardMedia.txt ++6 +82,14 @@ ++ ++e (string) entn6 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent1 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent2 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) strCommand ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 750 ++ ++e (string) tEntity1 ++15 +762,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent2.txt+",button" ++ tSend.txt="event,buttonPress2,cardMedia," ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++15 +794,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent1.txt+",button" ++ tSend.txt="event,buttonPress2,cardMedia," ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++216 +929,222 @@ ++ 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 ++ if(tInstruction.txt=="entityUpd") ++ { ++ // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 ++ spstr strCommand.txt,tHeading.txt,"~",1 ++ // navigation icon left ++ spstr strCommand.txt,tTmp.txt,"~",2 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ // navigation icons ++ spstr strCommand.txt,tId.txt,"~",2 ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="0") ++ { ++ vis bPrev,0 ++ }else ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ // get internal name ++ spstr strCommand.txt,nent1.txt,"~",3 ++ // change icon ++ spstr strCommand.txt,bPrev.txt,"~",4 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ covx tTmp.txt,sys0,0,0 ++ bPrev.pco=sys0 ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="" ++ } ++ // navigation icon right ++ spstr strCommand.txt,tTmp.txt,"~",8 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ }else ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent2.txt,"~",9 ++ // change icon ++ spstr strCommand.txt,bNext.txt,"~",10 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,sys0,0,0 ++ bNext.pco=sys0 ++ vis bNext,1 ++ bNext.txt="" ++ } ++ //entity name ++ spstr strCommand.txt,entn.txt,"~",14 ++ spstr strCommand.txt,entn.txt,"~",3 ++ //title ++ spstr strCommand.txt,tTitle.txt,"~",15 ++ spstr strCommand.txt,tTitle.txt,"~",4 ++ //title farbe ++ spstr strCommand.txt,tTmp.txt,"~",16 ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,tTitle.pco,0,0 ++ } ++ //author ++ spstr strCommand.txt,tAuthor.txt,"~",17 ++ spstr strCommand.txt,tAuthor.txt,"~",6 ++ //author farbe ++ spstr strCommand.txt,tTmp.txt,"~",18 ++ spstr strCommand.txt,tTmp.txt,"~",7 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,tAuthor.pco,0,0 ++ } ++ //volume ++ spstr strCommand.txt,tTmp.txt,"~",19 ++ spstr strCommand.txt,tTmp.txt,"~",8 ++ covx tTmp.txt,sys0,0,0 ++ hVolume.val=sys0 ++ //icon ++ spstr strCommand.txt,tPlayPause.txt,"~",20 ++ spstr strCommand.txt,tPlayPause.txt,"~",9 ++ // on off button ++ spstr strCommand.txt,tTmp.txt,"~",21 ++ spstr strCommand.txt,tTmp.txt,"~",10 ++ if(tTmp.txt=="disable") ++ { ++ vis t5,0 ++ }else ++ { ++ vis t5,1 ++ covx tTmp.txt,t5.pco,0,0 ++ } ++ // shuffel btn ++ spstr strCommand.txt,tTmp.txt,"~",22 ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ if(tTmp.txt=="disable") ++ { ++ vis tShuffle,0 ++ }else ++ { ++ vis tShuffle,1 ++ tShuffle.txt=tTmp.txt ++ } ++ // get Type ++ spstr strCommand.txt,type1.txt,"~",23 ++ spstr strCommand.txt,type1.txt,"~",12 ++ // get internal name ++ spstr strCommand.txt,entn1.txt,"~",24 ++ spstr strCommand.txt,entn1.txt,"~",13 ++ if(type1.txt=="delete"||type1.txt=="") ++ { ++ vis tEntity1,0 ++ vis bEntity1,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity1.txt,"~",25 ++ spstr strCommand.txt,bEntity1.txt,"~",14 ++ vis bEntity1,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",26 ++ spstr strCommand.txt,tTmp.txt,"~",15 ++ covx tTmp.txt,sys0,0,0 ++ bEntity1.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity1.txt,"~",27 ++ spstr strCommand.txt,tEntity1.txt,"~",16 ++ vis tEntity1,1 ++ } ++ // get Type ++ spstr strCommand.txt,type2.txt,"~",29 ++ spstr strCommand.txt,type2.txt,"~",18 ++ // get internal name ++ spstr strCommand.txt,entn2.txt,"~",30 ++ spstr strCommand.txt,entn2.txt,"~",19 ++ if(type2.txt=="delete"||type2.txt=="") ++ { ++ vis tEntity2,0 ++ vis bEntity2,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity2.txt,"~",31 ++ spstr strCommand.txt,bEntity2.txt,"~",20 ++ vis bEntity2,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",32 ++ spstr strCommand.txt,tTmp.txt,"~",21 ++ covx tTmp.txt,sys0,0,0 ++ bEntity2.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity2.txt,"~",33 ++ spstr strCommand.txt,tEntity2.txt,"~",22 ++ vis tEntity2,1 ++ } ++ // get Type ++ spstr strCommand.txt,type3.txt,"~",35 ++ spstr strCommand.txt,type3.txt,"~",24 ++ // get internal name ++ spstr strCommand.txt,entn3.txt,"~",36 ++ spstr strCommand.txt,entn3.txt,"~",25 ++ if(type3.txt=="delete"||type3.txt=="") ++ { ++ vis tEntity3,0 ++ vis bEntity3,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity3.txt,"~",37 ++ spstr strCommand.txt,bEntity3.txt,"~",26 ++ vis bEntity3,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",38 ++ spstr strCommand.txt,tTmp.txt,"~",27 ++ covx tTmp.txt,sys0,0,0 ++ bEntity3.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity3.txt,"~",39 ++ spstr strCommand.txt,tEntity3.txt,"~",28 ++ vis tEntity3,1 ++ } ++ // get Type ++ spstr strCommand.txt,type4.txt,"~",41 ++ spstr strCommand.txt,type4.txt,"~",30 ++ // get internal name ++ spstr strCommand.txt,entn4.txt,"~",42 ++ spstr strCommand.txt,entn4.txt,"~",31 ++ if(type4.txt=="delete"||type4.txt=="") ++ { ++ vis tEntity4,0 ++ vis bEntity4,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity4.txt,"~",43 ++ spstr strCommand.txt,bEntity4.txt,"~",32 ++ vis bEntity4,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",44 ++ spstr strCommand.txt,tTmp.txt,"~",33 ++ covx tTmp.txt,sys0,0,0 ++ bEntity4.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity4.txt,"~",45 ++ spstr strCommand.txt,tEntity4.txt,"~",34 ++ vis tEntity4,1 ++ } ++ // get Type ++ spstr strCommand.txt,type5.txt,"~",47 ++ spstr strCommand.txt,type5.txt,"~",36 ++ // get internal name ++ spstr strCommand.txt,entn5.txt,"~",48 ++ spstr strCommand.txt,entn5.txt,"~",37 ++ if(type5.txt=="delete"||type5.txt=="") ++ { ++ vis tEntity5,0 ++ vis bEntity5,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity5.txt,"~",49 ++ spstr strCommand.txt,bEntity5.txt,"~",38 ++ vis bEntity5,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",50 ++ spstr strCommand.txt,tTmp.txt,"~",39 ++ covx tTmp.txt,sys0,0,0 ++ bEntity5.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity5.txt,"~",51 ++ spstr strCommand.txt,tEntity5.txt,"~",40 ++ vis tEntity5,1 ++ } ++ // get Type ++ spstr strCommand.txt,type6.txt,"~",53 ++ spstr strCommand.txt,type6.txt,"~",42 ++ // get internal name ++ spstr strCommand.txt,entn6.txt,"~",54 ++ spstr strCommand.txt,entn6.txt,"~",43 ++ if(type6.txt=="delete"||type6.txt=="") ++ { ++ vis tEntity6,0 ++ vis bEntity6,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,bEntity6.txt,"~",55 ++ spstr strCommand.txt,bEntity6.txt,"~",44 ++ vis bEntity6,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",56 ++ spstr strCommand.txt,tTmp.txt,"~",45 ++ covx tTmp.txt,sys0,0,0 ++ bEntity6.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity6.txt,"~",57 ++ spstr strCommand.txt,tEntity6.txt,"~",46 ++ vis tEntity6,1 ++ } ++ } ++ if(tInstruction.txt=="pageType") ++ { ++ sleepValue=0 ++ //command format pageType,specialPageName ++,18 +1204,14 @@ ++ { ++ page cardQR ++ } ++ if(tId.txt=="cardPower") ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } ++ if(tInstruction.txt=="date") ++I/n2t-out/cardPower.txt +++ HMI/US/portrait/n2t-out/cardPower.txt ++6 +53,14 @@ ++ b[sys0].pic=19 ++ b[sys0].pic1=19 ++ b[sys0].pic2=15 ++ } ++ } ++ } ++ ++e (string) nent1 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent2 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) strCommand ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 275 ++ ++e (int32) t0Speed ++15 +342,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent2.txt+",button" ++ tSend.txt="event,buttonPress2,cardPower," ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++15 +374,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent1.txt+",button" ++ tSend.txt="event,buttonPress2,cardAlarm," ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++170 +551,176 @@ ++ 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 ++ if(tInstruction.txt=="entityUpd") ++ { ++ // command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6 ++ spstr strCommand.txt,tHeading.txt,"~",1 ++ // navigation icon left ++ spstr strCommand.txt,tTmp.txt,"~",2 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ // navigation icons ++ spstr strCommand.txt,tId.txt,"~",2 ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="0") ++ { ++ vis bPrev,0 ++ }else ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ // get internal name ++ spstr strCommand.txt,nent1.txt,"~",3 ++ // change icon ++ spstr strCommand.txt,bPrev.txt,"~",4 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ covx tTmp.txt,sys0,0,0 ++ bPrev.pco=sys0 ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="" ++ } ++ // navigation icon right ++ spstr strCommand.txt,tTmp.txt,"~",8 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ }else ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent2.txt,"~",9 ++ // change icon ++ spstr strCommand.txt,bNext.txt,"~",10 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,sys0,0,0 ++ bNext.pco=sys0 ++ vis bNext,1 ++ bNext.txt="" ++ } ++ // icon color home ++ spstr strCommand.txt,tTmp.txt,"~",14 ++ spstr strCommand.txt,tTmp.txt,"~",3 ++ covx tTmp.txt,t1.pco,0,0 ++ // icon home ++ spstr strCommand.txt,t1.txt,"~",15 ++ spstr strCommand.txt,t1.txt,"~",4 ++ // text home ++ spstr strCommand.txt,tHome.txt,"~",16 ++ spstr strCommand.txt,tHome.txt,"~",5 ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",17 ++ spstr strCommand.txt,tTmp.txt,"~",6 ++ covx tTmp.txt,t0Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t0Icon.txt,"~",18 ++ spstr strCommand.txt,t0Icon.txt,"~",7 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",19 ++ spstr strCommand.txt,tTmp.txt,"~",8 ++ covx tTmp.txt,t0Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t0u.txt,"~",20 ++ spstr strCommand.txt,t0u.txt,"~",9 ++ if(t0Icon.txt!="") ++ { ++ vis t0Icon,1 ++ vis t0u,1 ++ vis h0,1 ++ }else ++ { ++ vis t0Icon,0 ++ vis t0u,0 ++ vis h0,0 ++ } ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",21 ++ spstr strCommand.txt,tTmp.txt,"~",10 ++ covx tTmp.txt,t1Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t1Icon.txt,"~",22 ++ spstr strCommand.txt,t1Icon.txt,"~",11 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",23 ++ spstr strCommand.txt,tTmp.txt,"~",12 ++ covx tTmp.txt,t1Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t1u.txt,"~",24 ++ spstr strCommand.txt,t1u.txt,"~",13 ++ if(t1Icon.txt!="") ++ { ++ vis t1Icon,1 ++ vis t1u,1 ++ vis h1,1 ++ }else ++ { ++ vis t1Icon,0 ++ vis t1u,0 ++ vis h1,0 ++ } ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",25 ++ spstr strCommand.txt,tTmp.txt,"~",14 ++ covx tTmp.txt,t2Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t2Icon.txt,"~",26 ++ spstr strCommand.txt,t2Icon.txt,"~",15 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",27 ++ spstr strCommand.txt,tTmp.txt,"~",16 ++ covx tTmp.txt,t2Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t2u.txt,"~",28 ++ spstr strCommand.txt,t2u.txt,"~",17 ++ if(t2Icon.txt!="") ++ { ++ vis t2Icon,1 ++ vis t2u,1 ++ vis h2,1 ++ }else ++ { ++ vis t2Icon,0 ++ vis t2u,0 ++ vis h2,0 ++ } ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",29 ++ spstr strCommand.txt,tTmp.txt,"~",18 ++ covx tTmp.txt,t3Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t3Icon.txt,"~",30 ++ spstr strCommand.txt,t3Icon.txt,"~",19 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",31 ++ spstr strCommand.txt,tTmp.txt,"~",20 ++ covx tTmp.txt,t3Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t3u.txt,"~",32 ++ spstr strCommand.txt,t3u.txt,"~",21 ++ if(t3Icon.txt!="") ++ { ++ vis t3Icon,1 ++ vis t3u,1 ++ vis h3,1 ++ }else ++ { ++ vis t3Icon,0 ++ vis t3u,0 ++ vis h3,0 ++ } ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",33 ++ spstr strCommand.txt,tTmp.txt,"~",22 ++ covx tTmp.txt,t4Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t4Icon.txt,"~",34 ++ spstr strCommand.txt,t4Icon.txt,"~",23 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",35 ++ spstr strCommand.txt,tTmp.txt,"~",24 ++ covx tTmp.txt,t4Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t4u.txt,"~",36 ++ spstr strCommand.txt,t4u.txt,"~",25 ++ if(t4Icon.txt!="") ++ { ++ vis t4Icon,1 ++ vis t4u,1 ++ vis h4,1 ++ }else ++ { ++ vis t4Icon,0 ++ vis t4u,0 ++ vis h4,0 ++ } ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",37 ++ spstr strCommand.txt,tTmp.txt,"~",26 ++ covx tTmp.txt,t5Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t5Icon.txt,"~",38 ++ spstr strCommand.txt,t5Icon.txt,"~",27 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",39 ++ spstr strCommand.txt,tTmp.txt,"~",28 ++ covx tTmp.txt,t5Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t5u.txt,"~",40 ++ spstr strCommand.txt,t5u.txt,"~",29 ++ if(t5Icon.txt!="") ++ { ++ vis t5Icon,1 ++ vis t5u,1 ++ vis h5,1 ++ }else ++ { ++I/n2t-out/cardQR.txt +++ HMI/US/portrait/n2t-out/cardQR.txt ++1 +66,19 @@ ++ ++e (string) entn2 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent1 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 50 ++ ++e (string) nent2 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 50 ++ ++e (string) strCommand ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 400 ++ Max. Text Size: 275 ++ ++e (string) tId ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 20 ++ ++15 +183,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent2.txt+",button" ++ tSend.txt="event,buttonPress2,cardQR," ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++15 +215,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent1.txt+",button" ++ tSend.txt="event,buttonPress2,cardAlarm," ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++171 +442,177 @@ ++ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) ++ spstr strCommand.txt,tInstruction.txt,"~",0 ++ if(tInstruction.txt=="entityUpd") ++ { ++ // command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2 ++ //tHeading ++ spstr strCommand.txt,tHeading.txt,"~",1 ++ // navigation icon left ++ spstr strCommand.txt,tTmp.txt,"~",2 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ // navigation icons ++ spstr strCommand.txt,tId.txt,"~",2 ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="0") ++ { ++ vis bPrev,0 ++ }else ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ // get internal name ++ spstr strCommand.txt,nent1.txt,"~",3 ++ // change icon ++ spstr strCommand.txt,bPrev.txt,"~",4 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ covx tTmp.txt,sys0,0,0 ++ bPrev.pco=sys0 ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="" ++ } ++ // navigation icon right ++ spstr strCommand.txt,tTmp.txt,"~",8 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ }else ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent2.txt,"~",9 ++ // change icon ++ spstr strCommand.txt,bNext.txt,"~",10 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,sys0,0,0 ++ bNext.pco=sys0 ++ vis bNext,1 ++ bNext.txt="" ++ } ++ //text qrcode ++ spstr strCommand.txt,vaQR.txt,"~",14 ++ spstr strCommand.txt,vaQR.txt,"~",3 ++ // get Type ++ spstr strCommand.txt,type1.txt,"~",15 ++ spstr strCommand.txt,type1.txt,"~",4 ++ // get internal name ++ spstr strCommand.txt,entn1.txt,"~",16 ++ spstr strCommand.txt,entn1.txt,"~",5 ++ if(type1.txt=="delete"||type1.txt=="") ++ { ++ vis btOnOff1,0 ++ vis tEntity1,0 ++ vis tIcon1,0 ++ vis bText1,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,tIcon1.txt,"~",17 ++ spstr strCommand.txt,tIcon1.txt,"~",6 ++ vis tIcon1,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",18 ++ spstr strCommand.txt,tTmp.txt,"~",7 ++ covx tTmp.txt,sys0,0,0 ++ tIcon1.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity1.txt,"~",19 ++ spstr strCommand.txt,tEntity1.txt,"~",8 ++ vis tEntity1,1 ++ } ++ if(type1.txt=="light") ++ { ++ vis btOnOff1,1 ++ vis bText1,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",20 ++ spstr strCommand.txt,tTmp.txt,"~",9 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff1.val=sys0 ++ } ++ if(type1.txt=="switch") ++ { ++ vis btOnOff1,1 ++ vis bText1,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",20 ++ spstr strCommand.txt,tTmp.txt,"~",9 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff1.val=sys0 ++ } ++ if(type1.txt=="text") ++ { ++ vis btOnOff1,0 ++ vis bText1,1 ++ tsw bText1,0 ++ bText1.pco=65535 ++ bText1.pco2=65535 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText1.txt,"~",20 ++ spstr strCommand.txt,bText1.txt,"~",9 ++ } ++ if(type1.txt=="button") ++ { ++ vis btOnOff1,0 ++ vis bText1,1 ++ tsw bText1,1 ++ bText1.pco=1374 ++ bText1.pco2=1374 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText1.txt,"~",20 ++ spstr strCommand.txt,bText1.txt,"~",9 ++ } ++ // get Type ++ spstr strCommand.txt,type2.txt,"~",21 ++ spstr strCommand.txt,type2.txt,"~",10 ++ // get internal name ++ spstr strCommand.txt,entn2.txt,"~",22 ++ spstr strCommand.txt,entn2.txt,"~",11 ++ if(type2.txt=="delete"||type2.txt=="") ++ { ++ vis btOnOff2,0 ++ vis tEntity2,0 ++ vis tIcon2,0 ++ vis bText2,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,tIcon2.txt,"~",23 ++ spstr strCommand.txt,tIcon2.txt,"~",12 ++ vis tIcon2,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",24 ++ spstr strCommand.txt,tTmp.txt,"~",13 ++ covx tTmp.txt,sys0,0,0 ++ tIcon2.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity2.txt,"~",25 ++ spstr strCommand.txt,tEntity2.txt,"~",14 ++ vis tEntity2,1 ++ } ++ if(type2.txt=="light") ++ { ++ vis btOnOff2,1 ++ vis bText2,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",26 ++ spstr strCommand.txt,tTmp.txt,"~",15 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff2.val=sys0 ++ } ++ if(type2.txt=="switch") ++ { ++ vis btOnOff2,1 ++ vis bText2,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",26 ++ spstr strCommand.txt,tTmp.txt,"~",15 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff2.val=sys0 ++ } ++ if(type2.txt=="text") ++ { ++ vis btOnOff2,0 ++ vis bText2,1 ++ tsw bText2,0 ++ bText2.pco=65535 ++ bText2.pco2=65535 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText2.txt,"~",26 ++ spstr strCommand.txt,bText2.txt,"~",15 ++ } ++ if(type2.txt=="button") ++ { ++ vis btOnOff2,0 ++ vis bText2,1 ++ tsw bText2,1 ++ bText2.pco=1374 ++ bText2.pco2=1374 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText2.txt,"~",26 ++ spstr strCommand.txt,bText2.txt,"~",15 ++ } ++ if(type2.txt=="delete"||type2.txt=="") ++ { ++ if(type1.txt=="delete"||type1.txt=="") ++ { ++ qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt ++ } ++I/n2t-out/cardThermo.txt +++ HMI/US/portrait/n2t-out/cardThermo.txt ++6 +59,14 @@ ++ ++e (string) entn ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent1 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) nent2 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++e (string) strCommand ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 250 ++ ++e (string) tId ++15 +290,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent2.txt+",button" ++ tSend.txt="event,buttonPress2,cardThermo," ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++15 +322,22 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+nent1.txt+",button" ++ tSend.txt="event,buttonPress2,cardThermo," ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++208 +831,214 @@ ++ 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 ++ if(tInstruction.txt=="entityUpd") ++ { ++ //heading ++ spstr strCommand.txt,tHeading.txt,"~",1 ++ // navigation icon left ++ spstr strCommand.txt,tTmp.txt,"~",2 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ // navigation icons ++ spstr strCommand.txt,tId.txt,"~",2 ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="0") ++ { ++ vis bPrev,0 ++ }else ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ // get internal name ++ spstr strCommand.txt,nent1.txt,"~",3 ++ // change icon ++ spstr strCommand.txt,bPrev.txt,"~",4 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ covx tTmp.txt,sys0,0,0 ++ bPrev.pco=sys0 ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="" ++ } ++ // navigation icon right ++ spstr strCommand.txt,tTmp.txt,"~",8 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ }else ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ // get internal name ++ spstr strCommand.txt,nent2.txt,"~",9 ++ // change icon ++ spstr strCommand.txt,bNext.txt,"~",10 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,sys0,0,0 ++ bNext.pco=sys0 ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bNext,1 ++ bNext.txt="" ++ } ++ //entity name ++ spstr strCommand.txt,entn.txt,"~",14 ++ spstr strCommand.txt,entn.txt,"~",3 ++ //currentTemp ++ spstr strCommand.txt,tCurTemp.txt,"~",15 ++ spstr strCommand.txt,tCurTemp.txt,"~",4 ++ //dstTemp ++ spstr strCommand.txt,tTmp.txt,"~",16 ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ covx tTmp.txt,xTempDest1.val,0,0 ++ xTempDest.val=xTempDest1.val ++ //status ++ spstr strCommand.txt,tStatus.txt,"~",17 ++ spstr strCommand.txt,tStatus.txt,"~",6 ++ //minTemp ++ spstr strCommand.txt,tTmp.txt,"~",18 ++ spstr strCommand.txt,tTmp.txt,"~",7 ++ covx tTmp.txt,xTempMin1.val,0,0 ++ //maxTemp ++ spstr strCommand.txt,tTmp.txt,"~",19 ++ spstr strCommand.txt,tTmp.txt,"~",8 ++ covx tTmp.txt,xTempMax1.val,0,0 ++ //tempStep ++ spstr strCommand.txt,tTmp.txt,"~",20 ++ spstr strCommand.txt,tTmp.txt,"~",9 ++ covx tTmp.txt,xTempStep1.val,0,0 ++ // disable all buttons ++ vis bt0,0 ++ vis bt1,0 ++ vis bt2,0 ++ vis bt3,0 ++ vis bt4,0 ++ vis bt5,0 ++ vis bt6,0 ++ vis bt7,0 ++ //bt0 ++ spstr strCommand.txt,bt0.txt,"~",21 ++ spstr strCommand.txt,bt0.txt,"~",10 ++ if(bt0.txt!="") ++ { ++ // set text color on active state ++ spstr strCommand.txt,tTmp.txt,"~",22 ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,bt0.pco2,0,0 ++ // set state ++ spstr strCommand.txt,tTmp.txt,"~",23 ++ spstr strCommand.txt,tTmp.txt,"~",12 ++ covx tTmp.txt,bt0.val,0,0 ++ // save action ++ spstr strCommand.txt,va0.txt,"~",24 ++ spstr strCommand.txt,va0.txt,"~",13 ++ //enable ++ vis bt0,1 ++ } ++ //bt1 ++ spstr strCommand.txt,bt1.txt,"~",25 ++ spstr strCommand.txt,bt1.txt,"~",14 ++ if(bt1.txt!="") ++ { ++ // set text color on active state ++ spstr strCommand.txt,tTmp.txt,"~",26 ++ spstr strCommand.txt,tTmp.txt,"~",15 ++ covx tTmp.txt,bt1.pco2,0,0 ++ // set state ++ spstr strCommand.txt,tTmp.txt,"~",27 ++ spstr strCommand.txt,tTmp.txt,"~",16 ++ covx tTmp.txt,bt1.val,0,0 ++ // save action ++ spstr strCommand.txt,va1.txt,"~",28 ++ spstr strCommand.txt,va1.txt,"~",17 ++ //enable ++ vis bt1,1 ++ } ++ //bt2 ++ spstr strCommand.txt,bt2.txt,"~",29 ++ spstr strCommand.txt,bt2.txt,"~",18 ++ if(bt2.txt!="") ++ { ++ // set text color on active state ++ spstr strCommand.txt,tTmp.txt,"~",30 ++ spstr strCommand.txt,tTmp.txt,"~",19 ++ covx tTmp.txt,bt2.pco2,0,0 ++ // set state ++ spstr strCommand.txt,tTmp.txt,"~",31 ++ spstr strCommand.txt,tTmp.txt,"~",20 ++ covx tTmp.txt,bt2.val,0,0 ++ // save action ++ spstr strCommand.txt,va2.txt,"~",32 ++ spstr strCommand.txt,va2.txt,"~",21 ++ //enable ++ vis bt2,1 ++ } ++ //bt3 ++ spstr strCommand.txt,bt3.txt,"~",33 ++ spstr strCommand.txt,bt3.txt,"~",22 ++ if(bt3.txt!="") ++ { ++ // set text color on active state ++ spstr strCommand.txt,tTmp.txt,"~",34 ++ spstr strCommand.txt,tTmp.txt,"~",23 ++ covx tTmp.txt,bt3.pco2,0,0 ++ // set state ++ spstr strCommand.txt,tTmp.txt,"~",35 ++ spstr strCommand.txt,tTmp.txt,"~",24 ++ covx tTmp.txt,bt3.val,0,0 ++ // save action ++ spstr strCommand.txt,va3.txt,"~",36 ++ spstr strCommand.txt,va3.txt,"~",25 ++ //enable ++ vis bt3,1 ++ } ++ //bt4 ++ spstr strCommand.txt,bt4.txt,"~",37 ++ spstr strCommand.txt,bt4.txt,"~",26 ++ if(bt4.txt!="") ++ { ++ // set text color on active state ++ spstr strCommand.txt,tTmp.txt,"~",38 ++ spstr strCommand.txt,tTmp.txt,"~",27 ++ covx tTmp.txt,bt4.pco2,0,0 ++ // set state ++ spstr strCommand.txt,tTmp.txt,"~",39 ++ spstr strCommand.txt,tTmp.txt,"~",28 ++ covx tTmp.txt,bt4.val,0,0 ++ // save action ++ spstr strCommand.txt,va4.txt,"~",40 ++ spstr strCommand.txt,va4.txt,"~",29 ++ //enable ++ vis bt4,1 ++ } ++ //bt5 ++ spstr strCommand.txt,bt5.txt,"~",41 ++ spstr strCommand.txt,bt5.txt,"~",30 ++ if(bt5.txt!="") ++ { ++ // set text color on active state ++ spstr strCommand.txt,tTmp.txt,"~",42 ++ spstr strCommand.txt,tTmp.txt,"~",31 ++ covx tTmp.txt,bt5.pco2,0,0 ++ // set state ++ spstr strCommand.txt,tTmp.txt,"~",43 ++ spstr strCommand.txt,tTmp.txt,"~",32 ++ covx tTmp.txt,bt5.val,0,0 ++ // save action ++ spstr strCommand.txt,va5.txt,"~",44 ++ spstr strCommand.txt,va5.txt,"~",33 ++ //enable ++ vis bt5,1 ++ } ++ //bt6 ++ spstr strCommand.txt,bt6.txt,"~",45 ++ spstr strCommand.txt,bt6.txt,"~",34 ++ if(bt6.txt!="") ++ { ++ // set text color on active state ++ spstr strCommand.txt,tTmp.txt,"~",46 ++ spstr strCommand.txt,tTmp.txt,"~",35 ++ covx tTmp.txt,bt6.pco2,0,0 ++ // set state ++ spstr strCommand.txt,tTmp.txt,"~",47 ++ spstr strCommand.txt,tTmp.txt,"~",36 ++ covx tTmp.txt,bt6.val,0,0 ++ // save action ++ spstr strCommand.txt,va6.txt,"~",48 ++ spstr strCommand.txt,va6.txt,"~",37 ++ //enable ++ vis bt6,1 ++ } ++ //bt7 ++ spstr strCommand.txt,bt7.txt,"~",49 ++ spstr strCommand.txt,bt7.txt,"~",38 ++ if(bt7.txt!="") ++ { ++ // set text color on active state ++ spstr strCommand.txt,tTmp.txt,"~",50 ++ spstr strCommand.txt,tTmp.txt,"~",39 ++ covx tTmp.txt,bt7.pco2,0,0 ++ // set state ++ spstr strCommand.txt,tTmp.txt,"~",51 ++ spstr strCommand.txt,tTmp.txt,"~",40 ++ covx tTmp.txt,bt7.val,0,0 ++ // save action ++ spstr strCommand.txt,va7.txt,"~",52 ++ spstr strCommand.txt,va7.txt,"~",41 ++ //enable ++ vis bt7,1 ++ } ++ //Text tCurTempLbl ++ spstr strCommand.txt,tCurTempLbl.txt,"~",53 ++ spstr strCommand.txt,tCurTempLbl.txt,"~",42 ++ //Text tStateLbl ++ spstr strCommand.txt,tStateLbl.txt,"~",54 ++ spstr strCommand.txt,tStateLbl.txt,"~",43 ++ //Text tALbl ++ //spstr strCommand.txt,tALbl.txt,"~",55 ++ //spstr strCommand.txt,tALbl.txt,"~",44 ++ //Text tCF ++ spstr strCommand.txt,tCF.txt,"~",56 ++ spstr strCommand.txt,tCF.txt,"~",45 ++ tCF1.txt=tCF.txt ++ tCF2.txt=tCF.txt ++ //Second Temperature ++ spstr strCommand.txt,tTmp.txt,"~",57 ++ spstr strCommand.txt,tTmp.txt,"~",46 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,xTempDest2.val,0,0 ++ vis btUp,0 ++ vis xTempDest,0 ++ vis btDown,0 ++ vis tCF,0 ++,16 +1048,16 @@ ++ vis tCF1,1 ++ vis bUp2,1 ++ vis xTempDest2,1 ++ vis bDown2,1 ++ vis tCF2,1 ++ } ++ //Show btDetail ++ spstr strCommand.txt,tTmp.txt,"~",58 ++ if(tTmp.txt!="1") ++ spstr strCommand.txt,tTmp.txt,"~",47 ++ if(tTmp.txt=="1") ++ { ++ vis btDetail,1 ++ }else ++ { ++ vis btDetail,0 ++ } ++ } +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt +I/n2t-out/screensaver.txt diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index ade2be9a..dfe8f435 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -72,6 +72,20 @@ Variable (string) entn Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + ID : 41 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + ID : 40 + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes ID : 6 @@ -1014,14 +1028,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1068,14 +1075,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1223,86 +1223,80 @@ Timer tmSerial { //entn spstr strCommand.txt,entn.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } //text arm1 - spstr strCommand.txt,arm1.txt,"~",3 + spstr strCommand.txt,arm1.txt,"~",14 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,"~",4 + spstr strCommand.txt,va1.txt,"~",15 //text arm2 - spstr strCommand.txt,arm2.txt,"~",5 + spstr strCommand.txt,arm2.txt,"~",16 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,"~",6 + spstr strCommand.txt,va2.txt,"~",17 //text arm3 - spstr strCommand.txt,arm3.txt,"~",7 + spstr strCommand.txt,arm3.txt,"~",18 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,"~",8 + spstr strCommand.txt,va3.txt,"~",19 //text arm4 - spstr strCommand.txt,arm4.txt,"~",9 + spstr strCommand.txt,arm4.txt,"~",20 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,"~",10 + spstr strCommand.txt,va4.txt,"~",21 //icon - spstr strCommand.txt,tIcon.txt,"~",11 + spstr strCommand.txt,tIcon.txt,"~",22 //icon color - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,"~",13 + spstr strCommand.txt,tTmp.txt,"~",24 if(tTmp.txt!="disable") { vis b0,1 @@ -1335,7 +1329,7 @@ Timer tmSerial vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,"~",25 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -1344,13 +1338,13 @@ Timer tmSerial tmFlash.en=0 } // extra button - spstr strCommand.txt,b9.txt,"~",15 + spstr strCommand.txt,b9.txt,"~",26 if(b9.txt!="") { vis b9,1 - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",27 covx tTmp.txt,b9.pco,0,0 - spstr strCommand.txt,vaAddBtn.txt,"~",17 + spstr strCommand.txt,vaAddBtn.txt,"~",28 } } if(tInstruction.txt=="time") diff --git a/HMI/n2t-out-visual/cardChart.txt b/HMI/n2t-out-visual/cardChart.txt index 2a714277..163b953f 100644 --- a/HMI/n2t-out-visual/cardChart.txt +++ b/HMI/n2t-out-visual/cardChart.txt @@ -58,6 +58,20 @@ Variable (string) entn Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + ID : 32 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + ID : 31 + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes ID : 5 @@ -280,14 +294,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -334,14 +341,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -559,48 +559,42 @@ Timer tmSerial if(tInstruction.txt=="entityUpd") { spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } // extract color - spstr strCommand.txt,tTmp.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,vaColorL.val,0,0 // prepare dark color sys0=vaColorL.val>>11 // red @@ -612,7 +606,7 @@ Timer tmSerial // // detect nValues and maxValue vNValues.val=0 - spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17 strlen tTmp.txt,sya0 while(sya0>0) { @@ -623,7 +617,7 @@ Timer tmSerial } // next vNValues.val++ - spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17 strlen tTmp.txt,sya0 } // @@ -638,7 +632,7 @@ Timer tmSerial // line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 - spstr strCommand.txt,strTmp.txt,"~",5 + spstr strCommand.txt,strTmp.txt,"~",16 sya1=0 spstr strTmp.txt,tTmp.txt,":",sya1 strlen tTmp.txt,sya0 @@ -671,7 +665,7 @@ Timer tmSerial } // // y achis label - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",15 // tTmp.txt="Gas [kW]" strlen tTmp.txt,sys1 sya1=sys1*12+m0.h-48/2 @@ -687,7 +681,7 @@ Timer tmSerial vaValues.txt+="~" } // extract next entry - spstr strCommand.txt,tTmp.txt,"~",sys0+6 + spstr strCommand.txt,tTmp.txt,"~",sys0+17 // calculate left sys1=sys0*5*vaUnit.val sys1+=vaLeft.val diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 25c1cc74..9319ec68 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -96,28 +96,42 @@ Page cardEntities Variable (string) entn1 Attributes - ID : 44 + ID : 42 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 45 + ID : 43 Scope : local Text : Max. Text Size: 80 Variable (string) entn3 Attributes - ID : 46 + ID : 44 Scope : local Text : Max. Text Size: 80 Variable (string) entn4 Attributes - ID : 47 + ID : 45 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent1 + Attributes + ID : 63 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + ID : 64 Scope : local Text : Max. Text Size: 80 @@ -131,42 +145,42 @@ Variable (string) strCommand Variable (string) tSend Attributes - ID : 64 + ID : 62 Scope : local Text : Max. Text Size: 200 Variable (string) type1 Attributes - ID : 40 + ID : 38 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 41 + ID : 39 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 42 + ID : 40 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 43 + ID : 41 Scope : local Text : Max. Text Size: 10 Number nNum1 Attributes - ID : 53 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -196,7 +210,7 @@ Number nNum1 Number nNum2 Attributes - ID : 54 + ID : 52 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -226,7 +240,7 @@ Number nNum2 Number nNum3 Attributes - ID : 55 + ID : 53 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -256,7 +270,7 @@ Number nNum3 Number nNum4 Attributes - ID : 56 + ID : 54 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -663,7 +677,7 @@ Picture p0 Slider hSlider1 Attributes - ID : 49 + ID : 47 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -706,7 +720,7 @@ Slider hSlider1 Slider hSlider2 Attributes - ID : 50 + ID : 48 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -749,7 +763,7 @@ Slider hSlider2 Slider hSlider3 Attributes - ID : 51 + ID : 49 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -792,7 +806,7 @@ Slider hSlider3 Slider hSlider4 Attributes - ID : 52 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1023,7 +1037,7 @@ Button bDown4 Button bNext Attributes - ID : 33 + ID : 65 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1055,14 +1069,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardEntities," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1077,7 +1084,7 @@ Button bNext Button bPrev Attributes - ID : 32 + ID : 66 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1109,14 +1116,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardEntities," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1319,7 +1319,7 @@ Button bStop4 Button bText1 Attributes - ID : 60 + ID : 58 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1366,7 +1366,7 @@ Button bText1 Button bText2 Attributes - ID : 61 + ID : 59 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1413,7 +1413,7 @@ Button bText2 Button bText3 Attributes - ID : 62 + ID : 60 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1460,7 +1460,7 @@ Button bText3 Button bText4 Attributes - ID : 63 + ID : 61 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1875,7 +1875,7 @@ Dual-state Button btOnOff4 Hotspot m0 Attributes - ID : 38 + ID : 36 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1919,7 +1919,7 @@ Hotspot m0 Hotspot m1 Attributes - ID : 37 + ID : 35 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1963,7 +1963,7 @@ Hotspot m1 Hotspot m2 Attributes - ID : 36 + ID : 34 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2007,7 +2007,7 @@ Hotspot m2 Hotspot m3 Attributes - ID : 39 + ID : 37 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2051,7 +2051,7 @@ Hotspot m3 Hotspot mSpecial Attributes - ID : 34 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2077,7 +2077,7 @@ Hotspot mSpecial Hotspot mSwipeNext Attributes - ID : 57 + ID : 55 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2097,7 +2097,7 @@ Hotspot mSwipeNext Hotspot mSwipePrev Attributes - ID : 59 + ID : 57 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2117,7 +2117,7 @@ Hotspot mSwipePrev Hotspot mSwipeUp Attributes - ID : 58 + ID : 56 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2191,50 +2191,44 @@ Timer tmSerial { // 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") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } // get Type - spstr strCommand.txt,type1.txt,"~",3 + spstr strCommand.txt,type1.txt,"~",14 // get internal name - spstr strCommand.txt,entn1.txt,"~",4 + spstr strCommand.txt,entn1.txt,"~",15 if(type1.txt=="delete"||type1.txt=="") { vis bUp1,0 @@ -2249,14 +2243,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon1.txt,"~",5 + spstr strCommand.txt,tIcon1.txt,"~",16 vis tIcon1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",17 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",7 + spstr strCommand.txt,tEntity1.txt,"~",18 vis tEntity1,1 } if(type1.txt=="shutter") @@ -2269,7 +2263,7 @@ Timer tmSerial vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tId.txt,"~",8 + spstr strCommand.txt,tId.txt,"~",19 // up button spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") @@ -2320,7 +2314,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,"~",19 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -2337,7 +2331,7 @@ Timer tmSerial bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,"~",8 + spstr strCommand.txt,bText1.txt,"~",19 } if(type1.txt=="button"||type1.txt=="input_sel") { @@ -2352,7 +2346,7 @@ Timer tmSerial bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,"~",8 + spstr strCommand.txt,bText1.txt,"~",19 } if(type1.txt=="number") { @@ -2365,7 +2359,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,"~",19 //first value is current value spstr bText1.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2381,9 +2375,9 @@ Timer tmSerial hSlider1.maxval=sys0 } // get Type - spstr strCommand.txt,type2.txt,"~",9 + spstr strCommand.txt,type2.txt,"~",20 // get internal name - spstr strCommand.txt,entn2.txt,"~",10 + spstr strCommand.txt,entn2.txt,"~",21 if(type2.txt=="delete"||type2.txt=="") { vis bUp2,0 @@ -2398,14 +2392,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon2.txt,"~",11 + spstr strCommand.txt,tIcon2.txt,"~",22 vis tIcon2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",13 + spstr strCommand.txt,tEntity2.txt,"~",24 vis tEntity2,1 } if(type2.txt=="shutter") @@ -2418,7 +2412,7 @@ Timer tmSerial vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tId.txt,"~",14 + spstr strCommand.txt,tId.txt,"~",25 // up button spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") @@ -2469,7 +2463,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,"~",25 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -2486,7 +2480,7 @@ Timer tmSerial bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",14 + spstr strCommand.txt,bText2.txt,"~",25 } if(type2.txt=="button"||type2.txt=="input_sel") { @@ -2501,7 +2495,7 @@ Timer tmSerial bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",14 + spstr strCommand.txt,bText2.txt,"~",25 } if(type2.txt=="number") { @@ -2514,7 +2508,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,"~",25 //first value is current value spstr bText2.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2530,9 +2524,9 @@ Timer tmSerial hSlider2.maxval=sys0 } // get Type - spstr strCommand.txt,type3.txt,"~",15 + spstr strCommand.txt,type3.txt,"~",26 // get internal name - spstr strCommand.txt,entn3.txt,"~",16 + spstr strCommand.txt,entn3.txt,"~",27 if(type3.txt=="delete"||type3.txt=="") { vis bUp3,0 @@ -2547,14 +2541,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon3.txt,"~",17 + spstr strCommand.txt,tIcon3.txt,"~",28 vis tIcon3,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",29 covx tTmp.txt,sys0,0,0 tIcon3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,"~",19 + spstr strCommand.txt,tEntity3.txt,"~",30 vis tEntity3,1 } if(type3.txt=="shutter") @@ -2567,7 +2561,7 @@ Timer tmSerial vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tId.txt,"~",20 + spstr strCommand.txt,tId.txt,"~",31 // up button spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") @@ -2618,7 +2612,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,"~",31 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -2635,7 +2629,7 @@ Timer tmSerial bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,"~",20 + spstr strCommand.txt,bText3.txt,"~",31 } if(type3.txt=="button"||type3.txt=="input_sel") { @@ -2650,7 +2644,7 @@ Timer tmSerial bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,"~",20 + spstr strCommand.txt,bText3.txt,"~",31 } if(type3.txt=="number") { @@ -2663,7 +2657,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,"~",31 //first value is current value spstr bText3.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2679,9 +2673,9 @@ Timer tmSerial hSlider3.maxval=sys0 } // get Type - spstr strCommand.txt,type4.txt,"~",21 + spstr strCommand.txt,type4.txt,"~",32 // get internal name - spstr strCommand.txt,entn4.txt,"~",22 + spstr strCommand.txt,entn4.txt,"~",33 if(type4.txt=="delete"||type4.txt=="") { vis bUp4,0 @@ -2696,14 +2690,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon4.txt,"~",23 + spstr strCommand.txt,tIcon4.txt,"~",34 vis tIcon4,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",35 covx tTmp.txt,sys0,0,0 tIcon4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,"~",25 + spstr strCommand.txt,tEntity4.txt,"~",36 vis tEntity4,1 } if(type4.txt=="shutter") @@ -2716,7 +2710,7 @@ Timer tmSerial vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tId.txt,"~",26 + spstr strCommand.txt,tId.txt,"~",37 // up button spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") @@ -2767,7 +2761,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,"~",37 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -2784,7 +2778,7 @@ Timer tmSerial bText4.pco=65535 bText4.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,"~",26 + spstr strCommand.txt,bText4.txt,"~",37 } if(type4.txt=="button"||type4.txt=="input_sel") { @@ -2799,7 +2793,7 @@ Timer tmSerial bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,"~",26 + spstr strCommand.txt,bText4.txt,"~",37 } if(type4.txt=="number") { @@ -2812,7 +2806,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,"~",37 //first value is current value spstr bText4.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -2949,7 +2943,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 35 + ID : 33 Scope : local Period (ms): 1000 Enabled : yes @@ -2980,7 +2974,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 48 + ID : 46 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 2437f113..a861aeaa 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -96,12 +96,26 @@ Variable (string) entn6 Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + ID : 42 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + ID : 43 + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes ID : 4 Scope : local Text : - Max. Text Size: 500 + Max. Text Size: 700 Variable (string) tSend Attributes @@ -905,14 +919,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -933,9 +940,9 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 9 + x coordinate : 10 y coordinate : 16 - Width : 50 + Width : 49 Height : 50 Effect : load Effect Priority : 0 @@ -959,14 +966,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1139,50 +1139,44 @@ Timer tmSerial { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } // get Type - spstr strCommand.txt,type1.txt,"~",3 + spstr strCommand.txt,type1.txt,"~",14 // get internal name - spstr strCommand.txt,entn1.txt,"~",4 + spstr strCommand.txt,entn1.txt,"~",15 if(type1.txt=="delete"||type1.txt=="") { vis tEntity1,0 @@ -1190,20 +1184,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity1.txt,"~",5 + spstr strCommand.txt,bEntity1.txt,"~",16 vis bEntity1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",17 covx tTmp.txt,sys0,0,0 bEntity1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",7 + spstr strCommand.txt,tEntity1.txt,"~",18 vis tEntity1,1 } // get Type - spstr strCommand.txt,type2.txt,"~",9 + spstr strCommand.txt,type2.txt,"~",20 // get internal name - spstr strCommand.txt,entn2.txt,"~",10 + spstr strCommand.txt,entn2.txt,"~",21 if(type2.txt=="delete"||type2.txt=="") { vis tEntity2,0 @@ -1211,20 +1205,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity2.txt,"~",11 + spstr strCommand.txt,bEntity2.txt,"~",22 vis bEntity2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,sys0,0,0 bEntity2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",13 + spstr strCommand.txt,tEntity2.txt,"~",24 vis tEntity2,1 } // get Type - spstr strCommand.txt,type3.txt,"~",15 + spstr strCommand.txt,type3.txt,"~",26 // get internal name - spstr strCommand.txt,entn3.txt,"~",16 + spstr strCommand.txt,entn3.txt,"~",27 if(type3.txt=="delete"||type3.txt=="") { vis tEntity3,0 @@ -1232,20 +1226,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity3.txt,"~",17 + spstr strCommand.txt,bEntity3.txt,"~",28 vis bEntity3,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",29 covx tTmp.txt,sys0,0,0 bEntity3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,"~",19 + spstr strCommand.txt,tEntity3.txt,"~",30 vis tEntity3,1 } // get Type - spstr strCommand.txt,type4.txt,"~",21 + spstr strCommand.txt,type4.txt,"~",32 // get internal name - spstr strCommand.txt,entn4.txt,"~",22 + spstr strCommand.txt,entn4.txt,"~",33 if(type4.txt=="delete"||type4.txt=="") { vis tEntity4,0 @@ -1253,20 +1247,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity4.txt,"~",23 + spstr strCommand.txt,bEntity4.txt,"~",34 vis bEntity4,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",35 covx tTmp.txt,sys0,0,0 bEntity4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,"~",25 + spstr strCommand.txt,tEntity4.txt,"~",36 vis tEntity4,1 } // get Type - spstr strCommand.txt,type5.txt,"~",27 + spstr strCommand.txt,type5.txt,"~",38 // get internal name - spstr strCommand.txt,entn5.txt,"~",28 + spstr strCommand.txt,entn5.txt,"~",39 if(type5.txt=="delete"||type5.txt=="") { vis tEntity5,0 @@ -1274,20 +1268,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity5.txt,"~",29 + spstr strCommand.txt,bEntity5.txt,"~",40 vis bEntity5,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",30 + spstr strCommand.txt,tTmp.txt,"~",41 covx tTmp.txt,sys0,0,0 bEntity5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,"~",31 + spstr strCommand.txt,tEntity5.txt,"~",42 vis tEntity5,1 } // get Type - spstr strCommand.txt,type6.txt,"~",33 + spstr strCommand.txt,type6.txt,"~",44 // get internal name - spstr strCommand.txt,entn6.txt,"~",34 + spstr strCommand.txt,entn6.txt,"~",45 if(type6.txt=="delete"||type6.txt=="") { vis tEntity6,0 @@ -1295,14 +1289,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity6.txt,"~",35 + spstr strCommand.txt,bEntity6.txt,"~",46 vis bEntity6,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",36 + spstr strCommand.txt,tTmp.txt,"~",47 covx tTmp.txt,sys0,0,0 bEntity6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,"~",37 + spstr strCommand.txt,tEntity6.txt,"~",48 vis tEntity6,1 } } diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 4233f431..fda4a8ae 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -101,6 +101,20 @@ Variable (string) entn6 Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + ID : 58 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + ID : 57 + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes ID : 5 @@ -1200,14 +1214,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardMedia," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1254,14 +1261,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardMedia," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1419,72 +1419,66 @@ Timer tmSerial { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } //entity name - spstr strCommand.txt,entn.txt,"~",3 + spstr strCommand.txt,entn.txt,"~",14 //title - spstr strCommand.txt,tTitle.txt,"~",4 + spstr strCommand.txt,tTitle.txt,"~",15 //title farbe - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",16 if(tTmp.txt!="") { covx tTmp.txt,tTitle.pco,0,0 } //author - spstr strCommand.txt,tAuthor.txt,"~",6 + spstr strCommand.txt,tAuthor.txt,"~",17 //author farbe - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",18 if(tTmp.txt!="") { covx tTmp.txt,tAuthor.pco,0,0 } //volume - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,sys0,0,0 hVolume.val=sys0 //icon - spstr strCommand.txt,tPlayPause.txt,"~",9 + spstr strCommand.txt,tPlayPause.txt,"~",20 // on off button - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",21 if(tTmp.txt=="disable") { vis t5,0 @@ -1494,7 +1488,7 @@ Timer tmSerial covx tTmp.txt,t5.pco,0,0 } // shuffel btn - spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,"~",22 if(tTmp.txt=="disable") { vis tShuffle,0 @@ -1504,9 +1498,9 @@ Timer tmSerial tShuffle.txt=tTmp.txt } // get Type - spstr strCommand.txt,type1.txt,"~",12 + spstr strCommand.txt,type1.txt,"~",23 // get internal name - spstr strCommand.txt,entn1.txt,"~",13 + spstr strCommand.txt,entn1.txt,"~",24 if(type1.txt=="delete"||type1.txt=="") { vis tEntity1,0 @@ -1514,20 +1508,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity1.txt,"~",14 + spstr strCommand.txt,bEntity1.txt,"~",25 vis bEntity1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 bEntity1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",16 + spstr strCommand.txt,tEntity1.txt,"~",27 vis tEntity1,1 } // get Type - spstr strCommand.txt,type2.txt,"~",18 + spstr strCommand.txt,type2.txt,"~",29 // get internal name - spstr strCommand.txt,entn2.txt,"~",19 + spstr strCommand.txt,entn2.txt,"~",30 if(type2.txt=="delete"||type2.txt=="") { vis tEntity2,0 @@ -1535,20 +1529,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity2.txt,"~",20 + spstr strCommand.txt,bEntity2.txt,"~",31 vis bEntity2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",21 + spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,sys0,0,0 bEntity2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",22 + spstr strCommand.txt,tEntity2.txt,"~",33 vis tEntity2,1 } // get Type - spstr strCommand.txt,type3.txt,"~",24 + spstr strCommand.txt,type3.txt,"~",35 // get internal name - spstr strCommand.txt,entn3.txt,"~",25 + spstr strCommand.txt,entn3.txt,"~",36 if(type3.txt=="delete"||type3.txt=="") { vis tEntity3,0 @@ -1556,20 +1550,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity3.txt,"~",26 + spstr strCommand.txt,bEntity3.txt,"~",37 vis bEntity3,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,sys0,0,0 bEntity3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,"~",28 + spstr strCommand.txt,tEntity3.txt,"~",39 vis tEntity3,1 } // get Type - spstr strCommand.txt,type4.txt,"~",30 + spstr strCommand.txt,type4.txt,"~",41 // get internal name - spstr strCommand.txt,entn4.txt,"~",31 + spstr strCommand.txt,entn4.txt,"~",42 if(type4.txt=="delete"||type4.txt=="") { vis tEntity4,0 @@ -1577,20 +1571,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity4.txt,"~",32 + spstr strCommand.txt,bEntity4.txt,"~",43 vis bEntity4,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",33 + spstr strCommand.txt,tTmp.txt,"~",44 covx tTmp.txt,sys0,0,0 bEntity4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,"~",34 + spstr strCommand.txt,tEntity4.txt,"~",45 vis tEntity4,1 } // get Type - spstr strCommand.txt,type5.txt,"~",36 + spstr strCommand.txt,type5.txt,"~",47 // get internal name - spstr strCommand.txt,entn5.txt,"~",37 + spstr strCommand.txt,entn5.txt,"~",48 if(type5.txt=="delete"||type5.txt=="") { vis tEntity5,0 @@ -1598,20 +1592,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity5.txt,"~",38 + spstr strCommand.txt,bEntity5.txt,"~",49 vis bEntity5,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",39 + spstr strCommand.txt,tTmp.txt,"~",50 covx tTmp.txt,sys0,0,0 bEntity5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,"~",40 + spstr strCommand.txt,tEntity5.txt,"~",51 vis tEntity5,1 } // get Type - spstr strCommand.txt,type6.txt,"~",42 + spstr strCommand.txt,type6.txt,"~",53 // get internal name - spstr strCommand.txt,entn6.txt,"~",43 + spstr strCommand.txt,entn6.txt,"~",54 if(type6.txt=="delete"||type6.txt=="") { vis tEntity6,0 @@ -1619,14 +1613,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity6.txt,"~",44 + spstr strCommand.txt,bEntity6.txt,"~",55 vis bEntity6,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",45 + spstr strCommand.txt,tTmp.txt,"~",56 covx tTmp.txt,sys0,0,0 bEntity6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,"~",46 + spstr strCommand.txt,tEntity6.txt,"~",57 vis tEntity6,1 } } @@ -1694,6 +1688,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index c82688c6..a18be0d1 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -65,6 +65,20 @@ Page cardPower } } +Variable (string) nent1 + Attributes + ID : 43 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + ID : 44 + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes ID : 5 @@ -801,14 +815,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardPower," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -855,14 +862,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1061,63 +1061,57 @@ Timer tmSerial { // command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6 spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } // icon color home - spstr strCommand.txt,tTmp.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,t1.pco,0,0 // icon home - spstr strCommand.txt,t1.txt,"~",4 + spstr strCommand.txt,t1.txt,"~",15 // text home - spstr strCommand.txt,tHome.txt,"~",5 + spstr strCommand.txt,tHome.txt,"~",16 // iconColor - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",17 covx tTmp.txt,t0Icon.pco,0,0 // icon - spstr strCommand.txt,t0Icon.txt,"~",7 + spstr strCommand.txt,t0Icon.txt,"~",18 // speed - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t0Speed.val,0,0 // lower text - spstr strCommand.txt,t0u.txt,"~",9 + spstr strCommand.txt,t0u.txt,"~",20 if(t0Icon.txt!="") { vis t0Icon,1 @@ -1130,15 +1124,15 @@ Timer tmSerial vis h0,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,t1Icon.pco,0,0 // icon - spstr strCommand.txt,t1Icon.txt,"~",11 + spstr strCommand.txt,t1Icon.txt,"~",22 // speed - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,t1Speed.val,0,0 // lower text - spstr strCommand.txt,t1u.txt,"~",13 + spstr strCommand.txt,t1u.txt,"~",24 if(t1Icon.txt!="") { vis t1Icon,1 @@ -1151,15 +1145,15 @@ Timer tmSerial vis h1,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,"~",25 covx tTmp.txt,t2Icon.pco,0,0 // icon - spstr strCommand.txt,t2Icon.txt,"~",15 + spstr strCommand.txt,t2Icon.txt,"~",26 // speed - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",27 covx tTmp.txt,t2Speed.val,0,0 // lower text - spstr strCommand.txt,t2u.txt,"~",17 + spstr strCommand.txt,t2u.txt,"~",28 if(t2Icon.txt!="") { vis t2Icon,1 @@ -1172,15 +1166,15 @@ Timer tmSerial vis h2,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",29 covx tTmp.txt,t3Icon.pco,0,0 // icon - spstr strCommand.txt,t3Icon.txt,"~",19 + spstr strCommand.txt,t3Icon.txt,"~",30 // speed - spstr strCommand.txt,tTmp.txt,"~",20 + spstr strCommand.txt,tTmp.txt,"~",31 covx tTmp.txt,t3Speed.val,0,0 // lower text - spstr strCommand.txt,t3u.txt,"~",21 + spstr strCommand.txt,t3u.txt,"~",32 if(t3Icon.txt!="") { vis t3Icon,1 @@ -1193,15 +1187,15 @@ Timer tmSerial vis h3,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",22 + spstr strCommand.txt,tTmp.txt,"~",33 covx tTmp.txt,t4Icon.pco,0,0 // icon - spstr strCommand.txt,t4Icon.txt,"~",23 + spstr strCommand.txt,t4Icon.txt,"~",34 // speed - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",35 covx tTmp.txt,t4Speed.val,0,0 // lower text - spstr strCommand.txt,t4u.txt,"~",25 + spstr strCommand.txt,t4u.txt,"~",36 if(t4Icon.txt!="") { vis t4Icon,1 @@ -1214,15 +1208,15 @@ Timer tmSerial vis h4,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",26 + spstr strCommand.txt,tTmp.txt,"~",37 covx tTmp.txt,t5Icon.pco,0,0 // icon - spstr strCommand.txt,t5Icon.txt,"~",27 + spstr strCommand.txt,t5Icon.txt,"~",38 // speed - spstr strCommand.txt,tTmp.txt,"~",28 + spstr strCommand.txt,tTmp.txt,"~",39 covx tTmp.txt,t5Speed.val,0,0 // lower text - spstr strCommand.txt,t5u.txt,"~",29 + spstr strCommand.txt,t5u.txt,"~",40 if(t5Icon.txt!="") { vis t5Icon,1 diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index f4cb0679..33865c29 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -81,12 +81,26 @@ Variable (string) entn2 Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + ID : 32 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) nent2 + Attributes + ID : 33 + Scope : local + Text : + Max. Text Size: 50 + Variable (string) strCommand Attributes ID : 6 Scope : local Text : - Max. Text Size: 275 + Max. Text Size: 400 Variable (string) tId Attributes @@ -338,14 +352,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardQR," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -392,14 +399,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -657,9 +657,9 @@ Hotspot mSwipePrev Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 5 - Width : 9 - Height : 310 + y coordinate : 0 + Width : 7 + Height : 315 Effect : load Effect Priority : 0 Effect Time : 300 @@ -745,52 +745,46 @@ Timer tmSerial // command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2 //tHeading spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } //text qrcode - spstr strCommand.txt,vaQR.txt,"~",3 + spstr strCommand.txt,vaQR.txt,"~",14 // get Type - spstr strCommand.txt,type1.txt,"~",4 + spstr strCommand.txt,type1.txt,"~",15 // get internal name - spstr strCommand.txt,entn1.txt,"~",5 + spstr strCommand.txt,entn1.txt,"~",16 if(type1.txt=="delete"||type1.txt=="") { vis btOnOff1,0 @@ -800,14 +794,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon1.txt,"~",6 + spstr strCommand.txt,tIcon1.txt,"~",17 vis tIcon1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",18 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",8 + spstr strCommand.txt,tEntity1.txt,"~",19 vis tEntity1,1 } if(type1.txt=="light") @@ -815,7 +809,7 @@ Timer tmSerial vis btOnOff1,1 vis bText1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -824,7 +818,7 @@ Timer tmSerial vis btOnOff1,1 vis bText1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -836,7 +830,7 @@ Timer tmSerial bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,"~",9 + spstr strCommand.txt,bText1.txt,"~",20 } if(type1.txt=="button") { @@ -846,12 +840,12 @@ Timer tmSerial bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,"~",9 + spstr strCommand.txt,bText1.txt,"~",20 } // get Type - spstr strCommand.txt,type2.txt,"~",10 + spstr strCommand.txt,type2.txt,"~",21 // get internal name - spstr strCommand.txt,entn2.txt,"~",11 + spstr strCommand.txt,entn2.txt,"~",22 if(type2.txt=="delete"||type2.txt=="") { vis btOnOff2,0 @@ -861,14 +855,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon2.txt,"~",12 + spstr strCommand.txt,tIcon2.txt,"~",23 vis tIcon2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",13 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",14 + spstr strCommand.txt,tEntity2.txt,"~",25 vis tEntity2,1 } if(type2.txt=="light") @@ -876,7 +870,7 @@ Timer tmSerial vis btOnOff2,1 vis bText2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -885,7 +879,7 @@ Timer tmSerial vis btOnOff2,1 vis bText2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -897,7 +891,7 @@ Timer tmSerial bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",15 + spstr strCommand.txt,bText2.txt,"~",26 } if(type2.txt=="button") { @@ -907,7 +901,7 @@ Timer tmSerial bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",15 + spstr strCommand.txt,bText2.txt,"~",26 } if(type2.txt=="delete"||type2.txt=="") { diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 0497119e..ce06bb90 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -72,6 +72,20 @@ Variable (string) entn Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + ID : 56 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + ID : 55 + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes ID : 4 @@ -634,14 +648,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -688,14 +695,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1557,64 +1557,58 @@ Timer tmSerial { //heading spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } //entity name - spstr strCommand.txt,entn.txt,"~",3 + spstr strCommand.txt,entn.txt,"~",14 //currentTemp - spstr strCommand.txt,tCurTemp.txt,"~",4 + spstr strCommand.txt,tCurTemp.txt,"~",15 //dstTemp - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",16 covx tTmp.txt,xTempDest1.val,0,0 xTempDest.val=xTempDest1.val //status - spstr strCommand.txt,tStatus.txt,"~",6 + spstr strCommand.txt,tStatus.txt,"~",17 //minTemp - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",18 covx tTmp.txt,xTempMin1.val,0,0 //maxTemp - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,xTempMax1.val,0,0 //tempStep - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 @@ -1626,137 +1620,137 @@ Timer tmSerial vis bt6,0 vis bt7,0 //bt0 - spstr strCommand.txt,bt0.txt,"~",10 + spstr strCommand.txt,bt0.txt,"~",21 if(bt0.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,bt0.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,bt0.val,0,0 // save action - spstr strCommand.txt,va0.txt,"~",13 + spstr strCommand.txt,va0.txt,"~",24 //enable vis bt0,1 } //bt1 - spstr strCommand.txt,bt1.txt,"~",14 + spstr strCommand.txt,bt1.txt,"~",25 if(bt1.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,bt1.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",27 covx tTmp.txt,bt1.val,0,0 // save action - spstr strCommand.txt,va1.txt,"~",17 + spstr strCommand.txt,va1.txt,"~",28 //enable vis bt1,1 } //bt2 - spstr strCommand.txt,bt2.txt,"~",18 + spstr strCommand.txt,bt2.txt,"~",29 if(bt2.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",30 covx tTmp.txt,bt2.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",20 + spstr strCommand.txt,tTmp.txt,"~",31 covx tTmp.txt,bt2.val,0,0 // save action - spstr strCommand.txt,va2.txt,"~",21 + spstr strCommand.txt,va2.txt,"~",32 //enable vis bt2,1 } //bt3 - spstr strCommand.txt,bt3.txt,"~",22 + spstr strCommand.txt,bt3.txt,"~",33 if(bt3.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,bt3.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",35 covx tTmp.txt,bt3.val,0,0 // save action - spstr strCommand.txt,va3.txt,"~",25 + spstr strCommand.txt,va3.txt,"~",36 //enable vis bt3,1 } //bt4 - spstr strCommand.txt,bt4.txt,"~",26 + spstr strCommand.txt,bt4.txt,"~",37 if(bt4.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,bt4.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",28 + spstr strCommand.txt,tTmp.txt,"~",39 covx tTmp.txt,bt4.val,0,0 // save action - spstr strCommand.txt,va4.txt,"~",29 + spstr strCommand.txt,va4.txt,"~",40 //enable vis bt4,1 } //bt5 - spstr strCommand.txt,bt5.txt,"~",30 + spstr strCommand.txt,bt5.txt,"~",41 if(bt5.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,"~",42 covx tTmp.txt,bt5.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",32 + spstr strCommand.txt,tTmp.txt,"~",43 covx tTmp.txt,bt5.val,0,0 // save action - spstr strCommand.txt,va5.txt,"~",33 + spstr strCommand.txt,va5.txt,"~",44 //enable vis bt5,1 } //bt6 - spstr strCommand.txt,bt6.txt,"~",34 + spstr strCommand.txt,bt6.txt,"~",45 if(bt6.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",35 + spstr strCommand.txt,tTmp.txt,"~",46 covx tTmp.txt,bt6.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",36 + spstr strCommand.txt,tTmp.txt,"~",47 covx tTmp.txt,bt6.val,0,0 // save action - spstr strCommand.txt,va6.txt,"~",37 + spstr strCommand.txt,va6.txt,"~",48 //enable vis bt6,1 } //bt7 - spstr strCommand.txt,bt7.txt,"~",38 + spstr strCommand.txt,bt7.txt,"~",49 if(bt7.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",39 + spstr strCommand.txt,tTmp.txt,"~",50 covx tTmp.txt,bt7.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",40 + spstr strCommand.txt,tTmp.txt,"~",51 covx tTmp.txt,bt7.val,0,0 // save action - spstr strCommand.txt,va7.txt,"~",41 + spstr strCommand.txt,va7.txt,"~",52 //enable vis bt7,1 } //Text tCurTempLbl - spstr strCommand.txt,tCurTempLbl.txt,"~",42 + spstr strCommand.txt,tCurTempLbl.txt,"~",53 //Text tStateLbl - spstr strCommand.txt,tStateLbl.txt,"~",43 + spstr strCommand.txt,tStateLbl.txt,"~",54 //Text tALbl - //spstr strCommand.txt,tALbl.txt,"~",44 + //spstr strCommand.txt,tALbl.txt,"~",55 //Text tCF - spstr strCommand.txt,tCF.txt,"~",45 + spstr strCommand.txt,tCF.txt,"~",56 tCF1.txt=tCF.txt tCF2.txt=tCF.txt //Second Temperature - spstr strCommand.txt,tTmp.txt,"~",46 + spstr strCommand.txt,tTmp.txt,"~",57 if(tTmp.txt!="") { covx tTmp.txt,xTempDest2.val,0,0 @@ -1774,8 +1768,8 @@ Timer tmSerial vis tCF2,1 } //Show btDetail - spstr strCommand.txt,tTmp.txt,"~",47 - if(tTmp.txt=="1") + spstr strCommand.txt,tTmp.txt,"~",58 + if(tTmp.txt!="1") { vis btDetail,1 }else diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 2589b6a4..7499994b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -15,9 +15,9 @@ popupNotify 257 Line(s) of event code 166 Unique line(s) of event code cardChart - 31 Component(s) - 452 Line(s) of event code - 296 Unique line(s) of event code + 33 Component(s) + 425 Line(s) of event code + 290 Unique line(s) of event code screensaver 47 Component(s) 411 Line(s) of event code @@ -42,45 +42,45 @@ pageStartup 19 Component(s) 181 Line(s) of event code 129 Unique line(s) of event code +cardQR + 34 Component(s) + 398 Line(s) of event code + 232 Unique line(s) of event code pageTest 21 Component(s) 66 Line(s) of event code 64 Unique line(s) of event code cardGrid - 42 Component(s) - 538 Line(s) of event code - 300 Unique line(s) of event code -cardPower - 43 Component(s) - 439 Line(s) of event code - 299 Unique line(s) of event code -cardAlarm - 40 Component(s) - 442 Line(s) of event code - 262 Unique line(s) of event code -cardQR - 32 Component(s) - 425 Line(s) of event code - 244 Unique line(s) of event code + 44 Component(s) + 511 Line(s) of event code + 289 Unique line(s) of event code +cardMedia + 59 Component(s) + 637 Line(s) of event code + 316 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code 255 Unique line(s) of event code -cardThermo - 55 Component(s) - 555 Line(s) of event code - 322 Unique line(s) of event code -cardMedia - 57 Component(s) - 660 Line(s) of event code - 325 Unique line(s) of event code +cardPower + 45 Component(s) + 412 Line(s) of event code + 289 Unique line(s) of event code cardEntities - 65 Component(s) - 1185 Line(s) of event code - 537 Unique line(s) of event code + 67 Component(s) + 1158 Line(s) of event code + 526 Unique line(s) of event code +cardAlarm + 42 Component(s) + 415 Line(s) of event code + 253 Unique line(s) of event code +cardThermo + 57 Component(s) + 528 Line(s) of event code + 313 Unique line(s) of event code Total 19 Page(s) - 678 Component(s) - 8429 Line(s) of event code - 2132 Unique line(s) of event code + 694 Component(s) + 8217 Line(s) of event code + 2124 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index c67f148a..6cc63a03 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -63,6 +63,18 @@ Variable (string) entn Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes Scope : local @@ -482,14 +494,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -514,14 +519,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -640,86 +638,80 @@ Timer tmSerial { //entn spstr strCommand.txt,entn.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } //text arm1 - spstr strCommand.txt,arm1.txt,"~",3 + spstr strCommand.txt,arm1.txt,"~",14 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,"~",4 + spstr strCommand.txt,va1.txt,"~",15 //text arm2 - spstr strCommand.txt,arm2.txt,"~",5 + spstr strCommand.txt,arm2.txt,"~",16 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,"~",6 + spstr strCommand.txt,va2.txt,"~",17 //text arm3 - spstr strCommand.txt,arm3.txt,"~",7 + spstr strCommand.txt,arm3.txt,"~",18 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,"~",8 + spstr strCommand.txt,va3.txt,"~",19 //text arm4 - spstr strCommand.txt,arm4.txt,"~",9 + spstr strCommand.txt,arm4.txt,"~",20 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,"~",10 + spstr strCommand.txt,va4.txt,"~",21 //icon - spstr strCommand.txt,tIcon.txt,"~",11 + spstr strCommand.txt,tIcon.txt,"~",22 //icon color - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,"~",13 + spstr strCommand.txt,tTmp.txt,"~",24 if(tTmp.txt!="disable") { vis b0,1 @@ -752,7 +744,7 @@ Timer tmSerial vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,"~",25 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -761,13 +753,13 @@ Timer tmSerial tmFlash.en=0 } // extra button - spstr strCommand.txt,b9.txt,"~",15 + spstr strCommand.txt,b9.txt,"~",26 if(b9.txt!="") { vis b9,1 - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",27 covx tTmp.txt,b9.pco,0,0 - spstr strCommand.txt,vaAddBtn.txt,"~",17 + spstr strCommand.txt,vaAddBtn.txt,"~",28 } } if(tInstruction.txt=="time") diff --git a/HMI/n2t-out/cardChart.txt b/HMI/n2t-out/cardChart.txt index 9de54bcd..b45f5530 100644 --- a/HMI/n2t-out/cardChart.txt +++ b/HMI/n2t-out/cardChart.txt @@ -49,6 +49,18 @@ Variable (string) entn Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes Scope : local @@ -179,14 +191,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -211,14 +216,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -399,48 +397,42 @@ Timer tmSerial if(tInstruction.txt=="entityUpd") { spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } // extract color - spstr strCommand.txt,tTmp.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,vaColorL.val,0,0 // prepare dark color sys0=vaColorL.val>>11 // red @@ -452,7 +444,7 @@ Timer tmSerial // // detect nValues and maxValue vNValues.val=0 - spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17 strlen tTmp.txt,sya0 while(sya0>0) { @@ -463,7 +455,7 @@ Timer tmSerial } // next vNValues.val++ - spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17 strlen tTmp.txt,sya0 } // @@ -478,7 +470,7 @@ Timer tmSerial // line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 - spstr strCommand.txt,strTmp.txt,"~",5 + spstr strCommand.txt,strTmp.txt,"~",16 sya1=0 spstr strTmp.txt,tTmp.txt,":",sya1 strlen tTmp.txt,sya0 @@ -511,7 +503,7 @@ Timer tmSerial } // // y achis label - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",15 // tTmp.txt="Gas [kW]" strlen tTmp.txt,sys1 sya1=sys1*12+m0.h-48/2 @@ -527,7 +519,7 @@ Timer tmSerial vaValues.txt+="~" } // extract next entry - spstr strCommand.txt,tTmp.txt,"~",sys0+6 + spstr strCommand.txt,tTmp.txt,"~",sys0+17 // calculate left sys1=sys0*5*vaUnit.val sys1+=vaLeft.val diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 79bd7775..0784d32e 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -110,6 +110,18 @@ Variable (string) entn4 Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes Scope : local @@ -533,14 +545,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardEntities," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -565,14 +570,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardEntities," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1238,50 +1236,44 @@ Timer tmSerial { // 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") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } // get Type - spstr strCommand.txt,type1.txt,"~",3 + spstr strCommand.txt,type1.txt,"~",14 // get internal name - spstr strCommand.txt,entn1.txt,"~",4 + spstr strCommand.txt,entn1.txt,"~",15 if(type1.txt=="delete"||type1.txt=="") { vis bUp1,0 @@ -1296,14 +1288,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon1.txt,"~",5 + spstr strCommand.txt,tIcon1.txt,"~",16 vis tIcon1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",17 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",7 + spstr strCommand.txt,tEntity1.txt,"~",18 vis tEntity1,1 } if(type1.txt=="shutter") @@ -1316,7 +1308,7 @@ Timer tmSerial vis hSlider1,0 vis nNum1,0 // get Button State (optional Value) - spstr strCommand.txt,tId.txt,"~",8 + spstr strCommand.txt,tId.txt,"~",19 // up button spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") @@ -1367,7 +1359,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,"~",19 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1384,7 +1376,7 @@ Timer tmSerial bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,"~",8 + spstr strCommand.txt,bText1.txt,"~",19 } if(type1.txt=="button"||type1.txt=="input_sel") { @@ -1399,7 +1391,7 @@ Timer tmSerial bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,"~",8 + spstr strCommand.txt,bText1.txt,"~",19 } if(type1.txt=="number") { @@ -1412,7 +1404,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,"~",19 //first value is current value spstr bText1.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1428,9 +1420,9 @@ Timer tmSerial hSlider1.maxval=sys0 } // get Type - spstr strCommand.txt,type2.txt,"~",9 + spstr strCommand.txt,type2.txt,"~",20 // get internal name - spstr strCommand.txt,entn2.txt,"~",10 + spstr strCommand.txt,entn2.txt,"~",21 if(type2.txt=="delete"||type2.txt=="") { vis bUp2,0 @@ -1445,14 +1437,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon2.txt,"~",11 + spstr strCommand.txt,tIcon2.txt,"~",22 vis tIcon2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",13 + spstr strCommand.txt,tEntity2.txt,"~",24 vis tEntity2,1 } if(type2.txt=="shutter") @@ -1465,7 +1457,7 @@ Timer tmSerial vis hSlider2,0 vis nNum2,0 // get Button State (optional Value) - spstr strCommand.txt,tId.txt,"~",14 + spstr strCommand.txt,tId.txt,"~",25 // up button spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") @@ -1516,7 +1508,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,"~",25 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1533,7 +1525,7 @@ Timer tmSerial bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",14 + spstr strCommand.txt,bText2.txt,"~",25 } if(type2.txt=="button"||type2.txt=="input_sel") { @@ -1548,7 +1540,7 @@ Timer tmSerial bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",14 + spstr strCommand.txt,bText2.txt,"~",25 } if(type2.txt=="number") { @@ -1561,7 +1553,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,"~",25 //first value is current value spstr bText2.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1577,9 +1569,9 @@ Timer tmSerial hSlider2.maxval=sys0 } // get Type - spstr strCommand.txt,type3.txt,"~",15 + spstr strCommand.txt,type3.txt,"~",26 // get internal name - spstr strCommand.txt,entn3.txt,"~",16 + spstr strCommand.txt,entn3.txt,"~",27 if(type3.txt=="delete"||type3.txt=="") { vis bUp3,0 @@ -1594,14 +1586,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon3.txt,"~",17 + spstr strCommand.txt,tIcon3.txt,"~",28 vis tIcon3,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",29 covx tTmp.txt,sys0,0,0 tIcon3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,"~",19 + spstr strCommand.txt,tEntity3.txt,"~",30 vis tEntity3,1 } if(type3.txt=="shutter") @@ -1614,7 +1606,7 @@ Timer tmSerial vis hSlider3,0 vis nNum3,0 // get Button State (optional Value) - spstr strCommand.txt,tId.txt,"~",20 + spstr strCommand.txt,tId.txt,"~",31 // up button spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") @@ -1665,7 +1657,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,"~",31 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1682,7 +1674,7 @@ Timer tmSerial bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,"~",20 + spstr strCommand.txt,bText3.txt,"~",31 } if(type3.txt=="button"||type3.txt=="input_sel") { @@ -1697,7 +1689,7 @@ Timer tmSerial bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,"~",20 + spstr strCommand.txt,bText3.txt,"~",31 } if(type3.txt=="number") { @@ -1710,7 +1702,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,"~",31 //first value is current value spstr bText3.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 @@ -1726,9 +1718,9 @@ Timer tmSerial hSlider3.maxval=sys0 } // get Type - spstr strCommand.txt,type4.txt,"~",21 + spstr strCommand.txt,type4.txt,"~",32 // get internal name - spstr strCommand.txt,entn4.txt,"~",22 + spstr strCommand.txt,entn4.txt,"~",33 if(type4.txt=="delete"||type4.txt=="") { vis bUp4,0 @@ -1743,14 +1735,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon4.txt,"~",23 + spstr strCommand.txt,tIcon4.txt,"~",34 vis tIcon4,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",35 covx tTmp.txt,sys0,0,0 tIcon4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,"~",25 + spstr strCommand.txt,tEntity4.txt,"~",36 vis tEntity4,1 } if(type4.txt=="shutter") @@ -1763,7 +1755,7 @@ Timer tmSerial vis hSlider4,0 vis nNum4,0 // get Button State (optional Value) - spstr strCommand.txt,tId.txt,"~",26 + spstr strCommand.txt,tId.txt,"~",37 // up button spstr tId.txt,tTmp.txt,"|",3 if(tTmp.txt=="disable") @@ -1814,7 +1806,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,"~",37 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -1831,7 +1823,7 @@ Timer tmSerial bText4.pco=65535 bText4.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,"~",26 + spstr strCommand.txt,bText4.txt,"~",37 } if(type4.txt=="button"||type4.txt=="input_sel") { @@ -1846,7 +1838,7 @@ Timer tmSerial bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,"~",26 + spstr strCommand.txt,bText4.txt,"~",37 } if(type4.txt=="number") { @@ -1859,7 +1851,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,"~",37 //first value is current value spstr bText4.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 71ce4b2d..1ad6c8f4 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -82,11 +82,23 @@ Variable (string) entn6 Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 500 + Max. Text Size: 700 Variable (string) tSend Attributes @@ -519,14 +531,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -551,14 +556,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -693,50 +691,44 @@ Timer tmSerial { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } // get Type - spstr strCommand.txt,type1.txt,"~",3 + spstr strCommand.txt,type1.txt,"~",14 // get internal name - spstr strCommand.txt,entn1.txt,"~",4 + spstr strCommand.txt,entn1.txt,"~",15 if(type1.txt=="delete"||type1.txt=="") { vis tEntity1,0 @@ -744,20 +736,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity1.txt,"~",5 + spstr strCommand.txt,bEntity1.txt,"~",16 vis bEntity1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",17 covx tTmp.txt,sys0,0,0 bEntity1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",7 + spstr strCommand.txt,tEntity1.txt,"~",18 vis tEntity1,1 } // get Type - spstr strCommand.txt,type2.txt,"~",9 + spstr strCommand.txt,type2.txt,"~",20 // get internal name - spstr strCommand.txt,entn2.txt,"~",10 + spstr strCommand.txt,entn2.txt,"~",21 if(type2.txt=="delete"||type2.txt=="") { vis tEntity2,0 @@ -765,20 +757,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity2.txt,"~",11 + spstr strCommand.txt,bEntity2.txt,"~",22 vis bEntity2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,sys0,0,0 bEntity2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",13 + spstr strCommand.txt,tEntity2.txt,"~",24 vis tEntity2,1 } // get Type - spstr strCommand.txt,type3.txt,"~",15 + spstr strCommand.txt,type3.txt,"~",26 // get internal name - spstr strCommand.txt,entn3.txt,"~",16 + spstr strCommand.txt,entn3.txt,"~",27 if(type3.txt=="delete"||type3.txt=="") { vis tEntity3,0 @@ -786,20 +778,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity3.txt,"~",17 + spstr strCommand.txt,bEntity3.txt,"~",28 vis bEntity3,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",29 covx tTmp.txt,sys0,0,0 bEntity3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,"~",19 + spstr strCommand.txt,tEntity3.txt,"~",30 vis tEntity3,1 } // get Type - spstr strCommand.txt,type4.txt,"~",21 + spstr strCommand.txt,type4.txt,"~",32 // get internal name - spstr strCommand.txt,entn4.txt,"~",22 + spstr strCommand.txt,entn4.txt,"~",33 if(type4.txt=="delete"||type4.txt=="") { vis tEntity4,0 @@ -807,20 +799,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity4.txt,"~",23 + spstr strCommand.txt,bEntity4.txt,"~",34 vis bEntity4,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",35 covx tTmp.txt,sys0,0,0 bEntity4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,"~",25 + spstr strCommand.txt,tEntity4.txt,"~",36 vis tEntity4,1 } // get Type - spstr strCommand.txt,type5.txt,"~",27 + spstr strCommand.txt,type5.txt,"~",38 // get internal name - spstr strCommand.txt,entn5.txt,"~",28 + spstr strCommand.txt,entn5.txt,"~",39 if(type5.txt=="delete"||type5.txt=="") { vis tEntity5,0 @@ -828,20 +820,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity5.txt,"~",29 + spstr strCommand.txt,bEntity5.txt,"~",40 vis bEntity5,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",30 + spstr strCommand.txt,tTmp.txt,"~",41 covx tTmp.txt,sys0,0,0 bEntity5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,"~",31 + spstr strCommand.txt,tEntity5.txt,"~",42 vis tEntity5,1 } // get Type - spstr strCommand.txt,type6.txt,"~",33 + spstr strCommand.txt,type6.txt,"~",44 // get internal name - spstr strCommand.txt,entn6.txt,"~",34 + spstr strCommand.txt,entn6.txt,"~",45 if(type6.txt=="delete"||type6.txt=="") { vis tEntity6,0 @@ -849,14 +841,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity6.txt,"~",35 + spstr strCommand.txt,bEntity6.txt,"~",46 vis bEntity6,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",36 + spstr strCommand.txt,tTmp.txt,"~",47 covx tTmp.txt,sys0,0,0 bEntity6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,"~",37 + spstr strCommand.txt,tEntity6.txt,"~",48 vis tEntity6,1 } } diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index e02027c0..b7909860 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -86,6 +86,18 @@ Variable (string) entn6 Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes Scope : local @@ -766,14 +778,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardMedia," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -798,14 +803,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardMedia," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -933,72 +931,66 @@ Timer tmSerial { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } //entity name - spstr strCommand.txt,entn.txt,"~",3 + spstr strCommand.txt,entn.txt,"~",14 //title - spstr strCommand.txt,tTitle.txt,"~",4 + spstr strCommand.txt,tTitle.txt,"~",15 //title farbe - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",16 if(tTmp.txt!="") { covx tTmp.txt,tTitle.pco,0,0 } //author - spstr strCommand.txt,tAuthor.txt,"~",6 + spstr strCommand.txt,tAuthor.txt,"~",17 //author farbe - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",18 if(tTmp.txt!="") { covx tTmp.txt,tAuthor.pco,0,0 } //volume - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,sys0,0,0 hVolume.val=sys0 //icon - spstr strCommand.txt,tPlayPause.txt,"~",9 + spstr strCommand.txt,tPlayPause.txt,"~",20 // on off button - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",21 if(tTmp.txt=="disable") { vis t5,0 @@ -1008,7 +1000,7 @@ Timer tmSerial covx tTmp.txt,t5.pco,0,0 } // shuffel btn - spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,"~",22 if(tTmp.txt=="disable") { vis tShuffle,0 @@ -1018,9 +1010,9 @@ Timer tmSerial tShuffle.txt=tTmp.txt } // get Type - spstr strCommand.txt,type1.txt,"~",12 + spstr strCommand.txt,type1.txt,"~",23 // get internal name - spstr strCommand.txt,entn1.txt,"~",13 + spstr strCommand.txt,entn1.txt,"~",24 if(type1.txt=="delete"||type1.txt=="") { vis tEntity1,0 @@ -1028,20 +1020,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity1.txt,"~",14 + spstr strCommand.txt,bEntity1.txt,"~",25 vis bEntity1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 bEntity1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",16 + spstr strCommand.txt,tEntity1.txt,"~",27 vis tEntity1,1 } // get Type - spstr strCommand.txt,type2.txt,"~",18 + spstr strCommand.txt,type2.txt,"~",29 // get internal name - spstr strCommand.txt,entn2.txt,"~",19 + spstr strCommand.txt,entn2.txt,"~",30 if(type2.txt=="delete"||type2.txt=="") { vis tEntity2,0 @@ -1049,20 +1041,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity2.txt,"~",20 + spstr strCommand.txt,bEntity2.txt,"~",31 vis bEntity2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",21 + spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,sys0,0,0 bEntity2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",22 + spstr strCommand.txt,tEntity2.txt,"~",33 vis tEntity2,1 } // get Type - spstr strCommand.txt,type3.txt,"~",24 + spstr strCommand.txt,type3.txt,"~",35 // get internal name - spstr strCommand.txt,entn3.txt,"~",25 + spstr strCommand.txt,entn3.txt,"~",36 if(type3.txt=="delete"||type3.txt=="") { vis tEntity3,0 @@ -1070,20 +1062,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity3.txt,"~",26 + spstr strCommand.txt,bEntity3.txt,"~",37 vis bEntity3,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,sys0,0,0 bEntity3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,"~",28 + spstr strCommand.txt,tEntity3.txt,"~",39 vis tEntity3,1 } // get Type - spstr strCommand.txt,type4.txt,"~",30 + spstr strCommand.txt,type4.txt,"~",41 // get internal name - spstr strCommand.txt,entn4.txt,"~",31 + spstr strCommand.txt,entn4.txt,"~",42 if(type4.txt=="delete"||type4.txt=="") { vis tEntity4,0 @@ -1091,20 +1083,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity4.txt,"~",32 + spstr strCommand.txt,bEntity4.txt,"~",43 vis bEntity4,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",33 + spstr strCommand.txt,tTmp.txt,"~",44 covx tTmp.txt,sys0,0,0 bEntity4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,"~",34 + spstr strCommand.txt,tEntity4.txt,"~",45 vis tEntity4,1 } // get Type - spstr strCommand.txt,type5.txt,"~",36 + spstr strCommand.txt,type5.txt,"~",47 // get internal name - spstr strCommand.txt,entn5.txt,"~",37 + spstr strCommand.txt,entn5.txt,"~",48 if(type5.txt=="delete"||type5.txt=="") { vis tEntity5,0 @@ -1112,20 +1104,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity5.txt,"~",38 + spstr strCommand.txt,bEntity5.txt,"~",49 vis bEntity5,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",39 + spstr strCommand.txt,tTmp.txt,"~",50 covx tTmp.txt,sys0,0,0 bEntity5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,"~",40 + spstr strCommand.txt,tEntity5.txt,"~",51 vis tEntity5,1 } // get Type - spstr strCommand.txt,type6.txt,"~",42 + spstr strCommand.txt,type6.txt,"~",53 // get internal name - spstr strCommand.txt,entn6.txt,"~",43 + spstr strCommand.txt,entn6.txt,"~",54 if(type6.txt=="delete"||type6.txt=="") { vis tEntity6,0 @@ -1133,14 +1125,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity6.txt,"~",44 + spstr strCommand.txt,bEntity6.txt,"~",55 vis bEntity6,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",45 + spstr strCommand.txt,tTmp.txt,"~",56 covx tTmp.txt,sys0,0,0 bEntity6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,"~",46 + spstr strCommand.txt,tEntity6.txt,"~",57 vis tEntity6,1 } } @@ -1208,6 +1200,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index cfc75293..a29d2d83 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -57,6 +57,18 @@ Page cardPower } } +Variable (string) nent1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes Scope : local @@ -346,14 +358,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardPower," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -378,14 +383,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -555,63 +553,57 @@ Timer tmSerial { // command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6 spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } // icon color home - spstr strCommand.txt,tTmp.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,t1.pco,0,0 // icon home - spstr strCommand.txt,t1.txt,"~",4 + spstr strCommand.txt,t1.txt,"~",15 // text home - spstr strCommand.txt,tHome.txt,"~",5 + spstr strCommand.txt,tHome.txt,"~",16 // iconColor - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",17 covx tTmp.txt,t0Icon.pco,0,0 // icon - spstr strCommand.txt,t0Icon.txt,"~",7 + spstr strCommand.txt,t0Icon.txt,"~",18 // speed - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t0Speed.val,0,0 // lower text - spstr strCommand.txt,t0u.txt,"~",9 + spstr strCommand.txt,t0u.txt,"~",20 if(t0Icon.txt!="") { vis t0Icon,1 @@ -624,15 +616,15 @@ Timer tmSerial vis h0,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,t1Icon.pco,0,0 // icon - spstr strCommand.txt,t1Icon.txt,"~",11 + spstr strCommand.txt,t1Icon.txt,"~",22 // speed - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,t1Speed.val,0,0 // lower text - spstr strCommand.txt,t1u.txt,"~",13 + spstr strCommand.txt,t1u.txt,"~",24 if(t1Icon.txt!="") { vis t1Icon,1 @@ -645,15 +637,15 @@ Timer tmSerial vis h1,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,"~",25 covx tTmp.txt,t2Icon.pco,0,0 // icon - spstr strCommand.txt,t2Icon.txt,"~",15 + spstr strCommand.txt,t2Icon.txt,"~",26 // speed - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",27 covx tTmp.txt,t2Speed.val,0,0 // lower text - spstr strCommand.txt,t2u.txt,"~",17 + spstr strCommand.txt,t2u.txt,"~",28 if(t2Icon.txt!="") { vis t2Icon,1 @@ -666,15 +658,15 @@ Timer tmSerial vis h2,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",29 covx tTmp.txt,t3Icon.pco,0,0 // icon - spstr strCommand.txt,t3Icon.txt,"~",19 + spstr strCommand.txt,t3Icon.txt,"~",30 // speed - spstr strCommand.txt,tTmp.txt,"~",20 + spstr strCommand.txt,tTmp.txt,"~",31 covx tTmp.txt,t3Speed.val,0,0 // lower text - spstr strCommand.txt,t3u.txt,"~",21 + spstr strCommand.txt,t3u.txt,"~",32 if(t3Icon.txt!="") { vis t3Icon,1 @@ -687,15 +679,15 @@ Timer tmSerial vis h3,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",22 + spstr strCommand.txt,tTmp.txt,"~",33 covx tTmp.txt,t4Icon.pco,0,0 // icon - spstr strCommand.txt,t4Icon.txt,"~",23 + spstr strCommand.txt,t4Icon.txt,"~",34 // speed - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",35 covx tTmp.txt,t4Speed.val,0,0 // lower text - spstr strCommand.txt,t4u.txt,"~",25 + spstr strCommand.txt,t4u.txt,"~",36 if(t4Icon.txt!="") { vis t4Icon,1 @@ -708,15 +700,15 @@ Timer tmSerial vis h4,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",26 + spstr strCommand.txt,tTmp.txt,"~",37 covx tTmp.txt,t5Icon.pco,0,0 // icon - spstr strCommand.txt,t5Icon.txt,"~",27 + spstr strCommand.txt,t5Icon.txt,"~",38 // speed - spstr strCommand.txt,tTmp.txt,"~",28 + spstr strCommand.txt,tTmp.txt,"~",39 covx tTmp.txt,t5Speed.val,0,0 // lower text - spstr strCommand.txt,t5u.txt,"~",29 + spstr strCommand.txt,t5u.txt,"~",40 if(t5Icon.txt!="") { vis t5Icon,1 diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 9b3e879a..1b44aa31 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -70,11 +70,23 @@ Variable (string) entn2 Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) nent2 + Attributes + Scope : local + Text : + Max. Text Size: 50 + Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 275 + Max. Text Size: 400 Variable (string) tId Attributes @@ -187,14 +199,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardQR," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -219,14 +224,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -446,52 +444,46 @@ Timer tmSerial // command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2 //tHeading spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } //text qrcode - spstr strCommand.txt,vaQR.txt,"~",3 + spstr strCommand.txt,vaQR.txt,"~",14 // get Type - spstr strCommand.txt,type1.txt,"~",4 + spstr strCommand.txt,type1.txt,"~",15 // get internal name - spstr strCommand.txt,entn1.txt,"~",5 + spstr strCommand.txt,entn1.txt,"~",16 if(type1.txt=="delete"||type1.txt=="") { vis btOnOff1,0 @@ -501,14 +493,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon1.txt,"~",6 + spstr strCommand.txt,tIcon1.txt,"~",17 vis tIcon1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",18 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",8 + spstr strCommand.txt,tEntity1.txt,"~",19 vis tEntity1,1 } if(type1.txt=="light") @@ -516,7 +508,7 @@ Timer tmSerial vis btOnOff1,1 vis bText1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -525,7 +517,7 @@ Timer tmSerial vis btOnOff1,1 vis bText1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -537,7 +529,7 @@ Timer tmSerial bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,"~",9 + spstr strCommand.txt,bText1.txt,"~",20 } if(type1.txt=="button") { @@ -547,12 +539,12 @@ Timer tmSerial bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,"~",9 + spstr strCommand.txt,bText1.txt,"~",20 } // get Type - spstr strCommand.txt,type2.txt,"~",10 + spstr strCommand.txt,type2.txt,"~",21 // get internal name - spstr strCommand.txt,entn2.txt,"~",11 + spstr strCommand.txt,entn2.txt,"~",22 if(type2.txt=="delete"||type2.txt=="") { vis btOnOff2,0 @@ -562,14 +554,14 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tIcon2.txt,"~",12 + spstr strCommand.txt,tIcon2.txt,"~",23 vis tIcon2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",13 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",14 + spstr strCommand.txt,tEntity2.txt,"~",25 vis tEntity2,1 } if(type2.txt=="light") @@ -577,7 +569,7 @@ Timer tmSerial vis btOnOff2,1 vis bText2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -586,7 +578,7 @@ Timer tmSerial vis btOnOff2,1 vis bText2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -598,7 +590,7 @@ Timer tmSerial bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",15 + spstr strCommand.txt,bText2.txt,"~",26 } if(type2.txt=="button") { @@ -608,7 +600,7 @@ Timer tmSerial bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",15 + spstr strCommand.txt,bText2.txt,"~",26 } if(type2.txt=="delete"||type2.txt=="") { diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index bbb08974..cd7bba39 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -63,6 +63,18 @@ Variable (string) entn Text : Max. Text Size: 80 +Variable (string) nent1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes Scope : local @@ -294,14 +306,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo," - if(bNext.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -326,14 +331,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -835,64 +833,58 @@ Timer tmSerial { //heading spstr strCommand.txt,tHeading.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="0") + // navigation icon left + spstr strCommand.txt,tTmp.txt,"~",2 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bPrev,0 - tsw mSwipePrev,0 - tsw mSwipeUp,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent1.txt,"~",3 + // change icon + spstr strCommand.txt,bPrev.txt,"~",4 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,sys0,0,0 + bPrev.pco=sys0 vis bPrev,1 - tsw mSwipePrev,1 - tsw mSwipeUp,0 - bPrev.txt="" } - if(tTmp.txt=="2") - { - vis bPrev,1 - tsw mSwipePrev,0 - tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") + // navigation icon right + spstr strCommand.txt,tTmp.txt,"~",8 //type + if(tTmp.txt=="delete"||tTmp.txt=="") { vis bNext,0 - tsw mSwipeNext,0 - } - if(tTmp.txt=="1") + }else { + // get internal name + spstr strCommand.txt,nent2.txt,"~",9 + // change icon + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + bNext.pco=sys0 vis bNext,1 - tsw mSwipeNext,1 - bNext.txt="" - } - if(tTmp.txt=="2") - { - vis bNext,1 - bNext.txt="" } //entity name - spstr strCommand.txt,entn.txt,"~",3 + spstr strCommand.txt,entn.txt,"~",14 //currentTemp - spstr strCommand.txt,tCurTemp.txt,"~",4 + spstr strCommand.txt,tCurTemp.txt,"~",15 //dstTemp - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",16 covx tTmp.txt,xTempDest1.val,0,0 xTempDest.val=xTempDest1.val //status - spstr strCommand.txt,tStatus.txt,"~",6 + spstr strCommand.txt,tStatus.txt,"~",17 //minTemp - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",18 covx tTmp.txt,xTempMin1.val,0,0 //maxTemp - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,xTempMax1.val,0,0 //tempStep - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 @@ -904,137 +896,137 @@ Timer tmSerial vis bt6,0 vis bt7,0 //bt0 - spstr strCommand.txt,bt0.txt,"~",10 + spstr strCommand.txt,bt0.txt,"~",21 if(bt0.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,bt0.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,bt0.val,0,0 // save action - spstr strCommand.txt,va0.txt,"~",13 + spstr strCommand.txt,va0.txt,"~",24 //enable vis bt0,1 } //bt1 - spstr strCommand.txt,bt1.txt,"~",14 + spstr strCommand.txt,bt1.txt,"~",25 if(bt1.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,bt1.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",27 covx tTmp.txt,bt1.val,0,0 // save action - spstr strCommand.txt,va1.txt,"~",17 + spstr strCommand.txt,va1.txt,"~",28 //enable vis bt1,1 } //bt2 - spstr strCommand.txt,bt2.txt,"~",18 + spstr strCommand.txt,bt2.txt,"~",29 if(bt2.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",30 covx tTmp.txt,bt2.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",20 + spstr strCommand.txt,tTmp.txt,"~",31 covx tTmp.txt,bt2.val,0,0 // save action - spstr strCommand.txt,va2.txt,"~",21 + spstr strCommand.txt,va2.txt,"~",32 //enable vis bt2,1 } //bt3 - spstr strCommand.txt,bt3.txt,"~",22 + spstr strCommand.txt,bt3.txt,"~",33 if(bt3.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,bt3.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",35 covx tTmp.txt,bt3.val,0,0 // save action - spstr strCommand.txt,va3.txt,"~",25 + spstr strCommand.txt,va3.txt,"~",36 //enable vis bt3,1 } //bt4 - spstr strCommand.txt,bt4.txt,"~",26 + spstr strCommand.txt,bt4.txt,"~",37 if(bt4.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,bt4.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",28 + spstr strCommand.txt,tTmp.txt,"~",39 covx tTmp.txt,bt4.val,0,0 // save action - spstr strCommand.txt,va4.txt,"~",29 + spstr strCommand.txt,va4.txt,"~",40 //enable vis bt4,1 } //bt5 - spstr strCommand.txt,bt5.txt,"~",30 + spstr strCommand.txt,bt5.txt,"~",41 if(bt5.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,"~",42 covx tTmp.txt,bt5.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",32 + spstr strCommand.txt,tTmp.txt,"~",43 covx tTmp.txt,bt5.val,0,0 // save action - spstr strCommand.txt,va5.txt,"~",33 + spstr strCommand.txt,va5.txt,"~",44 //enable vis bt5,1 } //bt6 - spstr strCommand.txt,bt6.txt,"~",34 + spstr strCommand.txt,bt6.txt,"~",45 if(bt6.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",35 + spstr strCommand.txt,tTmp.txt,"~",46 covx tTmp.txt,bt6.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",36 + spstr strCommand.txt,tTmp.txt,"~",47 covx tTmp.txt,bt6.val,0,0 // save action - spstr strCommand.txt,va6.txt,"~",37 + spstr strCommand.txt,va6.txt,"~",48 //enable vis bt6,1 } //bt7 - spstr strCommand.txt,bt7.txt,"~",38 + spstr strCommand.txt,bt7.txt,"~",49 if(bt7.txt!="") { // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",39 + spstr strCommand.txt,tTmp.txt,"~",50 covx tTmp.txt,bt7.pco2,0,0 // set state - spstr strCommand.txt,tTmp.txt,"~",40 + spstr strCommand.txt,tTmp.txt,"~",51 covx tTmp.txt,bt7.val,0,0 // save action - spstr strCommand.txt,va7.txt,"~",41 + spstr strCommand.txt,va7.txt,"~",52 //enable vis bt7,1 } //Text tCurTempLbl - spstr strCommand.txt,tCurTempLbl.txt,"~",42 + spstr strCommand.txt,tCurTempLbl.txt,"~",53 //Text tStateLbl - spstr strCommand.txt,tStateLbl.txt,"~",43 + spstr strCommand.txt,tStateLbl.txt,"~",54 //Text tALbl - //spstr strCommand.txt,tALbl.txt,"~",44 + //spstr strCommand.txt,tALbl.txt,"~",55 //Text tCF - spstr strCommand.txt,tCF.txt,"~",45 + spstr strCommand.txt,tCF.txt,"~",56 tCF1.txt=tCF.txt tCF2.txt=tCF.txt //Second Temperature - spstr strCommand.txt,tTmp.txt,"~",46 + spstr strCommand.txt,tTmp.txt,"~",57 if(tTmp.txt!="") { covx tTmp.txt,xTempDest2.val,0,0 @@ -1052,8 +1044,8 @@ Timer tmSerial vis tCF2,1 } //Show btDetail - spstr strCommand.txt,tTmp.txt,"~",47 - if(tTmp.txt=="1") + spstr strCommand.txt,tTmp.txt,"~",58 + if(tTmp.txt!="1") { vis btDetail,1 }else