h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-20 14:37:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed popup pages (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-01 17:26:00 +00:00
committed by GitHub Actions
parent 13d353d65f
commit 809acb3962
23 changed files with 415 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
HMI/US/landscape/diff-eu-version.txt
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-04-01 15:25:01.342399464 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 15:25:02.174410141 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 17:25:59.457580623 +0000
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -94,7 +94,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tTmp.txt=="enable") if(tTmp.txt=="enable")
{ {
tmFlash.en=1 tmFlash.en=1
@@ -628,7 +629,7 @@ @@ -628,35 +629,35 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
@@ -103,7 +103,10 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -638,25 +639,25 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -135,8 +138,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=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-04-01 15:25:01.342399464 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-01 17:25:58.649575467 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 15:25:02.178410192 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 17:25:59.457580623 +0000
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
@@ -531,7 +534,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
//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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -1707,7 +1680,7 @@ @@ -1707,23 +1680,23 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
@@ -540,7 +543,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -1717,13 +1690,13 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -557,8 +563,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
} }
// end of user code // end of user code
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-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/cardGrid.txt 2022-04-01 17:25:58.649575467 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 15:25:02.178410192 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 17:25:59.457580623 +0000
@@ -12,28 +12,307 @@ @@ -12,28 +12,307 @@
Events Events
@@ -1105,7 +1111,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
//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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -797,7 +1049,7 @@ @@ -797,23 +1049,23 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
@@ -1114,7 +1120,10 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -807,13 +1059,13 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -1131,8 +1140,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
} }
// end of user code // end of user code
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/cardMedia.txt 2022-04-01 17:25:58.649575467 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-01 15:25:02.174410141 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-01 17:25:59.457580623 +0000
@@ -503,13 +503,13 @@ @@ -503,13 +503,13 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
@@ -1149,7 +1158,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
@@ -583,7 +583,7 @@ @@ -583,35 +583,35 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
@@ -1158,7 +1167,10 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -593,25 +593,25 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -1190,8 +1202,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-04-01 15:25:01.342399464 +0000 --- HMI/n2t-out/cardThermo.txt 2022-04-01 17:25:58.649575467 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-01 15:25:02.174410141 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-01 17:25:59.457580623 +0000
@@ -640,13 +640,13 @@ @@ -640,13 +640,13 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
@@ -1448,7 +1460,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -914,7 +914,7 @@ @@ -914,23 +914,23 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
@@ -1457,7 +1469,10 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -924,13 +924,13 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -1474,8 +1489,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
} }
// end of user code // end of user code
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/pageIcons.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 15:25:02.174410141 +0000 +++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 17:25:59.457580623 +0000
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
Attributes Attributes
Scope : global Scope : global
@@ -1486,9 +1501,9 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
Text tIcons Text tIcons
Attributes Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-01 15:25:02.174410141 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-01 17:25:59.457580623 +0000
@@ -257,11 +257,11 @@ @@ -257,27 +257,27 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
@@ -1502,7 +1517,10 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -271,13 +271,13 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -1534,8 +1552,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/popupLight.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-01 15:25:02.174410141 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-01 17:25:59.457580623 +0000
@@ -438,24 +438,24 @@ @@ -438,24 +438,24 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
@@ -1545,23 +1563,23 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// change icon // change icon
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
- spstr strCommand.txt,tTmp.txt,"}",2 - spstr strCommand.txt,tTmp.txt,"~",2
+ spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,",",2
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 tIcon1.pco=sys0
// get Button State // get Button State
- spstr strCommand.txt,tTmp.txt,"}",3 - spstr strCommand.txt,tTmp.txt,"~",3
+ spstr strCommand.txt,tTmp.txt,",",3 + spstr strCommand.txt,tTmp.txt,",",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0 btOnOff1.val=sys0
// get Brightness value // get Brightness value
- spstr strCommand.txt,tTmp.txt,"}",4 - spstr strCommand.txt,tTmp.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,",",4 + spstr strCommand.txt,tTmp.txt,",",4
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -1570,7 +1588,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
} }
} }
// get ColorTemp value // get ColorTemp value
- spstr strCommand.txt,tTmp.txt,"}",5 - spstr strCommand.txt,tTmp.txt,"~",5
+ spstr strCommand.txt,tTmp.txt,",",5 + spstr strCommand.txt,tTmp.txt,",",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -1579,32 +1597,35 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
} }
} }
// get Color value // get Color value
- spstr strCommand.txt,tTmp.txt,"}",6 - spstr strCommand.txt,tTmp.txt,"~",6
+ spstr strCommand.txt,tTmp.txt,",",6 + spstr strCommand.txt,tTmp.txt,",",6
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -541,7 +541,7 @@ @@ -541,34 +541,34 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -551,24 +551,24 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
@@ -1612,50 +1633,102 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
{ {
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
- spstr strCommand.txt,tId.txt,"}",1 - spstr strCommand.txt,tId.txt,"~",1
+ spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,",",1
//save second arg if there's one //save second arg if there's one
- spstr strCommand.txt,tTmp.txt,"}",2 - spstr strCommand.txt,tTmp.txt,"~",2
+ spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,",",2
//save third arg if there's one //save third arg if there's one
- spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+ spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/popupNotify.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-01 15:25:02.174410141 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-01 17:25:59.457580623 +0000
@@ -251,7 +251,7 @@ @@ -251,70 +251,70 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
- spstr strCommand.txt,tInstruction.txt,"}",0 - spstr strCommand.txt,tInstruction.txt,"~",0
+ spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// get entn // get entn
@@ -298,7 +298,7 @@ - spstr strCommand.txt,entn.txt,"~",1
+ spstr strCommand.txt,entn.txt,"|",1
// get Heading
- spstr strCommand.txt,tHeading.txt,"~",2
+ spstr strCommand.txt,tHeading.txt,"|",2
// heading color
- spstr strCommand.txt,tTmp.txt,"~",3
+ spstr strCommand.txt,tTmp.txt,"|",3
covx tTmp.txt,sys0,0,0
tHeading.pco=sys0
// get b1
- spstr strCommand.txt,b1.txt,"~",4
+ spstr strCommand.txt,b1.txt,"|",4
if(b1.txt!="")
{
vis b1,1
}
// b1 color
- spstr strCommand.txt,tTmp.txt,"~",5
+ spstr strCommand.txt,tTmp.txt,"|",5
covx tTmp.txt,sys0,0,0
b1.pco=sys0
// get b2
- spstr strCommand.txt,b2.txt,"~",6
+ spstr strCommand.txt,b2.txt,"|",6
if(b2.txt!="")
{
vis b2,1
}
// b2 color
- spstr strCommand.txt,tTmp.txt,"~",7
+ spstr strCommand.txt,tTmp.txt,"|",7
covx tTmp.txt,sys0,0,0
b2.pco=sys0
// get tText
- spstr strCommand.txt,tText.txt,"~",8
+ spstr strCommand.txt,tText.txt,"|",8
// tText color
- spstr strCommand.txt,tTmp.txt,"~",9
+ spstr strCommand.txt,tTmp.txt,"|",9
covx tTmp.txt,sys0,0,0
tText.pco=sys0
//preserve old sleepTimeout
vaOldSleepT.val=sleepTimeout
// sleep timeout
- spstr strCommand.txt,tTmp.txt,"~",10
+ spstr strCommand.txt,tTmp.txt,"|",10
covx tTmp.txt,sys0,0,0
sleepTimeout=sys0
}
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -308,13 +308,13 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
@@ -1664,30 +1737,30 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
sleepTimeout=vaOldSleepT.val sleepTimeout=vaOldSleepT.val
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
- spstr strCommand.txt,tId.txt,"}",1 - spstr strCommand.txt,tId.txt,"~",1
+ spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,",",1
//save second arg if there's one //save second arg if there's one
- spstr strCommand.txt,tTmp.txt,"}",2 - spstr strCommand.txt,tTmp.txt,"~",2
+ spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,",",2
//save third arg if there's one //save third arg if there's one
- spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+ spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/popupShutter.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-01 15:25:02.174410141 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-01 17:25:59.457580623 +0000
@@ -324,24 +324,24 @@ @@ -324,45 +324,45 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
- spstr strCommand.txt,tInstruction.txt,"}",0 - spstr strCommand.txt,tInstruction.txt,"~",0
+ spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// get Position value // get Position value
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hPosition.val=sys0 hPosition.val=sys0
@@ -1695,23 +1768,26 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -351,18 +351,18 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
@@ -1719,20 +1795,20 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
{ {
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
- spstr strCommand.txt,tId.txt,"}",1 - spstr strCommand.txt,tId.txt,"~",1
+ spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,",",1
//save second arg if there's one //save second arg if there's one
- spstr strCommand.txt,tTmp.txt,"}",2 - spstr strCommand.txt,tTmp.txt,"~",2
+ spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,",",2
//save third arg if there's one //save third arg if there's one
- spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+ spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-01 15:25:01.342399464 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-01 17:25:58.649575467 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 15:25:02.174410141 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 17:25:59.457580623 +0000
@@ -30,6 +30,26 @@ @@ -30,6 +30,26 @@
vis tSend,0 vis tSend,0
//page open event //page open event
@@ -1918,7 +1994,14 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="") if(tAMPM.txt=="")
@@ -388,98 +368,60 @@ @@ -382,104 +362,66 @@
if(tInstruction.txt=="date")
{
//get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
tDate.txt=pageIcons.vaDate.txt
}
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var

221
HMI/US/portrait/diff-eu-version.txt
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-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 17:25:59.041577968 +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-04-01 15:25:01.342399464 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-01 17:25:59.041577968 +0000
@@ -512,13 +512,13 @@ @@ -512,13 +512,13 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
@@ -98,7 +98,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
if(tTmp.txt=="enable") if(tTmp.txt=="enable")
{ {
tmFlash.en=1 tmFlash.en=1
@@ -628,7 +628,7 @@ @@ -628,35 +628,35 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
@@ -107,7 +107,10 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -638,25 +638,25 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -139,8 +142,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
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-04-01 15:25:01.342399464 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-01 17:25:58.649575467 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 17:25:59.045577994 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -1246,7 +1249,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
//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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -1707,7 +2411,7 @@ @@ -1707,23 +2411,23 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
@@ -1255,7 +1258,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -1717,13 +2421,13 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -1272,8 +1278,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
} }
// end of user code // end of user code
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-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/cardGrid.txt 2022-04-01 17:25:58.649575467 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-01 17:25:59.041577968 +0000
@@ -568,13 +568,13 @@ @@ -568,13 +568,13 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
@@ -1478,7 +1484,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
//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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -797,7 +797,7 @@ @@ -797,23 +797,23 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
@@ -1487,7 +1493,10 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -807,13 +807,13 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -1504,8 +1513,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
} }
// end of user code // end of user code
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-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/cardMedia.txt 2022-04-01 17:25:58.649575467 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-01 17:25:59.041577968 +0000
@@ -503,13 +503,13 @@ @@ -503,13 +503,13 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
@@ -1522,7 +1531,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
@@ -583,7 +583,7 @@ @@ -583,35 +583,35 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
@@ -1531,7 +1540,10 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -593,25 +593,25 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -1563,8 +1575,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=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-04-01 15:25:01.342399464 +0000 --- HMI/n2t-out/cardThermo.txt 2022-04-01 17:25:58.649575467 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-01 17:25:59.041577968 +0000
@@ -640,13 +640,13 @@ @@ -640,13 +640,13 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
@@ -1821,7 +1833,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -914,7 +914,7 @@ @@ -914,23 +914,23 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
@@ -1830,7 +1842,10 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -924,13 +924,13 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -1847,8 +1862,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
} }
// end of user code // end of user code
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-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 17:25:59.041577968 +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
@@ -1867,7 +1882,7 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -257,11 +257,11 @@ @@ -257,27 +257,27 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
@@ -1881,7 +1896,10 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -271,13 +271,13 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
@@ -1913,8 +1931,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/popupLight.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-01 17:25:59.041577968 +0000
@@ -438,24 +438,24 @@ @@ -438,24 +438,24 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
@@ -1924,23 +1942,23 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// change icon // change icon
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
- spstr strCommand.txt,tTmp.txt,"}",2 - spstr strCommand.txt,tTmp.txt,"~",2
+ spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,",",2
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 tIcon1.pco=sys0
// get Button State // get Button State
- spstr strCommand.txt,tTmp.txt,"}",3 - spstr strCommand.txt,tTmp.txt,"~",3
+ spstr strCommand.txt,tTmp.txt,",",3 + spstr strCommand.txt,tTmp.txt,",",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0 btOnOff1.val=sys0
// get Brightness value // get Brightness value
- spstr strCommand.txt,tTmp.txt,"}",4 - spstr strCommand.txt,tTmp.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,",",4 + spstr strCommand.txt,tTmp.txt,",",4
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -1949,7 +1967,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
} }
} }
// get ColorTemp value // get ColorTemp value
- spstr strCommand.txt,tTmp.txt,"}",5 - spstr strCommand.txt,tTmp.txt,"~",5
+ spstr strCommand.txt,tTmp.txt,",",5 + spstr strCommand.txt,tTmp.txt,",",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -1958,32 +1976,35 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
} }
} }
// get Color value // get Color value
- spstr strCommand.txt,tTmp.txt,"}",6 - spstr strCommand.txt,tTmp.txt,"~",6
+ spstr strCommand.txt,tTmp.txt,",",6 + spstr strCommand.txt,tTmp.txt,",",6
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -541,7 +541,7 @@ @@ -541,34 +541,34 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -551,24 +551,24 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
@@ -1991,50 +2012,102 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
{ {
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
- spstr strCommand.txt,tId.txt,"}",1 - spstr strCommand.txt,tId.txt,"~",1
+ spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,",",1
//save second arg if there's one //save second arg if there's one
- spstr strCommand.txt,tTmp.txt,"}",2 - spstr strCommand.txt,tTmp.txt,"~",2
+ spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,",",2
//save third arg if there's one //save third arg if there's one
- spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+ spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/popupNotify.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-01 17:25:59.041577968 +0000
@@ -251,7 +251,7 @@ @@ -251,70 +251,70 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
- spstr strCommand.txt,tInstruction.txt,"}",0 - spstr strCommand.txt,tInstruction.txt,"~",0
+ spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// get entn // get entn
@@ -298,7 +298,7 @@ - spstr strCommand.txt,entn.txt,"~",1
+ spstr strCommand.txt,entn.txt,"|",1
// get Heading
- spstr strCommand.txt,tHeading.txt,"~",2
+ spstr strCommand.txt,tHeading.txt,"|",2
// heading color
- spstr strCommand.txt,tTmp.txt,"~",3
+ spstr strCommand.txt,tTmp.txt,"|",3
covx tTmp.txt,sys0,0,0
tHeading.pco=sys0
// get b1
- spstr strCommand.txt,b1.txt,"~",4
+ spstr strCommand.txt,b1.txt,"|",4
if(b1.txt!="")
{
vis b1,1
}
// b1 color
- spstr strCommand.txt,tTmp.txt,"~",5
+ spstr strCommand.txt,tTmp.txt,"|",5
covx tTmp.txt,sys0,0,0
b1.pco=sys0
// get b2
- spstr strCommand.txt,b2.txt,"~",6
+ spstr strCommand.txt,b2.txt,"|",6
if(b2.txt!="")
{
vis b2,1
}
// b2 color
- spstr strCommand.txt,tTmp.txt,"~",7
+ spstr strCommand.txt,tTmp.txt,"|",7
covx tTmp.txt,sys0,0,0
b2.pco=sys0
// get tText
- spstr strCommand.txt,tText.txt,"~",8
+ spstr strCommand.txt,tText.txt,"|",8
// tText color
- spstr strCommand.txt,tTmp.txt,"~",9
+ spstr strCommand.txt,tTmp.txt,"|",9
covx tTmp.txt,sys0,0,0
tText.pco=sys0
//preserve old sleepTimeout
vaOldSleepT.val=sleepTimeout
// sleep timeout
- spstr strCommand.txt,tTmp.txt,"~",10
+ spstr strCommand.txt,tTmp.txt,"|",10
covx tTmp.txt,sys0,0,0
sleepTimeout=sys0
}
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -308,13 +308,13 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
@@ -2043,30 +2116,30 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
sleepTimeout=vaOldSleepT.val sleepTimeout=vaOldSleepT.val
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
- spstr strCommand.txt,tId.txt,"}",1 - spstr strCommand.txt,tId.txt,"~",1
+ spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,",",1
//save second arg if there's one //save second arg if there's one
- spstr strCommand.txt,tTmp.txt,"}",2 - spstr strCommand.txt,tTmp.txt,"~",2
+ spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,",",2
//save third arg if there's one //save third arg if there's one
- spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+ spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-04-01 15:25:01.338399413 +0000 --- HMI/n2t-out/popupShutter.txt 2022-04-01 17:25:58.645575442 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-01 17:25:59.041577968 +0000
@@ -324,24 +324,24 @@ @@ -324,45 +324,45 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
- spstr strCommand.txt,tInstruction.txt,"}",0 - spstr strCommand.txt,tInstruction.txt,"~",0
+ spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// get Position value // get Position value
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hPosition.val=sys0 hPosition.val=sys0
@@ -2074,23 +2147,26 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
- spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 - spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
@@ -351,18 +351,18 @@ // get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
}
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
- spstr strCommand.txt,tTmp.txt,"}",1 - spstr strCommand.txt,tTmp.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
@@ -2098,20 +2174,20 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
{ {
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
- spstr strCommand.txt,tId.txt,"}",1 - spstr strCommand.txt,tId.txt,"~",1
+ spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,",",1
//save second arg if there's one //save second arg if there's one
- spstr strCommand.txt,tTmp.txt,"}",2 - spstr strCommand.txt,tTmp.txt,"~",2
+ spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,",",2
//save third arg if there's one //save third arg if there's one
- spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 - spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+ spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-01 15:25:01.342399464 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-01 17:25:58.649575467 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-01 15:25:01.750404700 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-01 17:25:59.041577968 +0000
@@ -355,7 +355,7 @@ @@ -355,7 +355,7 @@
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
@@ -2138,7 +2214,14 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
if(tAMPM.txt=="") if(tAMPM.txt=="")
@@ -388,7 +388,7 @@ @@ -382,13 +382,13 @@
if(tInstruction.txt=="date")
{
//get set date to global variable
- spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ spstr strCommand.txt,pageIcons.vaDate.txt,"?",1
tDate.txt=pageIcons.vaDate.txt
}
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var

2
HMI/n2t-out-visual/cardAlarm.txt
View File

@@ -1163,7 +1163,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

2
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -2657,7 +2657,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

2
HMI/n2t-out-visual/cardGrid.txt
View File

@@ -1239,7 +1239,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

2
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -1010,7 +1010,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

2
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -1472,7 +1472,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

34
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -14,14 +14,22 @@ pageIcons
7 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
popupShutter
19 Component(s)
178 Line(s) of event code
101 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
178 Line(s) of event code 178 Line(s) of event code
117 Unique line(s) of event code 117 Unique line(s) of event code
popupShutter
19 Component(s)
178 Line(s) of event code
101 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
214 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 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
@@ -30,10 +38,10 @@ 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
pageStartup screensaver
19 Component(s) 33 Component(s)
150 Line(s) of event code 207 Line(s) of event code
113 Unique line(s) of event code 158 Unique line(s) of event code
cardGrid cardGrid
39 Component(s) 39 Component(s)
428 Line(s) of event code 428 Line(s) of event code
@@ -42,14 +50,6 @@ cardThermo
41 Component(s) 41 Component(s)
458 Line(s) of event code 458 Line(s) of event code
283 Unique line(s) of event code 283 Unique line(s) of event code
screensaver
33 Component(s)
207 Line(s) of event code
158 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
214 Unique line(s) of event code
cardEntities cardEntities
62 Component(s) 62 Component(s)
970 Line(s) of event code 970 Line(s) of event code
@@ -59,4 +59,4 @@ Total
13 Page(s) 13 Page(s)
355 Component(s) 355 Component(s)
3637 Line(s) of event code 3637 Line(s) of event code
1059 Unique line(s) of event code 1047 Unique line(s) of event code

2
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -561,7 +561,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

26
HMI/n2t-out-visual/popupLight.txt
View File

@@ -788,20 +788,20 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"}",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 tIcon1.pco=sys0
// get Button State // get Button State
spstr strCommand.txt,tTmp.txt,"}",3 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0 btOnOff1.val=sys0
// get Brightness value // get Brightness value
spstr strCommand.txt,tTmp.txt,"}",4 spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t1,0 vis t1,0
@@ -819,7 +819,7 @@ Timer tmSerial
} }
} }
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,"}",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis hTempSlider,0 vis hTempSlider,0
@@ -863,7 +863,7 @@ Timer tmSerial
} }
} }
// get Color value // get Color value
spstr strCommand.txt,tTmp.txt,"}",6 spstr strCommand.txt,tTmp.txt,"~",6
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -887,34 +887,34 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
spstr strCommand.txt,tId.txt,"}",1 spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one //save second arg if there's one
spstr strCommand.txt,tTmp.txt,"}",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0

