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

@@ -70,11 +70,23 @@ Variable (string) entn2
Text :
Max. Text Size: 80
Variable (string) nent1
Attributes
Scope : local
Text :
Max. Text Size: 50
Variable (string) nent2
Attributes
Scope : local
Text :
Max. Text Size: 50
Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 275
Max. Text Size: 400
Variable (string) tId
Attributes
@@ -187,14 +199,7 @@ Button bNext
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardQR,"
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
@@ -219,14 +224,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
@@ -446,52 +444,46 @@ Timer tmSerial
// command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2
//tHeading
spstr strCommand.txt,tHeading.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 qrcode
spstr strCommand.txt,vaQR.txt,"~",3
spstr strCommand.txt,vaQR.txt,"~",14
// get Type
spstr strCommand.txt,type1.txt,"~",4
spstr strCommand.txt,type1.txt,"~",15
// get internal name
spstr strCommand.txt,entn1.txt,"~",5
spstr strCommand.txt,entn1.txt,"~",16
if(type1.txt=="delete"||type1.txt=="")
{
vis btOnOff1,0
@@ -501,14 +493,14 @@ Timer tmSerial
}else
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",6
spstr strCommand.txt,tIcon1.txt,"~",17
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",7
spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0
// set name
spstr strCommand.txt,tEntity1.txt,"~",8
spstr strCommand.txt,tEntity1.txt,"~",19
vis tEntity1,1
}
if(type1.txt=="light")
@@ -516,7 +508,7 @@ Timer tmSerial
vis btOnOff1,1
vis bText1,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,"~",9
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
}
@@ -525,7 +517,7 @@ Timer tmSerial
vis btOnOff1,1
vis bText1,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,"~",9
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
}
@@ -537,7 +529,7 @@ Timer tmSerial
bText1.pco=65535
bText1.pco2=65535
// get Text (optional Value)
spstr strCommand.txt,bText1.txt,"~",9
spstr strCommand.txt,bText1.txt,"~",20
}
if(type1.txt=="button")
{
@@ -547,12 +539,12 @@ Timer tmSerial
bText1.pco=1374
bText1.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText1.txt,"~",9
spstr strCommand.txt,bText1.txt,"~",20
}
// get Type
spstr strCommand.txt,type2.txt,"~",10
spstr strCommand.txt,type2.txt,"~",21
// get internal name
spstr strCommand.txt,entn2.txt,"~",11
spstr strCommand.txt,entn2.txt,"~",22
if(type2.txt=="delete"||type2.txt=="")
{
vis btOnOff2,0
@@ -562,14 +554,14 @@ Timer tmSerial
}else
{
// change icon
spstr strCommand.txt,tIcon2.txt,"~",12
spstr strCommand.txt,tIcon2.txt,"~",23
vis tIcon2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",13
spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,sys0,0,0
tIcon2.pco=sys0
// set name
spstr strCommand.txt,tEntity2.txt,"~",14
spstr strCommand.txt,tEntity2.txt,"~",25
vis tEntity2,1
}
if(type2.txt=="light")
@@ -577,7 +569,7 @@ Timer tmSerial
vis btOnOff2,1
vis bText2,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,"~",15
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,sys0,0,0
btOnOff2.val=sys0
}
@@ -586,7 +578,7 @@ Timer tmSerial
vis btOnOff2,1
vis bText2,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,"~",15
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,sys0,0,0
btOnOff2.val=sys0
}
@@ -598,7 +590,7 @@ Timer tmSerial
bText2.pco=65535
bText2.pco2=65535
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",15
spstr strCommand.txt,bText2.txt,"~",26
}
if(type2.txt=="button")
{
@@ -608,7 +600,7 @@ Timer tmSerial
bText2.pco=1374
bText2.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",15
spstr strCommand.txt,bText2.txt,"~",26
}
if(type2.txt=="delete"||type2.txt=="")
{