From ee6bc988d0e62cfacea2dc9a552fbe063f202ff7 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sat, 8 Oct 2022 22:00:08 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 72 ------------------ HMI/US/landscape/n2t-out-visual/cardMedia.txt | 5 ++ HMI/US/landscape/n2t-out-visual/cardQR.txt | 5 ++ .../n2t-out-visual/nspanel_US_L_Stats.txt | 14 ++-- HMI/US/landscape/n2t-out/cardMedia.txt | 5 ++ HMI/US/landscape/n2t-out/cardQR.txt | 5 ++ HMI/US/portrait/diff-eu-version.txt | 72 ------------------ HMI/US/portrait/diff-filtered.txt | 74 +------------------ HMI/US/portrait/n2t-out-visual/cardMedia.txt | 5 ++ HMI/US/portrait/n2t-out-visual/cardQR.txt | 5 ++ .../n2t-out-visual/nspanel_US_P_Stats.txt | 14 ++-- HMI/US/portrait/n2t-out/cardMedia.txt | 5 ++ HMI/US/portrait/n2t-out/cardQR.txt | 5 ++ 13 files changed, 55 insertions(+), 231 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 0f58fdcb..f0058def 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -188,78 +188,6 @@ │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ } │ if(tInstruction.txt=="date") -├── cardMedia.txt -│ @@ -702,15 +702,14 @@ -│ //command format pageType,specialPageName -│ //write name of speical page to tId -│ spstr strCommand.txt,tId.txt,"~",1 -│ //save second arg if there's one -│ spstr strCommand.txt,tTmp.txt,"~",2 -│ //save third arg if there's one -│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 -│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... -│ udelete payloadLength-1 -│ bufferPos=0 -│ if(tId.txt=="pageStartup") -│ { -│ page pageStartup -│ } -│ @@ -752,18 +751,14 @@ -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR -│ } -│ - if(tId.txt=="cardPower") -│ - { -│ - page cardPower -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } -├── cardQR.txt -│ @@ -653,15 +653,14 @@ -│ //command format pageType,specialPageName -│ //write name of speical page to tId -│ spstr strCommand.txt,tId.txt,"~",1 -│ //save second arg if there's one -│ spstr strCommand.txt,tTmp.txt,"~",2 -│ //save third arg if there's one -│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 -│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... -│ udelete payloadLength-1 -│ bufferPos=0 -│ if(tId.txt=="pageStartup") -│ { -│ page pageStartup -│ } -│ @@ -703,18 +702,14 @@ -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR -│ } -│ - if(tId.txt=="cardPower") -│ - { -│ - page cardPower -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } ├── cardThermo.txt │ @@ -1089,15 +1089,14 @@ │ //command format pageType,specialPageName diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 4f8aa2e2..995edc80 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -1137,6 +1137,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -1186,6 +1187,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index ee54c999..b78ce18f 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -956,6 +956,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -1005,6 +1006,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 10139ffc..03f96aaa 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -20,16 +20,12 @@ popupFan 199 Unique line(s) of event code cardMedia 34 Component(s) - 389 Line(s) of event code - 210 Unique line(s) of event code + 394 Line(s) of event code + 213 Unique line(s) of event code popupShutter 25 Component(s) 389 Line(s) of event code 213 Unique line(s) of event code -cardQR - 32 Component(s) - 404 Line(s) of event code - 235 Unique line(s) of event code popupLight 27 Component(s) 386 Line(s) of event code @@ -58,6 +54,10 @@ cardAlarm 40 Component(s) 422 Line(s) of event code 255 Unique line(s) of event code +cardQR + 32 Component(s) + 409 Line(s) of event code + 238 Unique line(s) of event code cardEntities 65 Component(s) 1132 Line(s) of event code @@ -66,5 +66,5 @@ cardEntities Total 15 Page(s) 482 Component(s) - 5684 Line(s) of event code + 5694 Line(s) of event code 1546 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index f705403b..a4e667ae 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -706,6 +706,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -755,6 +756,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 7e2fc6a1..a561a57c 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -657,6 +657,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -706,6 +707,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 217b95c3..ea5ddd46 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -635,78 +635,6 @@ │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ } │ if(tInstruction.txt=="date") -├── cardMedia.txt -│ @@ -702,15 +702,14 @@ -│ //command format pageType,specialPageName -│ //write name of speical page to tId -│ spstr strCommand.txt,tId.txt,"~",1 -│ //save second arg if there's one -│ spstr strCommand.txt,tTmp.txt,"~",2 -│ //save third arg if there's one -│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 -│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... -│ udelete payloadLength-1 -│ bufferPos=0 -│ if(tId.txt=="pageStartup") -│ { -│ page pageStartup -│ } -│ @@ -752,18 +751,14 @@ -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR -│ } -│ - if(tId.txt=="cardPower") -│ - { -│ - page cardPower -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } -├── cardQR.txt -│ @@ -653,15 +653,14 @@ -│ //command format pageType,specialPageName -│ //write name of speical page to tId -│ spstr strCommand.txt,tId.txt,"~",1 -│ //save second arg if there's one -│ spstr strCommand.txt,tTmp.txt,"~",2 -│ //save third arg if there's one -│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 -│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... -│ udelete payloadLength-1 -│ bufferPos=0 -│ if(tId.txt=="pageStartup") -│ { -│ page pageStartup -│ } -│ @@ -703,18 +702,14 @@ -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR -│ } -│ - if(tId.txt=="cardPower") -│ - { -│ - page cardPower -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } ├── cardThermo.txt │ @@ -1089,15 +1089,14 @@ │ //command format pageType,specialPageName diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 3147121b..2d49ed23 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-08 21:40:20.817238068 +0000 ++++ /dev/fd/62 2022-10-08 22:00:00.068849517 +0000 +rdAlarm.txt +15 +784,14 @@ + //command format pageType,specialPageName @@ -103,78 +103,6 @@ + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") -+rdMedia.txt -+15 +702,14 @@ -+ //command format pageType,specialPageName -+ //write name of speical page to tId -+ spstr strCommand.txt,tId.txt,"~",1 -+ //save second arg if there's one -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ //save third arg if there's one -+ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 -+ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... -+ udelete payloadLength-1 -+ bufferPos=0 -+ if(tId.txt=="pageStartup") -+ { -+ page pageStartup -+ } -+18 +751,14 @@ -+ { -+ page cardAlarm -+ } -+ if(tId.txt=="cardQR") -+ { -+ page cardQR -+ } -+ if(tId.txt=="cardPower") -+ { -+ page cardPower -+ } -+ } -+ // end of user code -+ udelete payloadLength-1 -+ bufferPos=0 -+ } -+ } -+ } -+rdQR.txt -+15 +653,14 @@ -+ //command format pageType,specialPageName -+ //write name of speical page to tId -+ spstr strCommand.txt,tId.txt,"~",1 -+ //save second arg if there's one -+ spstr strCommand.txt,tTmp.txt,"~",2 -+ //save third arg if there's one -+ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -+ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 -+ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... -+ udelete payloadLength-1 -+ bufferPos=0 -+ if(tId.txt=="pageStartup") -+ { -+ page pageStartup -+ } -+18 +702,14 @@ -+ { -+ page cardAlarm -+ } -+ if(tId.txt=="cardQR") -+ { -+ page cardQR -+ } -+ if(tId.txt=="cardPower") -+ { -+ page cardPower -+ } -+ } -+ // end of user code -+ udelete payloadLength-1 -+ bufferPos=0 -+ } -+ } -+ } +rdThermo.txt +,15 +1089,14 @@ + //command format pageType,specialPageName diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index f42de156..0bfb3377 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -1137,6 +1137,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -1186,6 +1187,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 46bada64..0619e8a5 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -956,6 +956,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -1005,6 +1006,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 3351e7a9..f4c2138d 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -22,10 +22,6 @@ pageStartup 19 Component(s) 167 Line(s) of event code 122 Unique line(s) of event code -cardMedia - 34 Component(s) - 389 Line(s) of event code - 210 Unique line(s) of event code popupShutter 25 Component(s) 389 Line(s) of event code @@ -40,8 +36,12 @@ cardGrid 278 Unique line(s) of event code cardQR 32 Component(s) - 404 Line(s) of event code - 235 Unique line(s) of event code + 409 Line(s) of event code + 238 Unique line(s) of event code +cardMedia + 34 Component(s) + 394 Line(s) of event code + 213 Unique line(s) of event code popupFan 27 Component(s) 342 Line(s) of event code @@ -66,5 +66,5 @@ cardEntities Total 15 Page(s) 494 Component(s) - 5907 Line(s) of event code + 5917 Line(s) of event code 1620 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index f705403b..a4e667ae 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -706,6 +706,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -755,6 +756,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 7e2fc6a1..a561a57c 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -657,6 +657,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -706,6 +707,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1