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

This commit is contained in:
joBr99
2022-03-31 18:57:31 +00:00
committed by GitHub Actions
parent 92ee3a18b8
commit c7b0bc7d82
5 changed files with 576 additions and 699 deletions

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:53:35.913570934 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:57:30.523092501 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:53:36.717579522 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:57:31.323112832 +0000
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
vis arm2,0 vis arm2,0
vis arm3,0 vis arm3,0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:53:35.913570934 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 18:57:30.523092501 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:53:36.717579522 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:57:31.323112832 +0000
@@ -1125,33 +1125,6 @@ @@ -1125,33 +1125,6 @@
{ {
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
@@ -47,8 +47,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:53:35.913570934 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 18:57:30.523092501 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:53:36.717579522 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:57:31.327112934 +0000
@@ -12,28 +12,307 @@ @@ -12,28 +12,307 @@
Events Events
@@ -407,330 +407,3 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
// get Type // get Type
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:53:35.913570934 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:53:36.717579522 +0000
@@ -643,8 +643,8 @@
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
{
- //heading
- spstr strCommand.txt,tHeading.txt,",",1
+ //entn
+ spstr strCommand.txt,entn.txt,",",1
// navigation icons
spstr strCommand.txt,tId.txt,",",2
spstr tId.txt,tTmp.txt,"|",0
@@ -672,189 +672,109 @@
vis bPrev,1
bNext.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!="")
- {
- // set icon
- covx tTmp.txt,sys0,0,0
- substr pageIcons.tIcons.txt,bt0.txt,sys0,1
- // set text color on active state
+ //text arm1
+ spstr strCommand.txt,arm1.txt,",",3
+ if(arm1.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,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
+ substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
+ //icon color
+ spstr strCommand.txt,tTmp.txt,",",12
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!="")
+ 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")
{
- // 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!="")
+ tmFlash.en=1
+ }else
{
- // 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!="")
+ tmFlash.en=0
+ }
+ }
+ if(tInstruction.txt=="time")
{
- // 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!="")
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1
+ }
+ if(tInstruction.txt=="date")
{
- // 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!="")
+ // get set date to global variable
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
+ }
+ if(tInstruction.txt=="dimmode")
{
- // 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
+ // 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")
{
@@ -911,28 +831,6 @@
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

View File

@@ -1196,8 +1196,8 @@ Timer tmSerial
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//entn //heading
spstr strCommand.txt,entn.txt,",",1 spstr strCommand.txt,tHeading.txt,",",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,",",2 spstr strCommand.txt,tId.txt,",",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -1225,176 +1225,278 @@ Timer tmSerial
vis bPrev,1 vis bPrev,1
bNext.txt="" bNext.txt=""
} }
//text arm1 //entity name
spstr strCommand.txt,arm1.txt,",",3 spstr strCommand.txt,entn.txt,",",3
if(arm1.txt!="") //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 // set icon
} covx tTmp.txt,sys0,0,0
//id arm1 substr pageIcons.tIcons.txt,bt0.txt,sys0,1
spstr strCommand.txt,va1.txt,",",4 // set text color on active state
//text arm2 spstr strCommand.txt,tTmp.txt,",",11
spstr strCommand.txt,arm2.txt,",",5 covx tTmp.txt,bt0.pco2,0,0
if(arm2.txt!="") // set state
{ spstr strCommand.txt,tTmp.txt,",",12
vis arm2,1 covx tTmp.txt,bt0.val,0,0
} // save action
//id arm2 spstr strCommand.txt,va0.txt,",",13
spstr strCommand.txt,va2.txt,",",6 //enable
//text arm3 vis bt0,1
spstr strCommand.txt,arm3.txt,",",7 } //bt1
if(arm3.txt!="") spstr strCommand.txt,tTmp.txt,",",14
{ if(tTmp.txt!="")
vis arm3,1 {
} // set icon
//id arm3 covx tTmp.txt,sys0,0,0
spstr strCommand.txt,va3.txt,",",8 substr pageIcons.tIcons.txt,bt1.txt,sys0,1
//text arm4 // set text color on active state
spstr strCommand.txt,arm4.txt,",",9 spstr strCommand.txt,tTmp.txt,",",15
if(arm4.txt!="") covx tTmp.txt,bt1.pco2,0,0
{ // set state
vis arm4,1 spstr strCommand.txt,tTmp.txt,",",16
} covx tTmp.txt,bt1.val,0,0
//id arm4 // save action
spstr strCommand.txt,va4.txt,",",10 spstr strCommand.txt,va1.txt,",",17
//icon //enable
spstr strCommand.txt,tTmp.txt,",",11 vis bt1,1
covx tTmp.txt,sys0,0,0 } //bt2
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 spstr strCommand.txt,tTmp.txt,",",18
//icon color if(tTmp.txt!="")
spstr strCommand.txt,tTmp.txt,",",12 {
covx tTmp.txt,sys0,0,0 // set icon
tIcon.pco=sys0 covx tTmp.txt,sys0,0,0
//numpad status substr pageIcons.tIcons.txt,bt2.txt,sys0,1
spstr strCommand.txt,tTmp.txt,",",13 // set text color on active state
if(tTmp.txt!="disable") spstr strCommand.txt,tTmp.txt,",",19
{ covx tTmp.txt,bt2.pco2,0,0
vis b0,1 // set state
vis b1,1 spstr strCommand.txt,tTmp.txt,",",20
vis b2,1 covx tTmp.txt,bt2.val,0,0
vis b3,1 // save action
vis b4,1 spstr strCommand.txt,va2.txt,",",21
vis b5,1 //enable
vis b6,1 vis bt2,1
vis b7,1 } //bt3
vis b8,1 spstr strCommand.txt,tTmp.txt,",",22
vis b9,1 if(tTmp.txt!="")
vis b10,1 {
vis tCode,1 // set icon
}else covx tTmp.txt,sys0,0,0
{ substr pageIcons.tIcons.txt,bt3.txt,sys0,1
vis b0,0 // set text color on active state
vis b1,0 spstr strCommand.txt,tTmp.txt,",",23
vis b2,0 covx tTmp.txt,bt3.pco2,0,0
vis b3,0 // set state
vis b4,0 spstr strCommand.txt,tTmp.txt,",",24
vis b5,0 covx tTmp.txt,bt3.val,0,0
vis b6,0 // save action
vis b7,0 spstr strCommand.txt,va3.txt,",",25
vis b8,0 //enable
vis b9,0 vis bt3,1
vis b10,0 } //bt4
vis tCode,0 spstr strCommand.txt,tTmp.txt,",",26
} if(tTmp.txt!="")
//flashing status {
spstr strCommand.txt,tTmp.txt,",",14 // set icon
if(tTmp.txt=="enable") covx tTmp.txt,sys0,0,0
{ substr pageIcons.tIcons.txt,bt4.txt,sys0,1
tmFlash.en=1 // set text color on active state
}else spstr strCommand.txt,tTmp.txt,",",27
{ covx tTmp.txt,bt4.pco2,0,0
tmFlash.en=0 // set state
} spstr strCommand.txt,tTmp.txt,",",28
} covx tTmp.txt,bt4.val,0,0
if(tInstruction.txt=="time") // save action
{ spstr strCommand.txt,va4.txt,",",29
// get set time to global variable //enable
spstr strCommand.txt,pageIcons.vaTime.txt,",",1 vis bt4,1
} } //bt5
if(tInstruction.txt=="date") spstr strCommand.txt,tTmp.txt,",",30
{ if(tTmp.txt!="")
// get set date to global variable {
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 // set icon
} covx tTmp.txt,sys0,0,0
if(tInstruction.txt=="dimmode") substr pageIcons.tIcons.txt,bt5.txt,sys0,1
{ // set text color on active state
// get value spstr strCommand.txt,tTmp.txt,",",31
spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,bt5.pco2,0,0
covx tTmp.txt,dimValue,0,0 // set state
dim=dimValue spstr strCommand.txt,tTmp.txt,",",32
} covx tTmp.txt,bt5.val,0,0
if(tInstruction.txt=="timeout") // save action
{ spstr strCommand.txt,va5.txt,",",33
//set timeout to global var //enable
spstr strCommand.txt,tTmp.txt,",",1 vis bt5,1
covx tTmp.txt,sleepTimeout,0,0 } //bt6
} spstr strCommand.txt,tTmp.txt,",",34
if(tInstruction.txt=="pageType") if(tTmp.txt!="")
{ {
//command format pageType,specialPageName // set icon
//write name of speical page to tId covx tTmp.txt,sys0,0,0
spstr strCommand.txt,tId.txt,",",1 substr pageIcons.tIcons.txt,bt6.txt,sys0,1
//save second arg if there's one // set text color on active state
spstr strCommand.txt,tTmp.txt,",",2 spstr strCommand.txt,tTmp.txt,",",35
//save third arg if there's one covx tTmp.txt,bt6.pco2,0,0
spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 // set state
//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 ... spstr strCommand.txt,tTmp.txt,",",36
udelete payloadLength-1 covx tTmp.txt,bt6.val,0,0
bufferPos=0 // save action
if(tId.txt=="pageStartup") spstr strCommand.txt,va6.txt,",",37
{ //enable
page pageStartup vis bt6,1
} } //bt7
if(tId.txt=="screensaver") spstr strCommand.txt,tTmp.txt,",",38
{ if(tTmp.txt!="")
page screensaver {
} // set icon
if(tId.txt=="cardEntities") covx tTmp.txt,sys0,0,0
{ substr pageIcons.tIcons.txt,bt7.txt,sys0,1
page cardEntities // set text color on active state
} spstr strCommand.txt,tTmp.txt,",",39
if(tId.txt=="cardGrid") covx tTmp.txt,bt7.pco2,0,0
{ // set state
page cardGrid spstr strCommand.txt,tTmp.txt,",",40
} covx tTmp.txt,bt7.val,0,0
if(tId.txt=="popupLight") // save action
{ spstr strCommand.txt,va7.txt,",",41
pageIcons.tTmp1.txt=tTmp.txt //enable
page popupLight vis bt7,1
} } //bt8
if(tId.txt=="popupShutter") spstr strCommand.txt,tTmp.txt,",",42
{ if(tTmp.txt!="")
pageIcons.tTmp1.txt=tTmp.txt {
page popupShutter // set icon
} covx tTmp.txt,sys0,0,0
if(tId.txt=="popupNotify") substr pageIcons.tIcons.txt,bt8.txt,sys0,1
{ // set text color on active state
page popupNotify spstr strCommand.txt,tTmp.txt,",",43
} covx tTmp.txt,bt8.pco2,0,0
if(tId.txt=="cardThermo") // set state
{ spstr strCommand.txt,tTmp.txt,",",44
page cardThermo covx tTmp.txt,bt8.val,0,0
} // save action
if(tId.txt=="cardMedia") spstr strCommand.txt,va8.txt,",",45
{ //enable
page cardMedia vis bt8,1
} }
if(tId.txt=="cardAlarm") }
{ if(tInstruction.txt=="pageType")
page cardAlarm {
} //command format pageType,specialPageName
} //write name of speical page to tId
// end of user code spstr strCommand.txt,tId.txt,",",1
udelete payloadLength-1 //save second arg if there's one
bufferPos=0 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
// next character bufferPos=0
bufferPos++ 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 Timer tmSleep
Attributes Attributes

