From a2693de6ea2efe0c5310b034d8276f7740d21bb9 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 22 May 2022 08:52:07 +0000 Subject: [PATCH] fix cmd length on shutter page (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 ++++---- HMI/US/landscape/n2t-out-visual/popupShutter.txt | 2 +- HMI/US/landscape/n2t-out/popupShutter.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 12 ++++++------ HMI/US/portrait/diff-filtered.txt | 14 +++++++------- HMI/US/portrait/n2t-out-visual/popupShutter.txt | 2 +- HMI/US/portrait/n2t-out/popupShutter.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 8 ++++---- HMI/n2t-out-visual/popupShutter.txt | 2 +- HMI/n2t-out/popupShutter.txt | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 397507c8..aebc8351 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:36:42.175632757 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:36:43.131639685 +0000 +--- 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 @@ -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:36:42.175632757 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:36:43.131639685 +0000 +--- 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 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 3576b25a..bc4f5fff 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 39c20ee3..5fca3dc8 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 8c96df23..aeac48ab 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:36:42.175632757 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:36:42.611635917 +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 @@ -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:36:42.175632757 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:36:42.615635946 +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 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -465,8 +465,8 @@ 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:36:42.175632757 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:36:42.611635917 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:52:05.927852627 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index fc89c850..9b0ffe96 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:36:42.679636410 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:36:42.611635917 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:36:42.175632757 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:36:42.615635946 +0000 ++++ 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 + Hotspot mSwipeNext + Scope : local +@@ -1880,6 +2108,166 @@ @@ -26,5 +26,5 @@ ++ if(tTmp.txt=="disable") ++ }else if(tTmp.txt!="") ++ bDown5.txt=tTmp.txt -+--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:36:42.611635917 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:52:05.927852627 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index c88262c5..2cfd938c 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 39c20ee3..5fca3dc8 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index da26d1be..254fe31b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,6 +22,10 @@ popupNotify 17 Component(s) 200 Line(s) of event code 125 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code screensaver 35 Component(s) 296 Line(s) of event code @@ -34,10 +38,6 @@ cardQR 30 Component(s) 363 Line(s) of event code 205 Unique line(s) of event code -popupShutter - 20 Component(s) - 241 Line(s) of event code - 138 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 12852a06..baddcd3a 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 39c20ee3..5fca3dc8 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes