From 49fa3f1a0b9fe690f20f4e5210478fc8490aad33 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Tue, 12 Apr 2022 16:30:15 +0000 Subject: [PATCH] bump firmware version for next release (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +++--- .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 +++--- .../landscape/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/landscape/n2t-out/pageStartup.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 25 +++++++++++------ HMI/US/portrait/diff-filtered.txt | 27 ++++++++++++------- HMI/n2t-out-visual/pageStartup.txt | 2 +- HMI/n2t-out/pageStartup.txt | 2 +- 8 files changed, 47 insertions(+), 29 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 937a1bc9..ba19c01f 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-12 16:20:51.221116465 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 16:20:51.993105924 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-12 16:30:13.108641053 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 16:30:14.224656021 +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-12 16:20:51.221116465 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 16:20:51.997105870 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:30:13.108641053 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 16:30:14.224656021 +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 3603ae3b..1d753a2e 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 @@ -22,14 +22,14 @@ popupNotify 17 Component(s) 178 Line(s) of event code 117 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code popupShutter 19 Component(s) 178 Line(s) of event code 101 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) 320 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 8d048107..6486aece 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 : 30 + Text : 31 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 3213c10e..1c3ddd44 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 : 30 + Text : 31 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 3c5b87ae..8b13d0d6 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-12 16:20:51.221116465 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:20:51.597111331 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-12 16:30:13.108641053 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:30:13.624647974 +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-12 16:20:51.221116465 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:20:51.597111331 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-12 16:30:13.108641053 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:30:13.624647974 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -463,8 +463,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-12 16:20:51.221116465 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:20:51.597111331 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:30:13.108641053 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:30:13.624647974 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -474,6 +474,15 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt Max. Text Size : 100 Text tVersion +@@ -152,7 +152,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : 31 ++ Text : 30 + Max. Text Size : 10 + + Picture p0 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -484,8 +493,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-04-12 16:20:51.221116465 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:20:51.597111331 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-12 16:30:13.108641053 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:30:13.624647974 +0000 @@ -48,6 +48,26 @@ Scope: local Value: 0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 7f10a8bc..7bcb2dea 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-12 16:20:51.613111113 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-12 16:20:51.221116465 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:20:51.597111331 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-04-12 16:20:51.221116465 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:20:51.597111331 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 16:30:13.640648189 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-12 16:30:13.108641053 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:30:13.624647974 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-12 16:30:13.108641053 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:30:13.624647974 +0000 +@@ -62,6 +62,16 @@ +@@ -117,6 +127,18 @@ +@@ -153,6 +175,15 @@ @@ -49,11 +49,20 @@ +@@ -967,6 +1146,33 @@ +@@ -1072,6 +1278,28 @@ +@@ -1642,6 +1870,128 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:20:51.221116465 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:20:51.597111331 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:30:13.108641053 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:30:13.624647974 +0000 ++@@ -152,7 +152,7 @@ ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++- Text : 31 +++ Text : 30 ++ Max. Text Size : 10 ++ ++ Picture p0 +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-12 16:20:51.221116465 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:20:51.597111331 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-12 16:30:13.108641053 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:30:13.624647974 +0000 +@@ -48,6 +48,26 @@ + Scope: local + Value: 0 diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 6497f009..366c8e54 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 : 30 + Text : 31 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 b7d57b3f..e38b210c 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 : 30 + Text : 31 Max. Text Size : 10 Picture p0