fix navigation after PR (add nextion2text)

This commit is contained in:
joBr99
2022-11-26 21:54:22 +00:00
committed by github-actions[bot]
parent 4afa570562
commit 535c3a761f
34 changed files with 486 additions and 2018 deletions

View File

@@ -483,7 +483,7 @@ Button bNext
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,"
if(bNext.txt=="?")
if(bNext.txt=="")
{
tSend.txt+="bHome"
}else
@@ -515,7 +515,7 @@ Button bPrev
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,"
if(bPrev.txt=="?")
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
@@ -654,14 +654,14 @@ Timer tmSerial
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="?"
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="?"
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
@@ -673,12 +673,12 @@ Timer tmSerial
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt="?"
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt="?"
bNext.txt=""
}
//text arm1
spstr strCommand.txt,arm1.txt,"~",3

View File

@@ -180,7 +180,7 @@ Button bNext
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardChart,"
if(bPrev.txt=="?")
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
@@ -212,7 +212,7 @@ Button bPrev
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardChart,"
if(bPrev.txt=="?")
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
@@ -413,14 +413,14 @@ Timer tmSerial
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="?"
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="?"
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
@@ -432,12 +432,12 @@ Timer tmSerial
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt="?"
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt="?"
bNext.txt=""
}
// extract color
spstr strCommand.txt,tTmp.txt,"~",3

View File

@@ -534,7 +534,7 @@ Button bNext
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardEntities,"
if(bNext.txt=="?")
if(bNext.txt=="")
{
tSend.txt+="bHome"
}else
@@ -566,7 +566,7 @@ Button bPrev
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardEntities,"
if(bPrev.txt=="?")
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
@@ -1236,14 +1236,14 @@ Timer tmSerial
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="?"
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="?"
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
@@ -1255,12 +1255,12 @@ Timer tmSerial
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt="?"
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt="?"
bNext.txt=""
}
// get Type
spstr strCommand.txt,type1.txt,"~",3

View File

@@ -472,7 +472,7 @@ Button bNext
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardGrid,"
if(bNext.txt=="?")
if(bNext.txt=="")
{
tSend.txt+="bHome"
}else
@@ -504,7 +504,7 @@ Button bPrev
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardGrid,"
if(bPrev.txt=="?")
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
@@ -663,14 +663,14 @@ Timer tmSerial
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="?"
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="?"
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
@@ -682,12 +682,12 @@ Timer tmSerial
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt="?"
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt="?"
bNext.txt=""
}
// get Type
spstr strCommand.txt,type1.txt,"~",3

View File

@@ -448,7 +448,7 @@ Button bNext
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardMedia,"
if(bNext.txt=="?")
if(bNext.txt=="")
{
tSend.txt+="bHome"
}else
@@ -480,7 +480,7 @@ Button bPrev
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardMedia,"
if(bPrev.txt=="?")
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
@@ -611,14 +611,14 @@ Timer tmSerial
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="?"
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="?"
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
@@ -630,12 +630,12 @@ Timer tmSerial
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt="?"
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt="?"
bNext.txt=""
}
//entity name
spstr strCommand.txt,entn.txt,"~",3

View File

@@ -347,7 +347,7 @@ Button bNext
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardPower,"
if(bNext.txt=="?")
if(bNext.txt=="")
{
tSend.txt+="bHome"
}else
@@ -379,7 +379,7 @@ Button bPrev
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,"
if(bPrev.txt=="?")
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
@@ -569,14 +569,14 @@ Timer tmSerial
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="?"
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="?"
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
@@ -588,12 +588,12 @@ Timer tmSerial
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt="?"
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt="?"
bNext.txt=""
}
// icon color home
spstr strCommand.txt,tTmp.txt,"~",3

View File

@@ -188,7 +188,7 @@ Button bNext
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardQR,"
if(bNext.txt=="?")
if(bNext.txt=="")
{
tSend.txt+="bHome"
}else
@@ -220,7 +220,7 @@ Button bPrev
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,"
if(bPrev.txt=="?")
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
@@ -460,14 +460,14 @@ Timer tmSerial
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="?"
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="?"
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
@@ -479,12 +479,12 @@ Timer tmSerial
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt="?"
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt="?"
bNext.txt=""
}
//text qrcode
spstr strCommand.txt,vaQR.txt,"~",3

View File

@@ -295,7 +295,7 @@ Button bNext
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardThermo,"
if(bNext.txt=="?")
if(bNext.txt=="")
{
tSend.txt+="bHome"
}else
@@ -327,7 +327,7 @@ Button bPrev
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardThermo,"
if(bPrev.txt=="?")
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
@@ -908,14 +908,14 @@ Timer tmSerial
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="?"
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="?"
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
@@ -927,12 +927,12 @@ Timer tmSerial
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt="?"
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt="?"
bNext.txt=""
}
//entity name
spstr strCommand.txt,entn.txt,"~",3

View File

@@ -135,20 +135,6 @@ Button b13
Touch Press Event
page popupThermo
Button b14
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : chart
Max. Text Size : 10
Events
Touch Press Event
page cardChart
Button b2
Attributes
Scope : local

View File

@@ -623,10 +623,6 @@ Timer tmSerial
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1

View File

@@ -897,10 +897,6 @@ Timer tmSerial
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1

View File

@@ -686,10 +686,6 @@ Timer tmSerial
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1

View File

@@ -441,10 +441,6 @@ Timer tmSerial
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1

View File

@@ -675,10 +675,6 @@ Timer tmSerial
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1

View File

@@ -946,10 +946,6 @@ Timer tmSerial
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1