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

This commit is contained in:
joBr99
2023-07-31 16:25:33 +00:00
committed by github-actions[bot]
parent 3ddef89431
commit 1b57cdbe62
39 changed files with 6728 additions and 902 deletions

View File

@@ -24,12 +24,13 @@ 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
@@ -46,16 +47,16 @@ Page popupLight
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
vis t1,0
vis t2,0
vis hBrightness,0
//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
@@ -74,76 +75,195 @@ Page popupLight
}
if(defaultBcoColor==0)
{
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=16
hTempSlider.pic1=16
hTempSlider.pic1=17
hTempSlider.pic2=15
}
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 : 11
ID : 20
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
ID : 13
ID : 22
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
ID : 14
ID : 23
Scope: local
Value: 0
Variable (string) strCommand
Attributes
ID : 9
ID : 16
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 : 16
ID : 26
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Text t0
Attributes
ID : 21
Scope : local
Text :
Max. Text Size: 80
ID : 24
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 9
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
Send Component ID : disabled
Opacity : 127
x coordinate : 10
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
Send Component ID : disabled
Opacity : 127
x coordinate : 10
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
Send Component ID : disabled
Opacity : 127
x coordinate : 10
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
Send Component ID : disabled
Opacity : 127
x coordinate : 9
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 tEntity
Attributes
ID : 2
ID : 3
Scope : local
Dragging : 0
Send Component ID : disabled
@@ -158,10 +278,10 @@ Text tEntity
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 2
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: center
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : tEntity1
@@ -170,15 +290,147 @@ Text tEntity
Horizontal Spacing : 0
Vertical Spacing : 0
Picture pColorWheel
Text tIcon1
Attributes
ID : 4
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 11
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
Send Component ID : disabled
Opacity : 127
x coordinate : 100
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
Send Component ID : disabled
Opacity : 127
x coordinate : 0
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
Send Component ID : disabled
Opacity : 127
x coordinate : 406
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
Attributes
ID : 1
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 233
y coordinate : 105
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
Send Component ID: disabled
Opacity : 127
x coordinate : 167
y coordinate : 69
Width : 160
Height : 160
Effect : load
@@ -216,44 +468,30 @@ Picture pColorWheel
Slider hBrightness
Attributes
ID : 4
ID : 7
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 89
y coordinate : 64
Width : 100
Height : 250
x coordinate : 61
y coordinate : 261
Width : 335
Height : 43
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Direction : horizontal
Fill : image
Cursor width : auto
Cursor height : 1
Back. Picture ID : 65535
Slided Back. Picture ID: 65535
Cursor height : 255
Back. Picture ID : 5
Slided Back. Picture ID: 4
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
@@ -274,24 +512,24 @@ Slider hBrightness
Slider hTempSlider
Attributes
ID : 10
ID : 19
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 263
y coordinate : 64
Width : 100
Height : 250
x coordinate : 61
y coordinate : 178
Width : 335
Height : 44
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Direction : horizontal
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 7
Slided Back. Picture ID: 7
Back. Picture ID : 22
Slided Back. Picture ID: 23
Position : 50
Upper range limit : 100
Lower range limit : 0
@@ -318,7 +556,7 @@ Slider hTempSlider
Button b0
Attributes
ID : 3
ID : 5
Scope : local
Dragging : 0
Send Component ID : disabled
@@ -364,13 +602,13 @@ Button b0
Button bColor
Attributes
ID : 12
ID : 21
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 146
x coordinate : 93
y coordinate : 68
Width : 50
Height : 50
Effect : load
@@ -401,8 +639,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
{
@@ -412,21 +650,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 : 17
ID : 27
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 213
x coordinate : 396
y coordinate : 95
Width : 50
Height : 50
Effect : load
@@ -453,17 +691,18 @@ 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 : 5
ID : 8
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 77
x coordinate : 341
y coordinate : 95
Width : 50
Height : 50
Effect : load
@@ -502,7 +741,7 @@ Dual-state Button btOnOff1
Timer tmCooldown
Attributes
ID : 15
ID : 25
Scope : local
Period (ms): 100
Enabled : no
@@ -511,34 +750,9 @@ 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 : 8
ID : 15
Scope : local
Period (ms): 50
Enabled : yes
@@ -593,12 +807,11 @@ 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
col.val=sys0
//tEntity.pco=sys0
tIcon1.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
@@ -607,26 +820,27 @@ 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
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
if(tmCooldown.en==0)
{
hBrightness.val=sys0
}
}
// 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)
@@ -649,8 +863,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
@@ -669,12 +883,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)
{
@@ -686,11 +900,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")
@@ -768,10 +982,6 @@ Timer tmSerial
{
page cardGrid
}
if(tId.txt=="cardGrid2")
{
page cardGrid2
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
@@ -825,7 +1035,7 @@ Timer tmSerial
Timer tmSleep
Attributes
ID : 7
ID : 14
Scope : local
Period (ms): 1000
Enabled : yes
@@ -845,7 +1055,7 @@ Timer tmSleep
TouchCap tc0
Attributes
ID : 6
ID : 13
Scope: local
Value: 0