mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-26 19:02:15 +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
a1104b8f81
commit
291102971a
@@ -1856,8 +1856,13 @@ Hotspot m0
|
||||
}
|
||||
if(type1.txt=="light")
|
||||
{
|
||||
//popupLight.tEntity.txt=tEntity1.txt
|
||||
page popupLight
|
||||
if(featNewSliders==1)
|
||||
{
|
||||
page popupLightNew
|
||||
}else
|
||||
{
|
||||
page popupLight
|
||||
}
|
||||
}
|
||||
if(type1.txt=="fan")
|
||||
{
|
||||
@@ -1899,8 +1904,13 @@ Hotspot m1
|
||||
}
|
||||
if(type2.txt=="light")
|
||||
{
|
||||
//popupLight.tEntity.txt=tEntity2.txt
|
||||
page popupLight
|
||||
if(featNewSliders==1)
|
||||
{
|
||||
page popupLightNew
|
||||
}else
|
||||
{
|
||||
page popupLight
|
||||
}
|
||||
}
|
||||
if(type2.txt=="fan")
|
||||
{
|
||||
@@ -1942,8 +1952,13 @@ Hotspot m2
|
||||
}
|
||||
if(type3.txt=="light")
|
||||
{
|
||||
//popupLight.tEntity.txt=tEntity3.txt
|
||||
page popupLight
|
||||
if(featNewSliders==1)
|
||||
{
|
||||
page popupLightNew
|
||||
}else
|
||||
{
|
||||
page popupLight
|
||||
}
|
||||
}
|
||||
if(type3.txt=="fan")
|
||||
{
|
||||
@@ -1985,8 +2000,13 @@ Hotspot m3
|
||||
}
|
||||
if(type4.txt=="light")
|
||||
{
|
||||
//popupLight.tEntity.txt=tEntity4.txt
|
||||
page popupLight
|
||||
if(featNewSliders==1)
|
||||
{
|
||||
page popupLightNew
|
||||
}else
|
||||
{
|
||||
page popupLight
|
||||
}
|
||||
}
|
||||
if(type4.txt=="fan")
|
||||
{
|
||||
|
||||
@@ -1052,7 +1052,13 @@ Timer tmLP
|
||||
Timer Event
|
||||
if(tTmp.txt=="light")
|
||||
{
|
||||
page popupLight
|
||||
if(featNewSliders==1)
|
||||
{
|
||||
page popupLightNew
|
||||
}else
|
||||
{
|
||||
page popupLight
|
||||
}
|
||||
}
|
||||
if(tTmp.txt=="fan")
|
||||
{
|
||||
|
||||
@@ -1274,7 +1274,13 @@ Timer tmLP
|
||||
Timer Event
|
||||
if(tTmp.txt=="light")
|
||||
{
|
||||
page popupLight
|
||||
if(featNewSliders==1)
|
||||
{
|
||||
page popupLightNew
|
||||
}else
|
||||
{
|
||||
page popupLight
|
||||
}
|
||||
}
|
||||
if(tTmp.txt=="fan")
|
||||
{
|
||||
|
||||
@@ -1652,6 +1652,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardChart
|
||||
}
|
||||
if(tId.txt=="cardLChart")
|
||||
{
|
||||
page cardLChart
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -58,10 +58,10 @@ screensaver
|
||||
46 Component(s)
|
||||
435 Line(s) of event code
|
||||
309 Unique line(s) of event code
|
||||
cardGrid2
|
||||
52 Component(s)
|
||||
611 Line(s) of event code
|
||||
335 Unique line(s) of event code
|
||||
cardPower
|
||||
54 Component(s)
|
||||
531 Line(s) of event code
|
||||
349 Unique line(s) of event code
|
||||
cardLChart
|
||||
33 Component(s)
|
||||
402 Line(s) of event code
|
||||
@@ -74,29 +74,29 @@ cardMedia
|
||||
59 Component(s)
|
||||
649 Line(s) of event code
|
||||
322 Unique line(s) of event code
|
||||
screensaver2
|
||||
58 Component(s)
|
||||
348 Line(s) of event code
|
||||
245 Unique line(s) of event code
|
||||
cardGrid
|
||||
44 Component(s)
|
||||
523 Line(s) of event code
|
||||
295 Unique line(s) of event code
|
||||
cardPower
|
||||
54 Component(s)
|
||||
527 Line(s) of event code
|
||||
347 Unique line(s) of event code
|
||||
cardEntities
|
||||
67 Component(s)
|
||||
1170 Line(s) of event code
|
||||
532 Unique line(s) of event code
|
||||
cardGrid2
|
||||
52 Component(s)
|
||||
617 Line(s) of event code
|
||||
338 Unique line(s) of event code
|
||||
popupLight
|
||||
28 Component(s)
|
||||
412 Line(s) of event code
|
||||
226 Unique line(s) of event code
|
||||
227 Unique line(s) of event code
|
||||
cardGrid
|
||||
44 Component(s)
|
||||
529 Line(s) of event code
|
||||
298 Unique line(s) of event code
|
||||
cardEntities
|
||||
67 Component(s)
|
||||
1194 Line(s) of event code
|
||||
535 Unique line(s) of event code
|
||||
screensaver2
|
||||
58 Component(s)
|
||||
352 Line(s) of event code
|
||||
247 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
23 Page(s)
|
||||
875 Component(s)
|
||||
10335 Line(s) of event code
|
||||
2403 Unique line(s) of event code
|
||||
10379 Line(s) of event code
|
||||
2406 Unique line(s) of event code
|
||||
|
||||
@@ -75,8 +75,8 @@ Page popupLight
|
||||
}
|
||||
if(defaultBcoColor==0)
|
||||
{
|
||||
hBrightness.pic=14
|
||||
hBrightness.pic1=13
|
||||
hBrightness.pic=24
|
||||
hBrightness.pic1=25
|
||||
hBrightness.pic2=15
|
||||
hTempSlider.pic=16
|
||||
hTempSlider.pic1=17
|
||||
@@ -984,7 +984,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tId.txt=="cardGrid2")
|
||||
{
|
||||
page cardGrid
|
||||
page cardGrid2
|
||||
}
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
|
||||
@@ -1617,6 +1617,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardChart
|
||||
}
|
||||
if(tId.txt=="cardLChart")
|
||||
{
|
||||
page cardLChart
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user