diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 4c68f4ac..328b91d7 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-05-14 09:49:26.544742017 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 09:49:27.344742896 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-14 09:57:28.485725830 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 09:57:29.289737932 +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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:49:26.548742022 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 09:49:27.344742896 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:57:28.485725830 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 09:57:29.289737932 +0000 @@ -466,90 +466,6 @@ prints crcval,2 tCode.txt="" @@ -103,8 +103,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt Attributes Scope : local diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-14 09:49:26.548742022 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 09:49:27.348742900 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-14 09:57:28.489725890 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 09:57:29.289737932 +0000 @@ -1074,90 +1074,6 @@ page popupLight } @@ -197,8 +197,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt Attributes Scope : local diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-14 09:49:26.548742022 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 09:49:27.344742896 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-14 09:57:28.485725830 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 09:57:29.289737932 +0000 @@ -522,90 +522,6 @@ page pageTest } @@ -291,8 +291,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt Attributes Scope : local diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-14 09:49:26.548742022 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 09:49:27.344742896 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-14 09:57:28.485725830 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 09:57:29.289737932 +0000 @@ -223,7 +223,7 @@ Events @@ -403,8 +403,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt Attributes Scope : local diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-14 09:49:26.548742022 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 09:49:27.348742900 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-14 09:57:28.489725890 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 09:57:29.289737932 +0000 @@ -17,12 +17,9 @@ vis tInstruction,0 vis tTmp,0 @@ -842,8 +842,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt vis bt0,0 vis bt1,0 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-14 09:49:26.544742017 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 09:49:27.344742896 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-14 09:57:28.485725830 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 09:57:29.289737932 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index f77ed6b3..0cd4285a 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-05-14 09:49:26.544742017 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 09:49:26.936742448 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-14 09:57:28.485725830 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 09:57:28.881731791 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:49:26.548742022 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 09:49:26.936742448 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:57:28.485725830 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 09:57:28.881731791 +0000 @@ -466,7 +466,7 @@ prints crcval,2 tCode.txt="" @@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt click bPrev,1 } diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-14 09:49:26.548742022 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 09:49:26.940742452 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-14 09:57:28.489725890 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 09:57:28.881731791 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-14 09:49:26.548742022 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 09:49:26.936742448 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-14 09:57:28.489725890 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 09:57:28.881731791 +0000 @@ -17,12 +17,9 @@ vis tInstruction,0 vis tTmp,0 @@ -1036,8 +1036,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt vis bt0,0 vis bt1,0 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-14 09:49:26.544742017 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 09:49:26.936742448 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-14 09:57:28.485725830 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 09:57:28.881731791 +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 8f56bb6e..440ec4b4 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 09:49:26.952742465 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-14 09:49:26.544742017 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 09:49:26.936742448 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 09:57:28.897732032 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-14 09:57:28.485725830 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 09:57:28.881731791 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:49:26.548742022 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 09:49:26.936742448 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:57:28.485725830 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 09:57:28.881731791 +0000 +@@ -466,7 +466,7 @@ + prints crcval,2 + tCode.txt="" @@ -67,14 +67,14 @@ + { + click bPrev,1 + } -+--- HMI/n2t-out/cardEntities.txt 2022-05-14 09:49:26.548742022 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 09:49:26.940742452 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-14 09:57:28.489725890 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 09:57:28.881731791 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1728,6 +1956,128 @@ +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-14 09:49:26.548742022 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 09:49:26.936742448 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-14 09:57:28.489725890 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 09:57:28.881731791 +0000 +@@ -17,12 +17,9 @@ + vis tInstruction,0 + vis tTmp,0 @@ -615,8 +615,8 @@ + // disable all buttons + vis bt0,0 + vis bt1,0 -+--- HMI/n2t-out/pageStartup.txt 2022-05-14 09:49:26.544742017 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 09:49:26.936742448 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-14 09:57:28.485725830 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 09:57:28.881731791 +0000 +@@ -351,7 +351,7 @@ + + Events diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 647a8f43..911da82e 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -288,7 +288,7 @@ Number nNum5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 265 + x coordinate : 268 y coordinate : 420 Width : 44 Height : 50 @@ -738,7 +738,7 @@ Text tIcon5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 118 + x coordinate : 121 y coordinate : 430 Width : 45 Height : 30 @@ -786,7 +786,7 @@ Slider hSlider1 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 100 + y coordinate : 103 Width : 100 Height : 43 Effect : load @@ -829,7 +829,7 @@ Slider hSlider2 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 180 + y coordinate : 183 Width : 100 Height : 43 Effect : load @@ -872,7 +872,7 @@ Slider hSlider3 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 260 + y coordinate : 263 Width : 100 Height : 43 Effect : load @@ -915,7 +915,7 @@ Slider hSlider4 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 340 + y coordinate : 343 Width : 100 Height : 43 Effect : load @@ -1188,8 +1188,8 @@ Button bDown2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 269 - y coordinate : 153 + x coordinate : 265 + y coordinate : 180 Width : 50 Height : 50 Effect : load @@ -1853,7 +1853,7 @@ Button bStop5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 215 + x coordinate : 218 y coordinate : 420 Width : 50 Height : 50 @@ -1900,7 +1900,7 @@ Button bDown5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 265 + x coordinate : 268 y coordinate : 420 Width : 50 Height : 50 @@ -1947,7 +1947,7 @@ Button bUp5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 165 + x coordinate : 168 y coordinate : 420 Width : 50 Height : 50 @@ -1994,7 +1994,7 @@ Button bText5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 165 + x coordinate : 168 y coordinate : 430 Width : 145 Height : 30 @@ -2221,7 +2221,7 @@ Dual-state Button btOnOff5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 265 + x coordinate : 268 y coordinate : 420 Width : 50 Height : 50 @@ -2292,9 +2292,9 @@ Hotspot m2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 11 y coordinate : 230 - Width : 320 + Width : 150 Height : 75 Effect : load Effect Priority : 0 @@ -2323,9 +2323,9 @@ Hotspot m1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 12 y coordinate : 150 - Width : 320 + Width : 150 Height : 75 Effect : load Effect Priority : 0 @@ -2354,9 +2354,9 @@ Hotspot m0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 13 y coordinate : 70 - Width : 320 + Width : 150 Height : 75 Effect : load Effect Priority : 0 @@ -2385,9 +2385,9 @@ Hotspot m3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 12 y coordinate : 310 - Width : 320 + Width : 150 Height : 75 Effect : load Effect Priority : 0 @@ -2416,9 +2416,9 @@ Hotspot m4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 14 y coordinate : 390 - Width : 320 + Width : 150 Height : 75 Effect : load Effect Priority : 0 @@ -2447,9 +2447,9 @@ Hotspot mSwipeNext Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 311 + x coordinate : 310 y coordinate : 5 - Width : 9 + Width : 8 Height : 470 Effect : load Effect Priority : 0