h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-03-02 18:06:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1008
HMI/US/landscape/diff-eu-version.txt
View File

File diff suppressed because it is too large Load Diff

1
HMI/US/landscape/n2t-out-visual/Program.s.txt
View File

@@ -16,4 +16,5 @@ Program.s
int defaultBcoColor=6371
// fix touch offset
//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

58
HMI/US/landscape/n2t-out-visual/cardQR.txt
View File

@@ -3,7 +3,6 @@ Page cardQR
ID : 0
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
Width : 480
@@ -14,7 +13,7 @@ Page cardQR
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Swide right page ID: disabled
Fill : solid color
Back. Color : 6371
@@ -156,7 +155,6 @@ Text tEntity1
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 286
@@ -172,7 +170,7 @@ Text tEntity1
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : left
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : tEntity1
@@ -186,7 +184,6 @@ Text tEntity2
ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 287
@@ -202,7 +199,7 @@ Text tEntity2
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : left
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : tEntity1
@@ -216,7 +213,6 @@ Text tHeading
ID : 24
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 81
@@ -232,7 +228,7 @@ Text tHeading
Font ID : 2
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
@@ -246,7 +242,6 @@ Text tIcon1
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 234
@@ -262,7 +257,7 @@ Text tIcon1
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment : center
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
@@ -276,7 +271,6 @@ Text tIcon2
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 235
@@ -292,7 +286,7 @@ Text tIcon2
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment : center
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
@@ -306,8 +300,7 @@ Picture p0
ID : 1
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
@@ -323,7 +316,6 @@ Button bNext
ID : 3
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 406
@@ -337,7 +329,7 @@ Button bNext
Style : flat
Font ID : 3
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
@@ -370,7 +362,6 @@ Button bPrev
ID : 4
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 24
@@ -384,7 +375,7 @@ Button bPrev
Style : flat
Font ID : 3
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
@@ -417,7 +408,6 @@ Button bText1
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 235
@@ -431,7 +421,7 @@ Button bText1
Style : flat
Font ID : 0
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
@@ -464,7 +454,6 @@ Button bText2
ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 237
@@ -478,7 +467,7 @@ Button bText2
Style : flat
Font ID : 0
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
@@ -511,7 +500,6 @@ Dual-state Button btOnOff1
ID : 2
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 399
@@ -523,7 +511,7 @@ Dual-state Button btOnOff1
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed) : 1
Background Picture ID (Unpressed): 1
Back. Picture ID (Pressed) : 2
Horizontal Alignment : center
Vertical Alignment : center
@@ -556,7 +544,6 @@ Dual-state Button btOnOff2
ID : 20
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 400
@@ -568,7 +555,7 @@ Dual-state Button btOnOff2
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed) : 1
Background Picture ID (Unpressed): 1
Back. Picture ID (Pressed) : 2
Horizontal Alignment : center
Vertical Alignment : center
@@ -601,8 +588,7 @@ Hotspot m0
ID : 29
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Opacity : 127
x coordinate : 28
y coordinate : 91
@@ -617,8 +603,7 @@ Hotspot m1
ID : 30
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Opacity : 127
x coordinate : 143
y coordinate : 91
@@ -633,8 +618,7 @@ Hotspot mSwipeNext
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Opacity : 127
x coordinate : 471
y coordinate : 5
@@ -653,8 +637,7 @@ Hotspot mSwipePrev
ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
@@ -673,8 +656,7 @@ Hotspot mSwipeUp
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Opacity : 127
x coordinate : 12
y coordinate : 0
@@ -907,11 +889,11 @@ Timer tmSerial
{
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
{
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")

24
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

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

523
HMI/US/landscape/n2t-out-visual/popupLight.txt
View File

@@ -3,7 +3,6 @@ Page popupLight
ID : 0
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
Width : 480
@@ -14,7 +13,7 @@ Page popupLight
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Swide right page ID: disabled
Fill : solid color
Back. Color : 6371
@@ -25,13 +24,12 @@ Page popupLight
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
@@ -48,16 +46,16 @@ Page popupLight
prints tSend.txt,0
prints crcval,2
//disable brightness by default
vis t1,0
vis t2,0
vis hBrightness,0
//vis t1,0
//vis t2,0
vis hBrightness,1
//disable color temp by default
vis t4,0
vis t3,0
//vis t4,0
//vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
vis t0,0
//vis t0,0
vis pColorWheel,0
//vis t0,0
popupLight.bco=defaultBcoColor
@@ -76,206 +74,81 @@ Page popupLight
}
if(defaultBcoColor==0)
{
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=16
hTempSlider.pic1=17
hTempSlider.pic2=15
hTempSlider.pic1=16
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
ID : 18
Scope: local
Value: 65504
Variable (string) entn
Attributes
ID : 20
ID : 11
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
ID : 22
ID : 13
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
ID : 23
ID : 14
Scope: local
Value: 0
Variable (string) strCommand
Attributes
ID : 16
ID : 9
Scope : local
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
ID : 19
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
ID : 26
ID : 16
Scope : local
Text :
Max. Text Size: 200
Text t0
Variable (string) tTmp
Attributes
ID : 24
ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 24
y coordinate : 80
Width : 64
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 : 65535
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text : Color
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1
Attributes
ID : 6
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 25
y coordinate : 226
Width : 211
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 : 65535
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text : Brightness
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t2
Attributes
ID : 9
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 25
y coordinate : 267
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 40147
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t3
Attributes
ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 25
y coordinate : 181
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 40147
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t4
Attributes
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 24
y coordinate : 143
Width : 242
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 : 65535
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text : Temperature
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text :
Max. Text Size: 80
Text tEntity
Attributes
ID : 3
ID : 2
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 107
x coordinate : 108
y coordinate : 21
Width : 263
Height : 30
@@ -285,10 +158,10 @@ Text tEntity
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Font ID : 1
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : left
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : tEntity1
@@ -297,153 +170,15 @@ Text tEntity
Horizontal Spacing : 0
Vertical Spacing : 0
Text tIcon1
Attributes
ID : 4
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 26
y coordinate : 21
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tId
Attributes
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 115
y coordinate : 290
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInstruction
Attributes
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 15
y coordinate : 290
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tTmp
Attributes
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 421
y coordinate : 277
Width : 34
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 80
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Picture pColorWheel
Attributes
ID : 1
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
Width : 480
Height : 320
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 0
Picture pColorWheel
Attributes
ID : 2
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 182
y coordinate : 69
x coordinate : 249
y coordinate : 105
Width : 160
Height : 160
Effect : load
@@ -481,31 +216,44 @@ Picture pColorWheel
Slider hBrightness
Attributes
ID : 7
ID : 4
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 76
y coordinate : 261
Width : 335
Height : 43
x coordinate : 105
y coordinate : 64
Width : 100
Height : 250
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : horizontal
Direction : vertical
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 5
Slided Back. Picture ID : 4
Cursor height : 1
Back. Picture ID : 65535
Slided Back. Picture ID: 65535
Position : 50
Upper range limit : 100
Lower range limit : 0
Events
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.tim=2500
//craft command
@@ -526,25 +274,24 @@ Slider hBrightness
Slider hTempSlider
Attributes
ID : 19
ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 76
y coordinate : 178
Width : 335
Height : 44
x coordinate : 279
y coordinate : 64
Width : 100
Height : 250
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : horizontal
Direction : vertical
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 7
Slided Back. Picture ID : 8
Slided Back. Picture ID: 7
Position : 50
Upper range limit : 100
Lower range limit : 0
@@ -571,13 +318,12 @@ Slider hTempSlider
Button b0
Attributes
ID : 5
ID : 3
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 412
x coordinate : 413
y coordinate : 8
Width : 50
Height : 50
@@ -588,7 +334,7 @@ Button b0
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
@@ -618,14 +364,13 @@ Button b0
Button bColor
Attributes
ID : 21
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 108
y coordinate : 68
x coordinate : 30
y coordinate : 146
Width : 50
Height : 50
Effect : load
@@ -635,7 +380,7 @@ Button bColor
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
@@ -656,8 +401,8 @@ Button bColor
//enable color wheel
vis pColorWheel,1
//disable color temp
vis t4,0
vis t3,0
//vis t4,0
//vis t3,0
vis hTempSlider,0
}else
{
@@ -667,22 +412,21 @@ Button bColor
if(mode_temp.val==1)
{
//enable color temp
vis t4,1
vis t3,1
//vis t4,1
//vis t3,1
vis hTempSlider,1
}
}
Button bEffect
Attributes
ID : 27
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 411
y coordinate : 95
x coordinate : 30
y coordinate : 213
Width : 50
Height : 50
Effect : load
@@ -692,7 +436,7 @@ Button bEffect
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
@@ -709,19 +453,17 @@ Button bEffect
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
ID : 8
ID : 5
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 356
y coordinate : 95
x coordinate : 30
y coordinate : 77
Width : 50
Height : 50
Effect : load
@@ -729,7 +471,7 @@ Dual-state Button btOnOff1
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed) : 1
Background Picture ID (Unpressed): 1
Back. Picture ID (Pressed) : 2
Horizontal Alignment : center
Vertical Alignment : center
@@ -760,7 +502,7 @@ Dual-state Button btOnOff1
Timer tmCooldown
Attributes
ID : 25
ID : 15
Scope : local
Period (ms): 100
Enabled : no
@@ -769,9 +511,34 @@ Timer tmCooldown
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
ID : 22
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
Attributes
ID : 15
ID : 8
Scope : local
Period (ms): 50
Enabled : yes
@@ -826,11 +593,12 @@ Timer tmSerial
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
//vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0
col.val=sys0
//tEntity.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
@@ -839,27 +607,26 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
vis t1,0
vis t2,0
//vis t1,0
//vis t2,0
vis hBrightness,0
}else
{
vis t1,1
vis t2,1
//vis t1,1
//vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
if(tmCooldown.en==0)
{
hBrightness.val=sys0
}
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
vis t3,0
vis t4,0
//vis t3,0
//vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
@@ -882,8 +649,8 @@ Timer tmSerial
{
mode_temp.val=1
vis hTempSlider,1
vis t3,1
vis t4,1
//vis t3,1
//vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
@@ -902,12 +669,12 @@ Timer tmSerial
// disable -> isn't supported
if(tTmp.txt=="disable")
{
vis t0,0
//vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
vis t0,1
//vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
@@ -919,11 +686,11 @@ Timer tmSerial
}
}
// set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",8
//spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",9
//spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",10
//spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
@@ -1054,7 +821,7 @@ Timer tmSerial
Timer tmSleep
Attributes
ID : 14
ID : 7
Scope : local
Period (ms): 1000
Enabled : yes
@@ -1074,7 +841,7 @@ Timer tmSleep
TouchCap tc0
Attributes
ID : 13
ID : 6
Scope: local
Value: 0

1
HMI/US/landscape/n2t-out/Program.s.txt
View File

@@ -16,4 +16,5 @@ Program.s
int defaultBcoColor=6371
// fix touch offset
//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

58
HMI/US/landscape/n2t-out/cardQR.txt
View File

@@ -2,13 +2,12 @@ Page cardQR
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Swide right page ID: disabled
Events
Preinitialize Event
@@ -134,9 +133,8 @@ Text tEntity1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Associated Keyboard: none
Text : tEntity1
Max. Text Size : 30
@@ -144,9 +142,8 @@ Text tEntity2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Associated Keyboard: none
Text : tEntity1
Max. Text Size : 30
@@ -154,9 +151,8 @@ Text tHeading
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Associated Keyboard: none
Text :
Max. Text Size : 40
@@ -164,9 +160,8 @@ Text tIcon1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Associated Keyboard: none
Text : 
Max. Text Size : 5
@@ -174,9 +169,8 @@ Text tIcon2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Associated Keyboard: none
Text : 
Max. Text Size : 5
@@ -184,15 +178,13 @@ Picture p0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Button bNext
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
@@ -216,8 +208,7 @@ Button bPrev
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
@@ -241,8 +232,7 @@ Button bText1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
State : unpressed
Text :
Max. Text Size : 30
@@ -266,8 +256,7 @@ Button bText2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
State : unpressed
Text :
Max. Text Size : 30
@@ -291,8 +280,7 @@ Dual-state Button btOnOff1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
State : unpressed
Text :
Max. Text Size : 10
@@ -318,8 +306,7 @@ Dual-state Button btOnOff2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
State : unpressed
Text :
Max. Text Size : 10
@@ -345,22 +332,19 @@ Hotspot m0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Hotspot m1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Hotspot mSwipeNext
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Events
Touch Press Event
@@ -370,8 +354,7 @@ Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Events
Touch Press Event
@@ -381,8 +364,7 @@ Hotspot mSwipeUp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Events
Touch Press Event
@@ -606,11 +588,11 @@ Timer tmSerial
{
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
{
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")

256
HMI/US/landscape/n2t-out/popupLight.txt
View File

@@ -2,13 +2,12 @@ Page popupLight
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Swide right page ID: disabled
Events
Preinitialize Event
@@ -17,13 +16,12 @@ Page popupLight
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
@@ -40,16 +38,16 @@ Page popupLight
prints tSend.txt,0
prints crcval,2
//disable brightness by default
vis t1,0
vis t2,0
vis hBrightness,0
//vis t1,0
//vis t2,0
vis hBrightness,1
//disable color temp by default
vis t4,0
vis t3,0
//vis t4,0
//vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
vis t0,0
//vis t0,0
vis pColorWheel,0
//vis t0,0
popupLight.bco=defaultBcoColor
@@ -68,14 +66,18 @@ Page popupLight
}
if(defaultBcoColor==0)
{
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=16
hTempSlider.pic1=17
hTempSlider.pic2=15
hTempSlider.pic1=16
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
Scope: local
Value: 65504
Variable (string) entn
Attributes
Scope : local
@@ -98,125 +100,44 @@ Variable (string) strCommand
Text :
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
Attributes
Scope : local
Text :
Max. Text Size: 200
Text t0
Variable (string) tTmp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
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 :
Max. Text Size: 80
Text tEntity
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Associated Keyboard: none
Text : tEntity1
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
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Events
Touch Press Event
@@ -250,14 +171,27 @@ Slider hBrightness
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Position : 50
Upper range limit : 100
Lower range limit : 0
Upper range limit: 100
Lower range limit: 0
Events
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.tim=2500
//craft command
@@ -280,11 +214,10 @@ Slider hTempSlider
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
Position : 50
Upper range limit : 100
Lower range limit : 0
Upper range limit: 100
Lower range limit: 0
Events
Touch Release Event
@@ -310,8 +243,7 @@ Button b0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
@@ -335,8 +267,7 @@ Button bColor
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
@@ -349,8 +280,8 @@ Button bColor
//enable color wheel
vis pColorWheel,1
//disable color temp
vis t4,0
vis t3,0
//vis t4,0
//vis t3,0
vis hTempSlider,0
}else
{
@@ -360,8 +291,8 @@ Button bColor
if(mode_temp.val==1)
{
//enable color temp
vis t4,1
vis t3,1
//vis t4,1
//vis t3,1
vis hTempSlider,1
}
}
@@ -370,8 +301,7 @@ Button bEffect
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
@@ -380,15 +310,13 @@ Button bEffect
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Send Component ID: disabled
State : unpressed
Text :
Max. Text Size : 10
@@ -421,6 +349,30 @@ Timer tmCooldown
Timer Event
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
Attributes
Scope : local
@@ -477,11 +429,12 @@ Timer tmSerial
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
//vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0
col.val=sys0
//tEntity.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
@@ -490,27 +443,26 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
vis t1,0
vis t2,0
//vis t1,0
//vis t2,0
vis hBrightness,0
}else
{
vis t1,1
vis t2,1
//vis t1,1
//vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
if(tmCooldown.en==0)
{
hBrightness.val=sys0
}
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
vis t3,0
vis t4,0
//vis t3,0
//vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
@@ -533,8 +485,8 @@ Timer tmSerial
{
mode_temp.val=1
vis hTempSlider,1
vis t3,1
vis t4,1
//vis t3,1
//vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
@@ -553,12 +505,12 @@ Timer tmSerial
// disable -> isn't supported
if(tTmp.txt=="disable")
{
vis t0,0
//vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
vis t0,1
//vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
@@ -570,11 +522,11 @@ Timer tmSerial
}
}
// set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",8
//spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",9
//spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",10
//spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")

2
HMI/US/portrait/diff-filtered.txt
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
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,10 @@