mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-19 20:54:43 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
+++ /dev/fd/62 2023-01-23 16:53:32.157856011 +0000
|
||||
+++ /dev/fd/62 2023-01-23 17:04:15.689928965 +0000
|
||||
+I/n2t-out/Program.s.txt
|
||||
++ HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+I/n2t-out/cardEntities.txt
|
||||
|
||||
@@ -26,6 +26,10 @@ cardQR
|
||||
34 Component(s)
|
||||
402 Line(s) of event code
|
||||
234 Unique line(s) of event code
|
||||
screensaver
|
||||
46 Component(s)
|
||||
419 Line(s) of event code
|
||||
300 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
200 Line(s) of event code
|
||||
@@ -46,10 +50,6 @@ cardThermo
|
||||
57 Component(s)
|
||||
532 Line(s) of event code
|
||||
315 Unique line(s) of event code
|
||||
screensaver
|
||||
46 Component(s)
|
||||
417 Line(s) of event code
|
||||
300 Unique line(s) of event code
|
||||
cardChart
|
||||
33 Component(s)
|
||||
429 Line(s) of event code
|
||||
@@ -86,5 +86,5 @@ cardEntities
|
||||
Total
|
||||
20 Page(s)
|
||||
747 Component(s)
|
||||
9229 Line(s) of event code
|
||||
9231 Line(s) of event code
|
||||
2382 Unique line(s) of event code
|
||||
|
||||
@@ -1089,12 +1089,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
|
||||
@@ -1174,6 +1168,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=="")
|
||||
|
||||
@@ -516,12 +516,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
|
||||
@@ -601,6 +595,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=="")
|
||||
|
||||
Reference in New Issue
Block a user