From b9dd24889e1b2267a927fabf2198432b02b10223 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Wed, 30 Mar 2022 15:03:47 +0000 Subject: [PATCH] added home-export-outline and import icon (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 20 ++++++++++++++++---- HMI/US/portrait/diff-eu-version.txt | 28 ++++++++++++++++++++-------- HMI/n2t-out-visual/pageIcons.txt | 2 +- HMI/n2t-out/pageIcons.txt | 2 +- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index f904a0d9..4ff25a64 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-03-30 09:17:12.762388734 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 09:17:13.638390126 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-30 15:03:45.667488911 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 15:03:46.575489457 +0000 @@ -10,6 +10,6 @@ int sleepValue=0 // dim value @@ -10,9 +10,21 @@ 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-03-30 15:03:45.667488911 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 15:03:46.575489457 +0000 +@@ -17,7 +17,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text :  ++ Text :  + Max. Text Size : 150 + + Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-30 09:17:12.762388734 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 09:17:13.638390126 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-30 15:03:45.667488911 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 15:03:46.575489457 +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 c4c5e61e..838949b3 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-03-30 09:17:12.762388734 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 09:17:13.206389440 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-30 15:03:45.667488911 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 15:03:46.111489178 +0000 @@ -10,6 +10,6 @@ int sleepValue=0 // dim value @@ -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-03-30 09:17:12.766388740 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 09:17:13.206389440 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-30 15:03:45.671488913 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 15:03:46.111489178 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -781,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-30 09:17:12.766388740 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 09:17:13.206389440 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-30 15:03:45.671488913 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 15:03:46.111489178 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -807,9 +807,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt XFloat xTempCurr Attributes Scope : local +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt +--- HMI/n2t-out/pageIcons.txt 2022-03-30 15:03:45.667488911 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 15:03:46.111489178 +0000 +@@ -17,7 +17,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text :  ++ Text :  + Max. Text Size : 150 + + Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-30 09:17:12.762388734 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 09:17:13.206389440 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-30 15:03:45.667488911 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 15:03:46.111489178 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/n2t-out-visual/pageIcons.txt b/HMI/n2t-out-visual/pageIcons.txt index 7c46cd56..d2841861 100644 --- a/HMI/n2t-out-visual/pageIcons.txt +++ b/HMI/n2t-out-visual/pageIcons.txt @@ -42,7 +42,7 @@ Text tIcons Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text :  + Text :  Max. Text Size : 150 Word wrap : enabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index 47f5bf8d..da2c96a9 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/n2t-out/pageIcons.txt @@ -17,7 +17,7 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text :  Max. Text Size : 150 Text tTmp1