diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 9a247276..7567a2f1 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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-03-31 22:28:25.894497033 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:28:26.694539183 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 22:36:10.109846409 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:36:10.913861716 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -10,8 +10,44 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt vis arm2,0 vis arm3,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 22:28:25.898497244 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:28:26.698539394 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:36:10.109846409 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:36:10.913861716 +0000 +@@ -211,7 +211,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text :  +- Max. Text Size : 5 ++ Max. Text Size : 10 + + Text tIcon2 + Attributes +@@ -221,7 +221,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text :  +- Max. Text Size : 5 ++ Max. Text Size : 30 + + Text tIcon3 + Attributes +@@ -231,7 +231,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text :  +- Max. Text Size : 5 ++ Max. Text Size : 10 + + Text tIcon4 + Attributes +@@ -241,7 +241,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text :  +- Max. Text Size : 5 ++ Max. Text Size : 30 + + Text tSend + Attributes @@ -1125,33 +1125,6 @@ { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 @@ -47,8 +83,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-31 22:28:25.898497244 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:28:26.698539394 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 22:36:10.109846409 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:36:10.913861716 +0000 @@ -12,28 +12,307 @@ Events @@ -408,8 +444,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-31 22:28:25.894497033 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:28:26.694539183 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:36:10.109846409 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:36:10.909861639 +0000 @@ -20,7 +20,7 @@ Attributes Scope : global @@ -420,8 +456,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt Text tIcons Attributes diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-03-31 22:28:25.894497033 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:28:26.694539183 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-31 22:36:10.109846409 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:36:10.913861716 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 6c7ab3a2..aee7de8f 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-31 22:28:25.894497033 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:28:26.298518319 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-31 22:36:10.109846409 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:36:10.513854100 +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-03-31 22:28:25.898497244 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:28:26.298518319 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:36:10.109846409 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:36:10.513854100 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -118,7 +118,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Send Component ID : disabled + Associated Keyboard : none + Text :  -+ Max. Text Size : 30 ++ Max. Text Size : 5 + +Text tEntity6 + Attributes @@ -138,7 +138,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Send Component ID : disabled + Associated Keyboard : none + Text :  -+ Max. Text Size : 30 ++ Max. Text Size : 5 + Picture p0 Attributes @@ -780,21 +780,9 @@ 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-03-31 22:28:25.894497033 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 22:28:26.298518319 +0000 -@@ -20,7 +20,7 @@ - Attributes - Scope : global - Text : -- Max. Text Size: 35 -+ Max. Text Size: 30 - - Text tIcons - Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-31 22:28:25.894497033 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:28:26.298518319 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 22:36:10.109846409 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:36:10.513854100 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 0edf2924..2300a406 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -537,7 +537,7 @@ Text tIcon1 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 10 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -567,7 +567,7 @@ Text tIcon2 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 30 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -597,7 +597,7 @@ Text tIcon3 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 10 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -627,7 +627,7 @@ Text tIcon4 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 30 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -807,7 +807,7 @@ Text tIcon5 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 30 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -867,7 +867,7 @@ Text tIcon6 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 30 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 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 7e8212d2..da14ff7c 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,14 +6,14 @@ 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 117 Unique line(s) of event code +pageIcons + 7 Component(s) + 0 Line(s) of event code + 0 Unique line(s) of event code cardMedia 30 Component(s) 331 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 b0305155..8e202128 100644 --- a/HMI/US/portrait/n2t-out-visual/pageIcons.txt +++ b/HMI/US/portrait/n2t-out-visual/pageIcons.txt @@ -30,7 +30,7 @@ Variable (string) vaDate ID : 6 Scope : global Text : - Max. Text Size: 30 + Max. Text Size: 35 Text tIcons Attributes diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index dddc4f1e..114467a9 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -273,7 +273,7 @@ Text tIcon1 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 10 + Max. Text Size : 5 Text tIcon2 Attributes @@ -283,7 +283,7 @@ Text tIcon2 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 30 + Max. Text Size : 5 Text tIcon3 Attributes @@ -293,7 +293,7 @@ Text tIcon3 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 10 + Max. Text Size : 5 Text tIcon4 Attributes @@ -303,7 +303,7 @@ Text tIcon4 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 30 + Max. Text Size : 5 Text tSend Attributes @@ -363,7 +363,7 @@ Text tIcon5 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 30 + Max. Text Size : 5 Text tEntity6 Attributes @@ -383,7 +383,7 @@ Text tIcon6 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 30 + Max. Text Size : 5 Picture p0 Attributes diff --git a/HMI/US/portrait/n2t-out/pageIcons.txt b/HMI/US/portrait/n2t-out/pageIcons.txt index 66cb5ace..4ff01b79 100644 --- a/HMI/US/portrait/n2t-out/pageIcons.txt +++ b/HMI/US/portrait/n2t-out/pageIcons.txt @@ -20,7 +20,7 @@ Variable (string) vaDate Attributes Scope : global Text : - Max. Text Size: 30 + Max. Text Size: 35 Text tIcons Attributes diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 00cdf40d..be22671f 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -429,7 +429,7 @@ Text tIcon1 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 10 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -459,7 +459,7 @@ Text tIcon2 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 30 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -489,7 +489,7 @@ Text tIcon3 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 10 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -519,7 +519,7 @@ Text tIcon4 Vertical Alignment : center Input Type : character Text :  - Max. Text Size : 30 + Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index fefd1277..26eac4f3 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -42,10 +42,6 @@ cardAlarm 35 Component(s) 343 Line(s) of event code 214 Unique line(s) of event code -cardEntities - 62 Component(s) - 970 Line(s) of event code - 412 Unique line(s) of event code cardGrid 39 Component(s) 428 Line(s) of event code @@ -54,6 +50,10 @@ cardThermo 41 Component(s) 458 Line(s) of event code 283 Unique line(s) of event code +cardEntities + 62 Component(s) + 970 Line(s) of event code + 412 Unique line(s) of event code Total 14 Page(s) diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 3651ae1c..3b92b12e 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -211,7 +211,7 @@ Text tIcon1 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 10 + Max. Text Size : 5 Text tIcon2 Attributes @@ -221,7 +221,7 @@ Text tIcon2 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 30 + Max. Text Size : 5 Text tIcon3 Attributes @@ -231,7 +231,7 @@ Text tIcon3 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 10 + Max. Text Size : 5 Text tIcon4 Attributes @@ -241,7 +241,7 @@ Text tIcon4 Send Component ID : disabled Associated Keyboard : none Text :  - Max. Text Size : 30 + Max. Text Size : 5 Text tSend Attributes