h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-11 15:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
joBr99
2022-06-23 22:31:54 +02:00
parent 0dc1bac342 6531ccc3c3
commit bb6c1d12db
12 changed files with 261 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-23 20:12:05.612935077 +0000
@@ -11,9 +11,4 @@ @@ -11,9 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -12,8 +12,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.407072100 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 20:12:05.616935142 +0000
@@ -12,21 +12,6 @@ @@ -12,21 +12,6 @@
Events Events
@@ -65,8 +65,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-22 21:38:52.407072100 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 20:12:05.616935142 +0000
@@ -12,22 +12,6 @@ @@ -12,22 +12,6 @@
Events Events
@@ -110,8 +110,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/cardGrid.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 20:12:05.612935077 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -144,8 +144,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 20:12:05.612935077 +0000
@@ -12,17 +12,6 @@ @@ -12,17 +12,6 @@
Events Events
@@ -184,8 +184,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/cardQR.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 20:12:05.612935077 +0000
@@ -12,21 +12,6 @@ @@ -12,21 +12,6 @@
Events Events
@@ -228,8 +228,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-22 21:38:52.407072100 +0000 --- HMI/n2t-out/cardThermo.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 20:12:05.616935142 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -262,8 +262,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 20:12:05.612935077 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -293,8 +293,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/pageTest.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 20:12:05.612935077 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -343,8 +343,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
Picture p0 Picture p0
Attributes Attributes
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/popupLight.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 20:12:05.616935142 +0000
@@ -12,25 +12,6 @@ @@ -12,25 +12,6 @@
Events Events
@@ -391,8 +391,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/popupNotify.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 20:12:05.616935142 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -425,8 +425,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-22 21:38:52.407072100 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 20:12:05.616935142 +0000
@@ -12,40 +12,6 @@ @@ -12,40 +12,6 @@
Events Events
@@ -576,8 +576,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/screensaver.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-22 21:38:53.203087434 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 20:12:05.616935142 +0000
@@ -406,22 +406,10 @@ @@ -406,22 +406,10 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1

12
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -38,14 +38,14 @@ popupShutter
25 Component(s) 25 Component(s)
331 Line(s) of event code 331 Line(s) of event code
163 Unique line(s) of event code 163 Unique line(s) of event code
screensaver
38 Component(s)
319 Line(s) of event code
253 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1133 Line(s) of event code 1133 Line(s) of event code
496 Unique line(s) of event code 496 Unique line(s) of event code
screensaver
38 Component(s)
322 Line(s) of event code
254 Unique line(s) of event code
cardThermo cardThermo
53 Component(s) 53 Component(s)
555 Line(s) of event code 555 Line(s) of event code
@@ -58,5 +58,5 @@ cardAlarm
Total Total
13 Page(s) 13 Page(s)
412 Component(s) 412 Component(s)
4644 Line(s) of event code 4647 Line(s) of event code
1235 Unique line(s) of event code 1236 Unique line(s) of event code

53
HMI/US/landscape/n2t-out-visual/screensaver.txt
View File

@@ -1090,31 +1090,34 @@ Timer tmSerial
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco if(tTime.bco!=screensaver.bco)
tAMPM.bco=tTime.bco {
tDate.bco=tTime.bco screensaver.bco=tTime.bco
tMainIcon.bco=tTime.bco tAMPM.bco=tTime.bco
tMainText.bco=tTime.bco tDate.bco=tTime.bco
tMainIconAlt.bco=tTime.bco tMainIcon.bco=tTime.bco
tMainTextAlt.bco=tTime.bco tMainText.bco=tTime.bco
tMRIcon.bco=tTime.bco tMainIconAlt.bco=tTime.bco
tMR.bco=tTime.bco tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco tMR.bco=tTime.bco
tIcon2.bco=tTime.bco tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco tIcon1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tIcon2.bco=tTime.bco
tF1Icon.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast2.bco=tTime.bco tForecast1Val.bco=tTime.bco
tForecast2Val.bco=tTime.bco tF1Icon.bco=tTime.bco
tF2Icon.bco=tTime.bco tForecast2.bco=tTime.bco
tForecast3.bco=tTime.bco tForecast2Val.bco=tTime.bco
tForecast3Val.bco=tTime.bco tF2Icon.bco=tTime.bco
tF3Icon.bco=tTime.bco tForecast3.bco=tTime.bco
tForecast4.bco=tTime.bco tForecast3Val.bco=tTime.bco
tForecast4Val.bco=tTime.bco tF3Icon.bco=tTime.bco
tF4Icon.bco=tTime.bco tForecast4.bco=tTime.bco
tTimeAdd.bco=tTime.bco tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
tTimeAdd.bco=tTime.bco
}
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0 covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3

