mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-10 15:26:36 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
3349ce5996
commit
5dcd5be9ce
@@ -2285,21 +2285,7 @@ Timer tmSerial
|
||||
tsw bDown1,1
|
||||
}
|
||||
}
|
||||
if(type1.txt=="light")
|
||||
{
|
||||
vis bUp1,0
|
||||
vis bStop1,0
|
||||
vis bDown1,0
|
||||
vis btOnOff1,1
|
||||
vis bText1,0
|
||||
vis hSlider1,0
|
||||
vis nNum1,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,"~",8
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
}
|
||||
if(type1.txt=="switch")
|
||||
if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
|
||||
{
|
||||
vis bUp1,0
|
||||
vis bStop1,0
|
||||
@@ -2448,21 +2434,7 @@ Timer tmSerial
|
||||
tsw bDown2,1
|
||||
}
|
||||
}
|
||||
if(type2.txt=="light")
|
||||
{
|
||||
vis bUp2,0
|
||||
vis bStop2,0
|
||||
vis bDown2,0
|
||||
vis btOnOff2,1
|
||||
vis bText2,0
|
||||
vis hSlider2,0
|
||||
vis nNum2,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,"~",14
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff2.val=sys0
|
||||
}
|
||||
if(type2.txt=="switch")
|
||||
if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
|
||||
{
|
||||
vis bUp2,0
|
||||
vis bStop2,0
|
||||
@@ -2611,21 +2583,7 @@ Timer tmSerial
|
||||
tsw bDown3,1
|
||||
}
|
||||
}
|
||||
if(type3.txt=="light")
|
||||
{
|
||||
vis bUp3,0
|
||||
vis bStop3,0
|
||||
vis bDown3,0
|
||||
vis btOnOff3,1
|
||||
vis bText3,0
|
||||
vis hSlider3,0
|
||||
vis nNum3,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,"~",20
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff3.val=sys0
|
||||
}
|
||||
if(type3.txt=="switch")
|
||||
if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
|
||||
{
|
||||
vis bUp3,0
|
||||
vis bStop3,0
|
||||
@@ -2774,21 +2732,7 @@ Timer tmSerial
|
||||
tsw bDown4,1
|
||||
}
|
||||
}
|
||||
if(type4.txt=="light")
|
||||
{
|
||||
vis bUp4,0
|
||||
vis bStop4,0
|
||||
vis bDown4,0
|
||||
vis btOnOff4,1
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
vis nNum4,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,"~",26
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff4.val=sys0
|
||||
}
|
||||
if(type4.txt=="switch")
|
||||
if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
|
||||
{
|
||||
vis bUp4,0
|
||||
vis bStop4,0
|
||||
|
||||
@@ -6,18 +6,14 @@ pageIcons
|
||||
6 Component(s)
|
||||
0 Line(s) of event code
|
||||
0 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
167 Line(s) of event code
|
||||
122 Unique line(s) of event code
|
||||
popupShutter
|
||||
25 Component(s)
|
||||
388 Line(s) of event code
|
||||
211 Unique line(s) of event code
|
||||
popupFan
|
||||
20 Component(s)
|
||||
234 Line(s) of event code
|
||||
148 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
167 Line(s) of event code
|
||||
122 Unique line(s) of event code
|
||||
screensaver
|
||||
38 Component(s)
|
||||
332 Line(s) of event code
|
||||
@@ -42,6 +38,10 @@ pageTest
|
||||
14 Component(s)
|
||||
14 Line(s) of event code
|
||||
14 Unique line(s) of event code
|
||||
popupFan
|
||||
20 Component(s)
|
||||
236 Line(s) of event code
|
||||
150 Unique line(s) of event code
|
||||
cardQR
|
||||
32 Component(s)
|
||||
403 Line(s) of event code
|
||||
@@ -56,11 +56,11 @@ cardThermo
|
||||
303 Unique line(s) of event code
|
||||
cardEntities
|
||||
65 Component(s)
|
||||
1179 Line(s) of event code
|
||||
518 Unique line(s) of event code
|
||||
1127 Line(s) of event code
|
||||
514 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
14 Page(s)
|
||||
432 Component(s)
|
||||
5193 Line(s) of event code
|
||||
1352 Unique line(s) of event code
|
||||
5143 Line(s) of event code
|
||||
1353 Unique line(s) of event code
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 38
|
||||
Text : 39
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
|
||||
@@ -544,7 +544,7 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
// get Brightness value
|
||||
// get Speed value
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
@@ -560,8 +560,11 @@ Timer tmSerial
|
||||
hSpeed.val=sys0
|
||||
}
|
||||
}
|
||||
// set hSpeed maxValue
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
covx tTmp.txt,hSpeed.maxval,0,0
|
||||
// set t1 Speed (Localization)
|
||||
spstr strCommand.txt,t1.txt,"~",6
|
||||
spstr strCommand.txt,t1.txt,"~",7
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user