From ed5ec37ff3f3fb1a79abc6914d42f95631dbec18 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Tue, 22 Nov 2022 17:44:03 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 152 ----------------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 16 +- .../landscape/n2t-out-visual/pageStartup.txt | 29 ++-- .../landscape/n2t-out-visual/screensaver.txt | 55 ++++--- HMI/US/landscape/n2t-out/pageStartup.txt | 29 ++-- HMI/US/landscape/n2t-out/screensaver.txt | 45 ++--- HMI/US/portrait/diff-eu-version.txt | 152 ----------------- HMI/US/portrait/diff-filtered.txt | 154 +----------------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 20 +-- .../portrait/n2t-out-visual/pageStartup.txt | 29 ++-- .../portrait/n2t-out-visual/screensaver.txt | 45 ++--- HMI/US/portrait/n2t-out/pageStartup.txt | 29 ++-- HMI/US/portrait/n2t-out/screensaver.txt | 45 ++--- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +- 14 files changed, 200 insertions(+), 608 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 6a6184bb..3ea2e060 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -353,71 +353,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ @@ -306,52 +306,47 @@ -│ 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") -│ + if(tId.txt=="cardThermo") -│ { -│ - page pageStartup -│ + page cardThermo -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="cardEntities") -│ - { -│ - page cardEntities -│ - } -│ - if(tId.txt=="cardGrid") -│ - { -│ - page cardGrid -│ - } -│ if(tId.txt=="popupLight") -│ { -│ pageIcons.tTmp1.txt=tTmp.txt -│ page popupLight -│ } -│ - if(tId.txt=="popupShutter") -│ + if(tId.txt=="cardEntities") -│ { -│ - pageIcons.tTmp1.txt=tTmp.txt -│ - page popupShutter -│ + page cardEntities -│ } -│ - if(tId.txt=="popupNotify") -│ + if(tId.txt=="pageStartup") -│ { -│ - page popupNotify -│ + page pageStartup -│ } -│ - if(tId.txt=="cardThermo") -│ + if(tId.txt=="popupNotify") -│ { -│ - page cardThermo -│ + page popupNotify -│ } -│ if(tId.txt=="cardMedia") -│ { -│ page cardMedia -│ } -│ + if(tId.txt=="cardGrid") -│ + { -│ + page cardGrid -│ + } -│ if(tId.txt=="cardAlarm") -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR ├── screensaver.txt │ @@ -252,25 +252,25 @@ │ Attributes @@ -464,90 +399,3 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 -│ @@ -474,16 +474,14 @@ -│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 -│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 -│ if(tAMPM.txt=="") -│ { -│ vis tAMPM,0 -│ } -│ spstr strCommand.txt,tTimeAdd.txt,"~",2 -│ - ref tIcon1 -│ - ref tIcon2 -│ } -│ if(tInstruction.txt=="date") -│ { -│ //get set date to global variable -│ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -│ tDate.txt=pageIcons.vaDate.txt -│ } -│ @@ -691,53 +689,48 @@ -│ 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 -│ + udelete u[2]+3 -│ bufferPos=0 -│ - if(tId.txt=="pageStartup") -│ - { -│ - page pageStartup -│ - } -│ - if(tId.txt=="screensaver") -│ + if(tId.txt=="popupLight") -│ { -│ - page screensaver -│ + pageIcons.tTmp1.txt=tTmp.txt -│ + page popupLight -│ } -│ - if(tId.txt=="cardEntities") -│ + if(tId.txt=="pageStartup") -│ { -│ - page cardEntities -│ + page pageStartup -│ } -│ - if(tId.txt=="cardGrid") -│ + if(tId.txt=="cardThermo") -│ { -│ - page cardGrid -│ + page cardThermo -│ } -│ - if(tId.txt=="popupLight") -│ + if(tId.txt=="cardMedia") -│ { -│ - pageIcons.tTmp1.txt=tTmp.txt -│ - page popupLight -│ + page cardMedia -│ } -│ - if(tId.txt=="popupShutter") -│ + if(tId.txt=="pageStartup") -│ { -│ - pageIcons.tTmp1.txt=tTmp.txt -│ - page popupShutter -│ + page pageStartup -│ } -│ if(tId.txt=="popupNotify") -│ { -│ page popupNotify -│ } -│ - if(tId.txt=="cardThermo") -│ + if(tId.txt=="cardGrid") -│ { -│ - page cardThermo -│ + page cardGrid -│ } -│ - if(tId.txt=="cardMedia") -│ + if(tId.txt=="cardEntities") -│ { -│ - page cardMedia -│ + page cardEntities -│ } -│ if(tId.txt=="cardAlarm") -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { 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 705fed4c..c5bfd07d 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 @@ -14,14 +14,14 @@ popupNotify 19 Component(s) 253 Line(s) of event code 164 Unique line(s) of event code -pageStartup - 19 Component(s) - 172 Line(s) of event code - 125 Unique line(s) of event code cardAlarm 40 Component(s) 439 Line(s) of event code 261 Unique line(s) of event code +pageStartup + 19 Component(s) + 177 Line(s) of event code + 127 Unique line(s) of event code popupShutter 25 Component(s) 394 Line(s) of event code @@ -60,8 +60,8 @@ popupThermo 272 Unique line(s) of event code screensaver 45 Component(s) - 389 Line(s) of event code - 288 Unique line(s) of event code + 396 Line(s) of event code + 294 Unique line(s) of event code popupInSel 34 Component(s) 529 Line(s) of event code @@ -74,5 +74,5 @@ cardEntities Total 17 Page(s) 571 Component(s) - 7191 Line(s) of event code - 1809 Unique line(s) of event code + 7203 Line(s) of event code + 1810 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 553e874d..996accd9 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -605,39 +605,44 @@ Timer tmSerial //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") + if(tId.txt=="pageStartup") { - page cardThermo + page pageStartup } if(tId.txt=="screensaver") { page screensaver } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="cardEntities") + if(tId.txt=="popupShutter") { - page cardEntities - } - if(tId.txt=="pageStartup") - { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter } if(tId.txt=="popupNotify") { page popupNotify } + if(tId.txt=="cardThermo") + { + page cardThermo + } if(tId.txt=="cardMedia") { page cardMedia } - if(tId.txt=="cardGrid") - { - page cardGrid - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index bee23ac5..8dbb4117 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -578,7 +578,7 @@ Text tIcon1 Opacity : 127 x coordinate : 16 y coordinate : 0 - Width : 38 + Width : 85 Height : 38 Effect : load Effect Priority : 0 @@ -589,7 +589,7 @@ Text tIcon1 Font ID : 1 Back. Color : 0 Font Color : 17299 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : @@ -606,9 +606,9 @@ Text tIcon2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 429 + x coordinate : 393 y coordinate : 0 - Width : 38 + Width : 85 Height : 38 Effect : load Effect Priority : 0 @@ -619,7 +619,7 @@ Text tIcon2 Font ID : 1 Back. Color : 0 Font Color : 17299 - Horizontal Alignment : center + Horizontal Alignment : right Vertical Alignment : center Input Type : character Text : @@ -1050,6 +1050,8 @@ Timer tmSerial vis tAMPM,0 } spstr strCommand.txt,tTimeAdd.txt,"~",2 + ref tIcon1 + ref tIcon2 } if(tInstruction.txt=="date") { @@ -1265,16 +1267,37 @@ Timer tmSerial 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 u[2]+3 + udelete payloadLength-1 bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="pageStartup") + if(tId.txt=="popupShutter") { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify } if(tId.txt=="cardThermo") { @@ -1284,22 +1307,6 @@ Timer tmSerial { page cardMedia } - if(tId.txt=="pageStartup") - { - page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } - if(tId.txt=="cardGrid") - { - page cardGrid - } - if(tId.txt=="cardEntities") - { - page cardEntities - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 3250626c..9513edf5 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -310,39 +310,44 @@ Timer tmSerial //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") + if(tId.txt=="pageStartup") { - page cardThermo + page pageStartup } if(tId.txt=="screensaver") { page screensaver } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="cardEntities") + if(tId.txt=="popupShutter") { - page cardEntities - } - if(tId.txt=="pageStartup") - { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter } if(tId.txt=="popupNotify") { page popupNotify } + if(tId.txt=="cardThermo") + { + page cardThermo + } if(tId.txt=="cardMedia") { page cardMedia } - if(tId.txt=="cardGrid") - { - page cardGrid - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 80195ceb..f0ebb1e9 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -478,6 +478,8 @@ Timer tmSerial vis tAMPM,0 } spstr strCommand.txt,tTimeAdd.txt,"~",2 + ref tIcon1 + ref tIcon2 } if(tInstruction.txt=="date") { @@ -693,16 +695,37 @@ Timer tmSerial 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 u[2]+3 + udelete payloadLength-1 bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="pageStartup") + if(tId.txt=="popupShutter") { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify } if(tId.txt=="cardThermo") { @@ -712,22 +735,6 @@ Timer tmSerial { page cardMedia } - if(tId.txt=="pageStartup") - { - page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } - if(tId.txt=="cardGrid") - { - page cardGrid - } - if(tId.txt=="cardEntities") - { - page cardEntities - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 5603cdce..20cbe66e 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -646,71 +646,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ @@ -306,52 +306,47 @@ -│ 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") -│ + if(tId.txt=="cardThermo") -│ { -│ - page pageStartup -│ + page cardThermo -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="cardEntities") -│ - { -│ - page cardEntities -│ - } -│ - if(tId.txt=="cardGrid") -│ - { -│ - page cardGrid -│ - } -│ if(tId.txt=="popupLight") -│ { -│ pageIcons.tTmp1.txt=tTmp.txt -│ page popupLight -│ } -│ - if(tId.txt=="popupShutter") -│ + if(tId.txt=="cardEntities") -│ { -│ - pageIcons.tTmp1.txt=tTmp.txt -│ - page popupShutter -│ + page cardEntities -│ } -│ - if(tId.txt=="popupNotify") -│ + if(tId.txt=="pageStartup") -│ { -│ - page popupNotify -│ + page pageStartup -│ } -│ - if(tId.txt=="cardThermo") -│ + if(tId.txt=="popupNotify") -│ { -│ - page cardThermo -│ + page popupNotify -│ } -│ if(tId.txt=="cardMedia") -│ { -│ page cardMedia -│ } -│ + if(tId.txt=="cardGrid") -│ + { -│ + page cardGrid -│ + } -│ if(tId.txt=="cardAlarm") -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR ├── screensaver.txt │ @@ -252,25 +252,25 @@ │ Attributes @@ -740,90 +675,3 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled -│ @@ -474,16 +474,14 @@ -│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 -│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 -│ if(tAMPM.txt=="") -│ { -│ vis tAMPM,0 -│ } -│ spstr strCommand.txt,tTimeAdd.txt,"~",2 -│ - ref tIcon1 -│ - ref tIcon2 -│ } -│ if(tInstruction.txt=="date") -│ { -│ //get set date to global variable -│ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -│ tDate.txt=pageIcons.vaDate.txt -│ } -│ @@ -691,53 +689,48 @@ -│ 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 -│ + udelete u[2]+3 -│ bufferPos=0 -│ - if(tId.txt=="pageStartup") -│ - { -│ - page pageStartup -│ - } -│ - if(tId.txt=="screensaver") -│ + if(tId.txt=="popupLight") -│ { -│ - page screensaver -│ + pageIcons.tTmp1.txt=tTmp.txt -│ + page popupLight -│ } -│ - if(tId.txt=="cardEntities") -│ + if(tId.txt=="pageStartup") -│ { -│ - page cardEntities -│ + page pageStartup -│ } -│ - if(tId.txt=="cardGrid") -│ + if(tId.txt=="cardThermo") -│ { -│ - page cardGrid -│ + page cardThermo -│ } -│ - if(tId.txt=="popupLight") -│ + if(tId.txt=="cardMedia") -│ { -│ - pageIcons.tTmp1.txt=tTmp.txt -│ - page popupLight -│ + page cardMedia -│ } -│ - if(tId.txt=="popupShutter") -│ + if(tId.txt=="pageStartup") -│ { -│ - pageIcons.tTmp1.txt=tTmp.txt -│ - page popupShutter -│ + page pageStartup -│ } -│ if(tId.txt=="popupNotify") -│ { -│ page popupNotify -│ } -│ - if(tId.txt=="cardThermo") -│ + if(tId.txt=="cardGrid") -│ { -│ - page cardThermo -│ + page cardGrid -│ } -│ - if(tId.txt=="cardMedia") -│ + if(tId.txt=="cardEntities") -│ { -│ - page cardMedia -│ + page cardEntities -│ } -│ if(tId.txt=="cardAlarm") -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 4de811b9..74f8f710 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,69 +1,4 @@ -+++ /dev/fd/62 2022-11-22 17:23:14.264877564 +0000 -+52 +306,47 @@ -+ 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") -+ if(tId.txt=="cardThermo") -+ { -+ page pageStartup -+ page cardThermo -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid -+ } -+ if(tId.txt=="popupLight") -+ { -+ pageIcons.tTmp1.txt=tTmp.txt -+ page popupLight -+ } -+ if(tId.txt=="popupShutter") -+ if(tId.txt=="cardEntities") -+ { -+ pageIcons.tTmp1.txt=tTmp.txt -+ page popupShutter -+ page cardEntities -+ } -+ if(tId.txt=="popupNotify") -+ if(tId.txt=="pageStartup") -+ { -+ page popupNotify -+ page pageStartup -+ } -+ if(tId.txt=="cardThermo") -+ if(tId.txt=="popupNotify") -+ { -+ page cardThermo -+ page popupNotify -+ } -+ if(tId.txt=="cardMedia") -+ { -+ page cardMedia -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid -+ } -+ if(tId.txt=="cardAlarm") -+ { -+ page cardAlarm -+ } -+ if(tId.txt=="cardQR") -+ { -+ page cardQR ++++ /dev/fd/62 2022-11-22 17:43:56.613131221 +0000 +reensaver.txt +25 +252,25 @@ +ributes @@ -93,90 +28,3 @@ + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled -+16 +474,14 @@ -+ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 -+ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 -+ if(tAMPM.txt=="") -+ { -+ vis tAMPM,0 -+ } -+ spstr strCommand.txt,tTimeAdd.txt,"~",2 -+ ref tIcon1 -+ ref tIcon2 -+ } -+ if(tInstruction.txt=="date") -+ { -+ //get set date to global variable -+ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -+ tDate.txt=pageIcons.vaDate.txt -+ } -+53 +689,48 @@ -+ 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 -+ udelete u[2]+3 -+ bufferPos=0 -+ if(tId.txt=="pageStartup") -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ if(tId.txt=="popupLight") -+ { -+ page screensaver -+ pageIcons.tTmp1.txt=tTmp.txt -+ page popupLight -+ } -+ if(tId.txt=="cardEntities") -+ if(tId.txt=="pageStartup") -+ { -+ page cardEntities -+ page pageStartup -+ } -+ if(tId.txt=="cardGrid") -+ if(tId.txt=="cardThermo") -+ { -+ page cardGrid -+ page cardThermo -+ } -+ if(tId.txt=="popupLight") -+ if(tId.txt=="cardMedia") -+ { -+ pageIcons.tTmp1.txt=tTmp.txt -+ page popupLight -+ page cardMedia -+ } -+ if(tId.txt=="popupShutter") -+ if(tId.txt=="pageStartup") -+ { -+ pageIcons.tTmp1.txt=tTmp.txt -+ page popupShutter -+ page pageStartup -+ } -+ if(tId.txt=="popupNotify") -+ { -+ page popupNotify -+ } -+ if(tId.txt=="cardThermo") -+ if(tId.txt=="cardGrid") -+ { -+ page cardThermo -+ page cardGrid -+ } -+ if(tId.txt=="cardMedia") -+ if(tId.txt=="cardEntities") -+ { -+ page cardMedia -+ page cardEntities -+ } -+ if(tId.txt=="cardAlarm") -+ { -+ page cardAlarm -+ } -+ if(tId.txt=="cardQR") -+ { 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 3b197459..02585696 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 @@ -10,10 +10,6 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -pageStartup - 19 Component(s) - 172 Line(s) of event code - 125 Unique line(s) of event code cardGrid 42 Component(s) 490 Line(s) of event code @@ -22,6 +18,10 @@ popupShutter 25 Component(s) 394 Line(s) of event code 216 Unique line(s) of event code +pageStartup + 19 Component(s) + 177 Line(s) of event code + 127 Unique line(s) of event code popupThermo 44 Component(s) 515 Line(s) of event code @@ -46,10 +46,6 @@ popupFan 27 Component(s) 347 Line(s) of event code 202 Unique line(s) of event code -screensaver - 45 Component(s) - 389 Line(s) of event code - 288 Unique line(s) of event code cardMedia 34 Component(s) 421 Line(s) of event code @@ -58,6 +54,10 @@ cardPower 43 Component(s) 435 Line(s) of event code 297 Unique line(s) of event code +screensaver + 45 Component(s) + 396 Line(s) of event code + 294 Unique line(s) of event code cardAlarm 40 Component(s) 439 Line(s) of event code @@ -74,5 +74,5 @@ cardEntities Total 17 Page(s) 583 Component(s) - 7234 Line(s) of event code - 1879 Unique line(s) of event code + 7246 Line(s) of event code + 1880 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index 3ed7ec25..c8bfecb7 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -605,39 +605,44 @@ Timer tmSerial //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") + if(tId.txt=="pageStartup") { - page cardThermo + page pageStartup } if(tId.txt=="screensaver") { page screensaver } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="cardEntities") + if(tId.txt=="popupShutter") { - page cardEntities - } - if(tId.txt=="pageStartup") - { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter } if(tId.txt=="popupNotify") { page popupNotify } + if(tId.txt=="cardThermo") + { + page cardThermo + } if(tId.txt=="cardMedia") { page cardMedia } - if(tId.txt=="cardGrid") - { - page cardGrid - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index b994cca6..70c31305 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1050,6 +1050,8 @@ Timer tmSerial vis tAMPM,0 } spstr strCommand.txt,tTimeAdd.txt,"~",2 + ref tIcon1 + ref tIcon2 } if(tInstruction.txt=="date") { @@ -1265,16 +1267,37 @@ Timer tmSerial 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 u[2]+3 + udelete payloadLength-1 bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="pageStartup") + if(tId.txt=="popupShutter") { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify } if(tId.txt=="cardThermo") { @@ -1284,22 +1307,6 @@ Timer tmSerial { page cardMedia } - if(tId.txt=="pageStartup") - { - page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } - if(tId.txt=="cardGrid") - { - page cardGrid - } - if(tId.txt=="cardEntities") - { - page cardEntities - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 2174f86b..f4d64fa0 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -310,39 +310,44 @@ Timer tmSerial //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") + if(tId.txt=="pageStartup") { - page cardThermo + page pageStartup } if(tId.txt=="screensaver") { page screensaver } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="cardEntities") + if(tId.txt=="popupShutter") { - page cardEntities - } - if(tId.txt=="pageStartup") - { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter } if(tId.txt=="popupNotify") { page popupNotify } + if(tId.txt=="cardThermo") + { + page cardThermo + } if(tId.txt=="cardMedia") { page cardMedia } - if(tId.txt=="cardGrid") - { - page cardGrid - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 4db5f509..4e5478f4 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -478,6 +478,8 @@ Timer tmSerial vis tAMPM,0 } spstr strCommand.txt,tTimeAdd.txt,"~",2 + ref tIcon1 + ref tIcon2 } if(tInstruction.txt=="date") { @@ -693,16 +695,37 @@ Timer tmSerial 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 u[2]+3 + udelete payloadLength-1 bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="pageStartup") + if(tId.txt=="popupShutter") { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify } if(tId.txt=="cardThermo") { @@ -712,22 +735,6 @@ Timer tmSerial { page cardMedia } - if(tId.txt=="pageStartup") - { - page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } - if(tId.txt=="cardGrid") - { - page cardGrid - } - if(tId.txt=="cardEntities") - { - page cardEntities - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 8563e7d9..81be602e 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,6 +22,10 @@ popupNotify 19 Component(s) 253 Line(s) of event code 164 Unique line(s) of event code +screensaver + 45 Component(s) + 396 Line(s) of event code + 294 Unique line(s) of event code cardQR 32 Component(s) 421 Line(s) of event code @@ -30,10 +34,6 @@ cardGrid 42 Component(s) 490 Line(s) of event code 286 Unique line(s) of event code -screensaver - 45 Component(s) - 396 Line(s) of event code - 294 Unique line(s) of event code cardMedia 34 Component(s) 421 Line(s) of event code