diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index f0f2f813..008162a6 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -71,1023 +71,6 @@ │ Scope : local │ Period (ms): 50 │ Enabled : yes -│ --- HMI/n2t-out/cardMedia.txt -├── +++ HMI/US/landscape/n2t-out/cardMedia.txt -│ @@ -15,23 +15,16 @@ -│ dim=dimValueNormal -│ vis p0,0 -│ vis tSend,0 -│ vis tInstruction,0 -│ vis tTmp,0 -│ vis tId,0 -│ vis t5,0 -│ - 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) -│ { -│ b[sys0].bco=defaultBcoColor -│ b[sys0].pco=defaultFontColor -│ @@ -46,158 +39,32 @@ -│ -│ Variable (string) entn -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 80 -│ -│ -Variable (string) entn1 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 80 -│ - -│ -Variable (string) entn2 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 80 -│ - -│ -Variable (string) entn3 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 80 -│ - -│ -Variable (string) entn4 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 80 -│ - -│ -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: 750 -│ -│ -Variable (string) tEntity1 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tEntity2 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tEntity3 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tEntity4 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tEntity5 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tEntity6 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tId -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ Variable (string) tSend -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 200 -│ -│ -Variable (string) tTmp -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type1 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type2 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type3 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type4 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type5 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type6 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ Variable (string) vaMenu -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 50 -│ -│ -Variable (string) vaMenuType -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 50 -│ - -│ Variable (string) vaSpeakerList -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 400 -│ -│ Variable (int32) vaSpeakerPos -│ @@ -319,14 +186,24 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ +Text t4 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 10 -│ + -│ Text t5 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -348,14 +225,36 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ +Text t6 -│ + 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 Press Event -│ + //speaker -│ + tSpeaker.pco=65535 -│ + spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val -│ + vaSpeakerPos.val+=1 -│ + if(tSpeaker.txt=="") -│ + { -│ + vaSpeakerPos.val=0 -│ + spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val -│ + } -│ + -│ Text tAuthor -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -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 -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 20 -│ + -│ Text tInstruction -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -407,31 +344,31 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ -Text tShuffle -│ +Text tSpeaker -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ - Text : x -│ - Max. Text Size : 10 -│ + Text : -│ + Max. Text Size : 50 -│ -│ Events -│ Touch Press Event -│ // event,buttonPress2,entn,media-next -│ //craft command -│ tSend.txt="event,buttonPress2," -│ tSend.txt+=entn.txt+"," -│ - tSend.txt+="media-shuffle" -│ + tSend.txt+="speaker-sel,"+tSpeaker.txt -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -446,14 +383,24 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 50 -│ -│ +Text tTmp -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 10 -│ + -│ Picture p0 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ -│ @@ -484,280 +431,14 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ -Button bEntity1 -│ - 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=type1.txt -│ - pageIcons.tTmp1.txt=tEntity1.txt -│ - pageIcons.tTmp2.txt=entn1.txt -│ - pageIcons.tTmp3.txt=bEntity1.txt -│ - if(type1.txt=="shutter") -│ - { -│ - page popupShutter -│ - } -│ - if(type1.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - -│ - Touch Release Event -│ - tmLP.en=0 -│ - tSend.txt="event,buttonPress2,"+entn1.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 bEntity2 -│ - 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=type2.txt -│ - pageIcons.tTmp1.txt=tEntity2.txt -│ - pageIcons.tTmp2.txt=entn2.txt -│ - pageIcons.tTmp3.txt=bEntity2.txt -│ - if(type2.txt=="shutter") -│ - { -│ - page popupShutter -│ - } -│ - if(type2.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - if(type2.txt=="media_pl") -│ - { -│ - page popupInSel -│ - } -│ - -│ - Touch Release Event -│ - tmLP.en=0 -│ - tSend.txt="event,buttonPress2,"+entn2.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 bEntity3 -│ - 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=type3.txt -│ - pageIcons.tTmp1.txt=tEntity3.txt -│ - pageIcons.tTmp2.txt=entn3.txt -│ - pageIcons.tTmp3.txt=bEntity3.txt -│ - if(type3.txt=="shutter") -│ - { -│ - page popupShutter -│ - } -│ - if(type3.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - if(type3.txt=="media_pl") -│ - { -│ - page popupInSel -│ - } -│ - -│ - Touch Release Event -│ - tmLP.en=0 -│ - tSend.txt="event,buttonPress2,"+entn3.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 bEntity4 -│ - 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=type4.txt -│ - pageIcons.tTmp1.txt=tEntity4.txt -│ - pageIcons.tTmp2.txt=entn4.txt -│ - pageIcons.tTmp3.txt=bEntity4.txt -│ - if(type4.txt=="shutter") -│ - { -│ - page popupShutter -│ - } -│ - if(type4.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - if(type4.txt=="media_pl") -│ - { -│ - page popupInSel -│ - } -│ - -│ - Touch Release Event -│ - tmLP.en=0 -│ - tSend.txt="event,buttonPress2,"+entn4.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 bEntity5 -│ - 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=type5.txt -│ - pageIcons.tTmp1.txt=tEntity5.txt -│ - pageIcons.tTmp2.txt=entn5.txt -│ - pageIcons.tTmp3.txt=bEntity5.txt -│ - if(type5.txt=="shutter") -│ - { -│ - page popupShutter -│ - } -│ - if(type5.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - if(type5.txt=="media_pl") -│ - { -│ - page popupInSel -│ - } -│ - -│ - Touch Release Event -│ - tmLP.en=0 -│ - tSend.txt="event,buttonPress2,"+entn5.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 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(entn.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - if(type6.txt=="media_pl") -│ - { -│ - 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 -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ @@ -857,31 +538,14 @@ -│ Period (ms): 100 -│ Enabled : no -│ -│ Events -│ Timer Event -│ tmCooldown.en=0 -│ -│ -Timer tmLP -│ - Attributes -│ - Scope : local -│ - Period (ms): 500 -│ - Enabled : no -│ - -│ - Events -│ - Timer Event -│ - if(tTmp.txt=="light") -│ - { -│ - page popupLight -│ - } -│ - if(tTmp.txt=="fan") -│ - { -│ - page popupFan -│ - } -│ - -│ Timer tmSerial -│ Attributes -│ Scope : local -│ Period (ms): 50 -│ Enabled : yes -│ -│ Events -│ @@ -927,15 +591,15 @@ -│ // here is the location where acual code should be -│ // write command to variable strCommand -│ ucopy strCommand.txt,4,payloadLength-5,0 -│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -│ spstr strCommand.txt,tInstruction.txt,"~",0 -│ if(tInstruction.txt=="entityUpd") -│ { -│ - // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 -│ + //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") -│ { -│ vis bPrev,0 -│ @@ -971,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 -│ + if(tSpeaker.txt!="") -│ + { -│ + tSpeaker.pco=1374 -│ + }else -│ + { -│ + tSpeaker.pco=65535 -│ + } -│ + //speaker list -│ + spstr strCommand.txt,vaSpeakerList.txt,"~",13 -│ + if(vaSpeakerList.txt=="") -│ + { -│ + vis t6,0 -│ + } -│ + vaSpeakerPos.val=0 -│ // on off button -│ - spstr strCommand.txt,tTmp.txt,"~",10 -│ + spstr strCommand.txt,tTmp.txt,"~",14 -│ 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,"~",11 -│ - if(tTmp.txt=="disable") -│ - { -│ - vis tShuffle,0 -│ - }else -│ + //tIconBtnEntityName -│ + spstr strCommand.txt,vaMenu.txt,"~",15 -│ + } -│ + if(tInstruction.txt=="time") -│ + { -│ + // get set time to global variable -│ + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ + } -│ + if(tInstruction.txt=="date") -│ + { -│ + // get set date to global variable -│ + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -│ + } -│ + if(tInstruction.txt=="dimmode") -│ + { -│ + // get value -│ + spstr strCommand.txt,tTmp.txt,"~",1 -│ + covx tTmp.txt,dimValue,0,0 -│ + // get value normal -│ + spstr strCommand.txt,tTmp.txt,"~",2 -│ + covx tTmp.txt,dimValueNormal,0,0 -│ + dim=dimValueNormal -│ + // get background color -│ + spstr strCommand.txt,tTmp.txt,"~",3 -│ + if(tTmp.txt!="") -│ { -│ - vis tShuffle,1 -│ - tShuffle.txt=tTmp.txt -│ + covx tTmp.txt,defaultBcoColor,0,0 -│ } -│ - // get Type -│ - spstr strCommand.txt,type1.txt,"~",12 -│ - // get internal name -│ - 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,"~",14 -│ - vis bEntity1,1 -│ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",15 -│ - covx tTmp.txt,sys0,0,0 -│ - bEntity1.pco=sys0 -│ - // set name -│ - spstr strCommand.txt,tEntity1.txt,"~",16 -│ - vis tEntity1,1 -│ - } -│ - // get Type -│ - spstr strCommand.txt,type2.txt,"~",18 -│ - // get internal name -│ - 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,"~",20 -│ - vis bEntity2,1 -│ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",21 -│ - covx tTmp.txt,sys0,0,0 -│ - bEntity2.pco=sys0 -│ - // set name -│ - spstr strCommand.txt,tEntity2.txt,"~",22 -│ - vis tEntity2,1 -│ - } -│ - // get Type -│ - spstr strCommand.txt,type3.txt,"~",24 -│ - // get internal name -│ - 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,"~",26 -│ - vis bEntity3,1 -│ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",27 -│ - covx tTmp.txt,sys0,0,0 -│ - bEntity3.pco=sys0 -│ - // set name -│ - spstr strCommand.txt,tEntity3.txt,"~",28 -│ - vis tEntity3,1 -│ - } -│ - // get Type -│ - spstr strCommand.txt,type4.txt,"~",30 -│ - // get internal name -│ - 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,"~",32 -│ - vis bEntity4,1 -│ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",33 -│ - covx tTmp.txt,sys0,0,0 -│ - bEntity4.pco=sys0 -│ - // set name -│ - spstr strCommand.txt,tEntity4.txt,"~",34 -│ - vis tEntity4,1 -│ - } -│ - // get Type -│ - spstr strCommand.txt,type5.txt,"~",36 -│ - // get internal name -│ - 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,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 -│ + covx tTmp.txt,defaultFontColor,0,0 -│ } -│ } -│ + if(tInstruction.txt=="timeout") -│ + { -│ + //set timeout to global var -│ + spstr strCommand.txt,tTmp.txt,"~",1 -│ + covx tTmp.txt,sleepTimeout,0,0 -│ + } -│ if(tInstruction.txt=="pageType") -│ { -│ sleepValue=0 -│ //command format pageType,specialPageName -│ //write name of speical page to tId -│ spstr strCommand.txt,tId.txt,"~",1 -│ //save second arg if there's one -│ @@ -1204,63 +796,38 @@ -│ { -│ page cardQR -│ } -│ if(tId.txt=="cardPower") -│ { -│ page cardPower -│ } -│ - } -│ - if(tInstruction.txt=="time") -│ - { -│ - // get set time to global variable -│ - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ - } -│ - if(tInstruction.txt=="date") -│ - { -│ - // get set date to global variable -│ - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -│ - } -│ - if(tInstruction.txt=="dimmode") -│ - { -│ - // get value -│ - spstr strCommand.txt,tTmp.txt,"~",1 -│ - covx tTmp.txt,dimValue,0,0 -│ - // get value normal -│ - spstr strCommand.txt,tTmp.txt,"~",2 -│ - covx tTmp.txt,dimValueNormal,0,0 -│ - dim=dimValueNormal -│ - // get background color -│ - spstr strCommand.txt,tTmp.txt,"~",3 -│ - if(tTmp.txt!="") -│ + if(tId.txt=="cardChart") -│ { -│ - covx tTmp.txt,defaultBcoColor,0,0 -│ - } -│ - // get font color -│ - spstr strCommand.txt,tTmp.txt,"~",4 -│ - if(tTmp.txt!="") -│ - { -│ - covx tTmp.txt,defaultFontColor,0,0 -│ + page cardChart -│ } -│ } -│ - if(tInstruction.txt=="timeout") -│ - { -│ - //set timeout to global var -│ - spstr strCommand.txt,tTmp.txt,"~",1 -│ - covx tTmp.txt,sleepTimeout,0,0 -│ - } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } -│ } -│ // next character -│ bufferPos++ -│ } -│ + if(bufferPos==usize) -│ + { -│ + // copy whole buffer to t1.txt, for debugging -│ + //ucopy t2.txt,0,usize,0 -│ + // ucopy n2.val,0,usize,0 -│ + // clear whole buffer -│ + //code_c -│ + //bufferPos=0 -│ + } -│ } -│ -│ Timer tmSleep -│ Attributes -│ Scope : local -│ Period (ms): 1000 -│ Enabled : yes │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -173,15 +173,15 @@ diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 7fa59213..9d1fc3df 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -27,8 +27,15 @@ Page cardMedia vis tTmp,0 vis tId,0 vis t5,0 + 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++) { @@ -47,54 +54,201 @@ Page cardMedia Variable (string) entn Attributes - ID : 17 + ID : 14 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn1 + Attributes + ID : 42 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + ID : 43 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn3 + Attributes + ID : 44 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn4 + Attributes + ID : 45 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn5 + Attributes + ID : 47 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn6 + Attributes + ID : 54 Scope : local Text : Max. Text Size: 80 Variable (string) strCommand Attributes - ID : 6 + ID : 5 Scope : local Text : Max. Text Size: 750 +Variable (string) tEntity1 + Attributes + ID : 48 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity2 + Attributes + ID : 49 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity3 + Attributes + ID : 50 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity4 + Attributes + ID : 51 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity5 + Attributes + 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 : 29 + Scope : local + Text : + Max. Text Size: 20 + Variable (string) tSend Attributes - ID : 33 + ID : 27 Scope : local Text : Max. Text Size: 200 +Variable (string) tTmp + Attributes + ID : 30 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type1 + Attributes + ID : 38 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + ID : 39 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type3 + Attributes + ID : 40 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type4 + Attributes + ID : 41 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type5 + Attributes + 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 : 32 + ID : 26 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) vaMenuType + Attributes + ID : 31 Scope : local Text : Max. Text Size: 50 Variable (string) vaSpeakerList Attributes - ID : 26 + ID : 20 Scope : local Text : Max. Text Size: 400 Variable (int32) vaSpeakerPos Attributes - ID : 27 + ID : 21 Scope: local Value: 0 Text t0 Attributes - ID : 14 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 108 + x coordinate : 126 y coordinate : 145 Width : 50 Height : 50 @@ -137,13 +291,13 @@ Text t0 Text t1 Attributes - ID : 21 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 23 + x coordinate : 25 y coordinate : 201 Width : 50 Height : 50 @@ -187,13 +341,13 @@ Text t1 Text t2 Attributes - ID : 12 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 318 + x coordinate : 316 y coordinate : 145 Width : 50 Height : 50 @@ -236,13 +390,13 @@ Text t2 Text t3 Attributes - ID : 22 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 409 + x coordinate : 411 y coordinate : 201 Width : 50 Height : 50 @@ -284,45 +438,15 @@ Text t3 prints tSend.txt,0 prints crcval,2 -Text t4 - Attributes - ID : 23 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 37 - y coordinate : 262 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 3 - Back. Color : 6371 - Font Color : 50712 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text t5 Attributes - ID : 28 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 409 + x coordinate : 411 y coordinate : 145 Width : 50 Height : 50 @@ -363,57 +487,15 @@ Text t5 prints tSend.txt,0 prints crcval,2 -Text t6 - Attributes - ID : 25 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 397 - y coordinate : 262 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 3 - Back. Color : 6371 - Font Color : 50712 - 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 Press Event - //speaker - tSpeaker.pco=65535 - spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val - vaSpeakerPos.val+=1 - if(tSpeaker.txt=="") - { - vaSpeakerPos.val=0 - spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val - } - Text tAuthor Attributes - ID : 11 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 101 + x coordinate : 103 y coordinate : 108 Width : 358 Height : 25 @@ -437,13 +519,13 @@ Text tAuthor Text tHeading Attributes - ID : 9 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 127 + x coordinate : 129 y coordinate : 26 Width : 228 Height : 30 @@ -453,7 +535,7 @@ Text tHeading Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 1 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : center @@ -465,93 +547,15 @@ Text tHeading Horizontal Spacing : 0 Vertical Spacing : 0 -Text tIcon - Attributes - ID : 16 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 27 - 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 tId - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 65 - y coordinate : 159 - Width : 30 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 20 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tInstruction Attributes - ID : 7 + ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 312 + x coordinate : 296 y coordinate : 0 Width : 100 Height : 20 @@ -575,13 +579,13 @@ Text tInstruction Text tPlayPause Attributes - ID : 13 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 215 + x coordinate : 221 y coordinate : 145 Width : 50 Height : 50 @@ -622,17 +626,17 @@ Text tPlayPause prints tSend.txt,0 prints crcval,2 -Text tSpeaker +Text tShuffle Attributes - ID : 24 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 110 - y coordinate : 262 - Width : 267 + x coordinate : 31 + y coordinate : 145 + Width : 50 Height : 50 Effect : load Effect Priority : 0 @@ -640,14 +644,14 @@ Text tSpeaker Fill : solid color Style : flat Associated Keyboard : none - Font ID : 0 + Font ID : 3 Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : left + Font Color : 50712 + Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : - Max. Text Size : 50 + Text : x + Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -658,7 +662,7 @@ Text tSpeaker //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="speaker-sel,"+tSpeaker.txt + tSend.txt+="media-shuffle" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -673,13 +677,13 @@ Text tSpeaker Text tTitle Attributes - ID : 10 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 100 + x coordinate : 102 y coordinate : 78 Width : 358 Height : 25 @@ -701,36 +705,6 @@ Text tTitle Horizontal Spacing : 0 Vertical Spacing : 0 -Text tTmp - Attributes - ID : 2 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 30 - y coordinate : 156 - Width : 27 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Picture p0 Attributes ID : 1 @@ -750,13 +724,13 @@ Picture p0 Slider hVolume Attributes - ID : 15 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 77 + x coordinate : 79 y coordinate : 206 Width : 328 Height : 43 @@ -794,15 +768,413 @@ Slider hVolume prints tSend.txt,0 prints crcval,2 -Button bNext +Button bEntity1 Attributes - ID : 3 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 407 + x coordinate : 29 + y coordinate : 75 + Width : 71 + Height : 62 + 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=type1.txt + pageIcons.tTmp1.txt=tEntity1.txt + pageIcons.tTmp2.txt=entn1.txt + pageIcons.tTmp3.txt=bEntity1.txt + if(type1.txt=="shutter") + { + page popupShutter + } + if(type1.txt=="input_sel") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn1.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 bEntity2 + Attributes + ID : 33 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 31 + 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=type2.txt + pageIcons.tTmp1.txt=tEntity2.txt + pageIcons.tTmp2.txt=entn2.txt + pageIcons.tTmp3.txt=bEntity2.txt + if(type2.txt=="shutter") + { + page popupShutter + } + if(type2.txt=="input_sel") + { + page popupInSel + } + if(type2.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn2.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 bEntity3 + Attributes + ID : 34 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 122 + 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=type3.txt + pageIcons.tTmp1.txt=tEntity3.txt + pageIcons.tTmp2.txt=entn3.txt + pageIcons.tTmp3.txt=bEntity3.txt + if(type3.txt=="shutter") + { + page popupShutter + } + if(type3.txt=="input_sel") + { + page popupInSel + } + if(type3.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn3.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 bEntity4 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 213 + 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=type4.txt + pageIcons.tTmp1.txt=tEntity4.txt + pageIcons.tTmp2.txt=entn4.txt + pageIcons.tTmp3.txt=bEntity4.txt + if(type4.txt=="shutter") + { + page popupShutter + } + if(type4.txt=="input_sel") + { + page popupInSel + } + if(type4.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn4.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 bEntity5 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 304 + 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=type5.txt + pageIcons.tTmp1.txt=tEntity5.txt + pageIcons.tTmp2.txt=entn5.txt + pageIcons.tTmp3.txt=bEntity5.txt + if(type5.txt=="shutter") + { + page popupShutter + } + if(type5.txt=="input_sel") + { + page popupInSel + } + if(type5.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn5.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 bEntity6 + Attributes + ID : 53 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 400 + 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(entn.txt=="input_sel") + { + page popupInSel + } + if(type6.txt=="media_pl") + { + 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 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 409 y coordinate : 16 Width : 50 Height : 50 @@ -850,13 +1222,13 @@ Button bNext Button bPrev Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 27 y coordinate : 16 Width : 50 Height : 50 @@ -904,7 +1276,7 @@ Button bPrev Hotspot mSwipeNext Attributes - ID : 29 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -924,7 +1296,7 @@ Hotspot mSwipeNext Hotspot mSwipePrev Attributes - ID : 31 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -944,13 +1316,13 @@ Hotspot mSwipePrev Hotspot mSwipeUp Attributes - ID : 30 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 28 + x coordinate : 12 y coordinate : 0 Width : 426 Height : 9 @@ -964,7 +1336,7 @@ Hotspot mSwipeUp Timer tmCooldown Attributes - ID : 20 + ID : 17 Scope : local Period (ms): 100 Enabled : no @@ -973,9 +1345,27 @@ Timer tmCooldown Timer Event tmCooldown.en=0 +Timer tmLP + Attributes + ID : 37 + Scope : local + Period (ms): 500 + Enabled : no + + Events + Timer Event + if(tTmp.txt=="light") + { + page popupLight + } + if(tTmp.txt=="fan") + { + page popupFan + } + Timer tmSerial Attributes - ID : 5 + ID : 4 Scope : local Period (ms): 50 Enabled : yes @@ -1027,7 +1417,7 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { - //heading + // 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 @@ -1071,54 +1461,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 - //speaker current - spstr strCommand.txt,tSpeaker.txt,"~",12 - if(tSpeaker.txt!="") - { - tSpeaker.pco=1374 - }else - { - tSpeaker.pco=65535 - } - //speaker list - spstr strCommand.txt,vaSpeakerList.txt,"~",13 - if(vaSpeakerList.txt=="") - { - vis t6,0 - } - vaSpeakerPos.val=0 + spstr strCommand.txt,tPlayPause.txt,"~",9 // on off button - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { vis t5,0 @@ -1127,46 +1493,142 @@ Timer tmSerial vis t5,1 covx tTmp.txt,t5.pco,0,0 } - //tIconBtnEntityName - spstr strCommand.txt,vaMenu.txt,"~",15 - } - if(tInstruction.txt=="time") - { - // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 - } - if(tInstruction.txt=="dimmode") - { - // get value - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,dimValue,0,0 - // get value normal - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") + // shuffel btn + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="disable") { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") + vis tShuffle,0 + }else { - covx tTmp.txt,defaultFontColor,0,0 + vis tShuffle,1 + tShuffle.txt=tTmp.txt + } + // get Type + spstr strCommand.txt,type1.txt,"~",12 + // get internal name + 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,"~",14 + vis bEntity1,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,sys0,0,0 + bEntity1.pco=sys0 + // set name + spstr strCommand.txt,tEntity1.txt,"~",16 + vis tEntity1,1 + } + // get Type + spstr strCommand.txt,type2.txt,"~",18 + // get internal name + 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,"~",20 + vis bEntity2,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",21 + covx tTmp.txt,sys0,0,0 + bEntity2.pco=sys0 + // set name + spstr strCommand.txt,tEntity2.txt,"~",22 + vis tEntity2,1 + } + // get Type + spstr strCommand.txt,type3.txt,"~",24 + // get internal name + 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,"~",26 + vis bEntity3,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",27 + covx tTmp.txt,sys0,0,0 + bEntity3.pco=sys0 + // set name + spstr strCommand.txt,tEntity3.txt,"~",28 + vis tEntity3,1 + } + // get Type + spstr strCommand.txt,type4.txt,"~",30 + // get internal name + 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,"~",32 + vis bEntity4,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",33 + covx tTmp.txt,sys0,0,0 + bEntity4.pco=sys0 + // set name + spstr strCommand.txt,tEntity4.txt,"~",34 + vis tEntity4,1 + } + // get Type + spstr strCommand.txt,type5.txt,"~",36 + // get internal name + 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 + { + // 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=="timeout") - { - //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="pageType") { @@ -1232,10 +1694,44 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") { - page cardChart + covx tTmp.txt,defaultBcoColor,0,0 } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 } // end of user code udelete payloadLength-1 @@ -1247,20 +1743,11 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } Timer tmSleep Attributes - ID : 18 + ID : 15 Scope : local Period (ms): 1000 Enabled : yes @@ -1291,7 +1778,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 19 + ID : 16 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 170ee582..615572bb 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -10,10 +10,6 @@ pageTest 15 Component(s) 15 Line(s) of event code 15 Unique line(s) of event code -cardMedia - 34 Component(s) - 425 Line(s) of event code - 224 Unique line(s) of event code pageStartup 19 Component(s) 181 Line(s) of event code @@ -74,9 +70,13 @@ cardGrid 42 Component(s) 518 Line(s) of event code 294 Unique line(s) of event code +cardMedia + 57 Component(s) + 660 Line(s) of event code + 325 Unique line(s) of event code Total 18 Page(s) - 603 Component(s) - 7556 Line(s) of event code - 1941 Unique line(s) of event code + 626 Component(s) + 7791 Line(s) of event code + 1950 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index a99fab40..e02027c0 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -19,8 +19,15 @@ Page cardMedia vis tTmp,0 vis tId,0 vis t5,0 + 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++) { @@ -43,24 +50,150 @@ Variable (string) entn Text : Max. Text Size: 80 +Variable (string) entn1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn3 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn4 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +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: 750 +Variable (string) tEntity1 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity2 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity3 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity4 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity5 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity6 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + Variable (string) tSend Attributes Scope : local Text : Max. Text Size: 200 +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type1 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type3 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type4 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type5 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type6 + Attributes + Scope : local + Text : + Max. Text Size: 10 + Variable (string) vaMenu Attributes Scope : local Text : Max. Text Size: 50 +Variable (string) vaMenuType + Attributes + Scope : local + Text : + Max. Text Size: 50 + Variable (string) vaSpeakerList Attributes Scope : local @@ -190,16 +323,6 @@ Text t3 prints tSend.txt,0 prints crcval,2 -Text t4 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 10 - Text t5 Attributes Scope : local @@ -229,28 +352,6 @@ Text t5 prints tSend.txt,0 prints crcval,2 -Text t6 - 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 Press Event - //speaker - tSpeaker.pco=65535 - spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val - vaSpeakerPos.val+=1 - if(tSpeaker.txt=="") - { - vaSpeakerPos.val=0 - spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val - } - Text tAuthor Attributes Scope : local @@ -271,44 +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 tId - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 20 - Text tInstruction Attributes Scope : local @@ -348,15 +411,15 @@ Text tPlayPause prints tSend.txt,0 prints crcval,2 -Text tSpeaker +Text tShuffle Attributes Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : - Max. Text Size : 50 + Text : x + Max. Text Size : 10 Events Touch Press Event @@ -364,7 +427,7 @@ Text tSpeaker //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="speaker-sel,"+tSpeaker.txt + tSend.txt+="media-shuffle" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -387,16 +450,6 @@ Text tTitle Text : Max. Text Size : 50 -Text tTmp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - Picture p0 Attributes Scope : local @@ -435,6 +488,272 @@ Slider hVolume prints tSend.txt,0 prints crcval,2 +Button bEntity1 + 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=type1.txt + pageIcons.tTmp1.txt=tEntity1.txt + pageIcons.tTmp2.txt=entn1.txt + pageIcons.tTmp3.txt=bEntity1.txt + if(type1.txt=="shutter") + { + page popupShutter + } + if(type1.txt=="input_sel") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn1.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 bEntity2 + 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=type2.txt + pageIcons.tTmp1.txt=tEntity2.txt + pageIcons.tTmp2.txt=entn2.txt + pageIcons.tTmp3.txt=bEntity2.txt + if(type2.txt=="shutter") + { + page popupShutter + } + if(type2.txt=="input_sel") + { + page popupInSel + } + if(type2.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn2.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 bEntity3 + 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=type3.txt + pageIcons.tTmp1.txt=tEntity3.txt + pageIcons.tTmp2.txt=entn3.txt + pageIcons.tTmp3.txt=bEntity3.txt + if(type3.txt=="shutter") + { + page popupShutter + } + if(type3.txt=="input_sel") + { + page popupInSel + } + if(type3.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn3.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 bEntity4 + 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=type4.txt + pageIcons.tTmp1.txt=tEntity4.txt + pageIcons.tTmp2.txt=entn4.txt + pageIcons.tTmp3.txt=bEntity4.txt + if(type4.txt=="shutter") + { + page popupShutter + } + if(type4.txt=="input_sel") + { + page popupInSel + } + if(type4.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn4.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 bEntity5 + 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=type5.txt + pageIcons.tTmp1.txt=tEntity5.txt + pageIcons.tTmp2.txt=entn5.txt + pageIcons.tTmp3.txt=bEntity5.txt + if(type5.txt=="shutter") + { + page popupShutter + } + if(type5.txt=="input_sel") + { + page popupInSel + } + if(type5.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn5.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 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(entn.txt=="input_sel") + { + page popupInSel + } + if(type6.txt=="media_pl") + { + 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 @@ -542,6 +861,23 @@ Timer tmCooldown Timer Event tmCooldown.en=0 +Timer tmLP + Attributes + Scope : local + Period (ms): 500 + Enabled : no + + Events + Timer Event + if(tTmp.txt=="light") + { + page popupLight + } + if(tTmp.txt=="fan") + { + page popupFan + } + Timer tmSerial Attributes Scope : local @@ -595,7 +931,7 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { - //heading + // 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 @@ -639,54 +975,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 - //speaker current - spstr strCommand.txt,tSpeaker.txt,"~",12 - if(tSpeaker.txt!="") - { - tSpeaker.pco=1374 - }else - { - tSpeaker.pco=65535 - } - //speaker list - spstr strCommand.txt,vaSpeakerList.txt,"~",13 - if(vaSpeakerList.txt=="") - { - vis t6,0 - } - vaSpeakerPos.val=0 + spstr strCommand.txt,tPlayPause.txt,"~",9 // on off button - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { vis t5,0 @@ -695,46 +1007,142 @@ Timer tmSerial vis t5,1 covx tTmp.txt,t5.pco,0,0 } - //tIconBtnEntityName - spstr strCommand.txt,vaMenu.txt,"~",15 - } - if(tInstruction.txt=="time") - { - // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 - } - if(tInstruction.txt=="dimmode") - { - // get value - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,dimValue,0,0 - // get value normal - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") + // shuffel btn + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="disable") { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") + vis tShuffle,0 + }else { - covx tTmp.txt,defaultFontColor,0,0 + vis tShuffle,1 + tShuffle.txt=tTmp.txt + } + // get Type + spstr strCommand.txt,type1.txt,"~",12 + // get internal name + 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,"~",14 + vis bEntity1,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,sys0,0,0 + bEntity1.pco=sys0 + // set name + spstr strCommand.txt,tEntity1.txt,"~",16 + vis tEntity1,1 + } + // get Type + spstr strCommand.txt,type2.txt,"~",18 + // get internal name + 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,"~",20 + vis bEntity2,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",21 + covx tTmp.txt,sys0,0,0 + bEntity2.pco=sys0 + // set name + spstr strCommand.txt,tEntity2.txt,"~",22 + vis tEntity2,1 + } + // get Type + spstr strCommand.txt,type3.txt,"~",24 + // get internal name + 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,"~",26 + vis bEntity3,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",27 + covx tTmp.txt,sys0,0,0 + bEntity3.pco=sys0 + // set name + spstr strCommand.txt,tEntity3.txt,"~",28 + vis tEntity3,1 + } + // get Type + spstr strCommand.txt,type4.txt,"~",30 + // get internal name + 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,"~",32 + vis bEntity4,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",33 + covx tTmp.txt,sys0,0,0 + bEntity4.pco=sys0 + // set name + spstr strCommand.txt,tEntity4.txt,"~",34 + vis tEntity4,1 + } + // get Type + spstr strCommand.txt,type5.txt,"~",36 + // get internal name + 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 + { + // 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=="timeout") - { - //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="pageType") { @@ -800,10 +1208,44 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") { - page cardChart + covx tTmp.txt,defaultBcoColor,0,0 } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 } // end of user code udelete payloadLength-1 @@ -815,15 +1257,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } Timer tmSleep diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 0b09efc4..cb9fad5d 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -696,1023 +696,6 @@ │ Scope : local │ Period (ms): 50 │ Enabled : yes -│ --- HMI/n2t-out/cardMedia.txt -├── +++ HMI/US/portrait/n2t-out/cardMedia.txt -│ @@ -15,23 +15,16 @@ -│ dim=dimValueNormal -│ vis p0,0 -│ vis tSend,0 -│ vis tInstruction,0 -│ vis tTmp,0 -│ vis tId,0 -│ vis t5,0 -│ - 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) -│ { -│ b[sys0].bco=defaultBcoColor -│ b[sys0].pco=defaultFontColor -│ @@ -46,158 +39,32 @@ -│ -│ Variable (string) entn -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 80 -│ -│ -Variable (string) entn1 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 80 -│ - -│ -Variable (string) entn2 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 80 -│ - -│ -Variable (string) entn3 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 80 -│ - -│ -Variable (string) entn4 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 80 -│ - -│ -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: 750 -│ -│ -Variable (string) tEntity1 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tEntity2 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tEntity3 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tEntity4 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tEntity5 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tEntity6 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tId -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ Variable (string) tSend -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 200 -│ -│ -Variable (string) tTmp -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type1 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type2 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type3 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type4 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type5 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ -Variable (string) type6 -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 10 -│ - -│ Variable (string) vaMenu -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 50 -│ -│ -Variable (string) vaMenuType -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 50 -│ - -│ Variable (string) vaSpeakerList -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 400 -│ -│ Variable (int32) vaSpeakerPos -│ @@ -319,14 +186,24 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ +Text t4 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 10 -│ + -│ Text t5 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -348,14 +225,36 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ +Text t6 -│ + 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 Press Event -│ + //speaker -│ + tSpeaker.pco=65535 -│ + spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val -│ + vaSpeakerPos.val+=1 -│ + if(tSpeaker.txt=="") -│ + { -│ + vaSpeakerPos.val=0 -│ + spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val -│ + } -│ + -│ Text tAuthor -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -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 -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 20 -│ + -│ Text tInstruction -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -407,31 +344,31 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ -Text tShuffle -│ +Text tSpeaker -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ - Text : x -│ - Max. Text Size : 10 -│ + Text : -│ + Max. Text Size : 50 -│ -│ Events -│ Touch Press Event -│ // event,buttonPress2,entn,media-next -│ //craft command -│ tSend.txt="event,buttonPress2," -│ tSend.txt+=entn.txt+"," -│ - tSend.txt+="media-shuffle" -│ + tSend.txt+="speaker-sel,"+tSpeaker.txt -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -446,14 +383,24 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 50 -│ -│ +Text tTmp -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 10 -│ + -│ Picture p0 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ -│ @@ -484,280 +431,14 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ -Button bEntity1 -│ - 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=type1.txt -│ - pageIcons.tTmp1.txt=tEntity1.txt -│ - pageIcons.tTmp2.txt=entn1.txt -│ - pageIcons.tTmp3.txt=bEntity1.txt -│ - if(type1.txt=="shutter") -│ - { -│ - page popupShutter -│ - } -│ - if(type1.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - -│ - Touch Release Event -│ - tmLP.en=0 -│ - tSend.txt="event,buttonPress2,"+entn1.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 bEntity2 -│ - 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=type2.txt -│ - pageIcons.tTmp1.txt=tEntity2.txt -│ - pageIcons.tTmp2.txt=entn2.txt -│ - pageIcons.tTmp3.txt=bEntity2.txt -│ - if(type2.txt=="shutter") -│ - { -│ - page popupShutter -│ - } -│ - if(type2.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - if(type2.txt=="media_pl") -│ - { -│ - page popupInSel -│ - } -│ - -│ - Touch Release Event -│ - tmLP.en=0 -│ - tSend.txt="event,buttonPress2,"+entn2.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 bEntity3 -│ - 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=type3.txt -│ - pageIcons.tTmp1.txt=tEntity3.txt -│ - pageIcons.tTmp2.txt=entn3.txt -│ - pageIcons.tTmp3.txt=bEntity3.txt -│ - if(type3.txt=="shutter") -│ - { -│ - page popupShutter -│ - } -│ - if(type3.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - if(type3.txt=="media_pl") -│ - { -│ - page popupInSel -│ - } -│ - -│ - Touch Release Event -│ - tmLP.en=0 -│ - tSend.txt="event,buttonPress2,"+entn3.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 bEntity4 -│ - 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=type4.txt -│ - pageIcons.tTmp1.txt=tEntity4.txt -│ - pageIcons.tTmp2.txt=entn4.txt -│ - pageIcons.tTmp3.txt=bEntity4.txt -│ - if(type4.txt=="shutter") -│ - { -│ - page popupShutter -│ - } -│ - if(type4.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - if(type4.txt=="media_pl") -│ - { -│ - page popupInSel -│ - } -│ - -│ - Touch Release Event -│ - tmLP.en=0 -│ - tSend.txt="event,buttonPress2,"+entn4.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 bEntity5 -│ - 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=type5.txt -│ - pageIcons.tTmp1.txt=tEntity5.txt -│ - pageIcons.tTmp2.txt=entn5.txt -│ - pageIcons.tTmp3.txt=bEntity5.txt -│ - if(type5.txt=="shutter") -│ - { -│ - page popupShutter -│ - } -│ - if(type5.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - if(type5.txt=="media_pl") -│ - { -│ - page popupInSel -│ - } -│ - -│ - Touch Release Event -│ - tmLP.en=0 -│ - tSend.txt="event,buttonPress2,"+entn5.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 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(entn.txt=="input_sel") -│ - { -│ - page popupInSel -│ - } -│ - if(type6.txt=="media_pl") -│ - { -│ - 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 -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ @@ -857,31 +538,14 @@ -│ Period (ms): 100 -│ Enabled : no -│ -│ Events -│ Timer Event -│ tmCooldown.en=0 -│ -│ -Timer tmLP -│ - Attributes -│ - Scope : local -│ - Period (ms): 500 -│ - Enabled : no -│ - -│ - Events -│ - Timer Event -│ - if(tTmp.txt=="light") -│ - { -│ - page popupLight -│ - } -│ - if(tTmp.txt=="fan") -│ - { -│ - page popupFan -│ - } -│ - -│ Timer tmSerial -│ Attributes -│ Scope : local -│ Period (ms): 50 -│ Enabled : yes -│ -│ Events -│ @@ -927,15 +591,15 @@ -│ // here is the location where acual code should be -│ // write command to variable strCommand -│ ucopy strCommand.txt,4,payloadLength-5,0 -│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -│ spstr strCommand.txt,tInstruction.txt,"~",0 -│ if(tInstruction.txt=="entityUpd") -│ { -│ - // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 -│ + //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") -│ { -│ vis bPrev,0 -│ @@ -971,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 -│ + if(tSpeaker.txt!="") -│ + { -│ + tSpeaker.pco=1374 -│ + }else -│ + { -│ + tSpeaker.pco=65535 -│ + } -│ + //speaker list -│ + spstr strCommand.txt,vaSpeakerList.txt,"~",13 -│ + if(vaSpeakerList.txt=="") -│ + { -│ + vis t6,0 -│ + } -│ + vaSpeakerPos.val=0 -│ // on off button -│ - spstr strCommand.txt,tTmp.txt,"~",10 -│ + spstr strCommand.txt,tTmp.txt,"~",14 -│ 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,"~",11 -│ - if(tTmp.txt=="disable") -│ - { -│ - vis tShuffle,0 -│ - }else -│ + //tIconBtnEntityName -│ + spstr strCommand.txt,vaMenu.txt,"~",15 -│ + } -│ + if(tInstruction.txt=="time") -│ + { -│ + // get set time to global variable -│ + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ + } -│ + if(tInstruction.txt=="date") -│ + { -│ + // get set date to global variable -│ + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -│ + } -│ + if(tInstruction.txt=="dimmode") -│ + { -│ + // get value -│ + spstr strCommand.txt,tTmp.txt,"~",1 -│ + covx tTmp.txt,dimValue,0,0 -│ + // get value normal -│ + spstr strCommand.txt,tTmp.txt,"~",2 -│ + covx tTmp.txt,dimValueNormal,0,0 -│ + dim=dimValueNormal -│ + // get background color -│ + spstr strCommand.txt,tTmp.txt,"~",3 -│ + if(tTmp.txt!="") -│ { -│ - vis tShuffle,1 -│ - tShuffle.txt=tTmp.txt -│ + covx tTmp.txt,defaultBcoColor,0,0 -│ } -│ - // get Type -│ - spstr strCommand.txt,type1.txt,"~",12 -│ - // get internal name -│ - 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,"~",14 -│ - vis bEntity1,1 -│ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",15 -│ - covx tTmp.txt,sys0,0,0 -│ - bEntity1.pco=sys0 -│ - // set name -│ - spstr strCommand.txt,tEntity1.txt,"~",16 -│ - vis tEntity1,1 -│ - } -│ - // get Type -│ - spstr strCommand.txt,type2.txt,"~",18 -│ - // get internal name -│ - 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,"~",20 -│ - vis bEntity2,1 -│ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",21 -│ - covx tTmp.txt,sys0,0,0 -│ - bEntity2.pco=sys0 -│ - // set name -│ - spstr strCommand.txt,tEntity2.txt,"~",22 -│ - vis tEntity2,1 -│ - } -│ - // get Type -│ - spstr strCommand.txt,type3.txt,"~",24 -│ - // get internal name -│ - 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,"~",26 -│ - vis bEntity3,1 -│ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",27 -│ - covx tTmp.txt,sys0,0,0 -│ - bEntity3.pco=sys0 -│ - // set name -│ - spstr strCommand.txt,tEntity3.txt,"~",28 -│ - vis tEntity3,1 -│ - } -│ - // get Type -│ - spstr strCommand.txt,type4.txt,"~",30 -│ - // get internal name -│ - 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,"~",32 -│ - vis bEntity4,1 -│ - // change icon color -│ - spstr strCommand.txt,tTmp.txt,"~",33 -│ - covx tTmp.txt,sys0,0,0 -│ - bEntity4.pco=sys0 -│ - // set name -│ - spstr strCommand.txt,tEntity4.txt,"~",34 -│ - vis tEntity4,1 -│ - } -│ - // get Type -│ - spstr strCommand.txt,type5.txt,"~",36 -│ - // get internal name -│ - 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,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 -│ + covx tTmp.txt,defaultFontColor,0,0 -│ } -│ } -│ + if(tInstruction.txt=="timeout") -│ + { -│ + //set timeout to global var -│ + spstr strCommand.txt,tTmp.txt,"~",1 -│ + covx tTmp.txt,sleepTimeout,0,0 -│ + } -│ if(tInstruction.txt=="pageType") -│ { -│ sleepValue=0 -│ //command format pageType,specialPageName -│ //write name of speical page to tId -│ spstr strCommand.txt,tId.txt,"~",1 -│ //save second arg if there's one -│ @@ -1204,63 +796,38 @@ -│ { -│ page cardQR -│ } -│ if(tId.txt=="cardPower") -│ { -│ page cardPower -│ } -│ - } -│ - if(tInstruction.txt=="time") -│ - { -│ - // get set time to global variable -│ - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ - } -│ - if(tInstruction.txt=="date") -│ - { -│ - // get set date to global variable -│ - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -│ - } -│ - if(tInstruction.txt=="dimmode") -│ - { -│ - // get value -│ - spstr strCommand.txt,tTmp.txt,"~",1 -│ - covx tTmp.txt,dimValue,0,0 -│ - // get value normal -│ - spstr strCommand.txt,tTmp.txt,"~",2 -│ - covx tTmp.txt,dimValueNormal,0,0 -│ - dim=dimValueNormal -│ - // get background color -│ - spstr strCommand.txt,tTmp.txt,"~",3 -│ - if(tTmp.txt!="") -│ + if(tId.txt=="cardChart") -│ { -│ - covx tTmp.txt,defaultBcoColor,0,0 -│ - } -│ - // get font color -│ - spstr strCommand.txt,tTmp.txt,"~",4 -│ - if(tTmp.txt!="") -│ - { -│ - covx tTmp.txt,defaultFontColor,0,0 -│ + page cardChart -│ } -│ } -│ - if(tInstruction.txt=="timeout") -│ - { -│ - //set timeout to global var -│ - spstr strCommand.txt,tTmp.txt,"~",1 -│ - covx tTmp.txt,sleepTimeout,0,0 -│ - } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } -│ } -│ // next character -│ bufferPos++ -│ } -│ + if(bufferPos==usize) -│ + { -│ + // copy whole buffer to t1.txt, for debugging -│ + //ucopy t2.txt,0,usize,0 -│ + // ucopy n2.val,0,usize,0 -│ + // clear whole buffer -│ + //code_c -│ + //bufferPos=0 -│ + } -│ } -│ -│ Timer tmSleep -│ Attributes -│ Scope : local -│ Period (ms): 1000 -│ Enabled : yes │ --- 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 ee6e7889..7de43005 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-08 22:30:18.613127649 +0000 ++++ /dev/fd/62 2022-12-09 22:07:37.117380516 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt @@ -86,1023 +86,6 @@ + Scope : local + Period (ms): 50 + Enabled : yes -+I/n2t-out/cardMedia.txt -++ HMI/US/portrait/n2t-out/cardMedia.txt -+3 +15,16 @@ -+ dim=dimValueNormal -+ vis p0,0 -+ vis tSend,0 -+ vis tInstruction,0 -+ vis tTmp,0 -+ vis tId,0 -+ vis t5,0 -+ 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) -+ { -+ b[sys0].bco=defaultBcoColor -+ b[sys0].pco=defaultFontColor -+58 +39,32 @@ -+ -+e (string) entn -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 80 -+ -+e (string) entn1 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 80 -+ -+e (string) entn2 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 80 -+ -+e (string) entn3 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 80 -+ -+e (string) entn4 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 80 -+ -+e (string) entn5 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 80 -+ -+e (string) entn6 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 80 -+ -+e (string) strCommand -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 750 -+ -+e (string) tEntity1 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 20 -+ -+e (string) tEntity2 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 20 -+ -+e (string) tEntity3 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 20 -+ -+e (string) tEntity4 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 20 -+ -+e (string) tEntity5 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 20 -+ -+e (string) tEntity6 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 20 -+ -+e (string) tId -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 20 -+ -+e (string) tSend -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 200 -+ -+e (string) tTmp -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 10 -+ -+e (string) type1 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 10 -+ -+e (string) type2 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 10 -+ -+e (string) type3 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 10 -+ -+e (string) type4 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 10 -+ -+e (string) type5 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 10 -+ -+e (string) type6 -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 10 -+ -+e (string) vaMenu -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 50 -+ -+e (string) vaMenuType -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 50 -+ -+e (string) vaSpeakerList -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 400 -+ -+e (int32) vaSpeakerPos -+14 +186,24 @@ -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+ -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text :  -+ Max. Text Size : 10 -+ -+ -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+14 +225,36 @@ -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+ -+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 Press Event -+ //speaker -+ tSpeaker.pco=65535 -+ spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val -+ vaSpeakerPos.val+=1 -+ if(tSpeaker.txt=="") -+ { -+ vaSpeakerPos.val=0 -+ spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val -+ } -+ -+uthor -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+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 -+ prints tSend.txt,0 -+ prints crcval,2 -+ } -+ -+d -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 20 -+ -+nstruction -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+31 +344,31 @@ -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+huffle -+peaker -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : x -+ Max. Text Size : 10 -+ Text : -+ Max. Text Size : 50 -+ -+nts -+ Touch Press Event -+ // event,buttonPress2,entn,media-next -+ //craft command -+ tSend.txt="event,buttonPress2," -+ tSend.txt+=entn.txt+"," -+ tSend.txt+="media-shuffle" -+ tSend.txt+="speaker-sel,"+tSpeaker.txt -+ //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 +383,24 @@ -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 50 -+ -+mp -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 10 -+ -+ p0 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ -+280 +431,14 @@ -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+bEntity1 -+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=type1.txt -+ pageIcons.tTmp1.txt=tEntity1.txt -+ pageIcons.tTmp2.txt=entn1.txt -+ pageIcons.tTmp3.txt=bEntity1.txt -+ if(type1.txt=="shutter") -+ { -+ page popupShutter -+ } -+ if(type1.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn1.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 -+ -+bEntity2 -+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=type2.txt -+ pageIcons.tTmp1.txt=tEntity2.txt -+ pageIcons.tTmp2.txt=entn2.txt -+ pageIcons.tTmp3.txt=bEntity2.txt -+ if(type2.txt=="shutter") -+ { -+ page popupShutter -+ } -+ if(type2.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type2.txt=="media_pl") -+ { -+ page popupInSel -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn2.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 -+ -+bEntity3 -+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=type3.txt -+ pageIcons.tTmp1.txt=tEntity3.txt -+ pageIcons.tTmp2.txt=entn3.txt -+ pageIcons.tTmp3.txt=bEntity3.txt -+ if(type3.txt=="shutter") -+ { -+ page popupShutter -+ } -+ if(type3.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type3.txt=="media_pl") -+ { -+ page popupInSel -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn3.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 -+ -+bEntity4 -+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=type4.txt -+ pageIcons.tTmp1.txt=tEntity4.txt -+ pageIcons.tTmp2.txt=entn4.txt -+ pageIcons.tTmp3.txt=bEntity4.txt -+ if(type4.txt=="shutter") -+ { -+ page popupShutter -+ } -+ if(type4.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type4.txt=="media_pl") -+ { -+ page popupInSel -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn4.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 -+ -+bEntity5 -+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=type5.txt -+ pageIcons.tTmp1.txt=tEntity5.txt -+ pageIcons.tTmp2.txt=entn5.txt -+ pageIcons.tTmp3.txt=bEntity5.txt -+ if(type5.txt=="shutter") -+ { -+ page popupShutter -+ } -+ if(type5.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type5.txt=="media_pl") -+ { -+ page popupInSel -+ } -+ -+ Touch Release Event -+ tmLP.en=0 -+ tSend.txt="event,buttonPress2,"+entn5.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 -+ -+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(entn.txt=="input_sel") -+ { -+ page popupInSel -+ } -+ if(type6.txt=="media_pl") -+ { -+ 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 -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+31 +538,14 @@ -+ Period (ms): 100 -+ Enabled : no -+ -+nts -+ Timer Event -+ tmCooldown.en=0 -+ -+mLP -+ributes -+ Scope : local -+ Period (ms): 500 -+ Enabled : no -+ -+nts -+ Timer Event -+ if(tTmp.txt=="light") -+ { -+ page popupLight -+ } -+ if(tTmp.txt=="fan") -+ { -+ page popupFan -+ } -+ -+mSerial -+ributes -+ Scope : local -+ Period (ms): 50 -+ Enabled : yes -+ -+nts -+15 +591,15 @@ -+ // here is the location where acual code should be -+ // write command to variable strCommand -+ ucopy strCommand.txt,4,payloadLength-5,0 -+ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -+ spstr strCommand.txt,tInstruction.txt,"~",0 -+ if(tInstruction.txt=="entityUpd") -+ { -+ // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 -+ //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") -+ { -+ vis bPrev,0 -+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 -+ if(tSpeaker.txt!="") -+ { -+ tSpeaker.pco=1374 -+ }else -+ { -+ tSpeaker.pco=65535 -+ } -+ //speaker list -+ spstr strCommand.txt,vaSpeakerList.txt,"~",13 -+ if(vaSpeakerList.txt=="") -+ { -+ vis t6,0 -+ } -+ vaSpeakerPos.val=0 -+ // on off button -+ spstr strCommand.txt,tTmp.txt,"~",10 -+ spstr strCommand.txt,tTmp.txt,"~",14 -+ 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,"~",11 -+ if(tTmp.txt=="disable") -+ { -+ vis tShuffle,0 -+ }else -+ //tIconBtnEntityName -+ spstr strCommand.txt,vaMenu.txt,"~",15 -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } -+ if(tInstruction.txt=="date") -+ { -+ // get set date to global variable -+ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ } -+ if(tInstruction.txt=="dimmode") -+ { -+ // get value -+ spstr strCommand.txt,tTmp.txt,"~",1 -+ covx tTmp.txt,dimValue,0,0 -+ // get value normal -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+ // get background color -+ spstr strCommand.txt,tTmp.txt,"~",3 -+ if(tTmp.txt!="") -+ { -+ vis tShuffle,1 -+ tShuffle.txt=tTmp.txt -+ covx tTmp.txt,defaultBcoColor,0,0 -+ } -+ // get Type -+ spstr strCommand.txt,type1.txt,"~",12 -+ // get internal name -+ 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,"~",14 -+ vis bEntity1,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",15 -+ covx tTmp.txt,sys0,0,0 -+ bEntity1.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity1.txt,"~",16 -+ vis tEntity1,1 -+ } -+ // get Type -+ spstr strCommand.txt,type2.txt,"~",18 -+ // get internal name -+ 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,"~",20 -+ vis bEntity2,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",21 -+ covx tTmp.txt,sys0,0,0 -+ bEntity2.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity2.txt,"~",22 -+ vis tEntity2,1 -+ } -+ // get Type -+ spstr strCommand.txt,type3.txt,"~",24 -+ // get internal name -+ 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,"~",26 -+ vis bEntity3,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",27 -+ covx tTmp.txt,sys0,0,0 -+ bEntity3.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity3.txt,"~",28 -+ vis tEntity3,1 -+ } -+ // get Type -+ spstr strCommand.txt,type4.txt,"~",30 -+ // get internal name -+ 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,"~",32 -+ vis bEntity4,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",33 -+ covx tTmp.txt,sys0,0,0 -+ bEntity4.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity4.txt,"~",34 -+ vis tEntity4,1 -+ } -+ // get Type -+ spstr strCommand.txt,type5.txt,"~",36 -+ // get internal name -+ 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,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 -+ covx tTmp.txt,defaultFontColor,0,0 -+ } -+ } -+ if(tInstruction.txt=="timeout") -+ { -+ //set timeout to global var -+ spstr strCommand.txt,tTmp.txt,"~",1 -+ covx tTmp.txt,sleepTimeout,0,0 -+ } -+ if(tInstruction.txt=="pageType") -+ { -+ sleepValue=0 -+ //command format pageType,specialPageName -+ //write name of speical page to tId -+ spstr strCommand.txt,tId.txt,"~",1 -+ //save second arg if there's one -+,63 +796,38 @@ -+ { -+ page cardQR -+ } -+ if(tId.txt=="cardPower") -+ { -+ page cardPower -+ } -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } -+ if(tInstruction.txt=="date") -+ { -+ // get set date to global variable -+ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ } -+ if(tInstruction.txt=="dimmode") -+ { -+ // get value -+ spstr strCommand.txt,tTmp.txt,"~",1 -+ covx tTmp.txt,dimValue,0,0 -+ // get value normal -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ covx tTmp.txt,dimValueNormal,0,0 -+ dim=dimValueNormal -+ // get background color -+ spstr strCommand.txt,tTmp.txt,"~",3 -+ if(tTmp.txt!="") -+ if(tId.txt=="cardChart") -+ { -+ covx tTmp.txt,defaultBcoColor,0,0 -+ } -+ // get font color -+ spstr strCommand.txt,tTmp.txt,"~",4 -+ if(tTmp.txt!="") -+ { -+ covx tTmp.txt,defaultFontColor,0,0 -+ page cardChart -+ } -+ } -+ if(tInstruction.txt=="timeout") -+ { -+ //set timeout to global var -+ spstr strCommand.txt,tTmp.txt,"~",1 -+ covx tTmp.txt,sleepTimeout,0,0 -+ } -+ // end of user code -+ udelete payloadLength-1 -+ bufferPos=0 -+ } -+ } -+ } -+ } -+ // next character -+ bufferPos++ -+ } -+ if(bufferPos==usize) -+ { -+ // copy whole buffer to t1.txt, for debugging -+ //ucopy t2.txt,0,usize,0 -+ // ucopy n2.val,0,usize,0 -+ // clear whole buffer -+ //code_c -+ //bufferPos=0 -+ } -+ } -+ -+mSleep -+ributes -+ Scope : local -+ Period (ms): 1000 -+ Enabled : yes +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt +I/n2t-out/popupFan.txt diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 1f2677a4..66b16b4d 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -27,8 +27,15 @@ Page cardMedia vis tTmp,0 vis tId,0 vis t5,0 + 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++) { @@ -47,55 +54,202 @@ Page cardMedia Variable (string) entn Attributes - ID : 16 + ID : 14 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn1 + Attributes + ID : 42 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + ID : 43 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn3 + Attributes + ID : 44 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn4 + Attributes + ID : 45 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn5 + Attributes + ID : 47 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn6 + Attributes + ID : 54 Scope : local Text : Max. Text Size: 80 Variable (string) strCommand Attributes - ID : 6 + ID : 5 Scope : local Text : Max. Text Size: 750 +Variable (string) tEntity1 + Attributes + ID : 48 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity2 + Attributes + ID : 49 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity3 + Attributes + ID : 50 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity4 + Attributes + ID : 51 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity5 + Attributes + 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 : 29 + Scope : local + Text : + Max. Text Size: 20 + Variable (string) tSend Attributes - ID : 33 + ID : 27 Scope : local Text : Max. Text Size: 200 +Variable (string) tTmp + Attributes + ID : 30 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type1 + Attributes + ID : 38 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + ID : 39 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type3 + Attributes + ID : 40 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type4 + Attributes + ID : 41 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type5 + Attributes + 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 : 32 + ID : 26 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) vaMenuType + Attributes + ID : 31 Scope : local Text : Max. Text Size: 50 Variable (string) vaSpeakerList Attributes - ID : 25 + ID : 20 Scope : local Text : Max. Text Size: 400 Variable (int32) vaSpeakerPos Attributes - ID : 26 + ID : 21 Scope: local Value: 0 Text t0 Attributes - ID : 14 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 28 - y coordinate : 163 + x coordinate : 40 + y coordinate : 161 Width : 50 Height : 50 Effect : load @@ -137,14 +291,14 @@ Text t0 Text t1 Attributes - ID : 20 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 79 - y coordinate : 300 + x coordinate : 93 + y coordinate : 295 Width : 50 Height : 50 Effect : load @@ -187,14 +341,14 @@ Text t1 Text t2 Attributes - ID : 12 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 238 - y coordinate : 163 + x coordinate : 230 + y coordinate : 161 Width : 50 Height : 50 Effect : load @@ -236,14 +390,14 @@ Text t2 Text t3 Attributes - ID : 21 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 189 - y coordinate : 300 + x coordinate : 176 + y coordinate : 295 Width : 50 Height : 50 Effect : load @@ -284,7 +438,7 @@ Text t3 prints tSend.txt,0 prints crcval,2 -Text t4 +Text t5 Attributes ID : 22 Scope : local @@ -292,38 +446,8 @@ Text t4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 12 - y coordinate : 368 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 3 - Back. Color : 6371 - Font Color : 50712 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text t5 - Attributes - ID : 27 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 262 - y coordinate : 361 + x coordinate : 259 + y coordinate : 295 Width : 50 Height : 50 Effect : load @@ -363,51 +487,9 @@ Text t5 prints tSend.txt,0 prints crcval,2 -Text t6 - Attributes - ID : 24 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 263 - y coordinate : 425 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 3 - Back. Color : 6371 - Font Color : 50712 - 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 Press Event - //speaker - tSpeaker.pco=65535 - spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val - vaSpeakerPos.val+=1 - if(tSpeaker.txt=="") - { - vaSpeakerPos.val=0 - spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val - } - Text tAuthor Attributes - ID : 11 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -437,7 +519,7 @@ Text tAuthor Text tHeading Attributes - ID : 9 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -453,7 +535,7 @@ Text tHeading Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 1 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : center @@ -465,93 +547,15 @@ Text tHeading Horizontal Spacing : 0 Vertical Spacing : 0 -Text tIcon - Attributes - ID : 15 - 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 tId - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 3 - y coordinate : 268 - Width : 30 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 20 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tInstruction Attributes - ID : 7 + ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 220 + x coordinate : 122 y coordinate : 0 Width : 100 Height : 20 @@ -575,14 +579,14 @@ Text tInstruction Text tPlayPause Attributes - ID : 13 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 135 - y coordinate : 163 + y coordinate : 161 Width : 50 Height : 50 Effect : load @@ -622,17 +626,17 @@ Text tPlayPause prints tSend.txt,0 prints crcval,2 -Text tSpeaker +Text tShuffle Attributes - ID : 23 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 12 - y coordinate : 425 - Width : 244 + x coordinate : 10 + y coordinate : 295 + Width : 50 Height : 50 Effect : load Effect Priority : 0 @@ -640,14 +644,14 @@ Text tSpeaker Fill : solid color Style : flat Associated Keyboard : none - Font ID : 0 + Font ID : 3 Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : left + Font Color : 50712 + Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : - Max. Text Size : 50 + Text : x + Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -658,7 +662,7 @@ Text tSpeaker //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="speaker-sel,"+tSpeaker.txt + tSend.txt+="media-shuffle" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -673,7 +677,7 @@ Text tSpeaker Text tTitle Attributes - ID : 10 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -701,36 +705,6 @@ Text tTitle Horizontal Spacing : 0 Vertical Spacing : 0 -Text tTmp - Attributes - ID : 2 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 5 - y coordinate : 235 - Width : 27 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Picture p0 Attributes ID : 1 @@ -750,7 +724,7 @@ Picture p0 Slider hVolume Attributes - ID : 28 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -794,9 +768,407 @@ Slider hVolume prints tSend.txt,0 prints crcval,2 +Button bEntity1 + Attributes + ID : 32 + 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 + 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=type1.txt + pageIcons.tTmp1.txt=tEntity1.txt + pageIcons.tTmp2.txt=entn1.txt + pageIcons.tTmp3.txt=bEntity1.txt + if(type1.txt=="shutter") + { + page popupShutter + } + if(type1.txt=="input_sel") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn1.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 bEntity2 + Attributes + ID : 33 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 390 + 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=type2.txt + pageIcons.tTmp1.txt=tEntity2.txt + pageIcons.tTmp2.txt=entn2.txt + pageIcons.tTmp3.txt=bEntity2.txt + if(type2.txt=="shutter") + { + page popupShutter + } + if(type2.txt=="input_sel") + { + page popupInSel + } + if(type2.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn2.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 bEntity3 + Attributes + ID : 34 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 72 + y coordinate : 390 + 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=type3.txt + pageIcons.tTmp1.txt=tEntity3.txt + pageIcons.tTmp2.txt=entn3.txt + pageIcons.tTmp3.txt=bEntity3.txt + if(type3.txt=="shutter") + { + page popupShutter + } + if(type3.txt=="input_sel") + { + page popupInSel + } + if(type3.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn3.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 bEntity4 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 133 + y coordinate : 390 + 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=type4.txt + pageIcons.tTmp1.txt=tEntity4.txt + pageIcons.tTmp2.txt=entn4.txt + pageIcons.tTmp3.txt=bEntity4.txt + if(type4.txt=="shutter") + { + page popupShutter + } + if(type4.txt=="input_sel") + { + page popupInSel + } + if(type4.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn4.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 bEntity5 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 194 + y coordinate : 390 + 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=type5.txt + pageIcons.tTmp1.txt=tEntity5.txt + pageIcons.tTmp2.txt=entn5.txt + pageIcons.tTmp3.txt=bEntity5.txt + if(type5.txt=="shutter") + { + page popupShutter + } + if(type5.txt=="input_sel") + { + page popupInSel + } + if(type5.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn5.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 bEntity6 + Attributes + ID : 53 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 255 + y coordinate : 390 + 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(entn.txt=="input_sel") + { + page popupInSel + } + if(type6.txt=="media_pl") + { + 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 : 3 + ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -850,7 +1222,7 @@ Button bNext Button bPrev Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -904,14 +1276,14 @@ Button bPrev Hotspot mSwipeNext Attributes - ID : 29 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 311 - y coordinate : 0 + y coordinate : 5 Width : 8 Height : 470 Effect : load @@ -924,16 +1296,16 @@ Hotspot mSwipeNext Hotspot mSwipePrev Attributes - ID : 31 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 0 - Width : 8 - Height : 470 + y coordinate : 5 + Width : 9 + Height : 310 Effect : load Effect Priority : 0 Effect Time : 300 @@ -944,15 +1316,15 @@ Hotspot mSwipePrev Hotspot mSwipeUp Attributes - ID : 30 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 10 + x coordinate : 12 y coordinate : 0 - Width : 300 + Width : 301 Height : 9 Effect : load Effect Priority : 0 @@ -964,7 +1336,7 @@ Hotspot mSwipeUp Timer tmCooldown Attributes - ID : 19 + ID : 17 Scope : local Period (ms): 100 Enabled : no @@ -973,9 +1345,27 @@ Timer tmCooldown Timer Event tmCooldown.en=0 +Timer tmLP + Attributes + ID : 37 + Scope : local + Period (ms): 500 + Enabled : no + + Events + Timer Event + if(tTmp.txt=="light") + { + page popupLight + } + if(tTmp.txt=="fan") + { + page popupFan + } + Timer tmSerial Attributes - ID : 5 + ID : 4 Scope : local Period (ms): 50 Enabled : yes @@ -1027,7 +1417,7 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { - //heading + // 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 @@ -1071,54 +1461,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 - //speaker current - spstr strCommand.txt,tSpeaker.txt,"~",12 - if(tSpeaker.txt!="") - { - tSpeaker.pco=1374 - }else - { - tSpeaker.pco=65535 - } - //speaker list - spstr strCommand.txt,vaSpeakerList.txt,"~",13 - if(vaSpeakerList.txt=="") - { - vis t6,0 - } - vaSpeakerPos.val=0 + spstr strCommand.txt,tPlayPause.txt,"~",9 // on off button - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { vis t5,0 @@ -1127,46 +1493,142 @@ Timer tmSerial vis t5,1 covx tTmp.txt,t5.pco,0,0 } - //tIconBtnEntityName - spstr strCommand.txt,vaMenu.txt,"~",15 - } - if(tInstruction.txt=="time") - { - // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 - } - if(tInstruction.txt=="dimmode") - { - // get value - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,dimValue,0,0 - // get value normal - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") + // shuffel btn + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="disable") { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") + vis tShuffle,0 + }else { - covx tTmp.txt,defaultFontColor,0,0 + vis tShuffle,1 + tShuffle.txt=tTmp.txt + } + // get Type + spstr strCommand.txt,type1.txt,"~",12 + // get internal name + 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,"~",14 + vis bEntity1,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,sys0,0,0 + bEntity1.pco=sys0 + // set name + spstr strCommand.txt,tEntity1.txt,"~",16 + vis tEntity1,1 + } + // get Type + spstr strCommand.txt,type2.txt,"~",18 + // get internal name + 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,"~",20 + vis bEntity2,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",21 + covx tTmp.txt,sys0,0,0 + bEntity2.pco=sys0 + // set name + spstr strCommand.txt,tEntity2.txt,"~",22 + vis tEntity2,1 + } + // get Type + spstr strCommand.txt,type3.txt,"~",24 + // get internal name + 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,"~",26 + vis bEntity3,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",27 + covx tTmp.txt,sys0,0,0 + bEntity3.pco=sys0 + // set name + spstr strCommand.txt,tEntity3.txt,"~",28 + vis tEntity3,1 + } + // get Type + spstr strCommand.txt,type4.txt,"~",30 + // get internal name + 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,"~",32 + vis bEntity4,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",33 + covx tTmp.txt,sys0,0,0 + bEntity4.pco=sys0 + // set name + spstr strCommand.txt,tEntity4.txt,"~",34 + vis tEntity4,1 + } + // get Type + spstr strCommand.txt,type5.txt,"~",36 + // get internal name + 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 + { + // 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=="timeout") - { - //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="pageType") { @@ -1232,10 +1694,44 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") { - page cardChart + covx tTmp.txt,defaultBcoColor,0,0 } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 } // end of user code udelete payloadLength-1 @@ -1247,20 +1743,11 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } Timer tmSleep Attributes - ID : 17 + ID : 15 Scope : local Period (ms): 1000 Enabled : yes @@ -1291,7 +1778,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 18 + ID : 16 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 613fa30b..251ffecf 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -50,10 +50,6 @@ popupThermo 44 Component(s) 519 Line(s) of event code 274 Unique line(s) of event code -cardMedia - 34 Component(s) - 425 Line(s) of event code - 224 Unique line(s) of event code cardAlarm 40 Component(s) 443 Line(s) of event code @@ -62,6 +58,10 @@ cardGrid 42 Component(s) 518 Line(s) of event code 294 Unique line(s) of event code +cardMedia + 57 Component(s) + 660 Line(s) of event code + 325 Unique line(s) of event code screensaver 45 Component(s) 400 Line(s) of event code @@ -77,6 +77,6 @@ cardEntities Total 18 Page(s) - 615 Component(s) - 7783 Line(s) of event code - 2014 Unique line(s) of event code + 638 Component(s) + 8018 Line(s) of event code + 2023 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index a99fab40..e02027c0 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -19,8 +19,15 @@ Page cardMedia vis tTmp,0 vis tId,0 vis t5,0 + 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++) { @@ -43,24 +50,150 @@ Variable (string) entn Text : Max. Text Size: 80 +Variable (string) entn1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn3 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn4 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +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: 750 +Variable (string) tEntity1 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity2 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity3 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity4 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity5 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tEntity6 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + Variable (string) tSend Attributes Scope : local Text : Max. Text Size: 200 +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type1 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type3 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type4 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type5 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type6 + Attributes + Scope : local + Text : + Max. Text Size: 10 + Variable (string) vaMenu Attributes Scope : local Text : Max. Text Size: 50 +Variable (string) vaMenuType + Attributes + Scope : local + Text : + Max. Text Size: 50 + Variable (string) vaSpeakerList Attributes Scope : local @@ -190,16 +323,6 @@ Text t3 prints tSend.txt,0 prints crcval,2 -Text t4 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 10 - Text t5 Attributes Scope : local @@ -229,28 +352,6 @@ Text t5 prints tSend.txt,0 prints crcval,2 -Text t6 - 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 Press Event - //speaker - tSpeaker.pco=65535 - spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val - vaSpeakerPos.val+=1 - if(tSpeaker.txt=="") - { - vaSpeakerPos.val=0 - spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val - } - Text tAuthor Attributes Scope : local @@ -271,44 +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 tId - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 20 - Text tInstruction Attributes Scope : local @@ -348,15 +411,15 @@ Text tPlayPause prints tSend.txt,0 prints crcval,2 -Text tSpeaker +Text tShuffle Attributes Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : - Max. Text Size : 50 + Text : x + Max. Text Size : 10 Events Touch Press Event @@ -364,7 +427,7 @@ Text tSpeaker //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="speaker-sel,"+tSpeaker.txt + tSend.txt+="media-shuffle" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -387,16 +450,6 @@ Text tTitle Text : Max. Text Size : 50 -Text tTmp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - Picture p0 Attributes Scope : local @@ -435,6 +488,272 @@ Slider hVolume prints tSend.txt,0 prints crcval,2 +Button bEntity1 + 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=type1.txt + pageIcons.tTmp1.txt=tEntity1.txt + pageIcons.tTmp2.txt=entn1.txt + pageIcons.tTmp3.txt=bEntity1.txt + if(type1.txt=="shutter") + { + page popupShutter + } + if(type1.txt=="input_sel") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn1.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 bEntity2 + 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=type2.txt + pageIcons.tTmp1.txt=tEntity2.txt + pageIcons.tTmp2.txt=entn2.txt + pageIcons.tTmp3.txt=bEntity2.txt + if(type2.txt=="shutter") + { + page popupShutter + } + if(type2.txt=="input_sel") + { + page popupInSel + } + if(type2.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn2.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 bEntity3 + 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=type3.txt + pageIcons.tTmp1.txt=tEntity3.txt + pageIcons.tTmp2.txt=entn3.txt + pageIcons.tTmp3.txt=bEntity3.txt + if(type3.txt=="shutter") + { + page popupShutter + } + if(type3.txt=="input_sel") + { + page popupInSel + } + if(type3.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn3.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 bEntity4 + 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=type4.txt + pageIcons.tTmp1.txt=tEntity4.txt + pageIcons.tTmp2.txt=entn4.txt + pageIcons.tTmp3.txt=bEntity4.txt + if(type4.txt=="shutter") + { + page popupShutter + } + if(type4.txt=="input_sel") + { + page popupInSel + } + if(type4.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn4.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 bEntity5 + 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=type5.txt + pageIcons.tTmp1.txt=tEntity5.txt + pageIcons.tTmp2.txt=entn5.txt + pageIcons.tTmp3.txt=bEntity5.txt + if(type5.txt=="shutter") + { + page popupShutter + } + if(type5.txt=="input_sel") + { + page popupInSel + } + if(type5.txt=="media_pl") + { + page popupInSel + } + + Touch Release Event + tmLP.en=0 + tSend.txt="event,buttonPress2,"+entn5.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 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(entn.txt=="input_sel") + { + page popupInSel + } + if(type6.txt=="media_pl") + { + 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 @@ -542,6 +861,23 @@ Timer tmCooldown Timer Event tmCooldown.en=0 +Timer tmLP + Attributes + Scope : local + Period (ms): 500 + Enabled : no + + Events + Timer Event + if(tTmp.txt=="light") + { + page popupLight + } + if(tTmp.txt=="fan") + { + page popupFan + } + Timer tmSerial Attributes Scope : local @@ -595,7 +931,7 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { - //heading + // 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 @@ -639,54 +975,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 - //speaker current - spstr strCommand.txt,tSpeaker.txt,"~",12 - if(tSpeaker.txt!="") - { - tSpeaker.pco=1374 - }else - { - tSpeaker.pco=65535 - } - //speaker list - spstr strCommand.txt,vaSpeakerList.txt,"~",13 - if(vaSpeakerList.txt=="") - { - vis t6,0 - } - vaSpeakerPos.val=0 + spstr strCommand.txt,tPlayPause.txt,"~",9 // on off button - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { vis t5,0 @@ -695,46 +1007,142 @@ Timer tmSerial vis t5,1 covx tTmp.txt,t5.pco,0,0 } - //tIconBtnEntityName - spstr strCommand.txt,vaMenu.txt,"~",15 - } - if(tInstruction.txt=="time") - { - // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 - } - if(tInstruction.txt=="date") - { - // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 - } - if(tInstruction.txt=="dimmode") - { - // get value - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,dimValue,0,0 - // get value normal - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") + // shuffel btn + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="disable") { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") + vis tShuffle,0 + }else { - covx tTmp.txt,defaultFontColor,0,0 + vis tShuffle,1 + tShuffle.txt=tTmp.txt + } + // get Type + spstr strCommand.txt,type1.txt,"~",12 + // get internal name + 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,"~",14 + vis bEntity1,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,sys0,0,0 + bEntity1.pco=sys0 + // set name + spstr strCommand.txt,tEntity1.txt,"~",16 + vis tEntity1,1 + } + // get Type + spstr strCommand.txt,type2.txt,"~",18 + // get internal name + 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,"~",20 + vis bEntity2,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",21 + covx tTmp.txt,sys0,0,0 + bEntity2.pco=sys0 + // set name + spstr strCommand.txt,tEntity2.txt,"~",22 + vis tEntity2,1 + } + // get Type + spstr strCommand.txt,type3.txt,"~",24 + // get internal name + 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,"~",26 + vis bEntity3,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",27 + covx tTmp.txt,sys0,0,0 + bEntity3.pco=sys0 + // set name + spstr strCommand.txt,tEntity3.txt,"~",28 + vis tEntity3,1 + } + // get Type + spstr strCommand.txt,type4.txt,"~",30 + // get internal name + 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,"~",32 + vis bEntity4,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",33 + covx tTmp.txt,sys0,0,0 + bEntity4.pco=sys0 + // set name + spstr strCommand.txt,tEntity4.txt,"~",34 + vis tEntity4,1 + } + // get Type + spstr strCommand.txt,type5.txt,"~",36 + // get internal name + 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 + { + // 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=="timeout") - { - //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="pageType") { @@ -800,10 +1208,44 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") { - page cardChart + covx tTmp.txt,defaultBcoColor,0,0 } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 } // end of user code udelete payloadLength-1 @@ -815,15 +1257,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } Timer tmSleep