mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-19 12:44:44 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
@@ -1196,8 +1196,8 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tInstruction.txt,",",0
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
//entn
|
||||
spstr strCommand.txt,entn.txt,",",1
|
||||
//heading
|
||||
spstr strCommand.txt,tHeading.txt,",",1
|
||||
// navigation icons
|
||||
spstr strCommand.txt,tId.txt,",",2
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
@@ -1225,176 +1225,278 @@ Timer tmSerial
|
||||
vis bPrev,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//text arm1
|
||||
spstr strCommand.txt,arm1.txt,",",3
|
||||
if(arm1.txt!="")
|
||||
//entity name
|
||||
spstr strCommand.txt,entn.txt,",",3
|
||||
//currentTemp
|
||||
spstr strCommand.txt,tTmp.txt,",",4
|
||||
covx tTmp.txt,xTempCurr.val,0,0
|
||||
//dstTemp
|
||||
spstr strCommand.txt,tTmp.txt,",",5
|
||||
covx tTmp.txt,xTempDest.val,0,0
|
||||
//status
|
||||
spstr strCommand.txt,tStatus.txt,",",6
|
||||
//minTemp
|
||||
spstr strCommand.txt,tTmp.txt,",",7
|
||||
covx tTmp.txt,xTempMin.val,0,0
|
||||
//maxTemp
|
||||
spstr strCommand.txt,tTmp.txt,",",8
|
||||
covx tTmp.txt,xTempMax.val,0,0
|
||||
//tempStep
|
||||
spstr strCommand.txt,tTmp.txt,",",9
|
||||
covx tTmp.txt,xTempStep.val,0,0
|
||||
// disable all buttons
|
||||
vis bt0,0
|
||||
vis bt1,0
|
||||
vis bt2,0
|
||||
vis bt3,0
|
||||
vis bt4,0
|
||||
vis bt5,0
|
||||
vis bt6,0
|
||||
vis bt7,0
|
||||
vis bt8,0
|
||||
//bt0
|
||||
spstr strCommand.txt,tTmp.txt,",",10
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
vis arm1,1
|
||||
}
|
||||
//id arm1
|
||||
spstr strCommand.txt,va1.txt,",",4
|
||||
//text arm2
|
||||
spstr strCommand.txt,arm2.txt,",",5
|
||||
if(arm2.txt!="")
|
||||
{
|
||||
vis arm2,1
|
||||
}
|
||||
//id arm2
|
||||
spstr strCommand.txt,va2.txt,",",6
|
||||
//text arm3
|
||||
spstr strCommand.txt,arm3.txt,",",7
|
||||
if(arm3.txt!="")
|
||||
{
|
||||
vis arm3,1
|
||||
}
|
||||
//id arm3
|
||||
spstr strCommand.txt,va3.txt,",",8
|
||||
//text arm4
|
||||
spstr strCommand.txt,arm4.txt,",",9
|
||||
if(arm4.txt!="")
|
||||
{
|
||||
vis arm4,1
|
||||
}
|
||||
//id arm4
|
||||
spstr strCommand.txt,va4.txt,",",10
|
||||
//icon
|
||||
spstr strCommand.txt,tTmp.txt,",",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
||||
//icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon.pco=sys0
|
||||
//numpad status
|
||||
spstr strCommand.txt,tTmp.txt,",",13
|
||||
if(tTmp.txt!="disable")
|
||||
{
|
||||
vis b0,1
|
||||
vis b1,1
|
||||
vis b2,1
|
||||
vis b3,1
|
||||
vis b4,1
|
||||
vis b5,1
|
||||
vis b6,1
|
||||
vis b7,1
|
||||
vis b8,1
|
||||
vis b9,1
|
||||
vis b10,1
|
||||
vis tCode,1
|
||||
}else
|
||||
{
|
||||
vis b0,0
|
||||
vis b1,0
|
||||
vis b2,0
|
||||
vis b3,0
|
||||
vis b4,0
|
||||
vis b5,0
|
||||
vis b6,0
|
||||
vis b7,0
|
||||
vis b8,0
|
||||
vis b9,0
|
||||
vis b10,0
|
||||
vis tCode,0
|
||||
}
|
||||
//flashing status
|
||||
spstr strCommand.txt,tTmp.txt,",",14
|
||||
if(tTmp.txt=="enable")
|
||||
{
|
||||
tmFlash.en=1
|
||||
}else
|
||||
{
|
||||
tmFlash.en=0
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
{
|
||||
// get value
|
||||
spstr strCommand.txt,tTmp.txt,",",1
|
||||
covx tTmp.txt,dimValue,0,0
|
||||
dim=dimValue
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
//set timeout to global var
|
||||
spstr strCommand.txt,tTmp.txt,",",1
|
||||
covx tTmp.txt,sleepTimeout,0,0
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
//command format pageType,specialPageName
|
||||
//write name of speical page to tId
|
||||
spstr strCommand.txt,tId.txt,",",1
|
||||
//save second arg if there's one
|
||||
spstr strCommand.txt,tTmp.txt,",",2
|
||||
//save third arg if there's one
|
||||
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
|
||||
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
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// next character
|
||||
bufferPos++
|
||||
}
|
||||
}
|
||||
// set icon
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,bt0.txt,sys0,1
|
||||
// set text color on active state
|
||||
spstr strCommand.txt,tTmp.txt,",",11
|
||||
covx tTmp.txt,bt0.pco2,0,0
|
||||
// set state
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
covx tTmp.txt,bt0.val,0,0
|
||||
// save action
|
||||
spstr strCommand.txt,va0.txt,",",13
|
||||
//enable
|
||||
vis bt0,1
|
||||
} //bt1
|
||||
spstr strCommand.txt,tTmp.txt,",",14
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
// set icon
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,bt1.txt,sys0,1
|
||||
// set text color on active state
|
||||
spstr strCommand.txt,tTmp.txt,",",15
|
||||
covx tTmp.txt,bt1.pco2,0,0
|
||||
// set state
|
||||
spstr strCommand.txt,tTmp.txt,",",16
|
||||
covx tTmp.txt,bt1.val,0,0
|
||||
// save action
|
||||
spstr strCommand.txt,va1.txt,",",17
|
||||
//enable
|
||||
vis bt1,1
|
||||
} //bt2
|
||||
spstr strCommand.txt,tTmp.txt,",",18
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
// set icon
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,bt2.txt,sys0,1
|
||||
// set text color on active state
|
||||
spstr strCommand.txt,tTmp.txt,",",19
|
||||
covx tTmp.txt,bt2.pco2,0,0
|
||||
// set state
|
||||
spstr strCommand.txt,tTmp.txt,",",20
|
||||
covx tTmp.txt,bt2.val,0,0
|
||||
// save action
|
||||
spstr strCommand.txt,va2.txt,",",21
|
||||
//enable
|
||||
vis bt2,1
|
||||
} //bt3
|
||||
spstr strCommand.txt,tTmp.txt,",",22
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
// set icon
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,bt3.txt,sys0,1
|
||||
// set text color on active state
|
||||
spstr strCommand.txt,tTmp.txt,",",23
|
||||
covx tTmp.txt,bt3.pco2,0,0
|
||||
// set state
|
||||
spstr strCommand.txt,tTmp.txt,",",24
|
||||
covx tTmp.txt,bt3.val,0,0
|
||||
// save action
|
||||
spstr strCommand.txt,va3.txt,",",25
|
||||
//enable
|
||||
vis bt3,1
|
||||
} //bt4
|
||||
spstr strCommand.txt,tTmp.txt,",",26
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
// set icon
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,bt4.txt,sys0,1
|
||||
// set text color on active state
|
||||
spstr strCommand.txt,tTmp.txt,",",27
|
||||
covx tTmp.txt,bt4.pco2,0,0
|
||||
// set state
|
||||
spstr strCommand.txt,tTmp.txt,",",28
|
||||
covx tTmp.txt,bt4.val,0,0
|
||||
// save action
|
||||
spstr strCommand.txt,va4.txt,",",29
|
||||
//enable
|
||||
vis bt4,1
|
||||
} //bt5
|
||||
spstr strCommand.txt,tTmp.txt,",",30
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
// set icon
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,bt5.txt,sys0,1
|
||||
// set text color on active state
|
||||
spstr strCommand.txt,tTmp.txt,",",31
|
||||
covx tTmp.txt,bt5.pco2,0,0
|
||||
// set state
|
||||
spstr strCommand.txt,tTmp.txt,",",32
|
||||
covx tTmp.txt,bt5.val,0,0
|
||||
// save action
|
||||
spstr strCommand.txt,va5.txt,",",33
|
||||
//enable
|
||||
vis bt5,1
|
||||
} //bt6
|
||||
spstr strCommand.txt,tTmp.txt,",",34
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
// set icon
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,bt6.txt,sys0,1
|
||||
// set text color on active state
|
||||
spstr strCommand.txt,tTmp.txt,",",35
|
||||
covx tTmp.txt,bt6.pco2,0,0
|
||||
// set state
|
||||
spstr strCommand.txt,tTmp.txt,",",36
|
||||
covx tTmp.txt,bt6.val,0,0
|
||||
// save action
|
||||
spstr strCommand.txt,va6.txt,",",37
|
||||
//enable
|
||||
vis bt6,1
|
||||
} //bt7
|
||||
spstr strCommand.txt,tTmp.txt,",",38
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
// set icon
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,bt7.txt,sys0,1
|
||||
// set text color on active state
|
||||
spstr strCommand.txt,tTmp.txt,",",39
|
||||
covx tTmp.txt,bt7.pco2,0,0
|
||||
// set state
|
||||
spstr strCommand.txt,tTmp.txt,",",40
|
||||
covx tTmp.txt,bt7.val,0,0
|
||||
// save action
|
||||
spstr strCommand.txt,va7.txt,",",41
|
||||
//enable
|
||||
vis bt7,1
|
||||
} //bt8
|
||||
spstr strCommand.txt,tTmp.txt,",",42
|
||||
if(tTmp.txt!="")
|
||||
{
|
||||
// set icon
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,bt8.txt,sys0,1
|
||||
// set text color on active state
|
||||
spstr strCommand.txt,tTmp.txt,",",43
|
||||
covx tTmp.txt,bt8.pco2,0,0
|
||||
// set state
|
||||
spstr strCommand.txt,tTmp.txt,",",44
|
||||
covx tTmp.txt,bt8.val,0,0
|
||||
// save action
|
||||
spstr strCommand.txt,va8.txt,",",45
|
||||
//enable
|
||||
vis bt8,1
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
//command format pageType,specialPageName
|
||||
//write name of speical page to tId
|
||||
spstr strCommand.txt,tId.txt,",",1
|
||||
//save second arg if there's one
|
||||
spstr strCommand.txt,tTmp.txt,",",2
|
||||
//save third arg if there's one
|
||||
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
|
||||
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
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
// get set time to global variable
|
||||
spstr strCommand.txt,pageIcons.vaTime.txt,",",1
|
||||
}
|
||||
if(tInstruction.txt=="date")
|
||||
{
|
||||
// get set date to global variable
|
||||
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
|
||||
}
|
||||
if(tInstruction.txt=="dimmode")
|
||||
{
|
||||
// get value
|
||||
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
|
||||
covx tTmp.txt,sleepTimeout,0,0
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// next character
|
||||
bufferPos++
|
||||
}
|
||||
}
|
||||
|
||||
Timer tmSleep
|
||||
Attributes
|
||||
|
||||
@@ -22,6 +22,10 @@ pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
343 Line(s) of event code
|
||||
214 Unique line(s) of event code
|
||||
screensaver
|
||||
29 Component(s)
|
||||
182 Line(s) of event code
|
||||
@@ -34,18 +38,14 @@ cardMedia
|
||||
30 Component(s)
|
||||
331 Line(s) of event code
|
||||
169 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
343 Line(s) of event code
|
||||
214 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
458 Line(s) of event code
|
||||
283 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
322 Line(s) of event code
|
||||
173 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
398 Line(s) of event code
|
||||
205 Unique line(s) of event code
|
||||
cardEntities
|
||||
62 Component(s)
|
||||
944 Line(s) of event code
|
||||
@@ -58,5 +58,5 @@ cardGrid
|
||||
Total
|
||||
13 Page(s)
|
||||
351 Component(s)
|
||||
3721 Line(s) of event code
|
||||
862 Unique line(s) of event code
|
||||
3781 Line(s) of event code
|
||||
1027 Unique line(s) of event code
|
||||
|
||||
Reference in New Issue
Block a user