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

@@ -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 @@