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

This commit is contained in:
joBr99
2023-04-25 21:43:12 +00:00
committed by github-actions[bot]
parent 6381e87564
commit fb3920de32
9 changed files with 951 additions and 2268 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -16,4 +16,5 @@ Program.s
int defaultBcoColor=6371 int defaultBcoColor=6371
// fix touch offset // fix touch offset
//lcd_dev fffb 0002 0000 0020 //lcd_dev fffb 0002 0000 0020
printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
page pageStartup page pageStartup

View File

@@ -1,22 +1,21 @@
Page cardQR Page cardQR
Attributes Attributes
ID : 0 ID : 0
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 Width : 480
Width : 480 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Locked : no
Locked : no Swide up page ID : disabled
Swide up page ID : disabled Swide down page ID : disabled
Swide down page ID : disabled Swide left page ID : disabled
Swide left page ID : disabled Swide right page ID: disabled
Swide right page ID : disabled Fill : solid color
Fill : solid color Back. Color : 6371
Back. Color : 6371
Events Events
Preinitialize Event Preinitialize Event
@@ -153,202 +152,195 @@ Variable (string) vaQR
Text tEntity1 Text tEntity1
Attributes Attributes
ID : 17 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 286
x coordinate : 286 y coordinate : 97
y coordinate : 97 Width : 170
Width : 170 Height : 30
Height : 30 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : solid color
Fill : solid color Style : flat
Style : flat Associated Keyboard : none
Associated Keyboard : none Font ID : 0
Font ID : 0 Back. Color : 6371
Back. Color : 6371 Font Color : 65535
Font Color : 65535 Horizontal Alignment: left
Horizontal Alignment : left Vertical Alignment : center
Vertical Alignment : center Input Type : character
Input Type : character Text : tEntity1
Text : tEntity1 Max. Text Size : 30
Max. Text Size : 30 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Text tEntity2 Text tEntity2
Attributes Attributes
ID : 21 ID : 21
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 287
x coordinate : 287 y coordinate : 204
y coordinate : 204 Width : 170
Width : 170 Height : 30
Height : 30 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : solid color
Fill : solid color Style : flat
Style : flat Associated Keyboard : none
Associated Keyboard : none Font ID : 0
Font ID : 0 Back. Color : 6371
Back. Color : 6371 Font Color : 65535
Font Color : 65535 Horizontal Alignment: left
Horizontal Alignment : left Vertical Alignment : center
Vertical Alignment : center Input Type : character
Input Type : character Text : tEntity1
Text : tEntity1 Max. Text Size : 30
Max. Text Size : 30 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Text tHeading Text tHeading
Attributes Attributes
ID : 24 ID : 24
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 81
x coordinate : 81 y coordinate : 26
y coordinate : 26 Width : 320
Width : 320 Height : 30
Height : 30 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : solid color
Fill : solid color Style : flat
Style : flat Associated Keyboard : none
Associated Keyboard : none Font ID : 2
Font ID : 2 Back. Color : 6371
Back. Color : 6371 Font Color : 65535
Font Color : 65535 Horizontal Alignment: center
Horizontal Alignment : center Vertical Alignment : center
Vertical Alignment : center Input Type : character
Input Type : character Text :
Text : Max. Text Size : 40
Max. Text Size : 40 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Text tIcon1 Text tIcon1
Attributes Attributes
ID : 18 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 234
x coordinate : 234 y coordinate : 96
y coordinate : 96 Width : 45
Width : 45 Height : 30
Height : 30 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : solid color
Fill : solid color Style : flat
Style : flat Associated Keyboard : none
Associated Keyboard : none Font ID : 1
Font ID : 1 Back. Color : 6371
Back. Color : 6371 Font Color : 17299
Font Color : 17299 Horizontal Alignment: center
Horizontal Alignment : center Vertical Alignment : center
Vertical Alignment : center Input Type : character
Input Type : character Text : 
Text :  Max. Text Size : 5
Max. Text Size : 5 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Text tIcon2 Text tIcon2
Attributes Attributes
ID : 22 ID : 22
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 235
x coordinate : 235 y coordinate : 203
y coordinate : 203 Width : 45
Width : 45 Height : 30
Height : 30 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : solid color
Fill : solid color Style : flat
Style : flat Associated Keyboard : none
Associated Keyboard : none Font ID : 1
Font ID : 1 Back. Color : 6371
Back. Color : 6371 Font Color : 17299
Font Color : 17299 Horizontal Alignment: center
Horizontal Alignment : center Vertical Alignment : center
Vertical Alignment : center Input Type : character
Input Type : character Text : 
Text :  Max. Text Size : 5
Max. Text Size : 5 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 0
x coordinate : 0 y coordinate : 0
y coordinate : 0 Width : 480
Width : 480 Height : 320
Height : 320 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Picture ID : 0
Picture ID : 0
Button bNext Button bNext
Attributes Attributes
ID : 3 ID : 3
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 406
x coordinate : 406 y coordinate : 16
y coordinate : 16 Width : 50
Width : 50 Height : 50
Height : 50 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : solid color
Fill : solid color Style : flat
Style : flat Font ID : 3
Font ID : 3 Back. Color : 6371
Back. Color : 6371 Back. Picture ID (Pressed): 65535
Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823
Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535
Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535
Font Color (Pressed) : 65535 Horizontal Alignment : center
Horizontal Alignment : center Vertical Alignment : center
Vertical Alignment : center State : unpressed
State : unpressed Text : 
Text :  Max. Text Size : 10
Max. Text Size : 10 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Events Events
Touch Press Event Touch Press Event
@@ -367,35 +359,34 @@ Button bNext
Button bPrev Button bPrev
Attributes Attributes
ID : 4 ID : 4
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 24
x coordinate : 24 y coordinate : 16
y coordinate : 16 Width : 50
Width : 50 Height : 50
Height : 50 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : solid color
Fill : solid color Style : flat
Style : flat Font ID : 3
Font ID : 3 Back. Color : 6371
Back. Color : 6371 Back. Picture ID (Pressed): 65535
Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823
Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535
Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535
Font Color (Pressed) : 65535 Horizontal Alignment : center
Horizontal Alignment : center Vertical Alignment : center
Vertical Alignment : center State : unpressed
State : unpressed Text : 
Text :  Max. Text Size : 10
Max. Text Size : 10 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Events Events
Touch Press Event Touch Press Event
@@ -414,35 +405,34 @@ Button bPrev
Button bText1 Button bText1
Attributes Attributes
ID : 19 ID : 19
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 235
x coordinate : 235 y coordinate : 146
y coordinate : 146 Width : 214
Width : 214 Height : 30
Height : 30 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : solid color
Fill : solid color Style : flat
Style : flat Font ID : 0
Font ID : 0 Back. Color : 6371
Back. Color : 6371 Back. Picture ID (Pressed): 65535
Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823
Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535
Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535
Font Color (Pressed) : 65535 Horizontal Alignment : center
Horizontal Alignment : center Vertical Alignment : center
Vertical Alignment : center State : unpressed
State : unpressed Text :
Text : Max. Text Size : 30
Max. Text Size : 30 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Events Events
Touch Press Event Touch Press Event
@@ -461,35 +451,34 @@ Button bText1
Button bText2 Button bText2
Attributes Attributes
ID : 23 ID : 23
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 237
x coordinate : 237 y coordinate : 253
y coordinate : 253 Width : 213
Width : 213 Height : 30
Height : 30 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : solid color
Fill : solid color Style : flat
Style : flat Font ID : 0
Font ID : 0 Back. Color : 6371
Back. Color : 6371 Back. Picture ID (Pressed): 65535
Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823
Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535
Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535
Font Color (Pressed) : 65535 Horizontal Alignment : center
Horizontal Alignment : center Vertical Alignment : center
Vertical Alignment : center State : unpressed
State : unpressed Text :
Text : Max. Text Size : 30
Max. Text Size : 30 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Events Events
Touch Press Event Touch Press Event
@@ -508,31 +497,30 @@ Button bText2
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
ID : 2 ID : 2
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 399
x coordinate : 399 y coordinate : 137
y coordinate : 137 Width : 50
Width : 50 Height : 50
Height : 50 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : image
Fill : image Font ID : 0
Font ID : 0 Background Picture ID (Unpressed): 1
Background Picture ID (Unpressed) : 1 Back. Picture ID (Pressed) : 2
Back. Picture ID (Pressed) : 2 Horizontal Alignment : center
Horizontal Alignment : center Vertical Alignment : center
Vertical Alignment : center State : unpressed
State : unpressed Text :
Text : Max. Text Size : 10
Max. Text Size : 10 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Events Events
Touch Press Event Touch Press Event
@@ -553,31 +541,30 @@ Dual-state Button btOnOff1
Dual-state Button btOnOff2 Dual-state Button btOnOff2
Attributes Attributes
ID : 20 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 400
x coordinate : 400 y coordinate : 244
y coordinate : 244 Width : 50
Width : 50 Height : 50
Height : 50 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300 Fill : image
Fill : image Font ID : 0
Font ID : 0 Background Picture ID (Unpressed): 1
Background Picture ID (Unpressed) : 1 Back. Picture ID (Pressed) : 2
Back. Picture ID (Pressed) : 2 Horizontal Alignment : center
Horizontal Alignment : center Vertical Alignment : center
Vertical Alignment : center State : unpressed
State : unpressed Text :
Text : Max. Text Size : 10
Max. Text Size : 10 Word wrap : disabled
Word wrap : disabled Horizontal Spacing : 0
Horizontal Spacing : 0 Vertical Spacing : 0
Vertical Spacing : 0
Events Events
Touch Press Event Touch Press Event
@@ -598,51 +585,48 @@ Dual-state Button btOnOff2
Hotspot m0 Hotspot m0
Attributes Attributes
ID : 29 ID : 29
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 28
x coordinate : 28 y coordinate : 91
y coordinate : 91 Width : 200
Width : 200 Height : 200
Height : 200 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300
Hotspot m1 Hotspot m1
Attributes Attributes
ID : 30 ID : 30
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 143
x coordinate : 143 y coordinate : 91
y coordinate : 91 Width : 200
Width : 200 Height : 200
Height : 200 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
ID : 11 ID : 11
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 471
x coordinate : 471 y coordinate : 5
y coordinate : 5 Width : 9
Width : 9 Height : 310
Height : 310 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300
Events Events
Touch Press Event Touch Press Event
@@ -650,19 +634,18 @@ Hotspot mSwipeNext
Hotspot mSwipePrev Hotspot mSwipePrev
Attributes Attributes
ID : 13 ID : 13
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 0
x coordinate : 0 y coordinate : 0
y coordinate : 0 Width : 7
Width : 7 Height : 315
Height : 315 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300
Events Events
Touch Press Event Touch Press Event
@@ -670,19 +653,18 @@ Hotspot mSwipePrev
Hotspot mSwipeUp Hotspot mSwipeUp
Attributes Attributes
ID : 12 ID : 12
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled Opacity : 127
Opacity : 127 x coordinate : 12
x coordinate : 12 y coordinate : 0
y coordinate : 0 Width : 426
Width : 426 Height : 9
Height : 9 Effect : load
Effect : load Effect Priority : 0
Effect Priority : 0 Effect Time : 300
Effect Time : 300
Events Events
Touch Press Event Touch Press Event
@@ -907,11 +889,11 @@ Timer tmSerial
{ {
if(type1.txt=="delete"||type1.txt=="") if(type1.txt=="delete"||type1.txt=="")
{ {
qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
} }
}else }else
{ {
qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
} }
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")

