From d9d8e62a8b330aa1bb45c1bd99020af7adf8f57d Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 7 May 2022 15:43:33 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 ++++---- .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 ++++---- HMI/US/landscape/n2t-out-visual/popupLight.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 12 ++++++------ HMI/US/portrait/diff-filtered.txt | 14 +++++++------- HMI/n2t-out-visual/popupLight.txt | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 2b84c180..86a5a68f 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-07 15:37:51.728763344 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:37:52.500817194 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 15:43:32.155996375 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:43:33.036000662 +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-07 15:37:51.728763344 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:37:52.500817194 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:43:33.036000662 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 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 45608993..064c2189 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 @@ -10,14 +10,14 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -popupLight - 27 Component(s) - 341 Line(s) of event code - 185 Unique line(s) of event code popupShutter 20 Component(s) 193 Line(s) of event code 109 Unique line(s) of event code +popupLight + 27 Component(s) + 341 Line(s) of event code + 185 Unique line(s) of event code popupNotify 17 Component(s) 196 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 61ace9ce..e164e931 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -154,7 +154,7 @@ Text t1 Opacity : 127 x coordinate : 25 y coordinate : 226 - Width : 229 + Width : 208 Height : 30 Effect : load Effect Priority : 0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 06fa1b07..aa823c54 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-07 15:37:51.728763344 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:37:52.104789571 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 15:43:32.155996375 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:43:32.583998460 +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-07 15:37:51.728763344 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:37:52.104789571 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:43:32.155996375 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:43:32.587998479 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -427,8 +427,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-07 15:37:51.728763344 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:37:52.104789571 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:43:32.583998460 +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 609d099c..14d4397c 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,7 +1,7 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:37:52.120790687 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-07 15:37:51.728763344 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:37:52.104789571 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:37:51.728763344 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:37:52.104789571 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:37:52.104789571 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:43:32.599998538 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-07 15:43:32.155996375 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:43:32.583998460 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:43:32.155996375 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:43:32.587998479 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:43:32.583998460 +0000 diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 6d59086e..c0e6e77d 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -154,7 +154,7 @@ Text t1 Opacity : 127 x coordinate : 10 y coordinate : 226 - Width : 244 + Width : 211 Height : 30 Effect : load Effect Priority : 0