Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2022-05-14 15:34:36 +00:00
committed by github-actions[bot]
parent 24906f6ed8
commit 9ac2a98305
6 changed files with 237 additions and 127 deletions

View File

@@ -41,11 +41,11 @@ Page cardThermo
vis bt5,0
vis bt6,0
vis bt7,0
vis t0,0
vis tCF2,0
vis bUp2,0
vis bDown2,0
vis xTempDest2,0
vis t2,0
vis tCF1,0
vis btUp1,0
vis btDown1,0
vis xTempDest1,0
@@ -510,7 +510,7 @@ Text tStatus
Horizontal Spacing : 0
Vertical Spacing : 0
Text t2
Text tCF1
Attributes
ID : 8
Scope : local
@@ -600,7 +600,7 @@ Text tStateLbl
Horizontal Spacing : 0
Vertical Spacing : 0
Text t0
Text tCF2
Attributes
ID : 41
Scope : local
@@ -660,7 +660,7 @@ Text tALbl
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1
Text tCF
Attributes
ID : 55
Scope : local
@@ -1358,7 +1358,7 @@ Dual-state Button bUp2
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
tSend.txt+="tempUpd2,"
//convert temperature
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
@@ -1416,7 +1416,7 @@ Dual-state Button bDown2
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
tSend.txt+="tempUpd2,"
//convert temperature
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
@@ -1897,6 +1897,28 @@ Timer tmSerial
spstr strCommand.txt,tStateLbl.txt,"~",43
//Text tALbl
spstr strCommand.txt,tALbl.txt,"~",44
//Text tCF
spstr strCommand.txt,tCF.txt,"~",45
tCF1.txt=tCF.txt
tCF2.txt=tCF.txt
//Second Temperature
spstr strCommand.txt,tTmp.txt,"~",46
if(tTmp.txt!="")
{
covx tTmp.txt,xTempDest2.val,0,0
vis btUp,0
vis xTempDest,0
vis btDown,0
vis tCF,0
vis btUp1,1
vis xTempDest1,1
vis btDown1,1
vis tCF1,1
vis bUp2,1
vis xTempDest2,1
vis bDown2,1
vis tCF2,1
}
}
if(tInstruction.txt=="pageType")
{

View File

@@ -44,8 +44,8 @@ cardAlarm
222 Unique line(s) of event code
cardThermo
56 Component(s)
523 Line(s) of event code
269 Unique line(s) of event code
543 Line(s) of event code
288 Unique line(s) of event code
cardEntities
65 Component(s)
981 Line(s) of event code
@@ -54,5 +54,5 @@ cardEntities
Total
12 Page(s)
371 Component(s)
3841 Line(s) of event code
1041 Unique line(s) of event code
3861 Line(s) of event code
1060 Unique line(s) of event code