From 608c88b20594b65ad73e3f3afcd18bceabc90e4c Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 28 May 2022 20:18:18 +0000 Subject: [PATCH] changed size of colorwheel (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +++---- HMI/US/portrait/diff-eu-version.txt | 20 ++++++++--------- HMI/US/portrait/diff-filtered.txt | 22 +++++++++---------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 8 +++---- HMI/US/portrait/n2t-out-visual/popupLight.txt | 8 +++---- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 022bc4a8..02b9e136 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-28 19:58:06.686291753 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:58:07.586304354 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 20:18:16.481462743 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 20:18:17.549463034 +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-28 19:58:06.686291753 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:58:07.590304410 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 20:18:16.481462743 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 20:18:17.549463034 +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 9873fe80..b31ed881 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-28 19:58:06.686291753 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:58:07.122297824 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 20:18:16.481462743 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 20:18:16.997462884 +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-05-28 19:58:06.686291753 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:58:07.122297824 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 20:18:16.485462744 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 20:18:16.997462884 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-28 19:58:06.686291753 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:58:07.122297824 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 20:18:16.485462744 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 20:18:16.997462884 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-28 19:58:06.686291753 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:58:07.122297824 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 20:18:16.481462743 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 20:18:16.997462884 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -501,8 +501,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-28 19:58:06.686291753 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:58:07.122297824 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-28 20:18:16.485462744 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 20:18:16.997462884 +0000 @@ -471,22 +471,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 7ba1ae03..4974450f 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-05-28 19:58:07.138298050 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-28 19:58:06.686291753 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:58:07.122297824 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:58:06.686291753 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:58:07.122297824 +0000 -+--- HMI/n2t-out/cardQR.txt 2022-05-28 19:58:06.686291753 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:58:07.122297824 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:58:06.686291753 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:58:07.122297824 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-28 19:58:06.686291753 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:58:07.122297824 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 20:18:17.037462894 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-28 20:18:16.481462743 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 20:18:16.997462884 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-28 20:18:16.485462744 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 20:18:16.997462884 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-28 20:18:16.485462744 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 20:18:16.997462884 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-28 20:18:16.481462743 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 20:18:16.997462884 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-28 20:18:16.485462744 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 20:18:16.997462884 +0000 +@@ -471,22 +471,6 @@ 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 6be912f6..651a370e 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 @@ -2,6 +2,10 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code +popupLight + 27 Component(s) + 348 Line(s) of event code + 188 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -34,10 +38,6 @@ cardMedia 33 Component(s) 350 Line(s) of event code 179 Unique line(s) of event code -popupLight - 27 Component(s) - 348 Line(s) of event code - 188 Unique line(s) of event code pageStartup 19 Component(s) 154 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index a059a705..3c407766 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -439,10 +439,10 @@ Picture pColorWheel Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 160 - y coordinate : 69 - Width : 160 - Height : 160 + x coordinate : 67 + y coordinate : 89 + Width : 245 + Height : 245 Effect : load Effect Priority : 0 Effect Time : 300