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

This commit is contained in:
joBr99
2023-02-04 08:43:22 +00:00
committed by github-actions[bot]
parent 18d9d9bf90
commit eba3b0d913
9 changed files with 173 additions and 217 deletions

View File

@@ -80,8 +80,8 @@ popupTimer
255 Unique line(s) of event code
screensaver
47 Component(s)
432 Line(s) of event code
308 Unique line(s) of event code
430 Line(s) of event code
309 Unique line(s) of event code
cardPower
54 Component(s)
504 Line(s) of event code
@@ -90,5 +90,5 @@ cardPower
Total
21 Page(s)
802 Component(s)
9261 Line(s) of event code
2332 Unique line(s) of event code
9259 Line(s) of event code
2334 Unique line(s) of event code

View File

@@ -1091,7 +1091,7 @@ Timer tmSerial
}
if(tInstruction.txt=="time")
{
click m0,1
//click m0,1
//get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -1187,7 +1187,7 @@ Timer tmSerial
//tMainIconAlt2 Color
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,tMainIconAlt2.pco,0,0
if(tMainTextAlt2.txt!=""&&p0.w!=320)
if(tMainTextAlt2.txt!="")
{
//value for tMRIcon, activate alternative layout
vis tMainIcon,0
@@ -1196,22 +1196,25 @@ Timer tmSerial
vis tMainIconAlt,1
vis tMainTextAlt2,1
vis tMainIconAlt2,1
vis tForecast1,0
vis tF1Icon,0
vis tForecast1Val,0
//move forecast values to the right
tForecast4.txt=tForecast3.txt
tForecast3.txt=tForecast2.txt
tForecast2.txt=tForecast1.txt
tForecast4Val.txt=tForecast3Val.txt
tForecast3Val.txt=tForecast2Val.txt
tForecast2Val.txt=tForecast1Val.txt
tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
if(p0.w!=320)
{
vis tForecast1,0
vis tF1Icon,0
vis tForecast1Val,0
//move forecast values to the right
tForecast4.txt=tForecast3.txt
tForecast3.txt=tForecast2.txt
tForecast2.txt=tForecast1.txt
tForecast4Val.txt=tForecast3Val.txt
tForecast3Val.txt=tForecast2Val.txt
tForecast2Val.txt=tForecast1Val.txt
tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
}
}else
{
vis tMainIcon,1
@@ -1342,10 +1345,6 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities