From 4ecef8e3d231ae120232327c8c903277f9f4ea0f Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Thu, 31 Mar 2022 18:35:25 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 23 +++++++++++---------- HMI/US/portrait/diff-eu-version.txt | 31 ++++++++++++++-------------- HMI/n2t-out-visual/cardThermo.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +++---- HMI/n2t-out/cardThermo.txt | 2 +- 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e54cc571..70005ae4 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 18:31:19.852564647 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:31:20.772581196 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:35:24.383440514 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:35:25.187449610 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -122,8 +122,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt { tmFlash.en=1 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 18:31:19.852564647 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:31:20.772581196 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:35:24.387440559 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:35:25.187449610 +0000 @@ -1120,33 +1120,6 @@ { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 @@ -159,8 +159,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 18:31:19.852564647 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:31:20.772581196 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:35:24.383440514 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:35:25.187449610 +0000 @@ -568,33 +568,6 @@ { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 @@ -196,8 +196,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-31 18:31:19.852564647 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 18:31:20.772581196 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:35:24.387440559 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 18:35:25.187449610 +0000 @@ -501,55 +501,28 @@ spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") @@ -281,8 +281,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt { vis t5,0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-31 18:31:19.852564647 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:31:20.772581196 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:35:24.383440514 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:35:25.187449610 +0000 @@ -638,53 +638,26 @@ spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") @@ -326,7 +326,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt + spstr strCommand.txt,tTmp.txt,",",3 covx tTmp.txt,xTempCurr.val,0,0 //dstTemp - spstr strCommand.txt,tTmp.txt,",",4 +- spstr strCommand.txt,tTmp.txt,",",5 ++ spstr strCommand.txt,tTmp.txt,",",4 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 463cd3d4..262029ae 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 18:31:19.852564647 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:31:20.312572922 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-31 18:35:24.383440514 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:35:24.787445085 +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-03-31 18:31:19.852564647 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:31:20.312572922 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:35:24.383440514 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:35:24.787445085 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -134,8 +134,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt { tmFlash.en=1 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 18:31:19.852564647 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:31:20.316572994 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:35:24.387440559 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:35:24.787445085 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -938,8 +938,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-03-31 18:31:19.852564647 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:31:20.312572922 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:35:24.383440514 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:35:24.787445085 +0000 @@ -568,33 +568,6 @@ { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 @@ -975,8 +975,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-31 18:31:19.852564647 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:31:20.312572922 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:35:24.387440559 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:35:24.787445085 +0000 @@ -501,55 +501,28 @@ spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") @@ -1060,8 +1060,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 18:31:19.852564647 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:31:20.312572922 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:35:24.383440514 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:35:24.787445085 +0000 @@ -638,53 +638,26 @@ spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") @@ -1105,7 +1105,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt + spstr strCommand.txt,tTmp.txt,",",3 covx tTmp.txt,xTempCurr.val,0,0 //dstTemp - spstr strCommand.txt,tTmp.txt,",",4 +- spstr strCommand.txt,tTmp.txt,",",5 ++ spstr strCommand.txt,tTmp.txt,",",4 covx tTmp.txt,xTempDest.val,0,0 //status - spstr strCommand.txt,tStatus.txt,",",6 @@ -1389,8 +1390,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-31 18:31:19.852564647 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:31:20.312572922 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 18:35:24.383440514 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:35:24.787445085 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 6727ec88..e4d5c924 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1226,7 +1226,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 fd46939d..5b76216b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -38,6 +38,10 @@ cardGrid 39 Component(s) 423 Line(s) of event code 245 Unique line(s) of event code +cardThermo + 41 Component(s) + 453 Line(s) of event code + 280 Unique line(s) of event code screensaver 29 Component(s) 182 Line(s) of event code @@ -46,10 +50,6 @@ cardEntities 62 Component(s) 965 Line(s) of event code 409 Unique line(s) of event code -cardThermo - 41 Component(s) - 453 Line(s) of event code - 279 Unique line(s) of event code cardMedia 30 Component(s) 326 Line(s) of event code diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 49cf034f..756130b4 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -673,7 +673,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