From baef104d599a6574ae989cd416e5f33dc60308ef Mon Sep 17 00:00:00 2001 From: joBr99 Date: Wed, 1 Jun 2022 14:55:22 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 52 +++++++++++----------------- HMI/US/portrait/diff-eu-version.txt | 28 +++++---------- HMI/US/portrait/diff-filtered.txt | 24 +++++-------- HMI/n2t-out-visual/cardQR.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 8 ++--- HMI/n2t-out/cardQR.txt | 2 +- 6 files changed, 43 insertions(+), 73 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 10d4e89d..efbdf124 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-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-01 14:51:16.805072637 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-01 14:55:16.541020819 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-01 14:55:17.449030155 +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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-01 14:51:16.805072637 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-01 14:55:16.545020860 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-01 14:55:17.449030155 +0000 @@ -1925,10 +1925,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-01 14:51:16.805072637 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-01 14:55:16.545020860 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-01 14:55:17.449030155 +0000 @@ -846,10 +846,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-01 14:51:16.805072637 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-01 14:55:16.545020860 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-01 14:55:17.449030155 +0000 @@ -636,10 +636,7 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -51,21 +51,9 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt } if(tInstruction.txt=="timeout") { -diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-01 14:51:16.805072637 +0000 -@@ -97,7 +97,7 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 100 -+ Max. Text Size: 80 - - Text tEntity1 - Attributes diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-01 14:51:16.805072637 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-01 14:55:16.545020860 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-01 14:55:17.449030155 +0000 @@ -1170,10 +1170,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -78,8 +66,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt 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-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-01 14:51:16.805072637 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-01 14:55:16.545020860 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-01 14:55:17.449030155 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -101,8 +89,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-01 14:51:16.805072637 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-01 14:55:16.541020819 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-01 14:55:17.449030155 +0000 @@ -561,10 +561,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -115,8 +103,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-01 14:51:16.805072637 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-01 14:55:16.541020819 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-01 14:55:17.449030155 +0000 @@ -311,10 +311,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -129,8 +117,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-01 14:51:16.805072637 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-01 14:55:16.541020819 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-01 14:55:17.449030155 +0000 @@ -406,10 +406,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -143,8 +131,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-01 14:51:16.809072966 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-01 14:55:16.545020860 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-01 14:55:17.453030196 +0000 @@ -397,9 +397,6 @@ spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index dfc98a9e..e8ce1deb 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-01 14:51:15.788988952 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 14:51:16.285029806 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-01 14:55:16.541020819 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 14:55:16.989025425 +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-01 14:51:15.788988952 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 14:51:16.285029806 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-01 14:55:16.545020860 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 14:55:16.989025425 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -467,21 +467,9 @@ 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-06-01 14:51:15.788988952 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-01 14:51:16.285029806 +0000 -@@ -97,7 +97,7 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 100 -+ Max. Text Size: 80 - - Text tEntity1 - Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 14:51:16.285029806 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-01 14:55:16.545020860 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 14:55:16.989025425 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -501,8 +489,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-06-01 14:51:15.788988952 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 14:51:16.285029806 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-01 14:55:16.545020860 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 14:55:16.989025425 +0000 @@ -474,22 +474,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 1a8a82da..22aa5bd6 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-01 14:51:16.309031783 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-01 14:51:15.788988952 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 14:51:16.285029806 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-01 14:51:15.788988952 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 14:51:16.285029806 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-01 14:55:17.005025590 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-01 14:55:16.541020819 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 14:55:16.989025425 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-01 14:55:16.545020860 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 14:55:16.989025425 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -12,14 +12,8 @@ +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+--- HMI/n2t-out/cardQR.txt 2022-06-01 14:51:15.788988952 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-01 14:51:16.285029806 +0000 -+@@ -97,7 +97,7 @@ -+- Max. Text Size: 100 -++ Max. Text Size: 80 -+ Text tEntity1 -+--- HMI/n2t-out/pageStartup.txt 2022-06-01 14:51:15.788988952 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 14:51:16.285029806 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-06-01 14:51:15.788988952 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 14:51:16.285029806 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-01 14:55:16.545020860 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 14:55:16.989025425 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-06-01 14:55:16.545020860 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 14:55:16.989025425 +0000 +@@ -474,22 +474,6 @@ diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index b202f2ef..0c6f45a4 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -116,7 +116,7 @@ Variable (string) vaQR ID : 31 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 80 Text tEntity1 Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index d0b76feb..cd01dab7 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,6 +10,10 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code +cardQR + 32 Component(s) + 374 Line(s) of event code + 218 Unique line(s) of event code popupNotify 17 Component(s) 204 Line(s) of event code @@ -22,10 +26,6 @@ popupShutter 20 Component(s) 248 Line(s) of event code 141 Unique line(s) of event code -cardQR - 32 Component(s) - 374 Line(s) of event code - 218 Unique line(s) of event code cardMedia 33 Component(s) 349 Line(s) of event code diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 1cb85411..22c20e9a 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -97,7 +97,7 @@ Variable (string) vaQR Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 80 Text tEntity1 Attributes