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

This commit is contained in:
joBr99
2022-10-16 07:37:01 +00:00
committed by github-actions[bot]
parent 5708b4f75a
commit 6a78c6c869
9 changed files with 267 additions and 255 deletions

View File

@@ -30,99 +30,3 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
├── popupNotify.txt
│ @@ -21,25 +21,19 @@
│ vis tId,0
│ popupNotify.bco=defaultBcoColor
│ tHeading.bco=defaultBcoColor
│ b0.bco=defaultBcoColor
│ tText.bco=defaultBcoColor
│ b1.bco=defaultBcoColor
│ b2.bco=defaultBcoColor
│ - tIcon.bco=defaultBcoColor
│ - tTextAlt.bco=defaultBcoColor
│ tHeading.pco=defaultFontColor
│ b0.pco=defaultFontColor
│ tText.pco=defaultFontColor
│ b1.pco=defaultFontColor
│ b2.pco=defaultFontColor
│ - vis tIcon,0
│ - vis tTextAlt,0
│ - tIcon.pco=defaultFontColor
│ - tTextAlt.pco=defaultFontColor
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 1000
│ @@ -106,34 +100,14 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ Max. Text Size : 500
│ -Text tTextAlt
│ - Attributes
│ - Scope : local
│ - Dragging : 0
│ - Disable release event after dragging: 0
│ - Send Component ID : disabled
│ - Associated Keyboard : none
│ - Text :
│ - Max. Text Size : 500
│ -
│ -Text tIcon
│ - Attributes
│ - Scope : local
│ - Dragging : 0
│ - Disable release event after dragging: 0
│ - Send Component ID : disabled
│ - Associated Keyboard : none
│ - Text :
│ - Max. Text Size : 250
│ -
│ Picture p0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -325,33 +299,14 @@
│ tText.pco=sys0
│ //preserve old sleepTimeout
│ vaOldSleepT.val=sleepTimeout
│ // sleep timeout
│ spstr strCommand.txt,tTmp.txt,"~",10
│ covx tTmp.txt,sys0,0,0
│ sleepTimeout=sys0
│ - //font size
│ - spstr strCommand.txt,tTmp.txt,"~",11
│ - covx tTmp.txt,sys0,0,0
│ - tTextAlt.font=sys0
│ - tText.font=sys0
│ - //icon
│ - spstr strCommand.txt,tIcon.txt,"~",12
│ - if(tIcon.txt!="")
│ - {
│ - vis tIcon,1
│ - vis tTextAlt,1
│ - vis tText,0
│ - tTextAlt.txt=tText.txt
│ - tTextAlt.pco=tText.pco
│ - }
│ - // alt icon color
│ - spstr strCommand.txt,tTmp.txt,"~",13
│ - covx tTmp.txt,sys0,0,0
│ - tIcon.pco=sys0
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")

View File

@@ -7,9 +7,9 @@ pageIcons
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 19 Component(s)
231 Line(s) of event code 253 Line(s) of event code
146 Unique line(s) of event code 164 Unique line(s) of event code
cardMedia cardMedia
34 Component(s) 34 Component(s)
394 Line(s) of event code 394 Line(s) of event code
@@ -65,6 +65,6 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
482 Component(s) 484 Component(s)
5744 Line(s) of event code 5766 Line(s) of event code
1546 Unique line(s) of event code 1561 Unique line(s) of event code

View File

