Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2022-10-29 19:12:11 +00:00
committed by github-actions[bot]
parent 49cdd127c8
commit 2c99843e7c
6 changed files with 698 additions and 10 deletions

View File

@@ -68,6 +68,36 @@ Variable (string) tSend
Text :
Max. Text Size: 50
Variable (int32) xc1
Attributes
Scope: local
Value: 0
Variable (int32) yc1
Attributes
Scope: local
Value: 0
Variable (int32) xc2
Attributes
Scope: local
Value: 0
Variable (int32) yc2
Attributes
Scope: local
Value: 0
Variable (int32) ycR
Attributes
Scope: local
Value: 0
Variable (int32) xcR
Attributes
Scope: local
Value: 0
Text tTime
Attributes
Scope : local
@@ -728,6 +758,20 @@ Timer tmSleep
}
}
Timer tm0
Attributes
Scope : local
Period (ms): 50
Enabled : yes
Events
Timer Event
if(tc0.val!=0)
{
xc2.val=tch0
yc2.val=tch1
}
TouchCap tc0
Attributes
Scope: local
@@ -735,6 +779,9 @@ TouchCap tc0
Events
Touch Press Event
xc1.val=tch0
yc1.val=tch1
tm0.en=1
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
@@ -750,6 +797,67 @@ TouchCap tc0
covx vaTap.val,tTmp.txt,0,0
tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
//send calc crc
//btlen tSend.txt,sys0
//crcrest 1,0xffff // reset CRC
//crcputh 55 bb
//crcputs sys0,2
//crcputs tSend.txt,0
//send cmd
//printh 55 bb
//prints sys0,2
//prints tSend.txt,0
//prints crcval,2
Touch Release Event
tm0.en=0
if(tch0==0)
// When this is zero we can interpret that as the real end of the drag event
{
xcR.val=xc1.val-xc2.val
ycR.val=yc1.val-yc2.val
// 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.val>-125&&xcR.val<125)
{
//tStatusNew.txt="x low, -> y"
// check if below minimum value (change is negative)
if(ycR.val<-80)
{
//tDirNew.txt="down"
tSend.txt="event,buttonPress2,screensaver,swipeDown"
}else if(ycR.val>80)
{
//tDirNew.txt="up"
tSend.txt="event,buttonPress2,screensaver,swipeUp"
}else
{
//tDirNew.txt="invalid"
}
// y difference between -125 and 125 (swipe on x-axis)
}else if(ycR.val>-125&&ycR.val<125)
{
//tStatusNew.txt="y low, -> x"
if(xcR.val<-80)
{
//tDirNew.txt="right"
tSend.txt="event,buttonPress2,screensaver,swipeRight"
}else if(xcR.val>80)
{
//tDirNew.txt="left"
tSend.txt="event,buttonPress2,screensaver,swipeLeft"
}else
{
//tDirNew.txt="invalid"
}
//diagonal swipe invalid
}else
{
//tStatusNew.txt="invalid"
//tDirNew.txt="diagonal"
}
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb