start reworking navigation paramters (#644) (add nextion2text)

This commit is contained in:
joBr99
2022-12-28 19:03:54 +00:00
committed by github-actions[bot]
parent f0c5b5b429
commit f976e7a738
20 changed files with 9502 additions and 1289 deletions

View File

@@ -72,6 +72,20 @@ Variable (string) entn
Text :
Max. Text Size: 80
Variable (string) nent1
Attributes
ID : 41
Scope : local
Text :
Max. Text Size: 80
Variable (string) nent2
Attributes
ID : 40
Scope : local
Text :
Max. Text Size: 80
Variable (string) strCommand
Attributes
ID : 6
@@ -1014,14 +1028,7 @@ Button bNext
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,"
if(bNext.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
tSend.txt="event,buttonPress2,"+nent2.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1068,14 +1075,7 @@ Button bPrev
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt="event,buttonPress2,"+nent1.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1223,86 +1223,80 @@ Timer tmSerial
{
//entn
spstr strCommand.txt,entn.txt,"~",1
// navigation icons
spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0")
// navigation icon left
spstr strCommand.txt,tTmp.txt,"~",2 //type
if(tTmp.txt=="delete"||tTmp.txt=="")
{
vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
}
if(tTmp.txt=="1")
}else
{
// get internal name
spstr strCommand.txt,nent1.txt,"~",3
// change icon
spstr strCommand.txt,bPrev.txt,"~",4
// change icon color
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,sys0,0,0
bPrev.pco=sys0
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")
// navigation icon right
spstr strCommand.txt,tTmp.txt,"~",8 //type
if(tTmp.txt=="delete"||tTmp.txt=="")
{
vis bNext,0
tsw mSwipeNext,0
}
if(tTmp.txt=="1")
}else
{
// get internal name
spstr strCommand.txt,nent2.txt,"~",9
// change icon
spstr strCommand.txt,bNext.txt,"~",10
// change icon color
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,sys0,0,0
bNext.pco=sys0
vis bNext,1
tsw mSwipeNext,1
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
//text arm1
spstr strCommand.txt,arm1.txt,"~",3
spstr strCommand.txt,arm1.txt,"~",14
if(arm1.txt!="")
{
vis arm1,1
}
//id arm1
spstr strCommand.txt,va1.txt,"~",4
spstr strCommand.txt,va1.txt,"~",15
//text arm2
spstr strCommand.txt,arm2.txt,"~",5
spstr strCommand.txt,arm2.txt,"~",16
if(arm2.txt!="")
{
vis arm2,1
}
//id arm2
spstr strCommand.txt,va2.txt,"~",6
spstr strCommand.txt,va2.txt,"~",17
//text arm3
spstr strCommand.txt,arm3.txt,"~",7
spstr strCommand.txt,arm3.txt,"~",18
if(arm3.txt!="")
{
vis arm3,1
}
//id arm3
spstr strCommand.txt,va3.txt,"~",8
spstr strCommand.txt,va3.txt,"~",19
//text arm4
spstr strCommand.txt,arm4.txt,"~",9
spstr strCommand.txt,arm4.txt,"~",20
if(arm4.txt!="")
{
vis arm4,1
}
//id arm4
spstr strCommand.txt,va4.txt,"~",10
spstr strCommand.txt,va4.txt,"~",21
//icon
spstr strCommand.txt,tIcon.txt,"~",11
spstr strCommand.txt,tIcon.txt,"~",22
//icon color
spstr strCommand.txt,tTmp.txt,"~",12
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,sys0,0,0
tIcon.pco=sys0
//numpad status
spstr strCommand.txt,tTmp.txt,"~",13
spstr strCommand.txt,tTmp.txt,"~",24
if(tTmp.txt!="disable")
{
vis b0,1
@@ -1335,7 +1329,7 @@ Timer tmSerial
vis tCode,0
}
//flashing status
spstr strCommand.txt,tTmp.txt,"~",14
spstr strCommand.txt,tTmp.txt,"~",25
if(tTmp.txt=="enable")
{
tmFlash.en=1
@@ -1344,13 +1338,13 @@ Timer tmSerial
tmFlash.en=0
}
// extra button
spstr strCommand.txt,b9.txt,"~",15
spstr strCommand.txt,b9.txt,"~",26
if(b9.txt!="")
{
vis b9,1
spstr strCommand.txt,tTmp.txt,"~",16
spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,b9.pco,0,0
spstr strCommand.txt,vaAddBtn.txt,"~",17
spstr strCommand.txt,vaAddBtn.txt,"~",28
}
}
if(tInstruction.txt=="time")