diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 1af3573b..7a448622 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-05-06 15:15:11.662432193 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:15:12.706604053 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:18:23.858465659 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:18:24.886472251 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,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-05-06 15:15:11.662432193 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:15:12.706604053 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:18:24.886472251 +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 01f7ab5f..6d8584b7 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-05-06 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:18:23.858465659 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:18:24.362468867 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:15:11.666433006 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:18:24.362468867 +0000 @@ -46,7 +46,7 @@ Attributes Scope : local @@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-06 15:15:11.666433006 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:18:24.362468867 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-06 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:18:24.362468867 +0000 @@ -71,25 +71,25 @@ Attributes Scope : local @@ -542,8 +542,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt Text tHeading Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-06 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:18:24.362468867 +0000 @@ -25,19 +25,19 @@ Attributes Scope : local @@ -658,8 +658,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-06 15:15:11.666433006 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:18:24.362468867 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -786,30 +786,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-05-06 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:15:12.138528943 +0000 -@@ -30,7 +30,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text : -- Max. Text Size : 80 -+ Max. Text Size : 50 - - Text tTmp2 - Attributes -@@ -40,7 +40,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text : -- Max. Text Size : 80 -+ Max. Text Size : 50 - - Picture p0 - Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-06 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:18:24.362468867 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -828,17 +807,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-06 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:15:12.138528943 +0000 -@@ -59,8 +59,8 @@ - Variable (string) entn - Attributes - Scope : local -- Text : -- Max. Text Size: 80 -+ Text : newtxt -+ Max. Text Size: 50 - - Variable (int32) mode - Attributes diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 462975f8..57ea58b0 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:15:12.202541951 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:15:12.138528943 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:18:24.378468969 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-06 15:18:23.858465659 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:18:24.362468867 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:15:11.666433006 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:15:12.138528943 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:18:24.362468867 +0000 +@@ -46,7 +46,7 @@ + Attributes + Scope : local @@ -67,8 +67,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:15:11.666433006 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:15:12.138528943 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:18:24.362468867 +0000 +@@ -62,6 +62,16 @@ + vis bPrev,0 + vis bNext,0 @@ -91,8 +91,8 @@ + if(tInstruction.txt=="pageType") + { +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:15:12.138528943 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:18:24.362468867 +0000 +@@ -71,25 +71,25 @@ + Attributes + Scope : local @@ -140,8 +140,8 @@ + Text tHeading + Attributes +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:15:12.138528943 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:18:24.362468867 +0000 +@@ -25,19 +25,19 @@ + Attributes + Scope : local @@ -256,8 +256,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:15:11.666433006 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:15:12.138528943 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:18:24.362468867 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -384,40 +384,5 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt -+--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:15:12.138528943 +0000 -+@@ -30,7 +30,7 @@ -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+- Max. Text Size : 80 -++ Max. Text Size : 50 -+ -+ Text tTmp2 -+ Attributes -+@@ -40,7 +40,7 @@ -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+- Max. Text Size : 80 -++ Max. Text Size : 50 -+ -+ Picture p0 -+ Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:15:12.138528943 +0000 -+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-06 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:15:12.138528943 +0000 -+@@ -59,8 +59,8 @@ -+ Variable (string) entn -+ Attributes -+ Scope : local -+- Text : -+- Max. Text Size: 80 -++ Text : newtxt -++ Max. Text Size: 50 -+ -+ Variable (int32) mode -+ Attributes ++--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:18:24.362468867 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/pageIcons.txt b/HMI/US/portrait/n2t-out-visual/pageIcons.txt index 90aaf938..40ece9c0 100644 --- a/HMI/US/portrait/n2t-out-visual/pageIcons.txt +++ b/HMI/US/portrait/n2t-out-visual/pageIcons.txt @@ -57,7 +57,7 @@ Text tTmp1 Vertical Alignment : center Input Type : character Text : - Max. Text Size : 50 + Max. Text Size : 80 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -87,7 +87,7 @@ Text tTmp2 Vertical Alignment : center Input Type : character Text : - Max. Text Size : 50 + Max. Text Size : 80 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 2f6f60a6..ecf9a820 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -69,8 +69,8 @@ Variable (string) entn Attributes ID : 21 Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Variable (int32) mode Attributes diff --git a/HMI/US/portrait/n2t-out/pageIcons.txt b/HMI/US/portrait/n2t-out/pageIcons.txt index e5066db4..f6b260cf 100644 --- a/HMI/US/portrait/n2t-out/pageIcons.txt +++ b/HMI/US/portrait/n2t-out/pageIcons.txt @@ -30,7 +30,7 @@ Text tTmp1 Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 50 + Max. Text Size : 80 Text tTmp2 Attributes @@ -40,7 +40,7 @@ Text tTmp2 Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 50 + Max. Text Size : 80 Picture p0 Attributes diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 06dba784..9cd4e3cd 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -59,8 +59,8 @@ Variable (string) strCommand Variable (string) entn Attributes Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Variable (int32) mode Attributes