mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-03-01 02:20:12 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
bad5a61c12
commit
6a977a543b
@@ -638,86 +638,80 @@ Timer tmSerial
|
||||
{
|
||||
//entn
|
||||
spstr strCommand.txt,entn.txt,"~",1
|
||||
// navigation icons
|
||||
spstr strCommand.txt,tId.txt,"~",2
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
// navigation icon left
|
||||
spstr strCommand.txt,tTmp.txt,"~",2 //type
|
||||
if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
{
|
||||
vis bPrev,0
|
||||
tsw mSwipePrev,0
|
||||
tsw mSwipeUp,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
}else
|
||||
{
|
||||
// get internal name
|
||||
spstr strCommand.txt,nent1.txt,"~",3
|
||||
// change icon
|
||||
spstr strCommand.txt,bPrev.txt,"~",4
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bPrev.pco=sys0
|
||||
vis bPrev,1
|
||||
tsw mSwipePrev,1
|
||||
tsw mSwipeUp,0
|
||||
bPrev.txt="î°"
|
||||
}
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
vis bPrev,1
|
||||
tsw mSwipePrev,0
|
||||
tsw mSwipeUp,1
|
||||
bPrev.txt="î¶"
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
// navigation icon right
|
||||
spstr strCommand.txt,tTmp.txt,"~",8 //type
|
||||
if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
{
|
||||
vis bNext,0
|
||||
tsw mSwipeNext,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
}else
|
||||
{
|
||||
// get internal name
|
||||
spstr strCommand.txt,nent2.txt,"~",9
|
||||
// change icon
|
||||
spstr strCommand.txt,bNext.txt,"~",10
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bNext.pco=sys0
|
||||
vis bNext,1
|
||||
tsw mSwipeNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
vis bNext,1
|
||||
bNext.txt="î"
|
||||
}
|
||||
//text arm1
|
||||
spstr strCommand.txt,arm1.txt,"~",3
|
||||
spstr strCommand.txt,arm1.txt,"~",14
|
||||
if(arm1.txt!="")
|
||||
{
|
||||
vis arm1,1
|
||||
}
|
||||
//id arm1
|
||||
spstr strCommand.txt,va1.txt,"~",4
|
||||
spstr strCommand.txt,va1.txt,"~",15
|
||||
//text arm2
|
||||
spstr strCommand.txt,arm2.txt,"~",5
|
||||
spstr strCommand.txt,arm2.txt,"~",16
|
||||
if(arm2.txt!="")
|
||||
{
|
||||
vis arm2,1
|
||||
}
|
||||
//id arm2
|
||||
spstr strCommand.txt,va2.txt,"~",6
|
||||
spstr strCommand.txt,va2.txt,"~",17
|
||||
//text arm3
|
||||
spstr strCommand.txt,arm3.txt,"~",7
|
||||
spstr strCommand.txt,arm3.txt,"~",18
|
||||
if(arm3.txt!="")
|
||||
{
|
||||
vis arm3,1
|
||||
}
|
||||
//id arm3
|
||||
spstr strCommand.txt,va3.txt,"~",8
|
||||
spstr strCommand.txt,va3.txt,"~",19
|
||||
//text arm4
|
||||
spstr strCommand.txt,arm4.txt,"~",9
|
||||
spstr strCommand.txt,arm4.txt,"~",20
|
||||
if(arm4.txt!="")
|
||||
{
|
||||
vis arm4,1
|
||||
}
|
||||
//id arm4
|
||||
spstr strCommand.txt,va4.txt,"~",10
|
||||
spstr strCommand.txt,va4.txt,"~",21
|
||||
//icon
|
||||
spstr strCommand.txt,tIcon.txt,"~",11
|
||||
spstr strCommand.txt,tIcon.txt,"~",22
|
||||
//icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",12
|
||||
spstr strCommand.txt,tTmp.txt,"~",23
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon.pco=sys0
|
||||
//numpad status
|
||||
spstr strCommand.txt,tTmp.txt,"~",13
|
||||
spstr strCommand.txt,tTmp.txt,"~",24
|
||||
if(tTmp.txt!="disable")
|
||||
{
|
||||
vis b0,1
|
||||
@@ -750,7 +744,7 @@ Timer tmSerial
|
||||
vis tCode,0
|
||||
}
|
||||
//flashing status
|
||||
spstr strCommand.txt,tTmp.txt,"~",14
|
||||
spstr strCommand.txt,tTmp.txt,"~",25
|
||||
if(tTmp.txt=="enable")
|
||||
{
|
||||
tmFlash.en=1
|
||||
@@ -759,13 +753,13 @@ Timer tmSerial
|
||||
tmFlash.en=0
|
||||
}
|
||||
// extra button
|
||||
spstr strCommand.txt,b9.txt,"~",15
|
||||
spstr strCommand.txt,b9.txt,"~",26
|
||||
if(b9.txt!="")
|
||||
{
|
||||
vis b9,1
|
||||
spstr strCommand.txt,tTmp.txt,"~",16
|
||||
spstr strCommand.txt,tTmp.txt,"~",27
|
||||
covx tTmp.txt,b9.pco,0,0
|
||||
spstr strCommand.txt,vaAddBtn.txt,"~",17
|
||||
spstr strCommand.txt,vaAddBtn.txt,"~",28
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
|
||||
@@ -397,48 +397,42 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
spstr strCommand.txt,tHeading.txt,"~",1
|
||||
// navigation icons
|
||||
spstr strCommand.txt,tId.txt,"~",2
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
// navigation icon left
|
||||
spstr strCommand.txt,tTmp.txt,"~",2 //type
|
||||
if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
{
|
||||
vis bPrev,0
|
||||
tsw mSwipePrev,0
|
||||
tsw mSwipeUp,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
}else
|
||||
{
|
||||
// get internal name
|
||||
spstr strCommand.txt,nent1.txt,"~",3
|
||||
// change icon
|
||||
spstr strCommand.txt,bPrev.txt,"~",4
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bPrev.pco=sys0
|
||||
vis bPrev,1
|
||||
tsw mSwipePrev,1
|
||||
tsw mSwipeUp,0
|
||||
bPrev.txt="î°"
|
||||
}
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
vis bPrev,1
|
||||
tsw mSwipePrev,0
|
||||
tsw mSwipeUp,1
|
||||
bPrev.txt="î¶"
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
// navigation icon right
|
||||
spstr strCommand.txt,tTmp.txt,"~",8 //type
|
||||
if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
{
|
||||
vis bNext,0
|
||||
tsw mSwipeNext,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
}else
|
||||
{
|
||||
// get internal name
|
||||
spstr strCommand.txt,nent2.txt,"~",9
|
||||
// change icon
|
||||
spstr strCommand.txt,bNext.txt,"~",10
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bNext.pco=sys0
|
||||
vis bNext,1
|
||||
tsw mSwipeNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
vis bNext,1
|
||||
bNext.txt="î"
|
||||
}
|
||||
// extract color
|
||||
spstr strCommand.txt,tTmp.txt,"~",3
|
||||
spstr strCommand.txt,tTmp.txt,"~",14
|
||||
covx tTmp.txt,vaColorL.val,0,0
|
||||
// prepare dark color
|
||||
sys0=vaColorL.val>>11 // red
|
||||
@@ -450,7 +444,7 @@ Timer tmSerial
|
||||
//
|
||||
// detect nValues and maxValue
|
||||
vNValues.val=0
|
||||
spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6
|
||||
spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17
|
||||
strlen tTmp.txt,sya0
|
||||
while(sya0>0)
|
||||
{
|
||||
@@ -461,7 +455,7 @@ Timer tmSerial
|
||||
}
|
||||
// next
|
||||
vNValues.val++
|
||||
spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6
|
||||
spstr strCommand.txt,tTmp.txt,"~",vNValues.val+17
|
||||
strlen tTmp.txt,sya0
|
||||
}
|
||||
//
|
||||
@@ -476,7 +470,7 @@ Timer tmSerial
|
||||
//
|
||||
line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823
|
||||
line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823
|
||||
spstr strCommand.txt,strTmp.txt,"~",5
|
||||
spstr strCommand.txt,strTmp.txt,"~",16
|
||||
sya1=0
|
||||
spstr strTmp.txt,tTmp.txt,":",sya1
|
||||
strlen tTmp.txt,sya0
|
||||
@@ -509,7 +503,7 @@ Timer tmSerial
|
||||
}
|
||||
//
|
||||
// y achis label
|
||||
spstr strCommand.txt,tTmp.txt,"~",4
|
||||
spstr strCommand.txt,tTmp.txt,"~",15
|
||||
// tTmp.txt="Gas [kW]"
|
||||
strlen tTmp.txt,sys1
|
||||
sya1=sys1*12+m0.h-48/2
|
||||
@@ -525,7 +519,7 @@ Timer tmSerial
|
||||
vaValues.txt+="~"
|
||||
}
|
||||
// extract next entry
|
||||
spstr strCommand.txt,tTmp.txt,"~",sys0+6
|
||||
spstr strCommand.txt,tTmp.txt,"~",sys0+17
|
||||
// calculate left
|
||||
sys1=sys0*5*vaUnit.val
|
||||
sys1+=vaLeft.val
|
||||
|
||||
@@ -98,7 +98,7 @@ Variable (string) strCommand
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 500
|
||||
Max. Text Size: 700
|
||||
|
||||
Variable (string) tSend
|
||||
Attributes
|
||||
|
||||
@@ -444,52 +444,46 @@ Timer tmSerial
|
||||
// command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2
|
||||
//tHeading
|
||||
spstr strCommand.txt,tHeading.txt,"~",1
|
||||
// navigation icons
|
||||
spstr strCommand.txt,tId.txt,"~",2
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
// navigation icon left
|
||||
spstr strCommand.txt,tTmp.txt,"~",2 //type
|
||||
if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
{
|
||||
vis bPrev,0
|
||||
tsw mSwipePrev,0
|
||||
tsw mSwipeUp,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
}else
|
||||
{
|
||||
// get internal name
|
||||
spstr strCommand.txt,nent1.txt,"~",3
|
||||
// change icon
|
||||
spstr strCommand.txt,bPrev.txt,"~",4
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bPrev.pco=sys0
|
||||
vis bPrev,1
|
||||
tsw mSwipePrev,1
|
||||
tsw mSwipeUp,0
|
||||
bPrev.txt="î°"
|
||||
}
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
vis bPrev,1
|
||||
tsw mSwipePrev,0
|
||||
tsw mSwipeUp,1
|
||||
bPrev.txt="î¶"
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
// navigation icon right
|
||||
spstr strCommand.txt,tTmp.txt,"~",8 //type
|
||||
if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
{
|
||||
vis bNext,0
|
||||
tsw mSwipeNext,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
}else
|
||||
{
|
||||
// get internal name
|
||||
spstr strCommand.txt,nent2.txt,"~",9
|
||||
// change icon
|
||||
spstr strCommand.txt,bNext.txt,"~",10
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bNext.pco=sys0
|
||||
vis bNext,1
|
||||
tsw mSwipeNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
vis bNext,1
|
||||
bNext.txt="î"
|
||||
}
|
||||
//text qrcode
|
||||
spstr strCommand.txt,vaQR.txt,"~",3
|
||||
spstr strCommand.txt,vaQR.txt,"~",14
|
||||
// get Type
|
||||
spstr strCommand.txt,type1.txt,"~",4
|
||||
spstr strCommand.txt,type1.txt,"~",15
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn1.txt,"~",5
|
||||
spstr strCommand.txt,entn1.txt,"~",16
|
||||
if(type1.txt=="delete"||type1.txt=="")
|
||||
{
|
||||
vis btOnOff1,0
|
||||
@@ -499,14 +493,14 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,tIcon1.txt,"~",6
|
||||
spstr strCommand.txt,tIcon1.txt,"~",17
|
||||
vis tIcon1,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",7
|
||||
spstr strCommand.txt,tTmp.txt,"~",18
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon1.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity1.txt,"~",8
|
||||
spstr strCommand.txt,tEntity1.txt,"~",19
|
||||
vis tEntity1,1
|
||||
}
|
||||
if(type1.txt=="light")
|
||||
@@ -514,7 +508,7 @@ Timer tmSerial
|
||||
vis btOnOff1,1
|
||||
vis bText1,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,"~",9
|
||||
spstr strCommand.txt,tTmp.txt,"~",20
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
}
|
||||
@@ -523,7 +517,7 @@ Timer tmSerial
|
||||
vis btOnOff1,1
|
||||
vis bText1,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,"~",9
|
||||
spstr strCommand.txt,tTmp.txt,"~",20
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff1.val=sys0
|
||||
}
|
||||
@@ -535,7 +529,7 @@ Timer tmSerial
|
||||
bText1.pco=65535
|
||||
bText1.pco2=65535
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText1.txt,"~",9
|
||||
spstr strCommand.txt,bText1.txt,"~",20
|
||||
}
|
||||
if(type1.txt=="button")
|
||||
{
|
||||
@@ -545,12 +539,12 @@ Timer tmSerial
|
||||
bText1.pco=1374
|
||||
bText1.pco2=1374
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText1.txt,"~",9
|
||||
spstr strCommand.txt,bText1.txt,"~",20
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type2.txt,"~",10
|
||||
spstr strCommand.txt,type2.txt,"~",21
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn2.txt,"~",11
|
||||
spstr strCommand.txt,entn2.txt,"~",22
|
||||
if(type2.txt=="delete"||type2.txt=="")
|
||||
{
|
||||
vis btOnOff2,0
|
||||
@@ -560,14 +554,14 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,tIcon2.txt,"~",12
|
||||
spstr strCommand.txt,tIcon2.txt,"~",23
|
||||
vis tIcon2,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",13
|
||||
spstr strCommand.txt,tTmp.txt,"~",24
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon2.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity2.txt,"~",14
|
||||
spstr strCommand.txt,tEntity2.txt,"~",25
|
||||
vis tEntity2,1
|
||||
}
|
||||
if(type2.txt=="light")
|
||||
@@ -575,7 +569,7 @@ Timer tmSerial
|
||||
vis btOnOff2,1
|
||||
vis bText2,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,"~",15
|
||||
spstr strCommand.txt,tTmp.txt,"~",26
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff2.val=sys0
|
||||
}
|
||||
@@ -584,7 +578,7 @@ Timer tmSerial
|
||||
vis btOnOff2,1
|
||||
vis bText2,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tTmp.txt,"~",15
|
||||
spstr strCommand.txt,tTmp.txt,"~",26
|
||||
covx tTmp.txt,sys0,0,0
|
||||
btOnOff2.val=sys0
|
||||
}
|
||||
@@ -596,7 +590,7 @@ Timer tmSerial
|
||||
bText2.pco=65535
|
||||
bText2.pco2=65535
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText2.txt,"~",15
|
||||
spstr strCommand.txt,bText2.txt,"~",26
|
||||
}
|
||||
if(type2.txt=="button")
|
||||
{
|
||||
@@ -606,7 +600,7 @@ Timer tmSerial
|
||||
bText2.pco=1374
|
||||
bText2.pco2=1374
|
||||
// get Text (optional Value)
|
||||
spstr strCommand.txt,bText2.txt,"~",15
|
||||
spstr strCommand.txt,bText2.txt,"~",26
|
||||
}
|
||||
if(type2.txt=="delete"||type2.txt=="")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user