From 59b293784c2a3c36ac7d660fc80bde83ce22f26a Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 8 Oct 2022 22:48:59 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 71 ------------------- HMI/US/landscape/n2t-out-visual/cardAlarm.txt | 5 ++ .../n2t-out-visual/nspanel_US_L_Stats.txt | 18 ++--- .../landscape/n2t-out-visual/pageStartup.txt | 5 ++ HMI/US/landscape/n2t-out/cardAlarm.txt | 5 ++ HMI/US/landscape/n2t-out/pageStartup.txt | 5 ++ HMI/US/portrait/diff-eu-version.txt | 36 ---------- HMI/US/portrait/diff-filtered.txt | 38 +--------- HMI/US/portrait/n2t-out-visual/cardAlarm.txt | 5 ++ .../n2t-out-visual/nspanel_US_P_Stats.txt | 10 +-- HMI/US/portrait/n2t-out/cardAlarm.txt | 5 ++ 11 files changed, 45 insertions(+), 158 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index cb014af3..8be1b00a 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -12,42 +12,6 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup -├── cardAlarm.txt -│ @@ -784,15 +784,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 -│ } -│ @@ -834,18 +833,14 @@ -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR -│ } -│ - if(tId.txt=="cardPower") -│ - { -│ - page cardPower -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } ├── pageStartup.txt │ @@ -173,15 +173,15 @@ │ Max. Text Size : 10 @@ -66,38 +30,3 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ @@ -302,15 +302,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=="cardThermo") -│ { -│ page cardThermo -│ } -│ @@ -347,18 +346,14 @@ -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR -│ } -│ - if(tId.txt=="cardPower") -│ - { -│ - page cardPower -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 9b3adef5..ae5aede3 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -1370,6 +1370,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 @@ -1419,6 +1420,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 363da6cb..61e31eb9 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 @@ -6,10 +6,6 @@ pageIcons 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code -pageStartup - 19 Component(s) - 167 Line(s) of event code - 122 Unique line(s) of event code popupNotify 17 Component(s) 231 Line(s) of event code @@ -30,6 +26,10 @@ popupShutter 25 Component(s) 394 Line(s) of event code 216 Unique line(s) of event code +pageStartup + 19 Component(s) + 172 Line(s) of event code + 125 Unique line(s) of event code pageTest 14 Component(s) 14 Line(s) of event code @@ -38,14 +38,14 @@ cardGrid 42 Component(s) 474 Line(s) of event code 281 Unique line(s) of event code +cardAlarm + 40 Component(s) + 427 Line(s) of event code + 258 Unique line(s) of event code cardPower 43 Component(s) 420 Line(s) of event code 292 Unique line(s) of event code -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 @@ -66,5 +66,5 @@ cardEntities Total 15 Page(s) 482 Component(s) - 5734 Line(s) of event code + 5744 Line(s) of event code 1546 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 329756db..8d6299b6 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -601,6 +601,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 @@ -645,6 +646,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/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 910af12c..afd86599 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -788,6 +788,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 @@ -837,6 +838,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/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 403c4e14..eafec548 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -306,6 +306,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 @@ -350,6 +351,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 71e78c17..c9571c1b 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -14,42 +14,6 @@ │ + // fix touch offset (Removed for US version) │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup -├── cardAlarm.txt -│ @@ -784,15 +784,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 -│ } -│ @@ -834,18 +833,14 @@ -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR -│ } -│ - if(tId.txt=="cardPower") -│ - { -│ - page cardPower -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } ├── cardEntities.txt │ @@ -61,14 +61,24 @@ │ vis tIcon4,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 231a5cf0..717415ef 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,40 +1,4 @@ -+++ /dev/fd/62 2022-10-08 22:37:22.226531609 +0000 -+rdAlarm.txt -+15 +784,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 +833,14 @@ -+ { -+ page cardAlarm -+ } -+ if(tId.txt=="cardQR") -+ { -+ page cardQR -+ } -+ if(tId.txt=="cardPower") -+ { -+ page cardPower -+ } -+ } -+ // end of user code -+ udelete payloadLength-1 -+ bufferPos=0 -+ } -+ } -+ } ++++ /dev/fd/62 2022-10-08 22:48:53.818299279 +0000 +,26 +2059,174 @@ + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 058005ec..2507bf41 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -1370,6 +1370,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 @@ -1419,6 +1420,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 3d280bfa..448cbcbd 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 @@ -46,14 +46,14 @@ cardMedia 34 Component(s) 394 Line(s) of event code 213 Unique line(s) of event code -cardAlarm - 40 Component(s) - 422 Line(s) of event code - 255 Unique line(s) of event code screensaver 38 Component(s) 338 Line(s) of event code 262 Unique line(s) of event code +cardAlarm + 40 Component(s) + 427 Line(s) of event code + 258 Unique line(s) of event code cardThermo 52 Component(s) 585 Line(s) of event code @@ -66,5 +66,5 @@ cardEntities Total 15 Page(s) 494 Component(s) - 5947 Line(s) of event code + 5952 Line(s) of event code 1620 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 910af12c..afd86599 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -788,6 +788,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 @@ -837,6 +838,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1