diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 6cbf9a9c..f90de630 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-28 19:24:02.299115463 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-28 19:24:03.391109187 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-03 21:07:06.032233062 +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-28 19:24:02.303115440 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-28 19:24:03.395109164 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-03 21:07:06.032233062 +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-28 19:24:02.303115440 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-28 19:24:03.395109164 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,22 +12,6 @@ Events @@ -154,8 +154,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-28 19:24:02.303115440 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-28 19:24:03.391109187 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,11 +12,6 @@ Events @@ -199,8 +199,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt TouchCap tc0 Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-28 19:24:02.299115463 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-28 19:24:03.391109187 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,17 +12,6 @@ Events @@ -239,8 +239,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-28 19:24:02.299115463 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-28 19:24:03.391109187 +0000 +--- HMI/n2t-out/cardQR.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,21 +12,6 @@ Events @@ -283,8 +283,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-28 19:24:02.303115440 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-28 19:24:03.395109164 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,11 +12,6 @@ Events @@ -317,8 +317,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-28 19:24:02.299115463 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-28 19:24:03.391109187 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-03 21:07:06.032233062 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -348,8 +348,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-28 19:24:02.299115463 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-28 19:24:03.391109187 +0000 +--- HMI/n2t-out/pageTest.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-03 21:07:06.032233062 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -399,8 +399,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt Attributes Only in HMI/n2t-out: popupFan.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-28 19:24:02.299115463 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-28 19:24:03.391109187 +0000 +--- HMI/n2t-out/popupLight.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,25 +12,6 @@ Events @@ -447,8 +447,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-28 19:24:02.299115463 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-28 19:24:03.391109187 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-03 21:07:06.032233062 +0000 @@ -18,17 +18,6 @@ vis tTmp,0 vis tInstruction,0 @@ -487,8 +487,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-28 19:24:02.303115440 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-28 19:24:03.395109164 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,40 +12,6 @@ Events @@ -638,8 +638,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-28 19:24:02.299115463 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-28 19:24:03.395109164 +0000 +--- HMI/n2t-out/screensaver.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-03 21:07:06.032233062 +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 0c423c69..945f58c0 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-28 19:24:02.299115463 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-28 19:24:02.831112405 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-03 21:07:05.572226731 +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-28 19:24:02.303115440 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-28 19:24:02.831112405 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-03 21:07:05.572226731 +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-28 19:24:02.303115440 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-28 19:24:02.835112382 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-03 21:07:05.572226731 +0000 @@ -81,6 +81,18 @@ vis nNum4,0 vis bPrev,0 @@ -346,8 +346,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-06-28 19:24:02.303115440 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-28 19:24:02.835112382 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-03 21:07:05.572226731 +0000 @@ -928,10 +928,6 @@ { page popupLight @@ -360,8 +360,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt TouchCap tc0 Attributes diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-06-28 19:24:02.299115463 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-28 19:24:02.831112405 +0000 +--- HMI/n2t-out/cardQR.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-03 21:07:05.572226731 +0000 @@ -12,21 +12,6 @@ Events @@ -385,8 +385,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-28 19:24:02.303115440 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-28 19:24:02.835112382 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-03 21:07:05.572226731 +0000 @@ -12,11 +12,6 @@ Events @@ -400,8 +400,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-28 19:24:02.299115463 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-28 19:24:02.831112405 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-03 21:07:05.572226731 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -421,8 +421,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-28 19:24:02.299115463 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-28 19:24:02.831112405 +0000 +--- HMI/n2t-out/pageTest.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-03 21:07:05.572226731 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -472,8 +472,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt Attributes Only in HMI/n2t-out: popupFan.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-06-28 19:24:02.299115463 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-28 19:24:02.831112405 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-07-03 21:07:05.128220620 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-03 21:07:05.572226731 +0000 @@ -18,17 +18,6 @@ vis tTmp,0 vis tInstruction,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index f4d21bee..cdf20d5d 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-28 19:24:02.851112290 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-28 19:24:02.299115463 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-28 19:24:02.831112405 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-07-03 21:07:05.588226951 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-07-03 21:07:05.128220620 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-03 21:07:05.572226731 +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-28 19:24:02.303115440 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-28 19:24:02.831112405 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-07-03 21:07:05.128220620 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-03 21:07:05.572226731 +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-28 19:24:02.303115440 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-28 19:24:02.835112382 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-07-03 21:07:05.128220620 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-03 21:07:05.572226731 +0000 +@@ -81,6 +81,18 @@ + vis bPrev,0 + vis bNext,0 @@ -75,8 +75,8 @@ + } + +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-06-28 19:24:02.303115440 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-28 19:24:02.835112382 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-07-03 21:07:05.128220620 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-03 21:07:05.572226731 +0000 +@@ -928,10 +928,6 @@ + { + page popupLight @@ -87,8 +87,8 @@ +- } + + TouchCap tc0 -+--- HMI/n2t-out/cardQR.txt 2022-06-28 19:24:02.299115463 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-28 19:24:02.831112405 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-07-03 21:07:05.128220620 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-03 21:07:05.572226731 +0000 +@@ -12,21 +12,6 @@ + Events + Preinitialize Event @@ -111,8 +111,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-28 19:24:02.303115440 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-28 19:24:02.835112382 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-07-03 21:07:05.128220620 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-03 21:07:05.572226731 +0000 +@@ -12,11 +12,6 @@ + + Events @@ -125,11 +125,11 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 -+--- HMI/n2t-out/pageStartup.txt 2022-06-28 19:24:02.299115463 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-28 19:24:02.831112405 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-07-03 21:07:05.128220620 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-03 21:07:05.572226731 +0000 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-06-28 19:24:02.299115463 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-28 19:24:02.831112405 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-07-03 21:07:05.128220620 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-03 21:07:05.572226731 +0000 +@@ -13,46 +13,6 @@ + Events + Preinitialize Event @@ -179,8 +179,8 @@ + Attributes +Only in HMI/n2t-out: popupFan.txt +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-06-28 19:24:02.299115463 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-28 19:24:02.831112405 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-07-03 21:07:05.128220620 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-03 21:07:05.572226731 +0000 +@@ -18,17 +18,6 @@ + vis tTmp,0 + vis tInstruction,0