diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 0ccae2bd..c4463e7e 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-04-03 07:35:47.898571291 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 07:35:48.646571620 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-03 11:36:28.479194000 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 11:36:29.307198536 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,9 +10,21 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt +--- HMI/n2t-out/pageIcons.txt 2022-04-03 11:36:28.479194000 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-03 11:36:29.307198536 +0000 +@@ -29,7 +29,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text :  ++ Text :  + Max. Text Size : 170 + + Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-03 07:35:47.902571293 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 07:35:48.646571620 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-03 11:36:28.479194000 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 11:36:29.307198536 +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 77176b86..7f368021 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-04-03 07:35:47.898571291 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 07:35:48.266571453 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-03 11:36:28.479194000 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 11:36:28.883196213 +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-04-03 07:35:47.902571293 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 07:35:48.266571453 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-03 11:36:28.479194000 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 11:36:28.887196235 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -780,9 +780,21 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt +--- HMI/n2t-out/pageIcons.txt 2022-04-03 11:36:28.479194000 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-03 11:36:28.883196213 +0000 +@@ -29,7 +29,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text :  ++ Text :  + Max. Text Size : 170 + + Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-03 07:35:47.902571293 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 07:35:48.266571453 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-03 11:36:28.479194000 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 11:36:28.883196213 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 6c624e65..5b96c09a 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -2,6 +2,10 @@ Program.s 0 Component(s) 11 Line(s) of event code 11 Unique line(s) of event code +pageIcons + 7 Component(s) + 0 Line(s) of event code + 0 Unique line(s) of event code pageTest 13 Component(s) 13 Line(s) of event code @@ -10,10 +14,6 @@ pageSerialTest 13 Component(s) 48 Line(s) of event code 43 Unique line(s) of event code -pageIcons - 7 Component(s) - 0 Line(s) of event code - 0 Unique line(s) of event code popupNotify 17 Component(s) 178 Line(s) of event code diff --git a/HMI/n2t-out-visual/pageIcons.txt b/HMI/n2t-out-visual/pageIcons.txt index 023e1247..04e4087f 100644 --- a/HMI/n2t-out-visual/pageIcons.txt +++ b/HMI/n2t-out-visual/pageIcons.txt @@ -56,7 +56,7 @@ Text tIcons Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text :  + Text :  Max. Text Size : 170 Word wrap : enabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index 69e5a49f..c2b1cda9 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/n2t-out/pageIcons.txt @@ -29,7 +29,7 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text :  Max. Text Size : 170 Text tTmp1