diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 5ab6bf61..62e1f797 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-17 18:40:49.925246404 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-17 18:40:50.729250470 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-18 20:12:47.683701912 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,9 +10,148 @@ 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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardAlarm.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-18 20:12:47.683701912 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 50 + + Variable (string) tSend + Attributes +diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt +--- HMI/n2t-out/cardEntities.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-18 20:12:47.687701944 +0000 +@@ -97,25 +97,25 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn2 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn3 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn4 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Number nNum1 + Attributes +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardGrid.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-18 20:12:47.683701912 +0000 +@@ -69,25 +69,25 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn2 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn3 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn4 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) type5 + Attributes +@@ -105,13 +105,13 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 50 + + Variable (string) entn6 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 50 + + Text tHeading + Attributes +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-18 20:12:47.683701912 +0000 +@@ -30,7 +30,7 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 50 + + Variable (string) vaSpeakerList + Attributes +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-18 20:12:47.683701912 +0000 +@@ -42,7 +42,7 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 50 + + Variable (string) va0 + Attributes +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt +--- HMI/n2t-out/pageIcons.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-18 20:12:47.683701912 +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/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-17 18:40:49.925246404 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-17 18:40:50.729250470 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-18 20:12:47.683701912 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -23,8 +162,19 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-17 18:40:49.925246404 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-17 18:40:50.729250470 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-18 20:12:47.687701944 +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 @@ -570,43 +570,25 @@ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 @@ -75,9 +225,23 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt } if(tId.txt=="cardAlarm") { +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-18 20:12:47.683701912 +0000 +@@ -46,8 +46,8 @@ + Variable (string) entn + Attributes + Scope : local +- Text : +- Max. Text Size: 80 ++ Text : newtxt ++ Max. Text Size: 50 + + Text tEntity + Attributes diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-17 18:40:49.925246404 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-17 18:40:50.729250470 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-18 20:12:47.687701944 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 9c6efa36..608b6df4 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-17 18:40:49.925246404 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-17 18:40:50.309248346 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-18 20:12:47.271698536 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,9 +10,21 @@ 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-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-18 20:12:47.275698569 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 50 + + Variable (string) tSend + Attributes diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-17 18:40:49.925246404 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-17 18:40:50.313248366 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-18 20:12:47.275698569 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -30,10 +42,34 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Variable (string) strCommand Attributes -@@ -117,6 +127,18 @@ +@@ -97,25 +107,37 @@ + Attributes + Scope : local Text : - Max. Text Size: 70 +- Max. Text Size: 80 ++ Max. Text Size: 70 + Variable (string) entn2 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn3 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn4 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 ++ +Variable (string) entn5 + Attributes + Scope : local @@ -45,10 +81,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Scope : local + Text : + Max. Text Size: 10 -+ + Number nNum1 Attributes - Scope : local @@ -153,6 +175,15 @@ Associated Keyboard : none Value : 0 @@ -426,9 +461,103 @@ 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-04-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-18 20:12:47.275698569 +0000 +@@ -69,25 +69,25 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn2 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn3 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) entn4 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + + Variable (string) type5 + Attributes +@@ -105,13 +105,13 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 50 + + Variable (string) entn6 + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 50 + + Text tHeading + Attributes +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-18 20:12:47.275698569 +0000 +@@ -30,7 +30,7 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 50 + + Variable (string) vaSpeakerList + Attributes +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-18 20:12:47.275698569 +0000 +@@ -42,7 +42,7 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 80 ++ Max. Text Size: 50 + + Variable (string) va0 + Attributes +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt +--- HMI/n2t-out/pageIcons.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-18 20:12:47.271698536 +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-04-17 18:40:49.925246404 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-17 18:40:50.313248366 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-18 20:12:47.275698569 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -447,9 +576,37 @@ 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-04-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-18 20:12:47.275698569 +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 -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-18 20:12:47.275698569 +0000 +@@ -46,8 +46,8 @@ + Variable (string) entn + Attributes + Scope : local +- Text : +- Max. Text Size: 80 ++ Text : newtxt ++ Max. Text Size: 50 + + Text tEntity + Attributes diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-17 18:40:49.925246404 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-17 18:40:50.313248366 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-18 20:12:46.891695422 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-18 20:12:47.275698569 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 6f192a9e..c53d540b 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,10 +1,48 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-17 18:40:50.333248468 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-17 18:40:49.925246404 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-17 18:40:50.309248346 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-04-17 18:40:49.925246404 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-17 18:40:50.313248366 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-18 20:12:47.287698667 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-18 20:12:47.271698536 +0000 ++diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ++--- HMI/n2t-out/cardAlarm.txt 2022-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-18 20:12:47.275698569 +0000 ++@@ -44,7 +44,7 @@ ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 50 ++ ++ Variable (string) tSend ++ Attributes ++--- HMI/n2t-out/cardEntities.txt 2022-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-18 20:12:47.275698569 +0000 +@@ -62,6 +62,16 @@ -+@@ -117,6 +127,18 @@ ++@@ -97,25 +107,37 @@ ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 70 ++ ++ Variable (string) entn2 ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 70 ++ ++ Variable (string) entn3 ++ Attributes ++ Scope : local ++- Max. Text Size: 80 +++ Max. Text Size: 70 ++ Variable (string) entn4 ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 70 +++ ++ +@@ -153,6 +175,15 @@ +@@ -283,6 +314,26 @@ +@@ -402,6 +453,34 @@ @@ -15,11 +53,133 @@ + } + if(tInstruction.txt=="pageType") + { -+--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:40:49.925246404 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-17 18:40:50.313248366 +0000 ++diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ++--- HMI/n2t-out/cardGrid.txt 2022-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-18 20:12:47.275698569 +0000 ++@@ -69,25 +69,25 @@ ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 70 ++ ++ Variable (string) entn2 ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 70 ++ ++ Variable (string) entn3 ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 70 ++ ++ Variable (string) entn4 ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 70 ++ ++ Variable (string) type5 ++ Attributes ++@@ -105,13 +105,13 @@ ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 50 ++ ++ Variable (string) entn6 ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 50 ++ ++ Text tHeading ++ Attributes ++diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ++--- HMI/n2t-out/cardMedia.txt 2022-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-18 20:12:47.275698569 +0000 ++@@ -30,7 +30,7 @@ ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 50 ++ ++ Variable (string) vaSpeakerList ++ Attributes ++diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ++--- HMI/n2t-out/cardThermo.txt 2022-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-18 20:12:47.275698569 +0000 ++@@ -42,7 +42,7 @@ ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 80 +++ Max. Text Size: 50 ++ ++ Variable (string) va0 ++ Attributes ++diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ++--- HMI/n2t-out/pageIcons.txt 2022-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-18 20:12:47.271698536 +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-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-18 20:12:47.275698569 +0000 ++diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ++--- HMI/n2t-out/popupLight.txt 2022-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-18 20:12:47.275698569 +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 -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ++--- HMI/n2t-out/popupShutter.txt 2022-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-18 20:12:47.275698569 +0000 ++@@ -46,8 +46,8 @@ ++ Variable (string) entn ++ Attributes ++ Scope : local ++- Text : ++- Max. Text Size: 80 +++ Text : newtxt +++ Max. Text Size: 50 ++ ++ Text tEntity ++ Attributes +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-17 18:40:49.925246404 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-17 18:40:50.313248366 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-18 20:12:46.891695422 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-18 20:12:47.275698569 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 72a3a6d3..d6d8bd96 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -54,7 +54,7 @@ Variable (string) entn ID : 9 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) tSend Attributes diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index b8a2a8f8..b4ea9cbf 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -111,28 +111,28 @@ Variable (string) entn1 ID : 49 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn2 Attributes ID : 50 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn3 Attributes ID : 51 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn4 Attributes ID : 52 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Number nNum1 Attributes diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index b69b9112..688b6f87 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -83,28 +83,28 @@ Variable (string) entn1 ID : 18 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn2 Attributes ID : 19 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn3 Attributes ID : 20 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn4 Attributes ID : 21 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) type5 Attributes @@ -125,14 +125,14 @@ Variable (string) entn5 ID : 36 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) entn6 Attributes ID : 37 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Text tHeading Attributes diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index ffb5bb6d..91d4e4f5 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -40,7 +40,7 @@ Variable (string) entn ID : 18 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) vaSpeakerList Attributes diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 42751b15..9f2326ec 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -52,7 +52,7 @@ Variable (string) entn ID : 21 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) va0 Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index f9a9f590..70524cbd 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,10 +10,10 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -popupLight - 27 Component(s) - 338 Line(s) of event code - 182 Unique line(s) of event code +cardGrid + 39 Component(s) + 418 Line(s) of event code + 244 Unique line(s) of event code popupShutter 19 Component(s) 191 Line(s) of event code @@ -26,30 +26,30 @@ pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code -cardMedia - 30 Component(s) - 329 Line(s) of event code - 169 Unique line(s) of event code -cardThermo - 41 Component(s) - 442 Line(s) of event code - 247 Unique line(s) of event code -cardGrid - 39 Component(s) - 418 Line(s) of event code - 244 Unique line(s) of event code -screensaver - 35 Component(s) - 292 Line(s) of event code - 235 Unique line(s) of event code +popupLight + 27 Component(s) + 338 Line(s) of event code + 182 Unique line(s) of event code cardAlarm 35 Component(s) 343 Line(s) of event code 214 Unique line(s) of event code +cardMedia + 30 Component(s) + 329 Line(s) of event code + 169 Unique line(s) of event code +screensaver + 35 Component(s) + 292 Line(s) of event code + 235 Unique line(s) of event code cardEntities 62 Component(s) 964 Line(s) of event code 410 Unique line(s) of event code +cardThermo + 41 Component(s) + 442 Line(s) of event code + 247 Unique line(s) of event code Total 12 Page(s) diff --git a/HMI/n2t-out-visual/pageIcons.txt b/HMI/n2t-out-visual/pageIcons.txt index 6b8d4451..4753b885 100644 --- a/HMI/n2t-out-visual/pageIcons.txt +++ b/HMI/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/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index f4cc7319..c3845f5e 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/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/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 07ca9657..4ba66d24 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -56,8 +56,8 @@ Variable (string) entn Attributes ID : 18 Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Text tEntity Attributes diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 203a993a..d49e3e28 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -44,7 +44,7 @@ Variable (string) entn Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) tSend Attributes diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 4addeb52..7eca8770 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -97,25 +97,25 @@ Variable (string) entn1 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn2 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn3 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn4 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Number nNum1 Attributes diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index a25bf882..d080bab7 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -69,25 +69,25 @@ Variable (string) entn1 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn2 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn3 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn4 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) type5 Attributes @@ -105,13 +105,13 @@ Variable (string) entn5 Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) entn6 Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Text tHeading Attributes diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index eeb4a70e..828a8ce7 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -30,7 +30,7 @@ Variable (string) entn Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) vaSpeakerList Attributes diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 6d8feb21..274b229f 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -42,7 +42,7 @@ Variable (string) entn Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) va0 Attributes diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index 13b6ea02..cc5100ac 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/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/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 24a94b18..859517f6 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/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 diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 0c55bb6a..a8c40451 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -46,8 +46,8 @@ Variable (string) strCommand Variable (string) entn Attributes Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Text tEntity Attributes