@@ -33,11 +33,17 @@ Page popupNotify
tText.bco=defaultBcoColor tText.bco=defaultBcoColor
b1.bco=defaultBcoColor b1.bco=defaultBcoColor
b2.bco=defaultBcoColor b2.bco=defaultBcoColor
tIcon.bco=defaultBcoColor
tTextAlt.bco=defaultBcoColor
tHeading.pco=defaultFontColor tHeading.pco=defaultFontColor
b0.pco=defaultFontColor b0.pco=defaultFontColor
tText.pco=defaultFontColor tText.pco=defaultFontColor
b1.pco=defaultFontColor b1.pco=defaultFontColor
b2.pco=defaultFontColor b2.pco=defaultFontColor
vis tIcon,0
vis tTextAlt,0
tIcon.pco=defaultFontColor
tTextAlt.pco=defaultFontColor
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -174,7 +180,7 @@ Text tHeading
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : left Horizontal Alignment : left
@@ -216,6 +222,66 @@ Text tText
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tTextAlt
Attributes
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 150
y coordinate : 74
Width : 285
Height : 171
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : left
Vertical Alignment : top
Input Type : character
Text :
Max. Text Size : 500
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tIcon
Attributes
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 38
y coordinate : 74
Width : 109
Height : 171
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 250
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -298,7 +364,7 @@ Button b2
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 8 Back. Picture ID (Pressed) : 8
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -347,7 +413,7 @@ Button b1
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 8 Back. Picture ID (Pressed) : 8
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -493,6 +559,25 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
sleepTimeout=sys0 sleepTimeout=sys0
//font size
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,sys0,0,0
tTextAlt.font=sys0
tText.font=sys0
//icon
spstr strCommand.txt,tIcon.txt,"~",12
if(tIcon.txt!="")
{
vis tIcon,1
vis tTextAlt,1
vis tText,0
tTextAlt.txt=tText.txt
tTextAlt.pco=tText.pco
}
// alt icon color
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,sys0,0,0
tIcon.pco=sys0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -25,11 +25,17 @@ Page popupNotify
tText.bco=defaultBcoColor tText.bco=defaultBcoColor
b1.bco=defaultBcoColor b1.bco=defaultBcoColor
b2.bco=defaultBcoColor b2.bco=defaultBcoColor
tIcon.bco=defaultBcoColor
tTextAlt.bco=defaultBcoColor
tHeading.pco=defaultFontColor tHeading.pco=defaultFontColor
b0.pco=defaultFontColor b0.pco=defaultFontColor
tText.pco=defaultFontColor tText.pco=defaultFontColor
b1.pco=defaultFontColor b1.pco=defaultFontColor
b2.pco=defaultFontColor b2.pco=defaultFontColor
vis tIcon,0
vis tTextAlt,0
tIcon.pco=defaultFontColor
tTextAlt.pco=defaultFontColor
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -104,6 +110,26 @@ Text tText
Text : Text :
Max. Text Size : 500 Max. Text Size : 500
Text tTextAlt
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 500
Text tIcon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 250
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -303,6 +329,25 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
sleepTimeout=sys0 sleepTimeout=sys0
//font size
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,sys0,0,0
tTextAlt.font=sys0
tText.font=sys0
//icon
spstr strCommand.txt,tIcon.txt,"~",12
if(tIcon.txt!="")
{
vis tIcon,1
vis tTextAlt,1
vis tText,0
tTextAlt.txt=tText.txt
tTextAlt.pco=tText.pco
}
// alt icon color
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,sys0,0,0
tIcon.pco=sys0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -717,76 +717,6 @@
│ Scope : local │ Scope : local
│ Text : │ Text :
│ Max. Text Size: 1000 │ Max. Text Size: 1000
│ @@ -106,34 +100,14 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ Max. Text Size : 500
│ -Text tTextAlt
│ - Attributes
│ - Scope : local
│ - Dragging : 0
│ - Disable release event after dragging: 0
│ - Send Component ID : disabled
│ - Associated Keyboard : none
│ - Text :
│ - Max. Text Size : 500
│ -
│ -Text tIcon
│ - Attributes
│ - Scope : local
│ - Dragging : 0
│ - Disable release event after dragging: 0
│ - Send Component ID : disabled
│ - Associated Keyboard : none
│ - Text :
│ - Max. Text Size : 250
│ -
│ Picture p0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -325,33 +299,14 @@
│ tText.pco=sys0
│ //preserve old sleepTimeout
│ vaOldSleepT.val=sleepTimeout
│ // sleep timeout
│ spstr strCommand.txt,tTmp.txt,"~",10
│ covx tTmp.txt,sys0,0,0
│ sleepTimeout=sys0
│ - //font size
│ - spstr strCommand.txt,tTmp.txt,"~",11
│ - covx tTmp.txt,sys0,0,0
│ - tTextAlt.font=sys0
│ - tText.font=sys0
│ - //icon
│ - spstr strCommand.txt,tIcon.txt,"~",12
│ - if(tIcon.txt!="")
│ - {
│ - vis tIcon,1
│ - vis tTextAlt,1
│ - vis tText,0
│ - tTextAlt.txt=tText.txt
│ - tTextAlt.pco=tText.pco
│ - }
│ - // alt icon color
│ - spstr strCommand.txt,tTmp.txt,"~",13
│ - covx tTmp.txt,sys0,0,0
│ - tIcon.pco=sys0
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
├── screensaver.txt ├── screensaver.txt
│ @@ -71,15 +71,15 @@ │ @@ -71,15 +71,15 @@
│ Text tTime │ Text tTime

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-10-15 13:53:17.697936240 +0000 +++ /dev/fd/62 2022-10-16 07:36:55.021416954 +0000
+geIcons.txt +geIcons.txt
+5 +15,15 @@ +5 +15,15 @@
+ Scope : global + Scope : global
@@ -43,76 +43,6 @@
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 1000 + Max. Text Size: 1000
+
+34 +100,14 @@
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 500
+
+extAlt
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 500
+
+con
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 250
+
+ p0
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+
+33 +299,14 @@
+ tText.pco=sys0
+ //preserve old sleepTimeout
+ vaOldSleepT.val=sleepTimeout
+ // sleep timeout
+ spstr strCommand.txt,tTmp.txt,"~",10
+ covx tTmp.txt,sys0,0,0
+ sleepTimeout=sys0
+ //font size
+ spstr strCommand.txt,tTmp.txt,"~",11
+ covx tTmp.txt,sys0,0,0
+ tTextAlt.font=sys0
+ tText.font=sys0
+ //icon
+ spstr strCommand.txt,tIcon.txt,"~",12
+ if(tIcon.txt!="")
+ {
+ vis tIcon,1
+ vis tTextAlt,1
+ vis tText,0
+ tTextAlt.txt=tText.txt
+ tTextAlt.pco=tText.pco
+ }
+ // alt icon color
+ spstr strCommand.txt,tTmp.txt,"~",13
+ covx tTmp.txt,sys0,0,0
+ tIcon.pco=sys0
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")
+reensaver.txt +reensaver.txt
+5 +71,15 @@ +5 +71,15 @@
+ime +ime

