updated us versions (add nextion2text)

This commit is contained in:
joBr99
2022-04-01 18:14:34 +00:00
committed by GitHub Actions
parent d4c5f41634
commit bd62b86005
50 changed files with 1567 additions and 5435 deletions

View File

@@ -2907,13 +2907,13 @@ Timer tmSerial
// write command to variable strCommand
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
spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpd")
{
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
spstr strCommand.txt,tHeading.txt,",",1
spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons
spstr strCommand.txt,tId.txt,",",2
spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0")
{
@@ -2940,9 +2940,9 @@ Timer tmSerial
bNext.txt=""
}
// get Type
spstr strCommand.txt,type1.txt,",",3
spstr strCommand.txt,type1.txt,"~",3
// get internal name
spstr strCommand.txt,entn1.txt,",",4
spstr strCommand.txt,entn1.txt,"~",4
if(type1.txt=="delete"||type1.txt=="")
{
vis bUp1,0
@@ -2957,16 +2957,16 @@ Timer tmSerial
}else
{
// change icon
spstr strCommand.txt,tTmp.txt,",",5
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,",",6
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0
// set name
spstr strCommand.txt,tEntity1.txt,",",7
spstr strCommand.txt,tEntity1.txt,"~",7
vis tEntity1,1
}
if(type1.txt=="shutter")
@@ -2989,7 +2989,7 @@ Timer tmSerial
vis hSlider1,0
vis nNum1,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",8
spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
}
@@ -3003,7 +3003,7 @@ Timer tmSerial
vis hSlider1,0
vis nNum1,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",8
spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
}
@@ -3020,7 +3020,7 @@ Timer tmSerial
bText1.pco=65535
bText1.pco2=65535
// get Text (optional Value)
spstr strCommand.txt,bText1.txt,",",8
spstr strCommand.txt,bText1.txt,"~",8
}
if(type1.txt=="button")
{
@@ -3035,7 +3035,7 @@ Timer tmSerial
bText1.pco=1374
bText1.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText1.txt,",",8
spstr strCommand.txt,bText1.txt,"~",8
}
if(type1.txt=="number")
{
@@ -3048,7 +3048,7 @@ Timer tmSerial
vis hSlider1,1
vis nNum1,1
// get config (optional Value) (use bText as variable)
spstr strCommand.txt,bText1.txt,",",8
spstr strCommand.txt,bText1.txt,"~",8
//first value is current value
spstr bText1.txt,tTmp.txt,"|",0
covx tTmp.txt,sys0,0,0
@@ -3064,9 +3064,9 @@ Timer tmSerial
hSlider1.maxval=sys0
}
// get Type
spstr strCommand.txt,type2.txt,",",9
spstr strCommand.txt,type2.txt,"~",9
// get internal name
spstr strCommand.txt,entn2.txt,",",10
spstr strCommand.txt,entn2.txt,"~",10
if(type2.txt=="delete"||type2.txt=="")
{
vis bUp2,0
@@ -3081,16 +3081,16 @@ Timer tmSerial
}else
{
// change icon
spstr strCommand.txt,tTmp.txt,",",11
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,",",12
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,sys0,0,0
tIcon2.pco=sys0
// set name
spstr strCommand.txt,tEntity2.txt,",",13
spstr strCommand.txt,tEntity2.txt,"~",13
vis tEntity2,1
}
if(type2.txt=="shutter")
@@ -3113,7 +3113,7 @@ Timer tmSerial
vis hSlider2,0
vis nNum2,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",14
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,sys0,0,0
btOnOff2.val=sys0
}
@@ -3127,7 +3127,7 @@ Timer tmSerial
vis hSlider2,0
vis nNum2,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",14
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,sys0,0,0
btOnOff2.val=sys0
}
@@ -3144,7 +3144,7 @@ Timer tmSerial
bText2.pco=65535
bText2.pco2=65535
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,",",14
spstr strCommand.txt,bText2.txt,"~",14
}
if(type2.txt=="button")
{
@@ -3159,7 +3159,7 @@ Timer tmSerial
bText2.pco=1374
bText2.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,",",14
spstr strCommand.txt,bText2.txt,"~",14
}
if(type2.txt=="number")
{
@@ -3172,7 +3172,7 @@ Timer tmSerial
vis hSlider2,1
vis nNum2,1
// get config (optional Value) (use bText as variable)
spstr strCommand.txt,bText2.txt,",",14
spstr strCommand.txt,bText2.txt,"~",14
//first value is current value
spstr bText2.txt,tTmp.txt,"|",0
covx tTmp.txt,sys0,0,0
@@ -3188,9 +3188,9 @@ Timer tmSerial
hSlider2.maxval=sys0
}
// get Type
spstr strCommand.txt,type3.txt,",",15
spstr strCommand.txt,type3.txt,"~",15
// get internal name
spstr strCommand.txt,entn3.txt,",",16
spstr strCommand.txt,entn3.txt,"~",16
if(type3.txt=="delete"||type3.txt=="")
{
vis bUp3,0
@@ -3205,16 +3205,16 @@ Timer tmSerial
}else
{
// change icon
spstr strCommand.txt,tTmp.txt,",",17
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,",",18
spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,sys0,0,0
tIcon3.pco=sys0
// set name
spstr strCommand.txt,tEntity3.txt,",",19
spstr strCommand.txt,tEntity3.txt,"~",19
vis tEntity3,1
}
if(type3.txt=="shutter")
@@ -3237,7 +3237,7 @@ Timer tmSerial
vis hSlider3,0
vis nNum3,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",20
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,sys0,0,0
btOnOff3.val=sys0
}
@@ -3251,7 +3251,7 @@ Timer tmSerial
vis hSlider3,0
vis nNum3,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",20
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,sys0,0,0
btOnOff3.val=sys0
}
@@ -3268,7 +3268,7 @@ Timer tmSerial
bText3.pco=65535
bText3.pco2=65535
// get Text (optional Value)
spstr strCommand.txt,bText3.txt,",",20
spstr strCommand.txt,bText3.txt,"~",20
}
if(type3.txt=="button")
{
@@ -3283,7 +3283,7 @@ Timer tmSerial
bText3.pco=1374
bText3.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText3.txt,",",20
spstr strCommand.txt,bText3.txt,"~",20
}
if(type3.txt=="number")
{
@@ -3296,7 +3296,7 @@ Timer tmSerial
vis hSlider3,1
vis nNum3,1
// get config (optional Value) (use bText as variable)
spstr strCommand.txt,bText3.txt,",",20
spstr strCommand.txt,bText3.txt,"~",20
//first value is current value
spstr bText3.txt,tTmp.txt,"|",0
covx tTmp.txt,sys0,0,0
@@ -3312,9 +3312,9 @@ Timer tmSerial
hSlider3.maxval=sys0
}
// get Type
spstr strCommand.txt,type4.txt,",",21
spstr strCommand.txt,type4.txt,"~",21
// get internal name
spstr strCommand.txt,entn4.txt,",",22
spstr strCommand.txt,entn4.txt,"~",22
if(type4.txt=="delete"||type4.txt=="")
{
vis bUp4,0
@@ -3329,16 +3329,16 @@ Timer tmSerial
}else
{
// change icon
spstr strCommand.txt,tTmp.txt,",",23
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,",",24
spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,sys0,0,0
tIcon4.pco=sys0
// set name
spstr strCommand.txt,tEntity4.txt,",",25
spstr strCommand.txt,tEntity4.txt,"~",25
vis tEntity4,1
}
if(type4.txt=="shutter")
@@ -3361,7 +3361,7 @@ Timer tmSerial
vis hSlider4,0
vis nNum4,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",26
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,sys0,0,0
btOnOff4.val=sys0
}
@@ -3375,7 +3375,7 @@ Timer tmSerial
vis hSlider4,0
vis nNum4,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",26
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,sys0,0,0
btOnOff4.val=sys0
}
@@ -3392,7 +3392,7 @@ Timer tmSerial
bText4.pco=65535
bText4.pco2=65535
// get Text (optional Value)
spstr strCommand.txt,bText4.txt,",",26
spstr strCommand.txt,bText4.txt,"~",26
}
if(type4.txt=="button")
{
@@ -3407,7 +3407,7 @@ Timer tmSerial
bText4.pco=1374
bText4.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText4.txt,",",26
spstr strCommand.txt,bText4.txt,"~",26
}
if(type4.txt=="number")
{
@@ -3420,7 +3420,7 @@ Timer tmSerial
vis hSlider4,1
vis nNum4,1
// get config (optional Value) (use bText as variable)
spstr strCommand.txt,bText4.txt,",",26
spstr strCommand.txt,bText4.txt,"~",26
//first value is current value
spstr bText4.txt,tTmp.txt,"|",0
covx tTmp.txt,sys0,0,0
@@ -3436,9 +3436,9 @@ Timer tmSerial
hSlider4.maxval=sys0
}
// get Type
spstr strCommand.txt,type5.txt,",",27
spstr strCommand.txt,type5.txt,"~",27
// get internal name
spstr strCommand.txt,entn5.txt,",",28
spstr strCommand.txt,entn5.txt,"~",28
if(type5.txt=="delete"||type5.txt=="")
{
vis bUp5,0
@@ -3453,16 +3453,16 @@ Timer tmSerial
}else
{
// change icon
spstr strCommand.txt,tTmp.txt,",",29
spstr strCommand.txt,tTmp.txt,"~",29
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
vis tIcon5,1
// change icon color
spstr strCommand.txt,tTmp.txt,",",30
spstr strCommand.txt,tTmp.txt,"~",30
covx tTmp.txt,sys0,0,0
tIcon5.pco=sys0
// set name
spstr strCommand.txt,tEntity5.txt,",",31
spstr strCommand.txt,tEntity5.txt,"~",31
vis tEntity5,1
}
if(type5.txt=="shutter")
@@ -3485,7 +3485,7 @@ Timer tmSerial
vis hSlider5,0
vis nNum5,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",32
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,sys0,0,0
btOnOff5.val=sys0
}
@@ -3499,7 +3499,7 @@ Timer tmSerial
vis hSlider5,0
vis nNum5,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",32
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,sys0,0,0
btOnOff5.val=sys0
}
@@ -3516,7 +3516,7 @@ Timer tmSerial
bText5.pco=65535
bText5.pco2=65535
// get Text (optional Value)
spstr strCommand.txt,bText5.txt,",",32
spstr strCommand.txt,bText5.txt,"~",32
}
if(type5.txt=="button")
{
@@ -3531,7 +3531,7 @@ Timer tmSerial
bText5.pco=1374
bText5.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText5.txt,",",32
spstr strCommand.txt,bText5.txt,"~",32
}
if(type5.txt=="number")
{
@@ -3544,7 +3544,7 @@ Timer tmSerial
vis hSlider5,1
vis nNum5,1
// get config (optional Value) (use bText as variable)
spstr strCommand.txt,bText5.txt,",",32
spstr strCommand.txt,bText5.txt,"~",32
//first value is current value
spstr bText5.txt,tTmp.txt,"|",0
covx tTmp.txt,sys0,0,0
@@ -3560,9 +3560,9 @@ Timer tmSerial
hSlider5.maxval=sys0
}
// get Type
spstr strCommand.txt,type6.txt,",",33
spstr strCommand.txt,type6.txt,"~",33
// get internal name
spstr strCommand.txt,entn6.txt,",",34
spstr strCommand.txt,entn6.txt,"~",34
if(type6.txt=="delete"||type6.txt=="")
{
vis bUp6,0
@@ -3577,16 +3577,16 @@ Timer tmSerial
}else
{
// change icon
spstr strCommand.txt,tTmp.txt,",",35
spstr strCommand.txt,tTmp.txt,"~",35
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
vis tIcon6,1
// change icon color
spstr strCommand.txt,tTmp.txt,",",36
spstr strCommand.txt,tTmp.txt,"~",36
covx tTmp.txt,sys0,0,0
tIcon6.pco=sys0
// set name
spstr strCommand.txt,tEntity6.txt,",",37
spstr strCommand.txt,tEntity6.txt,"~",37
vis tEntity6,1
}
if(type6.txt=="shutter")
@@ -3609,7 +3609,7 @@ Timer tmSerial
vis hSlider6,0
vis nNum6,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",38
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,sys0,0,0
btOnOff6.val=sys0
}
@@ -3623,7 +3623,7 @@ Timer tmSerial
vis hSlider6,0
vis nNum6,0
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",38
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,sys0,0,0
btOnOff6.val=sys0
}
@@ -3640,7 +3640,7 @@ Timer tmSerial
bText6.pco=65535
bText6.pco2=65535
// get Text (optional Value)
spstr strCommand.txt,bText6.txt,",",38
spstr strCommand.txt,bText6.txt,"~",38
}
if(type6.txt=="button")
{
@@ -3655,7 +3655,7 @@ Timer tmSerial
bText6.pco=1374
bText6.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText6.txt,",",38
spstr strCommand.txt,bText6.txt,"~",38
}
if(type6.txt=="number")
{
@@ -3668,7 +3668,7 @@ Timer tmSerial
vis hSlider6,1
vis nNum6,1
// get config (optional Value) (use bText as variable)
spstr strCommand.txt,bText6.txt,",",38
spstr strCommand.txt,bText6.txt,"~",38
//first value is current value
spstr bText6.txt,tTmp.txt,"|",0
covx tTmp.txt,sys0,0,0
@@ -3688,11 +3688,11 @@ Timer tmSerial
{
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,",",1
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,",",2
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
//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
@@ -3742,23 +3742,23 @@ Timer tmSerial
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,",",1
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
}
if(tInstruction.txt=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,",",1
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
// end of user code