mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-15 09:26:58 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
374e3a57ef
commit
7654165670
@@ -10,6 +10,10 @@ pageTest
|
||||
13 Component(s)
|
||||
13 Line(s) of event code
|
||||
13 Unique line(s) of event code
|
||||
screensaver
|
||||
35 Component(s)
|
||||
282 Line(s) of event code
|
||||
229 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
338 Line(s) of event code
|
||||
@@ -38,10 +42,6 @@ cardGrid
|
||||
39 Component(s)
|
||||
418 Line(s) of event code
|
||||
244 Unique line(s) of event code
|
||||
screensaver
|
||||
33 Component(s)
|
||||
266 Line(s) of event code
|
||||
218 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
343 Line(s) of event code
|
||||
@@ -53,6 +53,6 @@ cardEntities
|
||||
|
||||
Total
|
||||
12 Page(s)
|
||||
341 Component(s)
|
||||
3661 Line(s) of event code
|
||||
1002 Unique line(s) of event code
|
||||
343 Component(s)
|
||||
3677 Line(s) of event code
|
||||
1012 Unique line(s) of event code
|
||||
|
||||
@@ -25,6 +25,8 @@ Page screensaver
|
||||
vis tInstruction,0
|
||||
vis tTmp,0
|
||||
vis p0,0
|
||||
vis tNotifyHead,0
|
||||
vis tNotifyText,0
|
||||
//load gloabl time string from pageIcons
|
||||
//tTime.txt=vaTime.txt
|
||||
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
|
||||
@@ -763,6 +765,66 @@ Text tMR
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Text tNotifyHead
|
||||
Attributes
|
||||
ID : 33
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 0
|
||||
y coordinate : 201
|
||||
Width : 450
|
||||
Height : 58
|
||||
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 : center
|
||||
Vertical Alignment : top
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 35
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Text tNotifyText
|
||||
Attributes
|
||||
ID : 34
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 0
|
||||
y coordinate : 258
|
||||
Width : 450
|
||||
Height : 47
|
||||
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 : top
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 35
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Picture p0
|
||||
Attributes
|
||||
ID : 1
|
||||
@@ -1005,6 +1067,20 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",23
|
||||
covx tTmp.txt,tMR.pco,0,0
|
||||
}
|
||||
if(tInstruction.txt=="notify")
|
||||
{
|
||||
spstr strCommand.txt,tNotifyHead.txt,"~",1
|
||||
spstr strCommand.txt,tNotifyText.txt,"~",2
|
||||
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||
{
|
||||
vis tNotifyHead,1
|
||||
vis tNotifyText,1
|
||||
}else
|
||||
{
|
||||
vis tNotifyHead,0
|
||||
vis tNotifyText,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
dim=100
|
||||
|
||||
Reference in New Issue
Block a user