View File

@@ -1,7 +1,11 @@
Program.s Program.s
0 Component(s) 0 Component(s)
12 Line(s) of event code 13 Line(s) of event code
12 Unique line(s) of event code 13 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
pageIcons pageIcons
7 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
@@ -54,10 +58,6 @@ cardMedia
59 Component(s) 59 Component(s)
645 Line(s) of event code 645 Line(s) of event code
320 Unique line(s) of event code 320 Unique line(s) of event code
popupLight
28 Component(s)
408 Line(s) of event code
225 Unique line(s) of event code
popupTimer popupTimer
42 Component(s) 42 Component(s)
512 Line(s) of event code 512 Line(s) of event code
@@ -78,10 +78,10 @@ screensaver2
58 Component(s) 58 Component(s)
344 Line(s) of event code 344 Line(s) of event code
243 Unique line(s) of event code 243 Unique line(s) of event code
cardQR popupLight
34 Component(s) 23 Component(s)
406 Line(s) of event code 406 Line(s) of event code
236 Unique line(s) of event code 207 Unique line(s) of event code
cardEntities cardEntities
67 Component(s) 67 Component(s)
1166 Line(s) of event code 1166 Line(s) of event code
@@ -89,6 +89,6 @@ cardEntities
Total Total
21 Page(s) 21 Page(s)
800 Component(s) 795 Component(s)
9224 Line(s) of event code 9223 Line(s) of event code
2331 Unique line(s) of event code 2322 Unique line(s) of event code

