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

This commit is contained in:
joBr99
2023-08-20 12:42:36 +00:00
committed by github-actions[bot]
parent a1104b8f81
commit 291102971a
21 changed files with 155 additions and 394 deletions

View File

@@ -965,8 +965,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")
{
@@ -999,8 +1004,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")
{
@@ -1033,8 +1043,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")
{
@@ -1067,8 +1082,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")
{

View File

@@ -605,7 +605,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{

View File

@@ -739,7 +739,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{

View File

@@ -964,6 +964,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -67,8 +67,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
@@ -635,7 +635,7 @@ Timer tmSerial
}
if(tId.txt=="cardGrid2")
{
page cardGrid
page cardGrid2
}
if(tId.txt=="popupLight")
{

View File

@@ -804,6 +804,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="timeout")
{