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

This commit is contained in:
joBr99
2023-01-23 17:04:24 +00:00
committed by github-actions[bot]
parent d17fb469cc
commit 0b61bb6c5c
8 changed files with 60 additions and 43 deletions

View File

@@ -48,7 +48,7 @@ cardAlarm
269 Unique line(s) of event code
screensaver
47 Component(s)
426 Line(s) of event code
428 Line(s) of event code
307 Unique line(s) of event code
popupInSel
34 Component(s)
@@ -86,5 +86,5 @@ cardEntities
Total
20 Page(s)
737 Component(s)
8818 Line(s) of event code
8820 Line(s) of event code
2271 Unique line(s) of event code

View File

@@ -1133,12 +1133,6 @@ Timer tmSerial
}
if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
vis tMainIcon,1
vis tMainIconAlt,0
vis tMainText,1
vis tMainTextAlt,0
vis tMainTextAlt2,0
vis tMainIconAlt2,0
//tMainIcon
spstr strCommand.txt,tMainIcon.txt,"~",3
tMainIconAlt.txt=tMainIcon.txt
@@ -1218,6 +1212,14 @@ Timer tmSerial
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
}else
{
vis tMainIcon,1
vis tMainIconAlt,0
vis tMainText,1
vis tMainTextAlt,0
vis tMainTextAlt2,0
vis tMainIconAlt2,0
}
}
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")