From d2195c5bb3a641fac468839b465282e9ced71f98 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Thu, 23 Jun 2022 20:12:06 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 52 +++++++++--------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 12 ++--- .../landscape/n2t-out-visual/screensaver.txt | 53 +++++++++--------- HMI/US/landscape/n2t-out/screensaver.txt | 53 +++++++++--------- HMI/US/portrait/diff-eu-version.txt | 52 +++++++++--------- HMI/US/portrait/diff-filtered.txt | 54 +++++++++---------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 8 +-- .../portrait/n2t-out-visual/screensaver.txt | 53 +++++++++--------- HMI/US/portrait/n2t-out/screensaver.txt | 53 +++++++++--------- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +-- HMI/n2t-out-visual/screensaver.txt | 53 +++++++++--------- HMI/n2t-out/screensaver.txt | 53 +++++++++--------- 12 files changed, 261 insertions(+), 243 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 66ea6ae7..ea4b5c79 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ 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/US/landscape/n2t-out/Program.s.txt 2022-06-22 21:38:53.203087434 +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-23 20:12:05.612935077 +0000 @@ -11,9 +11,4 @@ // dim value 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 page pageStartup 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/US/landscape/n2t-out/cardAlarm.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 20:12:05.616935142 +0000 @@ -12,21 +12,6 @@ Events @@ -65,8 +65,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt if(tInstruction.txt=="timeout") { 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/US/landscape/n2t-out/cardEntities.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 20:12:05.616935142 +0000 @@ -12,22 +12,6 @@ Events @@ -110,8 +110,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { 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/US/landscape/n2t-out/cardGrid.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 20:12:05.612935077 +0000 @@ -12,11 +12,6 @@ Events @@ -144,8 +144,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { 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/US/landscape/n2t-out/cardMedia.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 20:12:05.612935077 +0000 @@ -12,17 +12,6 @@ Events @@ -184,8 +184,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { 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/US/landscape/n2t-out/cardQR.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 20:12:05.612935077 +0000 @@ -12,21 +12,6 @@ Events @@ -228,8 +228,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt if(tInstruction.txt=="timeout") { 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/US/landscape/n2t-out/cardThermo.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 20:12:05.616935142 +0000 @@ -12,11 +12,6 @@ Events @@ -262,8 +262,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { 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/US/landscape/n2t-out/pageStartup.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 20:12:05.612935077 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -293,8 +293,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { 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/US/landscape/n2t-out/pageTest.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 20:12:05.612935077 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -343,8 +343,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt Picture p0 Attributes 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/US/landscape/n2t-out/popupLight.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 20:12:05.616935142 +0000 @@ -12,25 +12,6 @@ Events @@ -391,8 +391,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { 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/US/landscape/n2t-out/popupNotify.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 20:12:05.616935142 +0000 @@ -12,11 +12,6 @@ Events @@ -425,8 +425,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { 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/US/landscape/n2t-out/popupShutter.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 20:12:05.616935142 +0000 @@ -12,40 +12,6 @@ Events @@ -576,8 +576,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { 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/US/landscape/n2t-out/screensaver.txt 2022-06-22 21:38:53.203087434 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 20:12:05.616935142 +0000 @@ -406,22 +406,10 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 0184c79c..8b27a7f2 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 @@ -38,14 +38,14 @@ popupShutter 25 Component(s) 331 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 65 Component(s) 1133 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 53 Component(s) 555 Line(s) of event code @@ -58,5 +58,5 @@ cardAlarm Total 13 Page(s) 412 Component(s) - 4644 Line(s) of event code - 1235 Unique line(s) of event code + 4647 Line(s) of event code + 1236 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 ad414fec..a95006a0 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1090,31 +1090,34 @@ Timer tmSerial { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 - screensaver.bco=tTime.bco - tAMPM.bco=tTime.bco - tDate.bco=tTime.bco - tMainIcon.bco=tTime.bco - tMainText.bco=tTime.bco - tMainIconAlt.bco=tTime.bco - tMainTextAlt.bco=tTime.bco - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco - tIcon1.bco=tTime.bco - tIcon2.bco=tTime.bco - tForecast1.bco=tTime.bco - tForecast1Val.bco=tTime.bco - tF1Icon.bco=tTime.bco - tForecast2.bco=tTime.bco - tForecast2Val.bco=tTime.bco - tF2Icon.bco=tTime.bco - tForecast3.bco=tTime.bco - tForecast3Val.bco=tTime.bco - tF3Icon.bco=tTime.bco - tForecast4.bco=tTime.bco - tForecast4Val.bco=tTime.bco - tF4Icon.bco=tTime.bco - tTimeAdd.bco=tTime.bco + if(tTime.bco!=screensaver.bco) + { + screensaver.bco=tTime.bco + tAMPM.bco=tTime.bco + tDate.bco=tTime.bco + tMainIcon.bco=tTime.bco + tMainText.bco=tTime.bco + tMainIconAlt.bco=tTime.bco + tMainTextAlt.bco=tTime.bco + tMRIcon.bco=tTime.bco + tMR.bco=tTime.bco + tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco + tForecast1.bco=tTime.bco + tForecast1Val.bco=tTime.bco + tF1Icon.bco=tTime.bco + tForecast2.bco=tTime.bco + tForecast2Val.bco=tTime.bco + tF2Icon.bco=tTime.bco + tForecast3.bco=tTime.bco + tForecast3Val.bco=tTime.bco + tF3Icon.bco=tTime.bco + tForecast4.bco=tTime.bco + tForecast4Val.bco=tTime.bco + tF4Icon.bco=tTime.bco + tTimeAdd.bco=tTime.bco + } spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 3fe97b40..63e23c26 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -525,31 +525,34 @@ Timer tmSerial { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 - screensaver.bco=tTime.bco - tAMPM.bco=tTime.bco - tDate.bco=tTime.bco - tMainIcon.bco=tTime.bco - tMainText.bco=tTime.bco - tMainIconAlt.bco=tTime.bco - tMainTextAlt.bco=tTime.bco - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco - tIcon1.bco=tTime.bco - tIcon2.bco=tTime.bco - tForecast1.bco=tTime.bco - tForecast1Val.bco=tTime.bco - tF1Icon.bco=tTime.bco - tForecast2.bco=tTime.bco - tForecast2Val.bco=tTime.bco - tF2Icon.bco=tTime.bco - tForecast3.bco=tTime.bco - tForecast3Val.bco=tTime.bco - tF3Icon.bco=tTime.bco - tForecast4.bco=tTime.bco - tForecast4Val.bco=tTime.bco - tF4Icon.bco=tTime.bco - tTimeAdd.bco=tTime.bco + if(tTime.bco!=screensaver.bco) + { + screensaver.bco=tTime.bco + tAMPM.bco=tTime.bco + tDate.bco=tTime.bco + tMainIcon.bco=tTime.bco + tMainText.bco=tTime.bco + tMainIconAlt.bco=tTime.bco + tMainTextAlt.bco=tTime.bco + tMRIcon.bco=tTime.bco + tMR.bco=tTime.bco + tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco + tForecast1.bco=tTime.bco + tForecast1Val.bco=tTime.bco + tF1Icon.bco=tTime.bco + tForecast2.bco=tTime.bco + tForecast2Val.bco=tTime.bco + tF2Icon.bco=tTime.bco + tForecast3.bco=tTime.bco + tForecast3Val.bco=tTime.bco + tF3Icon.bco=tTime.bco + tForecast4.bco=tTime.bco + tForecast4Val.bco=tTime.bco + tF4Icon.bco=tTime.bco + tTimeAdd.bco=tTime.bco + } spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 1e329eed..66032ace 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ 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/US/portrait/n2t-out/Program.s.txt 2022-06-22 21:38:52.775079189 +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-23 20:12:05.148927555 +0000 @@ -11,9 +11,6 @@ // dim value 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 page pageStartup 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/US/portrait/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:12:05.152927620 +0000 @@ -12,21 +12,6 @@ Events @@ -67,8 +67,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt if(tInstruction.txt=="timeout") { 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/US/portrait/n2t-out/cardEntities.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:12:05.152927620 +0000 @@ -12,22 +12,6 @@ Events @@ -566,8 +566,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { 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/US/portrait/n2t-out/cardGrid.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-23 20:12:05.152927620 +0000 @@ -12,11 +12,6 @@ Events @@ -600,8 +600,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { 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/US/portrait/n2t-out/cardMedia.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-23 20:12:05.148927555 +0000 @@ -12,17 +12,6 @@ Events @@ -640,8 +640,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { 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/US/portrait/n2t-out/cardQR.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:12:05.148927555 +0000 @@ -12,21 +12,6 @@ Events @@ -684,8 +684,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt if(tInstruction.txt=="timeout") { 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/US/portrait/n2t-out/cardThermo.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:12:05.148927555 +0000 @@ -12,11 +12,6 @@ Events @@ -718,8 +718,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { 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/US/portrait/n2t-out/pageStartup.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:12:05.148927555 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 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") { 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/US/portrait/n2t-out/pageTest.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:12:05.148927555 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -808,8 +808,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt Picture p0 Attributes 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/US/portrait/n2t-out/popupLight.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:12:05.148927555 +0000 @@ -12,25 +12,6 @@ Events @@ -856,8 +856,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { 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/US/portrait/n2t-out/popupNotify.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:12:05.148927555 +0000 @@ -12,11 +12,6 @@ Events @@ -890,8 +890,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { 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/US/portrait/n2t-out/popupShutter.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:12:05.148927555 +0000 @@ -12,40 +12,6 @@ Events @@ -1041,8 +1041,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { 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/US/portrait/n2t-out/screensaver.txt 2022-06-22 21:38:52.775079189 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-23 20:12:04.708920422 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-23 20:12:05.148927555 +0000 @@ -406,22 +406,10 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 703c1ed1..8e45896b 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,13 +1,13 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-22 21:38:52.819080036 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-22 21:38:52.403072023 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-22 21:38:52.775079189 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-23 20:12:05.164927814 +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-23 20:12:05.148927555 +0000 +@@ -11,9 +11,6 @@ +- //color vars +- int defaultFontColor=65535 +- int defaultBcoColor=6371 +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/US/portrait/n2t-out/cardAlarm.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:12:05.152927620 +0000 +@@ -12,21 +12,6 @@ + + Events @@ -58,8 +58,8 @@ + } + if(tInstruction.txt=="timeout") + { -+--- HMI/n2t-out/cardEntities.txt 2022-06-22 21:38:52.407072100 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:12:05.152927620 +0000 +@@ -12,22 +12,6 @@ + + Events @@ -114,8 +114,8 @@ + if(tInstruction.txt=="timeout") + { +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/US/portrait/n2t-out/cardGrid.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-23 20:12:05.152927620 +0000 +@@ -12,11 +12,6 @@ + + Events @@ -148,8 +148,8 @@ + if(tInstruction.txt=="timeout") + { +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/US/portrait/n2t-out/cardMedia.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-23 20:12:05.148927555 +0000 +@@ -12,17 +12,6 @@ + + Events @@ -187,8 +187,8 @@ + } + if(tInstruction.txt=="timeout") + { -+--- HMI/n2t-out/cardQR.txt 2022-06-22 21:38:52.403072023 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:12:05.148927555 +0000 +@@ -12,21 +12,6 @@ + Events + Preinitialize Event @@ -230,8 +230,8 @@ + if(tInstruction.txt=="timeout") + { +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/US/portrait/n2t-out/cardThermo.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:12:05.148927555 +0000 +@@ -12,11 +12,6 @@ + + Events @@ -263,8 +263,8 @@ + } + if(tInstruction.txt=="timeout") + { -+--- HMI/n2t-out/pageStartup.txt 2022-06-22 21:38:52.403072023 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:12:05.148927555 +0000 +@@ -277,18 +277,6 @@ + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 @@ -285,8 +285,8 @@ + if(tInstruction.txt=="timeout") + { +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/US/portrait/n2t-out/pageTest.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:12:05.148927555 +0000 +@@ -13,46 +13,6 @@ + Events + Preinitialize Event @@ -335,8 +335,8 @@ + Picture p0 + Attributes +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/US/portrait/n2t-out/popupLight.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:12:05.148927555 +0000 +@@ -12,25 +12,6 @@ + + Events @@ -383,8 +383,8 @@ + if(tInstruction.txt=="timeout") + { +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/US/portrait/n2t-out/popupNotify.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:12:05.148927555 +0000 +@@ -12,11 +12,6 @@ + + Events @@ -417,8 +417,8 @@ + if(tInstruction.txt=="timeout") + { +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/US/portrait/n2t-out/popupShutter.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:12:05.148927555 +0000 +@@ -12,40 +12,6 @@ + + Events @@ -567,8 +567,8 @@ + if(tInstruction.txt=="time") + { +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/US/portrait/n2t-out/screensaver.txt 2022-06-22 21:38:52.775079189 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-06-23 20:12:04.708920422 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-23 20:12:05.148927555 +0000 +@@ -406,22 +406,10 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index e9a68153..26f0b5fb 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 @@ -40,8 +40,8 @@ cardMedia 195 Unique line(s) of event code screensaver 38 Component(s) - 319 Line(s) of event code - 253 Unique line(s) of event code + 322 Line(s) of event code + 254 Unique line(s) of event code cardEntities 77 Component(s) 1363 Line(s) of event code @@ -58,5 +58,5 @@ cardAlarm Total 13 Page(s) 424 Component(s) - 4874 Line(s) of event code - 1307 Unique line(s) of event code + 4877 Line(s) of event code + 1308 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 08821900..b6645b21 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1090,31 +1090,34 @@ Timer tmSerial { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 - screensaver.bco=tTime.bco - tAMPM.bco=tTime.bco - tDate.bco=tTime.bco - tMainIcon.bco=tTime.bco - tMainText.bco=tTime.bco - tMainIconAlt.bco=tTime.bco - tMainTextAlt.bco=tTime.bco - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco - tIcon1.bco=tTime.bco - tIcon2.bco=tTime.bco - tForecast1.bco=tTime.bco - tForecast1Val.bco=tTime.bco - tF1Icon.bco=tTime.bco - tForecast2.bco=tTime.bco - tForecast2Val.bco=tTime.bco - tF2Icon.bco=tTime.bco - tForecast3.bco=tTime.bco - tForecast3Val.bco=tTime.bco - tF3Icon.bco=tTime.bco - tForecast4.bco=tTime.bco - tForecast4Val.bco=tTime.bco - tF4Icon.bco=tTime.bco - tTimeAdd.bco=tTime.bco + if(tTime.bco!=screensaver.bco) + { + screensaver.bco=tTime.bco + tAMPM.bco=tTime.bco + tDate.bco=tTime.bco + tMainIcon.bco=tTime.bco + tMainText.bco=tTime.bco + tMainIconAlt.bco=tTime.bco + tMainTextAlt.bco=tTime.bco + tMRIcon.bco=tTime.bco + tMR.bco=tTime.bco + tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco + tForecast1.bco=tTime.bco + tForecast1Val.bco=tTime.bco + tF1Icon.bco=tTime.bco + tForecast2.bco=tTime.bco + tForecast2Val.bco=tTime.bco + tF2Icon.bco=tTime.bco + tForecast3.bco=tTime.bco + tForecast3Val.bco=tTime.bco + tF3Icon.bco=tTime.bco + tForecast4.bco=tTime.bco + tForecast4Val.bco=tTime.bco + tF4Icon.bco=tTime.bco + tTimeAdd.bco=tTime.bco + } spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index f371cc91..73ec7e00 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -525,31 +525,34 @@ Timer tmSerial { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 - screensaver.bco=tTime.bco - tAMPM.bco=tTime.bco - tDate.bco=tTime.bco - tMainIcon.bco=tTime.bco - tMainText.bco=tTime.bco - tMainIconAlt.bco=tTime.bco - tMainTextAlt.bco=tTime.bco - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco - tIcon1.bco=tTime.bco - tIcon2.bco=tTime.bco - tForecast1.bco=tTime.bco - tForecast1Val.bco=tTime.bco - tF1Icon.bco=tTime.bco - tForecast2.bco=tTime.bco - tForecast2Val.bco=tTime.bco - tF2Icon.bco=tTime.bco - tForecast3.bco=tTime.bco - tForecast3Val.bco=tTime.bco - tF3Icon.bco=tTime.bco - tForecast4.bco=tTime.bco - tForecast4Val.bco=tTime.bco - tF4Icon.bco=tTime.bco - tTimeAdd.bco=tTime.bco + if(tTime.bco!=screensaver.bco) + { + screensaver.bco=tTime.bco + tAMPM.bco=tTime.bco + tDate.bco=tTime.bco + tMainIcon.bco=tTime.bco + tMainText.bco=tTime.bco + tMainIconAlt.bco=tTime.bco + tMainTextAlt.bco=tTime.bco + tMRIcon.bco=tTime.bco + tMR.bco=tTime.bco + tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco + tForecast1.bco=tTime.bco + tForecast1Val.bco=tTime.bco + tF1Icon.bco=tTime.bco + tForecast2.bco=tTime.bco + tForecast2Val.bco=tTime.bco + tF2Icon.bco=tTime.bco + tForecast3.bco=tTime.bco + tForecast3Val.bco=tTime.bco + tF3Icon.bco=tTime.bco + tForecast4.bco=tTime.bco + tForecast4Val.bco=tTime.bco + tF4Icon.bco=tTime.bco + tTimeAdd.bco=tTime.bco + } spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 0af848c8..c0f360c9 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -20,8 +20,8 @@ popupLight 209 Unique line(s) of event code screensaver 38 Component(s) - 329 Line(s) of event code - 256 Unique line(s) of event code + 332 Line(s) of event code + 257 Unique line(s) of event code popupNotify 17 Component(s) 219 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 416 Component(s) - 4897 Line(s) of event code - 1309 Unique line(s) of event code + 4900 Line(s) of event code + 1310 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 69466f21..ed4d2c59 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1102,31 +1102,34 @@ Timer tmSerial { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 - screensaver.bco=tTime.bco - tAMPM.bco=tTime.bco - tDate.bco=tTime.bco - tMainIcon.bco=tTime.bco - tMainText.bco=tTime.bco - tMainIconAlt.bco=tTime.bco - tMainTextAlt.bco=tTime.bco - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco - tIcon1.bco=tTime.bco - tIcon2.bco=tTime.bco - tForecast1.bco=tTime.bco - tForecast1Val.bco=tTime.bco - tF1Icon.bco=tTime.bco - tForecast2.bco=tTime.bco - tForecast2Val.bco=tTime.bco - tF2Icon.bco=tTime.bco - tForecast3.bco=tTime.bco - tForecast3Val.bco=tTime.bco - tF3Icon.bco=tTime.bco - tForecast4.bco=tTime.bco - tForecast4Val.bco=tTime.bco - tF4Icon.bco=tTime.bco - tTimeAdd.bco=tTime.bco + if(tTime.bco!=screensaver.bco) + { + screensaver.bco=tTime.bco + tAMPM.bco=tTime.bco + tDate.bco=tTime.bco + tMainIcon.bco=tTime.bco + tMainText.bco=tTime.bco + tMainIconAlt.bco=tTime.bco + tMainTextAlt.bco=tTime.bco + tMRIcon.bco=tTime.bco + tMR.bco=tTime.bco + tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco + tForecast1.bco=tTime.bco + tForecast1Val.bco=tTime.bco + tF1Icon.bco=tTime.bco + tForecast2.bco=tTime.bco + tForecast2Val.bco=tTime.bco + tF2Icon.bco=tTime.bco + tForecast3.bco=tTime.bco + tForecast3Val.bco=tTime.bco + tF3Icon.bco=tTime.bco + tForecast4.bco=tTime.bco + tForecast4Val.bco=tTime.bco + tF4Icon.bco=tTime.bco + tTimeAdd.bco=tTime.bco + } spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index ee2dd6ec..80547cae 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -537,31 +537,34 @@ Timer tmSerial { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 - screensaver.bco=tTime.bco - tAMPM.bco=tTime.bco - tDate.bco=tTime.bco - tMainIcon.bco=tTime.bco - tMainText.bco=tTime.bco - tMainIconAlt.bco=tTime.bco - tMainTextAlt.bco=tTime.bco - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco - tIcon1.bco=tTime.bco - tIcon2.bco=tTime.bco - tForecast1.bco=tTime.bco - tForecast1Val.bco=tTime.bco - tF1Icon.bco=tTime.bco - tForecast2.bco=tTime.bco - tForecast2Val.bco=tTime.bco - tF2Icon.bco=tTime.bco - tForecast3.bco=tTime.bco - tForecast3Val.bco=tTime.bco - tF3Icon.bco=tTime.bco - tForecast4.bco=tTime.bco - tForecast4Val.bco=tTime.bco - tF4Icon.bco=tTime.bco - tTimeAdd.bco=tTime.bco + if(tTime.bco!=screensaver.bco) + { + screensaver.bco=tTime.bco + tAMPM.bco=tTime.bco + tDate.bco=tTime.bco + tMainIcon.bco=tTime.bco + tMainText.bco=tTime.bco + tMainIconAlt.bco=tTime.bco + tMainTextAlt.bco=tTime.bco + tMRIcon.bco=tTime.bco + tMR.bco=tTime.bco + tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco + tForecast1.bco=tTime.bco + tForecast1Val.bco=tTime.bco + tF1Icon.bco=tTime.bco + tForecast2.bco=tTime.bco + tForecast2Val.bco=tTime.bco + tF2Icon.bco=tTime.bco + tForecast3.bco=tTime.bco + tForecast3Val.bco=tTime.bco + tF3Icon.bco=tTime.bco + tForecast4.bco=tTime.bco + tForecast4Val.bco=tTime.bco + tF4Icon.bco=tTime.bco + tTimeAdd.bco=tTime.bco + } spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3