diff --git a/.github/issue-close-app.yml b/.github/issue-close-app.yml index 6b66c4d7..3b4abed0 100644 --- a/.github/issue-close-app.yml +++ b/.github/issue-close-app.yml @@ -24,9 +24,9 @@ issueConfigs: - content: # template 1: bug report - "PROBLEM DESCRIPTION" - - "REQUESTED INFORMATION" - - "TO REPRODUCE" - - "EXPECTED BEHAVIOUR" +# - "REQUESTED INFORMATION" +# - "TO REPRODUCE" +# - "EXPECTED BEHAVIOUR" - content: # template 2: feature request - "FEATURE DESCRIPTION" diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 1102c0a7..6a6184bb 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -12,6 +12,329 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup +├── cardMedia.txt +│ @@ -637,14 +637,276 @@ +│ vis bNext,1 +│ bNext.txt="" +│ } +│ //entity name +│ spstr strCommand.txt,entn.txt,"~",3 +│ //icon +│ spstr strCommand.txt,tIcon.txt,"~",4 +│ + //title +│ + spstr strCommand.txt,tTitle.txt,"~",5 +│ + //author +│ + spstr strCommand.txt,tAuthor.txt,"~",6 +│ + //volume +│ + spstr strCommand.txt,tTmp.txt,"~",7 +│ + covx tTmp.txt,sys0,0,0 +│ + hVolume.val=sys0 +│ + //icon +│ + spstr strCommand.txt,tPlayPause.txt,"~",8 +│ + //speaker current +│ + spstr strCommand.txt,tSpeaker.txt,"~",9 +│ + if(tSpeaker.txt!="") +│ + { +│ + tSpeaker.pco=1374 +│ + }else +│ + { +│ + tSpeaker.pco=65535 +│ + } +│ + //speaker list +│ + spstr strCommand.txt,vaSpeakerList.txt,"~",10 +│ + if(vaSpeakerList.txt=="") +│ + { +│ + vis t6,0 +│ + } +│ + vaSpeakerPos.val=0 +│ + // on off button +│ + spstr strCommand.txt,tTmp.txt,"~",11 +│ + if(tTmp.txt=="disable") +│ + { +│ + vis t5,0 +│ + }else +│ + { +│ + vis t5,1 +│ + covx tTmp.txt,t5.pco,0,0 +│ + } +│ + //tIconBtnEntityName +│ + spstr strCommand.txt,vaMenu.txt,"~",12 +│ + } +│ + 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!="") +│ + { +│ + 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 +│ + } +│ + 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 +│ + spstr strCommand.txt,tTmp.txt,"~",2 +│ + //save third arg if there's one +│ + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ + udelete payloadLength-1 +│ + bufferPos=0 +│ + if(tId.txt=="pageStartup") +│ + { +│ + page pageStartup +│ + } +│ + if(tId.txt=="screensaver") +│ + { +│ + page screensaver +│ + } +│ + if(tId.txt=="cardEntities") +│ + { +│ + page cardEntities +│ + } +│ + if(tId.txt=="cardGrid") +│ + { +│ + page cardGrid +│ + } +│ + if(tId.txt=="popupLight") +│ + { +│ + pageIcons.tTmp1.txt=tTmp.txt +│ + page popupLight +│ + } +│ + if(tId.txt=="popupShutter") +│ + { +│ + pageIcons.tTmp1.txt=tTmp.txt +│ + page popupShutter +│ + } +│ + if(tId.txt=="popupNotify") +│ + { +│ + page popupNotify +│ + } +│ + if(tId.txt=="cardThermo") +│ + { +│ + page cardThermo +│ + } +│ + if(tId.txt=="cardMedia") +│ + { +│ + page cardMedia +│ + } +│ + if(tId.txt=="cardAlarm") +│ + { +│ + page cardAlarm +│ + } +│ + if(tId.txt=="cardQR") +│ + { +│ + page cardQR +│ + } +│ + if(tId.txt=="cardPower") +│ + { +│ + page cardPower +│ + } +│ + } +│ + // 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 +│ + +│ + Events +│ + Timer Event +│ + // data available +│ + if(usize>1) +│ + { +│ + bufferPos=0 +│ + while(bufferPos1) { - sleepValue+=1 - if(sleepTimeout<=sleepValue) + bufferPos=0 + while(bufferPos1) { - sleepValue+=1 - if(sleepTimeout<=sleepValue) + bufferPos=0 + while(bufferPos