From d18e928678e86e6aa731cde2deeee5098cd7cd70 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 16:21:35 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 16 +-- HMI/US/portrait/diff-eu-version.txt | 99 ++--------------- HMI/US/portrait/diff-filtered.txt | 101 ++---------------- HMI/US/portrait/n2t-out-visual/cardGrid.txt | 12 +-- .../n2t-out-visual/nspanel_US_P_Stats.txt | 16 +-- HMI/US/portrait/n2t-out-visual/popupLight.txt | 4 +- .../portrait/n2t-out-visual/popupShutter.txt | 6 +- HMI/US/portrait/n2t-out/cardGrid.txt | 12 +-- HMI/US/portrait/n2t-out/popupLight.txt | 4 +- HMI/US/portrait/n2t-out/popupShutter.txt | 6 +- 10 files changed, 55 insertions(+), 221 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 600b3ac4..a70643f9 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-06 16:15:46.086827231 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:15:46.858823403 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 16:21:34.354244093 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:21:35.210254454 +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-06 16:15:46.086827231 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:15:46.858823403 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:21:34.358244142 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:21:35.214254503 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:15:46.858823403 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-06 16:21:34.358244142 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:21:35.214254503 +0000 @@ -535,12 +535,6 @@ vis pColorWheel,1 } @@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:15:46.858823403 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:21:34.358244142 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:21:35.214254503 +0000 @@ -109,7 +109,7 @@ Text : Max. Text Size : 20 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index eaab506e..0fbc0b2f 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-06 16:15:46.086827231 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:15:46.462825367 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 16:21:34.354244093 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:21:34.738248741 +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-06 16:15:46.086827231 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:15:46.466825347 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:21:34.358244142 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:21:34.742248790 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -426,58 +426,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-06 16:15:46.086827231 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:15:46.462825367 +0000 -@@ -71,25 +71,25 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 80 -+ Max. Text Size: 70 - - Variable (string) entn2 - Attributes - Scope : local - Text : -- Max. Text Size: 80 -+ Max. Text Size: 70 - - Variable (string) entn3 - Attributes - Scope : local - Text : -- Max. Text Size: 80 -+ Max. Text Size: 70 - - Variable (string) entn4 - Attributes - Scope : local - Text : -- Max. Text Size: 80 -+ Max. Text Size: 70 - - Variable (string) type5 - Attributes -@@ -107,13 +107,13 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 80 -+ Max. Text Size: 50 - - Variable (string) entn6 - Attributes - Scope : local - Text : -- Max. Text Size: 80 -+ Max. Text Size: 50 - - Text tHeading - Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-06 16:15:46.086827231 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:15:46.462825367 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:21:34.358244142 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:21:34.742248790 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -496,43 +447,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:15:46.462825367 +0000 -@@ -59,8 +59,8 @@ - Variable (string) entn - Attributes - Scope : local -- Text : -- Max. Text Size: 80 -+ Text : newtxt -+ Max. Text Size: 50 - - Variable (int32) mode - Attributes diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:15:46.462825367 +0000 -@@ -46,8 +46,8 @@ - Variable (string) entn - Attributes - Scope : local -- Text : -- Max. Text Size: 80 -+ Text : newtxt -+ Max. Text Size: 50 - - Text tEntity - Attributes -@@ -127,7 +127,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text : -- Max. Text Size : 40 -+ Max. Text Size : 25 - - Picture p0 - Attributes +--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:21:34.358244142 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:21:34.738248741 +0000 @@ -157,7 +157,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 7db73be4..43d2b86b 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-06 16:15:46.478825287 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:15:46.086827231 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:15:46.462825367 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:15:46.086827231 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:15:46.466825347 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:21:34.826249806 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-06 16:21:34.354244093 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:21:34.738248741 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:21:34.358244142 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:21:34.742248790 +0000 +@@ -62,6 +62,16 @@ + vis bPrev,0 + vis bNext,0 @@ -24,94 +24,11 @@ + } + if(tInstruction.txt=="pageType") + { -+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:15:46.086827231 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:15:46.462825367 +0000 -+@@ -71,25 +71,25 @@ -+ Attributes -+ Scope : local -+ Text : -+- Max. Text Size: 80 -++ Max. Text Size: 70 -+ -+ Variable (string) entn2 -+ Attributes -+ Scope : local -+ Text : -+- Max. Text Size: 80 -++ Max. Text Size: 70 -+ -+ Variable (string) entn3 -+ Attributes -+ Scope : local -+ Text : -+- Max. Text Size: 80 -++ Max. Text Size: 70 -+ -+ Variable (string) entn4 -+ Attributes -+ Scope : local -+ Text : -+- Max. Text Size: 80 -++ Max. Text Size: 70 -+ -+ Variable (string) type5 -+ Attributes -+@@ -107,13 +107,13 @@ -+ Attributes -+ Scope : local -+ Text : -+- Max. Text Size: 80 -++ Max. Text Size: 50 -+ -+ Variable (string) entn6 -+ Attributes -+ Scope : local -+ Text : -+- Max. Text Size: 80 -++ Max. Text Size: 50 -+ -+ Text tHeading -+ Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:15:46.086827231 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:15:46.462825367 +0000 -+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:15:46.462825367 +0000 -+@@ -59,8 +59,8 @@ -+ Variable (string) entn -+ Attributes -+ Scope : local -+- Text : -+- Max. Text Size: 80 -++ Text : newtxt -++ Max. Text Size: 50 -+ -+ Variable (int32) mode -+ Attributes ++--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:21:34.358244142 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:21:34.742248790 +0000 +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:15:46.462825367 +0000 -+@@ -46,8 +46,8 @@ -+ Variable (string) entn -+ Attributes -+ Scope : local -+- Text : -+- Max. Text Size: 80 -++ Text : newtxt -++ Max. Text Size: 50 -+ -+ Text tEntity -+ Attributes -+@@ -127,7 +127,7 @@ -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+- Max. Text Size : 40 -++ Max. Text Size : 25 -+ -+ Picture p0 -+ Attributes ++--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:21:34.358244142 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:21:34.738248741 +0000 +@@ -157,7 +157,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index ebee2cfe..fdb5dba0 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -85,28 +85,28 @@ Variable (string) entn1 ID : 18 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn2 Attributes ID : 19 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn3 Attributes ID : 20 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn4 Attributes ID : 21 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) type5 Attributes @@ -127,14 +127,14 @@ Variable (string) entn5 ID : 36 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) entn6 Attributes ID : 37 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Text tHeading Attributes 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 8bce29d8..8036c7e6 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 @@ -18,6 +18,10 @@ popupShutter 20 Component(s) 193 Line(s) of event code 110 Unique line(s) of event code +cardGrid + 39 Component(s) + 420 Line(s) of event code + 246 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code @@ -26,10 +30,6 @@ screensaver 35 Component(s) 292 Line(s) of event code 235 Unique line(s) of event code -popupLight - 27 Component(s) - 341 Line(s) of event code - 185 Unique line(s) of event code cardMedia 30 Component(s) 331 Line(s) of event code @@ -38,10 +38,10 @@ cardAlarm 35 Component(s) 345 Line(s) of event code 216 Unique line(s) of event code -cardGrid - 39 Component(s) - 420 Line(s) of event code - 246 Unique line(s) of event code +popupLight + 27 Component(s) + 341 Line(s) of event code + 185 Unique line(s) of event code cardThermo 41 Component(s) 444 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index fa6f5224..834c48e6 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -69,8 +69,8 @@ Variable (string) entn Attributes ID : 21 Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Variable (int32) mode Attributes diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index 9b6efaf2..d7ce9af7 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -56,8 +56,8 @@ Variable (string) entn Attributes ID : 18 Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Text tEntity Attributes @@ -294,7 +294,7 @@ Text tInfo1 Vertical Alignment : center Input Type : character Text : - Max. Text Size : 25 + Max. Text Size : 40 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 24bca37b..75c6d368 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -71,25 +71,25 @@ Variable (string) entn1 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn2 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn3 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) entn4 Attributes Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 80 Variable (string) type5 Attributes @@ -107,13 +107,13 @@ Variable (string) entn5 Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) entn6 Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Text tHeading Attributes diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 5b79b13f..ad73166a 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -59,8 +59,8 @@ Variable (string) strCommand Variable (string) entn Attributes Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Variable (int32) mode Attributes diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 125147dd..21f0a336 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -46,8 +46,8 @@ Variable (string) strCommand Variable (string) entn Attributes Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Text tEntity Attributes @@ -127,7 +127,7 @@ Text tInfo1 Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 25 + Max. Text Size : 40 Picture p0 Attributes