From 44af5c4d8f0d9924f51479ea0023c97b4f5d8acd Mon Sep 17 00:00:00 2001 From: joBr99 Date: Tue, 14 Feb 2023 21:29:52 +0000 Subject: [PATCH] add screensaver2 type in us l/p (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 187 ++---------------- HMI/US/landscape/n2t-out-visual/cardAlarm.txt | 4 + HMI/US/landscape/n2t-out-visual/cardChart.txt | 4 + .../landscape/n2t-out-visual/cardEntities.txt | 4 + HMI/US/landscape/n2t-out-visual/cardGrid.txt | 4 + .../landscape/n2t-out-visual/cardLChart.txt | 4 + HMI/US/landscape/n2t-out-visual/cardMedia.txt | 4 + HMI/US/landscape/n2t-out-visual/cardQR.txt | 4 + .../landscape/n2t-out-visual/cardThermo.txt | 4 + .../n2t-out-visual/nspanel_US_L_Stats.txt | 64 +++--- .../landscape/n2t-out-visual/screensaver.txt | 4 + HMI/US/landscape/n2t-out/cardAlarm.txt | 4 + HMI/US/landscape/n2t-out/cardChart.txt | 4 + HMI/US/landscape/n2t-out/cardEntities.txt | 4 + HMI/US/landscape/n2t-out/cardGrid.txt | 4 + HMI/US/landscape/n2t-out/cardLChart.txt | 4 + HMI/US/landscape/n2t-out/cardMedia.txt | 4 + HMI/US/landscape/n2t-out/cardQR.txt | 4 + HMI/US/landscape/n2t-out/cardThermo.txt | 4 + HMI/US/landscape/n2t-out/screensaver.txt | 4 + HMI/US/portrait/diff-eu-version.txt | 185 ++--------------- HMI/US/portrait/diff-filtered.txt | 187 ++---------------- HMI/US/portrait/n2t-out-visual/cardAlarm.txt | 4 + HMI/US/portrait/n2t-out-visual/cardChart.txt | 4 + .../portrait/n2t-out-visual/cardEntities.txt | 4 + HMI/US/portrait/n2t-out-visual/cardGrid.txt | 4 + HMI/US/portrait/n2t-out-visual/cardLChart.txt | 4 + HMI/US/portrait/n2t-out-visual/cardMedia.txt | 4 + HMI/US/portrait/n2t-out-visual/cardQR.txt | 4 + HMI/US/portrait/n2t-out-visual/cardThermo.txt | 4 + .../n2t-out-visual/nspanel_US_P_Stats.txt | 62 +++--- .../portrait/n2t-out-visual/screensaver.txt | 4 + HMI/US/portrait/n2t-out/cardAlarm.txt | 4 + HMI/US/portrait/n2t-out/cardChart.txt | 4 + HMI/US/portrait/n2t-out/cardEntities.txt | 4 + HMI/US/portrait/n2t-out/cardGrid.txt | 4 + HMI/US/portrait/n2t-out/cardLChart.txt | 4 + HMI/US/portrait/n2t-out/cardMedia.txt | 4 + HMI/US/portrait/n2t-out/cardQR.txt | 4 + HMI/US/portrait/n2t-out/cardThermo.txt | 4 + HMI/US/portrait/n2t-out/screensaver.txt | 4 + 41 files changed, 265 insertions(+), 564 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 867a249e..de272598 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -13,174 +13,6 @@ │ - lcd_dev fffb 0002 0000 0020 │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup -│ --- HMI/n2t-out/cardAlarm.txt -├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt -│ @@ -902,18 +902,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardChart.txt -├── +++ HMI/US/landscape/n2t-out/cardChart.txt -│ @@ -635,18 +635,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardEntities.txt -├── +++ HMI/US/landscape/n2t-out/cardEntities.txt -│ @@ -1885,18 +1885,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardGrid.txt -├── +++ HMI/US/landscape/n2t-out/cardGrid.txt -│ @@ -870,18 +870,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardLChart.txt -├── +++ HMI/US/landscape/n2t-out/cardLChart.txt -│ @@ -616,18 +616,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardMedia.txt -├── +++ HMI/US/landscape/n2t-out/cardMedia.txt -│ @@ -1154,18 +1154,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardQR.txt -├── +++ HMI/US/landscape/n2t-out/cardQR.txt -│ @@ -669,18 +669,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardThermo.txt -├── +++ HMI/US/landscape/n2t-out/cardThermo.txt -│ @@ -1071,18 +1071,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -179,15 +179,15 @@ @@ -335,6 +167,25 @@ │ vis tMainText,1 │ vis tMainTextAlt,0 │ vis tMainTextAlt2,0 +│ @@ -748,14 +721,18 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ + if(tId.txt=="screensaver2") +│ + { +│ + page screensaver2 +│ + } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid │ --- HMI/n2t-out/screensaver2.txt ├── +++ HMI/US/landscape/n2t-out/screensaver2.txt │ @@ -29,17 +29,14 @@ diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index fd95357e..d0e5d8c8 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -1511,6 +1511,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out-visual/cardChart.txt b/HMI/US/landscape/n2t-out-visual/cardChart.txt index f7b638d2..df0e515d 100644 --- a/HMI/US/landscape/n2t-out-visual/cardChart.txt +++ b/HMI/US/landscape/n2t-out-visual/cardChart.txt @@ -801,6 +801,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 31b21619..bac9a395 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2844,6 +2844,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 2768291c..7e060a57 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -1322,6 +1322,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out-visual/cardLChart.txt b/HMI/US/landscape/n2t-out-visual/cardLChart.txt index 6b525358..384e9f73 100644 --- a/HMI/US/landscape/n2t-out-visual/cardLChart.txt +++ b/HMI/US/landscape/n2t-out-visual/cardLChart.txt @@ -760,6 +760,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 8c1b3b07..e6e73844 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -1646,6 +1646,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index a65a6eba..58000e50 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -974,6 +974,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 6861d8e6..c2d9c980 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -1799,6 +1799,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities 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 e7b1d3ea..c72ae49f 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,18 +14,14 @@ popupShutter 25 Component(s) 398 Line(s) of event code 218 Unique line(s) of event code -cardLChart - 33 Component(s) - 394 Line(s) of event code - 262 Unique line(s) of event code pageStartup 20 Component(s) 185 Line(s) of event code 131 Unique line(s) of event code -cardChart +cardLChart 33 Component(s) - 429 Line(s) of event code - 292 Unique line(s) of event code + 398 Line(s) of event code + 264 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code @@ -42,22 +38,22 @@ popupThermo 44 Component(s) 519 Line(s) of event code 274 Unique line(s) of event code -cardQR - 34 Component(s) - 402 Line(s) of event code - 234 Unique line(s) of event code +cardChart + 33 Component(s) + 433 Line(s) of event code + 294 Unique line(s) of event code cardPower 54 Component(s) 523 Line(s) of event code 345 Unique line(s) of event code -screensaver - 46 Component(s) - 418 Line(s) of event code - 298 Unique line(s) of event code cardGrid 44 Component(s) - 515 Line(s) of event code - 291 Unique line(s) of event code + 519 Line(s) of event code + 293 Unique line(s) of event code +cardMedia + 59 Component(s) + 645 Line(s) of event code + 320 Unique line(s) of event code popupLight 28 Component(s) 408 Line(s) of event code @@ -66,29 +62,33 @@ popupTimer 42 Component(s) 512 Line(s) of event code 255 Unique line(s) of event code -cardThermo - 57 Component(s) - 532 Line(s) of event code - 315 Unique line(s) of event code -cardMedia - 59 Component(s) - 641 Line(s) of event code - 318 Unique line(s) of event code -cardEntities - 67 Component(s) - 1162 Line(s) of event code - 528 Unique line(s) of event code cardAlarm 43 Component(s) - 492 Line(s) of event code - 269 Unique line(s) of event code + 496 Line(s) of event code + 271 Unique line(s) of event code +cardQR + 34 Component(s) + 406 Line(s) of event code + 236 Unique line(s) of event code +cardThermo + 57 Component(s) + 536 Line(s) of event code + 317 Unique line(s) of event code +screensaver + 46 Component(s) + 422 Line(s) of event code + 300 Unique line(s) of event code screensaver2 58 Component(s) 344 Line(s) of event code 243 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) 800 Component(s) - 9179 Line(s) of event code + 9215 Line(s) of event code 2329 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 720369c3..3884165f 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1298,6 +1298,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index ad6e33cb..35afa004 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -906,6 +906,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out/cardChart.txt b/HMI/US/landscape/n2t-out/cardChart.txt index 7fd94478..79eafcbd 100644 --- a/HMI/US/landscape/n2t-out/cardChart.txt +++ b/HMI/US/landscape/n2t-out/cardChart.txt @@ -639,6 +639,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 05517a76..fb0ae315 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1889,6 +1889,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index f9b70050..115291d7 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -874,6 +874,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out/cardLChart.txt b/HMI/US/landscape/n2t-out/cardLChart.txt index a445407e..e3684ba7 100644 --- a/HMI/US/landscape/n2t-out/cardLChart.txt +++ b/HMI/US/landscape/n2t-out/cardLChart.txt @@ -620,6 +620,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index 6db7cb92..1bdbba61 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -1158,6 +1158,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 7855710f..e7e72c41 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -673,6 +673,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index 82159dd1..4d66237a 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -1075,6 +1075,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index c635e0b8..c508dcdb 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -725,6 +725,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 95e01675..44f37678 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -15,48 +15,6 @@ │ + // fix touch offset (Removed for US version) │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup -│ --- HMI/n2t-out/cardAlarm.txt -├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt -│ @@ -902,18 +902,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardChart.txt -├── +++ HMI/US/portrait/n2t-out/cardChart.txt -│ @@ -635,18 +635,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid │ --- HMI/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt │ @@ -61,16 +61,36 @@ @@ -1089,88 +1047,6 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 -│ @@ -1885,18 +2665,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardGrid.txt -├── +++ HMI/US/portrait/n2t-out/cardGrid.txt -│ @@ -870,18 +870,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardLChart.txt -├── +++ HMI/US/portrait/n2t-out/cardLChart.txt -│ @@ -616,18 +616,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardMedia.txt -├── +++ HMI/US/portrait/n2t-out/cardMedia.txt -│ @@ -1154,18 +1154,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid │ --- HMI/n2t-out/cardPower.txt ├── +++ HMI/US/portrait/n2t-out/cardPower.txt │ @@ -35,27 +35,27 @@ @@ -1524,48 +1400,6 @@ │ Scope : local │ Period (ms): 50 │ Enabled : yes -│ --- HMI/n2t-out/cardQR.txt -├── +++ HMI/US/portrait/n2t-out/cardQR.txt -│ @@ -669,18 +669,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardThermo.txt -├── +++ HMI/US/portrait/n2t-out/cardThermo.txt -│ @@ -1071,18 +1071,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt │ @@ -35,20 +35,14 @@ @@ -1698,6 +1532,25 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none +│ @@ -748,14 +724,18 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ + if(tId.txt=="screensaver2") +│ + { +│ + page screensaver2 +│ + } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid │ --- HMI/n2t-out/screensaver2.txt ├── +++ HMI/US/portrait/n2t-out/screensaver2.txt │ @@ -29,17 +29,14 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 52ae82d6..d20f55f6 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,48 +1,6 @@ -+++ /dev/fd/62 2023-02-13 21:33:02.347335367 +0000 ++++ /dev/fd/62 2023-02-14 21:29:44.298399725 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt -+I/n2t-out/cardAlarm.txt -++ HMI/US/portrait/n2t-out/cardAlarm.txt -+18 +902,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid -+I/n2t-out/cardChart.txt -++ HMI/US/portrait/n2t-out/cardChart.txt -+18 +635,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid +I/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt +6 +61,36 @@ @@ -508,88 +466,6 @@ + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } -+,18 +2665,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid -+I/n2t-out/cardGrid.txt -++ HMI/US/portrait/n2t-out/cardGrid.txt -+18 +870,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid -+I/n2t-out/cardLChart.txt -++ HMI/US/portrait/n2t-out/cardLChart.txt -+18 +616,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid -+I/n2t-out/cardMedia.txt -++ HMI/US/portrait/n2t-out/cardMedia.txt -+,18 +1154,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid +I/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardPower.txt +7 +35,27 @@ @@ -943,48 +819,6 @@ + Scope : local + Period (ms): 50 + Enabled : yes -+I/n2t-out/cardQR.txt -++ HMI/US/portrait/n2t-out/cardQR.txt -+18 +669,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid -+I/n2t-out/cardThermo.txt -++ HMI/US/portrait/n2t-out/cardThermo.txt -+,18 +1071,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt +0 +35,14 @@ @@ -1083,6 +917,25 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none ++14 +724,18 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid +I/n2t-out/screensaver2.txt ++ HMI/US/portrait/n2t-out/screensaver2.txt +7 +29,14 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 3cf2258e..45443245 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -1511,6 +1511,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out-visual/cardChart.txt b/HMI/US/portrait/n2t-out-visual/cardChart.txt index be6b3681..f1f1b5c7 100644 --- a/HMI/US/portrait/n2t-out-visual/cardChart.txt +++ b/HMI/US/portrait/n2t-out-visual/cardChart.txt @@ -801,6 +801,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 40726a49..fa232406 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -4010,6 +4010,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 230950fe..ff682723 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -1322,6 +1322,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out-visual/cardLChart.txt b/HMI/US/portrait/n2t-out-visual/cardLChart.txt index 1315c5b7..3f4b68f7 100644 --- a/HMI/US/portrait/n2t-out-visual/cardLChart.txt +++ b/HMI/US/portrait/n2t-out-visual/cardLChart.txt @@ -760,6 +760,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 55ca8ec5..79d2dc20 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -1646,6 +1646,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 5e850c24..29121e28 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -974,6 +974,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index f46d33fa..df7f8706 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -1799,6 +1799,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities 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 b32bd2e3..a39db041 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,22 +22,18 @@ popupFan 27 Component(s) 351 Line(s) of event code 204 Unique line(s) of event code +cardQR + 34 Component(s) + 406 Line(s) of event code + 236 Unique line(s) of event code pageStartup 19 Component(s) 185 Line(s) of event code 131 Unique line(s) of event code -cardChart - 33 Component(s) - 429 Line(s) of event code - 292 Unique line(s) of event code -cardLChart - 33 Component(s) - 394 Line(s) of event code - 262 Unique line(s) of event code -cardGrid - 44 Component(s) - 515 Line(s) of event code - 291 Unique line(s) of event code +cardThermo + 57 Component(s) + 536 Line(s) of event code + 317 Unique line(s) of event code popupShutter 25 Component(s) 398 Line(s) of event code @@ -46,34 +42,38 @@ popupThermo 44 Component(s) 519 Line(s) of event code 274 Unique line(s) of event code -cardMedia - 59 Component(s) - 641 Line(s) of event code - 318 Unique line(s) of event code cardAlarm 43 Component(s) - 492 Line(s) of event code - 269 Unique line(s) of event code -cardQR - 34 Component(s) - 402 Line(s) of event code - 234 Unique line(s) of event code + 496 Line(s) of event code + 271 Unique line(s) of event code +cardChart + 33 Component(s) + 433 Line(s) of event code + 294 Unique line(s) of event code +cardLChart + 33 Component(s) + 398 Line(s) of event code + 264 Unique line(s) of event code cardPower 54 Component(s) 517 Line(s) of event code 339 Unique line(s) of event code -cardThermo - 57 Component(s) - 532 Line(s) of event code - 315 Unique line(s) of event code +cardMedia + 59 Component(s) + 645 Line(s) of event code + 320 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code 255 Unique line(s) of event code screensaver 46 Component(s) - 421 Line(s) of event code - 302 Unique line(s) of event code + 425 Line(s) of event code + 304 Unique line(s) of event code +cardGrid + 44 Component(s) + 519 Line(s) of event code + 293 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code @@ -84,11 +84,11 @@ screensaver2 243 Unique line(s) of event code cardEntities 91 Component(s) - 1622 Line(s) of event code - 701 Unique line(s) of event code + 1626 Line(s) of event code + 703 Unique line(s) of event code Total 21 Page(s) 811 Component(s) - 9582 Line(s) of event code + 9618 Line(s) of event code 2454 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index e0ecfcda..f23ad895 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1301,6 +1301,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index ad6e33cb..35afa004 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -906,6 +906,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out/cardChart.txt b/HMI/US/portrait/n2t-out/cardChart.txt index 7fd94478..79eafcbd 100644 --- a/HMI/US/portrait/n2t-out/cardChart.txt +++ b/HMI/US/portrait/n2t-out/cardChart.txt @@ -639,6 +639,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 5bd5df67..6583407e 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -2669,6 +2669,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index f9b70050..115291d7 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -874,6 +874,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out/cardLChart.txt b/HMI/US/portrait/n2t-out/cardLChart.txt index a445407e..e3684ba7 100644 --- a/HMI/US/portrait/n2t-out/cardLChart.txt +++ b/HMI/US/portrait/n2t-out/cardLChart.txt @@ -620,6 +620,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 6db7cb92..1bdbba61 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -1158,6 +1158,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 7855710f..e7e72c41 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -673,6 +673,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 82159dd1..4d66237a 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -1075,6 +1075,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index e850716b..340793fa 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -728,6 +728,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities