mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-22 14:08:37 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
3fbdf55718
commit
9c7dabee6b
@@ -11,6 +11,9 @@ Program.s
|
||||
// dim value
|
||||
int dimValue=40
|
||||
int dimValueNormal=100
|
||||
//color vars
|
||||
int defaultFontColor=65535
|
||||
int defaultBcoColor=6371
|
||||
// fix touch offset (Removed for US version)
|
||||
//lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
|
||||
@@ -740,6 +740,18 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -2078,169 +2078,6 @@ Timer tmSerial
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider4.maxval=sys0
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type5.txt,"~",27
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn5.txt,"~",28
|
||||
if(type5.txt=="delete"||type5.txt=="")
|
||||
{
|
||||
vis bUp5,0
|
||||
vis bStop5,0
|
||||
vis bDown5,0
|
||||
vis btOnOff5,0
|
||||
vis tEntity5,0
|
||||
vis tIcon5,0
|
||||
vis bText5,0
|
||||
vis hSlider5,0
|
||||
vis nNum5,0
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,tIcon5.txt,"~",29
|
||||
vis tIcon5,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",30
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon5.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity5.txt,"~",31
|
||||
vis tEntity5,1
|
||||
}
|
||||
if(type5.txt=="shutter")
|
||||
{
|
||||
vis bUp5,1
|
||||
vis bStop5,1
|
||||
vis bDown5,1
|
||||
vis btOnOff5,0
|
||||
vis bText5,0
|
||||
vis hSlider5,0
|
||||
vis nNum5,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tId.txt,"~",32
|
||||
// up button
|
||||
spstr tId.txt,tTmp.txt,"|",3
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bUp5.pco=27501
|
||||
spstr tId.txt,bUp5.txt,"|",0
|
||||
tsw bUp5,0
|
||||
}else if(tTmp.txt=="enable")
|
||||
{
|
||||
bUp5.pco=65535
|
||||
spstr tId.txt,bUp5.txt,"|",0
|
||||
tsw bUp5,1
|
||||
}
|
||||
// stop button
|
||||
spstr tId.txt,tTmp.txt,"|",4
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bStop5.pco=27501
|
||||
spstr tId.txt,bStop5.txt,"|",1
|
||||
tsw bStop5,0
|
||||
}else if(tTmp.txt=="enable")
|
||||
{
|
||||
bStop5.pco=65535
|
||||
spstr tId.txt,bStop5.txt,"|",1
|
||||
tsw bStop5,1
|
||||
}
|
||||
// down button
|
||||
spstr tId.txt,tTmp.txt,"|",5
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
bDown5.pco=27501
|
||||
spstr tId.txt,bDown5.txt,"|",2
|
||||
tsw bDown5,0
|
||||
}else if(tTmp.txt=="enable")
|
||||
{
|
||||
bDown5.pco=65535
|
||||
spstr tId.txt,bDown5.txt,"|",2
|
||||
tsw bDown5,1
|
||||
}
|
||||
}
|
||||
if(type5.txt=="light")
|
||||
{
|
||||
vis bUp5,0
|
||||
vis bStop5,0
|
||||
vis bDown5,0
|
||||
vis btOnOff5,1
|
||||
vis bText5,0
|
||||
vis hSlider5,0
|
||||
vis nNum5,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,"~",32
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff5.val=sys0
|
||||
}
|
||||
if(type5.txt=="switch")
|
||||
{
|
||||
vis bUp5,0
|
||||
vis bStop5,0
|
||||
vis bDown5,0
|
||||
vis btOnOff5,1
|
||||
vis bText5,0
|
||||
vis hSlider5,0
|
||||
vis nNum5,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,"~",32
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff5.val=sys0
|
||||
}
|
||||
if(type5.txt=="text")
|
||||
{
|
||||
vis bUp5,0
|
||||
vis bStop5,0
|
||||
vis bDown5,0
|
||||
vis btOnOff5,0
|
||||
vis bText5,1
|
||||
tsw bText5,0
|
||||
vis hSlider5,0
|
||||
vis nNum5,0
|
||||
bText5.pco=65535
|
||||
bText5.pco2=65535
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText5.txt,"~",32
|
||||
}
|
||||
if(type5.txt=="button")
|
||||
{
|
||||
vis bUp5,0
|
||||
vis bStop5,0
|
||||
vis bDown5,0
|
||||
vis btOnOff5,0
|
||||
vis bText5,1
|
||||
tsw bText5,1
|
||||
vis hSlider5,0
|
||||
vis nNum5,0
|
||||
bText5.pco=1374
|
||||
bText5.pco2=1374
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText5.txt,"~",32
|
||||
}
|
||||
if(type5.txt=="number")
|
||||
{
|
||||
vis bUp5,0
|
||||
vis bStop5,0
|
||||
vis bDown5,0
|
||||
vis btOnOff5,0
|
||||
vis bText5,0
|
||||
tsw bText5,0
|
||||
vis hSlider5,1
|
||||
vis nNum5,1
|
||||
// get config (optional Value) (use bText as variable)
|
||||
spstr strCommand.txt,bText5.txt,"~",32
|
||||
//first value is current value
|
||||
spstr bText5.txt,tTmp.txt,"|",0
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider5.val=sys0
|
||||
nNum5.val=sys0
|
||||
//second value is min value
|
||||
spstr bText5.txt,tTmp.txt,"|",1
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider5.minval=sys0
|
||||
//third value is max value
|
||||
spstr bText5.txt,tTmp.txt,"|",2
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider5.maxval=sys0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
@@ -2320,6 +2157,18 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -12,6 +12,11 @@ Page cardGrid
|
||||
|
||||
Events
|
||||
Preinitialize Event
|
||||
for(sys0=0;sys0<40;sys0++)
|
||||
{
|
||||
b[sys0].bco=defaultBcoColor
|
||||
b[sys0].pco=defaultFontColor
|
||||
}
|
||||
dim=dimValueNormal
|
||||
//remove background & activate reparse mode
|
||||
vis p0,0
|
||||
@@ -850,6 +855,18 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -666,6 +666,18 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -609,6 +609,18 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -1156,6 +1156,18 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -277,6 +277,18 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -566,6 +566,18 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -315,6 +315,18 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -12,6 +12,40 @@ Page popupShutter
|
||||
|
||||
Events
|
||||
Preinitialize Event
|
||||
popupShutter.bco=defaultBcoColor
|
||||
b0.bco=defaultBcoColor
|
||||
tIcon1.bco=defaultBcoColor
|
||||
tEntity.bco=defaultBcoColor
|
||||
tInfo1.bco=defaultBcoColor
|
||||
tPosHeading.bco=defaultBcoColor
|
||||
tTiltHeading.bco=defaultBcoColor
|
||||
bUp1.bco=defaultBcoColor
|
||||
bStop1.bco=defaultBcoColor
|
||||
bDown1.bco=defaultBcoColor
|
||||
bTLeft.bco=defaultBcoColor
|
||||
bTStop.bco=defaultBcoColor
|
||||
bTRight.bco=defaultBcoColor
|
||||
b0.pco=defaultFontColor
|
||||
tIcon1.pco=defaultFontColor
|
||||
tEntity.pco=defaultFontColor
|
||||
tInfo1.pco=defaultFontColor
|
||||
tPosHeading.pco=defaultFontColor
|
||||
tTiltHeading.pco=defaultFontColor
|
||||
bUp1.pco=defaultFontColor
|
||||
bStop1.pco=defaultFontColor
|
||||
bDown1.pco=defaultFontColor
|
||||
bTLeft.pco=defaultFontColor
|
||||
bTStop.pco=defaultFontColor
|
||||
bTRight.pco=defaultFontColor
|
||||
if(defaultBcoColor==0)
|
||||
{
|
||||
hTilt.pic=14
|
||||
hTilt.pic1=13
|
||||
hTilt.pic2=15
|
||||
hPosition.pic=14
|
||||
hPosition.pic1=13
|
||||
hPosition.pic2=15
|
||||
}
|
||||
dim=dimValueNormal
|
||||
//get entitiy name
|
||||
tEntity.txt=pageIcons.tTmp1.txt
|
||||
@@ -515,11 +549,13 @@ Timer tmSerial
|
||||
tsw bTLeft,0
|
||||
spstr strCommand.txt,bTLeft.txt,"~",13
|
||||
bTLeft.pco=27501
|
||||
vis bTLeft,1
|
||||
}else if(tTmp.txt=="enable")
|
||||
{
|
||||
spstr strCommand.txt,bTLeft.txt,"~",13
|
||||
tsw bTLeft,1
|
||||
bTLeft.pco=65535
|
||||
vis bTLeft,1
|
||||
}
|
||||
// set icon bStop
|
||||
spstr strCommand.txt,tTmp.txt,"~",17
|
||||
@@ -528,24 +564,36 @@ Timer tmSerial
|
||||
tsw bTStop,0
|
||||
spstr strCommand.txt,bTStop.txt,"~",14
|
||||
bTStop.pco=27501
|
||||
vis bTStop,1
|
||||
}else if(tTmp.txt=="enable")
|
||||
{
|
||||
spstr strCommand.txt,bTStop.txt,"~",14
|
||||
tsw bTStop,1
|
||||
bTStop.pco=65535
|
||||
vis bTStop,1
|
||||
}
|
||||
// set icon bDown
|
||||
spstr strCommand.txt,tTmp.txt,"~",10
|
||||
spstr strCommand.txt,tTmp.txt,"~",18
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
spstr strCommand.txt,bTRight.txt,"~",15
|
||||
tsw bTRight,0
|
||||
bTRight.pco=27501
|
||||
vis bTRight,1
|
||||
}else if(tTmp.txt=="enable")
|
||||
{
|
||||
spstr strCommand.txt,bTRight.txt,"~",15
|
||||
tsw bTRight,1
|
||||
bTRight.pco=65535
|
||||
vis bTRight,1
|
||||
}
|
||||
// set tilt slider
|
||||
spstr strCommand.txt,tTmp.txt,"~",19
|
||||
if(tTmp.txt!="disable")
|
||||
{
|
||||
vis hTilt,1
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hTilt.val=sys0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
@@ -557,6 +605,18 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -406,10 +406,22 @@ Timer tmSerial
|
||||
// get value
|
||||
spstr strCommand.txt,tTmp.txt,"~",1
|
||||
covx tTmp.txt,dimValue,0,0
|
||||
dim=dimValue
|
||||
// get value normal
|
||||
spstr strCommand.txt,tTmp.txt,"~",2
|
||||
covx tTmp.txt,dimValueNormal,0,0
|
||||
dim=dimValueNormal
|
||||
// get background color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultBcoColor,0,0
|
||||
}
|
||||
// get font color
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
covx tTmp.txt,defaultFontColor,0,0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user