From 9ac2a9830537323bd3deebf8a680163a18a23d22 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 14 May 2022 15:34:36 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 114 ++++++++++++++++----------- HMI/US/portrait/diff-eu-version.txt | 84 ++++++++++++-------- HMI/US/portrait/diff-filtered.txt | 86 ++++++++++++-------- HMI/n2t-out-visual/cardThermo.txt | 36 +++++++-- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +- HMI/n2t-out/cardThermo.txt | 36 +++++++-- 6 files changed, 237 insertions(+), 127 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 08421e10..b25846aa 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:51:20.255641436 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 14:51:21.091644277 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 15:34:35.634269489 +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:51:20.259641424 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 14:51:21.091644277 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 15:34:35.634269489 +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:51:20.259641424 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 14:51:21.091644277 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 15:34:35.634269489 +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:51:20.259641424 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 14:51:21.091644277 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 15:34:35.634269489 +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:51:20.255641436 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 14:51:21.091644277 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 15:34:35.634269489 +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:51:20.259641424 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 14:51:21.091644277 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 15:34:35.634269489 +0000 @@ -17,12 +17,9 @@ vis tInstruction,0 vis tTmp,0 @@ -425,11 +425,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt vis bt5,0 vis bt6,0 vis bt7,0 -- vis t0,0 +- vis tCF2,0 - vis bUp2,0 - vis bDown2,0 - vis xTempDest2,0 -- vis t2,0 +- vis tCF1,0 - vis btUp1,0 - vis btDown1,0 - vis xTempDest1,0 @@ -568,10 +568,20 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt Text tHeading Attributes -@@ -248,56 +215,6 @@ - Text :  +@@ -238,57 +205,7 @@ + Text : Max. Text Size : 10 +-Text tCF1 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text :  +- Max. Text Size : 10 +- -Text tCurTempLbl - Attributes - Scope : local @@ -592,7 +602,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt - Text : State - Max. Text Size : 30 - --Text t0 +-Text tCF2 - Attributes - Scope : local - Dragging : 0 @@ -612,19 +622,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt - Text : Action - Max. Text Size : 30 - --Text t1 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text :  -- Max. Text Size : 10 -- - Picture p0 +-Text tCF ++Text t2 Attributes Scope : local + Dragging : 0 @@ -389,7 +306,7 @@ prints tSend.txt,0 prints crcval,2 @@ -745,12 +747,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt prints crcval,2 -Dual-state Button btUp1 -+Dual-state Button bt8 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled - State : unpressed - Text :  - Max. Text Size : 10 @@ -782,11 +783,12 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt - prints crcval,2 - -Dual-state Button btDown1 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled ++Dual-state Button bt8 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled - State : unpressed - Text :  - Max. Text Size : 10 @@ -837,7 +839,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," -- tSend.txt+="tempUpd," +- tSend.txt+="tempUpd2," - //convert temperature - covx xTempDest2.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt @@ -875,7 +877,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," -- tSend.txt+="tempUpd," +- tSend.txt+="tempUpd2," - //convert temperature - covx xTempDest2.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt @@ -1049,7 +1051,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt //bt0 spstr strCommand.txt,bt0.txt,"~",10 if(bt0.txt!="") -@@ -1109,12 +825,21 @@ +@@ -1109,33 +825,20 @@ //enable vis bt7,1 } @@ -1059,6 +1061,27 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt - spstr strCommand.txt,tStateLbl.txt,"~",43 - //Text tALbl - spstr strCommand.txt,tALbl.txt,"~",44 +- //Text tCF +- spstr strCommand.txt,tCF.txt,"~",45 +- tCF1.txt=tCF.txt +- tCF2.txt=tCF.txt +- //Second Temperature +- spstr strCommand.txt,tTmp.txt,"~",46 +- if(tTmp.txt!="") +- { +- covx tTmp.txt,xTempDest2.val,0,0 +- vis btUp,0 +- vis xTempDest,0 +- vis btDown,0 +- vis tCF,0 +- vis btUp1,1 +- vis xTempDest1,1 +- vis btDown1,1 +- vis tCF1,1 +- vis bUp2,1 +- vis xTempDest2,1 +- vis bDown2,1 +- vis tCF2,1 + //bt8 + spstr strCommand.txt,bt8.txt,"~",42 + if(bt8.txt!="") @@ -1073,13 +1096,12 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt + spstr strCommand.txt,va8.txt,"~",45 + //enable + vis bt8,1 -+ } + } } 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:51:20.255641436 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 14:51:21.091644277 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 15:34:35.634269489 +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 51f05c69..fbd13b9c 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:51:20.255641436 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:51:20.647641526 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 15:34:35.170263783 +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:51:20.259641424 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:51:20.647641526 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 15:34:35.170263783 +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:51:20.259641424 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:51:20.651641551 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 15:34:35.170263783 +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:51:20.259641424 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:51:20.651641551 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 15:34:35.170263783 +0000 @@ -17,12 +17,9 @@ vis tInstruction,0 vis tTmp,0 @@ -515,11 +515,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt vis bt5,0 vis bt6,0 vis bt7,0 -- vis t0,0 +- vis tCF2,0 - vis bUp2,0 - vis bDown2,0 - vis xTempDest2,0 -- vis t2,0 +- vis tCF1,0 - vis btUp1,0 - vis btDown1,0 - vis xTempDest1,0 @@ -658,10 +658,20 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Text tHeading Attributes -@@ -248,56 +215,6 @@ - Text :  +@@ -238,57 +205,7 @@ + Text : Max. Text Size : 10 +-Text tCF1 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text :  +- Max. Text Size : 10 +- -Text tCurTempLbl - Attributes - Scope : local @@ -682,7 +692,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt - Text : State - Max. Text Size : 30 - --Text t0 +-Text tCF2 - Attributes - Scope : local - Dragging : 0 @@ -702,19 +712,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt - Text : Action - Max. Text Size : 30 - --Text t1 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text :  -- Max. Text Size : 10 -- - Picture p0 +-Text tCF ++Text t2 Attributes Scope : local + Dragging : 0 @@ -330,26 +247,30 @@ prints tSend.txt,0 prints crcval,2 @@ -1034,7 +1036,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," -- tSend.txt+="tempUpd," +- tSend.txt+="tempUpd2," - //convert temperature - covx xTempDest2.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt @@ -1069,7 +1071,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," -- tSend.txt+="tempUpd," +- tSend.txt+="tempUpd2," - //convert temperature - covx xTempDest2.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt @@ -1182,7 +1184,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //bt0 spstr strCommand.txt,bt0.txt,"~",10 if(bt0.txt!="") -@@ -1109,12 +909,21 @@ +@@ -1109,33 +909,20 @@ //enable vis bt7,1 } @@ -1192,6 +1194,27 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt - spstr strCommand.txt,tStateLbl.txt,"~",43 - //Text tALbl - spstr strCommand.txt,tALbl.txt,"~",44 +- //Text tCF +- spstr strCommand.txt,tCF.txt,"~",45 +- tCF1.txt=tCF.txt +- tCF2.txt=tCF.txt +- //Second Temperature +- spstr strCommand.txt,tTmp.txt,"~",46 +- if(tTmp.txt!="") +- { +- covx tTmp.txt,xTempDest2.val,0,0 +- vis btUp,0 +- vis xTempDest,0 +- vis btDown,0 +- vis tCF,0 +- vis btUp1,1 +- vis xTempDest1,1 +- vis btDown1,1 +- vis tCF1,1 +- vis bUp2,1 +- vis xTempDest2,1 +- vis bDown2,1 +- vis tCF2,1 + //bt8 + spstr strCommand.txt,bt8.txt,"~",42 + if(bt8.txt!="") @@ -1206,13 +1229,12 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt + spstr strCommand.txt,va8.txt,"~",45 + //enable + vis bt8,1 -+ } + } } 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:51:20.255641436 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:51:20.647641526 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-14 15:34:34.762258765 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 15:34:35.170263783 +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 00fe8720..b1b96d4c 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: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 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 15:34:35.238264619 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-14 15:34:34.762258765 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 15:34:35.170263783 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- 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 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-14 15:34:34.762258765 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 15:34:35.170263783 +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:51:20.259641424 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:51:20.651641551 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-14 15:34:34.762258765 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 15:34:35.170263783 +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:51:20.259641424 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:51:20.651641551 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-14 15:34:34.762258765 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 15:34:35.170263783 +0000 +@@ -17,12 +17,9 @@ + vis tInstruction,0 + vis tTmp,0 @@ -95,11 +95,11 @@ + vis bt5,0 + vis bt6,0 + vis bt7,0 -+- vis t0,0 ++- vis tCF2,0 +- vis bUp2,0 +- vis bDown2,0 +- vis xTempDest2,0 -+- vis t2,0 ++- vis tCF1,0 +- vis btUp1,0 +- vis btDown1,0 +- vis xTempDest1,0 @@ -238,10 +238,20 @@ + + Text tHeading + Attributes -+@@ -248,56 +215,6 @@ -+ Text :  ++@@ -238,57 +205,7 @@ ++ Text : + Max. Text Size : 10 + ++-Text tCF1 ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Text :  ++- Max. Text Size : 10 ++- +-Text tCurTempLbl +- Attributes +- Scope : local @@ -262,7 +272,7 @@ +- Text : State +- Max. Text Size : 30 +- -+-Text t0 ++-Text tCF2 +- Attributes +- Scope : local +- Dragging : 0 @@ -282,19 +292,11 @@ +- Text : Action +- Max. Text Size : 30 +- -+-Text t1 -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- Associated Keyboard : none -+- Text :  -+- Max. Text Size : 10 -+- -+ Picture p0 ++-Text tCF +++Text t2 + Attributes + Scope : local ++ Dragging : 0 +@@ -330,26 +247,30 @@ + prints tSend.txt,0 + prints crcval,2 @@ -614,7 +616,7 @@ +- //craft command +- tSend.txt="event,buttonPress2," +- tSend.txt+=entn.txt+"," -+- tSend.txt+="tempUpd," ++- tSend.txt+="tempUpd2," +- //convert temperature +- covx xTempDest2.val,tTmp.txt,0,0 +- tSend.txt+=tTmp.txt @@ -649,7 +651,7 @@ + //craft command +- tSend.txt="event,buttonPress2," +- tSend.txt+=entn.txt+"," -+- tSend.txt+="tempUpd," ++- tSend.txt+="tempUpd2," +- //convert temperature +- covx xTempDest2.val,tTmp.txt,0,0 +- tSend.txt+=tTmp.txt @@ -762,7 +764,7 @@ + //bt0 + spstr strCommand.txt,bt0.txt,"~",10 + if(bt0.txt!="") -+@@ -1109,12 +909,21 @@ ++@@ -1109,33 +909,20 @@ + //enable + vis bt7,1 + } @@ -772,6 +774,27 @@ +- spstr strCommand.txt,tStateLbl.txt,"~",43 +- //Text tALbl +- spstr strCommand.txt,tALbl.txt,"~",44 ++- //Text tCF ++- spstr strCommand.txt,tCF.txt,"~",45 ++- tCF1.txt=tCF.txt ++- tCF2.txt=tCF.txt ++- //Second Temperature ++- spstr strCommand.txt,tTmp.txt,"~",46 ++- if(tTmp.txt!="") ++- { ++- covx tTmp.txt,xTempDest2.val,0,0 ++- vis btUp,0 ++- vis xTempDest,0 ++- vis btDown,0 ++- vis tCF,0 ++- vis btUp1,1 ++- vis xTempDest1,1 ++- vis btDown1,1 ++- vis tCF1,1 ++- vis bUp2,1 ++- vis xTempDest2,1 ++- vis bDown2,1 ++- vis tCF2,1 ++ //bt8 ++ spstr strCommand.txt,bt8.txt,"~",42 ++ if(bt8.txt!="") @@ -786,12 +809,11 @@ ++ spstr strCommand.txt,va8.txt,"~",45 ++ //enable ++ vis bt8,1 -++ } ++ } + } + if(tInstruction.txt=="pageType") -+ { -+--- 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 ++--- HMI/n2t-out/pageStartup.txt 2022-05-14 15:34:34.762258765 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 15:34:35.170263783 +0000 +@@ -351,7 +351,7 @@ + + Events diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index ee7b87d2..052b829d 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -41,11 +41,11 @@ Page cardThermo vis bt5,0 vis bt6,0 vis bt7,0 - vis t0,0 + vis tCF2,0 vis bUp2,0 vis bDown2,0 vis xTempDest2,0 - vis t2,0 + vis tCF1,0 vis btUp1,0 vis btDown1,0 vis xTempDest1,0 @@ -510,7 +510,7 @@ Text tStatus Horizontal Spacing : 0 Vertical Spacing : 0 -Text t2 +Text tCF1 Attributes ID : 8 Scope : local @@ -600,7 +600,7 @@ Text tStateLbl Horizontal Spacing : 0 Vertical Spacing : 0 -Text t0 +Text tCF2 Attributes ID : 41 Scope : local @@ -660,7 +660,7 @@ Text tALbl Horizontal Spacing : 0 Vertical Spacing : 0 -Text t1 +Text tCF Attributes ID : 55 Scope : local @@ -1358,7 +1358,7 @@ Dual-state Button bUp2 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," + tSend.txt+="tempUpd2," //convert temperature covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt @@ -1416,7 +1416,7 @@ Dual-state Button bDown2 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," + tSend.txt+="tempUpd2," //convert temperature covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt @@ -1897,6 +1897,28 @@ Timer tmSerial spstr strCommand.txt,tStateLbl.txt,"~",43 //Text tALbl spstr strCommand.txt,tALbl.txt,"~",44 + //Text tCF + spstr strCommand.txt,tCF.txt,"~",45 + tCF1.txt=tCF.txt + tCF2.txt=tCF.txt + //Second Temperature + spstr strCommand.txt,tTmp.txt,"~",46 + if(tTmp.txt!="") + { + covx tTmp.txt,xTempDest2.val,0,0 + vis btUp,0 + vis xTempDest,0 + vis btDown,0 + vis tCF,0 + vis btUp1,1 + vis xTempDest1,1 + vis btDown1,1 + vis tCF1,1 + vis bUp2,1 + vis xTempDest2,1 + vis bDown2,1 + vis tCF2,1 + } } if(tInstruction.txt=="pageType") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index d13acf88..6243b62e 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -44,8 +44,8 @@ cardAlarm 222 Unique line(s) of event code cardThermo 56 Component(s) - 523 Line(s) of event code - 269 Unique line(s) of event code + 543 Line(s) of event code + 288 Unique line(s) of event code cardEntities 65 Component(s) 981 Line(s) of event code @@ -54,5 +54,5 @@ cardEntities Total 12 Page(s) 371 Component(s) - 3841 Line(s) of event code - 1041 Unique line(s) of event code + 3861 Line(s) of event code + 1060 Unique line(s) of event code diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 0e7dee5e..b3b83128 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -33,11 +33,11 @@ Page cardThermo vis bt5,0 vis bt6,0 vis bt7,0 - vis t0,0 + vis tCF2,0 vis bUp2,0 vis bDown2,0 vis xTempDest2,0 - vis t2,0 + vis tCF1,0 vis btUp1,0 vis btDown1,0 vis xTempDest1,0 @@ -238,7 +238,7 @@ Text tStatus Text : Max. Text Size : 10 -Text t2 +Text tCF1 Attributes Scope : local Dragging : 0 @@ -268,7 +268,7 @@ Text tStateLbl Text : State Max. Text Size : 30 -Text t0 +Text tCF2 Attributes Scope : local Dragging : 0 @@ -288,7 +288,7 @@ Text tALbl Text : Action Max. Text Size : 30 -Text t1 +Text tCF Attributes Scope : local Dragging : 0 @@ -670,7 +670,7 @@ Dual-state Button bUp2 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," + tSend.txt+="tempUpd2," //convert temperature covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt @@ -706,7 +706,7 @@ Dual-state Button bDown2 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," + tSend.txt+="tempUpd2," //convert temperature covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt @@ -1115,6 +1115,28 @@ Timer tmSerial spstr strCommand.txt,tStateLbl.txt,"~",43 //Text tALbl spstr strCommand.txt,tALbl.txt,"~",44 + //Text tCF + spstr strCommand.txt,tCF.txt,"~",45 + tCF1.txt=tCF.txt + tCF2.txt=tCF.txt + //Second Temperature + spstr strCommand.txt,tTmp.txt,"~",46 + if(tTmp.txt!="") + { + covx tTmp.txt,xTempDest2.val,0,0 + vis btUp,0 + vis xTempDest,0 + vis btDown,0 + vis tCF,0 + vis btUp1,1 + vis xTempDest1,1 + vis btDown1,1 + vis tCF1,1 + vis bUp2,1 + vis xTempDest2,1 + vis bDown2,1 + vis tCF2,1 + } } if(tInstruction.txt=="pageType") {