From 660007f1883f36430de8ed3571ff70a914a38d2a Mon Sep 17 00:00:00 2001 From: joBr99 Date: Fri, 15 Apr 2022 16:21:25 +0000 Subject: [PATCH] bump version (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 16 ++++++++-------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 ++++---- HMI/US/landscape/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/landscape/n2t-out/pageStartup.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 12 ++++++------ HMI/US/portrait/diff-filtered.txt | 14 +++++++------- HMI/US/portrait/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/portrait/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 8 ++++---- HMI/n2t-out-visual/pageStartup.txt | 2 +- HMI/n2t-out/pageStartup.txt | 2 +- 11 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 e8062102..ea0692ec 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-04-13 20:21:34.698226402 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 20:21:35.478242275 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-15 16:21:24.696789846 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-15 16:21:25.464799585 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,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-04-13 20:21:34.698226402 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:21:35.478242275 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-15 16:21:24.696789846 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-15 16:21:25.464799585 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -23,8 +23,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-04-13 20:21:34.698226402 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:21:35.478242275 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-15 16:21:24.696789846 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-15 16:21:25.464799585 +0000 @@ -570,43 +570,25 @@ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 @@ -76,8 +76,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tId.txt=="cardAlarm") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-13 20:21:34.698226402 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:21:35.478242275 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-15 16:21:24.696789846 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-15 16:21:25.464799585 +0000 @@ -48,18 +48,6 @@ Scope: local Value: 0 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 925d0c5f..cef12589 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,6 +10,10 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code cardMedia 30 Component(s) 329 Line(s) of event code @@ -18,10 +22,6 @@ popupNotify 17 Component(s) 196 Line(s) of event code 123 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code cardAlarm 35 Component(s) 343 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 6486aece..0a0f9aff 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 31 + Text : 32 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 1c3ddd44..7967ce9a 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 31 + Text : 32 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index f3716bb2..154a8027 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-04-13 20:21:34.698226402 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:21:35.070233972 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-15 16:21:24.696789846 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-15 16:21:25.032794102 +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-04-13 20:21:34.698226402 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:21:35.070233972 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-15 16:21:24.696789846 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-15 16:21:25.032794102 +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-04-13 20:21:34.698226402 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:21:35.070233972 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-15 16:21:24.696789846 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-15 16:21:25.032794102 +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 0f7e0f51..a1fd52af 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-04-13 20:21:35.094234461 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-13 20:21:34.698226402 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:21:35.070233972 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:21:34.698226402 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:21:35.070233972 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-15 16:21:25.068794558 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-15 16:21:24.696789846 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-15 16:21:25.032794102 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-15 16:21:24.696789846 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-15 16:21:25.032794102 +0000 +@@ -62,6 +62,16 @@ +@@ -117,6 +127,18 @@ +@@ -153,6 +175,15 @@ @@ -15,5 +15,5 @@ + } + if(tInstruction.txt=="pageType") + { -+--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:21:34.698226402 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:21:35.070233972 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-15 16:21:24.696789846 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-15 16:21:25.032794102 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index 481fddc1..ac4102a5 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 31 + Text : 32 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index c6aeb067..4be017c7 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 31 + Text : 32 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 1be6aa3f..ea4d736e 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,10 +10,6 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code popupLight 27 Component(s) 338 Line(s) of event code @@ -26,6 +22,10 @@ popupNotify 17 Component(s) 196 Line(s) of event code 123 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code cardMedia 30 Component(s) 329 Line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 366c8e54..c1e9b71e 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 31 + Text : 32 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index e38b210c..b8a4c0bb 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 31 + Text : 32 Max. Text Size : 10 Picture p0