From 9e1b6044f566c49ff252610c0a22ae21b08c397d Mon Sep 17 00:00:00 2001 From: joBr99 Date: Tue, 5 Apr 2022 20:30:08 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +-- .../landscape/n2t-out-visual/cardThermo.txt | 2 +- .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 +-- HMI/US/landscape/n2t-out/cardThermo.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 53 ++++++++----------- HMI/n2t-out-visual/cardThermo.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 2 +- HMI/n2t-out/cardThermo.txt | 2 +- 8 files changed, 35 insertions(+), 44 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 63443b55..98c8720b 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-04 21:26:08.660575169 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-04 21:26:09.652584145 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-05 20:30:06.540918537 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-05 20:30:07.536951384 +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-04 21:26:08.660575169 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-04 21:26:09.652584145 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-05 20:30:07.536951384 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 1c2cfd1f..b7c35f3d 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -1233,7 +1233,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,xTempCurr.val,0,0 //dstTemp - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,xTempDest.val,0,0 //status spstr strCommand.txt,tStatus.txt,"~",6 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 2635c4e6..e83ff091 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,10 +10,6 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -cardThermo - 41 Component(s) - 442 Line(s) of event code - 245 Unique line(s) of event code popupNotify 17 Component(s) 178 Line(s) of event code @@ -42,6 +38,10 @@ cardGrid 39 Component(s) 418 Line(s) of event code 243 Unique line(s) of event code +cardThermo + 41 Component(s) + 442 Line(s) of event code + 246 Unique line(s) of event code screensaver 33 Component(s) 195 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index aa38f638..e019043b 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -680,7 +680,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,xTempCurr.val,0,0 //dstTemp - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,xTempDest.val,0,0 //status spstr strCommand.txt,tStatus.txt,"~",6 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 35ae1b22..30fb9a53 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-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-04 21:26:09.160579693 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-05 20:30:06.540918537 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-05 20:30:07.032935506 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-04 21:26:09.160579693 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-05 20:30:07.036935643 +0000 @@ -113,7 +113,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -34,8 +34,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,sys0,0,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-04 21:26:09.160579693 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-05 20:30:07.036935643 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -848,8 +848,8 @@ 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-04-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-04 21:26:09.160579693 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-05 20:30:07.036935643 +0000 @@ -613,7 +613,9 @@ }else { @@ -917,8 +917,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt // change icon color spstr strCommand.txt,tTmp.txt,"~",36 diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-04 21:26:09.160579693 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-05 20:30:07.036935643 +0000 @@ -540,7 +540,9 @@ //entity name spstr strCommand.txt,entn.txt,"~",3 @@ -942,17 +942,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt spstr strCommand.txt,tSpeaker.txt,"~",9 if(tSpeaker.txt!="") diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-04 21:26:09.160579693 +0000 -@@ -680,7 +680,7 @@ - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,xTempCurr.val,0,0 - //dstTemp -- spstr strCommand.txt,tTmp.txt,"~",4 -+ spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 - //status - spstr strCommand.txt,tStatus.txt,"~",6 +--- HMI/n2t-out/cardThermo.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-05 20:30:07.036935643 +0000 @@ -704,9 +704,12 @@ vis bt7,0 vis bt8,0 @@ -1121,8 +1112,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt spstr strCommand.txt,tTmp.txt,"~",43 covx tTmp.txt,bt8.pco2,0,0 diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-04 21:26:09.160579693 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-05 20:30:07.032935506 +0000 @@ -22,6 +22,16 @@ Text : Max. Text Size: 35 @@ -1142,8 +1133,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Scope : global Only in HMI/US/portrait/n2t-out: pageSerialTest.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-04 21:26:09.160579693 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-05 20:30:07.032935506 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1172,8 +1163,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-04-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-04-04 21:26:09.160579693 +0000 +--- HMI/n2t-out/pageTest.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-04-05 20:30:07.032935506 +0000 @@ -35,6 +35,20 @@ Touch Press Event page cardEntities @@ -1214,8 +1205,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt - bauds=115200 - diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-04 21:26:09.160579693 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-05 20:30:07.032935506 +0000 @@ -442,7 +442,9 @@ if(tInstruction.txt=="entityUpdateDetail") { @@ -1228,8 +1219,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt // change icon color spstr strCommand.txt,tTmp.txt,"~",2 diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-04 21:26:08.660575169 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-04 21:26:09.160579693 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-05 20:30:06.544918675 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-05 20:30:07.032935506 +0000 @@ -48,6 +48,26 @@ Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 61ab9377..c1236bac 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1233,7 +1233,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,xTempCurr.val,0,0 //dstTemp - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,xTempDest.val,0,0 //status spstr strCommand.txt,tStatus.txt,"~",6 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index d6d06acb..ce5d98c2 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -45,7 +45,7 @@ cardAlarm cardThermo 41 Component(s) 442 Line(s) of event code - 245 Unique line(s) of event code + 246 Unique line(s) of event code cardEntities 62 Component(s) 964 Line(s) of event code diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index aa38f638..e019043b 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -680,7 +680,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,xTempCurr.val,0,0 //dstTemp - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,xTempDest.val,0,0 //status spstr strCommand.txt,tStatus.txt,"~",6