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

@@ -429,7 +429,7 @@ Text tIcon1
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -459,7 +459,7 @@ Text tIcon2
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 30
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -489,7 +489,7 @@ Text tIcon3
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -519,7 +519,7 @@ Text tIcon4
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 30
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -2065,15 +2065,42 @@ 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 tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0")
{
vis bPrev,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{
vis bNext,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
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
@@ -2088,16 +2115,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")
@@ -2120,7 +2147,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
}
@@ -2134,7 +2161,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
}
@@ -2151,7 +2178,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")
{
@@ -2166,7 +2193,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")
{
@@ -2179,7 +2206,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
@@ -2195,9 +2222,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
@@ -2212,16 +2239,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")
@@ -2244,7 +2271,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
}
@@ -2258,7 +2285,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
}
@@ -2275,7 +2302,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")
{
@@ -2290,7 +2317,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")
{
@@ -2303,7 +2330,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
@@ -2319,9 +2346,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
@@ -2336,16 +2363,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")
@@ -2368,7 +2395,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
}
@@ -2382,7 +2409,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
}
@@ -2399,7 +2426,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")
{
@@ -2414,7 +2441,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")
{
@@ -2427,7 +2454,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
@@ -2443,9 +2470,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
@@ -2460,16 +2487,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")
@@ -2492,7 +2519,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
}
@@ -2506,7 +2533,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
}
@@ -2523,7 +2550,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")
{
@@ -2538,7 +2565,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")
{
@@ -2551,7 +2578,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
@@ -2571,11 +2598,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
@@ -2625,23 +2652,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