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

This commit is contained in:
joBr99
2022-09-26 13:46:00 +00:00
committed by github-actions[bot]
parent 40ca7694f9
commit 32e58e5fe3
12 changed files with 30 additions and 126 deletions

View File

@@ -24,8 +24,8 @@ popupLight
213 Unique line(s) of event code
screensaver
38 Component(s)
353 Line(s) of event code
265 Unique line(s) of event code
337 Line(s) of event code
261 Unique line(s) of event code
popupFan
27 Component(s)
346 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total
15 Page(s)
488 Component(s)
5741 Line(s) of event code
1534 Unique line(s) of event code
5725 Line(s) of event code
1530 Unique line(s) of event code

View File

@@ -1012,7 +1012,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="weatherUpdate")
if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
vis tMainIcon,1
vis tMainIconAlt,0
@@ -1086,16 +1086,8 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
}
if(tInstruction.txt=="color")
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0
@@ -1183,14 +1175,6 @@ Timer tmSerial
tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco
}
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
}
if(tInstruction.txt=="notify")
{