mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-21 23:14:25 +01:00
add color fields on cardMedia implements #584 (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
8776498241
commit
dd2bdacb6d
@@ -12,6 +12,329 @@
|
|||||||
│ - // fix touch offset
|
│ - // fix touch offset
|
||||||
│ - lcd_dev fffb 0002 0000 0020
|
│ - lcd_dev fffb 0002 0000 0020
|
||||||
│ - page pageStartup
|
│ - 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(bufferPos<usize)
|
||||||
|
│ + {
|
||||||
|
│ + // check for 0x55 0xBB - Command Init Secuence
|
||||||
|
│ + if(u[bufferPos]==187&&u[bufferPos-1]==85)
|
||||||
|
│ + {
|
||||||
|
│ + //remove garbage at the start of the buffer if there's any to free buffer for command
|
||||||
|
│ + if(u[bufferPos]!=1)
|
||||||
|
│ + {
|
||||||
|
│ + udelete bufferPos-1
|
||||||
|
│ + }
|
||||||
|
│ + //instruction is now aligned with buffer, because we deleted garbage before instrcution
|
||||||
|
│ + //get length after init sequence (check if there are more than to bytes in buffer)
|
||||||
|
│ + if(3<usize)
|
||||||
|
│ + {
|
||||||
|
│ + // check if serial buffer has reached the announced length
|
||||||
|
│ + ucopy payloadLength,2,2,0
|
||||||
|
│ + // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
|
||||||
|
│ + payloadLength+=3
|
||||||
|
│ + // payload length does also not contain crc, so we are adding another 2 bytes for crc
|
||||||
|
│ + payloadLength+=2
|
||||||
|
│ + if(payloadLength<usize)
|
||||||
|
│ + {
|
||||||
|
│ + // calculate crc
|
||||||
|
│ + crcrest 1,0xFFFF
|
||||||
|
│ + // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
|
||||||
|
│ + //crcputu 3,u[2]
|
||||||
|
│ + // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
|
||||||
|
│ + crcputu 0,payloadLength-1
|
||||||
|
│ + // get recived crc to be able to compare it
|
||||||
|
│ + ucopy recvCrc,payloadLength-1,2,0
|
||||||
|
│ + // compare crc with recived value
|
||||||
|
│ + if(crcval==recvCrc)
|
||||||
|
│ + {
|
||||||
|
│ + // crc is okay
|
||||||
|
│ + // 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")
|
||||||
|
│ + {
|
||||||
|
│ + //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
|
||||||
|
│ + tsw mSwipePrev,0
|
||||||
|
│ + tsw mSwipeUp,0
|
||||||
|
│ + }
|
||||||
|
│ + if(tTmp.txt=="1")
|
||||||
|
│ + {
|
||||||
|
│ + vis bPrev,1
|
||||||
|
│ + tsw mSwipePrev,1
|
||||||
|
│ + tsw mSwipeUp,0
|
||||||
|
│ + bPrev.txt="î°"
|
||||||
|
│ + }
|
||||||
|
│ + if(tTmp.txt=="2")
|
||||||
|
│ + {
|
||||||
|
│ + vis bPrev,1
|
||||||
|
│ + tsw mSwipePrev,0
|
||||||
|
│ + tsw mSwipeUp,1
|
||||||
|
│ + bPrev.txt="î¶"
|
||||||
|
│ + }
|
||||||
|
│ + spstr tId.txt,tTmp.txt,"|",1
|
||||||
|
│ + if(tTmp.txt=="0")
|
||||||
|
│ + {
|
||||||
|
│ + vis bNext,0
|
||||||
|
│ + tsw mSwipeNext,0
|
||||||
|
│ + }
|
||||||
|
│ + if(tTmp.txt=="1")
|
||||||
|
│ + {
|
||||||
|
│ + vis bNext,1
|
||||||
|
│ + tsw mSwipeNext,1
|
||||||
|
│ + bNext.txt="î³"
|
||||||
|
│ + }
|
||||||
|
│ + if(tTmp.txt=="2")
|
||||||
|
│ + {
|
||||||
|
│ + vis bNext,1
|
||||||
|
│ + bNext.txt="î"
|
||||||
|
│ + }
|
||||||
|
│ + //entity name
|
||||||
|
│ + spstr strCommand.txt,entn.txt,"~",3
|
||||||
|
│ + //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
|
||||||
|
│ @@ -818,44 +1080,14 @@
|
||||||
|
│ // 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
|
||||||
|
│ - if(sleepTimeout!=0&&dimValue!=dim)
|
||||||
|
│ - {
|
||||||
|
│ - sleepValue+=1
|
||||||
|
│ - if(sleepTimeout<=sleepValue)
|
||||||
|
│ - {
|
||||||
|
│ - sleepValue=0
|
||||||
|
│ - dim=dimValue
|
||||||
|
│ - tSend.txt="event,sleepReached,cardMedia"
|
||||||
|
│ - //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
|
||||||
|
│ - }
|
||||||
|
│ - }
|
||||||
|
│ -
|
||||||
|
│ TouchCap tc0
|
||||||
|
│ Attributes
|
||||||
|
│ Scope: local
|
||||||
|
│ Value: 0
|
||||||
|
│
|
||||||
|
│ Events
|
||||||
|
│ Touch Press Event
|
||||||
├── pageStartup.txt
|
├── pageStartup.txt
|
||||||
│ @@ -173,15 +173,15 @@
|
│ @@ -173,15 +173,15 @@
|
||||||
│ Max. Text Size : 10
|
│ Max. Text Size : 10
|
||||||
|
|||||||
@@ -1245,25 +1245,275 @@ Timer tmSleep
|
|||||||
|
|
||||||
Events
|
Events
|
||||||
Timer Event
|
Timer Event
|
||||||
if(sleepTimeout!=0&&dimValue!=dim)
|
// data available
|
||||||
|
if(usize>1)
|
||||||
{
|
{
|
||||||
sleepValue+=1
|
bufferPos=0
|
||||||
if(sleepTimeout<=sleepValue)
|
while(bufferPos<usize)
|
||||||
{
|
{
|
||||||
sleepValue=0
|
// check for 0x55 0xBB - Command Init Secuence
|
||||||
dim=dimValue
|
if(u[bufferPos]==187&&u[bufferPos-1]==85)
|
||||||
tSend.txt="event,sleepReached,cardMedia"
|
{
|
||||||
//send calc crc
|
//remove garbage at the start of the buffer if there's any to free buffer for command
|
||||||
btlen tSend.txt,sys0
|
if(u[bufferPos]!=1)
|
||||||
crcrest 1,0xffff // reset CRC
|
{
|
||||||
crcputh 55 bb
|
udelete bufferPos-1
|
||||||
crcputs sys0,2
|
}
|
||||||
crcputs tSend.txt,0
|
//instruction is now aligned with buffer, because we deleted garbage before instrcution
|
||||||
//send cmd
|
//get length after init sequence (check if there are more than to bytes in buffer)
|
||||||
printh 55 bb
|
if(3<usize)
|
||||||
prints sys0,2
|
{
|
||||||
prints tSend.txt,0
|
// check if serial buffer has reached the announced length
|
||||||
prints crcval,2
|
ucopy payloadLength,2,2,0
|
||||||
|
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
|
||||||
|
payloadLength+=3
|
||||||
|
// payload length does also not contain crc, so we are adding another 2 bytes for crc
|
||||||
|
payloadLength+=2
|
||||||
|
if(payloadLength<usize)
|
||||||
|
{
|
||||||
|
// calculate crc
|
||||||
|
crcrest 1,0xFFFF
|
||||||
|
// u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
|
||||||
|
//crcputu 3,u[2]
|
||||||
|
// u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
|
||||||
|
crcputu 0,payloadLength-1
|
||||||
|
// get recived crc to be able to compare it
|
||||||
|
ucopy recvCrc,payloadLength-1,2,0
|
||||||
|
// compare crc with recived value
|
||||||
|
if(crcval==recvCrc)
|
||||||
|
{
|
||||||
|
// crc is okay
|
||||||
|
// 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")
|
||||||
|
{
|
||||||
|
//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
|
||||||
|
tsw mSwipePrev,0
|
||||||
|
tsw mSwipeUp,0
|
||||||
|
}
|
||||||
|
if(tTmp.txt=="1")
|
||||||
|
{
|
||||||
|
vis bPrev,1
|
||||||
|
tsw mSwipePrev,1
|
||||||
|
tsw mSwipeUp,0
|
||||||
|
bPrev.txt="î°"
|
||||||
|
}
|
||||||
|
if(tTmp.txt=="2")
|
||||||
|
{
|
||||||
|
vis bPrev,1
|
||||||
|
tsw mSwipePrev,0
|
||||||
|
tsw mSwipeUp,1
|
||||||
|
bPrev.txt="î¶"
|
||||||
|
}
|
||||||
|
spstr tId.txt,tTmp.txt,"|",1
|
||||||
|
if(tTmp.txt=="0")
|
||||||
|
{
|
||||||
|
vis bNext,0
|
||||||
|
tsw mSwipeNext,0
|
||||||
|
}
|
||||||
|
if(tTmp.txt=="1")
|
||||||
|
{
|
||||||
|
vis bNext,1
|
||||||
|
tsw mSwipeNext,1
|
||||||
|
bNext.txt="î³"
|
||||||
|
}
|
||||||
|
if(tTmp.txt=="2")
|
||||||
|
{
|
||||||
|
vis bNext,1
|
||||||
|
bNext.txt="î"
|
||||||
|
}
|
||||||
|
//entity name
|
||||||
|
spstr strCommand.txt,entn.txt,"~",3
|
||||||
|
//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
|
||||||
|
//title farbe
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tTitle.pco,0,0
|
||||||
|
}
|
||||||
|
//author
|
||||||
|
spstr strCommand.txt,tAuthor.txt,"~",8
|
||||||
|
//author farbe
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",9
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tAuthor.pco,0,0
|
||||||
|
}
|
||||||
|
//volume
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",10
|
||||||
|
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
|
||||||
|
// on off button
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",14
|
||||||
|
if(tTmp.txt=="disable")
|
||||||
|
{
|
||||||
|
vis t5,0
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
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!="")
|
||||||
|
{
|
||||||
|
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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,14 +46,14 @@ cardPower
|
|||||||
43 Component(s)
|
43 Component(s)
|
||||||
435 Line(s) of event code
|
435 Line(s) of event code
|
||||||
297 Unique line(s) of event code
|
297 Unique line(s) of event code
|
||||||
cardMedia
|
|
||||||
34 Component(s)
|
|
||||||
406 Line(s) of event code
|
|
||||||
216 Unique line(s) of event code
|
|
||||||
cardThermo
|
cardThermo
|
||||||
53 Component(s)
|
53 Component(s)
|
||||||
608 Line(s) of event code
|
608 Line(s) of event code
|
||||||
316 Unique line(s) of event code
|
316 Unique line(s) of event code
|
||||||
|
cardMedia
|
||||||
|
34 Component(s)
|
||||||
|
605 Line(s) of event code
|
||||||
|
214 Unique line(s) of event code
|
||||||
popupThermo
|
popupThermo
|
||||||
44 Component(s)
|
44 Component(s)
|
||||||
515 Line(s) of event code
|
515 Line(s) of event code
|
||||||
@@ -74,5 +74,5 @@ cardEntities
|
|||||||
Total
|
Total
|
||||||
17 Page(s)
|
17 Page(s)
|
||||||
571 Component(s)
|
571 Component(s)
|
||||||
6992 Line(s) of event code
|
7191 Line(s) of event code
|
||||||
1801 Unique line(s) of event code
|
1809 Unique line(s) of event code
|
||||||
|
|||||||
@@ -812,25 +812,275 @@ Timer tmSleep
|
|||||||
|
|
||||||
Events
|
Events
|
||||||
Timer Event
|
Timer Event
|
||||||
if(sleepTimeout!=0&&dimValue!=dim)
|
// data available
|
||||||
|
if(usize>1)
|
||||||
{
|
{
|
||||||
sleepValue+=1
|
bufferPos=0
|
||||||
if(sleepTimeout<=sleepValue)
|
while(bufferPos<usize)
|
||||||
{
|
{
|
||||||
sleepValue=0
|
// check for 0x55 0xBB - Command Init Secuence
|
||||||
dim=dimValue
|
if(u[bufferPos]==187&&u[bufferPos-1]==85)
|
||||||
tSend.txt="event,sleepReached,cardMedia"
|
{
|
||||||
//send calc crc
|
//remove garbage at the start of the buffer if there's any to free buffer for command
|
||||||
btlen tSend.txt,sys0
|
if(u[bufferPos]!=1)
|
||||||
crcrest 1,0xffff // reset CRC
|
{
|
||||||
crcputh 55 bb
|
udelete bufferPos-1
|
||||||
crcputs sys0,2
|
}
|
||||||
crcputs tSend.txt,0
|
//instruction is now aligned with buffer, because we deleted garbage before instrcution
|
||||||
//send cmd
|
//get length after init sequence (check if there are more than to bytes in buffer)
|
||||||
printh 55 bb
|
if(3<usize)
|
||||||
prints sys0,2
|
{
|
||||||
prints tSend.txt,0
|
// check if serial buffer has reached the announced length
|
||||||
prints crcval,2
|
ucopy payloadLength,2,2,0
|
||||||
|
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
|
||||||
|
payloadLength+=3
|
||||||
|
// payload length does also not contain crc, so we are adding another 2 bytes for crc
|
||||||
|
payloadLength+=2
|
||||||
|
if(payloadLength<usize)
|
||||||
|
{
|
||||||
|
// calculate crc
|
||||||
|
crcrest 1,0xFFFF
|
||||||
|
// u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
|
||||||
|
//crcputu 3,u[2]
|
||||||
|
// u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
|
||||||
|
crcputu 0,payloadLength-1
|
||||||
|
// get recived crc to be able to compare it
|
||||||
|
ucopy recvCrc,payloadLength-1,2,0
|
||||||
|
// compare crc with recived value
|
||||||
|
if(crcval==recvCrc)
|
||||||
|
{
|
||||||
|
// crc is okay
|
||||||
|
// 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")
|
||||||
|
{
|
||||||
|
//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
|
||||||
|
tsw mSwipePrev,0
|
||||||
|
tsw mSwipeUp,0
|
||||||
|
}
|
||||||
|
if(tTmp.txt=="1")
|
||||||
|
{
|
||||||
|
vis bPrev,1
|
||||||
|
tsw mSwipePrev,1
|
||||||
|
tsw mSwipeUp,0
|
||||||
|
bPrev.txt="î°"
|
||||||
|
}
|
||||||
|
if(tTmp.txt=="2")
|
||||||
|
{
|
||||||
|
vis bPrev,1
|
||||||
|
tsw mSwipePrev,0
|
||||||
|
tsw mSwipeUp,1
|
||||||
|
bPrev.txt="î¶"
|
||||||
|
}
|
||||||
|
spstr tId.txt,tTmp.txt,"|",1
|
||||||
|
if(tTmp.txt=="0")
|
||||||
|
{
|
||||||
|
vis bNext,0
|
||||||
|
tsw mSwipeNext,0
|
||||||
|
}
|
||||||
|
if(tTmp.txt=="1")
|
||||||
|
{
|
||||||
|
vis bNext,1
|
||||||
|
tsw mSwipeNext,1
|
||||||
|
bNext.txt="î³"
|
||||||
|
}
|
||||||
|
if(tTmp.txt=="2")
|
||||||
|
{
|
||||||
|
vis bNext,1
|
||||||
|
bNext.txt="î"
|
||||||
|
}
|
||||||
|
//entity name
|
||||||
|
spstr strCommand.txt,entn.txt,"~",3
|
||||||
|
//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
|
||||||
|
//title farbe
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tTitle.pco,0,0
|
||||||
|
}
|
||||||
|
//author
|
||||||
|
spstr strCommand.txt,tAuthor.txt,"~",8
|
||||||
|
//author farbe
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",9
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tAuthor.pco,0,0
|
||||||
|
}
|
||||||
|
//volume
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",10
|
||||||
|
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
|
||||||
|
// on off button
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",14
|
||||||
|
if(tTmp.txt=="disable")
|
||||||
|
{
|
||||||
|
vis t5,0
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
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!="")
|
||||||
|
{
|
||||||
|
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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
+++ /dev/fd/62 2022-11-17 20:26:43.611134223 +0000
|
+++ /dev/fd/62 2022-11-19 22:44:23.979739346 +0000
|
||||||
+52 +306,47 @@
|
+52 +306,47 @@
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",2
|
+ spstr strCommand.txt,tTmp.txt,"~",2
|
||||||
+ //save third arg if there's one
|
+ //save third arg if there's one
|
||||||
|
|||||||
@@ -1073,18 +1073,36 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,entn.txt,"~",3
|
spstr strCommand.txt,entn.txt,"~",3
|
||||||
//icon
|
//icon
|
||||||
spstr strCommand.txt,tIcon.txt,"~",4
|
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
|
//title
|
||||||
spstr strCommand.txt,tTitle.txt,"~",5
|
spstr strCommand.txt,tTitle.txt,"~",6
|
||||||
//author
|
//title farbe
|
||||||
spstr strCommand.txt,tAuthor.txt,"~",6
|
|
||||||
//volume
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",7
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tTitle.pco,0,0
|
||||||
|
}
|
||||||
|
//author
|
||||||
|
spstr strCommand.txt,tAuthor.txt,"~",8
|
||||||
|
//author farbe
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",9
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tAuthor.pco,0,0
|
||||||
|
}
|
||||||
|
//volume
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",10
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
hVolume.val=sys0
|
hVolume.val=sys0
|
||||||
//icon
|
//icon
|
||||||
spstr strCommand.txt,tPlayPause.txt,"~",8
|
spstr strCommand.txt,tPlayPause.txt,"~",11
|
||||||
//speaker current
|
//speaker current
|
||||||
spstr strCommand.txt,tSpeaker.txt,"~",9
|
spstr strCommand.txt,tSpeaker.txt,"~",12
|
||||||
if(tSpeaker.txt!="")
|
if(tSpeaker.txt!="")
|
||||||
{
|
{
|
||||||
tSpeaker.pco=1374
|
tSpeaker.pco=1374
|
||||||
@@ -1093,14 +1111,14 @@ Timer tmSerial
|
|||||||
tSpeaker.pco=65535
|
tSpeaker.pco=65535
|
||||||
}
|
}
|
||||||
//speaker list
|
//speaker list
|
||||||
spstr strCommand.txt,vaSpeakerList.txt,"~",10
|
spstr strCommand.txt,vaSpeakerList.txt,"~",13
|
||||||
if(vaSpeakerList.txt=="")
|
if(vaSpeakerList.txt=="")
|
||||||
{
|
{
|
||||||
vis t6,0
|
vis t6,0
|
||||||
}
|
}
|
||||||
vaSpeakerPos.val=0
|
vaSpeakerPos.val=0
|
||||||
// on off button
|
// on off button
|
||||||
spstr strCommand.txt,tTmp.txt,"~",11
|
spstr strCommand.txt,tTmp.txt,"~",14
|
||||||
if(tTmp.txt=="disable")
|
if(tTmp.txt=="disable")
|
||||||
{
|
{
|
||||||
vis t5,0
|
vis t5,0
|
||||||
@@ -1110,7 +1128,7 @@ Timer tmSerial
|
|||||||
covx tTmp.txt,t5.pco,0,0
|
covx tTmp.txt,t5.pco,0,0
|
||||||
}
|
}
|
||||||
//tIconBtnEntityName
|
//tIconBtnEntityName
|
||||||
spstr strCommand.txt,vaMenu.txt,"~",12
|
spstr strCommand.txt,vaMenu.txt,"~",15
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10,10 +10,6 @@ pageTest
|
|||||||
14 Component(s)
|
14 Component(s)
|
||||||
14 Line(s) of event code
|
14 Line(s) of event code
|
||||||
14 Unique line(s) of event code
|
14 Unique line(s) of event code
|
||||||
cardMedia
|
|
||||||
34 Component(s)
|
|
||||||
406 Line(s) of event code
|
|
||||||
216 Unique line(s) of event code
|
|
||||||
cardGrid
|
cardGrid
|
||||||
42 Component(s)
|
42 Component(s)
|
||||||
490 Line(s) of event code
|
490 Line(s) of event code
|
||||||
@@ -54,6 +50,10 @@ screensaver
|
|||||||
45 Component(s)
|
45 Component(s)
|
||||||
389 Line(s) of event code
|
389 Line(s) of event code
|
||||||
288 Unique line(s) of event code
|
288 Unique line(s) of event code
|
||||||
|
cardMedia
|
||||||
|
34 Component(s)
|
||||||
|
421 Line(s) of event code
|
||||||
|
222 Unique line(s) of event code
|
||||||
cardPower
|
cardPower
|
||||||
43 Component(s)
|
43 Component(s)
|
||||||
435 Line(s) of event code
|
435 Line(s) of event code
|
||||||
@@ -74,5 +74,5 @@ cardEntities
|
|||||||
Total
|
Total
|
||||||
17 Page(s)
|
17 Page(s)
|
||||||
583 Component(s)
|
583 Component(s)
|
||||||
7219 Line(s) of event code
|
7234 Line(s) of event code
|
||||||
1876 Unique line(s) of event code
|
1879 Unique line(s) of event code
|
||||||
|
|||||||
@@ -641,18 +641,36 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,entn.txt,"~",3
|
spstr strCommand.txt,entn.txt,"~",3
|
||||||
//icon
|
//icon
|
||||||
spstr strCommand.txt,tIcon.txt,"~",4
|
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
|
//title
|
||||||
spstr strCommand.txt,tTitle.txt,"~",5
|
spstr strCommand.txt,tTitle.txt,"~",6
|
||||||
//author
|
//title farbe
|
||||||
spstr strCommand.txt,tAuthor.txt,"~",6
|
|
||||||
//volume
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",7
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tTitle.pco,0,0
|
||||||
|
}
|
||||||
|
//author
|
||||||
|
spstr strCommand.txt,tAuthor.txt,"~",8
|
||||||
|
//author farbe
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",9
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tAuthor.pco,0,0
|
||||||
|
}
|
||||||
|
//volume
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",10
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
hVolume.val=sys0
|
hVolume.val=sys0
|
||||||
//icon
|
//icon
|
||||||
spstr strCommand.txt,tPlayPause.txt,"~",8
|
spstr strCommand.txt,tPlayPause.txt,"~",11
|
||||||
//speaker current
|
//speaker current
|
||||||
spstr strCommand.txt,tSpeaker.txt,"~",9
|
spstr strCommand.txt,tSpeaker.txt,"~",12
|
||||||
if(tSpeaker.txt!="")
|
if(tSpeaker.txt!="")
|
||||||
{
|
{
|
||||||
tSpeaker.pco=1374
|
tSpeaker.pco=1374
|
||||||
@@ -661,14 +679,14 @@ Timer tmSerial
|
|||||||
tSpeaker.pco=65535
|
tSpeaker.pco=65535
|
||||||
}
|
}
|
||||||
//speaker list
|
//speaker list
|
||||||
spstr strCommand.txt,vaSpeakerList.txt,"~",10
|
spstr strCommand.txt,vaSpeakerList.txt,"~",13
|
||||||
if(vaSpeakerList.txt=="")
|
if(vaSpeakerList.txt=="")
|
||||||
{
|
{
|
||||||
vis t6,0
|
vis t6,0
|
||||||
}
|
}
|
||||||
vaSpeakerPos.val=0
|
vaSpeakerPos.val=0
|
||||||
// on off button
|
// on off button
|
||||||
spstr strCommand.txt,tTmp.txt,"~",11
|
spstr strCommand.txt,tTmp.txt,"~",14
|
||||||
if(tTmp.txt=="disable")
|
if(tTmp.txt=="disable")
|
||||||
{
|
{
|
||||||
vis t5,0
|
vis t5,0
|
||||||
@@ -678,7 +696,7 @@ Timer tmSerial
|
|||||||
covx tTmp.txt,t5.pco,0,0
|
covx tTmp.txt,t5.pco,0,0
|
||||||
}
|
}
|
||||||
//tIconBtnEntityName
|
//tIconBtnEntityName
|
||||||
spstr strCommand.txt,vaMenu.txt,"~",12
|
spstr strCommand.txt,vaMenu.txt,"~",15
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1073,18 +1073,36 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,entn.txt,"~",3
|
spstr strCommand.txt,entn.txt,"~",3
|
||||||
//icon
|
//icon
|
||||||
spstr strCommand.txt,tIcon.txt,"~",4
|
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
|
//title
|
||||||
spstr strCommand.txt,tTitle.txt,"~",5
|
spstr strCommand.txt,tTitle.txt,"~",6
|
||||||
//author
|
//title farbe
|
||||||
spstr strCommand.txt,tAuthor.txt,"~",6
|
|
||||||
//volume
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",7
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tTitle.pco,0,0
|
||||||
|
}
|
||||||
|
//author
|
||||||
|
spstr strCommand.txt,tAuthor.txt,"~",8
|
||||||
|
//author farbe
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",9
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tAuthor.pco,0,0
|
||||||
|
}
|
||||||
|
//volume
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",10
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
hVolume.val=sys0
|
hVolume.val=sys0
|
||||||
//icon
|
//icon
|
||||||
spstr strCommand.txt,tPlayPause.txt,"~",8
|
spstr strCommand.txt,tPlayPause.txt,"~",11
|
||||||
//speaker current
|
//speaker current
|
||||||
spstr strCommand.txt,tSpeaker.txt,"~",9
|
spstr strCommand.txt,tSpeaker.txt,"~",12
|
||||||
if(tSpeaker.txt!="")
|
if(tSpeaker.txt!="")
|
||||||
{
|
{
|
||||||
tSpeaker.pco=1374
|
tSpeaker.pco=1374
|
||||||
@@ -1093,14 +1111,14 @@ Timer tmSerial
|
|||||||
tSpeaker.pco=65535
|
tSpeaker.pco=65535
|
||||||
}
|
}
|
||||||
//speaker list
|
//speaker list
|
||||||
spstr strCommand.txt,vaSpeakerList.txt,"~",10
|
spstr strCommand.txt,vaSpeakerList.txt,"~",13
|
||||||
if(vaSpeakerList.txt=="")
|
if(vaSpeakerList.txt=="")
|
||||||
{
|
{
|
||||||
vis t6,0
|
vis t6,0
|
||||||
}
|
}
|
||||||
vaSpeakerPos.val=0
|
vaSpeakerPos.val=0
|
||||||
// on off button
|
// on off button
|
||||||
spstr strCommand.txt,tTmp.txt,"~",11
|
spstr strCommand.txt,tTmp.txt,"~",14
|
||||||
if(tTmp.txt=="disable")
|
if(tTmp.txt=="disable")
|
||||||
{
|
{
|
||||||
vis t5,0
|
vis t5,0
|
||||||
@@ -1110,7 +1128,7 @@ Timer tmSerial
|
|||||||
covx tTmp.txt,t5.pco,0,0
|
covx tTmp.txt,t5.pco,0,0
|
||||||
}
|
}
|
||||||
//tIconBtnEntityName
|
//tIconBtnEntityName
|
||||||
spstr strCommand.txt,vaMenu.txt,"~",12
|
spstr strCommand.txt,vaMenu.txt,"~",15
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -40,8 +40,8 @@ screensaver
|
|||||||
294 Unique line(s) of event code
|
294 Unique line(s) of event code
|
||||||
cardMedia
|
cardMedia
|
||||||
34 Component(s)
|
34 Component(s)
|
||||||
406 Line(s) of event code
|
421 Line(s) of event code
|
||||||
216 Unique line(s) of event code
|
222 Unique line(s) of event code
|
||||||
cardThermo
|
cardThermo
|
||||||
53 Component(s)
|
53 Component(s)
|
||||||
608 Line(s) of event code
|
608 Line(s) of event code
|
||||||
@@ -74,5 +74,5 @@ cardEntities
|
|||||||
Total
|
Total
|
||||||
17 Page(s)
|
17 Page(s)
|
||||||
578 Component(s)
|
578 Component(s)
|
||||||
7058 Line(s) of event code
|
7073 Line(s) of event code
|
||||||
1817 Unique line(s) of event code
|
1820 Unique line(s) of event code
|
||||||
|
|||||||
@@ -641,18 +641,36 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,entn.txt,"~",3
|
spstr strCommand.txt,entn.txt,"~",3
|
||||||
//icon
|
//icon
|
||||||
spstr strCommand.txt,tIcon.txt,"~",4
|
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
|
//title
|
||||||
spstr strCommand.txt,tTitle.txt,"~",5
|
spstr strCommand.txt,tTitle.txt,"~",6
|
||||||
//author
|
//title farbe
|
||||||
spstr strCommand.txt,tAuthor.txt,"~",6
|
|
||||||
//volume
|
|
||||||
spstr strCommand.txt,tTmp.txt,"~",7
|
spstr strCommand.txt,tTmp.txt,"~",7
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tTitle.pco,0,0
|
||||||
|
}
|
||||||
|
//author
|
||||||
|
spstr strCommand.txt,tAuthor.txt,"~",8
|
||||||
|
//author farbe
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",9
|
||||||
|
if(tTmp.txt!="")
|
||||||
|
{
|
||||||
|
covx tTmp.txt,tAuthor.pco,0,0
|
||||||
|
}
|
||||||
|
//volume
|
||||||
|
spstr strCommand.txt,tTmp.txt,"~",10
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
hVolume.val=sys0
|
hVolume.val=sys0
|
||||||
//icon
|
//icon
|
||||||
spstr strCommand.txt,tPlayPause.txt,"~",8
|
spstr strCommand.txt,tPlayPause.txt,"~",11
|
||||||
//speaker current
|
//speaker current
|
||||||
spstr strCommand.txt,tSpeaker.txt,"~",9
|
spstr strCommand.txt,tSpeaker.txt,"~",12
|
||||||
if(tSpeaker.txt!="")
|
if(tSpeaker.txt!="")
|
||||||
{
|
{
|
||||||
tSpeaker.pco=1374
|
tSpeaker.pco=1374
|
||||||
@@ -661,14 +679,14 @@ Timer tmSerial
|
|||||||
tSpeaker.pco=65535
|
tSpeaker.pco=65535
|
||||||
}
|
}
|
||||||
//speaker list
|
//speaker list
|
||||||
spstr strCommand.txt,vaSpeakerList.txt,"~",10
|
spstr strCommand.txt,vaSpeakerList.txt,"~",13
|
||||||
if(vaSpeakerList.txt=="")
|
if(vaSpeakerList.txt=="")
|
||||||
{
|
{
|
||||||
vis t6,0
|
vis t6,0
|
||||||
}
|
}
|
||||||
vaSpeakerPos.val=0
|
vaSpeakerPos.val=0
|
||||||
// on off button
|
// on off button
|
||||||
spstr strCommand.txt,tTmp.txt,"~",11
|
spstr strCommand.txt,tTmp.txt,"~",14
|
||||||
if(tTmp.txt=="disable")
|
if(tTmp.txt=="disable")
|
||||||
{
|
{
|
||||||
vis t5,0
|
vis t5,0
|
||||||
@@ -678,7 +696,7 @@ Timer tmSerial
|
|||||||
covx tTmp.txt,t5.pco,0,0
|
covx tTmp.txt,t5.pco,0,0
|
||||||
}
|
}
|
||||||
//tIconBtnEntityName
|
//tIconBtnEntityName
|
||||||
spstr strCommand.txt,vaMenu.txt,"~",12
|
spstr strCommand.txt,vaMenu.txt,"~",15
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user