sync serial proto changes to us-p (add nextion2text)

This commit is contained in:
joBr99
2023-02-01 21:52:52 +00:00
committed by github-actions[bot]
parent aab0f46b58
commit d0436c0b55
5 changed files with 339 additions and 657 deletions

View File

@@ -80,31 +80,67 @@ Variable (int32) t0Speed
Scope: local
Value: 0
Variable (string) t0o
Attributes
Scope : local
Text :
Max. Text Size: 1
Variable (int32) t1Speed
Attributes
Scope: local
Value: 0
Variable (string) t1o
Attributes
Scope : local
Text :
Max. Text Size: 1
Variable (int32) t2Speed
Attributes
Scope: local
Value: 0
Variable (string) t2o
Attributes
Scope : local
Text :
Max. Text Size: 1
Variable (int32) t3Speed
Attributes
Scope: local
Value: 0
Variable (string) t3o
Attributes
Scope : local
Text :
Max. Text Size: 1
Variable (int32) t4Speed
Attributes
Scope: local
Value: 0
Variable (string) t4o
Attributes
Scope : local
Text :
Max. Text Size: 1
Variable (int32) t5Speed
Attributes
Scope: local
Value: 0
Variable (string) t5o
Attributes
Scope : local
Text :
Max. Text Size: 1
Variable (string) tId
Attributes
Scope : local
@@ -599,7 +635,6 @@ Timer tmSerial
spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpd")
{
// command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
spstr strCommand.txt,tHeading.txt,"~",1
// navigation icon left
spstr strCommand.txt,tTmp.txt,"~",2 //type
@@ -636,29 +671,26 @@ Timer tmSerial
vis bNext,1
}
// icon color home
spstr strCommand.txt,tTmp.txt,"~",14
spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,t1.pco,0,0
// icon home
spstr strCommand.txt,t1.txt,"~",15
spstr strCommand.txt,t1.txt,"~",16
// speed 16 ignored
// text home
spstr strCommand.txt,tHome.txt,"~",17
spstr strCommand.txt,tHome.txt,"~",19
spstr tHome.txt,tHome2.txt," ",1
spstr tHome.txt,tHome.txt," ",0
// icon color 18 ignored
// icon 19 ignored
// speed 20 ignored
// text home
spstr strCommand.txt,tHomeO.txt,"~",21
spstr strCommand.txt,tHomeO.txt,"~",26
spstr tHomeO.txt,tHomeO2.txt," ",1
spstr tHomeO.txt,tHomeO.txt," ",0
// iconColor
spstr strCommand.txt,tTmp.txt,"~",22
spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,t0Icon.pco,0,0
// icon
spstr strCommand.txt,t0Icon.txt,"~",23
spstr strCommand.txt,t0Icon.txt,"~",30
// speed
spstr strCommand.txt,tTmp.txt,"~",24
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,t0Speed.val,0,0
if(t0Speed.val>120)
{
@@ -669,7 +701,9 @@ Timer tmSerial
t0Speed.val=-120
}
// lower text
spstr strCommand.txt,t0u.txt,"~",25
spstr strCommand.txt,t0u.txt,"~",33
// upper text
spstr strCommand.txt,t0o.txt,"~",32
if(t0Icon.txt!="")
{
vis t0Icon,1
@@ -682,12 +716,12 @@ Timer tmSerial
vis h0,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",26
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,t1Icon.pco,0,0
// icon
spstr strCommand.txt,t1Icon.txt,"~",27
spstr strCommand.txt,t1Icon.txt,"~",37
// speed
spstr strCommand.txt,tTmp.txt,"~",28
spstr strCommand.txt,tTmp.txt,"~",41
covx tTmp.txt,t1Speed.val,0,0
if(t1Speed.val>120)
{
@@ -698,7 +732,9 @@ Timer tmSerial
t1Speed.val=-120
}
// lower text
spstr strCommand.txt,t1u.txt,"~",29
spstr strCommand.txt,t1u.txt,"~",40
// upper text
spstr strCommand.txt,t1o.txt,"~",39
if(t1Icon.txt!="")
{
vis t1Icon,1
@@ -711,12 +747,12 @@ Timer tmSerial
vis h1,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",30
spstr strCommand.txt,tTmp.txt,"~",45
covx tTmp.txt,t2Icon.pco,0,0
// icon
spstr strCommand.txt,t2Icon.txt,"~",31
spstr strCommand.txt,t2Icon.txt,"~",44
// speed
spstr strCommand.txt,tTmp.txt,"~",32
spstr strCommand.txt,tTmp.txt,"~",48
covx tTmp.txt,t2Speed.val,0,0
if(t2Speed.val>120)
{
@@ -727,7 +763,9 @@ Timer tmSerial
t2Speed.val=-120
}
// lower text
spstr strCommand.txt,t2u.txt,"~",33
spstr strCommand.txt,t2u.txt,"~",47
// upper text
spstr strCommand.txt,t2o.txt,"~",46
if(t2Icon.txt!="")
{
vis t2Icon,1
@@ -740,12 +778,12 @@ Timer tmSerial
vis h2,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",34
spstr strCommand.txt,tTmp.txt,"~",52
covx tTmp.txt,t3Icon.pco,0,0
// icon
spstr strCommand.txt,t3Icon.txt,"~",35
spstr strCommand.txt,t3Icon.txt,"~",51
// speed
spstr strCommand.txt,tTmp.txt,"~",36
spstr strCommand.txt,tTmp.txt,"~",55
covx tTmp.txt,t3Speed.val,0,0
if(t3Speed.val>120)
{
@@ -756,7 +794,9 @@ Timer tmSerial
t3Speed.val=-120
}
// lower text
spstr strCommand.txt,t3u.txt,"~",37
spstr strCommand.txt,t3u.txt,"~",54
// upper text
spstr strCommand.txt,t3o.txt,"~",53
if(t3Icon.txt!="")
{
vis t3Icon,1
@@ -769,12 +809,12 @@ Timer tmSerial
vis h3,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",38
spstr strCommand.txt,tTmp.txt,"~",59
covx tTmp.txt,t4Icon.pco,0,0
// icon
spstr strCommand.txt,t4Icon.txt,"~",39
spstr strCommand.txt,t4Icon.txt,"~",58
// speed
spstr strCommand.txt,tTmp.txt,"~",40
spstr strCommand.txt,tTmp.txt,"~",62
covx tTmp.txt,t4Speed.val,0,0
if(t4Speed.val>120)
{
@@ -785,7 +825,9 @@ Timer tmSerial
t4Speed.val=-120
}
// lower text
spstr strCommand.txt,t4u.txt,"~",41
spstr strCommand.txt,t4u.txt,"~",61
// upper text
spstr strCommand.txt,t4o.txt,"~",60
if(t4Icon.txt!="")
{
vis t4Icon,1
@@ -798,12 +840,12 @@ Timer tmSerial
vis h4,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",42
spstr strCommand.txt,tTmp.txt,"~",66
covx tTmp.txt,t5Icon.pco,0,0
// icon
spstr strCommand.txt,t5Icon.txt,"~",43
spstr strCommand.txt,t5Icon.txt,"~",65
// speed
spstr strCommand.txt,tTmp.txt,"~",44
spstr strCommand.txt,tTmp.txt,"~",69
covx tTmp.txt,t5Speed.val,0,0
if(t5Speed.val>120)
{
@@ -814,7 +856,9 @@ Timer tmSerial
t5Speed.val=-120
}
// lower text
spstr strCommand.txt,t5u.txt,"~",45
spstr strCommand.txt,t5u.txt,"~",68
// upper text
spstr strCommand.txt,t5o.txt,"~",67
if(t5Icon.txt!="")
{
vis t5Icon,1
@@ -895,10 +939,6 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{