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

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

Browse Source
This commit is contained in:
joBr99
2023-01-21 20:36:23 +00:00
committed by github-actions[bot]
parent 30a96f3571
commit acb18db3f0
6 changed files with 760 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

245
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1161,7 +1161,7 @@
│ } │ }
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -29,17 +29,14 @@ │ @@ -29,22 +29,19 @@
│ } │ }
│ tDate.txt=pageIcons.vaDate.txt │ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue │ dim=dimValue
@@ -1176,9 +1176,15 @@
│ Attributes │ Attributes
│ Scope : local │ Scope : local
│ Text : │ Text :
│ Max. Text Size: 200 │ - Max. Text Size: 400
│ + Max. Text Size: 200
│ │
│ Variable (string) strTmp │ Variable (string) strTmp
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 2
│
│ @@ -103,35 +100,14 @@ │ @@ -103,35 +100,14 @@
│ Value: 0 │ Value: 0
│ │
@@ -1215,7 +1221,7 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ Associated Keyboard : none
│ @@ -294,55 +270,65 @@ │ @@ -294,65 +270,65 @@
│ Dragging : 0 │ Dragging : 0
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
@@ -1245,7 +1251,7 @@
│ Text : │ Text :
│ Max. Text Size : 10 │ Max. Text Size : 10
│ │
│ -Text tMainText │ -Text tMainIconAlt2
│ +Text tMainIcon │ +Text tMainIcon
│ Attributes │ Attributes
│ Scope : local │ Scope : local
@@ -1256,17 +1262,18 @@
│ Text : │ Text :
│ Max. Text Size : 10 │ Max. Text Size : 10
│ │
│ -Text tMainTextAlt │ -Text tMainText
│ +Text tMainIconAlt │ +Text tMainIconAlt
│ + Attributes │ Attributes
│ + Scope : local │ Scope : local
│ + Dragging : 0 │ Dragging : 0
│ + Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ + Send Component ID : disabled │ Send Component ID : disabled
│ + Associated Keyboard : none │ Associated Keyboard : none
│ + Text : │ Text :
│ + Max. Text Size : 10 │ Max. Text Size : 10
│ + │
│ -Text tMainTextAlt
│ +Text tMainText │ +Text tMainText
│ Attributes │ Attributes
│ Scope : local │ Scope : local
@@ -1286,23 +1293,60 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ Associated Keyboard : none
│ Text : │ Text :
│ @@ -456,15 +442,14 @@ │ @@ -468,14 +444,15 @@
│ {
│ // crc is okay
│ // here is the location where acual code should be │ // here is the location where acual code should be
│ // 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
│ - click m0,1
│ if(tInstruction.txt=="wake") │ if(tInstruction.txt=="wake")
│ { │ {
│ //dim=100 │ + //dim=100
│ click tc0,1 │ click tc0,1
│ } │ }
│ if(tInstruction.txt=="dimmode") │ if(tInstruction.txt=="dimmode")
│ { │ {
│ @@ -537,15 +522,16 @@ │ // get value
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,dimValue,0,0
│ @@ -494,15 +471,14 @@
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,defaultFontColor,0,0
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ - click m0,1
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0
│ @@ -513,14 +489,20 @@
│ }
│ if(tInstruction.txt=="date")
│ {
│ //get set date to global variable
│ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
│ tDate.txt=pageIcons.vaDate.txt
│ }
│ + if(tInstruction.txt=="timeout")
│ + {
│ + //set timeout to global var
│ + spstr strCommand.txt,tTmp.txt,"~",1
│ + covx tTmp.txt,sleepTimeout,0,0
│ + }
│ if(tInstruction.txt=="statusUpdate")
│ {
│ //statusIcon1
│ spstr strCommand.txt,tIcon1.txt,"~",1
│ spstr strCommand.txt,tTmp.txt,"~",2
│ covx tTmp.txt,tIcon1.pco,0,0
│ //statusIcon2
│ @@ -540,109 +522,109 @@
│ } │ }
│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") │ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ { │ {
@@ -1311,25 +1355,77 @@
│ vis tMainText,1 │ vis tMainText,1
│ vis tMainTextAlt,0 │ vis tMainTextAlt,0
│ - vis tMainTextAlt2,0 │ - vis tMainTextAlt2,0
│ - vis tMainIconAlt2,0
│ + vis tMRIcon,0 │ + vis tMRIcon,0
│ + vis tMR,0 │ + vis tMR,0
│ //tMainIcon │ //tMainIcon
│ spstr strCommand.txt,tMainIcon.txt,"~",1 │ - spstr strCommand.txt,tMainIcon.txt,"~",3
│ + spstr strCommand.txt,tMainIcon.txt,"~",1
│ tMainIconAlt.txt=tMainIcon.txt │ tMainIconAlt.txt=tMainIcon.txt
│ - //tMainIcon Color
│ - spstr strCommand.txt,tTmp.txt,"~",4
│ - covx tTmp.txt,tMainIcon.pco,0,0
│ - tMainIconAlt.pco=tMainIcon.pco
│ //tMainText │ //tMainText
│ spstr strCommand.txt,tMainText.txt,"~",2 │ - spstr strCommand.txt,tMainText.txt,"~",6
│ + spstr strCommand.txt,tMainText.txt,"~",2
│ tMainTextAlt.txt=tMainText.txt │ tMainTextAlt.txt=tMainText.txt
│ //tForecast1 │ //tForecast1
│ @@ -569,53 +555,76 @@ │ - spstr strCommand.txt,tForecast1.txt,"~",11
│ + spstr strCommand.txt,tForecast1.txt,"~",3
│ //tF1Icon
│ - spstr strCommand.txt,tF1Icon.txt,"~",9
│ - //tF1Icon Color
│ - spstr strCommand.txt,tTmp.txt,"~",10
│ - covx tTmp.txt,tF1Icon.pco,0,0
│ + spstr strCommand.txt,tF1Icon.txt,"~",4
│ //tForecast1Val
│ - spstr strCommand.txt,tForecast1Val.txt,"~",12
│ + spstr strCommand.txt,tForecast1Val.txt,"~",5
│ //tForecast2
│ - spstr strCommand.txt,tForecast2.txt,"~",17
│ + spstr strCommand.txt,tForecast2.txt,"~",6
│ //tF2Icon
│ - spstr strCommand.txt,tF2Icon.txt,"~",15
│ - //tF2Icon Color
│ - spstr strCommand.txt,tTmp.txt,"~",16
│ - covx tTmp.txt,tF2Icon.pco,0,0
│ + spstr strCommand.txt,tF2Icon.txt,"~",7
│ //tForecast2Val
│ - spstr strCommand.txt,tForecast2Val.txt,"~",18
│ + spstr strCommand.txt,tForecast2Val.txt,"~",8
│ //tForecast3
│ - spstr strCommand.txt,tForecast3.txt,"~",23
│ + spstr strCommand.txt,tForecast3.txt,"~",9
│ //tF3Icon
│ - spstr strCommand.txt,tF3Icon.txt,"~",21
│ - //tF3Icon Color
│ - spstr strCommand.txt,tTmp.txt,"~",22
│ - covx tTmp.txt,tF3Icon.pco,0,0
│ + spstr strCommand.txt,tF3Icon.txt,"~",10
│ //tForecast3Val
│ - spstr strCommand.txt,tForecast3Val.txt,"~",24
│ + spstr strCommand.txt,tForecast3Val.txt,"~",11
│ //tForecast4 │ //tForecast4
│ spstr strCommand.txt,tForecast4.txt,"~",12 │ - spstr strCommand.txt,tForecast4.txt,"~",29
│ + spstr strCommand.txt,tForecast4.txt,"~",12
│ //tF4Icon │ //tF4Icon
│ spstr strCommand.txt,tF4Icon.txt,"~",13 │ - spstr strCommand.txt,tF4Icon.txt,"~",27
│ - //tF4Icon Color
│ - spstr strCommand.txt,tTmp.txt,"~",28
│ - covx tTmp.txt,tF4Icon.pco,0,0
│ + spstr strCommand.txt,tF4Icon.txt,"~",13
│ //tForecast4Val │ //tForecast4Val
│ spstr strCommand.txt,tForecast4Val.txt,"~",14 │ - spstr strCommand.txt,tForecast4Val.txt,"~",30
│ + spstr strCommand.txt,tForecast4Val.txt,"~",14
│ //alternative layout │ //alternative layout
│ - //tMainTextAlt2 │ - //tMainTextAlt2
│ - spstr strCommand.txt,tMainTextAlt2.txt,"~",15 │ - spstr strCommand.txt,tMainTextAlt2.txt,"~",36
│ - //tMainIconAlt2
│ - spstr strCommand.txt,tMainIconAlt2.txt,"~",33
│ - //tMainIconAlt2 Color
│ - spstr strCommand.txt,tTmp.txt,"~",34
│ - covx tTmp.txt,tMainIconAlt2.pco,0,0
│ - if(tMainTextAlt2.txt!=""&&p0.w!=320) │ - if(tMainTextAlt2.txt!=""&&p0.w!=320)
│ + //tMRIcon │ + //tMRIcon
│ + spstr strCommand.txt,tMRIcon.txt,"~",15 │ + spstr strCommand.txt,tMRIcon.txt,"~",15
@@ -1341,6 +1437,7 @@
│ vis tMainTextAlt,1 │ vis tMainTextAlt,1
│ vis tMainIconAlt,1 │ vis tMainIconAlt,1
│ - vis tMainTextAlt2,1 │ - vis tMainTextAlt2,1
│ - vis tMainIconAlt2,1
│ + vis tMRIcon,1 │ + vis tMRIcon,1
│ + vis tMR,1 │ + vis tMR,1
│ vis tForecast1,0 │ vis tForecast1,0
@@ -1392,6 +1489,7 @@
│ tMainIconAlt.bco=tTime.bco │ tMainIconAlt.bco=tTime.bco
│ tMainTextAlt.bco=tTime.bco │ tMainTextAlt.bco=tTime.bco
│ - tMainTextAlt2.bco=tTime.bco │ - tMainTextAlt2.bco=tTime.bco
│ - tMainIconAlt2.bco=tTime.bco
│ + tMRIcon.bco=tTime.bco │ + tMRIcon.bco=tTime.bco
│ + tMR.bco=tTime.bco │ + tMR.bco=tTime.bco
│ + tMRIcon.bco=tTime.bco │ + tMRIcon.bco=tTime.bco
@@ -1402,28 +1500,95 @@
│ tF1Icon.bco=tTime.bco │ tF1Icon.bco=tTime.bco
│ tForecast2.bco=tTime.bco │ tForecast2.bco=tTime.bco
│ tForecast2Val.bco=tTime.bco │ tForecast2Val.bco=tTime.bco
│ @@ -663,20 +672,20 @@ │ @@ -658,42 +640,56 @@
│ spstr strCommand.txt,tTmp.txt,"~",17 │ spstr strCommand.txt,tTmp.txt,"~",2
│ covx tTmp.txt,tForecast3Val.pco,0,0 │ covx tTmp.txt,tTime.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",18 │ spstr strCommand.txt,tTmp.txt,"~",3
│ covx tTmp.txt,tForecast4Val.pco,0,0 │ covx tTmp.txt,tAMPM.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",19 │ spstr strCommand.txt,tTmp.txt,"~",4
│ covx tTmp.txt,t10.bco,0,0 │ covx tTmp.txt,tDate.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",20 │ spstr strCommand.txt,tTmp.txt,"~",5
│ + covx tTmp.txt,tMainIcon.pco,0,0
│ + tMainIconAlt.pco=tMainIcon.pco
│ + spstr strCommand.txt,tTmp.txt,"~",6
│ covx tTmp.txt,tMainText.pco,0,0
│ tMainTextAlt.pco=tMainText.pco
│ - spstr strCommand.txt,tTmp.txt,"~",6
│ - covx tTmp.txt,tForecast1.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",7
│ - covx tTmp.txt,tForecast2.pco,0,0
│ + covx tTmp.txt,tForecast1.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",8
│ - covx tTmp.txt,tForecast3.pco,0,0
│ + covx tTmp.txt,tForecast2.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",9
│ - covx tTmp.txt,tForecast4.pco,0,0
│ + covx tTmp.txt,tForecast3.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",10
│ - covx tTmp.txt,tForecast1Val.pco,0,0
│ + covx tTmp.txt,tForecast4.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",11
│ - covx tTmp.txt,tForecast2Val.pco,0,0
│ + covx tTmp.txt,tF1Icon.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",12
│ - covx tTmp.txt,tForecast3Val.pco,0,0
│ + covx tTmp.txt,tF2Icon.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",13
│ - covx tTmp.txt,tForecast4Val.pco,0,0
│ + covx tTmp.txt,tF3Icon.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",14
│ - covx tTmp.txt,t10.bco,0,0
│ + covx tTmp.txt,tF4Icon.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",15
│ - covx tTmp.txt,tMainTextAlt2.pco,0,0 │ - covx tTmp.txt,tMainTextAlt2.pco,0,0
│ - //spstr strCommand.txt,tTmp.txt,"~",21 │ - //spstr strCommand.txt,tTmp.txt,"~",16
│ - //covx tTmp.txt,tMR.pco,0,0 │ - //covx tTmp.txt,tMR.pco,0,0
│ + covx tTmp.txt,tForecast1Val.pco,0,0
│ + spstr strCommand.txt,tTmp.txt,"~",16
│ + covx tTmp.txt,tForecast2Val.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",17
│ + covx tTmp.txt,tForecast3Val.pco,0,0
│ + spstr strCommand.txt,tTmp.txt,"~",18
│ + covx tTmp.txt,tForecast4Val.pco,0,0
│ + spstr strCommand.txt,tTmp.txt,"~",19
│ + covx tTmp.txt,t10.bco,0,0
│ + spstr strCommand.txt,tTmp.txt,"~",20
│ + covx tTmp.txt,tMRIcon.pco,0,0 │ + covx tTmp.txt,tMRIcon.pco,0,0
│ + spstr strCommand.txt,tTmp.txt,"~",21 │ + spstr strCommand.txt,tTmp.txt,"~",21
│ + covx tTmp.txt,tMR.pco,0,0 │ + covx tTmp.txt,tMR.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",22 │ + spstr strCommand.txt,tTmp.txt,"~",22
│ covx tTmp.txt,tTimeAdd.pco,0,0 │ covx tTmp.txt,tTimeAdd.pco,0,0
│ - if(tMainTextAlt2.txt!=""&&p0.w!=320) │ - if(tMainTextAlt2.txt!=""&&p0.w!=320)
│ + if(tMRIcon.txt!=""&&p0.w!=320) │ + if(tMRIcon.txt!=""&&p0.w!=320)
│ { │ {
│ tF4Icon.pco=tF3Icon.pco │ + tF4Icon.pco=tF3Icon.pco
│ tF3Icon.pco=tF2Icon.pco │ + tF3Icon.pco=tF2Icon.pco
│ tF2Icon.pco=tF1Icon.pco │ + tF2Icon.pco=tF1Icon.pco
│ tForecast4Val.pco=tForecast3Val.pco │ tForecast4Val.pco=tForecast3Val.pco
│ tForecast3Val.pco=tForecast2Val.pco │ tForecast3Val.pco=tForecast2Val.pco
│ tForecast2Val.pco=tForecast1Val.pco │ tForecast2Val.pco=tForecast1Val.pco
│ tForecast4.pco=tForecast3.pco
│ tForecast3.pco=tForecast2.pco
│ tForecast2.pco=tForecast1.pco
│ }
│ @@ -789,20 +785,14 @@
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ }
│ - 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
│ }
│ }
│ }
│ }

