sync us-l (add nextion2text)

This commit is contained in:
joBr99
2023-01-24 16:45:51 +00:00
committed by github-actions[bot]
parent e5018b780f
commit c2cbcbdf5b
30 changed files with 2999 additions and 2214 deletions

View File

@@ -47,7 +47,7 @@ Page cardPower
vis t4Icon,0
vis t5Icon,0
cardPower.bco=defaultBcoColor
for(sys0=0;sys0<43;sys0++)
for(sys0=0;sys0<48;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
@@ -158,7 +158,7 @@ Text t0Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 33
x coordinate : 34
y coordinate : 80
Width : 60
Height : 60
@@ -190,7 +190,7 @@ Text t0u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 97
x coordinate : 98
y coordinate : 132
Width : 108
Height : 30
@@ -220,7 +220,7 @@ Text t1
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 213
x coordinate : 214
y coordinate : 70
Width : 60
Height : 230
@@ -252,7 +252,7 @@ Text t1Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 33
x coordinate : 34
y coordinate : 156
Width : 60
Height : 60
@@ -284,7 +284,7 @@ Text t1u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 97
x coordinate : 98
y coordinate : 209
Width : 108
Height : 30
@@ -314,7 +314,7 @@ Text t2Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 33
x coordinate : 34
y coordinate : 232
Width : 60
Height : 60
@@ -346,7 +346,7 @@ Text t2u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 97
x coordinate : 98
y coordinate : 285
Width : 108
Height : 30
@@ -376,7 +376,7 @@ Text t3Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 393
x coordinate : 394
y coordinate : 80
Width : 60
Height : 60
@@ -408,7 +408,7 @@ Text t3u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 277
x coordinate : 278
y coordinate : 132
Width : 108
Height : 30
@@ -438,7 +438,7 @@ Text t4Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 393
x coordinate : 394
y coordinate : 156
Width : 60
Height : 60
@@ -470,7 +470,7 @@ Text t4u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 277
x coordinate : 278
y coordinate : 209
Width : 108
Height : 30
@@ -500,7 +500,7 @@ Text t5Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 393
x coordinate : 394
y coordinate : 232
Width : 60
Height : 60
@@ -532,7 +532,7 @@ Text t5u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 277
x coordinate : 278
y coordinate : 285
Width : 108
Height : 30
@@ -562,7 +562,7 @@ Text tHeading
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 81
x coordinate : 82
y coordinate : 26
Width : 320
Height : 30
@@ -592,10 +592,40 @@ Text tHome
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 215
x coordinate : 216
y coordinate : 214
Width : 56
Height : 81
Height : 54
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : bottom
Input Type : character
Text :
Max. Text Size : 10
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tHome2
Attributes
ID : 45
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 216
y coordinate : 271
Width : 56
Height : 28
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -609,7 +639,67 @@ Text tHome
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Max. Text Size : 10
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tHomeO
Attributes
ID : 46
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 216
y coordinate : 73
Width : 56
Height : 54
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : bottom
Input Type : character
Text :
Max. Text Size : 10
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tHomeO2
Attributes
ID : 47
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 216
y coordinate : 130
Width : 56
Height : 28
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 10
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -639,7 +729,7 @@ Slider h0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 93
x coordinate : 94
y coordinate : 88
Width : 120
Height : 44
@@ -652,8 +742,8 @@ Slider h0
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h1
@@ -664,7 +754,7 @@ Slider h1
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 93
x coordinate : 94
y coordinate : 165
Width : 120
Height : 44
@@ -677,8 +767,8 @@ Slider h1
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h2
@@ -689,7 +779,7 @@ Slider h2
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 93
x coordinate : 94
y coordinate : 241
Width : 120
Height : 44
@@ -702,8 +792,8 @@ Slider h2
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h3
@@ -714,7 +804,7 @@ Slider h3
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 273
x coordinate : 274
y coordinate : 88
Width : 120
Height : 44
@@ -727,8 +817,8 @@ Slider h3
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h4
@@ -739,7 +829,7 @@ Slider h4
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 273
x coordinate : 274
y coordinate : 165
Width : 120
Height : 44
@@ -752,8 +842,8 @@ Slider h4
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Slider h5
@@ -764,7 +854,7 @@ Slider h5
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 273
x coordinate : 274
y coordinate : 241
Width : 120
Height : 44
@@ -777,8 +867,8 @@ Slider h5
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Position : 600
Upper range limit : 1200
Lower range limit : 0
Button bNext
@@ -789,7 +879,7 @@ Button bNext
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 406
x coordinate : 407
y coordinate : 16
Width : 50
Height : 50
@@ -836,7 +926,7 @@ Button bPrev
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 24
x coordinate : 25
y coordinate : 16
Width : 50
Height : 50
@@ -923,7 +1013,7 @@ Hotspot mSwipeUp
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 27
x coordinate : 12
y coordinate : 0
Width : 426
Height : 9
@@ -944,66 +1034,84 @@ Timer tm0
Events
Timer Event
sys0=h0.val+t0Speed.val
if(sys0>h0.maxval)
if(t0Speed.val!=0)
{
h0.val=h0.minval
sys0=h0.val+t0Speed.val
if(sys0>h0.maxval)
{
h0.val=h0.minval
}
if(sys0<h0.minval)
{
h0.val=h0.maxval
}
h0.val+=t0Speed.val
}
if(sys0<h0.minval)
if(t1Speed.val!=0)
{
h0.val=h0.maxval
sys0=h1.val+t1Speed.val
if(sys0>h1.maxval)
{
h1.val=h1.minval
}
if(sys0<h1.minval)
{
h1.val=h1.maxval
}
h1.val+=t1Speed.val
}
h0.val+=t0Speed.val
sys0=h1.val+t1Speed.val
if(sys0>h1.maxval)
if(t2Speed.val!=0)
{
h1.val=h1.minval
sys0=h2.val+t2Speed.val
if(sys0>h2.maxval)
{
h2.val=h2.minval
}
if(sys0<h2.minval)
{
h2.val=h2.maxval
}
h2.val+=t2Speed.val
}
if(sys0<h1.minval)
if(t3Speed.val!=0)
{
h1.val=h1.maxval
sys0=h3.val+t3Speed.val
if(sys0>h3.maxval)
{
h3.val=h3.minval
}
if(sys0<h3.minval)
{
h3.val=h3.maxval
}
h3.val+=t3Speed.val
}
h1.val+=t1Speed.val
sys0=h2.val+t2Speed.val
if(sys0>h2.maxval)
if(t4Speed.val!=0)
{
h2.val=h2.minval
sys0=h4.val+t4Speed.val
if(sys0>h4.maxval)
{
h4.val=h4.minval
}
if(sys0<h4.minval)
{
h4.val=h4.maxval
}
h4.val+=t4Speed.val
}
if(sys0<h2.minval)
if(t5Speed.val!=0)
{
h2.val=h2.maxval
sys0=h5.val+t5Speed.val
if(sys0>h5.maxval)
{
h5.val=h5.minval
}
if(sys0<h5.minval)
{
h5.val=h5.maxval
}
h5.val+=t5Speed.val
}
h2.val+=t2Speed.val
sys0=h3.val+t3Speed.val
if(sys0>h3.maxval)
{
h3.val=h3.minval
}
if(sys0<h3.minval)
{
h3.val=h3.maxval
}
h3.val+=t3Speed.val
sys0=h4.val+t4Speed.val
if(sys0>h4.maxval)
{
h4.val=h4.minval
}
if(sys0<h4.minval)
{
h4.val=h4.maxval
}
h4.val+=t4Speed.val
sys0=h5.val+t5Speed.val
if(sys0>h5.maxval)
{
h5.val=h5.minval
}
if(sys0<h5.minval)
{
h5.val=h5.maxval
}
h5.val+=t5Speed.val
Timer tmSerial
Attributes
@@ -1100,18 +1208,36 @@ Timer tmSerial
covx tTmp.txt,t1.pco,0,0
// icon home
spstr strCommand.txt,t1.txt,"~",15
// speed 16 ignored
// text home
spstr strCommand.txt,tHome.txt,"~",16
spstr strCommand.txt,tHome.txt,"~",17
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 tHomeO.txt,tHomeO2.txt," ",1
spstr tHomeO.txt,tHomeO.txt," ",0
// iconColor
spstr strCommand.txt,tTmp.txt,"~",17
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,t0Icon.pco,0,0
// icon
spstr strCommand.txt,t0Icon.txt,"~",18
spstr strCommand.txt,t0Icon.txt,"~",23
// speed
spstr strCommand.txt,tTmp.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,t0Speed.val,0,0
if(t0Speed.val>120)
{
t0Speed.val=120
}
if(t0Speed.val<-120)
{
t0Speed.val=-120
}
// lower text
spstr strCommand.txt,t0u.txt,"~",20
spstr strCommand.txt,t0u.txt,"~",25
if(t0Icon.txt!="")
{
vis t0Icon,1
@@ -1124,15 +1250,23 @@ Timer tmSerial
vis h0,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",21
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,t1Icon.pco,0,0
// icon
spstr strCommand.txt,t1Icon.txt,"~",22
spstr strCommand.txt,t1Icon.txt,"~",27
// speed
spstr strCommand.txt,tTmp.txt,"~",23
spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,t1Speed.val,0,0
if(t1Speed.val>120)
{
t1Speed.val=120
}
if(t1Speed.val<-120)
{
t1Speed.val=-120
}
// lower text
spstr strCommand.txt,t1u.txt,"~",24
spstr strCommand.txt,t1u.txt,"~",29
if(t1Icon.txt!="")
{
vis t1Icon,1
@@ -1145,15 +1279,23 @@ Timer tmSerial
vis h1,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",25
spstr strCommand.txt,tTmp.txt,"~",30
covx tTmp.txt,t2Icon.pco,0,0
// icon
spstr strCommand.txt,t2Icon.txt,"~",26
spstr strCommand.txt,t2Icon.txt,"~",31
// speed
spstr strCommand.txt,tTmp.txt,"~",27
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,t2Speed.val,0,0
if(t2Speed.val>120)
{
t2Speed.val=120
}
if(t2Speed.val<-120)
{
t2Speed.val=-120
}
// lower text
spstr strCommand.txt,t2u.txt,"~",28
spstr strCommand.txt,t2u.txt,"~",33
if(t2Icon.txt!="")
{
vis t2Icon,1
@@ -1166,15 +1308,23 @@ Timer tmSerial
vis h2,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",29
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,t3Icon.pco,0,0
// icon
spstr strCommand.txt,t3Icon.txt,"~",30
spstr strCommand.txt,t3Icon.txt,"~",35
// speed
spstr strCommand.txt,tTmp.txt,"~",31
spstr strCommand.txt,tTmp.txt,"~",36
covx tTmp.txt,t3Speed.val,0,0
if(t3Speed.val>120)
{
t3Speed.val=120
}
if(t3Speed.val<-120)
{
t3Speed.val=-120
}
// lower text
spstr strCommand.txt,t3u.txt,"~",32
spstr strCommand.txt,t3u.txt,"~",37
if(t3Icon.txt!="")
{
vis t3Icon,1
@@ -1187,15 +1337,23 @@ Timer tmSerial
vis h3,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",33
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,t4Icon.pco,0,0
// icon
spstr strCommand.txt,t4Icon.txt,"~",34
spstr strCommand.txt,t4Icon.txt,"~",39
// speed
spstr strCommand.txt,tTmp.txt,"~",35
spstr strCommand.txt,tTmp.txt,"~",40
covx tTmp.txt,t4Speed.val,0,0
if(t4Speed.val>120)
{
t4Speed.val=120
}
if(t4Speed.val<-120)
{
t4Speed.val=-120
}
// lower text
spstr strCommand.txt,t4u.txt,"~",36
spstr strCommand.txt,t4u.txt,"~",41
if(t4Icon.txt!="")
{
vis t4Icon,1
@@ -1208,15 +1366,23 @@ Timer tmSerial
vis h4,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",37
spstr strCommand.txt,tTmp.txt,"~",42
covx tTmp.txt,t5Icon.pco,0,0
// icon
spstr strCommand.txt,t5Icon.txt,"~",38
spstr strCommand.txt,t5Icon.txt,"~",43
// speed
spstr strCommand.txt,tTmp.txt,"~",39
spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,t5Speed.val,0,0
if(t5Speed.val>120)
{
t5Speed.val=120
}
if(t5Speed.val<-120)
{
t5Speed.val=-120
}
// lower text
spstr strCommand.txt,t5u.txt,"~",40
spstr strCommand.txt,t5u.txt,"~",45
if(t5Icon.txt!="")
{
vis t5Icon,1
@@ -1297,6 +1463,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{