Merge branch 'main' into pr/179 (add nextion2text)

This commit is contained in:
joBr99
2022-05-06 15:52:05 +00:00
committed by github-actions[bot]
parent d0d14e48a0
commit 70b9f6a65b
12 changed files with 191 additions and 66 deletions

View File

@@ -30,14 +30,14 @@ popupNotify
17 Component(s)
196 Line(s) of event code
123 Unique line(s) of event code
popupShutter
19 Component(s)
191 Line(s) of event code
107 Unique line(s) of event code
popupLight
27 Component(s)
338 Line(s) of event code
182 Unique line(s) of event code
popupShutter
20 Component(s)
192 Line(s) of event code
108 Unique line(s) of event code
cardAlarm
35 Component(s)
345 Line(s) of event code
@@ -53,6 +53,6 @@ cardThermo
Total
12 Page(s)
343 Component(s)
3697 Line(s) of event code
1020 Unique line(s) of event code
344 Component(s)
3698 Line(s) of event code
1021 Unique line(s) of event code

View File

@@ -68,7 +68,7 @@ Text tEntity
Send Component ID : disabled
Opacity : 127
x coordinate : 65
y coordinate : 108
y coordinate : 94
Width : 195
Height : 30
Effect : load
@@ -98,7 +98,7 @@ Text tIcon1
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 109
y coordinate : 108
Width : 45
Height : 30
Effect : load
@@ -269,6 +269,36 @@ Text t1
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInfo1
Attributes
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 65
y coordinate : 122
Width : 195
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 38066
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
@@ -596,6 +626,8 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
}
if(tInstruction.txt=="dimmode")
{