53
HMI/US/landscape/n2t-out/screensaver.txt
View File

@@ -525,31 +525,34 @@ Timer tmSerial
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco if(tTime.bco!=screensaver.bco)
tAMPM.bco=tTime.bco {
tDate.bco=tTime.bco screensaver.bco=tTime.bco
tMainIcon.bco=tTime.bco tAMPM.bco=tTime.bco
tMainText.bco=tTime.bco tDate.bco=tTime.bco
tMainIconAlt.bco=tTime.bco tMainIcon.bco=tTime.bco
tMainTextAlt.bco=tTime.bco tMainText.bco=tTime.bco
tMRIcon.bco=tTime.bco tMainIconAlt.bco=tTime.bco
tMR.bco=tTime.bco tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco tMR.bco=tTime.bco
tIcon2.bco=tTime.bco tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco tIcon1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tIcon2.bco=tTime.bco
tF1Icon.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast2.bco=tTime.bco tForecast1Val.bco=tTime.bco
tForecast2Val.bco=tTime.bco tF1Icon.bco=tTime.bco
tF2Icon.bco=tTime.bco tForecast2.bco=tTime.bco
tForecast3.bco=tTime.bco tForecast2Val.bco=tTime.bco
tForecast3Val.bco=tTime.bco tF2Icon.bco=tTime.bco
tF3Icon.bco=tTime.bco tForecast3.bco=tTime.bco
tForecast4.bco=tTime.bco tForecast3Val.bco=tTime.bco
tForecast4Val.bco=tTime.bco tF3Icon.bco=tTime.bco
tF4Icon.bco=tTime.bco tForecast4.bco=tTime.bco
tTimeAdd.bco=tTime.bco tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
tTimeAdd.bco=tTime.bco
}
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0 covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:12:05.148927555 +0000
@@ -11,9 +11,6 @@ @@ -11,9 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -14,8 +14,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.407072100 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:12:05.152927620 +0000
@@ -12,21 +12,6 @@ @@ -12,21 +12,6 @@
Events Events
@@ -67,8 +67,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-22 21:38:52.407072100 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:12:05.152927620 +0000
@@ -12,22 +12,6 @@ @@ -12,22 +12,6 @@
Events Events
@@ -566,8 +566,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/cardGrid.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-23 20:12:05.152927620 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -600,8 +600,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-23 20:12:05.148927555 +0000
@@ -12,17 +12,6 @@ @@ -12,17 +12,6 @@
Events Events
@@ -640,8 +640,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/cardQR.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:12:05.148927555 +0000
@@ -12,21 +12,6 @@ @@ -12,21 +12,6 @@
Events Events
@@ -684,8 +684,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-22 21:38:52.407072100 +0000 --- HMI/n2t-out/cardThermo.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:12:05.148927555 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -718,8 +718,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:12:05.148927555 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -758,8 +758,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/pageTest.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:12:05.148927555 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -808,8 +808,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
Picture p0 Picture p0
Attributes Attributes
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/popupLight.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:12:05.148927555 +0000
@@ -12,25 +12,6 @@ @@ -12,25 +12,6 @@
Events Events
@@ -856,8 +856,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/popupNotify.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:12:05.148927555 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -890,8 +890,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-22 21:38:52.407072100 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:12:05.148927555 +0000
@@ -12,40 +12,6 @@ @@ -12,40 +12,6 @@
Events Events
@@ -1041,8 +1041,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-22 21:38:52.403072023 +0000 --- HMI/n2t-out/screensaver.txt 2022-06-23 20:12:04.708920422 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-22 21:38:52.775079189 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-23 20:12:05.148927555 +0000
@@ -406,22 +406,10 @@ @@ -406,22 +406,10 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1

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

