diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 1ce0542f..074ace77 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-06 17:10:41.745533696 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 17:10:42.617522109 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 17:53:03.360649001 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-06 17:10:41.749533643 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 17:10:42.617522109 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 17:53:03.360649001 +0000 @@ -1925,10 +1925,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -23,8 +23,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-06 17:10:41.745533696 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 17:10:42.617522109 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 17:53:03.360649001 +0000 @@ -846,10 +846,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -37,8 +37,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-06 17:10:41.745533696 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 17:10:42.617522109 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 17:53:03.360649001 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -99,8 +99,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.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-06 17:10:41.749533643 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 17:10:42.617522109 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 17:53:03.360649001 +0000 @@ -1152,10 +1152,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -113,8 +113,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-06 17:10:41.745533696 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 17:10:42.617522109 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 17:53:03.360649001 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -136,8 +136,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-06 17:10:41.745533696 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 17:10:42.617522109 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 17:53:03.360649001 +0000 @@ -561,10 +561,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -150,8 +150,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-06 17:10:41.745533696 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 17:10:42.617522109 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 17:53:03.360649001 +0000 @@ -311,10 +311,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -164,8 +164,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-06 17:10:41.745533696 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-06 17:10:42.617522109 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-06 17:53:03.360649001 +0000 @@ -19,12 +19,9 @@ entn.txt=pageIcons.tTmp2.txt vis p0,0 diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 0a83ca90..5629385b 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -862,7 +862,7 @@ Text tIcon2 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tDateAdd +Text tTimeAdd Attributes ID : 37 Scope : local @@ -986,6 +986,7 @@ Timer tmSerial { vis tAMPM,0 } + spstr strCommand.txt,tTimeAdd.txt,"~",2 } if(tInstruction.txt=="date") { @@ -1076,7 +1077,6 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - spstr strCommand.txt,tDateAdd.txt,"~",21 if(tNotifyHead.txt!="") { ref tNotifyHead @@ -1114,7 +1114,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco - tDateAdd.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 @@ -1158,7 +1158,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",22 - covx tTmp.txt,tDateAdd.pco,0,0 + covx tTmp.txt,tTimeAdd.pco,0,0 } if(tInstruction.txt=="notify") { diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 5b7aedce..84c004cc 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -328,7 +328,7 @@ Text tIcon2 Text : Max. Text Size : 5 -Text tDateAdd +Text tTimeAdd Attributes Scope : local Dragging : 0 @@ -421,6 +421,7 @@ Timer tmSerial { vis tAMPM,0 } + spstr strCommand.txt,tTimeAdd.txt,"~",2 } if(tInstruction.txt=="date") { @@ -511,7 +512,6 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - spstr strCommand.txt,tDateAdd.txt,"~",21 if(tNotifyHead.txt!="") { ref tNotifyHead @@ -549,7 +549,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco - tDateAdd.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 @@ -593,7 +593,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",22 - covx tTmp.txt,tDateAdd.pco,0,0 + covx tTmp.txt,tTimeAdd.pco,0,0 } if(tInstruction.txt=="notify") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index cab8f19e..a8fcb93c 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-06 17:10:41.745533696 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:10:42.165528115 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:53:02.920648767 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-06 17:10:41.749533643 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:10:42.169528062 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:53:02.920648767 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-06 17:10:41.745533696 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:10:42.169528062 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:53:02.920648767 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-06 17:10:41.745533696 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:10:42.169528062 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:53:02.920648767 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -539,8 +539,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-06-06 17:10:41.745533696 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:10:42.169528062 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:53:02.496648542 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:53:02.920648767 +0000 @@ -19,12 +19,9 @@ entn.txt=pageIcons.tTmp2.txt vis p0,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index fcbc8599..2a3a98b0 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 17:10:42.181527903 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-06 17:10:41.745533696 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:10:42.165528115 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:10:41.749533643 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:10:42.169528062 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 17:53:02.932648774 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-06 17:53:02.496648542 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:53:02.920648767 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:53:02.496648542 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:53:02.920648767 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -13,8 +13,8 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:10:41.745533696 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:10:42.169528062 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:53:02.496648542 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:53:02.920648767 +0000 +@@ -45,12 +45,6 @@ + Scope: local + Value: 0 @@ -59,11 +59,11 @@ + } + if(tInstruction.txt=="time") + { -+--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:10:41.745533696 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:10:42.169528062 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:53:02.496648542 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:53:02.920648767 +0000 +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:10:41.745533696 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:10:42.169528062 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:53:02.496648542 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:53:02.920648767 +0000 +@@ -19,12 +19,9 @@ + entn.txt=pageIcons.tTmp2.txt + vis p0,0 diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index fb7602bc..e34cce40 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -862,7 +862,7 @@ Text tIcon2 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tDateAdd +Text tTimeAdd Attributes ID : 37 Scope : local @@ -986,6 +986,7 @@ Timer tmSerial { vis tAMPM,0 } + spstr strCommand.txt,tTimeAdd.txt,"~",2 } if(tInstruction.txt=="date") { @@ -1076,7 +1077,6 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - spstr strCommand.txt,tDateAdd.txt,"~",21 if(tNotifyHead.txt!="") { ref tNotifyHead @@ -1114,7 +1114,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco - tDateAdd.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 @@ -1158,7 +1158,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",22 - covx tTmp.txt,tDateAdd.pco,0,0 + covx tTmp.txt,tTimeAdd.pco,0,0 } if(tInstruction.txt=="notify") { diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index e7c0c3cb..647f08fa 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -328,7 +328,7 @@ Text tIcon2 Text : Max. Text Size : 5 -Text tDateAdd +Text tTimeAdd Attributes Scope : local Dragging : 0 @@ -421,6 +421,7 @@ Timer tmSerial { vis tAMPM,0 } + spstr strCommand.txt,tTimeAdd.txt,"~",2 } if(tInstruction.txt=="date") { @@ -511,7 +512,6 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - spstr strCommand.txt,tDateAdd.txt,"~",21 if(tNotifyHead.txt!="") { ref tNotifyHead @@ -549,7 +549,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco - tDateAdd.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 @@ -593,7 +593,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",22 - covx tTmp.txt,tDateAdd.pco,0,0 + covx tTmp.txt,tTimeAdd.pco,0,0 } if(tInstruction.txt=="notify") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 7b9e9fcf..4c3e2a07 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,6 +22,10 @@ popupLight 27 Component(s) 352 Line(s) of event code 191 Unique line(s) of event code +screensaver + 38 Component(s) + 319 Line(s) of event code + 253 Unique line(s) of event code cardMedia 34 Component(s) 363 Line(s) of event code @@ -46,10 +50,6 @@ cardThermo 53 Component(s) 555 Line(s) of event code 292 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 diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index e0510d76..03469e38 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -862,7 +862,7 @@ Text tIcon2 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tDateAdd +Text tTimeAdd Attributes ID : 37 Scope : local @@ -986,6 +986,7 @@ Timer tmSerial { vis tAMPM,0 } + spstr strCommand.txt,tTimeAdd.txt,"~",2 } if(tInstruction.txt=="date") { @@ -1076,7 +1077,6 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - spstr strCommand.txt,tDateAdd.txt,"~",21 if(tNotifyHead.txt!="") { ref tNotifyHead @@ -1114,7 +1114,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco - tDateAdd.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 @@ -1158,7 +1158,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",22 - covx tTmp.txt,tDateAdd.pco,0,0 + covx tTmp.txt,tTimeAdd.pco,0,0 } if(tInstruction.txt=="notify") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 5b7aedce..84c004cc 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -328,7 +328,7 @@ Text tIcon2 Text : Max. Text Size : 5 -Text tDateAdd +Text tTimeAdd Attributes Scope : local Dragging : 0 @@ -421,6 +421,7 @@ Timer tmSerial { vis tAMPM,0 } + spstr strCommand.txt,tTimeAdd.txt,"~",2 } if(tInstruction.txt=="date") { @@ -511,7 +512,6 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - spstr strCommand.txt,tDateAdd.txt,"~",21 if(tNotifyHead.txt!="") { ref tNotifyHead @@ -549,7 +549,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco - tDateAdd.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 @@ -593,7 +593,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",22 - covx tTmp.txt,tDateAdd.pco,0,0 + covx tTmp.txt,tTimeAdd.pco,0,0 } if(tInstruction.txt=="notify") {