File diff suppressed because it is too large Load Diff

View File

@@ -16,4 +16,5 @@ Program.s
int defaultBcoColor=6371 int defaultBcoColor=6371
// fix touch offset // fix touch offset
//lcd_dev fffb 0002 0000 0020 //lcd_dev fffb 0002 0000 0020
printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
page pageStartup page pageStartup

View File

@@ -1,14 +1,13 @@
Page cardQR Page cardQR
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Locked : no
Locked : no Swide up page ID : disabled
Swide up page ID : disabled Swide down page ID : disabled
Swide down page ID : disabled Swide left page ID : disabled
Swide left page ID : disabled Swide right page ID: disabled
Swide right page ID : disabled
Events Events
Preinitialize Event Preinitialize Event
@@ -132,70 +131,63 @@ Variable (string) vaQR
Text tEntity1 Text tEntity1
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Associated Keyboard: none
Associated Keyboard : none Text : tEntity1
Text : tEntity1 Max. Text Size : 30
Max. Text Size : 30
Text tEntity2 Text tEntity2
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Associated Keyboard: none
Associated Keyboard : none Text : tEntity1
Text : tEntity1 Max. Text Size : 30
Max. Text Size : 30
Text tHeading Text tHeading
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Associated Keyboard: none
Associated Keyboard : none Text :
Text : Max. Text Size : 40
Max. Text Size : 40
Text tIcon1 Text tIcon1
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Associated Keyboard: none
Associated Keyboard : none Text : 
Text :  Max. Text Size : 5
Max. Text Size : 5
Text tIcon2 Text tIcon2
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Associated Keyboard: none
Associated Keyboard : none Text : 
Text :  Max. Text Size : 5
Max. Text Size : 5
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Button bNext Button bNext
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled State : unpressed
State : unpressed Text : 
Text :  Max. Text Size : 10
Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
@@ -214,13 +206,12 @@ Button bNext
Button bPrev Button bPrev
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled State : unpressed
State : unpressed Text : 
Text :  Max. Text Size : 10
Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
@@ -239,13 +230,12 @@ Button bPrev
Button bText1 Button bText1
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled State : unpressed
State : unpressed Text :
Text : Max. Text Size : 30
Max. Text Size : 30
Events Events
Touch Press Event Touch Press Event
@@ -264,13 +254,12 @@ Button bText1
Button bText2 Button bText2
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled State : unpressed
State : unpressed Text :
Text : Max. Text Size : 30
Max. Text Size : 30
Events Events
Touch Press Event Touch Press Event
@@ -289,13 +278,12 @@ Button bText2
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled State : unpressed
State : unpressed Text :
Text : Max. Text Size : 10
Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
@@ -316,13 +304,12 @@ Dual-state Button btOnOff1
Dual-state Button btOnOff2 Dual-state Button btOnOff2
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled State : unpressed
State : unpressed Text :
Text : Max. Text Size : 10
Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
@@ -343,24 +330,21 @@ Dual-state Button btOnOff2
Hotspot m0 Hotspot m0
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Hotspot m1 Hotspot m1
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Events Events
Touch Press Event Touch Press Event
@@ -368,10 +352,9 @@ Hotspot mSwipeNext
Hotspot mSwipePrev Hotspot mSwipePrev
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Events Events
Touch Press Event Touch Press Event
@@ -379,10 +362,9 @@ Hotspot mSwipePrev
Hotspot mSwipeUp Hotspot mSwipeUp
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Events Events
Touch Press Event Touch Press Event
@@ -606,11 +588,11 @@ Timer tmSerial
{ {
if(type1.txt=="delete"||type1.txt=="") if(type1.txt=="delete"||type1.txt=="")
{ {
qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
} }
}else }else
{ {
qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
} }
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")

