From 516f51b803fe0ccdc5a4c86468ac0485ca11bc7b Mon Sep 17 00:00:00 2001 From: joBr99 Date: Thu, 31 Mar 2022 21:51:27 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 37 ++++++++++++++++++----- HMI/US/portrait/diff-eu-version.txt | 45 ++++++++++++++++++++-------- HMI/n2t-out-visual/nspanel_Stats.txt | 8 ++--- HMI/n2t-out-visual/pageIcons.txt | 2 +- HMI/n2t-out-visual/screensaver.txt | 2 +- HMI/n2t-out/pageIcons.txt | 2 +- HMI/n2t-out/screensaver.txt | 2 +- 7 files changed, 70 insertions(+), 28 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 7b17d90b..de267d56 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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:43:25.747084511 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:43:26.723167180 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:51:27.194798213 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt vis arm2,0 vis arm3,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 21:43:25.751084850 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:43:26.723167180 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:51:27.194798213 +0000 @@ -1125,33 +1125,6 @@ { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 @@ -47,8 +47,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-31 21:43:25.751084850 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:43:26.723167180 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:51:27.194798213 +0000 @@ -12,28 +12,307 @@ Events @@ -407,9 +407,21 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt // get Type spstr strCommand.txt,type1.txt,",",3 // get internal name +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt +--- HMI/n2t-out/pageIcons.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 21:51:27.194798213 +0000 +@@ -20,7 +20,7 @@ + Attributes + Scope : global + Text : +- Max. Text Size: 35 ++ Max. Text Size: 30 + + Text tIcons + Attributes diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-03-31 21:43:25.747084511 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:43:26.723167180 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:51:27.194798213 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event @@ -437,6 +449,15 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt Variable (string) strCommand Attributes +@@ -86,7 +106,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : Tuesday, 08. March 2022 +- Max. Text Size : 35 ++ Max. Text Size : 30 + + Text tSend + Attributes @@ -105,7 +125,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 06aaf431..2530f3ca 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-03-31 21:43:25.747084511 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 21:43:26.243126523 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 21:51:26.802801678 +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-03-31 21:43:25.751084850 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 21:43:26.243126523 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 21:51:26.806801643 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -781,8 +781,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-03-31 21:43:25.747084511 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 21:43:26.243126523 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 21:51:26.806801643 +0000 @@ -506,55 +506,28 @@ spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") @@ -866,8 +866,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt { vis t5,0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-31 21:43:25.751084850 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 21:43:26.243126523 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 21:51:26.806801643 +0000 @@ -643,53 +643,26 @@ spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") @@ -1195,9 +1195,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt // end of user code udelete payloadLength-1 bufferPos=0 +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt +--- HMI/n2t-out/pageIcons.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 21:51:26.802801678 +0000 +@@ -20,7 +20,7 @@ + Attributes + Scope : global + Text : +- Max. Text Size: 35 ++ Max. Text Size: 30 + + Text tIcons + Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-31 21:43:25.747084511 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 21:43:26.243126523 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 21:51:26.806801643 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1217,8 +1229,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-03-31 21:43:25.747084511 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 21:43:26.243126523 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-31 21:51:26.414805107 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 21:51:26.806801643 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event @@ -1246,6 +1258,15 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt Variable (string) strCommand Attributes +@@ -86,7 +106,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : Tuesday, 08. March 2022 +- Max. Text Size : 35 ++ Max. Text Size : 30 + + Text tSend + Attributes @@ -105,7 +125,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index f7b959f5..fefd1277 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -2,10 +2,6 @@ Program.s 0 Component(s) 11 Line(s) of event code 11 Unique line(s) of event code -pageIcons - 7 Component(s) - 0 Line(s) of event code - 0 Unique line(s) of event code pageTest 13 Component(s) 13 Line(s) of event code @@ -14,6 +10,10 @@ pageSerialTest 13 Component(s) 48 Line(s) of event code 43 Unique line(s) of event code +pageIcons + 7 Component(s) + 0 Line(s) of event code + 0 Unique line(s) of event code popupNotify 17 Component(s) 178 Line(s) of event code diff --git a/HMI/n2t-out-visual/pageIcons.txt b/HMI/n2t-out-visual/pageIcons.txt index a1864cf3..023e1247 100644 --- a/HMI/n2t-out-visual/pageIcons.txt +++ b/HMI/n2t-out-visual/pageIcons.txt @@ -30,7 +30,7 @@ Variable (string) vaDate ID : 6 Scope : global Text : - Max. Text Size: 30 + Max. Text Size: 35 Text tIcons Attributes diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 166cd04f..5866e161 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -174,7 +174,7 @@ Text tDate Vertical Alignment : center Input Type : character Text : Tuesday, 08. March 2022 - Max. Text Size : 30 + Max. Text Size : 35 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index 140ee77c..69e5a49f 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/n2t-out/pageIcons.txt @@ -20,7 +20,7 @@ Variable (string) vaDate Attributes Scope : global Text : - Max. Text Size: 30 + Max. Text Size: 35 Text tIcons Attributes diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index b29d0047..f7803de6 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -86,7 +86,7 @@ Text tDate Send Component ID : disabled Associated Keyboard : none Text : Tuesday, 08. March 2022 - Max. Text Size : 30 + Max. Text Size : 35 Text tSend Attributes