diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 6504e71e..94104924 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 20:43:14.701325786 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:43:15.757379552 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-08 20:00:07.004980492 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-08 20:00:08.089056883 +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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:43:15.757379552 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-08 20:00:07.004980492 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-08 20:00:08.089056883 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 5629385b..ad414fec 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1041,7 +1041,7 @@ Timer tmSerial //alternative layout //tMRIcon spstr strCommand.txt,tMRIcon.txt,"~",15 - if(tMRIcon.txt!="") + if(tMRIcon.txt!=""&&p0.w!=320) { //value for tMRIcon, activate alternative layout vis tMainIcon,0 diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 84c004cc..3fe97b40 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -476,7 +476,7 @@ Timer tmSerial //alternative layout //tMRIcon spstr strCommand.txt,tMRIcon.txt,"~",15 - if(tMRIcon.txt!="") + if(tMRIcon.txt!=""&&p0.w!=320) { //value for tMRIcon, activate alternative layout vis tMainIcon,0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index f9ef7ea2..f82ff3a5 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 20:43:14.701325786 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:43:15.217352058 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-08 20:00:07.004980492 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-08 20:00:07.521016838 +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 20:43:14.705325989 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:43:15.217352058 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-08 20:00:07.004980492 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-08 20:00:07.521016838 +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 20:43:14.705325989 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:43:15.217352058 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-08 20:00:07.004980492 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-08 20:00:07.521016838 +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 20:43:14.705325989 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:43:15.217352058 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-08 20:00:07.004980492 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-08 20:00:07.525017120 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 2db9cb62..c9c00a94 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 20:43:15.233352872 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-06 20:43:14.701325786 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:43:15.217352058 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:43:14.705325989 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:43:15.217352058 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-08 20:00:07.557019374 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-08 20:00:07.004980492 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-08 20:00:07.521016838 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-08 20:00:07.004980492 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-08 20:00:07.521016838 +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 20:43:14.705325989 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:43:15.217352058 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-08 20:00:07.004980492 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-08 20:00:07.521016838 +0000 +@@ -45,12 +45,6 @@ + Scope: local + Value: 0 @@ -59,5 +59,5 @@ + } + if(tInstruction.txt=="time") + { -+--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:43:15.217352058 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-08 20:00:07.004980492 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-08 20:00:07.525017120 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index e34cce40..08821900 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -901,9 +901,9 @@ Picture p0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 1 - Width : 319 - Height : 479 + y coordinate : 0 + Width : 320 + Height : 480 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1041,7 +1041,7 @@ Timer tmSerial //alternative layout //tMRIcon spstr strCommand.txt,tMRIcon.txt,"~",15 - if(tMRIcon.txt!="") + if(tMRIcon.txt!=""&&p0.w!=320) { //value for tMRIcon, activate alternative layout vis tMainIcon,0 diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 647f08fa..f371cc91 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -476,7 +476,7 @@ Timer tmSerial //alternative layout //tMRIcon spstr strCommand.txt,tMRIcon.txt,"~",15 - if(tMRIcon.txt!="") + if(tMRIcon.txt!=""&&p0.w!=320) { //value for tMRIcon, activate alternative layout vis tMainIcon,0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 6256bab1..977e968f 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,10 +22,6 @@ 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 @@ -50,6 +46,10 @@ 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 03469e38..00fb5d90 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1041,7 +1041,7 @@ Timer tmSerial //alternative layout //tMRIcon spstr strCommand.txt,tMRIcon.txt,"~",15 - if(tMRIcon.txt!="") + if(tMRIcon.txt!=""&&p0.w!=320) { //value for tMRIcon, activate alternative layout vis tMainIcon,0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 84c004cc..3fe97b40 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -476,7 +476,7 @@ Timer tmSerial //alternative layout //tMRIcon spstr strCommand.txt,tMRIcon.txt,"~",15 - if(tMRIcon.txt!="") + if(tMRIcon.txt!=""&&p0.w!=320) { //value for tMRIcon, activate alternative layout vis tMainIcon,0