mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-22 05:58:39 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
a481e70976
commit
9e026d8922
@@ -46,7 +46,7 @@ Page cardAlarm
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
cardAlarm.bco=defaultBcoColor
|
||||
for(sys0=0;sys0<40;sys0++)
|
||||
for(sys0=0;sys0<44;sys0++)
|
||||
{
|
||||
if(b[sys0].type==98||b[sys0].type==116)
|
||||
{
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -28,8 +28,8 @@ cardQR
|
||||
234 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
185 Line(s) of event code
|
||||
131 Unique line(s) of event code
|
||||
200 Line(s) of event code
|
||||
142 Unique line(s) of event code
|
||||
cardGrid
|
||||
44 Component(s)
|
||||
515 Line(s) of event code
|
||||
@@ -46,10 +46,10 @@ cardThermo
|
||||
57 Component(s)
|
||||
532 Line(s) of event code
|
||||
315 Unique line(s) of event code
|
||||
cardPower
|
||||
48 Component(s)
|
||||
465 Line(s) of event code
|
||||
318 Unique line(s) of event code
|
||||
screensaver
|
||||
46 Component(s)
|
||||
417 Line(s) of event code
|
||||
300 Unique line(s) of event code
|
||||
cardChart
|
||||
33 Component(s)
|
||||
429 Line(s) of event code
|
||||
@@ -70,14 +70,14 @@ cardAlarm
|
||||
43 Component(s)
|
||||
492 Line(s) of event code
|
||||
269 Unique line(s) of event code
|
||||
screensaver
|
||||
45 Component(s)
|
||||
413 Line(s) of event code
|
||||
296 Unique line(s) of event code
|
||||
popupInSel
|
||||
34 Component(s)
|
||||
617 Line(s) of event code
|
||||
295 Unique line(s) of event code
|
||||
cardPower
|
||||
48 Component(s)
|
||||
483 Line(s) of event code
|
||||
324 Unique line(s) of event code
|
||||
cardEntities
|
||||
91 Component(s)
|
||||
1622 Line(s) of event code
|
||||
@@ -85,6 +85,6 @@ cardEntities
|
||||
|
||||
Total
|
||||
20 Page(s)
|
||||
746 Component(s)
|
||||
9192 Line(s) of event code
|
||||
2379 Unique line(s) of event code
|
||||
747 Component(s)
|
||||
9229 Line(s) of event code
|
||||
2382 Unique line(s) of event code
|
||||
|
||||
@@ -20,22 +20,37 @@ Page pageStartup
|
||||
|
||||
Events
|
||||
Preinitialize Event
|
||||
dim=dimValueNormal
|
||||
vis p0,0
|
||||
recmod=1
|
||||
bauds=115200
|
||||
vis tSend,0
|
||||
vis tInstruction,0
|
||||
vis tTmp,0
|
||||
vis tId,0
|
||||
vis bSendStartup,0
|
||||
vis frame_ptr,0
|
||||
vis spinner_w,0
|
||||
vis frapic_w,0
|
||||
vis usual_cnt,0
|
||||
vis tMsg2,0
|
||||
vis tMsg3,0
|
||||
vis tVersion,0
|
||||
dim=100
|
||||
vis t5,0
|
||||
vis tShuffle,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
vis bEntity1,0
|
||||
vis bEntity2,0
|
||||
vis bEntity3,0
|
||||
vis bEntity4,0
|
||||
vis bEntity5,0
|
||||
vis bEntity6,0
|
||||
cardMedia.bco=defaultBcoColor
|
||||
for(sys0=0;sys0<52;sys0++)
|
||||
{
|
||||
if(b[sys0].type==98||b[sys0].type==116)
|
||||
{
|
||||
b[sys0].bco=defaultBcoColor
|
||||
b[sys0].pco=defaultFontColor
|
||||
}
|
||||
}
|
||||
if(defaultBcoColor==0)
|
||||
{
|
||||
hVolume.pic=14
|
||||
hVolume.pic1=13
|
||||
hVolume.pic2=15
|
||||
}
|
||||
|
||||
Postinitialize Event
|
||||
//send messages by clicking button
|
||||
@@ -373,7 +388,7 @@ Text tTmp
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
Max. Text Size : 30
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
@@ -48,6 +48,13 @@ Variable (string) strCommand
|
||||
Text :
|
||||
Max. Text Size: 200
|
||||
|
||||
Variable (string) strTmp
|
||||
Attributes
|
||||
ID : 45
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 2
|
||||
|
||||
Variable (string) tId
|
||||
Attributes
|
||||
ID : 16
|
||||
@@ -1040,6 +1047,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
click m0,1
|
||||
//get set time to global variable
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
||||
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||
@@ -1163,6 +1171,9 @@ Timer tmSerial
|
||||
tF4Icon.txt=tF3Icon.txt
|
||||
tF3Icon.txt=tF2Icon.txt
|
||||
tF2Icon.txt=tF1Icon.txt
|
||||
tF4Icon.pco=tF3Icon.pco
|
||||
tF3Icon.pco=tF2Icon.pco
|
||||
tF2Icon.pco=tF1Icon.pco
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
|
||||
|
||||
Reference in New Issue
Block a user