36
HMI/n2t-out-visual/popupNotify.txt
View File

@@ -460,70 +460,70 @@ Timer tmSerial
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"}",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// get entn // get entn
spstr strCommand.txt,entn.txt,"|",1 spstr strCommand.txt,entn.txt,"~",1
// get Heading // get Heading
spstr strCommand.txt,tHeading.txt,"|",2 spstr strCommand.txt,tHeading.txt,"~",2
// heading color // heading color
spstr strCommand.txt,tTmp.txt,"|",3 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tHeading.pco=sys0 tHeading.pco=sys0
// get b1 // get b1
spstr strCommand.txt,b1.txt,"|",4 spstr strCommand.txt,b1.txt,"~",4
if(b1.txt!="") if(b1.txt!="")
{ {
vis b1,1 vis b1,1
} }
// b1 color // b1 color
spstr strCommand.txt,tTmp.txt,"|",5 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
b1.pco=sys0 b1.pco=sys0
// get b2 // get b2
spstr strCommand.txt,b2.txt,"|",6 spstr strCommand.txt,b2.txt,"~",6
if(b2.txt!="") if(b2.txt!="")
{ {
vis b2,1 vis b2,1
} }
// b2 color // b2 color
spstr strCommand.txt,tTmp.txt,"|",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
b2.pco=sys0 b2.pco=sys0
// get tText // get tText
spstr strCommand.txt,tText.txt,"|",8 spstr strCommand.txt,tText.txt,"~",8
// tText color // tText color
spstr strCommand.txt,tTmp.txt,"|",9 spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tText.pco=sys0 tText.pco=sys0
//preserve old sleepTimeout //preserve old sleepTimeout
vaOldSleepT.val=sleepTimeout vaOldSleepT.val=sleepTimeout
// sleep timeout // sleep timeout
spstr strCommand.txt,tTmp.txt,"|",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
sleepTimeout=sys0 sleepTimeout=sys0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="exitPopup") if(tInstruction.txt=="exitPopup")
@@ -535,11 +535,11 @@ Timer tmSerial
sleepTimeout=vaOldSleepT.val sleepTimeout=vaOldSleepT.val
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
spstr strCommand.txt,tId.txt,"}",1 spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one //save second arg if there's one
spstr strCommand.txt,tTmp.txt,"}",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0

