add navigation on alarm and thermo page (add nextion2text)

This commit is contained in:
joBr99
2022-03-31 18:20:57 +00:00
committed by GitHub Actions
parent 76d4006095
commit c7ebf1d09d
7 changed files with 546 additions and 70 deletions

View File

@@ -1043,48 +1043,75 @@ 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")
{
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=""
}
//text arm1
spstr strCommand.txt,arm1.txt,",",2
spstr strCommand.txt,arm1.txt,",",3
if(arm1.txt!="")
{
vis arm1,1
}
//id arm1
spstr strCommand.txt,va1.txt,",",3
spstr strCommand.txt,va1.txt,",",4
//text arm2
spstr strCommand.txt,arm2.txt,",",4
spstr strCommand.txt,arm2.txt,",",5
if(arm2.txt!="")
{
vis arm2,1
}
//id arm2
spstr strCommand.txt,va2.txt,",",5
spstr strCommand.txt,va2.txt,",",6
//text arm3
spstr strCommand.txt,arm3.txt,",",6
spstr strCommand.txt,arm3.txt,",",7
if(arm3.txt!="")
{
vis arm3,1
}
//id arm3
spstr strCommand.txt,va3.txt,",",7
spstr strCommand.txt,va3.txt,",",8
//text arm4
spstr strCommand.txt,arm4.txt,",",8
spstr strCommand.txt,arm4.txt,",",9
if(arm4.txt!="")
{
vis arm4,1
}
//id arm4
spstr strCommand.txt,va4.txt,",",9
spstr strCommand.txt,va4.txt,",",10
//icon
spstr strCommand.txt,tTmp.txt,",",10
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,",",11
spstr strCommand.txt,tTmp.txt,",",12
covx tTmp.txt,sys0,0,0
tIcon.pco=sys0
//numpad status
spstr strCommand.txt,tTmp.txt,",",12
spstr strCommand.txt,tTmp.txt,",",13
if(tTmp.txt!="disable")
{
vis b0,1
@@ -1101,7 +1128,7 @@ Timer tmSerial
vis tCode,1
}
//flashing status
spstr strCommand.txt,tTmp.txt,",",13
spstr strCommand.txt,tTmp.txt,",",14
if(tTmp.txt=="enable")
{
tmFlash.en=1

View File

@@ -923,28 +923,55 @@ Timer tmSerial
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
{
//entity name
spstr strCommand.txt,entn.txt,"|",1
//heading
spstr strCommand.txt,tHeading.txt,"|",2
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=""
}
//entity name
spstr strCommand.txt,entn.txt,"|",3
//icon
spstr strCommand.txt,tTmp.txt,"|",3
spstr strCommand.txt,tTmp.txt,"|",4
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title
spstr strCommand.txt,tTitle.txt,"|",4
spstr strCommand.txt,tTitle.txt,"|",5
//author
spstr strCommand.txt,tAuthor.txt,"|",5
spstr strCommand.txt,tAuthor.txt,"|",6
//volume
spstr strCommand.txt,tTmp.txt,"|",6
spstr strCommand.txt,tTmp.txt,"|",7
covx tTmp.txt,sys0,0,0
hVolume.val=sys0
//icon
spstr strCommand.txt,tTmp.txt,"|",7
spstr strCommand.txt,tTmp.txt,"|",8
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current
spstr strCommand.txt,tSpeaker.txt,"|",8
spstr strCommand.txt,tSpeaker.txt,"|",9
if(tSpeaker.txt!="")
{
tSpeaker.pco=1374
@@ -953,14 +980,14 @@ Timer tmSerial
tSpeaker.pco=65535
}
//speaker list
spstr strCommand.txt,vaSpeakerList.txt,"|",9
spstr strCommand.txt,vaSpeakerList.txt,"|",10
if(vaSpeakerList.txt=="")
{
vis t6,0
}
vaSpeakerPos.val=0
// on off button
spstr strCommand.txt,tTmp.txt,"|",10
spstr strCommand.txt,tTmp.txt,"|",11
if(tTmp.txt=="disable")
{
vis t5,0

View File

@@ -34,14 +34,10 @@ cardGrid
39 Component(s)
423 Line(s) of event code
245 Unique line(s) of event code
cardMedia
30 Component(s)
300 Line(s) of event code
154 Unique line(s) of event code
cardAlarm
35 Component(s)
298 Line(s) of event code
187 Unique line(s) of event code
324 Line(s) of event code
199 Unique line(s) of event code
screensaver
29 Component(s)
182 Line(s) of event code
@@ -54,9 +50,13 @@ cardThermo
41 Component(s)
453 Line(s) of event code
279 Unique line(s) of event code
cardMedia
30 Component(s)
326 Line(s) of event code
166 Unique line(s) of event code
Total
13 Page(s)
351 Component(s)
3521 Line(s) of event code
1015 Unique line(s) of event code
3573 Line(s) of event code
1020 Unique line(s) of event code