diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 17b7b100..a20f44cb 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -73,7 +73,7 @@ │ Enabled : yes │ --- HMI/n2t-out/cardMedia.txt ├── +++ HMI/US/landscape/n2t-out/cardMedia.txt -│ @@ -15,15 +15,14 @@ +│ @@ -15,23 +15,16 @@ │ dim=dimValueNormal │ vis p0,0 │ vis tSend,0 @@ -84,12 +84,20 @@ │ - vis tShuffle,0 │ vis bPrev,0 │ vis bNext,0 +│ - vis bEntity1,0 +│ - vis bEntity2,0 +│ - vis bEntity3,0 +│ - vis bEntity4,0 +│ - vis bEntity5,0 +│ - vis bEntity6,0 │ cardMedia.bco=defaultBcoColor │ for(sys0=0;sys0<34;sys0++) │ { │ if(b[sys0].type==98||b[sys0].type==116) │ { -│ @@ -40,140 +39,32 @@ +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ @@ -46,158 +39,32 @@ │ │ Variable (string) entn │ Attributes @@ -127,6 +135,12 @@ │ - Text : │ - Max. Text Size: 80 │ - +│ -Variable (string) entn6 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - │ Variable (string) strCommand │ Attributes │ Scope : local @@ -163,6 +177,12 @@ │ - Text : │ - Max. Text Size: 20 │ - +│ -Variable (string) tEntity6 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 20 +│ - │ -Variable (string) tId │ - Attributes │ - Scope : local @@ -211,6 +231,12 @@ │ - Text : │ - Max. Text Size: 10 │ - +│ -Variable (string) type6 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 10 +│ - │ Variable (string) vaMenu │ Attributes │ Scope : local @@ -230,7 +256,7 @@ │ Max. Text Size: 400 │ │ Variable (int32) vaSpeakerPos -│ @@ -295,14 +186,24 @@ +│ @@ -319,14 +186,24 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -255,7 +281,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -324,14 +225,36 @@ +│ @@ -348,14 +225,36 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -292,14 +318,42 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -372,14 +295,24 @@ -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ } -│ +│ @@ -368,14 +267,52 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 40 +│ +│ +Text tIcon +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : +│ + Max. Text Size : 10 +│ + +│ + Events +│ + Touch Release Event +│ + if(vaMenu.txt!="") +│ + { +│ + tSend.txt="event,buttonPress2,"+vaMenu.txt+",button" +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + } +│ + │ +Text tId │ + Attributes │ + Scope : local @@ -317,7 +371,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -411,31 +344,31 @@ +│ @@ -407,31 +344,31 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -353,7 +407,7 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ @@ -450,14 +383,24 @@ +│ @@ -446,14 +383,24 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled @@ -378,7 +432,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -488,219 +431,14 @@ +│ @@ -484,260 +431,14 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -591,6 +645,47 @@ │ - prints tSend.txt,0 │ - prints crcval,2 │ - +│ -Button bEntity6 +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - State : unpressed +│ - Text :  +│ - Max. Text Size : 10 +│ - +│ - Events +│ - Touch Press Event +│ - tmLP.en=1 +│ - tTmp.txt=type6.txt +│ - pageIcons.tTmp1.txt=tEntity6.txt +│ - pageIcons.tTmp2.txt=entn6.txt +│ - pageIcons.tTmp3.txt=bEntity6.txt +│ - if(type6.txt=="shutter") +│ - { +│ - page popupShutter +│ - } +│ - if(type6.txt=="input_sel") +│ - { +│ - page popupInSel +│ - } +│ - +│ - Touch Release Event +│ - tmLP.en=0 +│ - tSend.txt="event,buttonPress2,"+entn6.txt+",button" +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 +│ - │ Button bNext │ Attributes │ Scope : local @@ -598,7 +693,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -800,31 +538,14 @@ +│ @@ -837,31 +538,14 @@ │ Period (ms): 100 │ Enabled : no │ @@ -630,7 +725,7 @@ │ Enabled : yes │ │ Events -│ @@ -870,15 +591,15 @@ +│ @@ -907,15 +591,15 @@ │ // here is the location where acual code should be │ // write command to variable strCommand │ ucopy strCommand.txt,4,payloadLength-5,0 @@ -647,14 +742,50 @@ │ if(tTmp.txt=="0") │ { │ vis bPrev,0 -│ @@ -944,144 +665,81 @@ +│ @@ -951,183 +635,111 @@ +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ bNext.txt="" +│ } +│ //entity name +│ spstr strCommand.txt,entn.txt,"~",3 +│ + //icon +│ + spstr strCommand.txt,tIcon.txt,"~",4 +│ + //icon farbe +│ + spstr strCommand.txt,tTmp.txt,"~",5 +│ + if(tTmp.txt!="") +│ + { +│ + covx tTmp.txt,tIcon.pco,0,0 +│ + } +│ //title +│ - spstr strCommand.txt,tTitle.txt,"~",4 +│ + spstr strCommand.txt,tTitle.txt,"~",6 +│ //title farbe +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ + spstr strCommand.txt,tTmp.txt,"~",7 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,tTitle.pco,0,0 +│ } +│ //author +│ - spstr strCommand.txt,tAuthor.txt,"~",6 +│ + spstr strCommand.txt,tAuthor.txt,"~",8 +│ //author farbe +│ - spstr strCommand.txt,tTmp.txt,"~",7 +│ + spstr strCommand.txt,tTmp.txt,"~",9 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,tAuthor.pco,0,0 │ } │ //volume -│ spstr strCommand.txt,tTmp.txt,"~",10 +│ - spstr strCommand.txt,tTmp.txt,"~",8 +│ + spstr strCommand.txt,tTmp.txt,"~",10 │ covx tTmp.txt,sys0,0,0 │ hVolume.val=sys0 │ //icon -│ spstr strCommand.txt,tPlayPause.txt,"~",11 +│ - spstr strCommand.txt,tPlayPause.txt,"~",9 +│ + spstr strCommand.txt,tPlayPause.txt,"~",11 │ + //speaker current │ + spstr strCommand.txt,tSpeaker.txt,"~",12 │ + if(tSpeaker.txt!="") @@ -672,7 +803,7 @@ │ + } │ + vaSpeakerPos.val=0 │ // on off button -│ - spstr strCommand.txt,tTmp.txt,"~",12 +│ - spstr strCommand.txt,tTmp.txt,"~",10 │ + spstr strCommand.txt,tTmp.txt,"~",14 │ if(tTmp.txt=="disable") │ { @@ -682,16 +813,13 @@ │ vis t5,1 │ covx tTmp.txt,t5.pco,0,0 │ } -│ - //tIconBtnEntityType -│ - spstr strCommand.txt,vaMenu.txt,"~",13 -│ //tIconBtnEntityName -│ - spstr strCommand.txt,vaMenu.txt,"~",14 │ - // shuffel btn -│ - spstr strCommand.txt,tTmp.txt,"~",15 +│ - spstr strCommand.txt,tTmp.txt,"~",11 │ - if(tTmp.txt=="disable") │ - { │ - vis tShuffle,0 │ - }else +│ + //tIconBtnEntityName │ + spstr strCommand.txt,vaMenu.txt,"~",15 │ + } │ + if(tInstruction.txt=="time") @@ -722,9 +850,9 @@ │ + covx tTmp.txt,defaultBcoColor,0,0 │ } │ - // get Type -│ - spstr strCommand.txt,type1.txt,"~",16 +│ - spstr strCommand.txt,type1.txt,"~",12 │ - // get internal name -│ - spstr strCommand.txt,entn1.txt,"~",17 +│ - spstr strCommand.txt,entn1.txt,"~",13 │ - if(type1.txt=="delete"||type1.txt=="") │ - { │ - vis tEntity1,0 @@ -732,20 +860,20 @@ │ - }else │ - { │ - // change icon -│ - spstr strCommand.txt,bEntity1.txt,"~",18 +│ - spstr strCommand.txt,bEntity1.txt,"~",14 │ - vis bEntity1,1 │ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",19 +│ - spstr strCommand.txt,tTmp.txt,"~",15 │ - covx tTmp.txt,sys0,0,0 │ - bEntity1.pco=sys0 │ - // set name -│ - spstr strCommand.txt,tEntity1.txt,"~",20 +│ - spstr strCommand.txt,tEntity1.txt,"~",16 │ - vis tEntity1,1 │ - } │ - // get Type -│ - spstr strCommand.txt,type2.txt,"~",22 +│ - spstr strCommand.txt,type2.txt,"~",18 │ - // get internal name -│ - spstr strCommand.txt,entn2.txt,"~",23 +│ - spstr strCommand.txt,entn2.txt,"~",19 │ - if(type2.txt=="delete"||type2.txt=="") │ - { │ - vis tEntity2,0 @@ -753,20 +881,20 @@ │ - }else │ - { │ - // change icon -│ - spstr strCommand.txt,bEntity2.txt,"~",24 +│ - spstr strCommand.txt,bEntity2.txt,"~",20 │ - vis bEntity2,1 │ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",25 +│ - spstr strCommand.txt,tTmp.txt,"~",21 │ - covx tTmp.txt,sys0,0,0 │ - bEntity2.pco=sys0 │ - // set name -│ - spstr strCommand.txt,tEntity2.txt,"~",26 +│ - spstr strCommand.txt,tEntity2.txt,"~",22 │ - vis tEntity2,1 │ - } │ - // get Type -│ - spstr strCommand.txt,type3.txt,"~",28 +│ - spstr strCommand.txt,type3.txt,"~",24 │ - // get internal name -│ - spstr strCommand.txt,entn3.txt,"~",29 +│ - spstr strCommand.txt,entn3.txt,"~",25 │ - if(type3.txt=="delete"||type3.txt=="") │ - { │ - vis tEntity3,0 @@ -774,20 +902,20 @@ │ - }else │ - { │ - // change icon -│ - spstr strCommand.txt,bEntity3.txt,"~",30 +│ - spstr strCommand.txt,bEntity3.txt,"~",26 │ - vis bEntity3,1 │ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",31 +│ - spstr strCommand.txt,tTmp.txt,"~",27 │ - covx tTmp.txt,sys0,0,0 │ - bEntity3.pco=sys0 │ - // set name -│ - spstr strCommand.txt,tEntity3.txt,"~",32 +│ - spstr strCommand.txt,tEntity3.txt,"~",28 │ - vis tEntity3,1 │ - } │ - // get Type -│ - spstr strCommand.txt,type4.txt,"~",34 +│ - spstr strCommand.txt,type4.txt,"~",30 │ - // get internal name -│ - spstr strCommand.txt,entn4.txt,"~",35 +│ - spstr strCommand.txt,entn4.txt,"~",31 │ - if(type4.txt=="delete"||type4.txt=="") │ - { │ - vis tEntity4,0 @@ -795,39 +923,60 @@ │ - }else │ - { │ - // change icon -│ - spstr strCommand.txt,bEntity4.txt,"~",36 +│ - spstr strCommand.txt,bEntity4.txt,"~",32 │ - vis bEntity4,1 │ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",37 +│ - spstr strCommand.txt,tTmp.txt,"~",33 │ - covx tTmp.txt,sys0,0,0 │ - bEntity4.pco=sys0 │ - // set name -│ - spstr strCommand.txt,tEntity4.txt,"~",38 +│ - spstr strCommand.txt,tEntity4.txt,"~",34 │ - vis tEntity4,1 │ - } │ - // get Type -│ - spstr strCommand.txt,type5.txt,"~",40 +│ - spstr strCommand.txt,type5.txt,"~",36 │ - // get internal name -│ - spstr strCommand.txt,entn5.txt,"~",41 +│ - 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,"~",38 +│ - vis bEntity5,1 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",39 +│ - covx tTmp.txt,sys0,0,0 +│ - bEntity5.pco=sys0 +│ - // set name +│ - spstr strCommand.txt,tEntity5.txt,"~",40 +│ - vis tEntity5,1 +│ - } +│ - // get Type +│ - spstr strCommand.txt,type6.txt,"~",42 +│ - // get internal name +│ - spstr strCommand.txt,entn6.txt,"~",43 +│ - if(type6.txt=="delete"||type6.txt=="") +│ - { +│ - vis tEntity6,0 +│ - vis bEntity6,0 +│ - }else │ + // get font color │ + spstr strCommand.txt,tTmp.txt,"~",4 │ + if(tTmp.txt!="") │ { │ - // change icon -│ - spstr strCommand.txt,bEntity5.txt,"~",42 -│ - vis bEntity5,1 +│ - spstr strCommand.txt,bEntity6.txt,"~",44 +│ - vis bEntity6,1 │ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",43 +│ - spstr strCommand.txt,tTmp.txt,"~",45 │ - covx tTmp.txt,sys0,0,0 -│ - bEntity5.pco=sys0 +│ - bEntity6.pco=sys0 │ - // set name -│ - spstr strCommand.txt,tEntity5.txt,"~",44 -│ - vis tEntity5,1 +│ - spstr strCommand.txt,tEntity6.txt,"~",46 +│ - vis tEntity6,1 │ + covx tTmp.txt,defaultFontColor,0,0 │ } │ } @@ -844,7 +993,7 @@ │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 │ //save second arg if there's one -│ @@ -1138,63 +796,38 @@ +│ @@ -1184,63 +796,38 @@ │ { │ page cardQR │ } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 0bc15884..73cc77ce 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -698,7 +698,7 @@ │ Enabled : yes │ --- HMI/n2t-out/cardMedia.txt ├── +++ HMI/US/portrait/n2t-out/cardMedia.txt -│ @@ -15,15 +15,14 @@ +│ @@ -15,23 +15,16 @@ │ dim=dimValueNormal │ vis p0,0 │ vis tSend,0 @@ -709,12 +709,20 @@ │ - vis tShuffle,0 │ vis bPrev,0 │ vis bNext,0 +│ - vis bEntity1,0 +│ - vis bEntity2,0 +│ - vis bEntity3,0 +│ - vis bEntity4,0 +│ - vis bEntity5,0 +│ - vis bEntity6,0 │ cardMedia.bco=defaultBcoColor │ for(sys0=0;sys0<34;sys0++) │ { │ if(b[sys0].type==98||b[sys0].type==116) │ { -│ @@ -40,140 +39,32 @@ +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ @@ -46,158 +39,32 @@ │ │ Variable (string) entn │ Attributes @@ -752,6 +760,12 @@ │ - Text : │ - Max. Text Size: 80 │ - +│ -Variable (string) entn6 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ - │ Variable (string) strCommand │ Attributes │ Scope : local @@ -788,6 +802,12 @@ │ - Text : │ - Max. Text Size: 20 │ - +│ -Variable (string) tEntity6 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 20 +│ - │ -Variable (string) tId │ - Attributes │ - Scope : local @@ -836,6 +856,12 @@ │ - Text : │ - Max. Text Size: 10 │ - +│ -Variable (string) type6 +│ - Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 10 +│ - │ Variable (string) vaMenu │ Attributes │ Scope : local @@ -855,7 +881,7 @@ │ Max. Text Size: 400 │ │ Variable (int32) vaSpeakerPos -│ @@ -295,14 +186,24 @@ +│ @@ -319,14 +186,24 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -880,7 +906,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -324,14 +225,36 @@ +│ @@ -348,14 +225,36 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -917,14 +943,42 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -372,14 +295,24 @@ -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ } -│ +│ @@ -368,14 +267,52 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 40 +│ +│ +Text tIcon +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : +│ + Max. Text Size : 10 +│ + +│ + Events +│ + Touch Release Event +│ + if(vaMenu.txt!="") +│ + { +│ + tSend.txt="event,buttonPress2,"+vaMenu.txt+",button" +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + } +│ + │ +Text tId │ + Attributes │ + Scope : local @@ -942,7 +996,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -411,31 +344,31 @@ +│ @@ -407,31 +344,31 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -978,7 +1032,7 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ @@ -450,14 +383,24 @@ +│ @@ -446,14 +383,24 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled @@ -1003,7 +1057,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -488,219 +431,14 @@ +│ @@ -484,260 +431,14 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -1216,6 +1270,47 @@ │ - prints tSend.txt,0 │ - prints crcval,2 │ - +│ -Button bEntity6 +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - State : unpressed +│ - Text :  +│ - Max. Text Size : 10 +│ - +│ - Events +│ - Touch Press Event +│ - tmLP.en=1 +│ - tTmp.txt=type6.txt +│ - pageIcons.tTmp1.txt=tEntity6.txt +│ - pageIcons.tTmp2.txt=entn6.txt +│ - pageIcons.tTmp3.txt=bEntity6.txt +│ - if(type6.txt=="shutter") +│ - { +│ - page popupShutter +│ - } +│ - if(type6.txt=="input_sel") +│ - { +│ - page popupInSel +│ - } +│ - +│ - Touch Release Event +│ - tmLP.en=0 +│ - tSend.txt="event,buttonPress2,"+entn6.txt+",button" +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 +│ - │ Button bNext │ Attributes │ Scope : local @@ -1223,7 +1318,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -800,31 +538,14 @@ +│ @@ -837,31 +538,14 @@ │ Period (ms): 100 │ Enabled : no │ @@ -1255,7 +1350,7 @@ │ Enabled : yes │ │ Events -│ @@ -870,15 +591,15 @@ +│ @@ -907,15 +591,15 @@ │ // here is the location where acual code should be │ // write command to variable strCommand │ ucopy strCommand.txt,4,payloadLength-5,0 @@ -1272,14 +1367,50 @@ │ if(tTmp.txt=="0") │ { │ vis bPrev,0 -│ @@ -944,144 +665,81 @@ +│ @@ -951,183 +635,111 @@ +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ bNext.txt="" +│ } +│ //entity name +│ spstr strCommand.txt,entn.txt,"~",3 +│ + //icon +│ + spstr strCommand.txt,tIcon.txt,"~",4 +│ + //icon farbe +│ + spstr strCommand.txt,tTmp.txt,"~",5 +│ + if(tTmp.txt!="") +│ + { +│ + covx tTmp.txt,tIcon.pco,0,0 +│ + } +│ //title +│ - spstr strCommand.txt,tTitle.txt,"~",4 +│ + spstr strCommand.txt,tTitle.txt,"~",6 +│ //title farbe +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ + spstr strCommand.txt,tTmp.txt,"~",7 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,tTitle.pco,0,0 +│ } +│ //author +│ - spstr strCommand.txt,tAuthor.txt,"~",6 +│ + spstr strCommand.txt,tAuthor.txt,"~",8 +│ //author farbe +│ - spstr strCommand.txt,tTmp.txt,"~",7 +│ + spstr strCommand.txt,tTmp.txt,"~",9 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,tAuthor.pco,0,0 │ } │ //volume -│ spstr strCommand.txt,tTmp.txt,"~",10 +│ - spstr strCommand.txt,tTmp.txt,"~",8 +│ + spstr strCommand.txt,tTmp.txt,"~",10 │ covx tTmp.txt,sys0,0,0 │ hVolume.val=sys0 │ //icon -│ spstr strCommand.txt,tPlayPause.txt,"~",11 +│ - spstr strCommand.txt,tPlayPause.txt,"~",9 +│ + spstr strCommand.txt,tPlayPause.txt,"~",11 │ + //speaker current │ + spstr strCommand.txt,tSpeaker.txt,"~",12 │ + if(tSpeaker.txt!="") @@ -1297,7 +1428,7 @@ │ + } │ + vaSpeakerPos.val=0 │ // on off button -│ - spstr strCommand.txt,tTmp.txt,"~",12 +│ - spstr strCommand.txt,tTmp.txt,"~",10 │ + spstr strCommand.txt,tTmp.txt,"~",14 │ if(tTmp.txt=="disable") │ { @@ -1307,16 +1438,13 @@ │ vis t5,1 │ covx tTmp.txt,t5.pco,0,0 │ } -│ - //tIconBtnEntityType -│ - spstr strCommand.txt,vaMenu.txt,"~",13 -│ //tIconBtnEntityName -│ - spstr strCommand.txt,vaMenu.txt,"~",14 │ - // shuffel btn -│ - spstr strCommand.txt,tTmp.txt,"~",15 +│ - spstr strCommand.txt,tTmp.txt,"~",11 │ - if(tTmp.txt=="disable") │ - { │ - vis tShuffle,0 │ - }else +│ + //tIconBtnEntityName │ + spstr strCommand.txt,vaMenu.txt,"~",15 │ + } │ + if(tInstruction.txt=="time") @@ -1347,9 +1475,9 @@ │ + covx tTmp.txt,defaultBcoColor,0,0 │ } │ - // get Type -│ - spstr strCommand.txt,type1.txt,"~",16 +│ - spstr strCommand.txt,type1.txt,"~",12 │ - // get internal name -│ - spstr strCommand.txt,entn1.txt,"~",17 +│ - spstr strCommand.txt,entn1.txt,"~",13 │ - if(type1.txt=="delete"||type1.txt=="") │ - { │ - vis tEntity1,0 @@ -1357,20 +1485,20 @@ │ - }else │ - { │ - // change icon -│ - spstr strCommand.txt,bEntity1.txt,"~",18 +│ - spstr strCommand.txt,bEntity1.txt,"~",14 │ - vis bEntity1,1 │ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",19 +│ - spstr strCommand.txt,tTmp.txt,"~",15 │ - covx tTmp.txt,sys0,0,0 │ - bEntity1.pco=sys0 │ - // set name -│ - spstr strCommand.txt,tEntity1.txt,"~",20 +│ - spstr strCommand.txt,tEntity1.txt,"~",16 │ - vis tEntity1,1 │ - } │ - // get Type -│ - spstr strCommand.txt,type2.txt,"~",22 +│ - spstr strCommand.txt,type2.txt,"~",18 │ - // get internal name -│ - spstr strCommand.txt,entn2.txt,"~",23 +│ - spstr strCommand.txt,entn2.txt,"~",19 │ - if(type2.txt=="delete"||type2.txt=="") │ - { │ - vis tEntity2,0 @@ -1378,20 +1506,20 @@ │ - }else │ - { │ - // change icon -│ - spstr strCommand.txt,bEntity2.txt,"~",24 +│ - spstr strCommand.txt,bEntity2.txt,"~",20 │ - vis bEntity2,1 │ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",25 +│ - spstr strCommand.txt,tTmp.txt,"~",21 │ - covx tTmp.txt,sys0,0,0 │ - bEntity2.pco=sys0 │ - // set name -│ - spstr strCommand.txt,tEntity2.txt,"~",26 +│ - spstr strCommand.txt,tEntity2.txt,"~",22 │ - vis tEntity2,1 │ - } │ - // get Type -│ - spstr strCommand.txt,type3.txt,"~",28 +│ - spstr strCommand.txt,type3.txt,"~",24 │ - // get internal name -│ - spstr strCommand.txt,entn3.txt,"~",29 +│ - spstr strCommand.txt,entn3.txt,"~",25 │ - if(type3.txt=="delete"||type3.txt=="") │ - { │ - vis tEntity3,0 @@ -1399,20 +1527,20 @@ │ - }else │ - { │ - // change icon -│ - spstr strCommand.txt,bEntity3.txt,"~",30 +│ - spstr strCommand.txt,bEntity3.txt,"~",26 │ - vis bEntity3,1 │ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",31 +│ - spstr strCommand.txt,tTmp.txt,"~",27 │ - covx tTmp.txt,sys0,0,0 │ - bEntity3.pco=sys0 │ - // set name -│ - spstr strCommand.txt,tEntity3.txt,"~",32 +│ - spstr strCommand.txt,tEntity3.txt,"~",28 │ - vis tEntity3,1 │ - } │ - // get Type -│ - spstr strCommand.txt,type4.txt,"~",34 +│ - spstr strCommand.txt,type4.txt,"~",30 │ - // get internal name -│ - spstr strCommand.txt,entn4.txt,"~",35 +│ - spstr strCommand.txt,entn4.txt,"~",31 │ - if(type4.txt=="delete"||type4.txt=="") │ - { │ - vis tEntity4,0 @@ -1420,39 +1548,60 @@ │ - }else │ - { │ - // change icon -│ - spstr strCommand.txt,bEntity4.txt,"~",36 +│ - spstr strCommand.txt,bEntity4.txt,"~",32 │ - vis bEntity4,1 │ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",37 +│ - spstr strCommand.txt,tTmp.txt,"~",33 │ - covx tTmp.txt,sys0,0,0 │ - bEntity4.pco=sys0 │ - // set name -│ - spstr strCommand.txt,tEntity4.txt,"~",38 +│ - spstr strCommand.txt,tEntity4.txt,"~",34 │ - vis tEntity4,1 │ - } │ - // get Type -│ - spstr strCommand.txt,type5.txt,"~",40 +│ - spstr strCommand.txt,type5.txt,"~",36 │ - // get internal name -│ - spstr strCommand.txt,entn5.txt,"~",41 +│ - 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,"~",38 +│ - vis bEntity5,1 +│ - // change icon color +│ - spstr strCommand.txt,tTmp.txt,"~",39 +│ - covx tTmp.txt,sys0,0,0 +│ - bEntity5.pco=sys0 +│ - // set name +│ - spstr strCommand.txt,tEntity5.txt,"~",40 +│ - vis tEntity5,1 +│ - } +│ - // get Type +│ - spstr strCommand.txt,type6.txt,"~",42 +│ - // get internal name +│ - spstr strCommand.txt,entn6.txt,"~",43 +│ - if(type6.txt=="delete"||type6.txt=="") +│ - { +│ - vis tEntity6,0 +│ - vis bEntity6,0 +│ - }else │ + // get font color │ + spstr strCommand.txt,tTmp.txt,"~",4 │ + if(tTmp.txt!="") │ { │ - // change icon -│ - spstr strCommand.txt,bEntity5.txt,"~",42 -│ - vis bEntity5,1 +│ - spstr strCommand.txt,bEntity6.txt,"~",44 +│ - vis bEntity6,1 │ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",43 +│ - spstr strCommand.txt,tTmp.txt,"~",45 │ - covx tTmp.txt,sys0,0,0 -│ - bEntity5.pco=sys0 +│ - bEntity6.pco=sys0 │ - // set name -│ - spstr strCommand.txt,tEntity5.txt,"~",44 -│ - vis tEntity5,1 +│ - spstr strCommand.txt,tEntity6.txt,"~",46 +│ - vis tEntity6,1 │ + covx tTmp.txt,defaultFontColor,0,0 │ } │ } @@ -1469,7 +1618,7 @@ │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 │ //save second arg if there's one -│ @@ -1138,63 +796,38 @@ +│ @@ -1184,63 +796,38 @@ │ { │ page cardQR │ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index faf6fb7e..1714102d 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-06 18:05:21.168366598 +0000 ++++ /dev/fd/62 2022-12-06 20:06:24.733697158 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt @@ -88,7 +88,7 @@ + Enabled : yes +I/n2t-out/cardMedia.txt ++ HMI/US/portrait/n2t-out/cardMedia.txt -+5 +15,14 @@ ++3 +15,16 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 @@ -99,12 +99,20 @@ + vis tShuffle,0 + vis bPrev,0 + vis bNext,0 ++ vis bEntity1,0 ++ vis bEntity2,0 ++ vis bEntity3,0 ++ vis bEntity4,0 ++ vis bEntity5,0 ++ vis bEntity6,0 + cardMedia.bco=defaultBcoColor + for(sys0=0;sys0<34;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { -+40 +39,32 @@ ++ b[sys0].bco=defaultBcoColor ++ b[sys0].pco=defaultFontColor ++58 +39,32 @@ + +e (string) entn +ributes @@ -142,6 +150,12 @@ + Text : + Max. Text Size: 80 + ++e (string) entn6 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ +e (string) strCommand +ributes + Scope : local @@ -178,6 +192,12 @@ + Text : + Max. Text Size: 20 + ++e (string) tEntity6 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 20 ++ +e (string) tId +ributes + Scope : local @@ -226,6 +246,12 @@ + Text : + Max. Text Size: 10 + ++e (string) type6 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 10 ++ +e (string) vaMenu +ributes + Scope : local @@ -307,7 +333,35 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none -+14 +295,24 @@ ++14 +267,52 @@ ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 40 ++ ++con ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++nts ++ Touch Release Event ++ if(vaMenu.txt!="") ++ { ++ tSend.txt="event,buttonPress2,"+vaMenu.txt+",button" ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 @@ -393,7 +447,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + -+219 +431,14 @@ ++260 +431,14 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -606,6 +660,47 @@ + prints tSend.txt,0 + prints crcval,2 + ++bEntity6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tmLP.en=1 ++ tTmp.txt=type6.txt ++ pageIcons.tTmp1.txt=tEntity6.txt ++ pageIcons.tTmp2.txt=entn6.txt ++ pageIcons.tTmp3.txt=bEntity6.txt ++ if(type6.txt=="shutter") ++ { ++ page popupShutter ++ } ++ if(type6.txt=="input_sel") ++ { ++ page popupInSel ++ } ++ ++ Touch Release Event ++ tmLP.en=0 ++ tSend.txt="event,buttonPress2,"+entn6.txt+",button" ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ +bNext +ributes + Scope : local @@ -662,13 +757,49 @@ + if(tTmp.txt=="0") + { + vis bPrev,0 -+144 +665,81 @@ ++183 +635,111 @@ ++ if(tTmp.txt=="2") ++ { ++ vis bNext,1 ++ bNext.txt="" ++ } ++ //entity name ++ spstr strCommand.txt,entn.txt,"~",3 ++ //icon ++ spstr strCommand.txt,tIcon.txt,"~",4 ++ //icon farbe ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,tIcon.pco,0,0 ++ } ++ //title ++ spstr strCommand.txt,tTitle.txt,"~",4 ++ spstr strCommand.txt,tTitle.txt,"~",6 ++ //title farbe ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ spstr strCommand.txt,tTmp.txt,"~",7 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,tTitle.pco,0,0 ++ } ++ //author ++ spstr strCommand.txt,tAuthor.txt,"~",6 ++ spstr strCommand.txt,tAuthor.txt,"~",8 ++ //author farbe ++ spstr strCommand.txt,tTmp.txt,"~",7 ++ spstr strCommand.txt,tTmp.txt,"~",9 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,tAuthor.pco,0,0 + } + //volume ++ spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",10 + covx tTmp.txt,sys0,0,0 + hVolume.val=sys0 + //icon ++ spstr strCommand.txt,tPlayPause.txt,"~",9 + spstr strCommand.txt,tPlayPause.txt,"~",11 + //speaker current + spstr strCommand.txt,tSpeaker.txt,"~",12 @@ -687,7 +818,7 @@ + } + vaSpeakerPos.val=0 + // on off button -+ spstr strCommand.txt,tTmp.txt,"~",12 ++ spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",14 + if(tTmp.txt=="disable") + { @@ -697,16 +828,13 @@ + vis t5,1 + covx tTmp.txt,t5.pco,0,0 + } -+ //tIconBtnEntityType -+ spstr strCommand.txt,vaMenu.txt,"~",13 -+ //tIconBtnEntityName -+ spstr strCommand.txt,vaMenu.txt,"~",14 + // shuffel btn -+ spstr strCommand.txt,tTmp.txt,"~",15 ++ spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="disable") + { + vis tShuffle,0 + }else ++ //tIconBtnEntityName + spstr strCommand.txt,vaMenu.txt,"~",15 + } + if(tInstruction.txt=="time") @@ -737,9 +865,9 @@ + covx tTmp.txt,defaultBcoColor,0,0 + } + // get Type -+ spstr strCommand.txt,type1.txt,"~",16 ++ spstr strCommand.txt,type1.txt,"~",12 + // get internal name -+ spstr strCommand.txt,entn1.txt,"~",17 ++ spstr strCommand.txt,entn1.txt,"~",13 + if(type1.txt=="delete"||type1.txt=="") + { + vis tEntity1,0 @@ -747,20 +875,20 @@ + }else + { + // change icon -+ spstr strCommand.txt,bEntity1.txt,"~",18 ++ spstr strCommand.txt,bEntity1.txt,"~",14 + vis bEntity1,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",19 ++ spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,sys0,0,0 + bEntity1.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity1.txt,"~",20 ++ spstr strCommand.txt,tEntity1.txt,"~",16 + vis tEntity1,1 + } + // get Type -+ spstr strCommand.txt,type2.txt,"~",22 ++ spstr strCommand.txt,type2.txt,"~",18 + // get internal name -+ spstr strCommand.txt,entn2.txt,"~",23 ++ spstr strCommand.txt,entn2.txt,"~",19 + if(type2.txt=="delete"||type2.txt=="") + { + vis tEntity2,0 @@ -768,20 +896,20 @@ + }else + { + // change icon -+ spstr strCommand.txt,bEntity2.txt,"~",24 ++ spstr strCommand.txt,bEntity2.txt,"~",20 + vis bEntity2,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",25 ++ spstr strCommand.txt,tTmp.txt,"~",21 + covx tTmp.txt,sys0,0,0 + bEntity2.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity2.txt,"~",26 ++ spstr strCommand.txt,tEntity2.txt,"~",22 + vis tEntity2,1 + } + // get Type -+ spstr strCommand.txt,type3.txt,"~",28 ++ spstr strCommand.txt,type3.txt,"~",24 + // get internal name -+ spstr strCommand.txt,entn3.txt,"~",29 ++ spstr strCommand.txt,entn3.txt,"~",25 + if(type3.txt=="delete"||type3.txt=="") + { + vis tEntity3,0 @@ -789,20 +917,20 @@ + }else + { + // change icon -+ spstr strCommand.txt,bEntity3.txt,"~",30 ++ spstr strCommand.txt,bEntity3.txt,"~",26 + vis bEntity3,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",31 ++ spstr strCommand.txt,tTmp.txt,"~",27 + covx tTmp.txt,sys0,0,0 + bEntity3.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity3.txt,"~",32 ++ spstr strCommand.txt,tEntity3.txt,"~",28 + vis tEntity3,1 + } + // get Type -+ spstr strCommand.txt,type4.txt,"~",34 ++ spstr strCommand.txt,type4.txt,"~",30 + // get internal name -+ spstr strCommand.txt,entn4.txt,"~",35 ++ spstr strCommand.txt,entn4.txt,"~",31 + if(type4.txt=="delete"||type4.txt=="") + { + vis tEntity4,0 @@ -810,39 +938,60 @@ + }else + { + // change icon -+ spstr strCommand.txt,bEntity4.txt,"~",36 ++ spstr strCommand.txt,bEntity4.txt,"~",32 + vis bEntity4,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",37 ++ spstr strCommand.txt,tTmp.txt,"~",33 + covx tTmp.txt,sys0,0,0 + bEntity4.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity4.txt,"~",38 ++ spstr strCommand.txt,tEntity4.txt,"~",34 + vis tEntity4,1 + } + // get Type -+ spstr strCommand.txt,type5.txt,"~",40 ++ spstr strCommand.txt,type5.txt,"~",36 + // get internal name -+ spstr strCommand.txt,entn5.txt,"~",41 ++ 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,"~",38 ++ vis bEntity5,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",39 ++ covx tTmp.txt,sys0,0,0 ++ bEntity5.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity5.txt,"~",40 ++ vis tEntity5,1 ++ } ++ // get Type ++ spstr strCommand.txt,type6.txt,"~",42 ++ // get internal name ++ spstr strCommand.txt,entn6.txt,"~",43 ++ if(type6.txt=="delete"||type6.txt=="") ++ { ++ vis tEntity6,0 ++ vis bEntity6,0 ++ }else + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + // change icon -+ spstr strCommand.txt,bEntity5.txt,"~",42 -+ vis bEntity5,1 ++ spstr strCommand.txt,bEntity6.txt,"~",44 ++ vis bEntity6,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",43 ++ spstr strCommand.txt,tTmp.txt,"~",45 + covx tTmp.txt,sys0,0,0 -+ bEntity5.pco=sys0 ++ bEntity6.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity5.txt,"~",44 -+ vis tEntity5,1 ++ spstr strCommand.txt,tEntity6.txt,"~",46 ++ vis tEntity6,1 + covx tTmp.txt,defaultFontColor,0,0 + } + } diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 6aaeecb6..f9daa5fd 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -30,6 +30,12 @@ Page cardMedia vis tShuffle,0 vis bPrev,0 vis bNext,0 + vis bEntity1,0 + vis bEntity2,0 + vis bEntity3,0 + vis bEntity4,0 + vis bEntity5,0 + vis bEntity6,0 cardMedia.bco=defaultBcoColor for(sys0=0;sys0<34;sys0++) { @@ -48,42 +54,49 @@ Page cardMedia Variable (string) entn Attributes - ID : 15 + ID : 14 Scope : local Text : Max. Text Size: 80 Variable (string) entn1 Attributes - ID : 43 + ID : 42 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 44 + ID : 43 Scope : local Text : Max. Text Size: 80 Variable (string) entn3 Attributes - ID : 45 + ID : 44 Scope : local Text : Max. Text Size: 80 Variable (string) entn4 Attributes - ID : 46 + ID : 45 Scope : local Text : Max. Text Size: 80 Variable (string) entn5 Attributes - ID : 48 + ID : 47 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn6 + Attributes + ID : 54 Scope : local Text : Max. Text Size: 80 @@ -97,119 +110,133 @@ Variable (string) strCommand Variable (string) tEntity1 Attributes - ID : 49 + ID : 48 Scope : local Text : Max. Text Size: 20 Variable (string) tEntity2 Attributes - ID : 50 + ID : 49 Scope : local Text : Max. Text Size: 20 Variable (string) tEntity3 Attributes - ID : 51 + ID : 50 Scope : local Text : Max. Text Size: 20 Variable (string) tEntity4 Attributes - ID : 52 + ID : 51 Scope : local Text : Max. Text Size: 20 Variable (string) tEntity5 Attributes - ID : 53 + ID : 52 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity6 + Attributes + ID : 56 Scope : local Text : Max. Text Size: 20 Variable (string) tId Attributes - ID : 30 + ID : 29 Scope : local Text : Max. Text Size: 20 Variable (string) tSend Attributes - ID : 28 + ID : 27 Scope : local Text : Max. Text Size: 200 Variable (string) tTmp Attributes - ID : 31 + ID : 30 Scope : local Text : Max. Text Size: 10 Variable (string) type1 Attributes - ID : 39 + ID : 38 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 40 + ID : 39 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 41 + ID : 40 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 42 + ID : 41 Scope : local Text : Max. Text Size: 10 Variable (string) type5 Attributes - ID : 47 + ID : 46 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type6 + Attributes + ID : 55 Scope : local Text : Max. Text Size: 10 Variable (string) vaMenu Attributes - ID : 27 + ID : 26 Scope : local Text : Max. Text Size: 50 Variable (string) vaMenuType Attributes - ID : 32 + ID : 31 Scope : local Text : Max. Text Size: 50 Variable (string) vaSpeakerList Attributes - ID : 21 + ID : 20 Scope : local Text : Max. Text Size: 400 Variable (int32) vaSpeakerPos Attributes - ID : 22 + ID : 21 Scope: local Value: 0 @@ -264,7 +291,7 @@ Text t0 Text t1 Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -363,7 +390,7 @@ Text t2 Text t3 Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -413,7 +440,7 @@ Text t3 Text t5 Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -520,54 +547,6 @@ Text tHeading Horizontal Spacing : 0 Vertical Spacing : 0 -Text tIcon - Attributes - ID : 14 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 11 - y coordinate : 75 - Width : 71 - Height : 62 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 3 - Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Release Event - if(vaMenu.txt!="") - { - tSend.txt="event,buttonPress2,"+vaMenu.txt+",button" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - } - Text tInstruction Attributes ID : 6 @@ -649,7 +628,7 @@ Text tPlayPause Text tShuffle Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -791,16 +770,16 @@ Slider hVolume Button bEntity1 Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 18 - y coordinate : 257 - Width : 55 - Height : 55 + x coordinate : 11 + y coordinate : 75 + Width : 71 + Height : 62 Effect : load Effect Priority : 0 Effect Time : 300 @@ -854,13 +833,13 @@ Button bEntity1 Button bEntity2 Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 109 + x coordinate : 13 y coordinate : 257 Width : 55 Height : 55 @@ -917,13 +896,13 @@ Button bEntity2 Button bEntity3 Attributes - ID : 35 + ID : 34 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 200 + x coordinate : 104 y coordinate : 257 Width : 55 Height : 55 @@ -980,13 +959,13 @@ Button bEntity3 Button bEntity4 Attributes - ID : 36 + ID : 35 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 291 + x coordinate : 195 y coordinate : 257 Width : 55 Height : 55 @@ -1043,13 +1022,13 @@ Button bEntity4 Button bEntity5 Attributes - ID : 37 + ID : 36 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 382 + x coordinate : 286 y coordinate : 257 Width : 55 Height : 55 @@ -1104,6 +1083,69 @@ Button bEntity5 prints tSend.txt,0 prints crcval,2 +Button bEntity6 + Attributes + ID : 53 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 382 + y coordinate : 257 + Width : 55 + Height : 55 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tmLP.en=1 + tTmp.txt=type6.txt + pageIcons.tTmp1.txt=tEntity6.txt + pageIcons.tTmp2.txt=entn6.txt + pageIcons.tTmp3.txt=bEntity6.txt + if(type6.txt=="shutter") + { + page popupShutter + } + if(type6.txt=="input_sel") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn6.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Button bNext Attributes ID : 2 @@ -1214,7 +1256,7 @@ Button bPrev Hotspot mSwipeNext Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1234,7 +1276,7 @@ Hotspot mSwipeNext Hotspot mSwipePrev Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1254,7 +1296,7 @@ Hotspot mSwipePrev Hotspot mSwipeUp Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1274,7 +1316,7 @@ Hotspot mSwipeUp Timer tmCooldown Attributes - ID : 18 + ID : 17 Scope : local Period (ms): 100 Enabled : no @@ -1285,7 +1327,7 @@ Timer tmCooldown Timer tmLP Attributes - ID : 38 + ID : 37 Scope : local Period (ms): 500 Enabled : no @@ -1399,38 +1441,30 @@ Timer tmSerial } //entity name spstr strCommand.txt,entn.txt,"~",3 - //icon - spstr strCommand.txt,tIcon.txt,"~",4 - //icon farbe - spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") - { - covx tTmp.txt,tIcon.pco,0,0 - } //title - spstr strCommand.txt,tTitle.txt,"~",6 + spstr strCommand.txt,tTitle.txt,"~",4 //title farbe - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",5 if(tTmp.txt!="") { covx tTmp.txt,tTitle.pco,0,0 } //author - spstr strCommand.txt,tAuthor.txt,"~",8 + spstr strCommand.txt,tAuthor.txt,"~",6 //author farbe - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",7 if(tTmp.txt!="") { covx tTmp.txt,tAuthor.pco,0,0 } //volume - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,sys0,0,0 hVolume.val=sys0 //icon - spstr strCommand.txt,tPlayPause.txt,"~",11 + spstr strCommand.txt,tPlayPause.txt,"~",9 // on off button - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { vis t5,0 @@ -1439,12 +1473,8 @@ Timer tmSerial vis t5,1 covx tTmp.txt,t5.pco,0,0 } - //tIconBtnEntityType - spstr strCommand.txt,vaMenu.txt,"~",13 - //tIconBtnEntityName - spstr strCommand.txt,vaMenu.txt,"~",14 // shuffel btn - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",11 if(tTmp.txt=="disable") { vis tShuffle,0 @@ -1454,9 +1484,9 @@ Timer tmSerial tShuffle.txt=tTmp.txt } // get Type - spstr strCommand.txt,type1.txt,"~",16 + spstr strCommand.txt,type1.txt,"~",12 // get internal name - spstr strCommand.txt,entn1.txt,"~",17 + spstr strCommand.txt,entn1.txt,"~",13 if(type1.txt=="delete"||type1.txt=="") { vis tEntity1,0 @@ -1464,20 +1494,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity1.txt,"~",18 + spstr strCommand.txt,bEntity1.txt,"~",14 vis bEntity1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",15 covx tTmp.txt,sys0,0,0 bEntity1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",20 + spstr strCommand.txt,tEntity1.txt,"~",16 vis tEntity1,1 } // get Type - spstr strCommand.txt,type2.txt,"~",22 + spstr strCommand.txt,type2.txt,"~",18 // get internal name - spstr strCommand.txt,entn2.txt,"~",23 + spstr strCommand.txt,entn2.txt,"~",19 if(type2.txt=="delete"||type2.txt=="") { vis tEntity2,0 @@ -1485,20 +1515,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity2.txt,"~",24 + spstr strCommand.txt,bEntity2.txt,"~",20 vis bEntity2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",25 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,sys0,0,0 bEntity2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",26 + spstr strCommand.txt,tEntity2.txt,"~",22 vis tEntity2,1 } // get Type - spstr strCommand.txt,type3.txt,"~",28 + spstr strCommand.txt,type3.txt,"~",24 // get internal name - spstr strCommand.txt,entn3.txt,"~",29 + spstr strCommand.txt,entn3.txt,"~",25 if(type3.txt=="delete"||type3.txt=="") { vis tEntity3,0 @@ -1506,20 +1536,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity3.txt,"~",30 + spstr strCommand.txt,bEntity3.txt,"~",26 vis bEntity3,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,"~",27 covx tTmp.txt,sys0,0,0 bEntity3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,"~",32 + spstr strCommand.txt,tEntity3.txt,"~",28 vis tEntity3,1 } // get Type - spstr strCommand.txt,type4.txt,"~",34 + spstr strCommand.txt,type4.txt,"~",30 // get internal name - spstr strCommand.txt,entn4.txt,"~",35 + spstr strCommand.txt,entn4.txt,"~",31 if(type4.txt=="delete"||type4.txt=="") { vis tEntity4,0 @@ -1527,20 +1557,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity4.txt,"~",36 + spstr strCommand.txt,bEntity4.txt,"~",32 vis bEntity4,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",37 + spstr strCommand.txt,tTmp.txt,"~",33 covx tTmp.txt,sys0,0,0 bEntity4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,"~",38 + spstr strCommand.txt,tEntity4.txt,"~",34 vis tEntity4,1 } // get Type - spstr strCommand.txt,type5.txt,"~",40 + spstr strCommand.txt,type5.txt,"~",36 // get internal name - spstr strCommand.txt,entn5.txt,"~",41 + spstr strCommand.txt,entn5.txt,"~",37 if(type5.txt=="delete"||type5.txt=="") { vis tEntity5,0 @@ -1548,16 +1578,37 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity5.txt,"~",42 + spstr strCommand.txt,bEntity5.txt,"~",38 vis bEntity5,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",43 + spstr strCommand.txt,tTmp.txt,"~",39 covx tTmp.txt,sys0,0,0 bEntity5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,"~",44 + spstr strCommand.txt,tEntity5.txt,"~",40 vis tEntity5,1 } + // get Type + spstr strCommand.txt,type6.txt,"~",42 + // get internal name + 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,"~",44 + vis bEntity6,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",45 + covx tTmp.txt,sys0,0,0 + bEntity6.pco=sys0 + // set name + spstr strCommand.txt,tEntity6.txt,"~",46 + vis tEntity6,1 + } } if(tInstruction.txt=="pageType") { @@ -1676,7 +1727,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 16 + ID : 15 Scope : local Period (ms): 1000 Enabled : yes @@ -1707,7 +1758,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 17 + ID : 16 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index fc4f7853..bfc22bca 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -38,10 +38,6 @@ cardGrid 42 Component(s) 514 Line(s) of event code 293 Unique line(s) of event code -cardMedia - 54 Component(s) - 615 Line(s) of event code - 312 Unique line(s) of event code cardPower 43 Component(s) 439 Line(s) of event code @@ -70,6 +66,10 @@ screensaver 47 Component(s) 402 Line(s) of event code 298 Unique line(s) of event code +cardMedia + 57 Component(s) + 640 Line(s) of event code + 320 Unique line(s) of event code cardEntities 65 Component(s) 1169 Line(s) of event code @@ -77,6 +77,6 @@ cardEntities Total 18 Page(s) - 631 Component(s) - 7772 Line(s) of event code - 1972 Unique line(s) of event code + 634 Component(s) + 7797 Line(s) of event code + 1961 Unique line(s) of event code diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 81125776..0844b770 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -22,6 +22,12 @@ Page cardMedia vis tShuffle,0 vis bPrev,0 vis bNext,0 + vis bEntity1,0 + vis bEntity2,0 + vis bEntity3,0 + vis bEntity4,0 + vis bEntity5,0 + vis bEntity6,0 cardMedia.bco=defaultBcoColor for(sys0=0;sys0<34;sys0++) { @@ -74,6 +80,12 @@ Variable (string) entn5 Text : Max. Text Size: 80 +Variable (string) entn6 + Attributes + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes Scope : local @@ -110,6 +122,12 @@ Variable (string) tEntity5 Text : Max. Text Size: 20 +Variable (string) tEntity6 + Attributes + Scope : local + Text : + Max. Text Size: 20 + Variable (string) tId Attributes Scope : local @@ -158,6 +176,12 @@ Variable (string) type5 Text : Max. Text Size: 10 +Variable (string) type6 + Attributes + Scope : local + Text : + Max. Text Size: 10 + Variable (string) vaMenu Attributes Scope : local @@ -348,34 +372,6 @@ Text tHeading Text : Max. Text Size : 40 -Text tIcon - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - - Events - Touch Release Event - if(vaMenu.txt!="") - { - tSend.txt="event,buttonPress2,"+vaMenu.txt+",button" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - } - Text tInstruction Attributes Scope : local @@ -697,6 +693,47 @@ Button bEntity5 prints tSend.txt,0 prints crcval,2 +Button bEntity6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tmLP.en=1 + tTmp.txt=type6.txt + pageIcons.tTmp1.txt=tEntity6.txt + pageIcons.tTmp2.txt=entn6.txt + pageIcons.tTmp3.txt=bEntity6.txt + if(type6.txt=="shutter") + { + page popupShutter + } + if(type6.txt=="input_sel") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn6.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Button bNext Attributes Scope : local @@ -918,38 +955,30 @@ Timer tmSerial } //entity name spstr strCommand.txt,entn.txt,"~",3 - //icon - spstr strCommand.txt,tIcon.txt,"~",4 - //icon farbe - spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") - { - covx tTmp.txt,tIcon.pco,0,0 - } //title - spstr strCommand.txt,tTitle.txt,"~",6 + spstr strCommand.txt,tTitle.txt,"~",4 //title farbe - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",5 if(tTmp.txt!="") { covx tTmp.txt,tTitle.pco,0,0 } //author - spstr strCommand.txt,tAuthor.txt,"~",8 + spstr strCommand.txt,tAuthor.txt,"~",6 //author farbe - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",7 if(tTmp.txt!="") { covx tTmp.txt,tAuthor.pco,0,0 } //volume - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,sys0,0,0 hVolume.val=sys0 //icon - spstr strCommand.txt,tPlayPause.txt,"~",11 + spstr strCommand.txt,tPlayPause.txt,"~",9 // on off button - spstr strCommand.txt,tTmp.txt,"~",12 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { vis t5,0 @@ -958,12 +987,8 @@ Timer tmSerial vis t5,1 covx tTmp.txt,t5.pco,0,0 } - //tIconBtnEntityType - spstr strCommand.txt,vaMenu.txt,"~",13 - //tIconBtnEntityName - spstr strCommand.txt,vaMenu.txt,"~",14 // shuffel btn - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",11 if(tTmp.txt=="disable") { vis tShuffle,0 @@ -973,9 +998,9 @@ Timer tmSerial tShuffle.txt=tTmp.txt } // get Type - spstr strCommand.txt,type1.txt,"~",16 + spstr strCommand.txt,type1.txt,"~",12 // get internal name - spstr strCommand.txt,entn1.txt,"~",17 + spstr strCommand.txt,entn1.txt,"~",13 if(type1.txt=="delete"||type1.txt=="") { vis tEntity1,0 @@ -983,20 +1008,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity1.txt,"~",18 + spstr strCommand.txt,bEntity1.txt,"~",14 vis bEntity1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",15 covx tTmp.txt,sys0,0,0 bEntity1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,"~",20 + spstr strCommand.txt,tEntity1.txt,"~",16 vis tEntity1,1 } // get Type - spstr strCommand.txt,type2.txt,"~",22 + spstr strCommand.txt,type2.txt,"~",18 // get internal name - spstr strCommand.txt,entn2.txt,"~",23 + spstr strCommand.txt,entn2.txt,"~",19 if(type2.txt=="delete"||type2.txt=="") { vis tEntity2,0 @@ -1004,20 +1029,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity2.txt,"~",24 + spstr strCommand.txt,bEntity2.txt,"~",20 vis bEntity2,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",25 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,sys0,0,0 bEntity2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,"~",26 + spstr strCommand.txt,tEntity2.txt,"~",22 vis tEntity2,1 } // get Type - spstr strCommand.txt,type3.txt,"~",28 + spstr strCommand.txt,type3.txt,"~",24 // get internal name - spstr strCommand.txt,entn3.txt,"~",29 + spstr strCommand.txt,entn3.txt,"~",25 if(type3.txt=="delete"||type3.txt=="") { vis tEntity3,0 @@ -1025,20 +1050,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity3.txt,"~",30 + spstr strCommand.txt,bEntity3.txt,"~",26 vis bEntity3,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,"~",27 covx tTmp.txt,sys0,0,0 bEntity3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,"~",32 + spstr strCommand.txt,tEntity3.txt,"~",28 vis tEntity3,1 } // get Type - spstr strCommand.txt,type4.txt,"~",34 + spstr strCommand.txt,type4.txt,"~",30 // get internal name - spstr strCommand.txt,entn4.txt,"~",35 + spstr strCommand.txt,entn4.txt,"~",31 if(type4.txt=="delete"||type4.txt=="") { vis tEntity4,0 @@ -1046,20 +1071,20 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity4.txt,"~",36 + spstr strCommand.txt,bEntity4.txt,"~",32 vis bEntity4,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",37 + spstr strCommand.txt,tTmp.txt,"~",33 covx tTmp.txt,sys0,0,0 bEntity4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,"~",38 + spstr strCommand.txt,tEntity4.txt,"~",34 vis tEntity4,1 } // get Type - spstr strCommand.txt,type5.txt,"~",40 + spstr strCommand.txt,type5.txt,"~",36 // get internal name - spstr strCommand.txt,entn5.txt,"~",41 + spstr strCommand.txt,entn5.txt,"~",37 if(type5.txt=="delete"||type5.txt=="") { vis tEntity5,0 @@ -1067,16 +1092,37 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,bEntity5.txt,"~",42 + spstr strCommand.txt,bEntity5.txt,"~",38 vis bEntity5,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",43 + spstr strCommand.txt,tTmp.txt,"~",39 covx tTmp.txt,sys0,0,0 bEntity5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,"~",44 + spstr strCommand.txt,tEntity5.txt,"~",40 vis tEntity5,1 } + // get Type + spstr strCommand.txt,type6.txt,"~",42 + // get internal name + 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,"~",44 + vis bEntity6,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",45 + covx tTmp.txt,sys0,0,0 + bEntity6.pco=sys0 + // set name + spstr strCommand.txt,tEntity6.txt,"~",46 + vis tEntity6,1 + } } if(tInstruction.txt=="pageType") {