245
HMI/US/portrait/diff-eu-version.txt
View File

@@ -2193,7 +2193,7 @@
│ } │ }
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -29,29 +29,20 @@ │ @@ -29,28 +29,19 @@
│ } │ }
│ tDate.txt=pageIcons.vaDate.txt │ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue │ dim=dimValue
@@ -2208,21 +2208,21 @@
│ Attributes │ Attributes
│ Scope : local │ Scope : local
│ Text : │ Text :
│ Max. Text Size: 200 │ - Max. Text Size: 400
│ │ -
│ -Variable (string) strTmp │ -Variable (string) strTmp
│ - Attributes │ - Attributes
│ - Scope : local │ - Scope : local
│ - Text : │ - Text :
│ - Max. Text Size: 2 │ - Max. Text Size: 2
│ - │ + Max. Text Size: 200
│
│ Variable (string) tId │ Variable (string) tId
│ Attributes │ Attributes
│ Scope : local │ Scope : local
│ Text : │ Text :
│ Max. Text Size: 25 │ Max. Text Size: 25
│ │
│ Variable (string) tInstruction
│ @@ -103,35 +94,14 @@ │ @@ -103,35 +94,14 @@
│ Value: 0 │ Value: 0
│ │
@@ -2259,7 +2259,7 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ Associated Keyboard : none
│ @@ -294,55 +264,65 @@ │ @@ -294,65 +264,65 @@
│ Dragging : 0 │ Dragging : 0
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
@@ -2289,7 +2289,7 @@
│ Text : │ Text :
│ Max. Text Size : 10 │ Max. Text Size : 10
│ │
│ -Text tMainText │ -Text tMainIconAlt2
│ +Text tMainIcon │ +Text tMainIcon
│ Attributes │ Attributes
│ Scope : local │ Scope : local
@@ -2300,17 +2300,18 @@
│ Text : │ Text :
│ Max. Text Size : 10 │ Max. Text Size : 10
│ │
│ -Text tMainTextAlt │ -Text tMainText
│ +Text tMainIconAlt │ +Text tMainIconAlt
│ + Attributes │ Attributes
│ + Scope : local │ Scope : local
│ + Dragging : 0 │ Dragging : 0
│ + Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ + Send Component ID : disabled │ Send Component ID : disabled
│ + Associated Keyboard : none │ Associated Keyboard : none
│ + Text : │ Text :
│ + Max. Text Size : 10 │ Max. Text Size : 10
│ + │
│ -Text tMainTextAlt
│ +Text tMainText │ +Text tMainText
│ Attributes │ Attributes
│ Scope : local │ Scope : local
@@ -2330,23 +2331,60 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ Associated Keyboard : none
│ Text : │ Text :
│ @@ -456,15 +436,14 @@ │ @@ -468,14 +438,15 @@
│ {
│ // crc is okay
│ // here is the location where acual code should be │ // here is the location where acual code should be
│ // 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
│ - click m0,1
│ if(tInstruction.txt=="wake") │ if(tInstruction.txt=="wake")
│ { │ {
│ //dim=100 │ + //dim=100
│ click tc0,1 │ click tc0,1
│ } │ }
│ if(tInstruction.txt=="dimmode") │ if(tInstruction.txt=="dimmode")
│ { │ {
│ @@ -537,15 +516,16 @@ │ // get value
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,dimValue,0,0
│ @@ -494,15 +465,14 @@
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,defaultFontColor,0,0
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ - click m0,1
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0
│ @@ -513,14 +483,20 @@
│ }
│ if(tInstruction.txt=="date")
│ {
│ //get set date to global variable
│ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
│ tDate.txt=pageIcons.vaDate.txt
│ }
│ + if(tInstruction.txt=="timeout")
│ + {
│ + //set timeout to global var
│ + spstr strCommand.txt,tTmp.txt,"~",1
│ + covx tTmp.txt,sleepTimeout,0,0
│ + }
│ if(tInstruction.txt=="statusUpdate")
│ {
│ //statusIcon1
│ spstr strCommand.txt,tIcon1.txt,"~",1
│ spstr strCommand.txt,tTmp.txt,"~",2
│ covx tTmp.txt,tIcon1.pco,0,0
│ //statusIcon2
│ @@ -540,109 +516,109 @@
│ } │ }
│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") │ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ { │ {
@@ -2355,25 +2393,77 @@
│ vis tMainText,1 │ vis tMainText,1
│ vis tMainTextAlt,0 │ vis tMainTextAlt,0
│ - vis tMainTextAlt2,0 │ - vis tMainTextAlt2,0
│ - vis tMainIconAlt2,0
│ + vis tMRIcon,0 │ + vis tMRIcon,0
│ + vis tMR,0 │ + vis tMR,0
│ //tMainIcon │ //tMainIcon
│ spstr strCommand.txt,tMainIcon.txt,"~",1 │ - spstr strCommand.txt,tMainIcon.txt,"~",3
│ + spstr strCommand.txt,tMainIcon.txt,"~",1
│ tMainIconAlt.txt=tMainIcon.txt │ tMainIconAlt.txt=tMainIcon.txt
│ - //tMainIcon Color
│ - spstr strCommand.txt,tTmp.txt,"~",4
│ - covx tTmp.txt,tMainIcon.pco,0,0
│ - tMainIconAlt.pco=tMainIcon.pco
│ //tMainText │ //tMainText
│ spstr strCommand.txt,tMainText.txt,"~",2 │ - spstr strCommand.txt,tMainText.txt,"~",6
│ + spstr strCommand.txt,tMainText.txt,"~",2
│ tMainTextAlt.txt=tMainText.txt │ tMainTextAlt.txt=tMainText.txt
│ //tForecast1 │ //tForecast1
│ @@ -569,53 +549,76 @@ │ - spstr strCommand.txt,tForecast1.txt,"~",11
│ + spstr strCommand.txt,tForecast1.txt,"~",3
│ //tF1Icon
│ - spstr strCommand.txt,tF1Icon.txt,"~",9
│ - //tF1Icon Color
│ - spstr strCommand.txt,tTmp.txt,"~",10
│ - covx tTmp.txt,tF1Icon.pco,0,0
│ + spstr strCommand.txt,tF1Icon.txt,"~",4
│ //tForecast1Val
│ - spstr strCommand.txt,tForecast1Val.txt,"~",12
│ + spstr strCommand.txt,tForecast1Val.txt,"~",5
│ //tForecast2
│ - spstr strCommand.txt,tForecast2.txt,"~",17
│ + spstr strCommand.txt,tForecast2.txt,"~",6
│ //tF2Icon
│ - spstr strCommand.txt,tF2Icon.txt,"~",15
│ - //tF2Icon Color
│ - spstr strCommand.txt,tTmp.txt,"~",16
│ - covx tTmp.txt,tF2Icon.pco,0,0
│ + spstr strCommand.txt,tF2Icon.txt,"~",7
│ //tForecast2Val
│ - spstr strCommand.txt,tForecast2Val.txt,"~",18
│ + spstr strCommand.txt,tForecast2Val.txt,"~",8
│ //tForecast3
│ - spstr strCommand.txt,tForecast3.txt,"~",23
│ + spstr strCommand.txt,tForecast3.txt,"~",9
│ //tF3Icon
│ - spstr strCommand.txt,tF3Icon.txt,"~",21
│ - //tF3Icon Color
│ - spstr strCommand.txt,tTmp.txt,"~",22
│ - covx tTmp.txt,tF3Icon.pco,0,0
│ + spstr strCommand.txt,tF3Icon.txt,"~",10
│ //tForecast3Val
│ - spstr strCommand.txt,tForecast3Val.txt,"~",24
│ + spstr strCommand.txt,tForecast3Val.txt,"~",11
│ //tForecast4 │ //tForecast4
│ spstr strCommand.txt,tForecast4.txt,"~",12 │ - spstr strCommand.txt,tForecast4.txt,"~",29
│ + spstr strCommand.txt,tForecast4.txt,"~",12
│ //tF4Icon │ //tF4Icon
│ spstr strCommand.txt,tF4Icon.txt,"~",13 │ - spstr strCommand.txt,tF4Icon.txt,"~",27
│ - //tF4Icon Color
│ - spstr strCommand.txt,tTmp.txt,"~",28
│ - covx tTmp.txt,tF4Icon.pco,0,0
│ + spstr strCommand.txt,tF4Icon.txt,"~",13
│ //tForecast4Val │ //tForecast4Val
│ spstr strCommand.txt,tForecast4Val.txt,"~",14 │ - spstr strCommand.txt,tForecast4Val.txt,"~",30
│ + spstr strCommand.txt,tForecast4Val.txt,"~",14
│ //alternative layout │ //alternative layout
│ - //tMainTextAlt2 │ - //tMainTextAlt2
│ - spstr strCommand.txt,tMainTextAlt2.txt,"~",15 │ - spstr strCommand.txt,tMainTextAlt2.txt,"~",36
│ - //tMainIconAlt2
│ - spstr strCommand.txt,tMainIconAlt2.txt,"~",33
│ - //tMainIconAlt2 Color
│ - spstr strCommand.txt,tTmp.txt,"~",34
│ - covx tTmp.txt,tMainIconAlt2.pco,0,0
│ - if(tMainTextAlt2.txt!=""&&p0.w!=320) │ - if(tMainTextAlt2.txt!=""&&p0.w!=320)
│ + //tMRIcon │ + //tMRIcon
│ + spstr strCommand.txt,tMRIcon.txt,"~",15 │ + spstr strCommand.txt,tMRIcon.txt,"~",15
@@ -2385,6 +2475,7 @@
│ vis tMainTextAlt,1 │ vis tMainTextAlt,1
│ vis tMainIconAlt,1 │ vis tMainIconAlt,1
│ - vis tMainTextAlt2,1 │ - vis tMainTextAlt2,1
│ - vis tMainIconAlt2,1
│ + vis tMRIcon,1 │ + vis tMRIcon,1
│ + vis tMR,1 │ + vis tMR,1
│ vis tForecast1,0 │ vis tForecast1,0
@@ -2436,6 +2527,7 @@
│ tMainIconAlt.bco=tTime.bco │ tMainIconAlt.bco=tTime.bco
│ tMainTextAlt.bco=tTime.bco │ tMainTextAlt.bco=tTime.bco
│ - tMainTextAlt2.bco=tTime.bco │ - tMainTextAlt2.bco=tTime.bco
│ - tMainIconAlt2.bco=tTime.bco
│ + tMRIcon.bco=tTime.bco │ + tMRIcon.bco=tTime.bco
│ + tMR.bco=tTime.bco │ + tMR.bco=tTime.bco
│ + tMRIcon.bco=tTime.bco │ + tMRIcon.bco=tTime.bco
@@ -2446,28 +2538,95 @@
│ tF1Icon.bco=tTime.bco │ tF1Icon.bco=tTime.bco
│ tForecast2.bco=tTime.bco │ tForecast2.bco=tTime.bco
│ tForecast2Val.bco=tTime.bco │ tForecast2Val.bco=tTime.bco
│ @@ -663,20 +666,20 @@ │ @@ -658,42 +634,56 @@
│ spstr strCommand.txt,tTmp.txt,"~",17 │ spstr strCommand.txt,tTmp.txt,"~",2
│ covx tTmp.txt,tForecast3Val.pco,0,0 │ covx tTmp.txt,tTime.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",18 │ spstr strCommand.txt,tTmp.txt,"~",3
│ covx tTmp.txt,tForecast4Val.pco,0,0 │ covx tTmp.txt,tAMPM.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",19 │ spstr strCommand.txt,tTmp.txt,"~",4
│ covx tTmp.txt,t10.bco,0,0 │ covx tTmp.txt,tDate.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",20 │ spstr strCommand.txt,tTmp.txt,"~",5
│ + covx tTmp.txt,tMainIcon.pco,0,0
│ + tMainIconAlt.pco=tMainIcon.pco
│ + spstr strCommand.txt,tTmp.txt,"~",6
│ covx tTmp.txt,tMainText.pco,0,0
│ tMainTextAlt.pco=tMainText.pco
│ - spstr strCommand.txt,tTmp.txt,"~",6
│ - covx tTmp.txt,tForecast1.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",7
│ - covx tTmp.txt,tForecast2.pco,0,0
│ + covx tTmp.txt,tForecast1.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",8
│ - covx tTmp.txt,tForecast3.pco,0,0
│ + covx tTmp.txt,tForecast2.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",9
│ - covx tTmp.txt,tForecast4.pco,0,0
│ + covx tTmp.txt,tForecast3.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",10
│ - covx tTmp.txt,tForecast1Val.pco,0,0
│ + covx tTmp.txt,tForecast4.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",11
│ - covx tTmp.txt,tForecast2Val.pco,0,0
│ + covx tTmp.txt,tF1Icon.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",12
│ - covx tTmp.txt,tForecast3Val.pco,0,0
│ + covx tTmp.txt,tF2Icon.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",13
│ - covx tTmp.txt,tForecast4Val.pco,0,0
│ + covx tTmp.txt,tF3Icon.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",14
│ - covx tTmp.txt,t10.bco,0,0
│ + covx tTmp.txt,tF4Icon.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",15
│ - covx tTmp.txt,tMainTextAlt2.pco,0,0 │ - covx tTmp.txt,tMainTextAlt2.pco,0,0
│ - //spstr strCommand.txt,tTmp.txt,"~",21 │ - //spstr strCommand.txt,tTmp.txt,"~",16
│ - //covx tTmp.txt,tMR.pco,0,0 │ - //covx tTmp.txt,tMR.pco,0,0
│ + covx tTmp.txt,tForecast1Val.pco,0,0
│ + spstr strCommand.txt,tTmp.txt,"~",16
│ + covx tTmp.txt,tForecast2Val.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",17
│ + covx tTmp.txt,tForecast3Val.pco,0,0
│ + spstr strCommand.txt,tTmp.txt,"~",18
│ + covx tTmp.txt,tForecast4Val.pco,0,0
│ + spstr strCommand.txt,tTmp.txt,"~",19
│ + covx tTmp.txt,t10.bco,0,0
│ + spstr strCommand.txt,tTmp.txt,"~",20
│ + covx tTmp.txt,tMRIcon.pco,0,0 │ + covx tTmp.txt,tMRIcon.pco,0,0
│ + spstr strCommand.txt,tTmp.txt,"~",21 │ + spstr strCommand.txt,tTmp.txt,"~",21
│ + covx tTmp.txt,tMR.pco,0,0 │ + covx tTmp.txt,tMR.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",22 │ + spstr strCommand.txt,tTmp.txt,"~",22
│ covx tTmp.txt,tTimeAdd.pco,0,0 │ covx tTmp.txt,tTimeAdd.pco,0,0
│ - if(tMainTextAlt2.txt!=""&&p0.w!=320) │ - if(tMainTextAlt2.txt!=""&&p0.w!=320)
│ + if(tMRIcon.txt!=""&&p0.w!=320) │ + if(tMRIcon.txt!=""&&p0.w!=320)
│ { │ {
│ tF4Icon.pco=tF3Icon.pco │ + tF4Icon.pco=tF3Icon.pco
│ tF3Icon.pco=tF2Icon.pco │ + tF3Icon.pco=tF2Icon.pco
│ tF2Icon.pco=tF1Icon.pco │ + tF2Icon.pco=tF1Icon.pco
│ tForecast4Val.pco=tForecast3Val.pco │ tForecast4Val.pco=tForecast3Val.pco
│ tForecast3Val.pco=tForecast2Val.pco │ tForecast3Val.pco=tForecast2Val.pco
│ tForecast2Val.pco=tForecast1Val.pco │ tForecast2Val.pco=tForecast1Val.pco
│ tForecast4.pco=tForecast3.pco
│ tForecast3.pco=tForecast2.pco
│ tForecast2.pco=tForecast1.pco
│ }
│ @@ -789,20 +779,14 @@
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ }
│ - 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
│ }
│ }
│ }
│ }

