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

@@ -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")
{