mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-20 13:14:44 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
40ca7694f9
commit
32e58e5fe3
@@ -52,8 +52,8 @@ cardThermo
|
||||
303 Unique line(s) of event code
|
||||
screensaver
|
||||
38 Component(s)
|
||||
349 Line(s) of event code
|
||||
263 Unique line(s) of event code
|
||||
333 Line(s) of event code
|
||||
259 Unique line(s) of event code
|
||||
cardEntities
|
||||
77 Component(s)
|
||||
1354 Line(s) of event code
|
||||
@@ -62,5 +62,5 @@ cardEntities
|
||||
Total
|
||||
14 Page(s)
|
||||
451 Component(s)
|
||||
5503 Line(s) of event code
|
||||
1489 Unique line(s) of event code
|
||||
5487 Line(s) of event code
|
||||
1485 Unique line(s) of event code
|
||||
|
||||
@@ -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")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user