sync us-p (add nextion2text)

This commit is contained in:
joBr99
2023-05-13 09:27:33 +00:00
committed by github-actions[bot]
parent 54db718a0b
commit d19a1bcb9f
11 changed files with 2404 additions and 3774 deletions

View File

@@ -24,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
@@ -47,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
@@ -75,202 +74,83 @@ 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
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 57
Width : 141
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 : 60
y coordinate : 374
Width : 251
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 : 374
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 : 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 t4
Attributes
ID : 11
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 60
y coordinate : 266
Width : 250
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
ID : 21
Scope : local
Text :
Max. Text Size: 80
Text tEntity
Attributes
ID : 3
ID : 2
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 60
x coordinate : 19
y coordinate : 21
Width : 200
Width : 224
Height : 30
Effect : load
Effect Priority : 0
@@ -278,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
@@ -290,149 +170,17 @@ Text tEntity
Horizontal Spacing : 0
Vertical Spacing : 0
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 : 450
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 : 450
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 : 282
y coordinate : 446
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
Send Component ID: disabled
Opacity : 127
x coordinate : 0
y coordinate : 1
Width : 319
Height : 479
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 : 67
y coordinate : 89
Width : 245
Height : 245
x coordinate : 150
y coordinate : 168
Width : 160
Height : 160
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -468,30 +216,44 @@ Picture pColorWheel
Slider hBrightness
Attributes
ID : 7
ID : 4
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 409
Width : 300
Height : 44
x coordinate : 25
y coordinate : 127
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
@@ -512,24 +274,24 @@ Slider hBrightness
Slider hTempSlider
Attributes
ID : 19
ID : 10
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 304
x coordinate : 187
y coordinate : 127
Width : 100
Height : 25
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
@@ -556,13 +318,13 @@ Slider hTempSlider
Button b0
Attributes
ID : 5
ID : 3
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 266
y coordinate : 14
x coordinate : 256
y coordinate : 12
Width : 50
Height : 50
Effect : load
@@ -602,13 +364,13 @@ Button b0
Button bColor
Attributes
ID : 21
ID : 12
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 89
x coordinate : 134
y coordinate : 407
Width : 50
Height : 50
Effect : load
@@ -639,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
{
@@ -650,21 +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
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 195
x coordinate : 60
y coordinate : 407
Width : 50
Height : 50
Effect : load
@@ -691,18 +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
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 142
x coordinate : 208
y coordinate : 407
Width : 50
Height : 50
Effect : load
@@ -741,7 +502,7 @@ Dual-state Button btOnOff1
Timer tmCooldown
Attributes
ID : 25
ID : 15
Scope : local
Period (ms): 100
Enabled : no
@@ -750,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
@@ -807,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
@@ -820,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
}
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)
@@ -863,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
@@ -883,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)
{
@@ -900,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")
@@ -1035,7 +821,7 @@ Timer tmSerial
Timer tmSleep
Attributes
ID : 14
ID : 7
Scope : local
Period (ms): 1000
Enabled : yes
@@ -1055,7 +841,7 @@ Timer tmSleep
TouchCap tc0
Attributes
ID : 13
ID : 6
Scope: local
Value: 0