diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 05c3722c..970ddd93 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -27,28 +27,7 @@ │ page pageStartup │ --- HMI/n2t-out/cardAlarm.txt ├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt -│ @@ -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 @@ +│ @@ -902,18 +902,14 @@ │ { │ page pageStartup │ } @@ -69,28 +48,7 @@ │ page cardGrid │ --- HMI/n2t-out/cardChart.txt ├── +++ HMI/US/landscape/n2t-out/cardChart.txt -│ @@ -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 @@ +│ @@ -635,18 +635,14 @@ │ { │ page pageStartup │ } @@ -130,27 +88,6 @@ │ 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 @@ @@ -172,51 +109,9 @@ │ 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 -│ @@ -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 @@ +│ @@ -616,18 +616,14 @@ │ { │ page pageStartup │ } @@ -256,27 +151,6 @@ │ 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 @@ @@ -851,51 +725,9 @@ │ 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 -│ @@ -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 @@ +│ @@ -669,18 +669,14 @@ │ { │ page pageStartup │ } @@ -935,27 +767,6 @@ │ 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 4aee352a..0600baa9 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -29,28 +29,7 @@ │ page pageStartup │ --- HMI/n2t-out/cardAlarm.txt ├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt -│ @@ -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 @@ +│ @@ -902,18 +902,14 @@ │ { │ page pageStartup │ } @@ -71,28 +50,7 @@ │ page cardGrid │ --- HMI/n2t-out/cardChart.txt ├── +++ HMI/US/portrait/n2t-out/cardChart.txt -│ @@ -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 @@ +│ @@ -635,18 +635,14 @@ │ { │ page pageStartup │ } @@ -1162,27 +1120,6 @@ │ 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 @@ @@ -1204,51 +1141,9 @@ │ 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 -│ @@ -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 @@ +│ @@ -616,18 +616,14 @@ │ { │ page pageStartup │ } @@ -1288,27 +1183,6 @@ │ 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 @@ @@ -1681,51 +1555,9 @@ │ 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 -│ @@ -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 @@ +│ @@ -669,18 +669,14 @@ │ { │ page pageStartup │ } @@ -1765,27 +1597,6 @@ │ 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 50187e53..72b6fce7 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -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 + +14,8 @@ +n.txt @@ -15,27 +15,6 @@ ++ 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 @@ -57,27 +36,6 @@ + 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 @@ -150,13 +108,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 @@ -562,13 +520,6 @@ + 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 @@ -588,27 +539,6 @@ + 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 @@ @@ -630,43 +560,8 @@ + 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 -+ } +18 +616,14 @@ + { + page pageStartup @@ -707,27 +602,6 @@ + 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 @@ @@ -1100,50 +974,8 @@ + 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 -+ } -+ } -+ 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 @@ + { + page pageStartup @@ -1184,27 +1016,6 @@ + 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 bc73d56f..3958dfb2 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1488,12 +1488,6 @@ 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 32ab3cf6..329bc7a7 100644 --- a/HMI/n2t-out-visual/cardChart.txt +++ b/HMI/n2t-out-visual/cardChart.txt @@ -778,12 +778,6 @@ 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 196eecec..95e78c0a 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2936,12 +2936,6 @@ 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 9e1029f5..263c77bc 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1414,12 +1414,6 @@ 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 29b76a26..0f888349 100644 --- a/HMI/n2t-out-visual/cardLChart.txt +++ b/HMI/n2t-out-visual/cardLChart.txt @@ -737,12 +737,6 @@ 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 5c446cc9..c84f1fbc 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -1738,12 +1738,6 @@ 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 58f51544..a37c9a64 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -1699,12 +1699,6 @@ 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 c5f94934..c50d2eb3 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -951,12 +951,6 @@ 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 0bc8ae39..e1304a35 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1891,12 +1891,6 @@ 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 99447301..4ac3cffd 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,10 +14,14 @@ popupNotify 19 Component(s) 257 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) - 403 Line(s) of event code - 266 Unique line(s) of event code + 433 Line(s) of event code + 294 Unique line(s) of event code pageStartup 20 Component(s) 189 Line(s) of event code @@ -26,26 +30,30 @@ pageTest 26 Component(s) 68 Line(s) of event code 66 Unique line(s) of event code -cardThermo - 57 Component(s) - 541 Line(s) of event code - 319 Unique line(s) of event code +cardAlarm + 43 Component(s) + 496 Line(s) of event code + 271 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code 204 Unique line(s) of event code -cardChart +cardLChart 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) - 411 Line(s) of event code - 238 Unique line(s) of event code + 398 Line(s) of event code + 264 Unique line(s) of event code +cardGrid + 44 Component(s) + 519 Line(s) of event code + 293 Unique line(s) of event code +cardThermo + 57 Component(s) + 536 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 34 Component(s) 617 Line(s) of event code @@ -58,22 +66,14 @@ popupShutter 25 Component(s) 398 Line(s) of event code 218 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 +cardMedia + 59 Component(s) + 645 Line(s) of event code + 320 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) 430 Line(s) of event code 309 Unique line(s) of event code -cardPower - 54 Component(s) - 504 Line(s) of event code - 340 Unique line(s) of event code +cardEntities + 67 Component(s) + 1166 Line(s) of event code + 530 Unique line(s) of event code Total 21 Page(s) 802 Component(s) - 9259 Line(s) of event code - 2334 Unique line(s) of event code + 9214 Line(s) of event code + 2333 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 454e7257..35afa004 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -883,12 +883,6 @@ 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 f0debbf8..79eafcbd 100644 --- a/HMI/n2t-out/cardChart.txt +++ b/HMI/n2t-out/cardChart.txt @@ -616,12 +616,6 @@ 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 f84b6fb4..fb0ae315 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1981,12 +1981,6 @@ 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 e1b6671f..115291d7 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -966,12 +966,6 @@ 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 9d2b30e2..e3684ba7 100644 --- a/HMI/n2t-out/cardLChart.txt +++ b/HMI/n2t-out/cardLChart.txt @@ -597,12 +597,6 @@ 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 008dc3dc..1bdbba61 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -1250,12 +1250,6 @@ 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 1e91aa01..c74cb351 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -1011,12 +1011,6 @@ 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 2031e905..e7e72c41 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -650,12 +650,6 @@ 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 08301e55..4d66237a 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -1167,12 +1167,6 @@ 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