h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-13 16:38:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

added alternative screensaver (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-02-02 19:03:31 +00:00
committed by github-actions[bot]
parent e9ae493894
commit 7f14e9d205
28 changed files with 3684 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

239
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,5 +1,143 @@
--- HMI/n2t-out --- HMI/n2t-out
+++ HMI/US/landscape/n2t-out +++ HMI/US/landscape/n2t-out
├── file list
│ @@ -14,9 +14,8 @@
│ popupFan.txt
│ popupInSel.txt
│ popupLight.txt
│ popupNotify.txt
│ popupShutter.txt
│ popupThermo.txt
│ popupTimer.txt
│ -screensaver.txt
│ -screensaver2.txt
│ +screensaver.txt
│ --- 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/cardPower.txt │ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/landscape/n2t-out/cardPower.txt ├── +++ HMI/US/landscape/n2t-out/cardPower.txt
│ @@ -35,27 +35,27 @@ │ @@ -35,27 +35,27 @@
@@ -536,7 +674,26 @@
│ vis h5,1 │ vis h5,1
│ }else │ }else
│ { │ {
│ @@ -965,14 +891,18 @@ │ @@ -919,18 +845,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
│ @@ -969,14 +891,18 @@
│ { │ {
│ page cardPower │ page cardPower
│ } │ }
@@ -555,6 +712,48 @@
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ } │ }
│ if(tInstruction.txt=="date") │ if(tInstruction.txt=="date")
│ --- 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/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -179,15 +179,15 @@ │ @@ -179,15 +179,15 @@
@@ -574,6 +773,25 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ @@ -320,18 +320,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/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -29,17 +29,14 @@ │ @@ -29,17 +29,14 @@
@@ -647,3 +865,22 @@
│ if(tAMPM.txt=="") │ if(tAMPM.txt=="")
│ { │ {
│ vis tAMPM,0 │ vis tAMPM,0
│ @@ -745,18 +721,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

235
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,5 +1,17 @@
--- HMI/n2t-out --- HMI/n2t-out
+++ HMI/US/portrait/n2t-out +++ HMI/US/portrait/n2t-out
├── file list
│ @@ -14,9 +14,8 @@
│ popupFan.txt
│ popupInSel.txt
│ popupLight.txt
│ popupNotify.txt
│ popupShutter.txt
│ popupThermo.txt
│ popupTimer.txt
│ -screensaver.txt
│ -screensaver2.txt
│ +screensaver.txt
│ --- HMI/n2t-out/Program.s.txt │ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/portrait/n2t-out/Program.s.txt ├── +++ HMI/US/portrait/n2t-out/Program.s.txt
│ @@ -10,10 +10,10 @@ │ @@ -10,10 +10,10 @@
@@ -15,6 +27,48 @@
│ + // fix touch offset (Removed for US version) │ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020 │ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup │ 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/n2t-out/cardEntities.txt
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
│ @@ -61,16 +61,36 @@ │ @@ -61,16 +61,36 @@
@@ -1047,6 +1101,88 @@
│ //command format pageType,specialPageName │ //command format pageType,specialPageName
│ //write name of speical page to tId │ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1 │ 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/n2t-out/cardPower.txt
├── +++ HMI/US/portrait/n2t-out/cardPower.txt ├── +++ HMI/US/portrait/n2t-out/cardPower.txt
│ @@ -35,27 +35,27 @@ │ @@ -35,27 +35,27 @@
@@ -1400,6 +1536,67 @@
│ Scope : local │ Scope : local
│ Period (ms): 50 │ Period (ms): 50
│ Enabled : yes │ Enabled : yes
│ @@ -919,18 +889,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/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/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -35,20 +35,14 @@ │ @@ -35,20 +35,14 @@
@@ -1457,6 +1654,25 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ @@ -320,18 +314,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/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -29,17 +29,14 @@ │ @@ -29,17 +29,14 @@
@@ -1530,3 +1746,22 @@
│ if(tAMPM.txt=="") │ if(tAMPM.txt=="")
│ { │ {
│ vis tAMPM,0 │ vis tAMPM,0
│ @@ -745,18 +721,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

239
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,6 +1,60 @@
+++ /dev/fd/62 2023-02-01 21:52:45.071014440 +0000 +++ /dev/fd/62 2023-02-02 19:03:22.647127423 +0000
+le list
+ +14,8 @@
+n.txt
+Sel.txt
+ght.txt
+tify.txt
+utter.txt
+ermo.txt
+mer.txt
+aver.txt
+aver2.txt
+aver.txt
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/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 +I/n2t-out/cardEntities.txt
++ HMI/US/portrait/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt
+6 +61,36 @@ +6 +61,36 @@
@@ -54,13 +108,13 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+ +
+e (string) nent2 +e (string) nent2
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+14 +186,26 @@ +14 +186,26 @@
+e (string) type6 +e (string) type6
@@ -466,6 +520,88 @@
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0 + 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 +I/n2t-out/cardPower.txt
++ HMI/US/portrait/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardPower.txt
+7 +35,27 @@ +7 +35,27 @@
@@ -819,6 +955,67 @@
+ Scope : local + Scope : local
+ Period (ms): 50 + Period (ms): 50
+ Enabled : yes + Enabled : yes
+18 +889,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/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 +I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +35,14 @@ +0 +35,14 @@
@@ -842,6 +1039,25 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
+18 +314,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/screensaver.txt +I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt
+7 +29,14 @@ +7 +29,14 @@
@@ -915,3 +1131,22 @@
+ if(tAMPM.txt=="") + if(tAMPM.txt=="")
+ { + {
+ vis tAMPM,0 + vis tAMPM,0
+18 +721,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

4
HMI/n2t-out-visual/cardAlarm.txt
View File

@@ -1511,6 +1511,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out-visual/cardChart.txt
View File

@@ -801,6 +801,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -2844,6 +2844,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out-visual/cardGrid.txt
View File

@@ -1322,6 +1322,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out-visual/cardLChart.txt
View File

@@ -760,6 +760,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -1646,6 +1646,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out-visual/cardPower.txt
View File

@@ -1611,6 +1611,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out-visual/cardQR.txt
View File

@@ -974,6 +974,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -1799,6 +1799,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

86
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -14,38 +14,42 @@ popupNotify
19 Component(s) 19 Component(s)
257 Line(s) of event code 257 Line(s) of event code
166 Unique line(s) of event code 166 Unique line(s) of event code
cardQR
34 Component(s)
402 Line(s) of event code
234 Unique line(s) of event code
pageStartup
20 Component(s)
185 Line(s) of event code
131 Unique line(s) of event code
cardChart cardChart
33 Component(s) 33 Component(s)
429 Line(s) of event code 433 Line(s) of event code
292 Unique 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
pageStartup
20 Component(s)
189 Line(s) of event code
133 Unique line(s) of event code
pageTest pageTest
26 Component(s) 26 Component(s)
68 Line(s) of event code 68 Line(s) of event code
66 Unique line(s) of event code 66 Unique line(s) of event code
screensaver cardMedia
47 Component(s) 59 Component(s)
428 Line(s) of event code 645 Line(s) of event code
306 Unique line(s) of event code 320 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
351 Line(s) of event code 351 Line(s) of event code
204 Unique 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
cardGrid
44 Component(s)
519 Line(s) of event code
293 Unique line(s) of event code
cardAlarm cardAlarm
43 Component(s) 43 Component(s)
492 Line(s) of event code 496 Line(s) of event code
269 Unique line(s) of event code 271 Unique line(s) of event code
cardLChart
33 Component(s)
394 Line(s) of event code
262 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
617 Line(s) of event code 617 Line(s) of event code
@@ -58,33 +62,33 @@ popupShutter
25 Component(s) 25 Component(s)
398 Line(s) of event code 398 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
cardMedia cardThermo
57 Component(s)
536 Line(s) of event code
317 Unique line(s) of event code
screensaver2
59 Component(s) 59 Component(s)
641 Line(s) of event code 354 Line(s) of event code
318 Unique line(s) of event code 251 Unique line(s) of event code
cardPower
54 Component(s)
495 Line(s) of event code
336 Unique line(s) of event code
popupTimer popupTimer
42 Component(s) 42 Component(s)
512 Line(s) of event code 512 Line(s) of event code
255 Unique line(s) of event code 255 Unique line(s) of event code
cardGrid screensaver
44 Component(s) 47 Component(s)
515 Line(s) of event code 432 Line(s) of event code
291 Unique line(s) of event code 308 Unique line(s) of event code
cardThermo cardPower
57 Component(s) 54 Component(s)
532 Line(s) of event code 499 Line(s) of event code
315 Unique line(s) of event code 338 Unique line(s) of event code
cardEntities cardEntities
67 Component(s) 67 Component(s)
1162 Line(s) of event code 1166 Line(s) of event code
528 Unique line(s) of event code 530 Unique line(s) of event code
Total Total
20 Page(s) 21 Page(s)
743 Component(s) 802 Component(s)
8818 Line(s) of event code 9216 Line(s) of event code
2279 Unique line(s) of event code 2331 Unique line(s) of event code

4
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -620,6 +620,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out-visual/screensaver.txt
View File

@@ -1342,6 +1342,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

1838
HMI/n2t-out-visual/screensaver2.txt Normal file
View File

File diff suppressed because it is too large Load Diff

4
HMI/n2t-out/cardAlarm.txt
View File

@@ -906,6 +906,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out/cardChart.txt
View File

@@ -639,6 +639,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out/cardEntities.txt
View File

@@ -1889,6 +1889,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out/cardGrid.txt
View File

@@ -874,6 +874,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out/cardLChart.txt
View File

@@ -620,6 +620,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out/cardMedia.txt
View File

@@ -1158,6 +1158,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out/cardPower.txt
View File

@@ -923,6 +923,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out/cardQR.txt
View File

@@ -673,6 +673,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out/cardThermo.txt
View File

@@ -1075,6 +1075,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out/pageStartup.txt
View File

@@ -324,6 +324,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

4
HMI/n2t-out/screensaver.txt
View File

@@ -749,6 +749,10 @@ Timer tmSerial
{ {
page screensaver page screensaver
} }
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities

1003
HMI/n2t-out/screensaver2.txt Normal file
View File

File diff suppressed because it is too large Load Diff