View File

@@ -22,6 +22,10 @@ pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
113 Unique 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 screensaver
29 Component(s) 29 Component(s)
182 Line(s) of event code 182 Line(s) of event code
@@ -34,18 +38,14 @@ cardMedia
30 Component(s) 30 Component(s)
331 Line(s) of event code 331 Line(s) of event code
169 Unique line(s) of event code 169 Unique line(s) of event code
cardAlarm cardThermo
35 Component(s) 41 Component(s)
343 Line(s) of event code 458 Line(s) of event code
214 Unique line(s) of event code 283 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
322 Line(s) of event code 322 Line(s) of event code
173 Unique 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 cardEntities
62 Component(s) 62 Component(s)
944 Line(s) of event code 944 Line(s) of event code
@@ -58,5 +58,5 @@ cardGrid
Total Total
13 Page(s) 13 Page(s)
351 Component(s) 351 Component(s)
3721 Line(s) of event code 3781 Line(s) of event code
862 Unique line(s) of event code 1027 Unique line(s) of event code

View File

@@ -643,8 +643,8 @@ Timer tmSerial
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//entn //heading
spstr strCommand.txt,entn.txt,",",1 spstr strCommand.txt,tHeading.txt,",",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,",",2 spstr strCommand.txt,tId.txt,",",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -672,176 +672,278 @@ Timer tmSerial
vis bPrev,1 vis bPrev,1
bNext.txt="" bNext.txt=""
} }
//text arm1 //entity name
spstr strCommand.txt,arm1.txt,",",3 spstr strCommand.txt,entn.txt,",",3
if(arm1.txt!="") //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 // set icon
} covx tTmp.txt,sys0,0,0
//id arm1 substr pageIcons.tIcons.txt,bt0.txt,sys0,1
spstr strCommand.txt,va1.txt,",",4 // set text color on active state
//text arm2 spstr strCommand.txt,tTmp.txt,",",11
spstr strCommand.txt,arm2.txt,",",5 covx tTmp.txt,bt0.pco2,0,0
if(arm2.txt!="") // set state
{ spstr strCommand.txt,tTmp.txt,",",12
vis arm2,1 covx tTmp.txt,bt0.val,0,0
} // save action
//id arm2 spstr strCommand.txt,va0.txt,",",13
spstr strCommand.txt,va2.txt,",",6 //enable
//text arm3 vis bt0,1
spstr strCommand.txt,arm3.txt,",",7 } //bt1
if(arm3.txt!="") spstr strCommand.txt,tTmp.txt,",",14
{ if(tTmp.txt!="")
vis arm3,1 {
} // set icon
//id arm3 covx tTmp.txt,sys0,0,0
spstr strCommand.txt,va3.txt,",",8 substr pageIcons.tIcons.txt,bt1.txt,sys0,1
//text arm4 // set text color on active state
spstr strCommand.txt,arm4.txt,",",9 spstr strCommand.txt,tTmp.txt,",",15
if(arm4.txt!="") covx tTmp.txt,bt1.pco2,0,0
{ // set state
vis arm4,1 spstr strCommand.txt,tTmp.txt,",",16
} covx tTmp.txt,bt1.val,0,0
//id arm4 // save action
spstr strCommand.txt,va4.txt,",",10 spstr strCommand.txt,va1.txt,",",17
//icon //enable
spstr strCommand.txt,tTmp.txt,",",11 vis bt1,1
covx tTmp.txt,sys0,0,0 } //bt2
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 spstr strCommand.txt,tTmp.txt,",",18
//icon color if(tTmp.txt!="")
spstr strCommand.txt,tTmp.txt,",",12 {
covx tTmp.txt,sys0,0,0 // set icon
tIcon.pco=sys0 covx tTmp.txt,sys0,0,0
//numpad status substr pageIcons.tIcons.txt,bt2.txt,sys0,1
spstr strCommand.txt,tTmp.txt,",",13 // set text color on active state
if(tTmp.txt!="disable") spstr strCommand.txt,tTmp.txt,",",19
{ covx tTmp.txt,bt2.pco2,0,0
vis b0,1 // set state
vis b1,1 spstr strCommand.txt,tTmp.txt,",",20
vis b2,1 covx tTmp.txt,bt2.val,0,0
vis b3,1 // save action
vis b4,1 spstr strCommand.txt,va2.txt,",",21
vis b5,1 //enable
vis b6,1 vis bt2,1
vis b7,1 } //bt3
vis b8,1 spstr strCommand.txt,tTmp.txt,",",22
vis b9,1 if(tTmp.txt!="")
vis b10,1 {
vis tCode,1 // set icon
}else covx tTmp.txt,sys0,0,0
{ substr pageIcons.tIcons.txt,bt3.txt,sys0,1
vis b0,0 // set text color on active state
vis b1,0 spstr strCommand.txt,tTmp.txt,",",23
vis b2,0 covx tTmp.txt,bt3.pco2,0,0
vis b3,0 // set state
vis b4,0 spstr strCommand.txt,tTmp.txt,",",24
vis b5,0 covx tTmp.txt,bt3.val,0,0
vis b6,0 // save action
vis b7,0 spstr strCommand.txt,va3.txt,",",25
vis b8,0 //enable
vis b9,0 vis bt3,1
vis b10,0 } //bt4
vis tCode,0 spstr strCommand.txt,tTmp.txt,",",26
} if(tTmp.txt!="")
//flashing status {
spstr strCommand.txt,tTmp.txt,",",14 // set icon
if(tTmp.txt=="enable") covx tTmp.txt,sys0,0,0
{ substr pageIcons.tIcons.txt,bt4.txt,sys0,1
tmFlash.en=1 // set text color on active state
}else spstr strCommand.txt,tTmp.txt,",",27
{ covx tTmp.txt,bt4.pco2,0,0
tmFlash.en=0 // set state
} spstr strCommand.txt,tTmp.txt,",",28
} covx tTmp.txt,bt4.val,0,0
if(tInstruction.txt=="time") // save action
{ spstr strCommand.txt,va4.txt,",",29
// get set time to global variable //enable
spstr strCommand.txt,pageIcons.vaTime.txt,",",1 vis bt4,1
} } //bt5
if(tInstruction.txt=="date") spstr strCommand.txt,tTmp.txt,",",30
{ if(tTmp.txt!="")
// get set date to global variable {
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 // set icon
} covx tTmp.txt,sys0,0,0
if(tInstruction.txt=="dimmode") substr pageIcons.tIcons.txt,bt5.txt,sys0,1
{ // set text color on active state
// get value spstr strCommand.txt,tTmp.txt,",",31
spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,bt5.pco2,0,0
covx tTmp.txt,dimValue,0,0 // set state
dim=dimValue spstr strCommand.txt,tTmp.txt,",",32
} covx tTmp.txt,bt5.val,0,0
if(tInstruction.txt=="timeout") // save action
{ spstr strCommand.txt,va5.txt,",",33
//set timeout to global var //enable
spstr strCommand.txt,tTmp.txt,",",1 vis bt5,1
covx tTmp.txt,sleepTimeout,0,0 } //bt6
} spstr strCommand.txt,tTmp.txt,",",34
if(tInstruction.txt=="pageType") if(tTmp.txt!="")
{ {
//command format pageType,specialPageName // set icon
//write name of speical page to tId covx tTmp.txt,sys0,0,0
spstr strCommand.txt,tId.txt,",",1 substr pageIcons.tIcons.txt,bt6.txt,sys0,1
//save second arg if there's one // set text color on active state
spstr strCommand.txt,tTmp.txt,",",2 spstr strCommand.txt,tTmp.txt,",",35
//save third arg if there's one covx tTmp.txt,bt6.pco2,0,0
spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 // set state
//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 ... spstr strCommand.txt,tTmp.txt,",",36
udelete payloadLength-1 covx tTmp.txt,bt6.val,0,0
bufferPos=0 // save action
if(tId.txt=="pageStartup") spstr strCommand.txt,va6.txt,",",37
{ //enable
page pageStartup vis bt6,1
} } //bt7
if(tId.txt=="screensaver") spstr strCommand.txt,tTmp.txt,",",38
{ if(tTmp.txt!="")
page screensaver {
} // set icon
if(tId.txt=="cardEntities") covx tTmp.txt,sys0,0,0
{ substr pageIcons.tIcons.txt,bt7.txt,sys0,1
page cardEntities // set text color on active state
} spstr strCommand.txt,tTmp.txt,",",39
if(tId.txt=="cardGrid") covx tTmp.txt,bt7.pco2,0,0
{ // set state
page cardGrid spstr strCommand.txt,tTmp.txt,",",40
} covx tTmp.txt,bt7.val,0,0
if(tId.txt=="popupLight") // save action
{ spstr strCommand.txt,va7.txt,",",41
pageIcons.tTmp1.txt=tTmp.txt //enable
page popupLight vis bt7,1
} } //bt8
if(tId.txt=="popupShutter") spstr strCommand.txt,tTmp.txt,",",42
{ if(tTmp.txt!="")
pageIcons.tTmp1.txt=tTmp.txt {
page popupShutter // set icon
} covx tTmp.txt,sys0,0,0
if(tId.txt=="popupNotify") substr pageIcons.tIcons.txt,bt8.txt,sys0,1
{ // set text color on active state
page popupNotify spstr strCommand.txt,tTmp.txt,",",43
} covx tTmp.txt,bt8.pco2,0,0
if(tId.txt=="cardThermo") // set state
{ spstr strCommand.txt,tTmp.txt,",",44
page cardThermo covx tTmp.txt,bt8.val,0,0
} // save action
if(tId.txt=="cardMedia") spstr strCommand.txt,va8.txt,",",45
{ //enable
page cardMedia vis bt8,1
} }
if(tId.txt=="cardAlarm") }
{ if(tInstruction.txt=="pageType")
page cardAlarm {
} //command format pageType,specialPageName
} //write name of speical page to tId
// end of user code spstr strCommand.txt,tId.txt,",",1
udelete payloadLength-1 //save second arg if there's one
bufferPos=0 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
// next character bufferPos=0
bufferPos++ 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 Timer tmSleep
Attributes Attributes

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-31 18:53:35.913570934 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-31 18:57:30.523092501 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:53:36.313575206 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:57:30.927102768 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:53:35.913570934 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:57:30.523092501 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:53:36.313575206 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:57:30.927102768 +0000
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -148,8 +148,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
{ {
tmFlash.en=1 tmFlash.en=1
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:53:35.913570934 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 18:57:30.523092501 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:53:36.313575206 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:57:30.927102768 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -966,8 +966,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:53:35.913570934 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 18:57:30.523092501 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:53:36.313575206 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:57:30.927102768 +0000
@@ -242,12 +242,7 @@ @@ -242,12 +242,7 @@
Events Events
@@ -1017,8 +1017,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:53:35.913570934 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-31 18:57:30.523092501 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:53:36.313575206 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:57:30.927102768 +0000
@@ -435,12 +435,7 @@ @@ -435,12 +435,7 @@
Events Events
@@ -1116,8 +1116,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
{ {
vis t5,0 vis t5,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:53:35.913570934 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-31 18:57:30.523092501 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:53:36.313575206 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:57:30.927102768 +0000
@@ -329,12 +329,7 @@ @@ -329,12 +329,7 @@
Events Events
@@ -1460,8 +1460,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 18:53:35.913570934 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-31 18:57:30.523092501 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:53:36.313575206 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:57:30.927102768 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled