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

This commit is contained in:
joBr99
2022-03-31 10:58:09 +00:00
committed by GitHub Actions
parent 22563d1cb4
commit 7bd3c263cf
22 changed files with 262 additions and 418 deletions

View File

@@ -93,8 +93,8 @@ Text tTmp
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 22
y coordinate : 155
x coordinate : 29
y coordinate : 151
Width : 27
Height : 30
Effect : load
@@ -153,8 +153,8 @@ Text tId
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 73
y coordinate : 158
x coordinate : 60
y coordinate : 153
Width : 30
Height : 30
Effect : load
@@ -1005,30 +1005,43 @@ Timer tmSerial
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
if(tId.txt=="popupLight")
if(tId.txt=="pageStartup")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
page pageStartup
}
if(tId.txt=="screensaver")
{
page screensaver
}
if(tId.txt=="cardEntities")
{
page cardEntities
}
if(tId.txt=="cardThermo")
if(tId.txt=="cardGrid")
{
page cardThermo
page cardGrid
}
if(tId.txt=="pageStartup")
if(tId.txt=="popupLight")
{
page pageStartup
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardGrid")
if(tId.txt=="cardThermo")
{
page cardGrid
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
@@ -1065,7 +1078,7 @@ Timer tmSleep
Events
Timer Event
if(sleepTimeout!=0)
if(sleepTimeout!=0&&dimValue!=dim)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)