View File

@@ -14,10 +14,6 @@ popupFan
27 Component(s) 27 Component(s)
347 Line(s) of event code 347 Line(s) of event code
202 Unique line(s) of event code 202 Unique line(s) of event code
popupNotify
17 Component(s)
231 Line(s) of event code
146 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
172 Line(s) of event code 172 Line(s) of event code
@@ -46,6 +42,10 @@ cardMedia
34 Component(s) 34 Component(s)
394 Line(s) of event code 394 Line(s) of event code
213 Unique line(s) of event code 213 Unique line(s) of event code
popupNotify
19 Component(s)
247 Line(s) of event code
158 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
338 Line(s) of event code 338 Line(s) of event code
@@ -65,6 +65,6 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
494 Component(s) 496 Component(s)
5967 Line(s) of event code 5983 Line(s) of event code
1620 Unique line(s) of event code 1629 Unique line(s) of event code

View File

@@ -194,8 +194,8 @@ Text tText
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 : 4
y coordinate : 74 y coordinate : 76
Width : 307 Width : 307
Height : 260 Height : 260
Effect : load Effect : load
@@ -216,6 +216,66 @@ Text tText
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tTextAlt
Attributes
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 4
y coordinate : 164
Width : 306
Height : 171
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : left
Vertical Alignment : top
Input Type : character
Text :
Max. Text Size : 500
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tIcon
Attributes
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 3
y coordinate : 74
Width : 308
Height : 90
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 250
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -493,6 +553,25 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
sleepTimeout=sys0 sleepTimeout=sys0
//font size
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,sys0,0,0
tTextAlt.font=sys0
tText.font=sys0
//icon
spstr strCommand.txt,tIcon.txt,"~",12
if(tIcon.txt!="")
{
vis tIcon,1
vis tTextAlt,1
vis tText,0
tTextAlt.txt=tText.txt
tTextAlt.pco=tText.pco
}
// alt icon color
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,sys0,0,0
tIcon.pco=sys0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -104,6 +104,26 @@ Text tText
Text : Text :
Max. Text Size : 500 Max. Text Size : 500
Text tTextAlt
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 500
Text tIcon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 250
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -303,6 +323,25 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
sleepTimeout=sys0 sleepTimeout=sys0
//font size
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,sys0,0,0
tTextAlt.font=sys0
tText.font=sys0
//icon
spstr strCommand.txt,tIcon.txt,"~",12
if(tIcon.txt!="")
{
vis tIcon,1
vis tTextAlt,1
vis tText,0
tTextAlt.txt=tText.txt
tTextAlt.pco=tText.pco
}
// alt icon color
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,sys0,0,0
tIcon.pco=sys0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {