Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2023-01-23 16:53:40 +00:00
committed by github-actions[bot]
parent a481e70976
commit 9e026d8922
19 changed files with 475 additions and 897 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)
{
@@ -609,7 +609,7 @@ 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
@@ -639,7 +639,7 @@ Text tHome2
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Max. Text Size : 10
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -669,7 +669,7 @@ Text tHomeO
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Max. Text Size : 10
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -699,7 +699,7 @@ Text tHomeO2
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Max. Text Size : 10
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -742,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
@@ -767,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
@@ -792,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
@@ -817,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
@@ -842,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
@@ -867,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
@@ -1034,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