mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-20 13:14:44 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
52749e4187
commit
af28e51bc9
@@ -34,6 +34,10 @@ cardPower
|
||||
45 Component(s)
|
||||
412 Line(s) of event code
|
||||
289 Unique line(s) of event code
|
||||
screensaver
|
||||
46 Component(s)
|
||||
410 Line(s) of event code
|
||||
295 Unique line(s) of event code
|
||||
popupShutter
|
||||
25 Component(s)
|
||||
398 Line(s) of event code
|
||||
@@ -66,10 +70,6 @@ popupTimer
|
||||
42 Component(s)
|
||||
512 Line(s) of event code
|
||||
255 Unique line(s) of event code
|
||||
screensaver
|
||||
45 Component(s)
|
||||
429 Line(s) of event code
|
||||
301 Unique line(s) of event code
|
||||
popupInSel
|
||||
34 Component(s)
|
||||
617 Line(s) of event code
|
||||
@@ -81,6 +81,6 @@ cardEntities
|
||||
|
||||
Total
|
||||
19 Page(s)
|
||||
709 Component(s)
|
||||
8642 Line(s) of event code
|
||||
2255 Unique line(s) of event code
|
||||
710 Component(s)
|
||||
8623 Line(s) of event code
|
||||
2253 Unique line(s) of event code
|
||||
|
||||
@@ -57,21 +57,21 @@ Variable (string) tId
|
||||
|
||||
Variable (string) tInstruction
|
||||
Attributes
|
||||
ID : 30
|
||||
ID : 28
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
|
||||
Variable (string) tSend
|
||||
Attributes
|
||||
ID : 34
|
||||
ID : 30
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
|
||||
Variable (string) tTmp
|
||||
Attributes
|
||||
ID : 31
|
||||
ID : 29
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 50
|
||||
@@ -84,37 +84,37 @@ Variable (int32) vaTap
|
||||
|
||||
Variable (int32) xc1
|
||||
Attributes
|
||||
ID : 43
|
||||
ID : 39
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (int32) xc2
|
||||
Attributes
|
||||
ID : 41
|
||||
ID : 37
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (int32) xcR
|
||||
Attributes
|
||||
ID : 38
|
||||
ID : 34
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (int32) yc1
|
||||
Attributes
|
||||
ID : 42
|
||||
ID : 38
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (int32) yc2
|
||||
Attributes
|
||||
ID : 40
|
||||
ID : 36
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
Variable (int32) ycR
|
||||
Attributes
|
||||
ID : 39
|
||||
ID : 35
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
@@ -570,7 +570,7 @@ Text tForecast4Val
|
||||
|
||||
Text tIcon1
|
||||
Attributes
|
||||
ID : 35
|
||||
ID : 31
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -600,7 +600,7 @@ Text tIcon1
|
||||
|
||||
Text tIcon2
|
||||
Attributes
|
||||
ID : 36
|
||||
ID : 32
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -628,66 +628,6 @@ Text tIcon2
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Text tMR
|
||||
Attributes
|
||||
ID : 29
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 224
|
||||
y coordinate : 329
|
||||
Width : 61
|
||||
Height : 20
|
||||
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 : left
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Text tMRIcon
|
||||
Attributes
|
||||
ID : 28
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 182
|
||||
y coordinate : 324
|
||||
Width : 40
|
||||
Height : 34
|
||||
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 tMainIcon
|
||||
Attributes
|
||||
ID : 7
|
||||
@@ -726,10 +666,40 @@ Text tMainIconAlt
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 44
|
||||
y coordinate : 280
|
||||
Width : 100
|
||||
Height : 65
|
||||
x coordinate : 58
|
||||
y coordinate : 257
|
||||
Width : 50
|
||||
Height : 50
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
Fill : solid color
|
||||
Style : flat
|
||||
Associated Keyboard : none
|
||||
Font ID : 4
|
||||
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 tMainIconAlt2
|
||||
Attributes
|
||||
ID : 42
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 214
|
||||
y coordinate : 257
|
||||
Width : 50
|
||||
Height : 50
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
@@ -786,10 +756,40 @@ Text tMainTextAlt
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 184
|
||||
y coordinate : 269
|
||||
x coordinate : 30
|
||||
y coordinate : 314
|
||||
Width : 105
|
||||
Height : 41
|
||||
Height : 50
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
Fill : solid color
|
||||
Style : flat
|
||||
Associated Keyboard : none
|
||||
Font ID : 3
|
||||
Back. Color : 0
|
||||
Font Color : 65535
|
||||
Horizontal Alignment : left
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Text tMainTextAlt2
|
||||
Attributes
|
||||
ID : 41
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 187
|
||||
y coordinate : 314
|
||||
Width : 105
|
||||
Height : 50
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
@@ -810,7 +810,7 @@ Text tMainTextAlt
|
||||
|
||||
Text tNotifyHead
|
||||
Attributes
|
||||
ID : 32
|
||||
ID : 45
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -840,7 +840,7 @@ Text tNotifyHead
|
||||
|
||||
Text tNotifyText
|
||||
Attributes
|
||||
ID : 33
|
||||
ID : 44
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -900,7 +900,7 @@ Text tTime
|
||||
|
||||
Text tTimeAdd
|
||||
Attributes
|
||||
ID : 37
|
||||
ID : 33
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
@@ -945,9 +945,25 @@ Picture p0
|
||||
Effect Time : 300
|
||||
Picture ID : 0
|
||||
|
||||
Hotspot m0
|
||||
Attributes
|
||||
ID : 43
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 289
|
||||
y coordinate : 282
|
||||
Width : 24
|
||||
Height : 23
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
|
||||
Timer tm0
|
||||
Attributes
|
||||
ID : 44
|
||||
ID : 40
|
||||
Scope : local
|
||||
Period (ms): 50
|
||||
Enabled : yes
|
||||
@@ -1014,7 +1030,6 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tInstruction.txt,"~",0
|
||||
if(tInstruction.txt=="wake")
|
||||
{
|
||||
//dim=100
|
||||
click tc0,1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
@@ -1041,6 +1056,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
click m0,1
|
||||
//get set time to global variable
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
||||
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||
@@ -1059,12 +1075,6 @@ Timer tmSerial
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
|
||||
tDate.txt=pageIcons.vaDate.txt
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
//set timeout to global var
|
||||
spstr strCommand.txt,tTmp.txt,"~",1
|
||||
covx tTmp.txt,sleepTimeout,0,0
|
||||
}
|
||||
if(tInstruction.txt=="statusUpdate")
|
||||
{
|
||||
//statusIcon1
|
||||
@@ -1092,50 +1102,71 @@ Timer tmSerial
|
||||
vis tMainIconAlt,0
|
||||
vis tMainText,1
|
||||
vis tMainTextAlt,0
|
||||
vis tMRIcon,0
|
||||
vis tMR,0
|
||||
vis tMainTextAlt2,0
|
||||
vis tMainIconAlt2,0
|
||||
//tMainIcon
|
||||
spstr strCommand.txt,tMainIcon.txt,"~",1
|
||||
spstr strCommand.txt,tMainIcon.txt,"~",3
|
||||
tMainIconAlt.txt=tMainIcon.txt
|
||||
//tMainIcon Color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
covx tTmp.txt,tMainIcon.pco,0,0
|
||||
tMainIconAlt.pco=tMainIcon.pco
|
||||
//tMainText
|
||||
spstr strCommand.txt,tMainText.txt,"~",2
|
||||
spstr strCommand.txt,tMainText.txt,"~",6
|
||||
tMainTextAlt.txt=tMainText.txt
|
||||
//tForecast1
|
||||
spstr strCommand.txt,tForecast1.txt,"~",3
|
||||
spstr strCommand.txt,tForecast1.txt,"~",11
|
||||
//tF1Icon
|
||||
spstr strCommand.txt,tF1Icon.txt,"~",4
|
||||
spstr strCommand.txt,tF1Icon.txt,"~",9
|
||||
//tF1Icon Color
|
||||
spstr strCommand.txt,tTmp.txt,"~",10
|
||||
covx tTmp.txt,tF1Icon.pco,0,0
|
||||
//tForecast1Val
|
||||
spstr strCommand.txt,tForecast1Val.txt,"~",5
|
||||
spstr strCommand.txt,tForecast1Val.txt,"~",12
|
||||
//tForecast2
|
||||
spstr strCommand.txt,tForecast2.txt,"~",6
|
||||
spstr strCommand.txt,tForecast2.txt,"~",17
|
||||
//tF2Icon
|
||||
spstr strCommand.txt,tF2Icon.txt,"~",7
|
||||
spstr strCommand.txt,tF2Icon.txt,"~",15
|
||||
//tF2Icon Color
|
||||
spstr strCommand.txt,tTmp.txt,"~",16
|
||||
covx tTmp.txt,tF2Icon.pco,0,0
|
||||
//tForecast2Val
|
||||
spstr strCommand.txt,tForecast2Val.txt,"~",8
|
||||
spstr strCommand.txt,tForecast2Val.txt,"~",18
|
||||
//tForecast3
|
||||
spstr strCommand.txt,tForecast3.txt,"~",9
|
||||
spstr strCommand.txt,tForecast3.txt,"~",23
|
||||
//tF3Icon
|
||||
spstr strCommand.txt,tF3Icon.txt,"~",10
|
||||
spstr strCommand.txt,tF3Icon.txt,"~",21
|
||||
//tF3Icon Color
|
||||
spstr strCommand.txt,tTmp.txt,"~",22
|
||||
covx tTmp.txt,tF3Icon.pco,0,0
|
||||
//tForecast3Val
|
||||
spstr strCommand.txt,tForecast3Val.txt,"~",11
|
||||
spstr strCommand.txt,tForecast3Val.txt,"~",24
|
||||
//tForecast4
|
||||
spstr strCommand.txt,tForecast4.txt,"~",12
|
||||
spstr strCommand.txt,tForecast4.txt,"~",29
|
||||
//tF4Icon
|
||||
spstr strCommand.txt,tF4Icon.txt,"~",13
|
||||
spstr strCommand.txt,tF4Icon.txt,"~",27
|
||||
//tF4Icon Color
|
||||
spstr strCommand.txt,tTmp.txt,"~",28
|
||||
covx tTmp.txt,tF4Icon.pco,0,0
|
||||
//tForecast4Val
|
||||
spstr strCommand.txt,tForecast4Val.txt,"~",14
|
||||
spstr strCommand.txt,tForecast4Val.txt,"~",30
|
||||
//alternative layout
|
||||
//tMRIcon
|
||||
spstr strCommand.txt,tMRIcon.txt,"~",15
|
||||
if(tMRIcon.txt!=""&&p0.w!=320)
|
||||
//tMainTextAlt2
|
||||
spstr strCommand.txt,tMainTextAlt2.txt,"~",36
|
||||
//tMainIconAlt2
|
||||
spstr strCommand.txt,tMainIconAlt2.txt,"~",33
|
||||
//tMainIconAlt2 Color
|
||||
spstr strCommand.txt,tTmp.txt,"~",34
|
||||
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
||||
if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
||||
{
|
||||
//value for tMRIcon, activate alternative layout
|
||||
vis tMainIcon,0
|
||||
vis tMainText,0
|
||||
vis tMainTextAlt,1
|
||||
vis tMainIconAlt,1
|
||||
vis tMRIcon,1
|
||||
vis tMR,1
|
||||
vis tMainTextAlt2,1
|
||||
vis tMainIconAlt2,1
|
||||
vis tForecast1,0
|
||||
vis tF1Icon,0
|
||||
vis tForecast1Val,0
|
||||
@@ -1150,26 +1181,6 @@ Timer tmSerial
|
||||
tF3Icon.txt=tF2Icon.txt
|
||||
tF2Icon.txt=tF1Icon.txt
|
||||
}
|
||||
//tMR
|
||||
spstr strCommand.txt,tMR.txt,"~",16
|
||||
//statusIcon1
|
||||
spstr strCommand.txt,tIcon1.txt,"~",17
|
||||
spstr strCommand.txt,tTmp.txt,"~",18
|
||||
covx tTmp.txt,tIcon1.pco,0,0
|
||||
//statusIcon2
|
||||
spstr strCommand.txt,tIcon2.txt,"~",19
|
||||
spstr strCommand.txt,tTmp.txt,"~",20
|
||||
covx tTmp.txt,tIcon2.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",21
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
tIcon1.font=3
|
||||
}
|
||||
spstr strCommand.txt,tTmp.txt,"~",22
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
tIcon2.font=3
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
|
||||
{
|
||||
@@ -1184,9 +1195,8 @@ Timer tmSerial
|
||||
tMainText.bco=tTime.bco
|
||||
tMainIconAlt.bco=tTime.bco
|
||||
tMainTextAlt.bco=tTime.bco
|
||||
tMRIcon.bco=tTime.bco
|
||||
tMR.bco=tTime.bco
|
||||
tMRIcon.bco=tTime.bco
|
||||
tMainTextAlt2.bco=tTime.bco
|
||||
tMainIconAlt2.bco=tTime.bco
|
||||
tIcon1.bco=tTime.bco
|
||||
tIcon2.bco=tTime.bco
|
||||
tForecast1.bco=tTime.bco
|
||||
@@ -1210,48 +1220,34 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
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
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
covx tTmp.txt,tForecast1.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",8
|
||||
spstr strCommand.txt,tTmp.txt,"~",7
|
||||
covx tTmp.txt,tForecast2.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",9
|
||||
spstr strCommand.txt,tTmp.txt,"~",8
|
||||
covx tTmp.txt,tForecast3.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",10
|
||||
spstr strCommand.txt,tTmp.txt,"~",9
|
||||
covx tTmp.txt,tForecast4.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",11
|
||||
covx tTmp.txt,tF1Icon.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",12
|
||||
covx tTmp.txt,tF2Icon.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",13
|
||||
covx tTmp.txt,tF3Icon.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",14
|
||||
covx tTmp.txt,tF4Icon.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",15
|
||||
spstr strCommand.txt,tTmp.txt,"~",10
|
||||
covx tTmp.txt,tForecast1Val.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",16
|
||||
spstr strCommand.txt,tTmp.txt,"~",11
|
||||
covx tTmp.txt,tForecast2Val.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",17
|
||||
spstr strCommand.txt,tTmp.txt,"~",12
|
||||
covx tTmp.txt,tForecast3Val.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",18
|
||||
spstr strCommand.txt,tTmp.txt,"~",13
|
||||
covx tTmp.txt,tForecast4Val.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",19
|
||||
spstr strCommand.txt,tTmp.txt,"~",14
|
||||
covx tTmp.txt,t10.bco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",20
|
||||
covx tTmp.txt,tMRIcon.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",21
|
||||
covx tTmp.txt,tMR.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",22
|
||||
spstr strCommand.txt,tTmp.txt,"~",15
|
||||
covx tTmp.txt,tMainTextAlt2.pco,0,0
|
||||
//spstr strCommand.txt,tTmp.txt,"~",16
|
||||
//covx tTmp.txt,tMR.pco,0,0
|
||||
spstr strCommand.txt,tTmp.txt,"~",17
|
||||
covx tTmp.txt,tTimeAdd.pco,0,0
|
||||
if(tMRIcon.txt!=""&&p0.w!=320)
|
||||
if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
||||
{
|
||||
tF4Icon.pco=tF3Icon.pco
|
||||
tF3Icon.pco=tF2Icon.pco
|
||||
tF2Icon.pco=tF1Icon.pco
|
||||
tForecast4Val.pco=tForecast3Val.pco
|
||||
tForecast3Val.pco=tForecast2Val.pco
|
||||
tForecast2Val.pco=tForecast1Val.pco
|
||||
@@ -1355,6 +1351,12 @@ Timer tmSerial
|
||||
page cardChart
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
//set timeout to global var
|
||||
spstr strCommand.txt,tTmp.txt,"~",1
|
||||
covx tTmp.txt,sleepTimeout,0,0
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
|
||||
Reference in New Issue
Block a user