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

@@ -16,12 +16,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
@@ -38,16 +39,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
@@ -66,18 +67,14 @@ 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
Scope: local
Value: 65504
Variable (string) entn
Attributes
Scope : local
@@ -100,29 +97,56 @@ 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
Variable (string) tTmp
Text t0
Attributes
Scope : local
Text :
Max. Text Size: 80
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Color
Max. Text Size : 50
Text t1
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Brightness
Max. Text Size : 50
Text t2
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text t3
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text t4
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Temperature
Max. Text Size : 50
Text tEntity
Attributes
@@ -133,6 +157,48 @@ Text tEntity
Text : tEntity1
Max. Text Size : 25
Text tIcon1
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text tId
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 20
Text tInstruction
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 20
Text tTmp
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 80
Picture p0
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Picture pColorWheel
Attributes
Scope : local
@@ -178,20 +244,6 @@ Slider hBrightness
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,8 +332,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
{
@@ -291,8 +343,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
}
}
@@ -310,6 +362,7 @@ 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
@@ -349,30 +402,6 @@ 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
@@ -429,12 +458,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
@@ -443,26 +471,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)
@@ -485,8 +514,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
@@ -505,12 +534,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)
{
@@ -522,11 +551,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")
@@ -604,10 +633,6 @@ Timer tmSerial
{
page cardGrid
}
if(tId.txt=="cardGrid2")
{
page cardGrid2
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt