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

This commit is contained in:
joBr99
2022-05-24 14:34:15 +00:00
committed by github-actions[bot]
parent 2bea2aa6bc
commit 395b5cd562
9 changed files with 145 additions and 83 deletions

View File

@@ -653,7 +653,7 @@ Text tMainTextAlt
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 203
x coordinate : 184
y coordinate : 249
Width : 105
Height : 41
@@ -683,7 +683,7 @@ Text tMainIconAlt
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 100
x coordinate : 44
y coordinate : 260
Width : 100
Height : 65
@@ -713,7 +713,7 @@ Text tMRIcon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 201
x coordinate : 182
y coordinate : 304
Width : 40
Height : 34
@@ -743,7 +743,7 @@ Text tMR
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 243
x coordinate : 224
y coordinate : 309
Width : 61
Height : 20
@@ -774,7 +774,7 @@ Text tNotifyHead
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 240
y coordinate : 236
Width : 320
Height : 58
Effect : load
@@ -804,7 +804,7 @@ Text tNotifyText
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 298
y coordinate : 294
Width : 320
Height : 58
Effect : load
@@ -979,19 +979,6 @@ Timer tmSerial
vis tMainIconAlt,1
vis tMRIcon,1
vis tMR,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
}
//tMR
spstr strCommand.txt,tMR.txt,"~",16
@@ -1030,8 +1017,10 @@ Timer tmSerial
covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
tMainIconAlt.pco=tMainIcon.pco
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0
tMainTextAlt.pco=tMainText.pco
spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8
@@ -1059,12 +1048,8 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tMainIconAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMainTextAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tMRIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",23
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="notify")