From 8314bca54dbb16d8bf59bda008eeb813df700f11 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Mon, 6 Jun 2022 20:43:20 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 22 ++++--------------- HMI/US/landscape/n2t-out-visual/cardGrid.txt | 4 ++++ .../n2t-out-visual/nspanel_US_L_Stats.txt | 10 ++++----- HMI/US/landscape/n2t-out/cardGrid.txt | 4 ++++ HMI/US/portrait/diff-eu-version.txt | 16 +++++++------- HMI/US/portrait/diff-filtered.txt | 18 +++++++-------- 6 files changed, 34 insertions(+), 40 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index bb5988cc..6504e71e 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-06-06 20:41:13.393750277 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:41:14.285762803 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:43:14.701325786 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:43:15.757379552 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,23 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-06-06 20:41:13.397750333 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:41:14.285762803 +0000 -@@ -846,10 +846,6 @@ - // get value - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,dimValue,0,0 -- // get value normal -- spstr strCommand.txt,tTmp.txt,"~",2 -- covx tTmp.txt,dimValueNormal,0,0 -- dim=dimValueNormal - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:41:14.285762803 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:43:15.757379552 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index ae6b8c9c..ef56a849 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -1310,6 +1310,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 982c1d7d..bdba6347 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -18,14 +18,14 @@ pageStartup 19 Component(s) 157 Line(s) of event code 117 Unique line(s) of event code +cardGrid + 42 Component(s) + 439 Line(s) of event code + 259 Unique line(s) of event code cardQR 32 Component(s) 374 Line(s) of event code 218 Unique line(s) of event code -cardGrid - 42 Component(s) - 436 Line(s) of event code - 257 Unique line(s) of event code popupNotify 17 Component(s) 204 Line(s) of event code @@ -58,5 +58,5 @@ cardAlarm Total 13 Page(s) 412 Component(s) - 4639 Line(s) of event code + 4642 Line(s) of event code 1232 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 49246ebe..55ceab06 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -846,6 +846,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index b164affa..f9ef7ea2 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-06-06 20:41:13.393750277 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:41:13.825756343 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:43:14.701325786 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:43:15.217352058 +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-06-06 20:41:13.397750333 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:41:13.829756399 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:43:14.705325989 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:43:15.217352058 +0000 @@ -63,6 +63,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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-06 20:41:13.393750277 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:41:13.829756399 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:43:14.705325989 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:43:15.217352058 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:41:13.829756399 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:43:15.217352058 +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 72d8e4a5..2db9cb62 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-06-06 20:41:13.841756568 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-06 20:41:13.393750277 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:41:13.825756343 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:41:13.397750333 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:41:13.829756399 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:43:15.233352872 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-06 20:43:14.701325786 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:43:15.217352058 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:43:14.705325989 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:43:15.217352058 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -13,8 +13,8 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:41:13.393750277 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:41:13.829756399 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:43:14.705325989 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:43:15.217352058 +0000 +@@ -45,12 +45,6 @@ + Scope: local + Value: 0 @@ -59,5 +59,5 @@ + } + if(tInstruction.txt=="time") + { -+--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:41:13.829756399 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:43:15.217352058 +0000