From 1c5a8fb321f8f3e0e3c183f5388afdf1a952e497 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sat, 14 May 2022 14:51:21 +0000 Subject: [PATCH] fix tmep (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 30 ++++++++++++++-------------- HMI/US/portrait/diff-eu-version.txt | 22 ++++++++++---------- HMI/US/portrait/diff-filtered.txt | 24 +++++++++++----------- HMI/n2t-out-visual/cardThermo.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 8 ++++---- HMI/n2t-out/cardThermo.txt | 2 +- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e57192aa..08421e10 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-14 14:37:58.882388573 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 14:37:59.678399277 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-14 14:51:20.255641436 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 14:51:21.091644277 +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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:37:58.882388573 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 14:37:59.678399277 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:51:20.259641424 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 14:51:21.091644277 +0000 @@ -466,90 +466,6 @@ prints crcval,2 tCode.txt="" @@ -103,8 +103,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt Attributes Scope : local diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-14 14:37:58.882388573 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 14:37:59.678399277 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-14 14:51:20.259641424 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 14:51:21.091644277 +0000 @@ -1074,90 +1074,6 @@ page popupLight } @@ -197,8 +197,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt Attributes Scope : local diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-14 14:37:58.882388573 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 14:37:59.678399277 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-14 14:51:20.259641424 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 14:51:21.091644277 +0000 @@ -522,90 +522,6 @@ page pageTest } @@ -291,8 +291,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt Attributes Scope : local diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-14 14:37:58.882388573 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 14:37:59.678399277 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-14 14:51:20.255641436 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 14:51:21.091644277 +0000 @@ -223,7 +223,7 @@ Events @@ -403,8 +403,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt Attributes Scope : local diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-14 14:37:58.882388573 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 14:37:59.678399277 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-14 14:51:20.259641424 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 14:51:21.091644277 +0000 @@ -17,12 +17,9 @@ vis tInstruction,0 vis tTmp,0 @@ -1022,7 +1022,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest1.val,0,0 -- xTempDest1.val=xTempDest.val +- xTempDest.val=xTempDest1.val + covx tTmp.txt,xTempDest.val,0,0 //status spstr strCommand.txt,tStatus.txt,"~",6 @@ -1078,8 +1078,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-14 14:37:58.882388573 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 14:37:59.678399277 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-14 14:51:20.255641436 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 14:51:21.091644277 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 1f48a09a..51f05c69 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-14 14:37:58.882388573 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:37:59.270393790 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-14 14:51:20.255641436 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:51:20.647641526 +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-05-14 14:37:58.882388573 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:37:59.274393844 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:51:20.259641424 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:51:20.647641526 +0000 @@ -466,7 +466,7 @@ prints crcval,2 tCode.txt="" @@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt click bPrev,1 } diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-14 14:37:58.882388573 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:37:59.274393844 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-14 14:51:20.259641424 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:51:20.651641551 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-14 14:37:58.882388573 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:37:59.274393844 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-14 14:51:20.259641424 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:51:20.651641551 +0000 @@ -17,12 +17,9 @@ vis tInstruction,0 vis tTmp,0 @@ -1155,7 +1155,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest1.val,0,0 -- xTempDest1.val=xTempDest.val +- xTempDest.val=xTempDest1.val + covx tTmp.txt,xTempDest.val,0,0 //status spstr strCommand.txt,tStatus.txt,"~",6 @@ -1211,8 +1211,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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-05-14 14:37:58.882388573 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:37:59.274393844 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-14 14:51:20.255641436 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:51:20.647641526 +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 5a5513ff..00fe8720 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 14:37:59.286394006 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-14 14:37:58.882388573 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:37:59.270393790 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 14:51:20.695641824 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-14 14:51:20.255641436 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:51:20.647641526 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:37:58.882388573 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:37:59.274393844 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:51:20.259641424 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:51:20.647641526 +0000 +@@ -466,7 +466,7 @@ + prints crcval,2 + tCode.txt="" @@ -67,14 +67,14 @@ + { + click bPrev,1 + } -+--- HMI/n2t-out/cardEntities.txt 2022-05-14 14:37:58.882388573 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:37:59.274393844 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-14 14:51:20.259641424 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:51:20.651641551 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1728,6 +1956,128 @@ +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-14 14:37:58.882388573 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:37:59.274393844 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-14 14:51:20.259641424 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:51:20.651641551 +0000 +@@ -17,12 +17,9 @@ + vis tInstruction,0 + vis tTmp,0 @@ -735,7 +735,7 @@ + //dstTemp + spstr strCommand.txt,tTmp.txt,"~",5 +- covx tTmp.txt,xTempDest1.val,0,0 -+- xTempDest1.val=xTempDest.val ++- xTempDest.val=xTempDest1.val ++ covx tTmp.txt,xTempDest.val,0,0 + //status + spstr strCommand.txt,tStatus.txt,"~",6 @@ -790,8 +790,8 @@ + } + if(tInstruction.txt=="pageType") + { -+--- HMI/n2t-out/pageStartup.txt 2022-05-14 14:37:58.882388573 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:37:59.274393844 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-14 14:51:20.255641436 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:51:20.647641526 +0000 +@@ -351,7 +351,7 @@ + + Events diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 9623c754..ee7b87d2 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1750,7 +1750,7 @@ Timer tmSerial //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,xTempDest1.val,0,0 - xTempDest1.val=xTempDest.val + xTempDest.val=xTempDest1.val //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 7152b134..d13acf88 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -34,10 +34,6 @@ popupLight 27 Component(s) 341 Line(s) of event code 185 Unique line(s) of event code -cardThermo - 56 Component(s) - 523 Line(s) of event code - 269 Unique line(s) of event code cardGrid 42 Component(s) 435 Line(s) of event code @@ -46,6 +42,10 @@ cardAlarm 38 Component(s) 360 Line(s) of event code 222 Unique line(s) of event code +cardThermo + 56 Component(s) + 523 Line(s) of event code + 269 Unique line(s) of event code cardEntities 65 Component(s) 981 Line(s) of event code diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index b453d3fd..0e7dee5e 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -968,7 +968,7 @@ Timer tmSerial //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,xTempDest1.val,0,0 - xTempDest1.val=xTempDest.val + xTempDest.val=xTempDest1.val //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp