From 979c60918eeae9722bf6963853d50069cedd1ab2 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 27 May 2022 14:25:39 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 50 ++--------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 12 +-- .../landscape/n2t-out-visual/screensaver.txt | 11 +-- HMI/US/landscape/n2t-out/screensaver.txt | 11 +-- HMI/US/portrait/diff-eu-version.txt | 20 ++--- HMI/US/portrait/diff-filtered.txt | 84 +++---------------- 6 files changed, 45 insertions(+), 143 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 6347d23c..dfa93a34 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-24 14:34:13.723678266 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-24 14:34:14.623688759 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 14:25:38.476109147 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 14:25:39.344117744 +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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-24 14:34:13.723678266 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-24 14:34:14.627688805 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-27 14:25:38.480109187 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 14:25:39.344117744 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-24 14:34:13.723678266 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-24 14:34:14.627688805 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:25:38.476109147 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 14:25:39.344117744 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -32,41 +32,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-24 14:34:13.723678266 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-24 14:34:14.627688805 +0000 -@@ -468,9 +468,6 @@ - tF4Icon.txt=tF3Icon.txt - tF3Icon.txt=tF2Icon.txt - tF2Icon.txt=tF1Icon.txt -- tF4Icon.pco=tF3Icon.pco -- tF3Icon.pco=tF2Icon.pco -- tF2Icon.pco=tF1Icon.pco - } - //tMR - spstr strCommand.txt,tMR.txt,"~",16 -@@ -509,10 +506,8 @@ - covx tTmp.txt,tDate.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,tMainIcon.pco,0,0 -- tMainIconAlt.pco=tMainIcon.pco - spstr strCommand.txt,tTmp.txt,"~",6 - covx tTmp.txt,tMainText.pco,0,0 -- tMainTextAlt.pco=tMainText.pco - spstr strCommand.txt,tTmp.txt,"~",7 - covx tTmp.txt,tForecast1.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",8 -@@ -540,8 +535,12 @@ - spstr strCommand.txt,tTmp.txt,"~",19 - covx tTmp.txt,t10.bco,0,0 - spstr strCommand.txt,tTmp.txt,"~",20 -- covx tTmp.txt,tMRIcon.pco,0,0 -+ covx tTmp.txt,tMainIconAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 -+ covx tTmp.txt,tMainTextAlt.pco,0,0 -+ spstr strCommand.txt,tTmp.txt,"~",22 -+ covx tTmp.txt,tMRIcon.pco,0,0 -+ spstr strCommand.txt,tTmp.txt,"~",23 - covx tTmp.txt,tMR.pco,0,0 - } - if(tInstruction.txt=="notify") 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 5c0fc908..a2b0e7a0 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 @@ -18,10 +18,6 @@ pageStartup 19 Component(s) 154 Line(s) of event code 115 Unique line(s) of event code -screensaver - 35 Component(s) - 296 Line(s) of event code - 237 Unique line(s) of event code cardAlarm 38 Component(s) 364 Line(s) of event code @@ -50,6 +46,10 @@ cardQR 30 Component(s) 363 Line(s) of event code 207 Unique line(s) of event code +screensaver + 35 Component(s) + 297 Line(s) of event code + 238 Unique line(s) of event code cardEntities 65 Component(s) 1133 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 402 Component(s) - 4458 Line(s) of event code - 1167 Unique line(s) of event code + 4459 Line(s) of event code + 1168 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index b3756ba7..d7bc5566 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -992,6 +992,9 @@ Timer tmSerial tF4Icon.txt=tF3Icon.txt tF3Icon.txt=tF2Icon.txt tF2Icon.txt=tF1Icon.txt + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco } //tMR spstr strCommand.txt,tMR.txt,"~",16 @@ -1030,8 +1033,10 @@ Timer tmSerial covx tTmp.txt,tDate.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,tMainIcon.pco,0,0 + tMainIconAlt.pco=tMainIcon.pco spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tMainText.pco,0,0 + tMainTextAlt.pco=tMainText.pco spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,tForecast1.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",8 @@ -1059,12 +1064,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMainIconAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMainTextAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 } if(tInstruction.txt=="notify") diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 48a71dd0..04c7b2c5 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -468,6 +468,9 @@ Timer tmSerial tF4Icon.txt=tF3Icon.txt tF3Icon.txt=tF2Icon.txt tF2Icon.txt=tF1Icon.txt + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco } //tMR spstr strCommand.txt,tMR.txt,"~",16 @@ -506,8 +509,10 @@ Timer tmSerial covx tTmp.txt,tDate.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,tMainIcon.pco,0,0 + tMainIconAlt.pco=tMainIcon.pco spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tMainText.pco,0,0 + tMainTextAlt.pco=tMainText.pco spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,tForecast1.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",8 @@ -535,12 +540,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMainIconAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMainTextAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 } if(tInstruction.txt=="notify") diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index af11a2ff..4638aa53 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-24 14:34:13.723678266 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-24 14:34:14.167683442 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 14:25:38.476109147 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:25:38.884113188 +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-24 14:34:13.723678266 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-24 14:34:14.171683489 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-27 14:25:38.480109187 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:25:38.888113228 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ 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-05-24 14:34:13.723678266 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-24 14:34:14.167683442 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-27 14:25:38.480109187 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:25:38.888113228 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-24 14:34:13.723678266 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-24 14:34:14.167683442 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:25:38.476109147 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:25:38.888113228 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -501,8 +501,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-05-24 14:34:13.723678266 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-24 14:34:14.167683442 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-27 14:25:38.480109187 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:25:38.888113228 +0000 @@ -455,22 +455,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index c7c92c90..f7b29cb1 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,73 +1,11 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-24 14:34:14.183683629 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-24 14:34:13.723678266 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-24 14:34:14.167683442 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-24 14:34:13.723678266 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-24 14:34:14.171683489 +0000 -+ Hotspot mSwipeNext -+ Scope : local -+@@ -1892,6 +2120,169 @@ -++ // up button -++ spstr tId.txt,tTmp.txt,"|",3 -++ if(tTmp.txt=="disable") -++ spstr tId.txt,bUp5.txt,"|",0 -++ }else if(tTmp.txt=="enable") -++ spstr tId.txt,bUp5.txt,"|",0 -++ // stop button -++ spstr tId.txt,tTmp.txt,"|",4 -++ if(tTmp.txt=="disable") -++ { -++ bStop5.pco=27501 -++ spstr tId.txt,bStop5.txt,"|",1 -++ tsw bStop5,0 -++ }else if(tTmp.txt=="enable") -++ { -++ bStop5.pco=65535 -++ spstr tId.txt,bStop5.txt,"|",1 -++ tsw bStop5,1 -++ } -++ // down button -++ spstr tId.txt,tTmp.txt,"|",5 -++ if(tTmp.txt=="disable") -++ spstr tId.txt,bDown5.txt,"|",2 -++ }else if(tTmp.txt=="enable") -++ spstr tId.txt,bDown5.txt,"|",2 -+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt -+--- HMI/n2t-out/cardQR.txt 2022-05-24 14:34:13.723678266 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-24 14:34:14.167683442 +0000 -+@@ -34,7 +34,7 @@ -+ Attributes -+ Scope : local -+ Text : -+- Max. Text Size: 275 -++ Max. Text Size: 270 -+ -+ Variable (string) entn -+ Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-24 14:34:13.723678266 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-24 14:34:14.167683442 +0000 -+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-05-24 14:34:13.723678266 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-24 14:34:14.167683442 +0000 -+@@ -455,22 +455,6 @@ -+ vis tMainIconAlt,1 -+ vis tMRIcon,1 -+ vis tMR,1 -+- vis tForecast1,0 -+- vis tF1Icon,0 -+- vis tForecast1Val,0 -+- //move forecast values to the right -+- tForecast4.txt=tForecast3.txt -+- tForecast3.txt=tForecast2.txt -+- tForecast2.txt=tForecast1.txt -+- tForecast4Val.txt=tForecast3Val.txt -+- tForecast3Val.txt=tForecast2Val.txt -+- tForecast2Val.txt=tForecast1Val.txt -+- tF4Icon.txt=tF3Icon.txt -+- tF3Icon.txt=tF2Icon.txt -+- tF2Icon.txt=tF1Icon.txt -+- tF4Icon.pco=tF3Icon.pco -+- tF3Icon.pco=tF2Icon.pco -+- tF2Icon.pco=tF1Icon.pco -+ } -+ //tMR -+ spstr strCommand.txt,tMR.txt,"~",16 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 14:25:38.900113346 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-27 14:25:38.476109147 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:25:38.884113188 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-27 14:25:38.480109187 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:25:38.888113228 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-27 14:25:38.480109187 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:25:38.888113228 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:25:38.476109147 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:25:38.888113228 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-27 14:25:38.480109187 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:25:38.888113228 +0000