some final cleanup of power page (add nextion2text)

This commit is contained in:
joBr99
2023-01-14 13:50:56 +00:00
committed by github-actions[bot]
parent a8c32c3542
commit bcf8e4e65e
6 changed files with 879 additions and 117 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)
{
@@ -595,7 +595,37 @@ Text tHome
x coordinate : 200
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 : 20
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 : 200
y coordinate : 271
Width : 56
Height : 28
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -609,11 +639,71 @@ Text tHome
Vertical Alignment : center
Input Type : character
Text :
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 : 200
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 : 20
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 : 200
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
Picture p0
Attributes
ID : 1
@@ -1100,18 +1190,28 @@ 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
// lower text
spstr strCommand.txt,t0u.txt,"~",20
spstr strCommand.txt,t0u.txt,"~",25
if(t0Icon.txt!="")
{
vis t0Icon,1
@@ -1124,15 +1224,15 @@ 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
// lower text
spstr strCommand.txt,t1u.txt,"~",24
spstr strCommand.txt,t1u.txt,"~",29
if(t1Icon.txt!="")
{
vis t1Icon,1
@@ -1145,15 +1245,15 @@ 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
// lower text
spstr strCommand.txt,t2u.txt,"~",28
spstr strCommand.txt,t2u.txt,"~",33
if(t2Icon.txt!="")
{
vis t2Icon,1
@@ -1166,15 +1266,15 @@ 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
// lower text
spstr strCommand.txt,t3u.txt,"~",32
spstr strCommand.txt,t3u.txt,"~",37
if(t3Icon.txt!="")
{
vis t3Icon,1
@@ -1187,15 +1287,15 @@ 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
// lower text
spstr strCommand.txt,t4u.txt,"~",36
spstr strCommand.txt,t4u.txt,"~",41
if(t4Icon.txt!="")
{
vis t4Icon,1
@@ -1208,15 +1308,15 @@ 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
// lower text
spstr strCommand.txt,t5u.txt,"~",40
spstr strCommand.txt,t5u.txt,"~",45
if(t5Icon.txt!="")
{
vis t5Icon,1
@@ -1297,10 +1397,6 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{