18
HMI/n2t-out-visual/popupShutter.txt
View File

@@ -589,45 +589,45 @@ Timer tmSerial
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"}",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hPosition.val=sys0 hPosition.val=sys0
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
spstr strCommand.txt,tId.txt,"}",1 spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one //save second arg if there's one
spstr strCommand.txt,tTmp.txt,"}",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0

2
HMI/n2t-out-visual/screensaver.txt
View File

@@ -904,7 +904,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
//get set date to global variable //get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
tDate.txt=pageIcons.vaDate.txt tDate.txt=pageIcons.vaDate.txt
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")

2
HMI/n2t-out/cardAlarm.txt
View File

@@ -633,7 +633,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

2
HMI/n2t-out/cardEntities.txt
View File

@@ -1712,7 +1712,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

2
HMI/n2t-out/cardGrid.txt
View File

@@ -802,7 +802,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

2
HMI/n2t-out/cardMedia.txt
View File

@@ -588,7 +588,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

2
HMI/n2t-out/cardThermo.txt
View File

@@ -919,7 +919,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

2
HMI/n2t-out/pageStartup.txt
View File

@@ -266,7 +266,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

26
HMI/n2t-out/popupLight.txt
View File

@@ -442,20 +442,20 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"}",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 tIcon1.pco=sys0
// get Button State // get Button State
spstr strCommand.txt,tTmp.txt,"}",3 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0 btOnOff1.val=sys0
// get Brightness value // get Brightness value
spstr strCommand.txt,tTmp.txt,"}",4 spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t1,0 vis t1,0
@@ -473,7 +473,7 @@ Timer tmSerial
} }
} }
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,"}",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis hTempSlider,0 vis hTempSlider,0
@@ -517,7 +517,7 @@ Timer tmSerial
} }
} }
// get Color value // get Color value
spstr strCommand.txt,tTmp.txt,"}",6 spstr strCommand.txt,tTmp.txt,"~",6
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
@@ -541,34 +541,34 @@ Timer tmSerial
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
spstr strCommand.txt,tId.txt,"}",1 spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one //save second arg if there's one
spstr strCommand.txt,tTmp.txt,"}",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0

