From b9b22cdbb5596ea951ecc29be16b2de629a6f23c Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Mon, 23 May 2022 06:20:45 +0000 Subject: [PATCH] . (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 12 ++++++------ HMI/US/portrait/diff-eu-version.txt | 16 ++++++++-------- HMI/US/portrait/diff-filtered.txt | 18 +++++++++--------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 8 ++++---- .../portrait/n2t-out-visual/popupShutter.txt | 16 ++++++++-------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index f7b5f9d2..6d6eb9f3 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-23 05:51:11.625618526 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-23 05:51:12.437634460 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-23 06:20:45.196459256 +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-23 05:51:11.625618526 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-23 05:51:12.441634539 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-23 06:20:45.196459256 +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-23 05:51:11.625618526 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-23 05:51:12.437634460 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-23 06:20:45.196459256 +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 c89e208f..2acf4f1f 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-23 05:51:11.625618526 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 05:51:12.005625983 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 06:20:44.736453105 +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-23 05:51:11.625618526 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 05:51:12.005625983 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-23 06:20:44.300447274 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 06:20:44.736453105 +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-23 05:51:11.625618526 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 05:51:12.005625983 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 06:20:44.736453105 +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-23 05:51:11.625618526 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 05:51:12.005625983 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 06:20:44.736453105 +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 e9de03f5..6a6d5af8 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-23 05:51:12.049626846 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-23 05:51:11.625618526 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 05:51:12.005625983 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-23 05:51:11.625618526 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 05:51:12.005625983 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-23 06:20:44.752453318 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 06:20:44.736453105 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-23 06:20:44.300447274 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 06:20:44.736453105 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1892,6 +2120,169 @@ @@ -32,8 +32,8 @@ ++ }else if(tTmp.txt=="enable") ++ spstr tId.txt,bDown5.txt,"|",2 +diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt -+--- HMI/n2t-out/cardQR.txt 2022-05-23 05:51:11.625618526 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 05:51:12.005625983 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 06:20:44.736453105 +0000 +@@ -34,7 +34,7 @@ + Attributes + Scope : local @@ -43,5 +43,5 @@ + + Variable (string) entn + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-23 05:51:11.625618526 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 05:51:12.005625983 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 06:20:44.736453105 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index a369c6aa..04503939 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -42,14 +42,14 @@ cardMedia 33 Component(s) 350 Line(s) of event code 179 Unique line(s) of event code -popupShutter - 20 Component(s) - 244 Line(s) of event code - 138 Unique line(s) of event code screensaver 35 Component(s) 296 Line(s) of event code 237 Unique line(s) of event code +popupShutter + 20 Component(s) + 244 Line(s) of event code + 138 Unique line(s) of event code cardEntities 77 Component(s) 1363 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index 894e85b6..d7c97199 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -417,8 +417,8 @@ Button bDown1 Opacity : 127 x coordinate : 199 y coordinate : 156 - Width : 50 - Height : 50 + Width : 70 + Height : 70 Effect : load Effect Priority : 0 Effect Time : 300 @@ -462,10 +462,10 @@ Button bStop1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 136 + x coordinate : 125 y coordinate : 156 - Width : 50 - Height : 50 + Width : 70 + Height : 70 Effect : load Effect Priority : 0 Effect Time : 300 @@ -509,10 +509,10 @@ Button bUp1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 73 + x coordinate : 51 y coordinate : 156 - Width : 50 - Height : 50 + Width : 70 + Height : 70 Effect : load Effect Priority : 0 Effect Time : 300