View File

@@ -1,14 +1,13 @@
Page popupLight Page popupLight
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Locked : no
Locked : no Swide up page ID : disabled
Swide up page ID : disabled Swide down page ID : disabled
Swide down page ID : disabled Swide left page ID : disabled
Swide left page ID : disabled Swide right page ID: disabled
Swide right page ID : disabled
Events Events
Preinitialize Event Preinitialize Event
@@ -17,13 +16,12 @@ Page popupLight
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
entn.txt=pageIcons.tTmp2.txt entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0
vis tInstruction,0 vis tInstruction,0
vis tId,0 vis tId,0
vis bEffect,0 vis bEffect,0
vis hBrightness,0
//page open event //page open event
// event,pageOpenDetail,typeOfPage,tEntityName // event,pageOpenDetail,typeOfPage,tEntityName
// craft command // craft command
@@ -40,16 +38,16 @@ Page popupLight
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
//disable brightness by default //disable brightness by default
vis t1,0 //vis t1,0
vis t2,0 //vis t2,0
vis hBrightness,0 vis hBrightness,1
//disable color temp by default //disable color temp by default
vis t4,0 //vis t4,0
vis t3,0 //vis t3,0
vis hTempSlider,0 vis hTempSlider,0
//disable color wheel components by default //disable color wheel components by default
vis bColor,0 vis bColor,0
vis t0,0 //vis t0,0
vis pColorWheel,0 vis pColorWheel,0
//vis t0,0 //vis t0,0
popupLight.bco=defaultBcoColor popupLight.bco=defaultBcoColor
@@ -68,14 +66,18 @@ Page popupLight
} }
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=16 hTempSlider.pic=16
hTempSlider.pic1=17 hTempSlider.pic1=16
hTempSlider.pic2=15
} }
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
Scope: local
Value: 65504
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
@@ -98,125 +100,44 @@ Variable (string) strCommand
Text : Text :
Max. Text Size: 500 Max. Text Size: 500
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend Variable (string) tSend
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 200
Text t0 Variable (string) tTmp
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Text :
Disable release event after dragging: 0 Max. Text Size: 80
Send Component ID : disabled
Associated Keyboard : none
Text : Color
Max. Text Size : 50
Text t1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : Brightness
Max. Text Size : 50
Text t2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 10
Text t3
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 10
Text t4
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : Temperature
Max. Text Size : 50
Text tEntity Text tEntity
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID : disabled
Send Component ID : disabled Associated Keyboard: none
Associated Keyboard : none Text : tEntity1
Text : tEntity1 Max. Text Size : 25
Max. Text Size : 25
Text tIcon1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 10
Text tId
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text tInstruction
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text tTmp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 80
Picture p0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Picture pColorWheel Picture pColorWheel
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Events Events
Touch Press Event Touch Press Event
@@ -248,16 +169,29 @@ Picture pColorWheel
Slider hBrightness Slider hBrightness
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled Position : 50
Position : 50 Upper range limit: 100
Upper range limit : 100 Lower range limit: 0
Lower range limit : 0
Events Events
Touch Release Event Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1 tmCooldown.en=1
tmCooldown.tim=2500 tmCooldown.tim=2500
//craft command //craft command
@@ -278,13 +212,12 @@ Slider hBrightness
Slider hTempSlider Slider hTempSlider
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled Position : 50
Position : 50 Upper range limit: 100
Upper range limit : 100 Lower range limit: 0
Lower range limit : 0
Events Events
Touch Release Event Touch Release Event
@@ -308,13 +241,12 @@ Slider hTempSlider
Button b0 Button b0
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled State : unpressed
State : unpressed Text : 
Text :  Max. Text Size : 10
Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
@@ -333,13 +265,12 @@ Button b0
Button bColor Button bColor
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled State : unpressed
State : unpressed Text : 
Text :  Max. Text Size : 10
Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
@@ -349,8 +280,8 @@ Button bColor
//enable color wheel //enable color wheel
vis pColorWheel,1 vis pColorWheel,1
//disable color temp //disable color temp
vis t4,0 //vis t4,0
vis t3,0 //vis t3,0
vis hTempSlider,0 vis hTempSlider,0
}else }else
{ {
@@ -360,38 +291,35 @@ Button bColor
if(mode_temp.val==1) if(mode_temp.val==1)
{ {
//enable color temp //enable color temp
vis t4,1 //vis t4,1
vis t3,1 //vis t3,1
vis hTempSlider,1 vis hTempSlider,1
} }
} }
Button bEffect Button bEffect
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled State : unpressed
State : unpressed Text : 
Text :  Max. Text Size : 10
Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel page popupInSel
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled State : unpressed
State : unpressed Text :
Text : Max. Text Size : 10
Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
@@ -421,6 +349,30 @@ Timer tmCooldown
Timer Event Timer Event
tmCooldown.en=0 tmCooldown.en=0
Timer tmDrawCooldown
Attributes
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial Timer tmSerial
Attributes Attributes
Scope : local Scope : local
@@ -477,11 +429,12 @@ Timer tmSerial
{ {
// change icon // change icon
//spstr strCommand.txt,tIcon1.txt,"~",2 //spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1 //vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 col.val=sys0
//tEntity.pco=sys0
// get Button State // get Button State
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
@@ -490,27 +443,26 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t1,0 //vis t1,0
vis t2,0 //vis t2,0
vis hBrightness,0 vis hBrightness,0
}else }else
{ {
vis t1,1 //vis t1,1
vis t2,1 //vis t2,1
vis hBrightness,1 vis hBrightness,1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
if(tmCooldown.en==0) hBrightness.val=sys0
{ tmDrawCooldown.en=1
hBrightness.val=sys0 tmDrawCooldown.tim=500
}
} }
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis hTempSlider,0 vis hTempSlider,0
vis t3,0 //vis t3,0
vis t4,0 //vis t4,0
mode_temp.val=0 mode_temp.val=0
// mode == 1 is temp controls currently shown // mode == 1 is temp controls currently shown
if(mode.val==1) if(mode.val==1)
@@ -533,8 +485,8 @@ Timer tmSerial
{ {
mode_temp.val=1 mode_temp.val=1
vis hTempSlider,1 vis hTempSlider,1
vis t3,1 //vis t3,1
vis t4,1 //vis t4,1
if(tmCooldown.en==0) if(tmCooldown.en==0)
{ {
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
@@ -553,12 +505,12 @@ Timer tmSerial
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t0,0 //vis t0,0
vis bColor,0 vis bColor,0
vis pColorWheel,0 vis pColorWheel,0
}else }else
{ {
vis t0,1 //vis t0,1
//only enable bColor button if color temp is also supported //only enable bColor button if color temp is also supported
if(mode_temp.val==1) if(mode_temp.val==1)
{ {
@@ -570,11 +522,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",8 //spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",9 //spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",10 //spstr strCommand.txt,t1.txt,"~",10
// activate effect button // activate effect button
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable") if(tTmp.txt=="enable")

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-04-19 16:16:22.100652931 +0000 +++ /dev/fd/62 2023-04-25 21:43:04.277460634 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,10 @@ +1 +10,10 @@