197
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-01-20 23:11:09.357823892 +0000 +++ /dev/fd/62 2023-01-21 20:36:15.338966163 +0000
+le list +le list
+ +1,12 @@ + +1,12 @@
+.s.txt +.s.txt
@@ -483,13 +483,13 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+ +
+e (string) nent2 +e (string) nent2
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+14 +186,26 @@ +14 +186,26 @@
+e (string) type6 +e (string) type6
@@ -1578,7 +1578,7 @@
+ } + }
+I/n2t-out/screensaver.txt +I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt
+9 +29,20 @@ +8 +29,19 @@
+ } + }
+ tDate.txt=pageIcons.vaDate.txt + tDate.txt=pageIcons.vaDate.txt
+ dim=dimValue + dim=dimValue
@@ -1593,13 +1593,14 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 200 + Max. Text Size: 400
+ +
+e (string) strTmp +e (string) strTmp
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 2 + Max. Text Size: 2
+ Max. Text Size: 200
+ +
+e (string) tId +e (string) tId
+ributes +ributes
@@ -1607,7 +1608,6 @@
+ Text : + Text :
+ Max. Text Size: 25 + Max. Text Size: 25
+ +
+e (string) tInstruction
+35 +94,14 @@ +35 +94,14 @@
+ Value: 0 + Value: 0
+ +
@@ -1644,7 +1644,7 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
+55 +264,65 @@ +65 +264,65 @@
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
@@ -1674,7 +1674,7 @@
+ Text : + Text :
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
+ainText +ainIconAlt2
+ainIcon +ainIcon
+ributes +ributes
+ Scope : local + Scope : local
@@ -1685,7 +1685,7 @@
+ Text : + Text :
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
+ainTextAlt +ainText
+ainIconAlt +ainIconAlt
+ributes +ributes
+ Scope : local + Scope : local
@@ -1696,6 +1696,7 @@
+ Text : + Text :
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
+ainTextAlt
+ainText +ainText
+ributes +ributes
+ Scope : local + Scope : local
@@ -1715,15 +1716,12 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
+ Text : + Text :
+15 +436,14 @@ +14 +438,15 @@
+ {
+ // crc is okay
+ // here is the location where acual code should be + // here is the location where acual code should be
+ // 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
+ click m0,1
+ if(tInstruction.txt=="wake") + if(tInstruction.txt=="wake")
+ { + {
+ //dim=100 + //dim=100
@@ -1731,7 +1729,47 @@
+ } + }
+ if(tInstruction.txt=="dimmode") + if(tInstruction.txt=="dimmode")
+ { + {
+15 +516,16 @@ + // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+15 +465,14 @@
+ if(tTmp.txt!="")
+ {
+ covx tTmp.txt,defaultFontColor,0,0
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ click m0,1
+ //get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
+ if(tAMPM.txt=="")
+ {
+ vis tAMPM,0
+14 +483,20 @@
+ }
+ if(tInstruction.txt=="date")
+ {
+ //get set date to global variable
+ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+ tDate.txt=pageIcons.vaDate.txt
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ }
+ if(tInstruction.txt=="statusUpdate")
+ {
+ //statusIcon1
+ spstr strCommand.txt,tIcon1.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,tIcon1.pco,0,0
+ //statusIcon2
+109 +516,109 @@
+ } + }
+ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") + if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
+ { + {
@@ -1740,25 +1778,77 @@
+ vis tMainText,1 + vis tMainText,1
+ vis tMainTextAlt,0 + vis tMainTextAlt,0
+ vis tMainTextAlt2,0 + vis tMainTextAlt2,0
+ vis tMainIconAlt2,0
+ vis tMRIcon,0 + vis tMRIcon,0
+ vis tMR,0 + vis tMR,0
+ //tMainIcon + //tMainIcon
+ spstr strCommand.txt,tMainIcon.txt,"~",3
+ spstr strCommand.txt,tMainIcon.txt,"~",1 + spstr strCommand.txt,tMainIcon.txt,"~",1
+ tMainIconAlt.txt=tMainIcon.txt + tMainIconAlt.txt=tMainIcon.txt
+ //tMainIcon Color
+ spstr strCommand.txt,tTmp.txt,"~",4
+ covx tTmp.txt,tMainIcon.pco,0,0
+ tMainIconAlt.pco=tMainIcon.pco
+ //tMainText + //tMainText
+ spstr strCommand.txt,tMainText.txt,"~",6
+ spstr strCommand.txt,tMainText.txt,"~",2 + spstr strCommand.txt,tMainText.txt,"~",2
+ tMainTextAlt.txt=tMainText.txt + tMainTextAlt.txt=tMainText.txt
+ //tForecast1 + //tForecast1
+53 +549,76 @@ + spstr strCommand.txt,tForecast1.txt,"~",11
+ spstr strCommand.txt,tForecast1.txt,"~",3
+ //tF1Icon
+ spstr strCommand.txt,tF1Icon.txt,"~",9
+ //tF1Icon Color
+ spstr strCommand.txt,tTmp.txt,"~",10
+ covx tTmp.txt,tF1Icon.pco,0,0
+ spstr strCommand.txt,tF1Icon.txt,"~",4
+ //tForecast1Val
+ spstr strCommand.txt,tForecast1Val.txt,"~",12
+ spstr strCommand.txt,tForecast1Val.txt,"~",5
+ //tForecast2
+ spstr strCommand.txt,tForecast2.txt,"~",17
+ spstr strCommand.txt,tForecast2.txt,"~",6
+ //tF2Icon
+ spstr strCommand.txt,tF2Icon.txt,"~",15
+ //tF2Icon Color
+ spstr strCommand.txt,tTmp.txt,"~",16
+ covx tTmp.txt,tF2Icon.pco,0,0
+ spstr strCommand.txt,tF2Icon.txt,"~",7
+ //tForecast2Val
+ spstr strCommand.txt,tForecast2Val.txt,"~",18
+ spstr strCommand.txt,tForecast2Val.txt,"~",8
+ //tForecast3
+ spstr strCommand.txt,tForecast3.txt,"~",23
+ spstr strCommand.txt,tForecast3.txt,"~",9
+ //tF3Icon
+ spstr strCommand.txt,tF3Icon.txt,"~",21
+ //tF3Icon Color
+ spstr strCommand.txt,tTmp.txt,"~",22
+ covx tTmp.txt,tF3Icon.pco,0,0
+ spstr strCommand.txt,tF3Icon.txt,"~",10
+ //tForecast3Val
+ spstr strCommand.txt,tForecast3Val.txt,"~",24
+ spstr strCommand.txt,tForecast3Val.txt,"~",11
+ //tForecast4 + //tForecast4
+ spstr strCommand.txt,tForecast4.txt,"~",29
+ spstr strCommand.txt,tForecast4.txt,"~",12 + spstr strCommand.txt,tForecast4.txt,"~",12
+ //tF4Icon + //tF4Icon
+ spstr strCommand.txt,tF4Icon.txt,"~",27
+ //tF4Icon Color
+ spstr strCommand.txt,tTmp.txt,"~",28
+ covx tTmp.txt,tF4Icon.pco,0,0
+ spstr strCommand.txt,tF4Icon.txt,"~",13 + spstr strCommand.txt,tF4Icon.txt,"~",13
+ //tForecast4Val + //tForecast4Val
+ spstr strCommand.txt,tForecast4Val.txt,"~",30
+ spstr strCommand.txt,tForecast4Val.txt,"~",14 + spstr strCommand.txt,tForecast4Val.txt,"~",14
+ //alternative layout + //alternative layout
+ //tMainTextAlt2 + //tMainTextAlt2
+ spstr strCommand.txt,tMainTextAlt2.txt,"~",15 + spstr strCommand.txt,tMainTextAlt2.txt,"~",36
+ //tMainIconAlt2
+ spstr strCommand.txt,tMainIconAlt2.txt,"~",33
+ //tMainIconAlt2 Color
+ spstr strCommand.txt,tTmp.txt,"~",34
+ covx tTmp.txt,tMainIconAlt2.pco,0,0
+ if(tMainTextAlt2.txt!=""&&p0.w!=320) + if(tMainTextAlt2.txt!=""&&p0.w!=320)
+ //tMRIcon + //tMRIcon
+ spstr strCommand.txt,tMRIcon.txt,"~",15 + spstr strCommand.txt,tMRIcon.txt,"~",15
@@ -1770,6 +1860,7 @@
+ vis tMainTextAlt,1 + vis tMainTextAlt,1
+ vis tMainIconAlt,1 + vis tMainIconAlt,1
+ vis tMainTextAlt2,1 + vis tMainTextAlt2,1
+ vis tMainIconAlt2,1
+ vis tMRIcon,1 + vis tMRIcon,1
+ vis tMR,1 + vis tMR,1
+ vis tForecast1,0 + vis tForecast1,0
@@ -1821,6 +1912,7 @@
+ tMainIconAlt.bco=tTime.bco + tMainIconAlt.bco=tTime.bco
+ tMainTextAlt.bco=tTime.bco + tMainTextAlt.bco=tTime.bco
+ tMainTextAlt2.bco=tTime.bco + tMainTextAlt2.bco=tTime.bco
+ tMainIconAlt2.bco=tTime.bco
+ tMRIcon.bco=tTime.bco + tMRIcon.bco=tTime.bco
+ tMR.bco=tTime.bco + tMR.bco=tTime.bco
+ tMRIcon.bco=tTime.bco + tMRIcon.bco=tTime.bco
@@ -1831,7 +1923,52 @@
+ tF1Icon.bco=tTime.bco + tF1Icon.bco=tTime.bco
+ tForecast2.bco=tTime.bco + tForecast2.bco=tTime.bco
+ tForecast2Val.bco=tTime.bco + tForecast2Val.bco=tTime.bco
+20 +666,20 @@ +42 +634,56 @@
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,tTime.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",3
+ covx tTmp.txt,tAMPM.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",4
+ covx tTmp.txt,tDate.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",5
+ covx tTmp.txt,tMainIcon.pco,0,0
+ tMainIconAlt.pco=tMainIcon.pco
+ spstr strCommand.txt,tTmp.txt,"~",6
+ covx tTmp.txt,tMainText.pco,0,0
+ tMainTextAlt.pco=tMainText.pco
+ spstr strCommand.txt,tTmp.txt,"~",6
+ covx tTmp.txt,tForecast1.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",7
+ covx tTmp.txt,tForecast2.pco,0,0
+ covx tTmp.txt,tForecast1.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",8
+ covx tTmp.txt,tForecast3.pco,0,0
+ covx tTmp.txt,tForecast2.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",9
+ covx tTmp.txt,tForecast4.pco,0,0
+ covx tTmp.txt,tForecast3.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",10
+ covx tTmp.txt,tForecast1Val.pco,0,0
+ covx tTmp.txt,tForecast4.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",11
+ covx tTmp.txt,tForecast2Val.pco,0,0
+ covx tTmp.txt,tF1Icon.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",12
+ covx tTmp.txt,tForecast3Val.pco,0,0
+ covx tTmp.txt,tF2Icon.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",13
+ covx tTmp.txt,tForecast4Val.pco,0,0
+ covx tTmp.txt,tF3Icon.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",14
+ covx tTmp.txt,t10.bco,0,0
+ covx tTmp.txt,tF4Icon.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",15
+ covx tTmp.txt,tMainTextAlt2.pco,0,0
+ //spstr strCommand.txt,tTmp.txt,"~",16
+ //covx tTmp.txt,tMR.pco,0,0
+ covx tTmp.txt,tForecast1Val.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",16
+ covx tTmp.txt,tForecast2Val.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",17
+ covx tTmp.txt,tForecast3Val.pco,0,0 + covx tTmp.txt,tForecast3Val.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",18
@@ -1839,9 +1976,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",19
+ covx tTmp.txt,t10.bco,0,0 + covx tTmp.txt,t10.bco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",20 + spstr strCommand.txt,tTmp.txt,"~",20
+ covx tTmp.txt,tMainTextAlt2.pco,0,0
+ //spstr strCommand.txt,tTmp.txt,"~",21
+ //covx tTmp.txt,tMR.pco,0,0
+ covx tTmp.txt,tMRIcon.pco,0,0 + covx tTmp.txt,tMRIcon.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",21 + spstr strCommand.txt,tTmp.txt,"~",21
+ covx tTmp.txt,tMR.pco,0,0 + covx tTmp.txt,tMR.pco,0,0
@@ -1856,3 +1990,28 @@
+ tForecast4Val.pco=tForecast3Val.pco + tForecast4Val.pco=tForecast3Val.pco
+ tForecast3Val.pco=tForecast2Val.pco + tForecast3Val.pco=tForecast2Val.pco
+ tForecast2Val.pco=tForecast1Val.pco + tForecast2Val.pco=tForecast1Val.pco
+ tForecast4.pco=tForecast3.pco
+ tForecast3.pco=tForecast2.pco
+ tForecast2.pco=tForecast1.pco
+ }
+20 +779,14 @@
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ }
+ 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
+ }
+ }
+ }
+ }

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

