diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 2b893821..5d24253c 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-08-30 17:57:12.079887165 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-30 17:57:13.223987935 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-31 18:53:56.794842960 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-31 18:53:57.834857361 +0000 @@ -14,6 +14,3 @@ //color vars int defaultFontColor=65535 @@ -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-08-30 17:57:12.079887165 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-30 17:57:13.223987935 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-31 18:53:56.794842960 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-31 18:53:57.834857361 +0000 @@ -152,7 +152,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -30,8 +30,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-08-30 17:57:12.079887165 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-30 17:57:13.223987935 +0000 +--- HMI/n2t-out/pageTest.txt 2022-08-31 18:53:56.794842960 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-31 18:53:57.834857361 +0000 @@ -13,36 +13,6 @@ Events Preinitialize Event diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index d052ab1a..50fc94e8 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-08-30 17:57:12.079887165 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-30 17:57:12.635936141 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-31 18:53:56.794842960 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-31 18:53:57.290849828 +0000 @@ -14,6 +14,6 @@ //color vars int defaultFontColor=65535 @@ -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-08-30 17:57:12.079887165 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-30 17:57:12.635936141 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-08-31 18:53:56.798843016 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-31 18:53:57.290849828 +0000 @@ -65,6 +65,16 @@ vis nNum4,0 vis bPrev,0 @@ -458,8 +458,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-08-30 17:57:12.079887165 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-30 17:57:12.635936141 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-31 18:53:56.794842960 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-31 18:53:57.290849828 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -488,8 +488,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-08-30 17:57:12.079887165 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-30 17:57:12.635936141 +0000 +--- HMI/n2t-out/pageTest.txt 2022-08-31 18:53:56.794842960 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-31 18:53:57.290849828 +0000 @@ -13,36 +13,6 @@ Events Preinitialize Event diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index c87f01ce..37750be8 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-08-30 17:57:12.663938607 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-08-30 17:57:12.079887165 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-30 17:57:12.635936141 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-08-31 18:53:57.354850715 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-08-31 18:53:56.794842960 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-31 18:53:57.290849828 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 -+--- HMI/n2t-out/cardEntities.txt 2022-08-30 17:57:12.079887165 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-30 17:57:12.635936141 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-08-31 18:53:56.798843016 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-31 18:53:57.290849828 +0000 +@@ -65,6 +65,16 @@ + vis bPrev,0 + vis bNext,0 @@ -33,8 +33,8 @@ ++ spstr strCommand.txt,tTmp.txt,"~",32 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff5.val=sys0 -+--- HMI/n2t-out/pageStartup.txt 2022-08-30 17:57:12.079887165 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-30 17:57:12.635936141 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-08-31 18:53:56.794842960 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-31 18:53:57.290849828 +0000 +@@ -152,7 +152,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled @@ -45,8 +45,8 @@ + + Picture p0 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-08-30 17:57:12.079887165 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-30 17:57:12.635936141 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-08-31 18:53:56.794842960 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-31 18:53:57.290849828 +0000 +@@ -13,36 +13,6 @@ + Events + Preinitialize Event diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index f57cec7e..e401fd1d 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -317,7 +317,7 @@ Text tEntity1 Opacity : 127 x coordinate : 77 y coordinate : 85 - Width : 180 + Width : 184 Height : 30 Effect : load Effect Priority : 0 @@ -347,7 +347,7 @@ Text tEntity2 Opacity : 127 x coordinate : 78 y coordinate : 142 - Width : 180 + Width : 184 Height : 30 Effect : load Effect Priority : 0 @@ -377,7 +377,7 @@ Text tEntity3 Opacity : 127 x coordinate : 78 y coordinate : 198 - Width : 180 + Width : 184 Height : 30 Effect : load Effect Priority : 0 @@ -407,7 +407,7 @@ Text tEntity4 Opacity : 127 x coordinate : 78 y coordinate : 254 - Width : 180 + Width : 184 Height : 30 Effect : load Effect Priority : 0