diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index af57314f..39bbf2f3 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -14,7 +14,28 @@ │ +screensaver.txt │ --- HMI/n2t-out/cardAlarm.txt ├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt -│ @@ -902,18 +902,14 @@ +│ @@ -879,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 +│ @@ -908,18 +902,14 @@ │ { │ page pageStartup │ } @@ -35,7 +56,28 @@ │ page cardGrid │ --- HMI/n2t-out/cardChart.txt ├── +++ HMI/US/landscape/n2t-out/cardChart.txt -│ @@ -635,18 +635,14 @@ +│ @@ -612,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 +│ @@ -641,18 +635,14 @@ │ { │ page pageStartup │ } @@ -75,6 +117,27 @@ │ if(tId.txt=="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/US/landscape/n2t-out/cardGrid.txt │ @@ -870,18 +870,14 @@ @@ -96,9 +159,51 @@ │ if(tId.txt=="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/US/landscape/n2t-out/cardLChart.txt -│ @@ -616,18 +616,14 @@ +│ @@ -593,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 +│ - } +│ } +│ 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 │ } @@ -138,6 +243,27 @@ │ if(tId.txt=="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/US/landscape/n2t-out/cardPower.txt │ @@ -35,27 +35,27 @@ @@ -712,9 +838,51 @@ │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ } │ 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/US/landscape/n2t-out/cardQR.txt -│ @@ -669,18 +669,14 @@ +│ @@ -646,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 +│ @@ -675,18 +669,14 @@ │ { │ page pageStartup │ } @@ -754,6 +922,27 @@ │ if(tId.txt=="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/US/landscape/n2t-out/pageStartup.txt │ @@ -179,15 +179,15 @@ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 81d8e5da..2cc14a65 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -29,7 +29,28 @@ │ page pageStartup │ --- HMI/n2t-out/cardAlarm.txt ├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt -│ @@ -902,18 +902,14 @@ +│ @@ -879,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 +│ @@ -908,18 +902,14 @@ │ { │ page pageStartup │ } @@ -50,7 +71,28 @@ │ page cardGrid │ --- HMI/n2t-out/cardChart.txt ├── +++ HMI/US/portrait/n2t-out/cardChart.txt -│ @@ -635,18 +635,14 @@ +│ @@ -612,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 +│ @@ -641,18 +635,14 @@ │ { │ page pageStartup │ } @@ -1120,6 +1162,27 @@ │ if(tId.txt=="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/US/portrait/n2t-out/cardGrid.txt │ @@ -870,18 +870,14 @@ @@ -1141,9 +1204,51 @@ │ if(tId.txt=="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/US/portrait/n2t-out/cardLChart.txt -│ @@ -616,18 +616,14 @@ +│ @@ -593,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 +│ - } +│ } +│ 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 │ } @@ -1183,6 +1288,27 @@ │ if(tId.txt=="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/US/portrait/n2t-out/cardPower.txt │ @@ -35,27 +35,27 @@ @@ -1555,9 +1681,51 @@ │ if(tId.txt=="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/US/portrait/n2t-out/cardQR.txt -│ @@ -669,18 +669,14 @@ +│ @@ -646,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 +│ @@ -675,18 +669,14 @@ │ { │ page pageStartup │ } @@ -1597,6 +1765,27 @@ │ if(tId.txt=="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/US/portrait/n2t-out/pageStartup.txt │ @@ -35,20 +35,14 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 6fa88b6d..0a63818e 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-02-03 17:20:12.414684320 +0000 ++++ /dev/fd/62 2023-02-03 17:56:15.794899421 +0000 +le list + +14,8 @@ +n.txt @@ -15,6 +15,27 @@ ++ HMI/US/portrait/n2t-out/Program.s.txt +I/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 @@ + { + page pageStartup @@ -36,6 +57,27 @@ + page cardGrid +I/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 @@ + { + page pageStartup @@ -108,13 +150,13 @@ +ributes + Scope : local + Text : -+ Max. Text Size: 80 + Max. Text Size: 40 + +e (string) nent2 +ributes + Scope : local + Text : ++ Max. Text Size: 80 + Max. Text Size: 40 +14 +186,26 @@ +e (string) type6 @@ -520,6 +562,13 @@ + covx tTmp.txt,sys0,0,0 + 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 @@ + { + page pageStartup @@ -539,6 +588,27 @@ + if(tId.txt=="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 ++ HMI/US/portrait/n2t-out/cardGrid.txt +18 +870,14 @@ @@ -560,8 +630,50 @@ + if(tId.txt=="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 ++ 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 ++ } ++ } ++ if(tInstruction.txt=="pageType") ++ { ++ sleepValue=0 ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 +18 +616,14 @@ + { + page pageStartup @@ -602,6 +714,27 @@ + if(tId.txt=="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 ++ HMI/US/portrait/n2t-out/cardPower.txt +7 +35,27 @@ @@ -974,8 +1107,43 @@ + if(tId.txt=="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 ++ 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 ++ } +18 +669,14 @@ + { + page pageStartup @@ -1016,6 +1184,27 @@ + if(tId.txt=="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 ++ HMI/US/portrait/n2t-out/pageStartup.txt +0 +35,14 @@ diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 3958dfb2..bc73d56f 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1488,6 +1488,12 @@ Timer tmSerial //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") { diff --git a/HMI/n2t-out-visual/cardChart.txt b/HMI/n2t-out-visual/cardChart.txt index 329bc7a7..32ab3cf6 100644 --- a/HMI/n2t-out-visual/cardChart.txt +++ b/HMI/n2t-out-visual/cardChart.txt @@ -778,6 +778,12 @@ Timer tmSerial //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") { diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 95e78c0a..196eecec 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2936,6 +2936,12 @@ Timer tmSerial //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 diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 263c77bc..9e1029f5 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1414,6 +1414,12 @@ Timer tmSerial //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 diff --git a/HMI/n2t-out-visual/cardLChart.txt b/HMI/n2t-out-visual/cardLChart.txt index 0f888349..29b76a26 100644 --- a/HMI/n2t-out-visual/cardLChart.txt +++ b/HMI/n2t-out-visual/cardLChart.txt @@ -737,6 +737,12 @@ Timer tmSerial //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") { diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index c84f1fbc..5c446cc9 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -1738,6 +1738,12 @@ Timer tmSerial //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 diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index a37c9a64..58f51544 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -1699,6 +1699,12 @@ Timer tmSerial //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 diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index c50d2eb3..c5f94934 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -951,6 +951,12 @@ Timer tmSerial //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") { diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index e1304a35..0bc8ae39 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1891,6 +1891,12 @@ Timer tmSerial //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 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 584f69f0..3303c845 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -16,12 +16,8 @@ popupNotify 166 Unique line(s) of event code cardLChart 33 Component(s) - 398 Line(s) of event code - 264 Unique line(s) of event code -cardChart - 33 Component(s) - 433 Line(s) of event code - 294 Unique line(s) of event code + 403 Line(s) of event code + 266 Unique line(s) of event code pageStartup 20 Component(s) 189 Line(s) of event code @@ -30,30 +26,26 @@ pageTest 26 Component(s) 68 Line(s) of event code 66 Unique line(s) of event code -cardMedia - 59 Component(s) - 645 Line(s) of event code - 320 Unique line(s) of event code +cardThermo + 57 Component(s) + 541 Line(s) of event code + 319 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code 204 Unique line(s) of event code +cardChart + 33 Component(s) + 438 Line(s) of event code + 296 Unique line(s) of event code +cardMedia + 59 Component(s) + 650 Line(s) of event code + 321 Unique line(s) of event code cardQR 34 Component(s) - 406 Line(s) of event code - 236 Unique line(s) of event code -cardPower - 54 Component(s) - 499 Line(s) of event code - 338 Unique line(s) of event code -cardGrid - 44 Component(s) - 519 Line(s) of event code - 293 Unique line(s) of event code -cardAlarm - 43 Component(s) - 496 Line(s) of event code - 271 Unique line(s) of event code + 411 Line(s) of event code + 238 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code @@ -66,14 +58,22 @@ popupShutter 25 Component(s) 398 Line(s) of event code 218 Unique line(s) of event code -cardThermo - 57 Component(s) - 536 Line(s) of event code - 317 Unique line(s) of event code +cardAlarm + 43 Component(s) + 501 Line(s) of event code + 273 Unique line(s) of event code +cardGrid + 44 Component(s) + 524 Line(s) of event code + 295 Unique line(s) of event code screensaver2 59 Component(s) 354 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 42 Component(s) 512 Line(s) of event code @@ -82,13 +82,13 @@ screensaver 47 Component(s) 432 Line(s) of event code 308 Unique line(s) of event code -cardEntities - 67 Component(s) - 1166 Line(s) of event code - 530 Unique line(s) of event code +cardPower + 54 Component(s) + 504 Line(s) of event code + 340 Unique line(s) of event code Total 21 Page(s) 802 Component(s) - 9216 Line(s) of event code - 2331 Unique line(s) of event code + 9261 Line(s) of event code + 2332 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 35afa004..454e7257 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -883,6 +883,12 @@ Timer tmSerial //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") { diff --git a/HMI/n2t-out/cardChart.txt b/HMI/n2t-out/cardChart.txt index 79eafcbd..f0debbf8 100644 --- a/HMI/n2t-out/cardChart.txt +++ b/HMI/n2t-out/cardChart.txt @@ -616,6 +616,12 @@ Timer tmSerial //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") { diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index fb0ae315..f84b6fb4 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1981,6 +1981,12 @@ Timer tmSerial //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 diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 115291d7..e1b6671f 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -966,6 +966,12 @@ Timer tmSerial //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 diff --git a/HMI/n2t-out/cardLChart.txt b/HMI/n2t-out/cardLChart.txt index e3684ba7..9d2b30e2 100644 --- a/HMI/n2t-out/cardLChart.txt +++ b/HMI/n2t-out/cardLChart.txt @@ -597,6 +597,12 @@ Timer tmSerial //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") { diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 1bdbba61..008dc3dc 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -1250,6 +1250,12 @@ Timer tmSerial //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 diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index c74cb351..1e91aa01 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -1011,6 +1011,12 @@ Timer tmSerial //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 diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index e7e72c41..2031e905 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -650,6 +650,12 @@ Timer tmSerial //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") { diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 4d66237a..08301e55 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -1167,6 +1167,12 @@ Timer tmSerial //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