diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 6a84c41b..ceadb0e5 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-07-23 14:02:48.223325770 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 14:02:49.219337687 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-07 21:12:08.440754014 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-07 21:12:09.588765588 +0000 @@ -14,6 +14,3 @@ //color vars int defaultFontColor=65535 @@ -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-07-23 14:02:48.223325770 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 14:02:49.219337687 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-07 21:12:08.440754014 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-07 21:12:09.592765628 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 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 e49aaa79..eeecdbb8 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 @@ -10,10 +10,6 @@ popupNotify 17 Component(s) 226 Line(s) of event code 143 Unique line(s) of event code -popupFan - 20 Component(s) - 236 Line(s) of event code - 150 Unique line(s) of event code popupLight 27 Component(s) 386 Line(s) of event code @@ -42,6 +38,10 @@ pageStartup 19 Component(s) 167 Line(s) of event code 122 Unique line(s) of event code +popupFan + 20 Component(s) + 236 Line(s) of event code + 150 Unique line(s) of event code screensaver 38 Component(s) 332 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupFan.txt b/HMI/US/landscape/n2t-out-visual/popupFan.txt index bbafd420..3414997a 100644 --- a/HMI/US/landscape/n2t-out-visual/popupFan.txt +++ b/HMI/US/landscape/n2t-out-visual/popupFan.txt @@ -117,7 +117,7 @@ Text tEntity Horizontal Alignment : left Vertical Alignment : center Input Type : character - Text : tEntity1 + Text : Max. Text Size : 25 Word wrap : disabled Horizontal Spacing : 0 @@ -147,7 +147,7 @@ Text tIcon1 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -177,7 +177,7 @@ Text t1 Horizontal Alignment : left Vertical Alignment : center Input Type : character - Text : Speed + Text : Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out/popupFan.txt b/HMI/US/landscape/n2t-out/popupFan.txt index 661ef3aa..8e796f65 100644 --- a/HMI/US/landscape/n2t-out/popupFan.txt +++ b/HMI/US/landscape/n2t-out/popupFan.txt @@ -88,7 +88,7 @@ Text tEntity Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : tEntity1 + Text : Max. Text Size : 25 Text tIcon1 @@ -98,7 +98,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 10 Text t1 @@ -108,7 +108,7 @@ Text t1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : Speed + Text : Max. Text Size : 50 Text tSend diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index d175b2a4..e326a0ac 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-07-23 14:02:48.223325770 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 14:02:48.731331848 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-07 21:12:08.440754014 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-07 21:12:08.996759619 +0000 @@ -14,6 +14,6 @@ //color vars int defaultFontColor=65535 @@ -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-07-23 14:02:48.227325818 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 14:02:48.731331848 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-08-07 21:12:08.440754014 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-07 21:12:08.996759619 +0000 @@ -65,6 +65,16 @@ vis nNum4,0 vis bPrev,0 @@ -458,8 +458,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-07-23 14:02:48.223325770 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 14:02:48.731331848 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-07 21:12:08.440754014 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-07 21:12:08.996759619 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 4e971e0b..1e1d6556 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 14:02:48.743331992 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-07-23 14:02:48.223325770 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 14:02:48.731331848 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-08-07 21:12:09.012759781 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-08-07 21:12:08.440754014 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-07 21:12:08.996759619 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 -+--- HMI/n2t-out/cardEntities.txt 2022-07-23 14:02:48.227325818 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 14:02:48.731331848 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-08-07 21:12:08.440754014 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-07 21:12:08.996759619 +0000 +@@ -65,6 +65,16 @@ + vis bPrev,0 + vis bNext,0 @@ -33,5 +33,5 @@ ++ spstr strCommand.txt,tTmp.txt,"~",32 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff5.val=sys0 -+--- HMI/n2t-out/pageStartup.txt 2022-07-23 14:02:48.223325770 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 14:02:48.731331848 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-08-07 21:12:08.440754014 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-07 21:12:08.996759619 +0000 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 83440c97..9b1d91c1 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 @@ -18,10 +18,6 @@ popupLight 27 Component(s) 386 Line(s) of event code 211 Unique line(s) of event code -popupFan - 20 Component(s) - 236 Line(s) of event code - 150 Unique line(s) of event code cardMedia 34 Component(s) 388 Line(s) of event code @@ -42,6 +38,10 @@ cardQR 32 Component(s) 403 Line(s) of event code 234 Unique line(s) of event code +popupFan + 20 Component(s) + 236 Line(s) of event code + 150 Unique line(s) of event code screensaver 38 Component(s) 332 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupFan.txt b/HMI/US/portrait/n2t-out-visual/popupFan.txt index 1c3cc111..1eddcd99 100644 --- a/HMI/US/portrait/n2t-out-visual/popupFan.txt +++ b/HMI/US/portrait/n2t-out-visual/popupFan.txt @@ -117,7 +117,7 @@ Text tEntity Horizontal Alignment : left Vertical Alignment : center Input Type : character - Text : tEntity1 + Text : Max. Text Size : 25 Word wrap : disabled Horizontal Spacing : 0 @@ -147,7 +147,7 @@ Text tIcon1 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -177,7 +177,7 @@ Text t1 Horizontal Alignment : left Vertical Alignment : center Input Type : character - Text : Speed + Text : Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/popupFan.txt b/HMI/US/portrait/n2t-out/popupFan.txt index 661ef3aa..8e796f65 100644 --- a/HMI/US/portrait/n2t-out/popupFan.txt +++ b/HMI/US/portrait/n2t-out/popupFan.txt @@ -88,7 +88,7 @@ Text tEntity Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : tEntity1 + Text : Max. Text Size : 25 Text tIcon1 @@ -98,7 +98,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 10 Text t1 @@ -108,7 +108,7 @@ Text t1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : Speed + Text : Max. Text Size : 50 Text tSend diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index fae777b9..6ff4026a 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -38,10 +38,6 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -popupFan - 20 Component(s) - 236 Line(s) of event code - 150 Unique line(s) of event code cardQR 32 Component(s) 403 Line(s) of event code @@ -50,6 +46,10 @@ cardAlarm 40 Component(s) 421 Line(s) of event code 254 Unique line(s) of event code +popupFan + 20 Component(s) + 236 Line(s) of event code + 150 Unique line(s) of event code cardThermo 53 Component(s) 580 Line(s) of event code diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt index ab9cbced..1f10aacd 100644 --- a/HMI/n2t-out-visual/popupFan.txt +++ b/HMI/n2t-out-visual/popupFan.txt @@ -117,7 +117,7 @@ Text tEntity Horizontal Alignment : left Vertical Alignment : center Input Type : character - Text : tEntity1 + Text : Max. Text Size : 25 Word wrap : disabled Horizontal Spacing : 0 @@ -147,7 +147,7 @@ Text tIcon1 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text :  + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -177,7 +177,7 @@ Text t1 Horizontal Alignment : left Vertical Alignment : center Input Type : character - Text : Speed + Text : Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/popupFan.txt b/HMI/n2t-out/popupFan.txt index 661ef3aa..8e796f65 100644 --- a/HMI/n2t-out/popupFan.txt +++ b/HMI/n2t-out/popupFan.txt @@ -88,7 +88,7 @@ Text tEntity Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : tEntity1 + Text : Max. Text Size : 25 Text tIcon1 @@ -98,7 +98,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text : Max. Text Size : 10 Text t1 @@ -108,7 +108,7 @@ Text t1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : Speed + Text : Max. Text Size : 50 Text tSend