mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-10 07:16:34 +01:00
fix file pattern (add nextion2text)
This commit is contained in:
joBr99
GitHub Actions
File diff suppressed because it is too large
Load Diff
@@ -5,24 +5,11 @@ Program.s
|
|||||||
int recvCrc=0
|
int recvCrc=0
|
||||||
int payloadLength=0
|
int payloadLength=0
|
||||||
int par0=0,par1=0
|
int par0=0,par1=0
|
||||||
// landsspace orientation x has 480px and y has 320px xy limits todo: adjust xy values to something that fit's resulution
|
|
||||||
//Maximum values in directional change for Swipes beeing detected as swipe (diagonal swipes are invalid) (for one axis at a time)
|
|
||||||
int xLimit=125,yLimit=125
|
|
||||||
int ixLimit=-125,iyLimit=-125
|
|
||||||
//Minimum values for swipes, directional changes below theese values are ignored, because they could be unintended swipes
|
|
||||||
int xLimitMin=60,yLimitMin=60
|
|
||||||
int ixLimitMin=-60,iyLimitMin=-60
|
|
||||||
// Swipe Result Vars
|
|
||||||
int ycR=0,xcR=0
|
|
||||||
// Start End Swipe Touch Locations
|
|
||||||
int yc1=0,xc1=0,yc2=0,xc2=0
|
|
||||||
// sleep timeout in s
|
// sleep timeout in s
|
||||||
int sleepTimeout=20
|
int sleepTimeout=20
|
||||||
int sleepValue=0
|
int sleepValue=0
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
// current page
|
|
||||||
int nPage=0
|
|
||||||
// fix touch offset (Removed for US version)
|
// fix touch offset (Removed for US version)
|
||||||
//lcd_dev fffb 0002 0000 0020
|
//lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
|
|||||||
@@ -419,6 +419,7 @@ Button arm1
|
|||||||
prints sys0,2
|
prints sys0,2
|
||||||
prints tSend.txt,0
|
prints tSend.txt,0
|
||||||
prints crcval,2
|
prints crcval,2
|
||||||
|
tCode.txt=""
|
||||||
|
|
||||||
Button arm3
|
Button arm3
|
||||||
Attributes
|
Attributes
|
||||||
@@ -449,6 +450,7 @@ Button arm3
|
|||||||
prints sys0,2
|
prints sys0,2
|
||||||
prints tSend.txt,0
|
prints tSend.txt,0
|
||||||
prints crcval,2
|
prints crcval,2
|
||||||
|
tCode.txt=""
|
||||||
|
|
||||||
Button arm2
|
Button arm2
|
||||||
Attributes
|
Attributes
|
||||||
@@ -479,6 +481,7 @@ Button arm2
|
|||||||
prints sys0,2
|
prints sys0,2
|
||||||
prints tSend.txt,0
|
prints tSend.txt,0
|
||||||
prints crcval,2
|
prints crcval,2
|
||||||
|
tCode.txt=""
|
||||||
|
|
||||||
Button arm4
|
Button arm4
|
||||||
Attributes
|
Attributes
|
||||||
@@ -509,6 +512,7 @@ Button arm4
|
|||||||
prints sys0,2
|
prints sys0,2
|
||||||
prints tSend.txt,0
|
prints tSend.txt,0
|
||||||
prints crcval,2
|
prints crcval,2
|
||||||
|
tCode.txt=""
|
||||||
|
|
||||||
Timer tmSerial
|
Timer tmSerial
|
||||||
Attributes
|
Attributes
|
||||||
@@ -602,8 +606,12 @@ Timer tmSerial
|
|||||||
spstr strCommand.txt,tTmp.txt,",",10
|
spstr strCommand.txt,tTmp.txt,",",10
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
||||||
//numpad status
|
//icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",11
|
spstr strCommand.txt,tTmp.txt,",",11
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
tIcon.pco=sys0
|
||||||
|
//numpad status
|
||||||
|
spstr strCommand.txt,tTmp.txt,",",12
|
||||||
if(tTmp.txt!="disable")
|
if(tTmp.txt!="disable")
|
||||||
{
|
{
|
||||||
vis b0,1
|
vis b0,1
|
||||||
@@ -619,6 +627,15 @@ Timer tmSerial
|
|||||||
vis b10,1
|
vis b10,1
|
||||||
vis tCode,1
|
vis tCode,1
|
||||||
}
|
}
|
||||||
|
//flashing status
|
||||||
|
spstr strCommand.txt,tTmp.txt,",",13
|
||||||
|
if(tTmp.txt=="enable")
|
||||||
|
{
|
||||||
|
tmFlash.en=1
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
tmFlash.en=0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ Page cardEntities
|
|||||||
vis tIcon1,0
|
vis tIcon1,0
|
||||||
vis tEntity1,0
|
vis tEntity1,0
|
||||||
vis bText1,0
|
vis bText1,0
|
||||||
|
vis hSlider1,0
|
||||||
//ui e2
|
//ui e2
|
||||||
vis btOnOff2,0
|
vis btOnOff2,0
|
||||||
vis bUp2,0
|
vis bUp2,0
|
||||||
@@ -39,6 +40,7 @@ Page cardEntities
|
|||||||
vis tIcon2,0
|
vis tIcon2,0
|
||||||
vis tEntity2,0
|
vis tEntity2,0
|
||||||
vis bText2,0
|
vis bText2,0
|
||||||
|
vis hSlider2,0
|
||||||
//ui e3
|
//ui e3
|
||||||
vis btOnOff3,0
|
vis btOnOff3,0
|
||||||
vis bUp3,0
|
vis bUp3,0
|
||||||
@@ -47,6 +49,7 @@ Page cardEntities
|
|||||||
vis tIcon3,0
|
vis tIcon3,0
|
||||||
vis tEntity3,0
|
vis tEntity3,0
|
||||||
vis bText3,0
|
vis bText3,0
|
||||||
|
vis hSlider3,0
|
||||||
//ui e4
|
//ui e4
|
||||||
vis btOnOff4,0
|
vis btOnOff4,0
|
||||||
vis bUp4,0
|
vis bUp4,0
|
||||||
@@ -55,6 +58,7 @@ Page cardEntities
|
|||||||
vis tIcon4,0
|
vis tIcon4,0
|
||||||
vis tEntity4,0
|
vis tEntity4,0
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
|
vis hSlider4,0
|
||||||
|
|
||||||
Variable (string) strCommand
|
Variable (string) strCommand
|
||||||
Attributes
|
Attributes
|
||||||
@@ -1406,18 +1410,15 @@ Timer tmSerial
|
|||||||
ucopy strCommand.txt,4,payloadLength-5,0
|
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)
|
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
||||||
spstr strCommand.txt,tInstruction.txt,",",0
|
spstr strCommand.txt,tInstruction.txt,",",0
|
||||||
if(tInstruction.txt=="entityUpdHeading")
|
|
||||||
{
|
|
||||||
spstr strCommand.txt,tHeading.txt,",",1
|
|
||||||
}
|
|
||||||
if(tInstruction.txt=="entityUpd")
|
if(tInstruction.txt=="entityUpd")
|
||||||
{
|
{
|
||||||
// command format: entityUpd[,type,internalName,iconId,displayName,optionalValue]x4
|
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
|
||||||
|
spstr strCommand.txt,tHeading.txt,",",1
|
||||||
// get Type
|
// get Type
|
||||||
spstr strCommand.txt,type1.txt,",",1
|
spstr strCommand.txt,type1.txt,",",3
|
||||||
// get internal name
|
// get internal name
|
||||||
spstr strCommand.txt,entn1.txt,",",2
|
spstr strCommand.txt,entn1.txt,",",4
|
||||||
if(type1.txt=="delete")
|
if(type1.txt=="delete"||type1.txt=="")
|
||||||
{
|
{
|
||||||
vis bUp1,0
|
vis bUp1,0
|
||||||
vis bStop1,0
|
vis bStop1,0
|
||||||
@@ -1426,19 +1427,20 @@ Timer tmSerial
|
|||||||
vis tEntity1,0
|
vis tEntity1,0
|
||||||
vis tIcon1,0
|
vis tIcon1,0
|
||||||
vis bText1,0
|
vis bText1,0
|
||||||
|
vis hSlider1,0
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,",",3
|
spstr strCommand.txt,tTmp.txt,",",5
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
|
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
|
||||||
vis tIcon1,1
|
vis tIcon1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",4
|
spstr strCommand.txt,tTmp.txt,",",6
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
tIcon1.pco=sys0
|
tIcon1.pco=sys0
|
||||||
// set name
|
// set name
|
||||||
spstr strCommand.txt,tEntity1.txt,",",5
|
spstr strCommand.txt,tEntity1.txt,",",7
|
||||||
vis tEntity1,1
|
vis tEntity1,1
|
||||||
}
|
}
|
||||||
if(type1.txt=="shutter")
|
if(type1.txt=="shutter")
|
||||||
@@ -1448,6 +1450,7 @@ Timer tmSerial
|
|||||||
vis bDown1,1
|
vis bDown1,1
|
||||||
vis btOnOff1,0
|
vis btOnOff1,0
|
||||||
vis bText1,0
|
vis bText1,0
|
||||||
|
vis hSlider1,0
|
||||||
}
|
}
|
||||||
if(type1.txt=="light")
|
if(type1.txt=="light")
|
||||||
{
|
{
|
||||||
@@ -1456,8 +1459,9 @@ Timer tmSerial
|
|||||||
vis bDown1,0
|
vis bDown1,0
|
||||||
vis btOnOff1,1
|
vis btOnOff1,1
|
||||||
vis bText1,0
|
vis bText1,0
|
||||||
|
vis hSlider1,0
|
||||||
// get Button State (optional Value)
|
// get Button State (optional Value)
|
||||||
spstr strCommand.txt,tTmp.txt,",",6
|
spstr strCommand.txt,tTmp.txt,",",8
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
btOnOff1.val=sys0
|
btOnOff1.val=sys0
|
||||||
}
|
}
|
||||||
@@ -1468,8 +1472,9 @@ Timer tmSerial
|
|||||||
vis bDown1,0
|
vis bDown1,0
|
||||||
vis btOnOff1,1
|
vis btOnOff1,1
|
||||||
vis bText1,0
|
vis bText1,0
|
||||||
|
vis hSlider1,0
|
||||||
// get Button State (optional Value)
|
// get Button State (optional Value)
|
||||||
spstr strCommand.txt,tTmp.txt,",",6
|
spstr strCommand.txt,tTmp.txt,",",8
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
btOnOff1.val=sys0
|
btOnOff1.val=sys0
|
||||||
}
|
}
|
||||||
@@ -1481,10 +1486,11 @@ Timer tmSerial
|
|||||||
vis btOnOff1,0
|
vis btOnOff1,0
|
||||||
vis bText1,1
|
vis bText1,1
|
||||||
tsw bText1,0
|
tsw bText1,0
|
||||||
|
vis hSlider1,0
|
||||||
bText1.pco=65535
|
bText1.pco=65535
|
||||||
bText1.pco2=65535
|
bText1.pco2=65535
|
||||||
// get Text (optional Value)
|
// get Text (optional Value)
|
||||||
spstr strCommand.txt,bText1.txt,",",6
|
spstr strCommand.txt,bText1.txt,",",8
|
||||||
}
|
}
|
||||||
if(type1.txt=="button")
|
if(type1.txt=="button")
|
||||||
{
|
{
|
||||||
@@ -1494,17 +1500,41 @@ Timer tmSerial
|
|||||||
vis btOnOff1,0
|
vis btOnOff1,0
|
||||||
vis bText1,1
|
vis bText1,1
|
||||||
tsw bText1,1
|
tsw bText1,1
|
||||||
|
vis hSlider1,0
|
||||||
bText1.pco=1374
|
bText1.pco=1374
|
||||||
bText1.pco2=1374
|
bText1.pco2=1374
|
||||||
// get Text (optional Value)
|
// get Text (optional Value)
|
||||||
spstr strCommand.txt,bText1.txt,",",6
|
spstr strCommand.txt,bText1.txt,",",8
|
||||||
|
}
|
||||||
|
if(type1.txt=="number")
|
||||||
|
{
|
||||||
|
vis bUp1,0
|
||||||
|
vis bStop1,0
|
||||||
|
vis bDown1,0
|
||||||
|
vis btOnOff1,0
|
||||||
|
vis bText1,0
|
||||||
|
tsw bText1,0
|
||||||
|
vis hSlider1,1
|
||||||
|
// get config (optional Value) (use bText as variable)
|
||||||
|
spstr strCommand.txt,bText1.txt,",",8
|
||||||
|
//first value is current value
|
||||||
|
spstr bText1.txt,tTmp.txt,"|",1
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider1.val=sys0
|
||||||
|
//second value is min value
|
||||||
|
spstr bText1.txt,tTmp.txt,"|",2
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider1.minval=sys0
|
||||||
|
//third value is max value
|
||||||
|
spstr bText1.txt,tTmp.txt,"|",3
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider1.maxval=sys0
|
||||||
}
|
}
|
||||||
// id2
|
|
||||||
// get Type
|
// get Type
|
||||||
spstr strCommand.txt,type2.txt,",",7
|
spstr strCommand.txt,type2.txt,",",9
|
||||||
// get internal name
|
// get internal name
|
||||||
spstr strCommand.txt,entn2.txt,",",8
|
spstr strCommand.txt,entn2.txt,",",10
|
||||||
if(type2.txt=="delete")
|
if(type2.txt=="delete"||type2.txt=="")
|
||||||
{
|
{
|
||||||
vis bUp2,0
|
vis bUp2,0
|
||||||
vis bStop2,0
|
vis bStop2,0
|
||||||
@@ -1513,19 +1543,20 @@ Timer tmSerial
|
|||||||
vis tEntity2,0
|
vis tEntity2,0
|
||||||
vis tIcon2,0
|
vis tIcon2,0
|
||||||
vis bText2,0
|
vis bText2,0
|
||||||
|
vis hSlider2,0
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
//change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,",",9
|
spstr strCommand.txt,tTmp.txt,",",11
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
|
substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
|
||||||
vis tIcon2,1
|
vis tIcon2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",10
|
spstr strCommand.txt,tTmp.txt,",",12
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
tIcon2.pco=sys0
|
tIcon2.pco=sys0
|
||||||
// set name
|
// set name
|
||||||
spstr strCommand.txt,tEntity2.txt,",",11
|
spstr strCommand.txt,tEntity2.txt,",",13
|
||||||
vis tEntity2,1
|
vis tEntity2,1
|
||||||
}
|
}
|
||||||
if(type2.txt=="shutter")
|
if(type2.txt=="shutter")
|
||||||
@@ -1535,6 +1566,7 @@ Timer tmSerial
|
|||||||
vis bDown2,1
|
vis bDown2,1
|
||||||
vis btOnOff2,0
|
vis btOnOff2,0
|
||||||
vis bText2,0
|
vis bText2,0
|
||||||
|
vis hSlider2,0
|
||||||
}
|
}
|
||||||
if(type2.txt=="light")
|
if(type2.txt=="light")
|
||||||
{
|
{
|
||||||
@@ -1543,8 +1575,9 @@ Timer tmSerial
|
|||||||
vis bDown2,0
|
vis bDown2,0
|
||||||
vis btOnOff2,1
|
vis btOnOff2,1
|
||||||
vis bText2,0
|
vis bText2,0
|
||||||
|
vis hSlider2,0
|
||||||
// get Button State (optional Value)
|
// get Button State (optional Value)
|
||||||
spstr strCommand.txt,tTmp.txt,",",12
|
spstr strCommand.txt,tTmp.txt,",",14
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
btOnOff2.val=sys0
|
btOnOff2.val=sys0
|
||||||
}
|
}
|
||||||
@@ -1555,8 +1588,9 @@ Timer tmSerial
|
|||||||
vis bDown2,0
|
vis bDown2,0
|
||||||
vis btOnOff2,1
|
vis btOnOff2,1
|
||||||
vis bText2,0
|
vis bText2,0
|
||||||
|
vis hSlider2,0
|
||||||
// get Button State (optional Value)
|
// get Button State (optional Value)
|
||||||
spstr strCommand.txt,tTmp.txt,",",12
|
spstr strCommand.txt,tTmp.txt,",",14
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
btOnOff2.val=sys0
|
btOnOff2.val=sys0
|
||||||
}
|
}
|
||||||
@@ -1568,10 +1602,11 @@ Timer tmSerial
|
|||||||
vis btOnOff2,0
|
vis btOnOff2,0
|
||||||
vis bText2,1
|
vis bText2,1
|
||||||
tsw bText2,0
|
tsw bText2,0
|
||||||
|
vis hSlider2,0
|
||||||
bText2.pco=65535
|
bText2.pco=65535
|
||||||
bText2.pco2=65535
|
bText2.pco2=65535
|
||||||
// get Text (optional Value)
|
// get Text (optional Value)
|
||||||
spstr strCommand.txt,bText2.txt,",",12
|
spstr strCommand.txt,bText2.txt,",",14
|
||||||
}
|
}
|
||||||
if(type2.txt=="button")
|
if(type2.txt=="button")
|
||||||
{
|
{
|
||||||
@@ -1581,17 +1616,41 @@ Timer tmSerial
|
|||||||
vis btOnOff2,0
|
vis btOnOff2,0
|
||||||
vis bText2,1
|
vis bText2,1
|
||||||
tsw bText2,1
|
tsw bText2,1
|
||||||
|
vis hSlider2,0
|
||||||
bText2.pco=1374
|
bText2.pco=1374
|
||||||
bText2.pco2=1374
|
bText2.pco2=1374
|
||||||
// get Text (optional Value)
|
// get Text (optional Value)
|
||||||
spstr strCommand.txt,bText2.txt,",",12
|
spstr strCommand.txt,bText2.txt,",",14
|
||||||
|
}
|
||||||
|
if(type2.txt=="number")
|
||||||
|
{
|
||||||
|
vis bUp2,0
|
||||||
|
vis bStop2,0
|
||||||
|
vis bDown2,0
|
||||||
|
vis btOnOff2,0
|
||||||
|
vis bText2,0
|
||||||
|
tsw bText2,0
|
||||||
|
vis hSlider2,1
|
||||||
|
// get config (optional Value) (use bText as variable)
|
||||||
|
spstr strCommand.txt,bText2.txt,",",14
|
||||||
|
//first value is current value
|
||||||
|
spstr bText2.txt,tTmp.txt,"|",1
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider2.val=sys0
|
||||||
|
//second value is min value
|
||||||
|
spstr bText2.txt,tTmp.txt,"|",2
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider2.minval=sys0
|
||||||
|
//third value is max value
|
||||||
|
spstr bText2.txt,tTmp.txt,"|",3
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider2.maxval=sys0
|
||||||
}
|
}
|
||||||
// id3
|
|
||||||
// get Type
|
// get Type
|
||||||
spstr strCommand.txt,type3.txt,",",13
|
spstr strCommand.txt,type3.txt,",",15
|
||||||
// get internal name
|
// get internal name
|
||||||
spstr strCommand.txt,entn3.txt,",",14
|
spstr strCommand.txt,entn3.txt,",",16
|
||||||
if(type3.txt=="delete")
|
if(type3.txt=="delete"||type3.txt=="")
|
||||||
{
|
{
|
||||||
vis bUp3,0
|
vis bUp3,0
|
||||||
vis bStop3,0
|
vis bStop3,0
|
||||||
@@ -1600,19 +1659,20 @@ Timer tmSerial
|
|||||||
vis tEntity3,0
|
vis tEntity3,0
|
||||||
vis tIcon3,0
|
vis tIcon3,0
|
||||||
vis bText3,0
|
vis bText3,0
|
||||||
|
vis hSlider3,0
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
//change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,",",15
|
spstr strCommand.txt,tTmp.txt,",",17
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
|
substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
|
||||||
vis tIcon3,1
|
vis tIcon3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",16
|
spstr strCommand.txt,tTmp.txt,",",18
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
tIcon3.pco=sys0
|
tIcon3.pco=sys0
|
||||||
// set name
|
// set name
|
||||||
spstr strCommand.txt,tEntity3.txt,",",17
|
spstr strCommand.txt,tEntity3.txt,",",19
|
||||||
vis tEntity3,1
|
vis tEntity3,1
|
||||||
}
|
}
|
||||||
if(type3.txt=="shutter")
|
if(type3.txt=="shutter")
|
||||||
@@ -1622,16 +1682,18 @@ Timer tmSerial
|
|||||||
vis bDown3,1
|
vis bDown3,1
|
||||||
vis btOnOff3,0
|
vis btOnOff3,0
|
||||||
vis bText3,0
|
vis bText3,0
|
||||||
|
vis hSlider3,0
|
||||||
}
|
}
|
||||||
if(type3.txt=="light")
|
if(type3.txt=="light")
|
||||||
{
|
{
|
||||||
vis bUp3,0
|
vis bUp3,0
|
||||||
vis bStop3,0
|
vis bStop3,0
|
||||||
vis bDown3,0
|
vis bDown3,0
|
||||||
vis bText3,0
|
|
||||||
vis btOnOff3,1
|
vis btOnOff3,1
|
||||||
|
vis bText3,0
|
||||||
|
vis hSlider3,0
|
||||||
// get Button State (optional Value)
|
// get Button State (optional Value)
|
||||||
spstr strCommand.txt,tTmp.txt,",",18
|
spstr strCommand.txt,tTmp.txt,",",20
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
btOnOff3.val=sys0
|
btOnOff3.val=sys0
|
||||||
}
|
}
|
||||||
@@ -1640,10 +1702,11 @@ Timer tmSerial
|
|||||||
vis bUp3,0
|
vis bUp3,0
|
||||||
vis bStop3,0
|
vis bStop3,0
|
||||||
vis bDown3,0
|
vis bDown3,0
|
||||||
vis bText3,0
|
|
||||||
vis btOnOff3,1
|
vis btOnOff3,1
|
||||||
|
vis bText3,0
|
||||||
|
vis hSlider3,0
|
||||||
// get Button State (optional Value)
|
// get Button State (optional Value)
|
||||||
spstr strCommand.txt,tTmp.txt,",",18
|
spstr strCommand.txt,tTmp.txt,",",20
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
btOnOff3.val=sys0
|
btOnOff3.val=sys0
|
||||||
}
|
}
|
||||||
@@ -1655,10 +1718,11 @@ Timer tmSerial
|
|||||||
vis btOnOff3,0
|
vis btOnOff3,0
|
||||||
vis bText3,1
|
vis bText3,1
|
||||||
tsw bText3,0
|
tsw bText3,0
|
||||||
|
vis hSlider3,0
|
||||||
bText3.pco=65535
|
bText3.pco=65535
|
||||||
bText3.pco2=65535
|
bText3.pco2=65535
|
||||||
// get Text (optional Value)
|
// get Text (optional Value)
|
||||||
spstr strCommand.txt,bText3.txt,",",18
|
spstr strCommand.txt,bText3.txt,",",20
|
||||||
}
|
}
|
||||||
if(type3.txt=="button")
|
if(type3.txt=="button")
|
||||||
{
|
{
|
||||||
@@ -1668,17 +1732,41 @@ Timer tmSerial
|
|||||||
vis btOnOff3,0
|
vis btOnOff3,0
|
||||||
vis bText3,1
|
vis bText3,1
|
||||||
tsw bText3,1
|
tsw bText3,1
|
||||||
|
vis hSlider3,0
|
||||||
bText3.pco=1374
|
bText3.pco=1374
|
||||||
bText3.pco2=1374
|
bText3.pco2=1374
|
||||||
// get Text (optional Value)
|
// get Text (optional Value)
|
||||||
spstr strCommand.txt,bText3.txt,",",18
|
spstr strCommand.txt,bText3.txt,",",20
|
||||||
|
}
|
||||||
|
if(type3.txt=="number")
|
||||||
|
{
|
||||||
|
vis bUp3,0
|
||||||
|
vis bStop3,0
|
||||||
|
vis bDown3,0
|
||||||
|
vis btOnOff3,0
|
||||||
|
vis bText3,0
|
||||||
|
tsw bText3,0
|
||||||
|
vis hSlider3,1
|
||||||
|
// get config (optional Value) (use bText as variable)
|
||||||
|
spstr strCommand.txt,bText3.txt,",",20
|
||||||
|
//first value is current value
|
||||||
|
spstr bText3.txt,tTmp.txt,"|",1
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider3.val=sys0
|
||||||
|
//second value is min value
|
||||||
|
spstr bText3.txt,tTmp.txt,"|",2
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider3.minval=sys0
|
||||||
|
//third value is max value
|
||||||
|
spstr bText3.txt,tTmp.txt,"|",3
|
||||||
|
covx tTmp.txt,sys0,0,0
|
||||||
|
hSlider3.maxval=sys0
|
||||||
}
|
}
|
||||||
// id4
|
|
||||||
// get Type
|
// get Type
|
||||||
spstr strCommand.txt,type4.txt,",",19
|
spstr strCommand.txt,type4.txt,",",21
|
||||||
// get internal name
|
// get internal name
|
||||||
spstr strCommand.txt,entn4.txt,",",20
|
spstr strCommand.txt,entn4.txt,",",22
|
||||||
if(type4.txt=="delete")
|
if(type4.txt=="delete"||type4.txt=="")
|
||||||
{
|
{
|
||||||
vis bUp4,0
|
vis bUp4,0
|
||||||
vis bStop4,0
|
vis bStop4,0
|
||||||
@@ -1687,19 +1775,20 @@ Timer tmSerial
|
|||||||
vis tEntity4,0
|
vis tEntity4,0
|
||||||
vis tIcon4,0
|
vis tIcon4,0
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
|
vis hSlider4,0
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
//change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,",",21
|
spstr strCommand.txt,tTmp.txt,",",23
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
|
substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
|
||||||
vis tIcon4,1
|
vis tIcon4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",22
|
spstr strCommand.txt,tTmp.txt,",",24
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
tIcon4.pco=sys0
|
tIcon4.pco=sys0
|
||||||
// set name
|
// set name
|
||||||
spstr strCommand.txt,tEntity4.txt,",",23
|
spstr strCommand.txt,tEntity4.txt,",",25
|
||||||
vis tEntity4,1
|
vis tEntity4,1
|
||||||
}
|
}
|
||||||
if(type4.txt=="shutter")
|
if(type4.txt=="shutter")
|
||||||
@@ -1709,16 +1798,18 @@ Timer tmSerial
|
|||||||
vis bDown4,1
|
vis bDown4,1
|
||||||
vis btOnOff4,0
|
vis btOnOff4,0
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
|
vis hSlider4,0
|
||||||
}
|
}
|
||||||
if(type4.txt=="light")
|
if(type4.txt=="light")
|
||||||
{
|
{
|
||||||
vis bUp4,0
|
vis bUp4,0
|
||||||
vis bStop4,0
|
vis bStop4,0
|
||||||
vis bDown4,0
|
vis bDown4,0
|
||||||
vis bText4,0
|
|
||||||
vis btOnOff4,1
|
vis btOnOff4,1
|
||||||
|
vis bText4,0
|
||||||
|
vis hSlider4,0
|
||||||
// get Button State (optional Value)
|
// get Button State (optional Value)
|
||||||
spstr strCommand.txt,tTmp.txt,",",24
|
spstr strCommand.txt,tTmp.txt,",",26
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
btOnOff4.val=sys0
|
btOnOff4.val=sys0
|
||||||
}
|
}
|
||||||
@@ -1727,10 +1818,11 @@ Timer tmSerial
|
|||||||
vis bUp4,0
|
vis bUp4,0
|
||||||
vis bStop4,0
|
vis bStop4,0
|
||||||
vis bDown4,0
|
vis bDown4,0
|
||||||
vis bText4,0
|
|
||||||
vis btOnOff4,1
|
vis btOnOff4,1
|
||||||
|
vis bText4,0
|
||||||
|
vis hSlider4,0
|
||||||
// get Button State (optional Value)
|
// get Button State (optional Value)
|
||||||
spstr strCommand.txt,tTmp.txt,",",24
|
spstr strCommand.txt,tTmp.txt,",",26
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
btOnOff4.val=sys0
|
btOnOff4.val=sys0
|
||||||
}
|
}
|
||||||
@@ -1742,10 +1834,11 @@ Timer tmSerial
|
|||||||
vis btOnOff4,0
|
vis btOnOff4,0
|
||||||
vis bText4,1
|
vis bText4,1
|
||||||
tsw bText4,0
|
tsw bText4,0
|
||||||
|
vis hSlider4,0
|
||||||
bText4.pco=65535
|
bText4.pco=65535
|
||||||
bText4.pco2=65535
|
bText4.pco2=65535
|
||||||
// get Text (optional Value)
|
// get Text (optional Value)
|
||||||
spstr strCommand.txt,bText4.txt,",",24
|
spstr strCommand.txt,bText4.txt,",",26
|
||||||
}
|
}
|
||||||
if(type4.txt=="button")
|
if(type4.txt=="button")
|
||||||
{
|
{
|
||||||
@@ -1755,184 +1848,35 @@ Timer tmSerial
|
|||||||
vis btOnOff4,0
|
vis btOnOff4,0
|
||||||
vis bText4,1
|
vis bText4,1
|
||||||
tsw bText4,1
|
tsw bText4,1
|
||||||
|
vis hSlider4,0
|
||||||
bText4.pco=1374
|
bText4.pco=1374
|
||||||
bText4.pco2=1374
|
bText4.pco2=1374
|
||||||
// get Text (optional Value)
|
// get Text (optional Value)
|
||||||
spstr strCommand.txt,bText4.txt,",",24
|
spstr strCommand.txt,bText4.txt,",",26
|
||||||
}
|
}
|
||||||
// id5
|
if(type4.txt=="number")
|
||||||
// get Type
|
|
||||||
spstr strCommand.txt,type5.txt,",",25
|
|
||||||
// get internal name
|
|
||||||
spstr strCommand.txt,entn5.txt,",",26
|
|
||||||
if(type5.txt=="delete")
|
|
||||||
{
|
{
|
||||||
vis bUp5,0
|
vis bUp4,0
|
||||||
vis bStop5,0
|
vis bStop4,0
|
||||||
vis bDown5,0
|
vis bDown4,0
|
||||||
vis btOnOff5,0
|
vis btOnOff4,0
|
||||||
vis tEntity5,0
|
vis bText4,0
|
||||||
vis tIcon5,0
|
tsw bText4,0
|
||||||
vis bText5,0
|
vis hSlider4,1
|
||||||
}else
|
// get config (optional Value) (use bText as variable)
|
||||||
{
|
spstr strCommand.txt,bText4.txt,",",26
|
||||||
//change icon
|
//first value is current value
|
||||||
spstr strCommand.txt,tTmp.txt,",",27
|
spstr bText4.txt,tTmp.txt,"|",1
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
|
hSlider4.val=sys0
|
||||||
vis tIcon5,1
|
//second value is min value
|
||||||
// change icon color
|
spstr bText4.txt,tTmp.txt,"|",2
|
||||||
spstr strCommand.txt,tTmp.txt,",",28
|
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
tIcon5.pco=sys0
|
hSlider4.minval=sys0
|
||||||
// set name
|
//third value is max value
|
||||||
spstr strCommand.txt,tEntity5.txt,",",29
|
spstr bText4.txt,tTmp.txt,"|",3
|
||||||
vis tEntity5,1
|
|
||||||
}
|
|
||||||
if(type5.txt=="shutter")
|
|
||||||
{
|
|
||||||
vis bUp5,1
|
|
||||||
vis bStop5,1
|
|
||||||
vis bDown5,1
|
|
||||||
vis btOnOff5,0
|
|
||||||
vis bText5,0
|
|
||||||
}
|
|
||||||
if(type5.txt=="light")
|
|
||||||
{
|
|
||||||
vis bUp5,0
|
|
||||||
vis bStop5,0
|
|
||||||
vis bDown5,0
|
|
||||||
vis bText5,0
|
|
||||||
vis btOnOff5,1
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,",",30
|
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
btOnOff5.val=sys0
|
hSlider4.maxval=sys0
|
||||||
}
|
|
||||||
if(type5.txt=="switch")
|
|
||||||
{
|
|
||||||
vis bUp5,0
|
|
||||||
vis bStop5,0
|
|
||||||
vis bDown5,0
|
|
||||||
vis bText5,0
|
|
||||||
vis btOnOff5,1
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,",",30
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff5.val=sys0
|
|
||||||
}
|
|
||||||
if(type5.txt=="text")
|
|
||||||
{
|
|
||||||
vis bUp5,0
|
|
||||||
vis bStop5,0
|
|
||||||
vis bDown5,0
|
|
||||||
vis btOnOff5,0
|
|
||||||
vis bText5,1
|
|
||||||
tsw bText5,0
|
|
||||||
bText5.pco=65535
|
|
||||||
bText5.pco2=65535
|
|
||||||
// get Text (optional Value)
|
|
||||||
spstr strCommand.txt,bText5.txt,",",30
|
|
||||||
}
|
|
||||||
if(type5.txt=="button")
|
|
||||||
{
|
|
||||||
vis bUp5,0
|
|
||||||
vis bStop5,0
|
|
||||||
vis bDown5,0
|
|
||||||
vis btOnOff5,0
|
|
||||||
vis bText5,1
|
|
||||||
tsw bText5,1
|
|
||||||
bText5.pco=1374
|
|
||||||
bText5.pco2=1374
|
|
||||||
// get Text (optional Value)
|
|
||||||
spstr strCommand.txt,bText5.txt,",",30
|
|
||||||
}
|
|
||||||
// id6
|
|
||||||
// get Type
|
|
||||||
spstr strCommand.txt,type6.txt,",",31
|
|
||||||
// get internal name
|
|
||||||
spstr strCommand.txt,entn6.txt,",",32
|
|
||||||
if(type6.txt=="delete")
|
|
||||||
{
|
|
||||||
vis bUp6,0
|
|
||||||
vis bStop6,0
|
|
||||||
vis bDown6,0
|
|
||||||
vis btOnOff6,0
|
|
||||||
vis tEntity6,0
|
|
||||||
vis tIcon6,0
|
|
||||||
vis bText6,0
|
|
||||||
}else
|
|
||||||
{
|
|
||||||
//change icon
|
|
||||||
spstr strCommand.txt,tTmp.txt,",",33
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
|
|
||||||
vis tIcon6,1
|
|
||||||
// change icon color
|
|
||||||
spstr strCommand.txt,tTmp.txt,",",34
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
tIcon6.pco=sys0
|
|
||||||
// set name
|
|
||||||
spstr strCommand.txt,tEntity6.txt,",",35
|
|
||||||
vis tEntity6,1
|
|
||||||
}
|
|
||||||
if(type6.txt=="shutter")
|
|
||||||
{
|
|
||||||
vis bUp6,1
|
|
||||||
vis bStop6,1
|
|
||||||
vis bDown6,1
|
|
||||||
vis btOnOff6,0
|
|
||||||
vis bText6,0
|
|
||||||
}
|
|
||||||
if(type6.txt=="light")
|
|
||||||
{
|
|
||||||
vis bUp6,0
|
|
||||||
vis bStop6,0
|
|
||||||
vis bDown6,0
|
|
||||||
vis bText6,0
|
|
||||||
vis btOnOff6,1
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,",",36
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff6.val=sys0
|
|
||||||
}
|
|
||||||
if(type6.txt=="switch")
|
|
||||||
{
|
|
||||||
vis bUp6,0
|
|
||||||
vis bStop6,0
|
|
||||||
vis bDown6,0
|
|
||||||
vis bText6,0
|
|
||||||
vis btOnOff6,1
|
|
||||||
// get Button State (optional Value)
|
|
||||||
spstr strCommand.txt,tTmp.txt,",",36
|
|
||||||
covx tTmp.txt,sys0,0,0
|
|
||||||
btOnOff6.val=sys0
|
|
||||||
}
|
|
||||||
if(type6.txt=="text")
|
|
||||||
{
|
|
||||||
vis bUp6,0
|
|
||||||
vis bStop6,0
|
|
||||||
vis bDown6,0
|
|
||||||
vis btOnOff6,0
|
|
||||||
vis bText6,1
|
|
||||||
tsw bText6,0
|
|
||||||
bText6.pco=65535
|
|
||||||
bText6.pco2=65535
|
|
||||||
// get Text (optional Value)
|
|
||||||
spstr strCommand.txt,bText6.txt,",",36
|
|
||||||
}
|
|
||||||
if(type6.txt=="button")
|
|
||||||
{
|
|
||||||
vis bUp6,0
|
|
||||||
vis bStop6,0
|
|
||||||
vis bDown6,0
|
|
||||||
vis btOnOff6,0
|
|
||||||
vis bText6,1
|
|
||||||
tsw bText6,1
|
|
||||||
bText6.pco=1374
|
|
||||||
bText6.pco2=1374
|
|
||||||
// get Text (optional Value)
|
|
||||||
spstr strCommand.txt,bText6.txt,",",36
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="pageType")
|
if(tInstruction.txt=="pageType")
|
||||||
@@ -1947,11 +1891,36 @@ Timer tmSerial
|
|||||||
//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 ...
|
//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
|
udelete payloadLength-1
|
||||||
bufferPos=0
|
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")
|
if(tId.txt=="popupLight")
|
||||||
{
|
{
|
||||||
pageIcons.tTmp1.txt=tTmp.txt
|
pageIcons.tTmp1.txt=tTmp.txt
|
||||||
page popupLight
|
page popupLight
|
||||||
}
|
}
|
||||||
|
if(tId.txt=="popupShutter")
|
||||||
|
{
|
||||||
|
pageIcons.tTmp1.txt=tTmp.txt
|
||||||
|
page popupShutter
|
||||||
|
}
|
||||||
|
if(tId.txt=="popupNotify")
|
||||||
|
{
|
||||||
|
page popupNotify
|
||||||
|
}
|
||||||
if(tId.txt=="cardThermo")
|
if(tId.txt=="cardThermo")
|
||||||
{
|
{
|
||||||
page cardThermo
|
page cardThermo
|
||||||
@@ -1960,18 +1929,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardMedia
|
page cardMedia
|
||||||
}
|
}
|
||||||
if(tId.txt=="pageStartup")
|
|
||||||
{
|
|
||||||
page pageStartup
|
|
||||||
}
|
|
||||||
if(tId.txt=="popupNotify")
|
|
||||||
{
|
|
||||||
page popupNotify
|
|
||||||
}
|
|
||||||
if(tId.txt=="cardGrid")
|
|
||||||
{
|
|
||||||
page cardGrid
|
|
||||||
}
|
|
||||||
if(tId.txt=="cardAlarm")
|
if(tId.txt=="cardAlarm")
|
||||||
{
|
{
|
||||||
page cardAlarm
|
page cardAlarm
|
||||||
|
|||||||
@@ -612,17 +612,14 @@ Timer tmSerial
|
|||||||
ucopy strCommand.txt,4,payloadLength-5,0
|
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)
|
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
||||||
spstr strCommand.txt,tInstruction.txt,",",0
|
spstr strCommand.txt,tInstruction.txt,",",0
|
||||||
if(tInstruction.txt=="entityUpdHeading")
|
|
||||||
{
|
|
||||||
spstr strCommand.txt,tHeading.txt,",",1
|
|
||||||
}
|
|
||||||
if(tInstruction.txt=="entityUpd")
|
if(tInstruction.txt=="entityUpd")
|
||||||
{
|
{
|
||||||
// command format: entityUpd[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
|
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
|
||||||
|
spstr strCommand.txt,tHeading.txt,",",1
|
||||||
// get Type
|
// get Type
|
||||||
spstr strCommand.txt,type1.txt,",",1
|
spstr strCommand.txt,type1.txt,",",3
|
||||||
// get internal name
|
// get internal name
|
||||||
spstr strCommand.txt,entn1.txt,",",2
|
spstr strCommand.txt,entn1.txt,",",4
|
||||||
if(type1.txt=="delete"||type1.txt=="")
|
if(type1.txt=="delete"||type1.txt=="")
|
||||||
{
|
{
|
||||||
vis tEntity1,0
|
vis tEntity1,0
|
||||||
@@ -630,22 +627,22 @@ Timer tmSerial
|
|||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,",",3
|
spstr strCommand.txt,tTmp.txt,",",5
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
|
substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
|
||||||
vis bEntity1,1
|
vis bEntity1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",4
|
spstr strCommand.txt,tTmp.txt,",",6
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
bEntity1.pco=sys0
|
bEntity1.pco=sys0
|
||||||
// set name
|
// set name
|
||||||
spstr strCommand.txt,tEntity1.txt,",",5
|
spstr strCommand.txt,tEntity1.txt,",",7
|
||||||
vis tEntity1,1
|
vis tEntity1,1
|
||||||
}
|
}
|
||||||
// get Type
|
// get Type
|
||||||
spstr strCommand.txt,type2.txt,",",7
|
spstr strCommand.txt,type2.txt,",",9
|
||||||
// get internal name
|
// get internal name
|
||||||
spstr strCommand.txt,entn2.txt,",",8
|
spstr strCommand.txt,entn2.txt,",",10
|
||||||
if(type2.txt=="delete"||type2.txt=="")
|
if(type2.txt=="delete"||type2.txt=="")
|
||||||
{
|
{
|
||||||
vis tEntity2,0
|
vis tEntity2,0
|
||||||
@@ -653,22 +650,22 @@ Timer tmSerial
|
|||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,",",9
|
spstr strCommand.txt,tTmp.txt,",",11
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
|
substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
|
||||||
vis bEntity2,1
|
vis bEntity2,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",10
|
spstr strCommand.txt,tTmp.txt,",",12
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
bEntity2.pco=sys0
|
bEntity2.pco=sys0
|
||||||
// set name
|
// set name
|
||||||
spstr strCommand.txt,tEntity2.txt,",",11
|
spstr strCommand.txt,tEntity2.txt,",",13
|
||||||
vis tEntity2,1
|
vis tEntity2,1
|
||||||
}
|
}
|
||||||
// get Type
|
// get Type
|
||||||
spstr strCommand.txt,type3.txt,",",13
|
spstr strCommand.txt,type3.txt,",",15
|
||||||
// get internal name
|
// get internal name
|
||||||
spstr strCommand.txt,entn3.txt,",",14
|
spstr strCommand.txt,entn3.txt,",",16
|
||||||
if(type3.txt=="delete"||type3.txt=="")
|
if(type3.txt=="delete"||type3.txt=="")
|
||||||
{
|
{
|
||||||
vis tEntity3,0
|
vis tEntity3,0
|
||||||
@@ -676,22 +673,22 @@ Timer tmSerial
|
|||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,",",15
|
spstr strCommand.txt,tTmp.txt,",",17
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
|
substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
|
||||||
vis bEntity3,1
|
vis bEntity3,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",16
|
spstr strCommand.txt,tTmp.txt,",",18
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
bEntity3.pco=sys0
|
bEntity3.pco=sys0
|
||||||
// set name
|
// set name
|
||||||
spstr strCommand.txt,tEntity3.txt,",",17
|
spstr strCommand.txt,tEntity3.txt,",",19
|
||||||
vis tEntity3,1
|
vis tEntity3,1
|
||||||
}
|
}
|
||||||
// get Type
|
// get Type
|
||||||
spstr strCommand.txt,type4.txt,",",19
|
spstr strCommand.txt,type4.txt,",",21
|
||||||
// get internal name
|
// get internal name
|
||||||
spstr strCommand.txt,entn4.txt,",",20
|
spstr strCommand.txt,entn4.txt,",",22
|
||||||
if(type4.txt=="delete"||type4.txt=="")
|
if(type4.txt=="delete"||type4.txt=="")
|
||||||
{
|
{
|
||||||
vis tEntity4,0
|
vis tEntity4,0
|
||||||
@@ -699,22 +696,22 @@ Timer tmSerial
|
|||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,",",21
|
spstr strCommand.txt,tTmp.txt,",",23
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
|
substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
|
||||||
vis bEntity4,1
|
vis bEntity4,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",22
|
spstr strCommand.txt,tTmp.txt,",",24
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
bEntity4.pco=sys0
|
bEntity4.pco=sys0
|
||||||
// set name
|
// set name
|
||||||
spstr strCommand.txt,tEntity4.txt,",",23
|
spstr strCommand.txt,tEntity4.txt,",",25
|
||||||
vis tEntity4,1
|
vis tEntity4,1
|
||||||
}
|
}
|
||||||
// get Type
|
// get Type
|
||||||
spstr strCommand.txt,type5.txt,",",25
|
spstr strCommand.txt,type5.txt,",",27
|
||||||
// get internal name
|
// get internal name
|
||||||
spstr strCommand.txt,entn5.txt,",",26
|
spstr strCommand.txt,entn5.txt,",",28
|
||||||
if(type5.txt=="delete"||type5.txt=="")
|
if(type5.txt=="delete"||type5.txt=="")
|
||||||
{
|
{
|
||||||
vis tEntity5,0
|
vis tEntity5,0
|
||||||
@@ -722,22 +719,22 @@ Timer tmSerial
|
|||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,",",27
|
spstr strCommand.txt,tTmp.txt,",",29
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
|
substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
|
||||||
vis bEntity5,1
|
vis bEntity5,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",28
|
spstr strCommand.txt,tTmp.txt,",",30
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
bEntity5.pco=sys0
|
bEntity5.pco=sys0
|
||||||
// set name
|
// set name
|
||||||
spstr strCommand.txt,tEntity5.txt,",",29
|
spstr strCommand.txt,tEntity5.txt,",",31
|
||||||
vis tEntity5,1
|
vis tEntity5,1
|
||||||
}
|
}
|
||||||
// get Type
|
// get Type
|
||||||
spstr strCommand.txt,type6.txt,",",31
|
spstr strCommand.txt,type6.txt,",",33
|
||||||
// get internal name
|
// get internal name
|
||||||
spstr strCommand.txt,entn6.txt,",",32
|
spstr strCommand.txt,entn6.txt,",",34
|
||||||
if(type6.txt=="delete"||type6.txt=="")
|
if(type6.txt=="delete"||type6.txt=="")
|
||||||
{
|
{
|
||||||
vis tEntity6,0
|
vis tEntity6,0
|
||||||
@@ -745,16 +742,16 @@ Timer tmSerial
|
|||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,",",33
|
spstr strCommand.txt,tTmp.txt,",",35
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
|
substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
|
||||||
vis bEntity6,1
|
vis bEntity6,1
|
||||||
// change icon color
|
// change icon color
|
||||||
spstr strCommand.txt,tTmp.txt,",",34
|
spstr strCommand.txt,tTmp.txt,",",36
|
||||||
covx tTmp.txt,sys0,0,0
|
covx tTmp.txt,sys0,0,0
|
||||||
bEntity6.pco=sys0
|
bEntity6.pco=sys0
|
||||||
// set name
|
// set name
|
||||||
spstr strCommand.txt,tEntity6.txt,",",35
|
spstr strCommand.txt,tEntity6.txt,",",37
|
||||||
vis tEntity6,1
|
vis tEntity6,1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -770,11 +767,36 @@ Timer tmSerial
|
|||||||
//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 ...
|
//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
|
udelete payloadLength-1
|
||||||
bufferPos=0
|
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")
|
if(tId.txt=="popupLight")
|
||||||
{
|
{
|
||||||
pageIcons.tTmp1.txt=tTmp.txt
|
pageIcons.tTmp1.txt=tTmp.txt
|
||||||
page popupLight
|
page popupLight
|
||||||
}
|
}
|
||||||
|
if(tId.txt=="popupShutter")
|
||||||
|
{
|
||||||
|
pageIcons.tTmp1.txt=tTmp.txt
|
||||||
|
page popupShutter
|
||||||
|
}
|
||||||
|
if(tId.txt=="popupNotify")
|
||||||
|
{
|
||||||
|
page popupNotify
|
||||||
|
}
|
||||||
if(tId.txt=="cardThermo")
|
if(tId.txt=="cardThermo")
|
||||||
{
|
{
|
||||||
page cardThermo
|
page cardThermo
|
||||||
@@ -783,18 +805,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardMedia
|
page cardMedia
|
||||||
}
|
}
|
||||||
if(tId.txt=="pageStartup")
|
|
||||||
{
|
|
||||||
page pageStartup
|
|
||||||
}
|
|
||||||
if(tId.txt=="popupNotify")
|
|
||||||
{
|
|
||||||
page popupNotify
|
|
||||||
}
|
|
||||||
if(tId.txt=="cardEntities")
|
|
||||||
{
|
|
||||||
page cardEntities
|
|
||||||
}
|
|
||||||
if(tId.txt=="cardAlarm")
|
if(tId.txt=="cardAlarm")
|
||||||
{
|
{
|
||||||
page cardAlarm
|
page cardAlarm
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
Program.s
|
Program.s
|
||||||
0 Component(s)
|
0 Component(s)
|
||||||
16 Line(s) of event code
|
9 Line(s) of event code
|
||||||
16 Unique line(s) of event code
|
9 Unique line(s) of event code
|
||||||
pageIcons
|
pageIcons
|
||||||
6 Component(s)
|
6 Component(s)
|
||||||
0 Line(s) of event code
|
0 Line(s) of event code
|
||||||
@@ -14,14 +14,6 @@ pageSerialTest
|
|||||||
13 Component(s)
|
13 Component(s)
|
||||||
48 Line(s) of event code
|
48 Line(s) of event code
|
||||||
43 Unique line(s) of event code
|
43 Unique line(s) of event code
|
||||||
pageTest
|
|
||||||
14 Component(s)
|
|
||||||
14 Line(s) of event code
|
|
||||||
14 Unique line(s) of event code
|
|
||||||
cardMedia
|
|
||||||
22 Component(s)
|
|
||||||
200 Line(s) of event code
|
|
||||||
115 Unique line(s) of event code
|
|
||||||
pageStartup
|
pageStartup
|
||||||
19 Component(s)
|
19 Component(s)
|
||||||
146 Line(s) of event code
|
146 Line(s) of event code
|
||||||
@@ -30,14 +22,18 @@ popupShutter
|
|||||||
19 Component(s)
|
19 Component(s)
|
||||||
180 Line(s) of event code
|
180 Line(s) of event code
|
||||||
103 Unique line(s) of event code
|
103 Unique line(s) of event code
|
||||||
pageSwipeTest
|
pageTest
|
||||||
19 Component(s)
|
13 Component(s)
|
||||||
62 Line(s) of event code
|
13 Line(s) of event code
|
||||||
44 Unique line(s) of event code
|
13 Unique line(s) of event code
|
||||||
cardAlarm
|
cardMedia
|
||||||
35 Component(s)
|
22 Component(s)
|
||||||
259 Line(s) of event code
|
200 Line(s) of event code
|
||||||
163 Unique line(s) of event code
|
115 Unique line(s) of event code
|
||||||
|
cardGrid
|
||||||
|
39 Component(s)
|
||||||
|
392 Line(s) of event code
|
||||||
|
226 Unique line(s) of event code
|
||||||
cardThermo
|
cardThermo
|
||||||
42 Component(s)
|
42 Component(s)
|
||||||
412 Line(s) of event code
|
412 Line(s) of event code
|
||||||
@@ -46,21 +42,21 @@ screensaver
|
|||||||
25 Component(s)
|
25 Component(s)
|
||||||
173 Line(s) of event code
|
173 Line(s) of event code
|
||||||
124 Unique line(s) of event code
|
124 Unique line(s) of event code
|
||||||
cardGrid
|
cardAlarm
|
||||||
39 Component(s)
|
35 Component(s)
|
||||||
382 Line(s) of event code
|
274 Line(s) of event code
|
||||||
221 Unique line(s) of event code
|
170 Unique line(s) of event code
|
||||||
popupLight
|
popupLight
|
||||||
26 Component(s)
|
26 Component(s)
|
||||||
307 Line(s) of event code
|
307 Line(s) of event code
|
||||||
168 Unique line(s) of event code
|
168 Unique line(s) of event code
|
||||||
cardEntities
|
cardEntities
|
||||||
74 Component(s)
|
74 Component(s)
|
||||||
1006 Line(s) of event code
|
970 Line(s) of event code
|
||||||
407 Unique line(s) of event code
|
380 Unique line(s) of event code
|
||||||
|
|
||||||
Total
|
Total
|
||||||
14 Page(s)
|
13 Page(s)
|
||||||
370 Component(s)
|
350 Component(s)
|
||||||
3385 Line(s) of event code
|
3304 Line(s) of event code
|
||||||
894 Unique line(s) of event code
|
838 Unique line(s) of event code
|
||||||
|
|||||||
@@ -1,294 +0,0 @@
|
|||||||
Page pageSwipeTest
|
|
||||||
Attributes
|
|
||||||
ID : 0
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Locked : no
|
|
||||||
Swide up page ID : disabled
|
|
||||||
Swide down page ID : disabled
|
|
||||||
Swide left page ID : disabled
|
|
||||||
Swide right page ID : disabled
|
|
||||||
|
|
||||||
Number nXS
|
|
||||||
Attributes
|
|
||||||
ID : 7
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Value : 0
|
|
||||||
|
|
||||||
Number nYE
|
|
||||||
Attributes
|
|
||||||
ID : 8
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Value : 0
|
|
||||||
|
|
||||||
Number nYS
|
|
||||||
Attributes
|
|
||||||
ID : 9
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Value : 0
|
|
||||||
|
|
||||||
Number nXE
|
|
||||||
Attributes
|
|
||||||
ID : 10
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Value : 0
|
|
||||||
|
|
||||||
Number nYR
|
|
||||||
Attributes
|
|
||||||
ID : 12
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Value : 0
|
|
||||||
|
|
||||||
Number nXR
|
|
||||||
Attributes
|
|
||||||
ID : 13
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Value : 0
|
|
||||||
|
|
||||||
Text tDesc1
|
|
||||||
Attributes
|
|
||||||
ID : 2
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Text : X-Start:\r\nX-End:\r\nY-Start:\r\nY-End:
|
|
||||||
Max. Text Size : 70
|
|
||||||
|
|
||||||
Text t2
|
|
||||||
Attributes
|
|
||||||
ID : 3
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Text : Swipe Dir\r\nold:
|
|
||||||
Max. Text Size : 70
|
|
||||||
|
|
||||||
Text tDirection
|
|
||||||
Attributes
|
|
||||||
ID : 6
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Text : newtxt
|
|
||||||
Max. Text Size : 10
|
|
||||||
|
|
||||||
Text t0
|
|
||||||
Attributes
|
|
||||||
ID : 11
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Text : Difference\r\nX\r\nY
|
|
||||||
Max. Text Size : 60
|
|
||||||
|
|
||||||
Text tStatusNew
|
|
||||||
Attributes
|
|
||||||
ID : 14
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Text : newtxt
|
|
||||||
Max. Text Size : 40
|
|
||||||
|
|
||||||
Text t3
|
|
||||||
Attributes
|
|
||||||
ID : 15
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Text : new direction:
|
|
||||||
Max. Text Size : 50
|
|
||||||
|
|
||||||
Text tDirNew
|
|
||||||
Attributes
|
|
||||||
ID : 16
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Text : newtxt
|
|
||||||
Max. Text Size : 40
|
|
||||||
|
|
||||||
Text t1
|
|
||||||
Attributes
|
|
||||||
ID : 18
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Text : new status:
|
|
||||||
Max. Text Size : 50
|
|
||||||
|
|
||||||
Picture p0
|
|
||||||
Attributes
|
|
||||||
ID : 1
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
|
|
||||||
Button b8
|
|
||||||
Attributes
|
|
||||||
ID : 17
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
State : unpressed
|
|
||||||
Text : back
|
|
||||||
Max. Text Size : 10
|
|
||||||
|
|
||||||
Events
|
|
||||||
Touch Press Event
|
|
||||||
page pageTest
|
|
||||||
|
|
||||||
Timer tm0
|
|
||||||
Attributes
|
|
||||||
ID : 5
|
|
||||||
Scope : local
|
|
||||||
Period (ms): 50
|
|
||||||
Enabled : yes
|
|
||||||
|
|
||||||
Events
|
|
||||||
Timer Event
|
|
||||||
if(tc0.val!=0)
|
|
||||||
{
|
|
||||||
xc2=tch0
|
|
||||||
yc2=tch1
|
|
||||||
//debug
|
|
||||||
nXE.val=xc2
|
|
||||||
nYE.val=yc2
|
|
||||||
}
|
|
||||||
|
|
||||||
TouchCap tc0
|
|
||||||
Attributes
|
|
||||||
ID : 4
|
|
||||||
Scope: local
|
|
||||||
Value: 0
|
|
||||||
|
|
||||||
Events
|
|
||||||
Touch Press Event
|
|
||||||
if(tc0.val==9) // This is the location of the brightness slider
|
|
||||||
{
|
|
||||||
xc1=0
|
|
||||||
yc1=0
|
|
||||||
}else
|
|
||||||
{
|
|
||||||
xc1=tch0
|
|
||||||
yc1=tch1
|
|
||||||
//debug
|
|
||||||
nXS.val=xc1
|
|
||||||
nYS.val=yc1
|
|
||||||
tm0.en=1
|
|
||||||
}
|
|
||||||
|
|
||||||
Touch Release Event
|
|
||||||
tm0.en=0
|
|
||||||
if(tc0.val==9) // This is the location of the brightness slider
|
|
||||||
{
|
|
||||||
}else
|
|
||||||
{
|
|
||||||
if(tch0==0)
|
|
||||||
// When this is zero we can interpret that as the real end of the drag event
|
|
||||||
{
|
|
||||||
xcR=xc1-xc2
|
|
||||||
ycR=yc1-yc2
|
|
||||||
// //debug
|
|
||||||
// nXR.val=xcR
|
|
||||||
// nYR.val=ycR
|
|
||||||
// if(xcR>125)
|
|
||||||
// {
|
|
||||||
// tDirection.txt="left"
|
|
||||||
// }else if(xcR<-125)
|
|
||||||
// {
|
|
||||||
// tDirection.txt="right"
|
|
||||||
// }else if(ycR>125)
|
|
||||||
// {
|
|
||||||
// tDirection.txt="up"
|
|
||||||
// }else if(ycR<-125)
|
|
||||||
// {
|
|
||||||
// tDirection.txt="down"
|
|
||||||
// }else
|
|
||||||
// {
|
|
||||||
// tDirection.txt="invalid"
|
|
||||||
// }
|
|
||||||
// new method
|
|
||||||
// one of the difference values should be low to be a valid direction, in case it has a high value it's not a valid swipe, because it's diagonal
|
|
||||||
// x difference between -125 and 125 (swipe on y-axis)
|
|
||||||
if(xcR>ixLimit&&xcR<xLimit)
|
|
||||||
{
|
|
||||||
tStatusNew.txt="x low, -> y"
|
|
||||||
// check if below minimum value (change is negative)
|
|
||||||
if(ycR<iyLimitMin)
|
|
||||||
{
|
|
||||||
tDirNew.txt="down"
|
|
||||||
}else if(ycR>yLimitMin)
|
|
||||||
{
|
|
||||||
tDirNew.txt="up"
|
|
||||||
}else
|
|
||||||
{
|
|
||||||
tDirNew.txt="invalid"
|
|
||||||
}
|
|
||||||
// y difference between -125 and 125 (swipe on x-axis)
|
|
||||||
}else if(ycR>iyLimit&&ycR<yLimit)
|
|
||||||
{
|
|
||||||
tStatusNew.txt="y low, -> x"
|
|
||||||
if(xcR<ixLimitMin)
|
|
||||||
{
|
|
||||||
tDirNew.txt="right"
|
|
||||||
}else if(xcR>xLimitMin)
|
|
||||||
{
|
|
||||||
tDirNew.txt="left"
|
|
||||||
}else
|
|
||||||
{
|
|
||||||
tDirNew.txt="invalid"
|
|
||||||
}
|
|
||||||
//diagonal swipe invalid
|
|
||||||
}else
|
|
||||||
{
|
|
||||||
tStatusNew.txt="invalid"
|
|
||||||
tDirNew.txt="diagonal"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -53,24 +53,9 @@ Button b1
|
|||||||
Touch Press Event
|
Touch Press Event
|
||||||
page pageSerialTest
|
page pageSerialTest
|
||||||
|
|
||||||
Button b2
|
|
||||||
Attributes
|
|
||||||
ID : 4
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
Disable release event after dragging: 0
|
|
||||||
Send Component ID : disabled
|
|
||||||
State : unpressed
|
|
||||||
Text : swipe
|
|
||||||
Max. Text Size : 10
|
|
||||||
|
|
||||||
Events
|
|
||||||
Touch Press Event
|
|
||||||
page pageSwipeTest
|
|
||||||
|
|
||||||
Button b3
|
Button b3
|
||||||
Attributes
|
Attributes
|
||||||
ID : 5
|
ID : 4
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
@@ -85,7 +70,7 @@ Button b3
|
|||||||
|
|
||||||
Button b6
|
Button b6
|
||||||
Attributes
|
Attributes
|
||||||
ID : 6
|
ID : 5
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
@@ -100,7 +85,7 @@ Button b6
|
|||||||
|
|
||||||
Button b4
|
Button b4
|
||||||
Attributes
|
Attributes
|
||||||
ID : 7
|
ID : 6
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
@@ -115,7 +100,7 @@ Button b4
|
|||||||
|
|
||||||
Button b5
|
Button b5
|
||||||
Attributes
|
Attributes
|
||||||
ID : 8
|
ID : 7
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
@@ -130,7 +115,7 @@ Button b5
|
|||||||
|
|
||||||
Button b7
|
Button b7
|
||||||
Attributes
|
Attributes
|
||||||
ID : 9
|
ID : 8
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
@@ -145,7 +130,7 @@ Button b7
|
|||||||
|
|
||||||
Button b8
|
Button b8
|
||||||
Attributes
|
Attributes
|
||||||
ID : 10
|
ID : 9
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
@@ -161,7 +146,7 @@ Button b8
|
|||||||
|
|
||||||
Button b9
|
Button b9
|
||||||
Attributes
|
Attributes
|
||||||
ID : 11
|
ID : 10
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
@@ -176,7 +161,7 @@ Button b9
|
|||||||
|
|
||||||
Button b10
|
Button b10
|
||||||
Attributes
|
Attributes
|
||||||
ID : 12
|
ID : 11
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
@@ -191,7 +176,7 @@ Button b10
|
|||||||
|
|
||||||
Button b11
|
Button b11
|
||||||
Attributes
|
Attributes
|
||||||
ID : 13
|
ID : 12
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
|
|||||||
Reference in New Issue
Block a user