mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-25 17:02:14 +01:00
untested fix for #768 (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
75fb6f8e5d
commit
209a2525ee
@@ -39,7 +39,7 @@ Page cardPower
|
||||
vis t4Icon,0
|
||||
vis t5Icon,0
|
||||
cardPower.bco=defaultBcoColor
|
||||
for(sys0=0;sys0<48;sys0++)
|
||||
for(sys0=0;sys0<54;sys0++)
|
||||
{
|
||||
if(b[sys0].type==98||b[sys0].type==116)
|
||||
{
|
||||
@@ -50,8 +50,8 @@ Page cardPower
|
||||
{
|
||||
if(b[sys0].type==1)
|
||||
{
|
||||
b[sys0].pic=19
|
||||
b[sys0].pic1=19
|
||||
b[sys0].pic=21
|
||||
b[sys0].pic1=21
|
||||
b[sys0].pic2=15
|
||||
}
|
||||
}
|
||||
@@ -73,7 +73,7 @@ Variable (string) strCommand
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 275
|
||||
Max. Text Size: 1000
|
||||
|
||||
Variable (int32) t0Speed
|
||||
Attributes
|
||||
@@ -139,6 +139,16 @@ Text t0Icon
|
||||
Text : î¢
|
||||
Max. Text Size : 5
|
||||
|
||||
Text t0o
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 20
|
||||
|
||||
Text t0u
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -169,6 +179,16 @@ Text t1Icon
|
||||
Text : î¶
|
||||
Max. Text Size : 5
|
||||
|
||||
Text t1o
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 20
|
||||
|
||||
Text t1u
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -189,6 +209,16 @@ Text t2Icon
|
||||
Text : î °
|
||||
Max. Text Size : 5
|
||||
|
||||
Text t2o
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 20
|
||||
|
||||
Text t2u
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -209,6 +239,16 @@ Text t3Icon
|
||||
Text : î °
|
||||
Max. Text Size : 5
|
||||
|
||||
Text t3o
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 20
|
||||
|
||||
Text t3u
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -229,6 +269,16 @@ Text t4Icon
|
||||
Text : î´½
|
||||
Max. Text Size : 5
|
||||
|
||||
Text t4o
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 20
|
||||
|
||||
Text t4u
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -249,6 +299,16 @@ Text t5Icon
|
||||
Text : î
|
||||
Max. Text Size : 5
|
||||
|
||||
Text t5o
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 20
|
||||
|
||||
Text t5u
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -479,6 +539,7 @@ Timer tm0
|
||||
h0.val=h0.maxval
|
||||
}
|
||||
h0.val+=t0Speed.val
|
||||
ref t0u
|
||||
}
|
||||
if(t1Speed.val!=0)
|
||||
{
|
||||
@@ -492,6 +553,7 @@ Timer tm0
|
||||
h1.val=h1.maxval
|
||||
}
|
||||
h1.val+=t1Speed.val
|
||||
ref t1u
|
||||
}
|
||||
if(t2Speed.val!=0)
|
||||
{
|
||||
@@ -505,6 +567,7 @@ Timer tm0
|
||||
h2.val=h2.maxval
|
||||
}
|
||||
h2.val+=t2Speed.val
|
||||
ref t2u
|
||||
}
|
||||
if(t3Speed.val!=0)
|
||||
{
|
||||
@@ -518,6 +581,7 @@ Timer tm0
|
||||
h3.val=h3.maxval
|
||||
}
|
||||
h3.val+=t3Speed.val
|
||||
ref t3u
|
||||
}
|
||||
if(t4Speed.val!=0)
|
||||
{
|
||||
@@ -531,6 +595,7 @@ Timer tm0
|
||||
h4.val=h4.maxval
|
||||
}
|
||||
h4.val+=t4Speed.val
|
||||
ref t4u
|
||||
}
|
||||
if(t5Speed.val!=0)
|
||||
{
|
||||
@@ -544,6 +609,7 @@ Timer tm0
|
||||
h5.val=h5.maxval
|
||||
}
|
||||
h5.val+=t5Speed.val
|
||||
ref t5u
|
||||
}
|
||||
|
||||
Timer tmSerial
|
||||
@@ -599,7 +665,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,30 +701,31 @@ 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(p0.h==320)
|
||||
{
|
||||
t0Speed.val=t0Speed.val*-1
|
||||
}
|
||||
if(t0Speed.val>120)
|
||||
{
|
||||
t0Speed.val=120
|
||||
@@ -669,7 +735,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,13 +750,17 @@ 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(p0.h==320)
|
||||
{
|
||||
t1Speed.val=t1Speed.val*-1
|
||||
}
|
||||
if(t1Speed.val>120)
|
||||
{
|
||||
t1Speed.val=120
|
||||
@@ -698,7 +770,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,13 +785,17 @@ 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(p0.h==320)
|
||||
{
|
||||
t2Speed.val=t2Speed.val*-1
|
||||
}
|
||||
if(t2Speed.val>120)
|
||||
{
|
||||
t2Speed.val=120
|
||||
@@ -727,7 +805,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,13 +820,17 @@ 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(p0.h==320)
|
||||
{
|
||||
t3Speed.val=t3Speed.val*-1
|
||||
}
|
||||
if(t3Speed.val>120)
|
||||
{
|
||||
t3Speed.val=120
|
||||
@@ -756,7 +840,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,13 +855,17 @@ 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(p0.h==320)
|
||||
{
|
||||
t4Speed.val=t4Speed.val*-1
|
||||
}
|
||||
if(t4Speed.val>120)
|
||||
{
|
||||
t4Speed.val=120
|
||||
@@ -785,7 +875,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,13 +890,17 @@ 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(p0.h==320)
|
||||
{
|
||||
t5Speed.val=t5Speed.val*-1
|
||||
}
|
||||
if(t5Speed.val>120)
|
||||
{
|
||||
t5Speed.val=120
|
||||
@@ -814,7 +910,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
|
||||
@@ -849,6 +947,10 @@ Timer tmSerial
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="screensaver2")
|
||||
{
|
||||
page screensaver2
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
@@ -895,10 +997,6 @@ Timer tmSerial
|
||||
{
|
||||
page cardChart
|
||||
}
|
||||
if(tId.txt=="cardLChart")
|
||||
{
|
||||
page cardLChart
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user