diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 28fc3d5d..8a99049b 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-06 21:34:50.751296428 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-06 21:34:51.675351557 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-07 16:14:06.171998815 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-07 16:14:06.952034176 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-06 21:34:50.751296428 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-06 21:34:51.675351557 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-07 16:14:06.171998815 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-07 16:14:06.952034176 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 7956b6d4..6102eaee 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -205,7 +205,7 @@ Text tCode Horizontal Alignment : center Vertical Alignment : center Input Type : password - Text : 3333 + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 4bd34ddc..defa8194 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -14,6 +14,10 @@ screensaver 33 Component(s) 195 Line(s) of event code 152 Unique line(s) of event code +cardAlarm + 35 Component(s) + 343 Line(s) of event code + 213 Unique line(s) of event code popupNotify 17 Component(s) 178 Line(s) of event code @@ -34,10 +38,6 @@ popupLight 27 Component(s) 320 Line(s) of event code 173 Unique line(s) of event code -cardAlarm - 35 Component(s) - 343 Line(s) of event code - 213 Unique line(s) of event code cardGrid 39 Component(s) 418 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 4adbe8d5..c3a47e14 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -113,7 +113,7 @@ Text tCode Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 3333 + Text : Max. Text Size : 10 Text tIcon diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 6d364417..9221cd86 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-06 21:34:50.751296428 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-06 21:34:51.215324112 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-07 16:14:06.171998815 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-07 16:14:06.556016223 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,21 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-06 21:34:50.751296428 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-06 21:34:51.215324112 +0000 -@@ -113,7 +113,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : 3333 -+ Text : - Max. Text Size : 10 - - Text tIcon diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-06 21:34:50.751296428 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-06 21:34:51.215324112 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-07 16:14:06.175998996 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-07 16:14:06.556016223 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -789,8 +777,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-06 21:34:50.751296428 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-06 21:34:51.215324112 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-07 16:14:06.171998815 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-07 16:14:06.556016223 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -810,8 +798,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/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-06 21:34:50.751296428 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-06 21:34:51.215324112 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-07 16:14:06.175998996 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-07 16:14:06.556016223 +0000 @@ -48,6 +48,26 @@ Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 740e8183..353d3364 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -205,7 +205,7 @@ Text tCode Horizontal Alignment : center Vertical Alignment : center Input Type : password - Text : 3333 + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 4adbe8d5..c3a47e14 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -113,7 +113,7 @@ Text tCode Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 3333 + Text : Max. Text Size : 10 Text tIcon