fix file pattern (add nextion2text)

This commit is contained in:
joBr99
2022-03-29 07:10:48 +00:00
committed by GitHub Actions
parent ac0b09379d
commit d1ffaac7af
8 changed files with 337 additions and 1839 deletions

View File

@@ -31,6 +31,7 @@ Page cardEntities
vis tIcon1,0
vis tEntity1,0
vis bText1,0
vis hSlider1,0
//ui e2
vis btOnOff2,0
vis bUp2,0
@@ -39,6 +40,7 @@ Page cardEntities
vis tIcon2,0
vis tEntity2,0
vis bText2,0
vis hSlider2,0
//ui e3
vis btOnOff3,0
vis bUp3,0
@@ -47,6 +49,7 @@ Page cardEntities
vis tIcon3,0
vis tEntity3,0
vis bText3,0
vis hSlider3,0
//ui e4
vis btOnOff4,0
vis bUp4,0
@@ -55,6 +58,7 @@ Page cardEntities
vis tIcon4,0
vis tEntity4,0
vis bText4,0
vis hSlider4,0
Variable (string) strCommand
Attributes
@@ -1406,18 +1410,15 @@ 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
}
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
if(type1.txt=="delete")
spstr strCommand.txt,entn1.txt,",",4
if(type1.txt=="delete"||type1.txt=="")
{
vis bUp1,0
vis bStop1,0
@@ -1426,19 +1427,20 @@ Timer tmSerial
vis tEntity1,0
vis tIcon1,0
vis bText1,0
vis hSlider1,0
}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")
@@ -1448,6 +1450,7 @@ Timer tmSerial
vis bDown1,1
vis btOnOff1,0
vis bText1,0
vis hSlider1,0
}
if(type1.txt=="light")
{
@@ -1456,8 +1459,9 @@ Timer tmSerial
vis bDown1,0
vis btOnOff1,1
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
}
@@ -1468,8 +1472,9 @@ Timer tmSerial
vis bDown1,0
vis btOnOff1,1
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
}
@@ -1481,10 +1486,11 @@ Timer tmSerial
vis btOnOff1,0
vis bText1,1
tsw bText1,0
vis hSlider1,0
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")
{
@@ -1494,17 +1500,41 @@ Timer tmSerial
vis btOnOff1,0
vis bText1,1
tsw bText1,1
vis hSlider1,0
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")
{
vis bUp1,0
vis bStop1,0
vis bDown1,0
vis btOnOff1,0
vis bText1,0
tsw bText1,0
vis hSlider1,1
// 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
}
// id2
// get Type
spstr strCommand.txt,type2.txt,",",7
spstr strCommand.txt,type2.txt,",",9
// get internal name
spstr strCommand.txt,entn2.txt,",",8
if(type2.txt=="delete")
spstr strCommand.txt,entn2.txt,",",10
if(type2.txt=="delete"||type2.txt=="")
{
vis bUp2,0
vis bStop2,0
@@ -1513,19 +1543,20 @@ Timer tmSerial
vis tEntity2,0
vis tIcon2,0
vis bText2,0
vis hSlider2,0
}else
{
//change icon
spstr strCommand.txt,tTmp.txt,",",9
// change icon
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")
@@ -1535,6 +1566,7 @@ Timer tmSerial
vis bDown2,1
vis btOnOff2,0
vis bText2,0
vis hSlider2,0
}
if(type2.txt=="light")
{
@@ -1543,8 +1575,9 @@ Timer tmSerial
vis bDown2,0
vis btOnOff2,1
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
}
@@ -1555,8 +1588,9 @@ Timer tmSerial
vis bDown2,0
vis btOnOff2,1
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
}
@@ -1568,10 +1602,11 @@ Timer tmSerial
vis btOnOff2,0
vis bText2,1
tsw bText2,0
vis hSlider2,0
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")
{
@@ -1581,17 +1616,41 @@ Timer tmSerial
vis btOnOff2,0
vis bText2,1
tsw bText2,1
vis hSlider2,0
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")
{
vis bUp2,0
vis bStop2,0
vis bDown2,0
vis btOnOff2,0
vis bText2,0
tsw bText2,0
vis hSlider2,1
// 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
}
// id3
// get Type
spstr strCommand.txt,type3.txt,",",13
spstr strCommand.txt,type3.txt,",",15
// get internal name
spstr strCommand.txt,entn3.txt,",",14
if(type3.txt=="delete")
spstr strCommand.txt,entn3.txt,",",16
if(type3.txt=="delete"||type3.txt=="")
{
vis bUp3,0
vis bStop3,0
@@ -1600,19 +1659,20 @@ Timer tmSerial
vis tEntity3,0
vis tIcon3,0
vis bText3,0
vis hSlider3,0
}else
{
//change icon
spstr strCommand.txt,tTmp.txt,",",15
// change icon
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")
@@ -1622,16 +1682,18 @@ Timer tmSerial
vis bDown3,1
vis btOnOff3,0
vis bText3,0
vis hSlider3,0
}
if(type3.txt=="light")
{
vis bUp3,0
vis bStop3,0
vis bDown3,0
vis bText3,0
vis btOnOff3,1
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
}
@@ -1640,10 +1702,11 @@ Timer tmSerial
vis bUp3,0
vis bStop3,0
vis bDown3,0
vis bText3,0
vis btOnOff3,1
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
}
@@ -1655,10 +1718,11 @@ Timer tmSerial
vis btOnOff3,0
vis bText3,1
tsw bText3,0
vis hSlider3,0
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")
{
@@ -1668,17 +1732,41 @@ Timer tmSerial
vis btOnOff3,0
vis bText3,1
tsw bText3,1
vis hSlider3,0
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")
{
vis bUp3,0
vis bStop3,0
vis bDown3,0
vis btOnOff3,0
vis bText3,0
tsw bText3,0
vis hSlider3,1
// 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
}
// id4
// get Type
spstr strCommand.txt,type4.txt,",",19
spstr strCommand.txt,type4.txt,",",21
// get internal name
spstr strCommand.txt,entn4.txt,",",20
if(type4.txt=="delete")
spstr strCommand.txt,entn4.txt,",",22
if(type4.txt=="delete"||type4.txt=="")
{
vis bUp4,0
vis bStop4,0
@@ -1687,19 +1775,20 @@ Timer tmSerial
vis tEntity4,0
vis tIcon4,0
vis bText4,0
vis hSlider4,0
}else
{
//change icon
spstr strCommand.txt,tTmp.txt,",",21
// change icon
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")
@@ -1709,16 +1798,18 @@ Timer tmSerial
vis bDown4,1
vis btOnOff4,0
vis bText4,0
vis hSlider4,0
}
if(type4.txt=="light")
{
vis bUp4,0
vis bStop4,0
vis bDown4,0
vis bText4,0
vis btOnOff4,1
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
}
@@ -1727,10 +1818,11 @@ Timer tmSerial
vis bUp4,0
vis bStop4,0
vis bDown4,0
vis bText4,0
vis btOnOff4,1
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
}
@@ -1742,10 +1834,11 @@ Timer tmSerial
vis btOnOff4,0
vis bText4,1
tsw bText4,0
vis hSlider4,0
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")
{
@@ -1755,184 +1848,35 @@ Timer tmSerial
vis btOnOff4,0
vis bText4,1
tsw bText4,1
vis hSlider4,0
bText4.pco=1374
bText4.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText4.txt,",",24
spstr strCommand.txt,bText4.txt,",",26
}
// id5
// get Type
spstr strCommand.txt,type5.txt,",",25
// get internal name
spstr strCommand.txt,entn5.txt,",",26
if(type5.txt=="delete")
if(type4.txt=="number")
{
vis bUp5,0
vis bStop5,0
vis bDown5,0
vis btOnOff5,0
vis tEntity5,0
vis tIcon5,0
vis bText5,0
}else
{
//change icon
spstr strCommand.txt,tTmp.txt,",",27
vis bUp4,0
vis bStop4,0
vis bDown4,0
vis btOnOff4,0
vis bText4,0
tsw bText4,0
vis hSlider4,1
// 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
substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
vis tIcon5,1
// change icon color
spstr strCommand.txt,tTmp.txt,",",28
hSlider4.val=sys0
//second value is min value
spstr bText4.txt,tTmp.txt,"|",2
covx tTmp.txt,sys0,0,0
tIcon5.pco=sys0
// set name
spstr strCommand.txt,tEntity5.txt,",",29
vis tEntity5,1
}
if(type5.txt=="shutter")
{
vis bUp5,1
vis bStop5,1
vis bDown5,1
vis btOnOff5,0
vis bText5,0
}
if(type5.txt=="light")
{
vis bUp5,0
vis bStop5,0
vis bDown5,0
vis bText5,0
vis btOnOff5,1
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",30
hSlider4.minval=sys0
//third value is max value
spstr bText4.txt,tTmp.txt,"|",3
covx tTmp.txt,sys0,0,0
btOnOff5.val=sys0
}
if(type5.txt=="switch")
{
vis bUp5,0
vis bStop5,0
vis bDown5,0
vis bText5,0
vis btOnOff5,1
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",30
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
bText5.pco=65535
bText5.pco2=65535
// get Text (optional Value)
spstr strCommand.txt,bText5.txt,",",30
}
if(type5.txt=="button")
{
vis bUp5,0
vis bStop5,0
vis bDown5,0
vis btOnOff5,0
vis bText5,1
tsw bText5,1
bText5.pco=1374
bText5.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText5.txt,",",30
}
// id6
// get Type
spstr strCommand.txt,type6.txt,",",31
// get internal name
spstr strCommand.txt,entn6.txt,",",32
if(type6.txt=="delete")
{
vis bUp6,0
vis bStop6,0
vis bDown6,0
vis btOnOff6,0
vis tEntity6,0
vis tIcon6,0
vis bText6,0
}else
{
//change icon
spstr strCommand.txt,tTmp.txt,",",33
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,",",34
covx tTmp.txt,sys0,0,0
tIcon6.pco=sys0
// set name
spstr strCommand.txt,tEntity6.txt,",",35
vis tEntity6,1
}
if(type6.txt=="shutter")
{
vis bUp6,1
vis bStop6,1
vis bDown6,1
vis btOnOff6,0
vis bText6,0
}
if(type6.txt=="light")
{
vis bUp6,0
vis bStop6,0
vis bDown6,0
vis bText6,0
vis btOnOff6,1
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",36
covx tTmp.txt,sys0,0,0
btOnOff6.val=sys0
}
if(type6.txt=="switch")
{
vis bUp6,0
vis bStop6,0
vis bDown6,0
vis bText6,0
vis btOnOff6,1
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",36
covx tTmp.txt,sys0,0,0
btOnOff6.val=sys0
}
if(type6.txt=="text")
{
vis bUp6,0
vis bStop6,0
vis bDown6,0
vis btOnOff6,0
vis bText6,1
tsw bText6,0
bText6.pco=65535
bText6.pco2=65535
// get Text (optional Value)
spstr strCommand.txt,bText6.txt,",",36
}
if(type6.txt=="button")
{
vis bUp6,0
vis bStop6,0
vis bDown6,0
vis btOnOff6,0
vis bText6,1
tsw bText6,1
bText6.pco=1374
bText6.pco2=1374
// get Text (optional Value)
spstr strCommand.txt,bText6.txt,",",36
hSlider4.maxval=sys0
}
}
if(tInstruction.txt=="pageType")
@@ -1947,11 +1891,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
@@ -1960,18 +1929,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