From 79ef896ca8df846e5b44075a83a5776f3afda33e Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 3 Apr 2022 16:02:25 +0000 Subject: [PATCH] added some icons #120 (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 20 ++++------------ .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 +++---- HMI/US/landscape/n2t-out-visual/pageIcons.txt | 4 ++-- .../landscape/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/landscape/n2t-out/pageIcons.txt | 4 ++-- HMI/US/landscape/n2t-out/pageStartup.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 24 +++++-------------- HMI/US/portrait/n2t-out-visual/pageIcons.txt | 4 ++-- .../portrait/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/portrait/n2t-out/pageIcons.txt | 4 ++-- HMI/US/portrait/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +++---- HMI/n2t-out-visual/pageIcons.txt | 4 ++-- HMI/n2t-out-visual/pageStartup.txt | 2 +- HMI/n2t-out/pageIcons.txt | 4 ++-- HMI/n2t-out/pageStartup.txt | 2 +- 16 files changed, 36 insertions(+), 60 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index c4463e7e..a804a446 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-03 11:36:28.479194000 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 11:36:29.307198536 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-03 16:02:24.464717607 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 16:02:25.284722859 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,21 +10,9 @@ 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/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-03 11:36:28.479194000 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-03 11:36:29.307198536 +0000 -@@ -29,7 +29,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text :  -+ Text :  - Max. Text Size : 170 - - Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-03 11:36:28.479194000 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 11:36:29.307198536 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-03 16:02:24.464717607 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 16:02:25.288722884 +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 1dc696dd..fe4f7c3a 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 @@ -2,6 +2,10 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code +pageIcons + 7 Component(s) + 0 Line(s) of event code + 0 Unique line(s) of event code pageTest 13 Component(s) 13 Line(s) of event code @@ -10,10 +14,6 @@ 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 diff --git a/HMI/US/landscape/n2t-out-visual/pageIcons.txt b/HMI/US/landscape/n2t-out-visual/pageIcons.txt index 023e1247..61188426 100644 --- a/HMI/US/landscape/n2t-out-visual/pageIcons.txt +++ b/HMI/US/landscape/n2t-out-visual/pageIcons.txt @@ -56,8 +56,8 @@ Text tIcons Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text :  - Max. Text Size : 170 + Text :  + Max. Text Size : 185 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 3544bd42..c256bf24 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 28 + Text : 29 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out/pageIcons.txt b/HMI/US/landscape/n2t-out/pageIcons.txt index 69e5a49f..4cd9924a 100644 --- a/HMI/US/landscape/n2t-out/pageIcons.txt +++ b/HMI/US/landscape/n2t-out/pageIcons.txt @@ -29,8 +29,8 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  - Max. Text Size : 170 + Text :  + Max. Text Size : 185 Text tTmp1 Attributes diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 1885e66c..c8d77d28 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 28 + Text : 29 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 7f368021..23a96ba8 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-03 11:36:28.479194000 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 11:36:28.883196213 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-03 16:02:24.464717607 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 16:02:24.872720220 +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-04-03 11:36:28.479194000 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 11:36:28.887196235 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-03 16:02:24.468717633 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 16:02:24.872720220 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -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-04-03 11:36:28.479194000 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-03 11:36:28.883196213 +0000 -@@ -29,7 +29,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text :  -+ Text :  - Max. Text Size : 170 - - Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-03 11:36:28.479194000 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 11:36:28.883196213 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-03 16:02:24.464717607 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 16:02:24.872720220 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/n2t-out-visual/pageIcons.txt b/HMI/US/portrait/n2t-out-visual/pageIcons.txt index 8e202128..fb302ac7 100644 --- a/HMI/US/portrait/n2t-out-visual/pageIcons.txt +++ b/HMI/US/portrait/n2t-out-visual/pageIcons.txt @@ -56,8 +56,8 @@ Text tIcons Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text :  - Max. Text Size : 170 + Text :  + Max. Text Size : 185 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index 90a9da4a..121cbc56 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 28 + Text : 29 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/pageIcons.txt b/HMI/US/portrait/n2t-out/pageIcons.txt index 4ff01b79..d0e79d2c 100644 --- a/HMI/US/portrait/n2t-out/pageIcons.txt +++ b/HMI/US/portrait/n2t-out/pageIcons.txt @@ -29,8 +29,8 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  - Max. Text Size : 170 + Text :  + Max. Text Size : 185 Text tTmp1 Attributes diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 793a79ae..155a5aaf 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 28 + Text : 29 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 5b96c09a..d5bba8a9 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,6 +14,10 @@ pageSerialTest 13 Component(s) 48 Line(s) of event code 43 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code popupNotify 17 Component(s) 178 Line(s) of event code @@ -26,10 +30,6 @@ popupLight 27 Component(s) 322 Line(s) of event code 173 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code cardThermo 41 Component(s) 460 Line(s) of event code diff --git a/HMI/n2t-out-visual/pageIcons.txt b/HMI/n2t-out-visual/pageIcons.txt index 04e4087f..61188426 100644 --- a/HMI/n2t-out-visual/pageIcons.txt +++ b/HMI/n2t-out-visual/pageIcons.txt @@ -56,8 +56,8 @@ Text tIcons Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text :  - Max. Text Size : 170 + Text :  + Max. Text Size : 185 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 1f45d79f..22d08b9f 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 28 + Text : 29 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index c2b1cda9..4cd9924a 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/n2t-out/pageIcons.txt @@ -29,8 +29,8 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  - Max. Text Size : 170 + Text :  + Max. Text Size : 185 Text tTmp1 Attributes diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 4f108416..df49a42a 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 28 + Text : 29 Max. Text Size : 10 Picture p0