mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-03-04 22:06:53 +01:00
moved heading to entityUpd #86 (add nextion2text)
This commit is contained in:
joBr99
GitHub Actions
@@ -1872,38 +1872,14 @@ Timer tmSerial
|
||||
ucopy strCommand.txt,4,payloadLength-5,0
|
||||
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
||||
spstr strCommand.txt,tInstruction.txt,",",0
|
||||
if(tInstruction.txt=="entityUpdHeading")
|
||||
{
|
||||
spstr strCommand.txt,tHeading.txt,",",1
|
||||
spstr strCommand.txt,tTmp.txt,",",2
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
vis bPrev,0
|
||||
}else
|
||||
{
|
||||
vis bPrev,1
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
bPrev.txt="î¶"
|
||||
bPrev.isbr=1
|
||||
}
|
||||
}
|
||||
spstr strCommand.txt,tTmp.txt,",",3
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
vis bNext,0
|
||||
}else
|
||||
{
|
||||
vis bNext,1
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
// command format: entityUpd[,type,internalName,iconId,displayName,optionalValue]x4
|
||||
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
|
||||
spstr strCommand.txt,tHeading.txt,",",1
|
||||
// get Type
|
||||
spstr strCommand.txt,type1.txt,",",1
|
||||
spstr strCommand.txt,type1.txt,",",3
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn1.txt,",",2
|
||||
spstr strCommand.txt,entn1.txt,",",4
|
||||
if(type1.txt=="delete"||type1.txt=="")
|
||||
{
|
||||
vis bUp1,0
|
||||
@@ -1917,16 +1893,16 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,tTmp.txt,",",3
|
||||
spstr strCommand.txt,tTmp.txt,",",5
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
|
||||
vis tIcon1,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",4
|
||||
spstr strCommand.txt,tTmp.txt,",",6
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon1.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity1.txt,",",5
|
||||
spstr strCommand.txt,tEntity1.txt,",",7
|
||||
vis tEntity1,1
|
||||
}
|
||||
if(type1.txt=="shutter")
|
||||
@@ -1947,7 +1923,7 @@ Timer tmSerial
|
||||
vis bText1,0
|
||||
vis hSlider1,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,",",6
|
||||
spstr strCommand.txt,tTmp.txt,",",8
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
}
|
||||
@@ -1960,7 +1936,7 @@ Timer tmSerial
|
||||
vis bText1,0
|
||||
vis hSlider1,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,",",6
|
||||
spstr strCommand.txt,tTmp.txt,",",8
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
}
|
||||
@@ -1976,7 +1952,7 @@ Timer tmSerial
|
||||
bText1.pco=65535
|
||||
bText1.pco2=65535
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText1.txt,",",6
|
||||
spstr strCommand.txt,bText1.txt,",",8
|
||||
}
|
||||
if(type1.txt=="button")
|
||||
{
|
||||
@@ -1990,7 +1966,7 @@ Timer tmSerial
|
||||
bText1.pco=1374
|
||||
bText1.pco2=1374
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText1.txt,",",6
|
||||
spstr strCommand.txt,bText1.txt,",",8
|
||||
}
|
||||
if(type1.txt=="number")
|
||||
{
|
||||
@@ -2001,13 +1977,25 @@ Timer tmSerial
|
||||
vis bText1,0
|
||||
tsw bText1,0
|
||||
vis hSlider1,1
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText1.txt,",",6
|
||||
// get config (optional Value) (use bText as variable)
|
||||
spstr strCommand.txt,bText1.txt,",",8
|
||||
//first value is current value
|
||||
spstr bText1.txt,tTmp.txt,"|",1
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider1.val=sys0
|
||||
//second value is min value
|
||||
spstr bText1.txt,tTmp.txt,"|",2
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider1.minval=sys0
|
||||
//third value is max value
|
||||
spstr bText1.txt,tTmp.txt,"|",3
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider1.maxval=sys0
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type2.txt,",",7
|
||||
spstr strCommand.txt,type2.txt,",",9
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn2.txt,",",8
|
||||
spstr strCommand.txt,entn2.txt,",",10
|
||||
if(type2.txt=="delete"||type2.txt=="")
|
||||
{
|
||||
vis bUp2,0
|
||||
@@ -2021,16 +2009,16 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,tTmp.txt,",",9
|
||||
spstr strCommand.txt,tTmp.txt,",",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
|
||||
vis tIcon2,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",10
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon2.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity2.txt,",",11
|
||||
spstr strCommand.txt,tEntity2.txt,",",13
|
||||
vis tEntity2,1
|
||||
}
|
||||
if(type2.txt=="shutter")
|
||||
@@ -2051,7 +2039,7 @@ Timer tmSerial
|
||||
vis bText2,0
|
||||
vis hSlider2,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
spstr strCommand.txt,tTmp.txt,",",14
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff2.val=sys0
|
||||
}
|
||||
@@ -2064,7 +2052,7 @@ Timer tmSerial
|
||||
vis bText2,0
|
||||
vis hSlider2,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
spstr strCommand.txt,tTmp.txt,",",14
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff2.val=sys0
|
||||
}
|
||||
@@ -2080,7 +2068,7 @@ Timer tmSerial
|
||||
bText2.pco=65535
|
||||
bText2.pco2=65535
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText2.txt,",",12
|
||||
spstr strCommand.txt,bText2.txt,",",14
|
||||
}
|
||||
if(type2.txt=="button")
|
||||
{
|
||||
@@ -2094,7 +2082,7 @@ Timer tmSerial
|
||||
bText2.pco=1374
|
||||
bText2.pco2=1374
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText2.txt,",",12
|
||||
spstr strCommand.txt,bText2.txt,",",14
|
||||
}
|
||||
if(type2.txt=="number")
|
||||
{
|
||||
@@ -2105,13 +2093,25 @@ Timer tmSerial
|
||||
vis bText2,0
|
||||
tsw bText2,0
|
||||
vis hSlider2,1
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText2.txt,",",12
|
||||
// get config (optional Value) (use bText as variable)
|
||||
spstr strCommand.txt,bText2.txt,",",14
|
||||
//first value is current value
|
||||
spstr bText2.txt,tTmp.txt,"|",1
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider2.val=sys0
|
||||
//second value is min value
|
||||
spstr bText2.txt,tTmp.txt,"|",2
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider2.minval=sys0
|
||||
//third value is max value
|
||||
spstr bText2.txt,tTmp.txt,"|",3
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider2.maxval=sys0
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type3.txt,",",13
|
||||
spstr strCommand.txt,type3.txt,",",15
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn3.txt,",",14
|
||||
spstr strCommand.txt,entn3.txt,",",16
|
||||
if(type3.txt=="delete"||type3.txt=="")
|
||||
{
|
||||
vis bUp3,0
|
||||
@@ -2125,16 +2125,16 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,tTmp.txt,",",15
|
||||
spstr strCommand.txt,tTmp.txt,",",17
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
|
||||
vis tIcon3,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",16
|
||||
spstr strCommand.txt,tTmp.txt,",",18
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon3.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity3.txt,",",17
|
||||
spstr strCommand.txt,tEntity3.txt,",",19
|
||||
vis tEntity3,1
|
||||
}
|
||||
if(type3.txt=="shutter")
|
||||
@@ -2155,7 +2155,7 @@ Timer tmSerial
|
||||
vis bText3,0
|
||||
vis hSlider3,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,",",18
|
||||
spstr strCommand.txt,tTmp.txt,",",20
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff3.val=sys0
|
||||
}
|
||||
@@ -2168,7 +2168,7 @@ Timer tmSerial
|
||||
vis bText3,0
|
||||
vis hSlider3,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,",",18
|
||||
spstr strCommand.txt,tTmp.txt,",",20
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff3.val=sys0
|
||||
}
|
||||
@@ -2184,7 +2184,7 @@ Timer tmSerial
|
||||
bText3.pco=65535
|
||||
bText3.pco2=65535
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText3.txt,",",18
|
||||
spstr strCommand.txt,bText3.txt,",",20
|
||||
}
|
||||
if(type3.txt=="button")
|
||||
{
|
||||
@@ -2198,7 +2198,7 @@ Timer tmSerial
|
||||
bText3.pco=1374
|
||||
bText3.pco2=1374
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText3.txt,",",18
|
||||
spstr strCommand.txt,bText3.txt,",",20
|
||||
}
|
||||
if(type3.txt=="number")
|
||||
{
|
||||
@@ -2209,13 +2209,25 @@ Timer tmSerial
|
||||
vis bText3,0
|
||||
tsw bText3,0
|
||||
vis hSlider3,1
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText3.txt,",",18
|
||||
// get config (optional Value) (use bText as variable)
|
||||
spstr strCommand.txt,bText3.txt,",",20
|
||||
//first value is current value
|
||||
spstr bText3.txt,tTmp.txt,"|",1
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider3.val=sys0
|
||||
//second value is min value
|
||||
spstr bText3.txt,tTmp.txt,"|",2
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider3.minval=sys0
|
||||
//third value is max value
|
||||
spstr bText3.txt,tTmp.txt,"|",3
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider3.maxval=sys0
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type4.txt,",",19
|
||||
spstr strCommand.txt,type4.txt,",",21
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn4.txt,",",20
|
||||
spstr strCommand.txt,entn4.txt,",",22
|
||||
if(type4.txt=="delete"||type4.txt=="")
|
||||
{
|
||||
vis bUp4,0
|
||||
@@ -2229,16 +2241,16 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,tTmp.txt,",",21
|
||||
spstr strCommand.txt,tTmp.txt,",",23
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
|
||||
vis tIcon4,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",22
|
||||
spstr strCommand.txt,tTmp.txt,",",24
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon4.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity4.txt,",",23
|
||||
spstr strCommand.txt,tEntity4.txt,",",25
|
||||
vis tEntity4,1
|
||||
}
|
||||
if(type4.txt=="shutter")
|
||||
@@ -2259,7 +2271,7 @@ Timer tmSerial
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,",",24
|
||||
spstr strCommand.txt,tTmp.txt,",",26
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff4.val=sys0
|
||||
}
|
||||
@@ -2272,7 +2284,7 @@ Timer tmSerial
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,",",24
|
||||
spstr strCommand.txt,tTmp.txt,",",26
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff4.val=sys0
|
||||
}
|
||||
@@ -2288,7 +2300,7 @@ Timer tmSerial
|
||||
bText4.pco=65535
|
||||
bText4.pco2=65535
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText4.txt,",",24
|
||||
spstr strCommand.txt,bText4.txt,",",26
|
||||
}
|
||||
if(type4.txt=="button")
|
||||
{
|
||||
@@ -2302,7 +2314,7 @@ Timer tmSerial
|
||||
bText4.pco=1374
|
||||
bText4.pco2=1374
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText4.txt,",",24
|
||||
spstr strCommand.txt,bText4.txt,",",26
|
||||
}
|
||||
if(type4.txt=="number")
|
||||
{
|
||||
@@ -2313,8 +2325,20 @@ Timer tmSerial
|
||||
vis bText4,0
|
||||
tsw bText4,0
|
||||
vis hSlider4,1
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText4.txt,",",24
|
||||
// get config (optional Value) (use bText as variable)
|
||||
spstr strCommand.txt,bText4.txt,",",26
|
||||
//first value is current value
|
||||
spstr bText4.txt,tTmp.txt,"|",1
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider4.val=sys0
|
||||
//second value is min value
|
||||
spstr bText4.txt,tTmp.txt,"|",2
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider4.minval=sys0
|
||||
//third value is max value
|
||||
spstr bText4.txt,tTmp.txt,"|",3
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider4.maxval=sys0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
@@ -2329,11 +2353,36 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardThermo
|
||||
@@ -2342,18 +2391,6 @@ Timer tmSerial
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
page cardAlarm
|
||||
|
||||
Reference in New Issue
Block a user