36
HMI/n2t-out/popupNotify.txt
View File

@@ -251,70 +251,70 @@ Timer tmSerial
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"}",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// get entn // get entn
spstr strCommand.txt,entn.txt,"|",1 spstr strCommand.txt,entn.txt,"~",1
// get Heading // get Heading
spstr strCommand.txt,tHeading.txt,"|",2 spstr strCommand.txt,tHeading.txt,"~",2
// heading color // heading color
spstr strCommand.txt,tTmp.txt,"|",3 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tHeading.pco=sys0 tHeading.pco=sys0
// get b1 // get b1
spstr strCommand.txt,b1.txt,"|",4 spstr strCommand.txt,b1.txt,"~",4
if(b1.txt!="") if(b1.txt!="")
{ {
vis b1,1 vis b1,1
} }
// b1 color // b1 color
spstr strCommand.txt,tTmp.txt,"|",5 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
b1.pco=sys0 b1.pco=sys0
// get b2 // get b2
spstr strCommand.txt,b2.txt,"|",6 spstr strCommand.txt,b2.txt,"~",6
if(b2.txt!="") if(b2.txt!="")
{ {
vis b2,1 vis b2,1
} }
// b2 color // b2 color
spstr strCommand.txt,tTmp.txt,"|",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
b2.pco=sys0 b2.pco=sys0
// get tText // get tText
spstr strCommand.txt,tText.txt,"|",8 spstr strCommand.txt,tText.txt,"~",8
// tText color // tText color
spstr strCommand.txt,tTmp.txt,"|",9 spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tText.pco=sys0 tText.pco=sys0
//preserve old sleepTimeout //preserve old sleepTimeout
vaOldSleepT.val=sleepTimeout vaOldSleepT.val=sleepTimeout
// sleep timeout // sleep timeout
spstr strCommand.txt,tTmp.txt,"|",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
sleepTimeout=sys0 sleepTimeout=sys0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="exitPopup") if(tInstruction.txt=="exitPopup")
@@ -326,11 +326,11 @@ Timer tmSerial
sleepTimeout=vaOldSleepT.val sleepTimeout=vaOldSleepT.val
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
spstr strCommand.txt,tId.txt,"}",1 spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one //save second arg if there's one
spstr strCommand.txt,tTmp.txt,"}",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0

18
HMI/n2t-out/popupShutter.txt
View File

@@ -324,45 +324,45 @@ Timer tmSerial
// write command to variable strCommand // write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0 ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"}",0 spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// get Position value // get Position value
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hPosition.val=sys0 hPosition.val=sys0
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
// get value // get value
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
// get set time to global variable // get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"}",1 spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
} }
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
// get set date to global variable // get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"}",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
//command format pageType,specialPageName //command format pageType,specialPageName
//write name of speical page to tId //write name of speical page to tId
spstr strCommand.txt,tId.txt,"}",1 spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one //save second arg if there's one
spstr strCommand.txt,tTmp.txt,"}",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"}",3 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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0

2
HMI/n2t-out/screensaver.txt
View File

@@ -382,7 +382,7 @@ Timer tmSerial
if(tInstruction.txt=="date") if(tInstruction.txt=="date")
{ {
//get set date to global variable //get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
tDate.txt=pageIcons.vaDate.txt tDate.txt=pageIcons.vaDate.txt
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")