diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 4ff25a64..36010a9d 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-03-30 15:03:45.667488911 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 15:03:46.575489457 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-30 16:28:19.999450404 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 16:28:20.967456859 +0000 @@ -10,6 +10,6 @@ int sleepValue=0 // dim value @@ -10,21 +10,9 @@ 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-03-30 15:03:45.667488911 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 15:03:46.575489457 +0000 -@@ -17,7 +17,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text :  -+ Text :  - Max. Text Size : 150 - - Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-30 15:03:45.667488911 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 15:03:46.575489457 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-30 16:28:19.999450404 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 16:28:20.967456859 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/pageIcons.txt b/HMI/US/landscape/n2t-out-visual/pageIcons.txt index 7c46cd56..6b62c3a3 100644 --- a/HMI/US/landscape/n2t-out-visual/pageIcons.txt +++ b/HMI/US/landscape/n2t-out-visual/pageIcons.txt @@ -42,8 +42,8 @@ Text tIcons Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text :  - Max. Text Size : 150 + Text :  + Max. Text Size : 170 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/landscape/n2t-out/pageIcons.txt b/HMI/US/landscape/n2t-out/pageIcons.txt index 47f5bf8d..b30e29bd 100644 --- a/HMI/US/landscape/n2t-out/pageIcons.txt +++ b/HMI/US/landscape/n2t-out/pageIcons.txt @@ -17,8 +17,8 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  - Max. Text Size : 150 + Text :  + Max. Text Size : 170 Text tTmp1 Attributes diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 838949b3..99cfb260 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-03-30 15:03:45.667488911 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 15:03:46.111489178 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-30 16:28:19.999450404 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 16:28:20.451453418 +0000 @@ -10,6 +10,6 @@ int sleepValue=0 // dim value @@ -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-03-30 15:03:45.671488913 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 15:03:46.111489178 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-30 16:28:19.999450404 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 16:28:20.455453444 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -781,8 +781,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-03-30 15:03:45.671488913 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 15:03:46.111489178 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-30 16:28:19.999450404 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 16:28:20.455453444 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -807,21 +807,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt XFloat xTempCurr Attributes Scope : local -diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-30 15:03:45.667488911 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 15:03:46.111489178 +0000 -@@ -17,7 +17,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text :  -+ Text :  - Max. Text Size : 150 - - Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-30 15:03:45.667488911 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 15:03:46.111489178 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-30 16:28:19.999450404 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 16:28:20.455453444 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled 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 249a069b..097d7410 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 @@ -6,6 +6,10 @@ pageSerialTest 13 Component(s) 48 Line(s) of event code 43 Unique line(s) of event code +pageIcons + 5 Component(s) + 0 Line(s) of event code + 0 Unique line(s) of event code popupShutter 19 Component(s) 179 Line(s) of event code @@ -42,10 +46,6 @@ cardMedia 30 Component(s) 278 Line(s) of event code 139 Unique line(s) of event code -pageIcons - 5 Component(s) - 0 Line(s) of event code - 0 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageIcons.txt b/HMI/US/portrait/n2t-out-visual/pageIcons.txt index 19bac96f..a48a745b 100644 --- a/HMI/US/portrait/n2t-out-visual/pageIcons.txt +++ b/HMI/US/portrait/n2t-out-visual/pageIcons.txt @@ -42,8 +42,8 @@ Text tIcons Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text :  - Max. Text Size : 150 + Text :  + Max. Text Size : 170 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/pageIcons.txt b/HMI/US/portrait/n2t-out/pageIcons.txt index 47f5bf8d..b30e29bd 100644 --- a/HMI/US/portrait/n2t-out/pageIcons.txt +++ b/HMI/US/portrait/n2t-out/pageIcons.txt @@ -17,8 +17,8 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  - Max. Text Size : 150 + Text :  + Max. Text Size : 170 Text tTmp1 Attributes diff --git a/HMI/n2t-out-visual/pageIcons.txt b/HMI/n2t-out-visual/pageIcons.txt index d2841861..6b62c3a3 100644 --- a/HMI/n2t-out-visual/pageIcons.txt +++ b/HMI/n2t-out-visual/pageIcons.txt @@ -42,8 +42,8 @@ Text tIcons Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text :  - Max. Text Size : 150 + Text :  + Max. Text Size : 170 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index da2c96a9..b30e29bd 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/n2t-out/pageIcons.txt @@ -17,8 +17,8 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  - Max. Text Size : 150 + Text :  + Max. Text Size : 170 Text tTmp1 Attributes