@@ -43,9 +43,9 @@ pageStartup
185 Line(s) of event code 185 Line(s) of event code
131 Unique line(s) of event code 131 Unique line(s) of event code
screensaver screensaver
46 Component(s) 47 Component(s)
416 Line(s) of event code 419 Line(s) of event code
301 Unique line(s) of event code 302 Unique line(s) of event code
cardPower cardPower
48 Component(s) 48 Component(s)
483 Line(s) of event code 483 Line(s) of event code
@@ -85,6 +85,6 @@ cardEntities
Total Total
20 Page(s) 20 Page(s)
736 Component(s) 737 Component(s)
8775 Line(s) of event code 8778 Line(s) of event code
2264 Unique line(s) of event code 2266 Unique line(s) of event code

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

@@ -49,7 +49,7 @@ Variable (string) strCommand
ID : 4 ID : 4
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 400
Variable (string) strTmp Variable (string) strTmp
Attributes Attributes
@@ -717,10 +717,10 @@ Text tMainIconAlt
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 2 x coordinate : 11
y coordinate : 238 y coordinate : 216
Width : 54 Width : 54
Height : 50 Height : 45
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -730,7 +730,37 @@ Text tMainIconAlt
Font ID : 3 Font ID : 3
Back. Color : 0 Back. Color : 0
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : right
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tMainIconAlt2
Attributes
ID : 46
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 11
y coordinate : 265
Width : 54
Height : 45
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 3
Back. Color : 0
Font Color : 65535
Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
@@ -777,9 +807,9 @@ Text tMainTextAlt
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 58 x coordinate : 69
y coordinate : 216 y coordinate : 215
Width : 152 Width : 135
Height : 45 Height : 45
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -807,9 +837,9 @@ Text tMainTextAlt2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 58 x coordinate : 69
y coordinate : 265 y coordinate : 265
Width : 152 Width : 135
Height : 45 Height : 45
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -838,7 +868,7 @@ Text tNotifyHead
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 207 y coordinate : 107
Width : 450 Width : 450
Height : 58 Height : 58
Effect : load Effect : load
@@ -868,7 +898,7 @@ Text tNotifyText
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 264 y coordinate : 164
Width : 450 Width : 450
Height : 47 Height : 47
Effect : load Effect : load
@@ -1033,10 +1063,8 @@ Timer tmSerial
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
click m0,1
if(tInstruction.txt=="wake") if(tInstruction.txt=="wake")
{ {
//dim=100
click tc0,1 click tc0,1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
@@ -1063,6 +1091,7 @@ Timer tmSerial
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
click m0,1
//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 pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -1081,12 +1110,6 @@ Timer tmSerial
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")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="statusUpdate") if(tInstruction.txt=="statusUpdate")
{ {
//statusIcon1 //statusIcon1
@@ -1115,39 +1138,61 @@ Timer tmSerial
vis tMainText,1 vis tMainText,1
vis tMainTextAlt,0 vis tMainTextAlt,0
vis tMainTextAlt2,0 vis tMainTextAlt2,0
vis tMainIconAlt2,0
//tMainIcon //tMainIcon
spstr strCommand.txt,tMainIcon.txt,"~",1 spstr strCommand.txt,tMainIcon.txt,"~",3
tMainIconAlt.txt=tMainIcon.txt tMainIconAlt.txt=tMainIcon.txt
//tMainIcon Color
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tMainIcon.pco,0,0
tMainIconAlt.pco=tMainIcon.pco
//tMainText //tMainText
spstr strCommand.txt,tMainText.txt,"~",2 spstr strCommand.txt,tMainText.txt,"~",6
tMainTextAlt.txt=tMainText.txt tMainTextAlt.txt=tMainText.txt
//tForecast1 //tForecast1
spstr strCommand.txt,tForecast1.txt,"~",3 spstr strCommand.txt,tForecast1.txt,"~",11
//tF1Icon //tF1Icon
spstr strCommand.txt,tF1Icon.txt,"~",4 spstr strCommand.txt,tF1Icon.txt,"~",9
//tF1Icon Color
spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,tF1Icon.pco,0,0
//tForecast1Val //tForecast1Val
spstr strCommand.txt,tForecast1Val.txt,"~",5 spstr strCommand.txt,tForecast1Val.txt,"~",12
//tForecast2 //tForecast2
spstr strCommand.txt,tForecast2.txt,"~",6 spstr strCommand.txt,tForecast2.txt,"~",17
//tF2Icon //tF2Icon
spstr strCommand.txt,tF2Icon.txt,"~",7 spstr strCommand.txt,tF2Icon.txt,"~",15
//tF2Icon Color
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tF2Icon.pco,0,0
//tForecast2Val //tForecast2Val
spstr strCommand.txt,tForecast2Val.txt,"~",8 spstr strCommand.txt,tForecast2Val.txt,"~",18
//tForecast3 //tForecast3
spstr strCommand.txt,tForecast3.txt,"~",9 spstr strCommand.txt,tForecast3.txt,"~",23
//tF3Icon //tF3Icon
spstr strCommand.txt,tF3Icon.txt,"~",10 spstr strCommand.txt,tF3Icon.txt,"~",21
//tF3Icon Color
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tF3Icon.pco,0,0
//tForecast3Val //tForecast3Val
spstr strCommand.txt,tForecast3Val.txt,"~",11 spstr strCommand.txt,tForecast3Val.txt,"~",24
//tForecast4 //tForecast4
spstr strCommand.txt,tForecast4.txt,"~",12 spstr strCommand.txt,tForecast4.txt,"~",29
//tF4Icon //tF4Icon
spstr strCommand.txt,tF4Icon.txt,"~",13 spstr strCommand.txt,tF4Icon.txt,"~",27
//tF4Icon Color
spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,tF4Icon.pco,0,0
//tForecast4Val //tForecast4Val
spstr strCommand.txt,tForecast4Val.txt,"~",14 spstr strCommand.txt,tForecast4Val.txt,"~",30
//alternative layout //alternative layout
//tMainTextAlt2 //tMainTextAlt2
spstr strCommand.txt,tMainTextAlt2.txt,"~",15 spstr strCommand.txt,tMainTextAlt2.txt,"~",36
//tMainIconAlt2
spstr strCommand.txt,tMainIconAlt2.txt,"~",33
//tMainIconAlt2 Color
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,tMainIconAlt2.pco,0,0
if(tMainTextAlt2.txt!=""&&p0.w!=320) if(tMainTextAlt2.txt!=""&&p0.w!=320)
{ {
//value for tMRIcon, activate alternative layout //value for tMRIcon, activate alternative layout
@@ -1156,6 +1201,7 @@ Timer tmSerial
vis tMainTextAlt,1 vis tMainTextAlt,1
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMainTextAlt2,1 vis tMainTextAlt2,1
vis tMainIconAlt2,1
vis tForecast1,0 vis tForecast1,0
vis tF1Icon,0 vis tF1Icon,0
vis tForecast1Val,0 vis tForecast1Val,0
@@ -1185,6 +1231,7 @@ Timer tmSerial
tMainIconAlt.bco=tTime.bco tMainIconAlt.bco=tTime.bco
tMainTextAlt.bco=tTime.bco tMainTextAlt.bco=tTime.bco
tMainTextAlt2.bco=tTime.bco tMainTextAlt2.bco=tTime.bco
tMainIconAlt2.bco=tTime.bco
tIcon1.bco=tTime.bco tIcon1.bco=tTime.bco
tIcon2.bco=tTime.bco tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco tForecast1.bco=tTime.bco
@@ -1208,48 +1255,34 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tDate.pco,0,0 covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
tMainIconAlt.pco=tMainIcon.pco
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0 covx tTmp.txt,tMainText.pco,0,0
tMainTextAlt.pco=tMainText.pco tMainTextAlt.pco=tMainText.pco
spstr strCommand.txt,tTmp.txt,"~",7 spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tForecast1.pco,0,0 covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast2.pco,0,0 covx tTmp.txt,tForecast2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",9 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,tForecast3.pco,0,0 covx tTmp.txt,tForecast3.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,tForecast4.pco,0,0 covx tTmp.txt,tForecast4.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,tF1Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,tF2Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,tF3Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,tF4Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tForecast1Val.pco,0,0 covx tTmp.txt,tForecast1Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",16 spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,tForecast2Val.pco,0,0 covx tTmp.txt,tForecast2Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17 spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,tForecast3Val.pco,0,0 covx tTmp.txt,tForecast3Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",18 spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,tForecast4Val.pco,0,0 covx tTmp.txt,tForecast4Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,t10.bco,0,0 covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tMainTextAlt2.pco,0,0 covx tTmp.txt,tMainTextAlt2.pco,0,0
//spstr strCommand.txt,tTmp.txt,"~",21 //spstr strCommand.txt,tTmp.txt,"~",16
//covx tTmp.txt,tMR.pco,0,0 //covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22 spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,tTimeAdd.pco,0,0 covx tTmp.txt,tTimeAdd.pco,0,0
if(tMainTextAlt2.txt!=""&&p0.w!=320) if(tMainTextAlt2.txt!=""&&p0.w!=320)
{ {
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
tForecast4Val.pco=tForecast3Val.pco tForecast4Val.pco=tForecast3Val.pco
tForecast3Val.pco=tForecast2Val.pco tForecast3Val.pco=tForecast2Val.pco
tForecast2Val.pco=tForecast1Val.pco tForecast2Val.pco=tForecast1Val.pco
@@ -1353,6 +1386,12 @@ Timer tmSerial
page cardChart page cardChart
} }
} }
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 // end of user code
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0

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

@@ -40,7 +40,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 400
Variable (string) strTmp Variable (string) strTmp
Attributes Attributes
@@ -318,6 +318,16 @@ Text tMainIconAlt
Text : Text :
Max. Text Size : 10 Max. Text Size : 10
Text tMainIconAlt2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 10
Text tMainText Text tMainText
Attributes Attributes
Scope : local Scope : local
@@ -460,10 +470,8 @@ Timer tmSerial
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
click m0,1
if(tInstruction.txt=="wake") if(tInstruction.txt=="wake")
{ {
//dim=100
click tc0,1 click tc0,1
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
@@ -490,6 +498,7 @@ Timer tmSerial
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
click m0,1
//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 pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -508,12 +517,6 @@ Timer tmSerial
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")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="statusUpdate") if(tInstruction.txt=="statusUpdate")
{ {
//statusIcon1 //statusIcon1
@@ -542,39 +545,61 @@ Timer tmSerial
vis tMainText,1 vis tMainText,1
vis tMainTextAlt,0 vis tMainTextAlt,0
vis tMainTextAlt2,0 vis tMainTextAlt2,0
vis tMainIconAlt2,0
//tMainIcon //tMainIcon
spstr strCommand.txt,tMainIcon.txt,"~",1 spstr strCommand.txt,tMainIcon.txt,"~",3
tMainIconAlt.txt=tMainIcon.txt tMainIconAlt.txt=tMainIcon.txt
//tMainIcon Color
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tMainIcon.pco,0,0
tMainIconAlt.pco=tMainIcon.pco
//tMainText //tMainText
spstr strCommand.txt,tMainText.txt,"~",2 spstr strCommand.txt,tMainText.txt,"~",6
tMainTextAlt.txt=tMainText.txt tMainTextAlt.txt=tMainText.txt
//tForecast1 //tForecast1
spstr strCommand.txt,tForecast1.txt,"~",3 spstr strCommand.txt,tForecast1.txt,"~",11
//tF1Icon //tF1Icon
spstr strCommand.txt,tF1Icon.txt,"~",4 spstr strCommand.txt,tF1Icon.txt,"~",9
//tF1Icon Color
spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,tF1Icon.pco,0,0
//tForecast1Val //tForecast1Val
spstr strCommand.txt,tForecast1Val.txt,"~",5 spstr strCommand.txt,tForecast1Val.txt,"~",12
//tForecast2 //tForecast2
spstr strCommand.txt,tForecast2.txt,"~",6 spstr strCommand.txt,tForecast2.txt,"~",17
//tF2Icon //tF2Icon
spstr strCommand.txt,tF2Icon.txt,"~",7 spstr strCommand.txt,tF2Icon.txt,"~",15
//tF2Icon Color
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tF2Icon.pco,0,0
//tForecast2Val //tForecast2Val
spstr strCommand.txt,tForecast2Val.txt,"~",8 spstr strCommand.txt,tForecast2Val.txt,"~",18
//tForecast3 //tForecast3
spstr strCommand.txt,tForecast3.txt,"~",9 spstr strCommand.txt,tForecast3.txt,"~",23
//tF3Icon //tF3Icon
spstr strCommand.txt,tF3Icon.txt,"~",10 spstr strCommand.txt,tF3Icon.txt,"~",21
//tF3Icon Color
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tF3Icon.pco,0,0
//tForecast3Val //tForecast3Val
spstr strCommand.txt,tForecast3Val.txt,"~",11 spstr strCommand.txt,tForecast3Val.txt,"~",24
//tForecast4 //tForecast4
spstr strCommand.txt,tForecast4.txt,"~",12 spstr strCommand.txt,tForecast4.txt,"~",29
//tF4Icon //tF4Icon
spstr strCommand.txt,tF4Icon.txt,"~",13 spstr strCommand.txt,tF4Icon.txt,"~",27
//tF4Icon Color
spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,tF4Icon.pco,0,0
//tForecast4Val //tForecast4Val
spstr strCommand.txt,tForecast4Val.txt,"~",14 spstr strCommand.txt,tForecast4Val.txt,"~",30
//alternative layout //alternative layout
//tMainTextAlt2 //tMainTextAlt2
spstr strCommand.txt,tMainTextAlt2.txt,"~",15 spstr strCommand.txt,tMainTextAlt2.txt,"~",36
//tMainIconAlt2
spstr strCommand.txt,tMainIconAlt2.txt,"~",33
//tMainIconAlt2 Color
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,tMainIconAlt2.pco,0,0
if(tMainTextAlt2.txt!=""&&p0.w!=320) if(tMainTextAlt2.txt!=""&&p0.w!=320)
{ {
//value for tMRIcon, activate alternative layout //value for tMRIcon, activate alternative layout
@@ -583,6 +608,7 @@ Timer tmSerial
vis tMainTextAlt,1 vis tMainTextAlt,1
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMainTextAlt2,1 vis tMainTextAlt2,1
vis tMainIconAlt2,1
vis tForecast1,0 vis tForecast1,0
vis tF1Icon,0 vis tF1Icon,0
vis tForecast1Val,0 vis tForecast1Val,0
@@ -612,6 +638,7 @@ Timer tmSerial
tMainIconAlt.bco=tTime.bco tMainIconAlt.bco=tTime.bco
tMainTextAlt.bco=tTime.bco tMainTextAlt.bco=tTime.bco
tMainTextAlt2.bco=tTime.bco tMainTextAlt2.bco=tTime.bco
tMainIconAlt2.bco=tTime.bco
tIcon1.bco=tTime.bco tIcon1.bco=tTime.bco
tIcon2.bco=tTime.bco tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco tForecast1.bco=tTime.bco
@@ -635,48 +662,34 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tDate.pco,0,0 covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
tMainIconAlt.pco=tMainIcon.pco
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0 covx tTmp.txt,tMainText.pco,0,0
tMainTextAlt.pco=tMainText.pco tMainTextAlt.pco=tMainText.pco
spstr strCommand.txt,tTmp.txt,"~",7 spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tForecast1.pco,0,0 covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast2.pco,0,0 covx tTmp.txt,tForecast2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",9 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,tForecast3.pco,0,0 covx tTmp.txt,tForecast3.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,tForecast4.pco,0,0 covx tTmp.txt,tForecast4.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,tF1Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,tF2Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,tF3Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,tF4Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tForecast1Val.pco,0,0 covx tTmp.txt,tForecast1Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",16 spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,tForecast2Val.pco,0,0 covx tTmp.txt,tForecast2Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17 spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,tForecast3Val.pco,0,0 covx tTmp.txt,tForecast3Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",18 spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,tForecast4Val.pco,0,0 covx tTmp.txt,tForecast4Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,t10.bco,0,0 covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tMainTextAlt2.pco,0,0 covx tTmp.txt,tMainTextAlt2.pco,0,0
//spstr strCommand.txt,tTmp.txt,"~",21 //spstr strCommand.txt,tTmp.txt,"~",16
//covx tTmp.txt,tMR.pco,0,0 //covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22 spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,tTimeAdd.pco,0,0 covx tTmp.txt,tTimeAdd.pco,0,0
if(tMainTextAlt2.txt!=""&&p0.w!=320) if(tMainTextAlt2.txt!=""&&p0.w!=320)
{ {
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
tForecast4Val.pco=tForecast3Val.pco tForecast4Val.pco=tForecast3Val.pco
tForecast3Val.pco=tForecast2Val.pco tForecast3Val.pco=tForecast2Val.pco
tForecast2Val.pco=tForecast1Val.pco tForecast2Val.pco=tForecast1Val.pco
@@ -780,6 +793,12 @@ Timer tmSerial
page cardChart page cardChart
} }
} }
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 // end of user code
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0