diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 8c6926d3..db5d4b8a 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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-23 21:11:31.450513481 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 20:59:32.348046636 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-23 21:11:30.570513917 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 21:11:31.454513479 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-23 21:11:30.570513917 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 21:11:31.454513479 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 21:11:31.450513481 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 21:11:31.450513481 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 21:11:31.450513481 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 20:59:32.348046636 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-23 21:11:30.570513917 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 21:11:31.454513479 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 21:11:31.450513481 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 21:11:31.450513481 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 21:11:31.450513481 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 21:11:31.450513481 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 21:11:31.450513481 +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-23 20:59:31.468041609 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 20:59:32.344046613 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 21:11:31.454513479 +0000 @@ -406,22 +406,10 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 547f9bac..6ea4ed50 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-23 20:59:31.468041609 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:59:31.892044031 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 21:11:31.002513703 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:59:31.468041609 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:59:31.896044054 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-23 21:11:30.570513917 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 21:11:31.002513703 +0000 @@ -138,7 +138,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Text tIcon diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-23 20:59:31.468041609 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:59:31.896044054 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-23 21:11:30.570513917 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 21:11:31.002513703 +0000 @@ -136,6 +136,18 @@ Text : Max. Text Size: 80 @@ -293,8 +293,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Attributes Scope : local diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-06-23 20:59:31.468041609 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:59:31.896044054 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 21:11:31.002513703 +0000 @@ -12,21 +12,6 @@ Events @@ -318,8 +318,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt vis p0,0 vis tSend,0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-06-23 20:59:31.468041609 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:59:31.896044054 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-23 21:11:30.570513917 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 21:11:31.002513703 +0000 @@ -12,11 +12,6 @@ Events @@ -333,8 +333,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt vis p0,0 vis tSend,0 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-23 20:59:31.468041609 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:59:31.896044054 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 21:11:31.002513703 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -354,8 +354,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-06-23 20:59:31.468041609 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:59:31.892044031 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 21:11:31.002513703 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -404,8 +404,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt Picture p0 Attributes diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-06-23 20:59:31.468041609 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:59:31.892044031 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-23 21:11:30.566513919 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 21:11:31.002513703 +0000 @@ -12,11 +12,6 @@ Events diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index e76280f4..582241d8 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-23 20:59:31.908044123 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-23 20:59:31.468041609 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:59:31.892044031 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-23 21:11:31.014513697 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-23 21:11:30.566513919 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 21:11:31.002513703 +0000 +@@ -14,6 +14,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-23 20:59:31.468041609 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:59:31.896044054 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-06-23 21:11:30.570513917 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 21:11:31.002513703 +0000 +@@ -138,7 +138,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled @@ -17,8 +17,8 @@ + Max. Text Size : 10 + + Text tIcon -+--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:59:31.468041609 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:59:31.896044054 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-23 21:11:30.570513917 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 21:11:31.002513703 +0000 +@@ -136,6 +136,18 @@ +@@ -172,6 +184,15 @@ +@@ -302,6 +323,26 @@ @@ -28,8 +28,8 @@ ++ Max. Text Size : 20 +@@ -986,6 +1155,33 @@ +@@ -1091,6 +1287,28 @@ -+--- HMI/n2t-out/cardQR.txt 2022-06-23 20:59:31.468041609 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:59:31.896044054 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-06-23 21:11:30.566513919 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 21:11:31.002513703 +0000 +@@ -12,21 +12,6 @@ + Events + Preinitialize Event @@ -52,8 +52,8 @@ + vis p0,0 + vis tSend,0 +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:59:31.468041609 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:59:31.896044054 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-06-23 21:11:30.570513917 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 21:11:31.002513703 +0000 +@@ -12,11 +12,6 @@ + + Events @@ -66,11 +66,11 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 -+--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:59:31.468041609 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:59:31.896044054 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-23 21:11:30.566513919 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 21:11:31.002513703 +0000 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-06-23 20:59:31.468041609 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:59:31.892044031 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-06-23 21:11:30.566513919 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 21:11:31.002513703 +0000 +@@ -13,46 +13,6 @@ + Events + Preinitialize Event @@ -119,8 +119,8 @@ + Picture p0 + Attributes +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:59:31.468041609 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:59:31.892044031 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-06-23 21:11:30.566513919 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 21:11:31.002513703 +0000 +@@ -12,11 +12,6 @@ + + Events 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 4e87fc62..0d658280 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 @@ -38,14 +38,14 @@ pageStartup 19 Component(s) 167 Line(s) of event code 122 Unique line(s) of event code -screensaver - 38 Component(s) - 332 Line(s) of event code - 257 Unique line(s) of event code cardThermo 53 Component(s) 565 Line(s) of event code 296 Unique line(s) of event code +screensaver + 38 Component(s) + 332 Line(s) of event code + 257 Unique line(s) of event code cardGrid 42 Component(s) 454 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 dfbb27f8..b6b92691 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -821,7 +821,7 @@ Text tIcon1 Style : flat Associated Keyboard : none Font ID : 1 - Back. Color : 6371 + Back. Color : 0 Font Color : 17299 Horizontal Alignment : center Vertical Alignment : center @@ -851,7 +851,7 @@ Text tIcon2 Style : flat Associated Keyboard : none Font ID : 1 - Back. Color : 6371 + Back. Color : 0 Font Color : 17299 Horizontal Alignment : center Vertical Alignment : center