@@ -1,13 +1,13 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-22 21:38:52.819080036 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-23 20:12:05.164927814 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-22 21:38:52.403072023 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:12:05.148927555 +0000
+@@ -11,9 +11,6 @@ +@@ -11,9 +11,6 @@
+- //color vars +- //color vars
+- int defaultFontColor=65535 +- int defaultFontColor=65535
+- int defaultBcoColor=6371 +- int defaultBcoColor=6371
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.407072100 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:12:05.152927620 +0000
+@@ -12,21 +12,6 @@ +@@ -12,21 +12,6 @@
+ +
+ Events + Events
@@ -58,8 +58,8 @@
+ } + }
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+--- HMI/n2t-out/cardEntities.txt 2022-06-22 21:38:52.407072100 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:12:05.152927620 +0000
+@@ -12,22 +12,6 @@ +@@ -12,22 +12,6 @@
+ +
+ Events + Events
@@ -114,8 +114,8 @@
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-06-22 21:38:52.403072023 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-23 20:12:05.152927620 +0000
+@@ -12,11 +12,6 @@ +@@ -12,11 +12,6 @@
+ +
+ Events + Events
@@ -148,8 +148,8 @@
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-22 21:38:52.403072023 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-23 20:12:05.148927555 +0000
+@@ -12,17 +12,6 @@ +@@ -12,17 +12,6 @@
+ +
+ Events + Events
@@ -187,8 +187,8 @@
+ } + }
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+--- HMI/n2t-out/cardQR.txt 2022-06-22 21:38:52.403072023 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:12:05.148927555 +0000
+@@ -12,21 +12,6 @@ +@@ -12,21 +12,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -230,8 +230,8 @@
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-06-22 21:38:52.407072100 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:12:05.148927555 +0000
+@@ -12,11 +12,6 @@ +@@ -12,11 +12,6 @@
+ +
+ Events + Events
@@ -263,8 +263,8 @@
+ } + }
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+--- HMI/n2t-out/pageStartup.txt 2022-06-22 21:38:52.403072023 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:12:05.148927555 +0000
+@@ -277,18 +277,6 @@ +@@ -277,18 +277,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,dimValueNormal,0,0 + covx tTmp.txt,dimValueNormal,0,0
@@ -285,8 +285,8 @@
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-06-22 21:38:52.403072023 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:12:05.148927555 +0000
+@@ -13,46 +13,6 @@ +@@ -13,46 +13,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -335,8 +335,8 @@
+ Picture p0 + Picture p0
+ Attributes + Attributes
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-06-22 21:38:52.403072023 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:12:05.148927555 +0000
+@@ -12,25 +12,6 @@ +@@ -12,25 +12,6 @@
+ +
+ Events + Events
@@ -383,8 +383,8 @@
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-06-22 21:38:52.403072023 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:12:05.148927555 +0000
+@@ -12,11 +12,6 @@ +@@ -12,11 +12,6 @@
+ +
+ Events + Events
@@ -417,8 +417,8 @@
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-06-22 21:38:52.407072100 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:12:05.148927555 +0000
+@@ -12,40 +12,6 @@ +@@ -12,40 +12,6 @@
+ +
+ Events + Events
@@ -567,8 +567,8 @@
+ if(tInstruction.txt=="time") + if(tInstruction.txt=="time")
+ { + {
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-06-22 21:38:52.403072023 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-23 20:12:04.708920422 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-23 20:12:05.148927555 +0000
+@@ -406,22 +406,10 @@ +@@ -406,22 +406,10 @@
+ // get value + // get value
+ spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"~",1

8
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -40,8 +40,8 @@ cardMedia
195 Unique line(s) of event code 195 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
319 Line(s) of event code 322 Line(s) of event code
253 Unique line(s) of event code 254 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1363 Line(s) of event code 1363 Line(s) of event code
@@ -58,5 +58,5 @@ cardAlarm
Total Total
13 Page(s) 13 Page(s)
424 Component(s) 424 Component(s)
4874 Line(s) of event code 4877 Line(s) of event code
1307 Unique line(s) of event code 1308 Unique line(s) of event code

53
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -1090,31 +1090,34 @@ Timer tmSerial
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco if(tTime.bco!=screensaver.bco)
tAMPM.bco=tTime.bco {
tDate.bco=tTime.bco screensaver.bco=tTime.bco
tMainIcon.bco=tTime.bco tAMPM.bco=tTime.bco
tMainText.bco=tTime.bco tDate.bco=tTime.bco
tMainIconAlt.bco=tTime.bco tMainIcon.bco=tTime.bco
tMainTextAlt.bco=tTime.bco tMainText.bco=tTime.bco
tMRIcon.bco=tTime.bco tMainIconAlt.bco=tTime.bco
tMR.bco=tTime.bco tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco tMR.bco=tTime.bco
tIcon2.bco=tTime.bco tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco tIcon1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tIcon2.bco=tTime.bco
tF1Icon.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast2.bco=tTime.bco tForecast1Val.bco=tTime.bco
tForecast2Val.bco=tTime.bco tF1Icon.bco=tTime.bco
tF2Icon.bco=tTime.bco tForecast2.bco=tTime.bco
tForecast3.bco=tTime.bco tForecast2Val.bco=tTime.bco
tForecast3Val.bco=tTime.bco tF2Icon.bco=tTime.bco
tF3Icon.bco=tTime.bco tForecast3.bco=tTime.bco
tForecast4.bco=tTime.bco tForecast3Val.bco=tTime.bco
tForecast4Val.bco=tTime.bco tF3Icon.bco=tTime.bco
tF4Icon.bco=tTime.bco tForecast4.bco=tTime.bco
tTimeAdd.bco=tTime.bco tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
tTimeAdd.bco=tTime.bco
}
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0 covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3

53
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -525,31 +525,34 @@ Timer tmSerial
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco if(tTime.bco!=screensaver.bco)
tAMPM.bco=tTime.bco {
tDate.bco=tTime.bco screensaver.bco=tTime.bco
tMainIcon.bco=tTime.bco tAMPM.bco=tTime.bco
tMainText.bco=tTime.bco tDate.bco=tTime.bco
tMainIconAlt.bco=tTime.bco tMainIcon.bco=tTime.bco
tMainTextAlt.bco=tTime.bco tMainText.bco=tTime.bco
tMRIcon.bco=tTime.bco tMainIconAlt.bco=tTime.bco
tMR.bco=tTime.bco tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco tMR.bco=tTime.bco
tIcon2.bco=tTime.bco tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco tIcon1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tIcon2.bco=tTime.bco
tF1Icon.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast2.bco=tTime.bco tForecast1Val.bco=tTime.bco
tForecast2Val.bco=tTime.bco tF1Icon.bco=tTime.bco
tF2Icon.bco=tTime.bco tForecast2.bco=tTime.bco
tForecast3.bco=tTime.bco tForecast2Val.bco=tTime.bco
tForecast3Val.bco=tTime.bco tF2Icon.bco=tTime.bco
tF3Icon.bco=tTime.bco tForecast3.bco=tTime.bco
tForecast4.bco=tTime.bco tForecast3Val.bco=tTime.bco
tForecast4Val.bco=tTime.bco tF3Icon.bco=tTime.bco
tF4Icon.bco=tTime.bco tForecast4.bco=tTime.bco
tTimeAdd.bco=tTime.bco tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
tTimeAdd.bco=tTime.bco
}
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0 covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -20,8 +20,8 @@ popupLight
209 Unique line(s) of event code 209 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
329 Line(s) of event code 332 Line(s) of event code
256 Unique line(s) of event code 257 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
219 Line(s) of event code 219 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
416 Component(s) 416 Component(s)
4897 Line(s) of event code 4900 Line(s) of event code
1309 Unique line(s) of event code 1310 Unique line(s) of event code

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

@@ -1102,31 +1102,34 @@ Timer tmSerial
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco if(tTime.bco!=screensaver.bco)
tAMPM.bco=tTime.bco {
tDate.bco=tTime.bco screensaver.bco=tTime.bco
tMainIcon.bco=tTime.bco tAMPM.bco=tTime.bco
tMainText.bco=tTime.bco tDate.bco=tTime.bco
tMainIconAlt.bco=tTime.bco tMainIcon.bco=tTime.bco
tMainTextAlt.bco=tTime.bco tMainText.bco=tTime.bco
tMRIcon.bco=tTime.bco tMainIconAlt.bco=tTime.bco
tMR.bco=tTime.bco tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco tMR.bco=tTime.bco
tIcon2.bco=tTime.bco tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco tIcon1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tIcon2.bco=tTime.bco
tF1Icon.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast2.bco=tTime.bco tForecast1Val.bco=tTime.bco
tForecast2Val.bco=tTime.bco tF1Icon.bco=tTime.bco
tF2Icon.bco=tTime.bco tForecast2.bco=tTime.bco
tForecast3.bco=tTime.bco tForecast2Val.bco=tTime.bco
tForecast3Val.bco=tTime.bco tF2Icon.bco=tTime.bco
tF3Icon.bco=tTime.bco tForecast3.bco=tTime.bco
tForecast4.bco=tTime.bco tForecast3Val.bco=tTime.bco
tForecast4Val.bco=tTime.bco tF3Icon.bco=tTime.bco
tF4Icon.bco=tTime.bco tForecast4.bco=tTime.bco
tTimeAdd.bco=tTime.bco tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
tTimeAdd.bco=tTime.bco
}
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0 covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -537,31 +537,34 @@ Timer tmSerial
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco if(tTime.bco!=screensaver.bco)
tAMPM.bco=tTime.bco {
tDate.bco=tTime.bco screensaver.bco=tTime.bco
tMainIcon.bco=tTime.bco tAMPM.bco=tTime.bco
tMainText.bco=tTime.bco tDate.bco=tTime.bco
tMainIconAlt.bco=tTime.bco tMainIcon.bco=tTime.bco
tMainTextAlt.bco=tTime.bco tMainText.bco=tTime.bco
tMRIcon.bco=tTime.bco tMainIconAlt.bco=tTime.bco
tMR.bco=tTime.bco tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco tMR.bco=tTime.bco
tIcon2.bco=tTime.bco tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco tIcon1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tIcon2.bco=tTime.bco
tF1Icon.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast2.bco=tTime.bco tForecast1Val.bco=tTime.bco
tForecast2Val.bco=tTime.bco tF1Icon.bco=tTime.bco
tF2Icon.bco=tTime.bco tForecast2.bco=tTime.bco
tForecast3.bco=tTime.bco tForecast2Val.bco=tTime.bco
tForecast3Val.bco=tTime.bco tF2Icon.bco=tTime.bco
tF3Icon.bco=tTime.bco tForecast3.bco=tTime.bco
tForecast4.bco=tTime.bco tForecast3Val.bco=tTime.bco
tForecast4Val.bco=tTime.bco tF3Icon.bco=tTime.bco
tF4Icon.bco=tTime.bco tForecast4.bco=tTime.bco
tTimeAdd.bco=tTime.bco tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
tTimeAdd.bco=tTime.bco
}
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0 covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3