From a89ba30cd3e3d166818cd302faa646696b25832c Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 22 May 2022 08:56:38 +0000 Subject: [PATCH] Merge branch 'main' into pr/203 (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 ++++---- HMI/US/portrait/diff-eu-version.txt | 13 +++++++++---- HMI/US/portrait/diff-filtered.txt | 12 +++++++----- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index aebc8351..30aa9bbb 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-22 08:52:05.367816736 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:52:06.663941704 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:56:32.972794177 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:56:34.028800991 +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-22 08:52:05.367816736 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:52:06.667941783 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:56:32.972794177 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:56:34.032801017 +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 cb0ae92e..2c7ea44b 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-22 08:52:05.367816736 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:56:32.972794177 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:56:33.488797507 +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-22 08:52:05.367816736 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:56:32.976794203 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:56:33.492797532 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -465,8 +465,13 @@ 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-05-22 08:56:32.972794177 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:56:33.488797507 +0000 +@@ -142,7 +142,7 @@ + Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none +- Text : please check your backend configuration + Text : pls check your backend configuration Max. Text Size : 100 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index aa09eec7..67fd2d23 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:52:06.071870294 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:52:05.367816736 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:56:33.504797610 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-22 08:56:32.972794177 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:56:33.488797507 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:56:32.976794203 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:56:33.492797532 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1880,6 +2108,166 @@ @@ -26,3 +26,5 @@ ++ if(tTmp.txt=="disable") ++ }else if(tTmp.txt!="") ++ bDown5.txt=tTmp.txt ++--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:56:32.972794177 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:56:33.488797507 +0000