From 2344b46937358e4b3871fc13355d2b24ba7ee308 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 27 May 2022 19:42:40 +0000 Subject: [PATCH] move icons (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 24 +++++++++++----------- HMI/US/portrait/diff-eu-version.txt | 28 +++++++++++++------------- HMI/US/portrait/diff-filtered.txt | 30 ++++++++++++++-------------- HMI/n2t-out-visual/screensaver.txt | 24 +++++++++++----------- HMI/n2t-out/screensaver.txt | 4 ++-- 5 files changed, 55 insertions(+), 55 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 5a691be7..3f797469 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-27 19:16:48.789764560 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 19:16:49.553773382 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 19:42:39.418054880 +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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 19:16:49.553773382 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 19:42:39.418054880 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-27 19:16:48.789764560 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 19:16:49.553773382 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 19:42:39.418054880 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -33,8 +33,8 @@ 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-05-27 19:16:48.789764560 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-27 19:16:49.553773382 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-27 19:42:39.418054880 +0000 @@ -209,9 +209,6 @@ sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 @@ -46,8 +46,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-27 19:16:48.789764560 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-27 19:16:49.553773382 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-27 19:42:39.418054880 +0000 @@ -62,12 +62,6 @@ Text : Max. Text Size: 50 @@ -89,7 +89,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : +- Text :  - Max. Text Size : 5 - -Text tIcon2 @@ -99,7 +99,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : +- Text :  - Max. Text Size : 5 - Picture p0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 7f66f8af..dfac20ab 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-27 19:16:48.789764560 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:16:49.157768810 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:42:38.974090580 +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-27 19:16:48.789764560 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:16:49.157768810 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:42:38.978090258 +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-27 19:16:48.789764560 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:16:49.157768810 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:42:38.978090258 +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-27 19:16:48.789764560 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:16:49.157768810 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:42:38.978090258 +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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-27 19:16:48.789764560 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:16:49.157768810 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:42:38.978090258 +0000 @@ -209,9 +209,6 @@ sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 @@ -514,8 +514,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.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-27 19:16:48.789764560 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:16:49.157768810 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-27 19:42:38.550124672 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:42:38.978090258 +0000 @@ -62,12 +62,6 @@ Text : Max. Text Size: 50 @@ -557,7 +557,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : +- Text :  - Max. Text Size : 5 - -Text tIcon2 @@ -567,7 +567,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : +- Text :  - Max. Text Size : 5 - Picture p0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 3a184a87..ebaa7693 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,15 +1,15 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 19:16:49.169768948 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-27 19:16:48.789764560 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:16:49.157768810 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-27 19:16:48.789764560 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:16:49.157768810 +0000 -+--- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:16:49.157768810 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:16:48.789764560 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:16:49.157768810 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 19:42:38.990089293 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-27 19:42:38.550124672 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:42:38.974090580 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-27 19:42:38.550124672 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:42:38.978090258 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-27 19:42:38.550124672 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:42:38.978090258 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:42:38.550124672 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:42:38.978090258 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-27 19:16:48.789764560 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:16:49.157768810 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-05-27 19:42:38.550124672 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:42:38.978090258 +0000 +@@ -209,9 +209,6 @@ + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 @@ -20,8 +20,8 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+--- HMI/n2t-out/screensaver.txt 2022-05-27 19:16:48.789764560 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:16:49.157768810 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-27 19:42:38.550124672 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:42:38.978090258 +0000 +@@ -62,12 +62,6 @@ + Text : + Max. Text Size: 50 @@ -63,7 +63,7 @@ +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none -+- Text : ++- Text :  +- Max. Text Size : 5 +- +-Text tIcon2 @@ -73,7 +73,7 @@ +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none -+- Text : ++- Text :  +- Max. Text Size : 5 +- + Picture p0 diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 3f07bc08..c0d547bb 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -120,9 +120,9 @@ Text tDate Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 38 y coordinate : 154 - Width : 451 + Width : 375 Height : 38 Effect : load Effect Priority : 0 @@ -810,10 +810,10 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 344 - y coordinate : 2 - Width : 50 - Height : 45 + x coordinate : 0 + y coordinate : 154 + Width : 38 + Height : 38 Effect : load Effect Priority : 0 Effect Time : 300 @@ -826,7 +826,7 @@ Text tIcon1 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : + Text :  Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 @@ -840,10 +840,10 @@ Text tIcon2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 400 - y coordinate : 2 - Width : 45 - Height : 45 + x coordinate : 413 + y coordinate : 154 + Width : 38 + Height : 38 Effect : load Effect Priority : 0 Effect Time : 300 @@ -856,7 +856,7 @@ Text tIcon2 Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : + Text :  Max. Text Size : 5 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 42a6eb9a..36a6c547 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -315,7 +315,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text :  Max. Text Size : 5 Text tIcon2 @@ -325,7 +325,7 @@ Text tIcon2 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text :  Max. Text Size : 5 Picture p0