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

This commit is contained in:
joBr99
2022-03-27 14:29:36 +00:00
committed by GitHub Actions
parent f566212540
commit 98dfb98d19
2 changed files with 158 additions and 120 deletions

View File

@@ -30,10 +30,6 @@ popupLight
27 Component(s) 27 Component(s)
323 Line(s) of event code 323 Line(s) of event code
173 Unique line(s) of event code 173 Unique line(s) of event code
screensaver
29 Component(s)
176 Line(s) of event code
127 Unique line(s) of event code
cardGrid cardGrid
39 Component(s) 39 Component(s)
378 Line(s) of event code 378 Line(s) of event code
@@ -54,9 +50,13 @@ cardMedia
29 Component(s) 29 Component(s)
256 Line(s) of event code 256 Line(s) of event code
132 Unique line(s) of event code 132 Unique line(s) of event code
screensaver
30 Component(s)
180 Line(s) of event code
130 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
342 Component(s) 343 Component(s)
3123 Line(s) of event code 3127 Line(s) of event code
832 Unique line(s) of event code 835 Unique line(s) of event code

View File

@@ -41,8 +41,6 @@ Page screensaver
// clear weather elements, to keep example content in HMI // clear weather elements, to keep example content in HMI
tMainIcon.txt="" tMainIcon.txt=""
tMainText.txt="" tMainText.txt=""
tMRIcon.txt=""
tMR.txt=""
tForecast1.txt="" tForecast1.txt=""
tF1Icon.txt="" tF1Icon.txt=""
tForecast1Val.txt="" tForecast1Val.txt=""
@@ -67,7 +65,7 @@ Variable (string) strCommand
ID : 5 ID : 5
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 200
Variable (string) vaTime Variable (string) vaTime
Attributes Attributes
@@ -85,7 +83,7 @@ Variable (string) vaDate
Variable (string) tId Variable (string) tId
Attributes Attributes
ID : 24 ID : 22
Scope : local Scope : local
Text : Text :
Max. Text Size: 25 Max. Text Size: 25
@@ -145,7 +143,7 @@ Text tInstruction
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 20 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -175,7 +173,7 @@ Text tTmp
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 20 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -278,8 +276,8 @@ Text tMainIcon
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 5 x coordinate : 26
y coordinate : 223 y coordinate : 202
Width : 70 Width : 70
Height : 66 Height : 66
Effect : load Effect : load
@@ -308,8 +306,8 @@ Text tMainText
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 81 x coordinate : 7
y coordinate : 214 y coordinate : 267
Width : 110 Width : 110
Height : 43 Height : 43
Effect : load Effect : load
@@ -330,7 +328,7 @@ Text tMainText
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tMRIcon Text tForecast1
Attributes Attributes
ID : 15 ID : 15
Scope : local Scope : local
@@ -338,67 +336,7 @@ Text tMRIcon
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 83 x coordinate : 128
y coordinate : 268
Width : 40
Height : 35
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tMR
Attributes
ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 124
y coordinate : 275
Width : 67
Height : 22
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 0 mm
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tForecast1
Attributes
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 207
y coordinate : 210 y coordinate : 210
Width : 72 Width : 72
Height : 26 Height : 26
@@ -422,13 +360,13 @@ Text tForecast1
Text tForecast1Val Text tForecast1Val
Attributes Attributes
ID : 18 ID : 16
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 205 x coordinate : 126
y coordinate : 277 y coordinate : 277
Width : 72 Width : 72
Height : 26 Height : 26
@@ -452,13 +390,13 @@ Text tForecast1Val
Text tF1Icon Text tF1Icon
Attributes Attributes
ID : 19 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 225 x coordinate : 146
y coordinate : 239 y coordinate : 239
Width : 40 Width : 40
Height : 35 Height : 35
@@ -482,13 +420,13 @@ Text tF1Icon
Text tForecast2 Text tForecast2
Attributes Attributes
ID : 20 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 291 x coordinate : 212
y coordinate : 210 y coordinate : 210
Width : 72 Width : 72
Height : 25 Height : 25
@@ -512,16 +450,16 @@ Text tForecast2
Text tF2Icon Text tF2Icon
Attributes Attributes
ID : 21 ID : 19
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 307 x coordinate : 228
y coordinate : 238 y coordinate : 239
Width : 40 Width : 40
Height : 33 Height : 35
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -542,13 +480,13 @@ Text tF2Icon
Text tForecast2Val Text tForecast2Val
Attributes Attributes
ID : 22 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 291 x coordinate : 212
y coordinate : 277 y coordinate : 277
Width : 72 Width : 72
Height : 25 Height : 25
@@ -572,7 +510,7 @@ Text tForecast2Val
Text t10 Text t10
Attributes Attributes
ID : 23 ID : 21
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -602,7 +540,7 @@ Text t10
Text tAMPM Text tAMPM
Attributes Attributes
ID : 25 ID : 23
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -630,17 +568,17 @@ Text tAMPM
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text t0 Text tForecast3Val
Attributes Attributes
ID : 26 ID : 24
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 375 x coordinate : 292
y coordinate : 277 y coordinate : 277
Width : 72 Width : 71
Height : 25 Height : 25
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -654,24 +592,24 @@ Text t0
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 11,9 °C Text :
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text t1 Text tF3Icon
Attributes Attributes
ID : 27 ID : 25
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 391 x coordinate : 309
y coordinate : 238 y coordinate : 239
Width : 40 Width : 40
Height : 33 Height : 35
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -684,21 +622,21 @@ Text t1
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text :
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text t2 Text tForecast3
Attributes Attributes
ID : 28 ID : 26
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 375 x coordinate : 293
y coordinate : 210 y coordinate : 210
Width : 72 Width : 72
Height : 25 Height : 25
@@ -714,7 +652,97 @@ Text t2
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Do Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tForecast4
Attributes
ID : 27
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 374
y coordinate : 210
Width : 72
Height : 25
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tF4Icon
Attributes
ID : 28
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 390
y coordinate : 239
Width : 40
Height : 35
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tForecast4Val
Attributes
ID : 29
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 374
y coordinate : 277
Width : 72
Height : 25
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -832,28 +860,38 @@ Timer tmSerial
substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
//tMainText //tMainText
spstr strCommand.txt,tMainText.txt,"?",2 spstr strCommand.txt,tMainText.txt,"?",2
//tMRIcon
spstr strCommand.txt,tTmp.txt,"?",3
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
//tMR
spstr strCommand.txt,tMR.txt,"?",4
//tForecast1 //tForecast1
spstr strCommand.txt,tForecast1.txt,"?",5 spstr strCommand.txt,tForecast1.txt,"?",3
//tF1Icon //tF1Icon
spstr strCommand.txt,tTmp.txt,"?",6 spstr strCommand.txt,tTmp.txt,"?",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1 substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
//tForecast1Val //tForecast1Val
spstr strCommand.txt,tForecast1Val.txt,"?",7 spstr strCommand.txt,tForecast1Val.txt,"?",5
//tForecast2 //tForecast2
spstr strCommand.txt,tForecast2.txt,"?",8 spstr strCommand.txt,tForecast2.txt,"?",6
//tF2Icon //tF2Icon
spstr strCommand.txt,tTmp.txt,"?",9 spstr strCommand.txt,tTmp.txt,"?",7
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1 substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
//tForecast2Val //tForecast2Val
spstr strCommand.txt,tForecast2Val.txt,"?",10 spstr strCommand.txt,tForecast2Val.txt,"?",8
//tForecast3
spstr strCommand.txt,tForecast3.txt,"?",9
//tF3Icon
spstr strCommand.txt,tTmp.txt,"?",10
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
//tForecast3Val
spstr strCommand.txt,tForecast3Val.txt,"?",11
//tForecast4
spstr strCommand.txt,tForecast4.txt,"?",12
//tF4Icon
spstr strCommand.txt,tTmp.txt,"?",13
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
//tForecast4Val
spstr strCommand.txt,tForecast4Val.txt,"?",14
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {