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

@@ -92,36 +92,78 @@ Variable (int32) t0Speed
Scope: local
Value: 0
Variable (string) t0o
Attributes
ID : 48
Scope : local
Text :
Max. Text Size: 1
Variable (int32) t1Speed
Attributes
ID : 37
Scope: local
Value: 0
Variable (string) t1o
Attributes
ID : 49
Scope : local
Text :
Max. Text Size: 1
Variable (int32) t2Speed
Attributes
ID : 41
Scope: local
Value: 0
Variable (string) t2o
Attributes
ID : 50
Scope : local
Text :
Max. Text Size: 1
Variable (int32) t3Speed
Attributes
ID : 38
Scope: local
Value: 0
Variable (string) t3o
Attributes
ID : 51
Scope : local
Text :
Max. Text Size: 1
Variable (int32) t4Speed
Attributes
ID : 39
Scope: local
Value: 0
Variable (string) t4o
Attributes
ID : 52
Scope : local
Text :
Max. Text Size: 1
Variable (int32) t5Speed
Attributes
ID : 40
Scope: local
Value: 0
Variable (string) t5o
Attributes
ID : 53
Scope : local
Text :
Max. Text Size: 1
Variable (string) tId
Attributes
ID : 13
@@ -159,7 +201,7 @@ Text t0Icon
Send Component ID : disabled
Opacity : 127
x coordinate : 50
y coordinate : 107
y coordinate : 108
Width : 60
Height : 60
Effect : load
@@ -221,7 +263,7 @@ Text t1
Send Component ID : disabled
Opacity : 127
x coordinate : 46
y coordinate : 237
y coordinate : 244
Width : 230
Height : 60
Effect : load
@@ -253,7 +295,7 @@ Text t1Icon
Send Component ID : disabled
Opacity : 127
x coordinate : 130
y coordinate : 107
y coordinate : 108
Width : 60
Height : 60
Effect : load
@@ -315,7 +357,7 @@ Text t2Icon
Send Component ID : disabled
Opacity : 127
x coordinate : 210
y coordinate : 107
y coordinate : 108
Width : 60
Height : 60
Effect : load
@@ -377,7 +419,7 @@ Text t3Icon
Send Component ID : disabled
Opacity : 127
x coordinate : 50
y coordinate : 369
y coordinate : 378
Width : 60
Height : 60
Effect : load
@@ -409,7 +451,7 @@ Text t3u
Send Component ID : disabled
Opacity : 127
x coordinate : 38
y coordinate : 429
y coordinate : 439
Width : 80
Height : 30
Effect : load
@@ -439,7 +481,7 @@ Text t4Icon
Send Component ID : disabled
Opacity : 127
x coordinate : 129
y coordinate : 369
y coordinate : 378
Width : 60
Height : 60
Effect : load
@@ -471,7 +513,7 @@ Text t4u
Send Component ID : disabled
Opacity : 127
x coordinate : 118
y coordinate : 429
y coordinate : 439
Width : 80
Height : 30
Effect : load
@@ -501,7 +543,7 @@ Text t5Icon
Send Component ID : disabled
Opacity : 127
x coordinate : 208
y coordinate : 369
y coordinate : 378
Width : 60
Height : 60
Effect : load
@@ -533,7 +575,7 @@ Text t5u
Send Component ID : disabled
Opacity : 127
x coordinate : 197
y coordinate : 429
y coordinate : 439
Width : 80
Height : 30
Effect : load
@@ -592,9 +634,9 @@ Text tHome
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 179
y coordinate : 239
Width : 61
x coordinate : 178
y coordinate : 245
Width : 60
Height : 55
Effect : load
Effect Priority : 0
@@ -623,7 +665,7 @@ Text tHome2
Send Component ID : disabled
Opacity : 127
x coordinate : 239
y coordinate : 239
y coordinate : 246
Width : 35
Height : 55
Effect : load
@@ -653,7 +695,7 @@ Text tHomeO
Send Component ID : disabled
Opacity : 127
x coordinate : 48
y coordinate : 240
y coordinate : 247
Width : 61
Height : 55
Effect : load
@@ -683,7 +725,7 @@ Text tHomeO2
Send Component ID : disabled
Opacity : 127
x coordinate : 108
y coordinate : 240
y coordinate : 247
Width : 35
Height : 55
Effect : load
@@ -730,7 +772,7 @@ Slider h0
Send Component ID : disabled
Opacity : 127
x coordinate : 61
y coordinate : 166
y coordinate : 169
Width : 44
Height : 72
Effect : load
@@ -755,7 +797,7 @@ Slider h1
Send Component ID : disabled
Opacity : 127
x coordinate : 139
y coordinate : 166
y coordinate : 169
Width : 44
Height : 72
Effect : load
@@ -780,7 +822,7 @@ Slider h2
Send Component ID : disabled
Opacity : 127
x coordinate : 217
y coordinate : 166
y coordinate : 169
Width : 44
Height : 72
Effect : load
@@ -805,7 +847,7 @@ Slider h3
Send Component ID : disabled
Opacity : 127
x coordinate : 61
y coordinate : 297
y coordinate : 305
Width : 44
Height : 72
Effect : load
@@ -830,7 +872,7 @@ Slider h4
Send Component ID : disabled
Opacity : 127
x coordinate : 139
y coordinate : 297
y coordinate : 305
Width : 44
Height : 72
Effect : load
@@ -855,7 +897,7 @@ Slider h5
Send Component ID : disabled
Opacity : 127
x coordinate : 217
y coordinate : 297
y coordinate : 305
Width : 44
Height : 72
Effect : load
@@ -1167,7 +1209,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
@@ -1204,29 +1245,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)
{
@@ -1237,7 +1275,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
@@ -1250,12 +1290,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)
{
@@ -1266,7 +1306,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
@@ -1279,12 +1321,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)
{
@@ -1295,7 +1337,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
@@ -1308,12 +1352,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)
{
@@ -1324,7 +1368,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
@@ -1337,12 +1383,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)
{
@@ -1353,7 +1399,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
@@ -1366,12 +1414,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)
{
@@ -1382,7 +1430,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
@@ -1463,10 +1513,6 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{