revert changes to timeout command (add nextion2text)

This commit is contained in:
joBr99
2023-02-13 18:43:49 +00:00
committed by github-actions[bot]
parent 11251950b9
commit 32d7a1c6d8
22 changed files with 46 additions and 721 deletions

View File

@@ -27,28 +27,7 @@
│ page pageStartup │ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt │ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt ├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt
│ @@ -879,20 +879,14 @@ │ @@ -902,18 +902,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ if(tInstruction.txt=="pageType")
│ {
│ sleepValue=0
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -908,18 +902,14 @@
│ { │ {
│ page pageStartup │ page pageStartup
│ } │ }
@@ -69,28 +48,7 @@
│ page cardGrid │ page cardGrid
│ --- HMI/n2t-out/cardChart.txt │ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/landscape/n2t-out/cardChart.txt ├── +++ HMI/US/landscape/n2t-out/cardChart.txt
│ @@ -612,20 +612,14 @@ │ @@ -635,18 +635,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ if(tInstruction.txt=="pageType")
│ {
│ sleepValue=0
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -641,18 +635,14 @@
│ { │ {
│ page pageStartup │ page pageStartup
│ } │ }
@@ -130,27 +88,6 @@
│ if(tId.txt=="cardGrid") │ if(tId.txt=="cardGrid")
│ { │ {
│ page cardGrid │ page cardGrid
│ @@ -1977,20 +1973,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardGrid.txt │ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid.txt ├── +++ HMI/US/landscape/n2t-out/cardGrid.txt
│ @@ -870,18 +870,14 @@ │ @@ -870,18 +870,14 @@
@@ -172,51 +109,9 @@
│ if(tId.txt=="cardGrid") │ if(tId.txt=="cardGrid")
│ { │ {
│ page cardGrid │ page cardGrid
│ @@ -962,20 +958,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardLChart.txt │ --- HMI/n2t-out/cardLChart.txt
├── +++ HMI/US/landscape/n2t-out/cardLChart.txt ├── +++ HMI/US/landscape/n2t-out/cardLChart.txt
│ @@ -593,20 +593,14 @@ │ @@ -616,18 +616,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ if(tInstruction.txt=="pageType")
│ {
│ sleepValue=0
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -622,18 +616,14 @@
│ { │ {
│ page pageStartup │ page pageStartup
│ } │ }
@@ -256,27 +151,6 @@
│ if(tId.txt=="cardGrid") │ if(tId.txt=="cardGrid")
│ { │ {
│ page cardGrid │ page cardGrid
│ @@ -1246,20 +1242,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardPower.txt │ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/landscape/n2t-out/cardPower.txt ├── +++ HMI/US/landscape/n2t-out/cardPower.txt
│ @@ -35,27 +35,27 @@ │ @@ -35,27 +35,27 @@
@@ -851,51 +725,9 @@
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ } │ }
│ if(tInstruction.txt=="date") │ if(tInstruction.txt=="date")
│ @@ -1007,20 +933,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardQR.txt │ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/landscape/n2t-out/cardQR.txt ├── +++ HMI/US/landscape/n2t-out/cardQR.txt
│ @@ -646,20 +646,14 @@ │ @@ -669,18 +669,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ if(tInstruction.txt=="pageType")
│ {
│ sleepValue=0
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -675,18 +669,14 @@
│ { │ {
│ page pageStartup │ page pageStartup
│ } │ }
@@ -935,27 +767,6 @@
│ if(tId.txt=="cardGrid") │ if(tId.txt=="cardGrid")
│ { │ {
│ page cardGrid │ page cardGrid
│ @@ -1163,20 +1159,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -179,15 +179,15 @@ │ @@ -179,15 +179,15 @@

View File

@@ -29,28 +29,7 @@
│ page pageStartup │ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt │ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt ├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt
│ @@ -879,20 +879,14 @@ │ @@ -902,18 +902,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ if(tInstruction.txt=="pageType")
│ {
│ sleepValue=0
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -908,18 +902,14 @@
│ { │ {
│ page pageStartup │ page pageStartup
│ } │ }
@@ -71,28 +50,7 @@
│ page cardGrid │ page cardGrid
│ --- HMI/n2t-out/cardChart.txt │ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/portrait/n2t-out/cardChart.txt ├── +++ HMI/US/portrait/n2t-out/cardChart.txt
│ @@ -612,20 +612,14 @@ │ @@ -635,18 +635,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ if(tInstruction.txt=="pageType")
│ {
│ sleepValue=0
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -641,18 +635,14 @@
│ { │ {
│ page pageStartup │ page pageStartup
│ } │ }
@@ -1162,27 +1120,6 @@
│ if(tId.txt=="cardGrid") │ if(tId.txt=="cardGrid")
│ { │ {
│ page cardGrid │ page cardGrid
│ @@ -1977,20 +2753,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardGrid.txt │ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/portrait/n2t-out/cardGrid.txt ├── +++ HMI/US/portrait/n2t-out/cardGrid.txt
│ @@ -870,18 +870,14 @@ │ @@ -870,18 +870,14 @@
@@ -1204,51 +1141,9 @@
│ if(tId.txt=="cardGrid") │ if(tId.txt=="cardGrid")
│ { │ {
│ page cardGrid │ page cardGrid
│ @@ -962,20 +958,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardLChart.txt │ --- HMI/n2t-out/cardLChart.txt
├── +++ HMI/US/portrait/n2t-out/cardLChart.txt ├── +++ HMI/US/portrait/n2t-out/cardLChart.txt
│ @@ -593,20 +593,14 @@ │ @@ -616,18 +616,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ if(tInstruction.txt=="pageType")
│ {
│ sleepValue=0
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -622,18 +616,14 @@
│ { │ {
│ page pageStartup │ page pageStartup
│ } │ }
@@ -1288,27 +1183,6 @@
│ if(tId.txt=="cardGrid") │ if(tId.txt=="cardGrid")
│ { │ {
│ page cardGrid │ page cardGrid
│ @@ -1246,20 +1242,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardPower.txt │ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/portrait/n2t-out/cardPower.txt ├── +++ HMI/US/portrait/n2t-out/cardPower.txt
│ @@ -35,27 +35,27 @@ │ @@ -35,27 +35,27 @@
@@ -1681,51 +1555,9 @@
│ if(tId.txt=="cardGrid") │ if(tId.txt=="cardGrid")
│ { │ {
│ page cardGrid │ page cardGrid
│ @@ -1007,20 +973,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardQR.txt │ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt ├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -646,20 +646,14 @@ │ @@ -669,18 +669,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ if(tInstruction.txt=="pageType")
│ {
│ sleepValue=0
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -675,18 +669,14 @@
│ { │ {
│ page pageStartup │ page pageStartup
│ } │ }
@@ -1765,27 +1597,6 @@
│ if(tId.txt=="cardGrid") │ if(tId.txt=="cardGrid")
│ { │ {
│ page cardGrid │ page cardGrid
│ @@ -1163,20 +1159,14 @@
│ }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ - //temporary disable sleep timer
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - if(tTmp.txt=="disable")
│ - {
│ - tmSleep.en=0
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -35,20 +35,14 @@ │ @@ -35,20 +35,14 @@

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-02-11 09:32:13.287521388 +0000 +++ /dev/fd/62 2023-02-13 18:43:41.508869570 +0000
+le list +le list
+ +14,8 @@ + +14,8 @@
+n.txt +n.txt
@@ -15,27 +15,6 @@
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardAlarm.txt +I/n2t-out/cardAlarm.txt
++ HMI/US/portrait/n2t-out/cardAlarm.txt ++ HMI/US/portrait/n2t-out/cardAlarm.txt
+20 +879,14 @@
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ //temporary disable sleep timer
+ spstr strCommand.txt,tTmp.txt,"~",2
+ if(tTmp.txt=="disable")
+ {
+ tmSleep.en=0
+ }
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ sleepValue=0
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+18 +902,14 @@ +18 +902,14 @@
+ { + {
+ page pageStartup + page pageStartup
@@ -57,27 +36,6 @@
+ page cardGrid + page cardGrid
+I/n2t-out/cardChart.txt +I/n2t-out/cardChart.txt
++ HMI/US/portrait/n2t-out/cardChart.txt ++ HMI/US/portrait/n2t-out/cardChart.txt
+20 +612,14 @@
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ //temporary disable sleep timer
+ spstr strCommand.txt,tTmp.txt,"~",2
+ if(tTmp.txt=="disable")
+ {
+ tmSleep.en=0
+ }
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ sleepValue=0
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+18 +635,14 @@ +18 +635,14 @@
+ { + {
+ page pageStartup + page pageStartup
@@ -150,13 +108,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
@@ -562,13 +520,6 @@
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0 + hSlider6.maxval=sys0
+ } + }
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ sleepValue=0
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+,18 +2665,14 @@ +,18 +2665,14 @@
+ { + {
+ page pageStartup + page pageStartup
@@ -588,27 +539,6 @@
+ if(tId.txt=="cardGrid") + if(tId.txt=="cardGrid")
+ { + {
+ page cardGrid + page cardGrid
+,20 +2753,14 @@
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ //temporary disable sleep timer
+ spstr strCommand.txt,tTmp.txt,"~",2
+ if(tTmp.txt=="disable")
+ {
+ tmSleep.en=0
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/cardGrid.txt +I/n2t-out/cardGrid.txt
++ HMI/US/portrait/n2t-out/cardGrid.txt ++ HMI/US/portrait/n2t-out/cardGrid.txt
+18 +870,14 @@ +18 +870,14 @@
@@ -630,43 +560,8 @@
+ if(tId.txt=="cardGrid") + if(tId.txt=="cardGrid")
+ { + {
+ page cardGrid + page cardGrid
+20 +958,14 @@
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ //temporary disable sleep timer
+ spstr strCommand.txt,tTmp.txt,"~",2
+ if(tTmp.txt=="disable")
+ {
+ tmSleep.en=0
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/cardLChart.txt +I/n2t-out/cardLChart.txt
++ HMI/US/portrait/n2t-out/cardLChart.txt ++ HMI/US/portrait/n2t-out/cardLChart.txt
+20 +593,14 @@
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ //temporary disable sleep timer
+ spstr strCommand.txt,tTmp.txt,"~",2
+ if(tTmp.txt=="disable")
+ {
+ tmSleep.en=0
+ }
+18 +616,14 @@ +18 +616,14 @@
+ { + {
+ page pageStartup + page pageStartup
@@ -707,27 +602,6 @@
+ if(tId.txt=="cardGrid") + if(tId.txt=="cardGrid")
+ { + {
+ page cardGrid + page cardGrid
+,20 +1242,14 @@
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ //temporary disable sleep timer
+ spstr strCommand.txt,tTmp.txt,"~",2
+ if(tTmp.txt=="disable")
+ {
+ tmSleep.en=0
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/cardPower.txt +I/n2t-out/cardPower.txt
++ HMI/US/portrait/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardPower.txt
+7 +35,27 @@ +7 +35,27 @@
@@ -1100,50 +974,8 @@
+ if(tId.txt=="cardGrid") + if(tId.txt=="cardGrid")
+ { + {
+ page cardGrid + page cardGrid
+,20 +973,14 @@
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ //temporary disable sleep timer
+ spstr strCommand.txt,tTmp.txt,"~",2
+ if(tTmp.txt=="disable")
+ {
+ tmSleep.en=0
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/cardQR.txt +I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt ++ HMI/US/portrait/n2t-out/cardQR.txt
+20 +646,14 @@
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ //temporary disable sleep timer
+ spstr strCommand.txt,tTmp.txt,"~",2
+ if(tTmp.txt=="disable")
+ {
+ tmSleep.en=0
+ }
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ sleepValue=0
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+18 +669,14 @@ +18 +669,14 @@
+ { + {
+ page pageStartup + page pageStartup
@@ -1184,27 +1016,6 @@
+ if(tId.txt=="cardGrid") + if(tId.txt=="cardGrid")
+ { + {
+ page cardGrid + page cardGrid
+,20 +1159,14 @@
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ //temporary disable sleep timer
+ spstr strCommand.txt,tTmp.txt,"~",2
+ if(tTmp.txt=="disable")
+ {
+ tmSleep.en=0
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/pageStartup.txt +I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +35,14 @@ +0 +35,14 @@

View File

@@ -1488,12 +1488,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {

View File

@@ -778,12 +778,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {

View File

@@ -2936,12 +2936,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -1414,12 +1414,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -737,12 +737,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {

View File

@@ -1738,12 +1738,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -1699,12 +1699,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -951,12 +951,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {

View File

@@ -1891,12 +1891,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -14,10 +14,14 @@ popupNotify
19 Component(s) 19 Component(s)
257 Line(s) of event code 257 Line(s) of event code
166 Unique line(s) of event code 166 Unique line(s) of event code
cardLChart cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
cardChart
33 Component(s) 33 Component(s)
403 Line(s) of event code 433 Line(s) of event code
266 Unique line(s) of event code 294 Unique line(s) of event code
pageStartup pageStartup
20 Component(s) 20 Component(s)
189 Line(s) of event code 189 Line(s) of event code
@@ -26,26 +30,30 @@ pageTest
26 Component(s) 26 Component(s)
68 Line(s) of event code 68 Line(s) of event code
66 Unique line(s) of event code 66 Unique line(s) of event code
cardThermo cardAlarm
57 Component(s) 43 Component(s)
541 Line(s) of event code 496 Line(s) of event code
319 Unique line(s) of event code 271 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
351 Line(s) of event code 351 Line(s) of event code
204 Unique line(s) of event code 204 Unique line(s) of event code
cardChart cardLChart
33 Component(s) 33 Component(s)
438 Line(s) of event code 398 Line(s) of event code
296 Unique line(s) of event code 264 Unique line(s) of event code
cardMedia cardGrid
59 Component(s) 44 Component(s)
650 Line(s) of event code 519 Line(s) of event code
321 Unique line(s) of event code 293 Unique line(s) of event code
cardQR cardThermo
34 Component(s) 57 Component(s)
411 Line(s) of event code 536 Line(s) of event code
238 Unique line(s) of event code 317 Unique line(s) of event code
cardPower
54 Component(s)
499 Line(s) of event code
338 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
617 Line(s) of event code 617 Line(s) of event code
@@ -58,22 +66,14 @@ popupShutter
25 Component(s) 25 Component(s)
398 Line(s) of event code 398 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
cardAlarm cardMedia
43 Component(s) 59 Component(s)
501 Line(s) of event code 645 Line(s) of event code
273 Unique line(s) of event code 320 Unique line(s) of event code
cardGrid
44 Component(s)
524 Line(s) of event code
295 Unique line(s) of event code
screensaver2 screensaver2
59 Component(s) 59 Component(s)
354 Line(s) of event code 354 Line(s) of event code
251 Unique line(s) of event code 251 Unique line(s) of event code
cardEntities
67 Component(s)
1171 Line(s) of event code
532 Unique line(s) of event code
popupTimer popupTimer
42 Component(s) 42 Component(s)
512 Line(s) of event code 512 Line(s) of event code
@@ -82,13 +82,13 @@ screensaver
47 Component(s) 47 Component(s)
430 Line(s) of event code 430 Line(s) of event code
309 Unique line(s) of event code 309 Unique line(s) of event code
cardPower cardEntities
54 Component(s) 67 Component(s)
504 Line(s) of event code 1166 Line(s) of event code
340 Unique line(s) of event code 530 Unique line(s) of event code
Total Total
21 Page(s) 21 Page(s)
802 Component(s) 802 Component(s)
9259 Line(s) of event code 9214 Line(s) of event code
2334 Unique line(s) of event code 2333 Unique line(s) of event code

View File

@@ -883,12 +883,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {

View File

@@ -616,12 +616,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {

View File

@@ -1981,12 +1981,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -966,12 +966,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -597,12 +597,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {

View File

@@ -1250,12 +1250,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -1011,12 +1011,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

View File

@@ -650,12 +650,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {

View File

@@ -1167,12 +1167,6 @@ Timer tmSerial
//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
//temporary disable sleep timer
spstr strCommand.txt,tTmp.txt,"~",2
if(tTmp.txt=="disable")
{
tmSleep.en=0
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1