diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 0040dcc5..4c68f4ac 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-13 22:18:51.556125857 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-13 22:18:52.344165434 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-14 09:49:26.544742017 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 09:49:27.344742896 +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-13 22:18:51.556125857 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-13 22:18:52.348165635 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:49:26.548742022 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 09:49:27.344742896 +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-13 22:18:51.560126058 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-13 22:18:52.348165635 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-14 09:49:26.548742022 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 09:49:27.348742900 +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-13 22:18:51.556125857 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-13 22:18:52.348165635 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-14 09:49:26.548742022 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 09:49:27.344742896 +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-13 22:18:51.556125857 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-13 22:18:52.348165635 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-14 09:49:26.548742022 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 09:49:27.344742896 +0000 @@ -223,7 +223,7 @@ Events @@ -403,9 +403,331 @@ 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-13 22:18:51.556125857 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-13 22:18:52.348165635 +0000 -@@ -594,90 +594,6 @@ +--- HMI/n2t-out/cardThermo.txt 2022-05-14 09:49:26.548742022 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 09:49:27.348742900 +0000 +@@ -17,12 +17,9 @@ + vis tInstruction,0 + vis tTmp,0 + vis tId,0 +- vis xTempMin1,0 +- vis xTempMax1,0 +- vis xTempStep1,0 +- vis xTempMin2,0 +- vis xTempMax2,0 +- vis xTempStep2,0 ++ vis xTempMin,0 ++ vis xTempMax,0 ++ vis xTempStep,0 + //tEntity.txt=tHeading.txt + // disable all buttons + vis bt0,0 +@@ -34,10 +31,6 @@ + vis bt6,0 + vis bt7,0 + vis bt8,0 +- vis t0,0 +- vis bUp2,0 +- vis bDown2,0 +- vis xTempDest2,0 + vis bPrev,0 + vis bNext,0 + +@@ -116,7 +109,7 @@ + Associated Keyboard : none + Value : 0 + +-XFloat xTempDest1 ++XFloat xTempDest + Attributes + Scope : local + Dragging : 0 +@@ -125,7 +118,7 @@ + Associated Keyboard : none + Value : 0 + +-XFloat xTempMin1 ++XFloat xTempMin + Attributes + Scope : local + Dragging : 0 +@@ -134,7 +127,7 @@ + Associated Keyboard : none + Value : 0 + +-XFloat xTempMax1 ++XFloat xTempMax + Attributes + Scope : local + Dragging : 0 +@@ -143,43 +136,7 @@ + Associated Keyboard : none + Value : 0 + +-XFloat xTempStep1 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Value : 0 +- +-XFloat xTempDest2 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Value : 0 +- +-XFloat xTempMin2 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Value : 0 +- +-XFloat xTempMax2 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Value : 0 +- +-XFloat xTempStep2 ++XFloat xTempStep + Attributes + Scope : local + Dragging : 0 +@@ -258,36 +215,6 @@ + Text :  + Max. Text Size : 10 + +-Text tCurTempLbl +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : Currently +- Max. Text Size : 30 +- +-Text tStateLbl +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : State +- Max. Text Size : 30 +- +-Text t0 +- 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 + Attributes + Scope : local +@@ -379,7 +306,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Dual-state Button bt2 ++Dual-state Button bt1 + Attributes + Scope : local + Dragging : 0 +@@ -406,7 +333,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Dual-state Button bt4 ++Dual-state Button bt2 + Attributes + Scope : local + Dragging : 0 +@@ -433,7 +360,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Dual-state Button bt6 ++Dual-state Button bt3 + Attributes + Scope : local + Dragging : 0 +@@ -460,7 +387,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Dual-state Button bt8 ++Dual-state Button bt4 + Attributes + Scope : local + Dragging : 0 +@@ -487,7 +414,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Dual-state Button bt1 ++Dual-state Button bt5 + Attributes + Scope : local + Dragging : 0 +@@ -514,7 +441,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Dual-state Button bt3 ++Dual-state Button bt6 + Attributes + Scope : local + Dragging : 0 +@@ -541,7 +468,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Dual-state Button bt5 ++Dual-state Button bt7 + Attributes + Scope : local + Dragging : 0 +@@ -568,7 +495,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Dual-state Button bt7 ++Dual-state Button bt8 + Attributes + Scope : local + Dragging : 0 +@@ -607,9 +534,9 @@ + + Events + Touch Press Event +- if(xTempDest1.valxTempMin1.val) +- { +- xTempDest1.val=xTempDest1.val-xTempStep1.val +- } +- // event,buttonPress2,entn,tempUpd,X +- //craft command +- tSend.txt="event,buttonPress2," +- tSend.txt+=entn.txt+"," +- tSend.txt+="tempUpd," +- //convert temperature +- covx xTempDest1.val,tTmp.txt,0,0 +- tSend.txt+=tTmp.txt +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- +-Dual-state Button bUp2 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text :  +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- if(xTempDest2.valxTempMin2.val) ++ if(xTempDest.val>xTempMin.val) + { +- xTempDest2.val=xTempDest2.val-xTempStep2.val ++ xTempDest.val=xTempDest.val-xTempStep.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command +@@ -725,7 +580,7 @@ + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature +- covx xTempDest2.val,tTmp.txt,0,0 ++ covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 +@@ -739,90 +594,6 @@ prints tSend.txt,0 prints crcval,2 @@ -496,9 +818,32 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt Timer tmSerial Attributes Scope : local +@@ -912,18 +683,18 @@ + covx tTmp.txt,xTempCurr.val,0,0 + //dstTemp + spstr strCommand.txt,tTmp.txt,"~",5 +- covx tTmp.txt,xTempDest1.val,0,0 ++ covx tTmp.txt,xTempDest.val,0,0 + //status + spstr strCommand.txt,tStatus.txt,"~",6 + //minTemp + spstr strCommand.txt,tTmp.txt,"~",7 +- covx tTmp.txt,xTempMin1.val,0,0 ++ covx tTmp.txt,xTempMin.val,0,0 + //maxTemp + spstr strCommand.txt,tTmp.txt,"~",8 +- covx tTmp.txt,xTempMax1.val,0,0 ++ covx tTmp.txt,xTempMax.val,0,0 + //tempStep + spstr strCommand.txt,tTmp.txt,"~",9 +- covx tTmp.txt,xTempStep1.val,0,0 ++ covx tTmp.txt,xTempStep.val,0,0 + // disable all buttons + vis bt0,0 + vis bt1,0 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-13 22:18:51.556125857 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-13 22:18:52.344165434 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-14 09:49:26.544742017 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 09:49:27.344742896 +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 a265966f..f77ed6b3 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-13 22:18:51.556125857 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-13 22:18:51.944145344 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-14 09:49:26.544742017 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 09:49:26.936742448 +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-13 22:18:51.556125857 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-13 22:18:51.944145344 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:49:26.548742022 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 09:49:26.936742448 +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-13 22:18:51.560126058 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-13 22:18:51.944145344 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-14 09:49:26.548742022 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 09:49:26.940742452 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,9 +493,145 @@ 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-13 22:18:51.556125857 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-13 22:18:51.944145344 +0000 -@@ -247,26 +247,30 @@ +--- HMI/n2t-out/cardThermo.txt 2022-05-14 09:49:26.548742022 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 09:49:26.936742448 +0000 +@@ -17,12 +17,9 @@ + vis tInstruction,0 + vis tTmp,0 + vis tId,0 +- vis xTempMin1,0 +- vis xTempMax1,0 +- vis xTempStep1,0 +- vis xTempMin2,0 +- vis xTempMax2,0 +- vis xTempStep2,0 ++ vis xTempMin,0 ++ vis xTempMax,0 ++ vis xTempStep,0 + //tEntity.txt=tHeading.txt + // disable all buttons + vis bt0,0 +@@ -34,10 +31,6 @@ + vis bt6,0 + vis bt7,0 + vis bt8,0 +- vis t0,0 +- vis bUp2,0 +- vis bDown2,0 +- vis xTempDest2,0 + vis bPrev,0 + vis bNext,0 + +@@ -116,7 +109,7 @@ + Associated Keyboard : none + Value : 0 + +-XFloat xTempDest1 ++XFloat xTempDest + Attributes + Scope : local + Dragging : 0 +@@ -125,7 +118,7 @@ + Associated Keyboard : none + Value : 0 + +-XFloat xTempMin1 ++XFloat xTempMin + Attributes + Scope : local + Dragging : 0 +@@ -134,7 +127,7 @@ + Associated Keyboard : none + Value : 0 + +-XFloat xTempMax1 ++XFloat xTempMax + Attributes + Scope : local + Dragging : 0 +@@ -143,43 +136,7 @@ + Associated Keyboard : none + Value : 0 + +-XFloat xTempStep1 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Value : 0 +- +-XFloat xTempDest2 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Value : 0 +- +-XFloat xTempMin2 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Value : 0 +- +-XFloat xTempMax2 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Value : 0 +- +-XFloat xTempStep2 ++XFloat xTempStep + Attributes + Scope : local + Dragging : 0 +@@ -258,36 +215,6 @@ + Text :  + Max. Text Size : 10 + +-Text tCurTempLbl +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : Currently +- Max. Text Size : 30 +- +-Text tStateLbl +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : State +- Max. Text Size : 30 +- +-Text t0 +- 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 + Attributes + Scope : local +@@ -320,26 +247,30 @@ prints tSend.txt,0 prints crcval,2 @@ -534,7 +670,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -279,21 +283,30 @@ +@@ -352,21 +283,30 @@ prints tSend.txt,0 prints crcval,2 @@ -569,11 +705,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -306,21 +319,26 @@ +@@ -379,21 +319,26 @@ prints tSend.txt,0 prints crcval,2 --Dual-state Button bt1 +-Dual-state Button bt2 +Button bPrev Attributes Scope : local @@ -601,16 +737,16 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -333,7 +351,7 @@ +@@ -406,7 +351,7 @@ prints tSend.txt,0 prints crcval,2 --Dual-state Button bt2 +-Dual-state Button bt4 +Dual-state Button bt0 Attributes Scope : local Dragging : 0 -@@ -347,7 +365,7 @@ +@@ -420,7 +365,7 @@ Touch Press Event //craft command tSend.txt="event,buttonPress2,"+entn.txt @@ -619,16 +755,16 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -360,7 +378,7 @@ +@@ -433,7 +378,7 @@ prints tSend.txt,0 prints crcval,2 --Dual-state Button bt3 +-Dual-state Button bt6 +Dual-state Button bt1 Attributes Scope : local Dragging : 0 -@@ -374,7 +392,7 @@ +@@ -447,7 +392,7 @@ Touch Press Event //craft command tSend.txt="event,buttonPress2,"+entn.txt @@ -637,16 +773,16 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -387,7 +405,7 @@ +@@ -460,7 +405,7 @@ prints tSend.txt,0 prints crcval,2 --Dual-state Button bt4 +-Dual-state Button bt8 +Dual-state Button bt2 Attributes Scope : local Dragging : 0 -@@ -401,7 +419,7 @@ +@@ -474,7 +419,7 @@ Touch Press Event //craft command tSend.txt="event,buttonPress2,"+entn.txt @@ -655,11 +791,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -414,13 +432,13 @@ +@@ -487,13 +432,13 @@ prints tSend.txt,0 prints crcval,2 --Dual-state Button bt5 +-Dual-state Button bt1 +Dual-state Button bt3 Attributes Scope : local @@ -671,7 +807,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Text :  Max. Text Size : 10 -@@ -428,7 +446,7 @@ +@@ -501,7 +446,7 @@ Touch Press Event //craft command tSend.txt="event,buttonPress2,"+entn.txt @@ -680,11 +816,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -441,13 +459,13 @@ +@@ -514,13 +459,13 @@ prints tSend.txt,0 prints crcval,2 --Dual-state Button bt6 +-Dual-state Button bt3 +Dual-state Button bt4 Attributes Scope : local @@ -696,7 +832,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Text :  Max. Text Size : 10 -@@ -455,7 +473,7 @@ +@@ -528,7 +473,7 @@ Touch Press Event //craft command tSend.txt="event,buttonPress2,"+entn.txt @@ -705,16 +841,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -468,7 +486,7 @@ - prints tSend.txt,0 - prints crcval,2 - --Dual-state Button bt7 -+Dual-state Button bt5 - Attributes - Scope : local - Dragging : 0 -@@ -482,7 +500,7 @@ +@@ -555,7 +500,7 @@ Touch Press Event //craft command tSend.txt="event,buttonPress2,"+entn.txt @@ -723,29 +850,101 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -495,7 +513,7 @@ +@@ -568,7 +513,7 @@ prints tSend.txt,0 prints crcval,2 --Dual-state Button bt8 +-Dual-state Button bt7 +Dual-state Button bt6 Attributes Scope : local Dragging : 0 -@@ -509,7 +527,7 @@ +@@ -582,79 +527,7 @@ Touch Press Event //craft command tSend.txt="event,buttonPress2,"+entn.txt - tSend.txt+=",hvac_action,"+va8.txt +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- +-Dual-state Button btUp1 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text :  +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- if(xTempDest1.valxTempMin1.val) +- { +- xTempDest1.val=xTempDest1.val-xTempStep1.val +- } +- // event,buttonPress2,entn,tempUpd,X +- //craft command +- tSend.txt="event,buttonPress2," +- tSend.txt+=entn.txt+"," +- tSend.txt+="tempUpd," +- //convert temperature +- covx xTempDest1.val,tTmp.txt,0,0 +- tSend.txt+=tTmp.txt + tSend.txt+=",hvac_action,"+va6.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -522,30 +540,21 @@ +@@ -667,30 +540,21 @@ prints tSend.txt,0 prints crcval,2 --Dual-state Button btUp1 +-Dual-state Button bUp2 +Dual-state Button bt7 Attributes Scope : local @@ -760,9 +959,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Events Touch Press Event -- if(xTempDest.valxTempMin.val) +- if(xTempDest2.val>xTempMin2.val) - { -- xTempDest.val=xTempDest.val-xTempStep.val +- xTempDest2.val=xTempDest2.val-xTempStep2.val - } - // event,buttonPress2,entn,tempUpd,X //craft command @@ -806,16 +1005,39 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt - tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," - //convert temperature -- covx xTempDest.val,tTmp.txt,0,0 +- covx xTempDest2.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt + tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt+=",hvac_action,"+va8.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC +@@ -912,18 +767,18 @@ + covx tTmp.txt,xTempCurr.val,0,0 + //dstTemp + spstr strCommand.txt,tTmp.txt,"~",5 +- covx tTmp.txt,xTempDest1.val,0,0 ++ covx tTmp.txt,xTempDest.val,0,0 + //status + spstr strCommand.txt,tStatus.txt,"~",6 + //minTemp + spstr strCommand.txt,tTmp.txt,"~",7 +- covx tTmp.txt,xTempMin1.val,0,0 ++ covx tTmp.txt,xTempMin.val,0,0 + //maxTemp + spstr strCommand.txt,tTmp.txt,"~",8 +- covx tTmp.txt,xTempMax1.val,0,0 ++ covx tTmp.txt,xTempMax.val,0,0 + //tempStep + spstr strCommand.txt,tTmp.txt,"~",9 +- covx tTmp.txt,xTempStep1.val,0,0 ++ covx tTmp.txt,xTempStep.val,0,0 + // disable all buttons + vis bt0,0 + vis bt1,0 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-13 22:18:51.556125857 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-13 22:18:51.944145344 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-14 09:49:26.544742017 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 09:49:26.936742448 +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 1806d6e6..8f56bb6e 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-13 22:18:51.960146147 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-13 22:18:51.556125857 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-13 22:18:51.944145344 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 09:49:26.952742465 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-14 09:49:26.544742017 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 09:49:26.936742448 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-13 22:18:51.556125857 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-13 22:18:51.944145344 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:49:26.548742022 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 09:49:26.936742448 +0000 +@@ -466,7 +466,7 @@ + prints crcval,2 + tCode.txt="" @@ -67,15 +67,151 @@ + { + click bPrev,1 + } -+--- HMI/n2t-out/cardEntities.txt 2022-05-13 22:18:51.560126058 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-13 22:18:51.944145344 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-14 09:49:26.548742022 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 09:49:26.940742452 +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-13 22:18:51.556125857 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-13 22:18:51.944145344 +0000 -+@@ -247,26 +247,30 @@ ++--- HMI/n2t-out/cardThermo.txt 2022-05-14 09:49:26.548742022 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 09:49:26.936742448 +0000 ++@@ -17,12 +17,9 @@ ++ vis tInstruction,0 ++ vis tTmp,0 ++ vis tId,0 ++- vis xTempMin1,0 ++- vis xTempMax1,0 ++- vis xTempStep1,0 ++- vis xTempMin2,0 ++- vis xTempMax2,0 ++- vis xTempStep2,0 +++ vis xTempMin,0 +++ vis xTempMax,0 +++ vis xTempStep,0 ++ //tEntity.txt=tHeading.txt ++ // disable all buttons ++ vis bt0,0 ++@@ -34,10 +31,6 @@ ++ vis bt6,0 ++ vis bt7,0 ++ vis bt8,0 ++- vis t0,0 ++- vis bUp2,0 ++- vis bDown2,0 ++- vis xTempDest2,0 ++ vis bPrev,0 ++ vis bNext,0 ++ ++@@ -116,7 +109,7 @@ ++ Associated Keyboard : none ++ Value : 0 ++ ++-XFloat xTempDest1 +++XFloat xTempDest ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -125,7 +118,7 @@ ++ Associated Keyboard : none ++ Value : 0 ++ ++-XFloat xTempMin1 +++XFloat xTempMin ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -134,7 +127,7 @@ ++ Associated Keyboard : none ++ Value : 0 ++ ++-XFloat xTempMax1 +++XFloat xTempMax ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -143,43 +136,7 @@ ++ Associated Keyboard : none ++ Value : 0 ++ ++-XFloat xTempStep1 ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Value : 0 ++- ++-XFloat xTempDest2 ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Value : 0 ++- ++-XFloat xTempMin2 ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Value : 0 ++- ++-XFloat xTempMax2 ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Value : 0 ++- ++-XFloat xTempStep2 +++XFloat xTempStep ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -258,36 +215,6 @@ ++ Text :  ++ Max. Text Size : 10 ++ ++-Text tCurTempLbl ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Text : Currently ++- Max. Text Size : 30 ++- ++-Text tStateLbl ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Text : State ++- Max. Text Size : 30 ++- ++-Text t0 ++- 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 ++ Attributes ++ Scope : local ++@@ -320,26 +247,30 @@ + prints tSend.txt,0 + prints crcval,2 + @@ -114,7 +250,7 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -279,21 +283,30 @@ ++@@ -352,21 +283,30 @@ + prints tSend.txt,0 + prints crcval,2 + @@ -149,11 +285,11 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -306,21 +319,26 @@ ++@@ -379,21 +319,26 @@ + prints tSend.txt,0 + prints crcval,2 + -+-Dual-state Button bt1 ++-Dual-state Button bt2 ++Button bPrev + Attributes + Scope : local @@ -181,16 +317,16 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -333,7 +351,7 @@ ++@@ -406,7 +351,7 @@ + prints tSend.txt,0 + prints crcval,2 + -+-Dual-state Button bt2 ++-Dual-state Button bt4 ++Dual-state Button bt0 + Attributes + Scope : local + Dragging : 0 -+@@ -347,7 +365,7 @@ ++@@ -420,7 +365,7 @@ + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt @@ -199,16 +335,16 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -360,7 +378,7 @@ ++@@ -433,7 +378,7 @@ + prints tSend.txt,0 + prints crcval,2 + -+-Dual-state Button bt3 ++-Dual-state Button bt6 ++Dual-state Button bt1 + Attributes + Scope : local + Dragging : 0 -+@@ -374,7 +392,7 @@ ++@@ -447,7 +392,7 @@ + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt @@ -217,16 +353,16 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -387,7 +405,7 @@ ++@@ -460,7 +405,7 @@ + prints tSend.txt,0 + prints crcval,2 + -+-Dual-state Button bt4 ++-Dual-state Button bt8 ++Dual-state Button bt2 + Attributes + Scope : local + Dragging : 0 -+@@ -401,7 +419,7 @@ ++@@ -474,7 +419,7 @@ + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt @@ -235,11 +371,11 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -414,13 +432,13 @@ ++@@ -487,13 +432,13 @@ + prints tSend.txt,0 + prints crcval,2 + -+-Dual-state Button bt5 ++-Dual-state Button bt1 ++Dual-state Button bt3 + Attributes + Scope : local @@ -251,7 +387,7 @@ + Text :  + Max. Text Size : 10 + -+@@ -428,7 +446,7 @@ ++@@ -501,7 +446,7 @@ + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt @@ -260,11 +396,11 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -441,13 +459,13 @@ ++@@ -514,13 +459,13 @@ + prints tSend.txt,0 + prints crcval,2 + -+-Dual-state Button bt6 ++-Dual-state Button bt3 ++Dual-state Button bt4 + Attributes + Scope : local @@ -276,7 +412,7 @@ + Text :  + Max. Text Size : 10 + -+@@ -455,7 +473,7 @@ ++@@ -528,7 +473,7 @@ + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt @@ -285,16 +421,7 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -468,7 +486,7 @@ -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+-Dual-state Button bt7 -++Dual-state Button bt5 -+ Attributes -+ Scope : local -+ Dragging : 0 -+@@ -482,7 +500,7 @@ ++@@ -555,7 +500,7 @@ + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt @@ -303,29 +430,101 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -495,7 +513,7 @@ ++@@ -568,7 +513,7 @@ + prints tSend.txt,0 + prints crcval,2 + -+-Dual-state Button bt8 ++-Dual-state Button bt7 ++Dual-state Button bt6 + Attributes + Scope : local + Dragging : 0 -+@@ -509,7 +527,7 @@ ++@@ -582,79 +527,7 @@ + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt +- tSend.txt+=",hvac_action,"+va8.txt ++- //send calc crc ++- btlen tSend.txt,sys0 ++- crcrest 1,0xffff // reset CRC ++- crcputh 55 bb ++- crcputs sys0,2 ++- crcputs tSend.txt,0 ++- //send cmd ++- printh 55 bb ++- prints sys0,2 ++- prints tSend.txt,0 ++- prints crcval,2 ++- ++-Dual-state Button btUp1 ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- State : unpressed ++- Text :  ++- Max. Text Size : 10 ++- ++- Events ++- Touch Press Event ++- if(xTempDest1.valxTempMin1.val) ++- { ++- xTempDest1.val=xTempDest1.val-xTempStep1.val ++- } ++- // event,buttonPress2,entn,tempUpd,X ++- //craft command ++- tSend.txt="event,buttonPress2," ++- tSend.txt+=entn.txt+"," ++- tSend.txt+="tempUpd," ++- //convert temperature ++- covx xTempDest1.val,tTmp.txt,0,0 ++- tSend.txt+=tTmp.txt ++ tSend.txt+=",hvac_action,"+va6.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+@@ -522,30 +540,21 @@ ++@@ -667,30 +540,21 @@ + prints tSend.txt,0 + prints crcval,2 + -+-Dual-state Button btUp1 ++-Dual-state Button bUp2 ++Dual-state Button bt7 + Attributes + Scope : local @@ -340,9 +539,9 @@ + + Events + Touch Press Event -+- if(xTempDest.valxTempMin.val) ++- if(xTempDest2.val>xTempMin2.val) +- { -+- xTempDest.val=xTempDest.val-xTempStep.val ++- xTempDest2.val=xTempDest2.val-xTempStep2.val +- } +- // event,buttonPress2,entn,tempUpd,X + //craft command @@ -386,15 +585,38 @@ +- tSend.txt+=entn.txt+"," +- tSend.txt+="tempUpd," +- //convert temperature -+- covx xTempDest.val,tTmp.txt,0,0 ++- covx xTempDest2.val,tTmp.txt,0,0 +- tSend.txt+=tTmp.txt ++ tSend.txt="event,buttonPress2,"+entn.txt ++ tSend.txt+=",hvac_action,"+va8.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+--- HMI/n2t-out/pageStartup.txt 2022-05-13 22:18:51.556125857 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-13 22:18:51.944145344 +0000 ++@@ -912,18 +767,18 @@ ++ covx tTmp.txt,xTempCurr.val,0,0 ++ //dstTemp ++ spstr strCommand.txt,tTmp.txt,"~",5 ++- covx tTmp.txt,xTempDest1.val,0,0 +++ covx tTmp.txt,xTempDest.val,0,0 ++ //status ++ spstr strCommand.txt,tStatus.txt,"~",6 ++ //minTemp ++ spstr strCommand.txt,tTmp.txt,"~",7 ++- covx tTmp.txt,xTempMin1.val,0,0 +++ covx tTmp.txt,xTempMin.val,0,0 ++ //maxTemp ++ spstr strCommand.txt,tTmp.txt,"~",8 ++- covx tTmp.txt,xTempMax1.val,0,0 +++ covx tTmp.txt,xTempMax.val,0,0 ++ //tempStep ++ spstr strCommand.txt,tTmp.txt,"~",9 ++- covx tTmp.txt,xTempStep1.val,0,0 +++ covx tTmp.txt,xTempStep.val,0,0 ++ // disable all buttons ++ vis bt0,0 ++ vis bt1,0 ++--- HMI/n2t-out/pageStartup.txt 2022-05-14 09:49:26.544742017 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 09:49:26.936742448 +0000 +@@ -351,7 +351,7 @@ + + Events diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 7458c026..cc0f58eb 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -25,9 +25,12 @@ Page cardThermo vis tInstruction,0 vis tTmp,0 vis tId,0 - vis xTempMin,0 - vis xTempMax,0 - vis xTempStep,0 + vis xTempMin1,0 + vis xTempMax1,0 + vis xTempStep1,0 + vis xTempMin2,0 + vis xTempMax2,0 + vis xTempStep2,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 @@ -39,6 +42,10 @@ Page cardThermo vis bt6,0 vis bt7,0 vis bt8,0 + vis t0,0 + vis bUp2,0 + vis bDown2,0 + vis xTempDest2,0 vis bPrev,0 vis bNext,0 @@ -127,10 +134,10 @@ XFloat xTempCurr Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 143 - y coordinate : 70 - Width : 90 - Height : 35 + x coordinate : 13 + y coordinate : 121 + Width : 95 + Height : 30 Effect : load Effect Priority : 0 Effect Time : 300 @@ -149,7 +156,7 @@ XFloat xTempCurr Horizontal Spacing : 0 Vertical Spacing : 0 -XFloat xTempDest +XFloat xTempDest1 Attributes ID : 13 Scope : local @@ -157,8 +164,8 @@ XFloat xTempDest Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 296 - y coordinate : 97 + x coordinate : 295 + y coordinate : 118 Width : 120 Height : 60 Effect : load @@ -179,7 +186,7 @@ XFloat xTempDest Horizontal Spacing : 0 Vertical Spacing : 0 -XFloat xTempMin +XFloat xTempMin1 Attributes ID : 14 Scope : local @@ -187,10 +194,10 @@ XFloat xTempMin Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 269 - y coordinate : 0 - Width : 51 - Height : 30 + x coordinate : 383 + y coordinate : 71 + Width : 50 + Height : 22 Effect : load Effect Priority : 0 Effect Time : 300 @@ -209,7 +216,7 @@ XFloat xTempMin Horizontal Spacing : 0 Vertical Spacing : 0 -XFloat xTempMax +XFloat xTempMax1 Attributes ID : 15 Scope : local @@ -217,10 +224,10 @@ XFloat xTempMax Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 320 - y coordinate : 0 + x coordinate : 383 + y coordinate : 93 Width : 45 - Height : 30 + Height : 20 Effect : load Effect Priority : 0 Effect Time : 300 @@ -239,7 +246,7 @@ XFloat xTempMax Horizontal Spacing : 0 Vertical Spacing : 0 -XFloat xTempStep +XFloat xTempStep1 Attributes ID : 16 Scope : local @@ -247,10 +254,130 @@ XFloat xTempStep Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 366 - y coordinate : 0 + x coordinate : 384 + y coordinate : 181 Width : 45 - Height : 30 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment : center + Vertical Alignment : center + Value : 0 + Significant digits left : 0 + Significant digits right : 1 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +XFloat xTempDest2 + Attributes + ID : 48 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 142 + y coordinate : 118 + Width : 120 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 4 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Value : 0 + Significant digits left : 0 + Significant digits right : 1 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +XFloat xTempMin2 + Attributes + ID : 50 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 231 + y coordinate : 69 + Width : 50 + Height : 21 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment : center + Vertical Alignment : center + Value : 0 + Significant digits left : 0 + Significant digits right : 1 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +XFloat xTempMax2 + Attributes + ID : 51 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 231 + y coordinate : 91 + Width : 45 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment : center + Vertical Alignment : center + Value : 0 + Significant digits left : 0 + Significant digits right : 1 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +XFloat xTempStep2 + Attributes + ID : 52 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 232 + y coordinate : 179 + Width : 45 + Height : 20 Effect : load Effect Priority : 0 Effect Time : 300 @@ -397,9 +524,9 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 5 - y coordinate : 257 - Width : 227 + x coordinate : 64 + y coordinate : 26 + Width : 320 Height : 30 Effect : load Effect Priority : 0 @@ -427,9 +554,9 @@ Text tStatus Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 143 - y coordinate : 115 - Width : 86 + x coordinate : 11 + y coordinate : 200 + Width : 97 Height : 30 Effect : load Effect Priority : 0 @@ -440,7 +567,7 @@ Text tStatus Font ID : 0 Back. Color : 6371 Font Color : 50712 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : @@ -457,8 +584,98 @@ Text t2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 417 - y coordinate : 115 + x coordinate : 416 + y coordinate : 136 + Width : 25 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tCurTempLbl + Attributes + ID : 44 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 13 + y coordinate : 85 + Width : 95 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : Currently + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tStateLbl + Attributes + ID : 45 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 162 + Width : 95 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : State + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t0 + Attributes + ID : 47 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 263 + y coordinate : 136 Width : 25 Height : 30 Effect : load @@ -605,10 +822,10 @@ Dual-state Button bt0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 8 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 27 + y coordinate : 241 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -646,7 +863,7 @@ Dual-state Button bt0 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt1 +Dual-state Button bt2 Attributes ID : 22 Scope : local @@ -654,10 +871,10 @@ Dual-state Button bt1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 55 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 117 + y coordinate : 241 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -695,7 +912,7 @@ Dual-state Button bt1 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt2 +Dual-state Button bt4 Attributes ID : 23 Scope : local @@ -703,10 +920,10 @@ Dual-state Button bt2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 102 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 207 + y coordinate : 241 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -744,7 +961,7 @@ Dual-state Button bt2 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt3 +Dual-state Button bt6 Attributes ID : 24 Scope : local @@ -752,10 +969,10 @@ Dual-state Button bt3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 149 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 297 + y coordinate : 241 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -793,7 +1010,7 @@ Dual-state Button bt3 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt4 +Dual-state Button bt8 Attributes ID : 25 Scope : local @@ -801,10 +1018,10 @@ Dual-state Button bt4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 196 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 386 + y coordinate : 240 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -842,7 +1059,7 @@ Dual-state Button bt4 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt5 +Dual-state Button bt1 Attributes ID : 26 Scope : local @@ -850,10 +1067,10 @@ Dual-state Button bt5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 29 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 72 + y coordinate : 241 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -891,7 +1108,7 @@ Dual-state Button bt5 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt6 +Dual-state Button bt3 Attributes ID : 27 Scope : local @@ -899,10 +1116,10 @@ Dual-state Button bt6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 76 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 162 + y coordinate : 241 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -940,7 +1157,7 @@ Dual-state Button bt6 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt7 +Dual-state Button bt5 Attributes ID : 28 Scope : local @@ -948,10 +1165,10 @@ Dual-state Button bt7 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 123 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 252 + y coordinate : 241 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -989,7 +1206,7 @@ Dual-state Button bt7 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt8 +Dual-state Button bt7 Attributes ID : 29 Scope : local @@ -997,10 +1214,10 @@ Dual-state Button bt8 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 170 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 342 + y coordinate : 241 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1046,8 +1263,8 @@ Dual-state Button btUp1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 332 - y coordinate : 46 + x coordinate : 331 + y coordinate : 67 Width : 50 Height : 50 Effect : load @@ -1072,9 +1289,9 @@ Dual-state Button btUp1 Events Touch Press Event - if(xTempDest.valxTempMin.val) + if(xTempDest1.val>xTempMin1.val) { - xTempDest.val=xTempDest.val-xTempStep.val + xTempDest1.val=xTempDest1.val-xTempStep1.val } // event,buttonPress2,entn,tempUpd,X //craft command @@ -1140,7 +1357,123 @@ Dual-state Button btDown1 tSend.txt+=entn.txt+"," tSend.txt+="tempUpd," //convert temperature - covx xTempDest.val,tTmp.txt,0,0 + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button bUp2 + Attributes + ID : 46 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 178 + y coordinate : 67 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color (Unpressed) : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 6371 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 64512 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + if(xTempDest2.valxTempMin2.val) + { + xTempDest2.val=xTempDest2.val-xTempStep2.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 @@ -1355,18 +1688,18 @@ Timer tmSerial covx tTmp.txt,xTempCurr.val,0,0 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp spstr strCommand.txt,tTmp.txt,"~",7 - covx tTmp.txt,xTempMin.val,0,0 + covx tTmp.txt,xTempMin1.val,0,0 //maxTemp spstr strCommand.txt,tTmp.txt,"~",8 - covx tTmp.txt,xTempMax.val,0,0 + covx tTmp.txt,xTempMax1.val,0,0 //tempStep spstr strCommand.txt,tTmp.txt,"~",9 - covx tTmp.txt,xTempStep.val,0,0 + covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 vis bt1,0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 84b592ea..ff3c582b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -38,14 +38,14 @@ cardGrid 42 Component(s) 435 Line(s) of event code 252 Unique line(s) of event code -cardThermo - 44 Component(s) - 459 Line(s) of event code - 255 Unique line(s) of event code cardAlarm 38 Component(s) 360 Line(s) of event code 222 Unique line(s) of event code +cardThermo + 53 Component(s) + 502 Line(s) of event code + 267 Unique line(s) of event code cardEntities 65 Component(s) 981 Line(s) of event code @@ -53,6 +53,6 @@ cardEntities Total 12 Page(s) - 359 Component(s) - 3777 Line(s) of event code - 1031 Unique line(s) of event code + 368 Component(s) + 3820 Line(s) of event code + 1040 Unique line(s) of event code diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index d292f748..8e8a1a5e 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -17,9 +17,12 @@ Page cardThermo vis tInstruction,0 vis tTmp,0 vis tId,0 - vis xTempMin,0 - vis xTempMax,0 - vis xTempStep,0 + vis xTempMin1,0 + vis xTempMax1,0 + vis xTempStep1,0 + vis xTempMin2,0 + vis xTempMax2,0 + vis xTempStep2,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 @@ -31,6 +34,10 @@ Page cardThermo vis bt6,0 vis bt7,0 vis bt8,0 + vis t0,0 + vis bUp2,0 + vis bDown2,0 + vis xTempDest2,0 vis bPrev,0 vis bNext,0 @@ -109,7 +116,7 @@ XFloat xTempCurr Associated Keyboard : none Value : 0 -XFloat xTempDest +XFloat xTempDest1 Attributes Scope : local Dragging : 0 @@ -118,7 +125,7 @@ XFloat xTempDest Associated Keyboard : none Value : 0 -XFloat xTempMin +XFloat xTempMin1 Attributes Scope : local Dragging : 0 @@ -127,7 +134,7 @@ XFloat xTempMin Associated Keyboard : none Value : 0 -XFloat xTempMax +XFloat xTempMax1 Attributes Scope : local Dragging : 0 @@ -136,7 +143,43 @@ XFloat xTempMax Associated Keyboard : none Value : 0 -XFloat xTempStep +XFloat xTempStep1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +XFloat xTempDest2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +XFloat xTempMin2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +XFloat xTempMax2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +XFloat xTempStep2 Attributes Scope : local Dragging : 0 @@ -215,6 +258,36 @@ Text t2 Text :  Max. Text Size : 10 +Text tCurTempLbl + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : Currently + Max. Text Size : 30 + +Text tStateLbl + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : State + Max. Text Size : 30 + +Text t0 + 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 Attributes Scope : local @@ -306,7 +379,7 @@ Dual-state Button bt0 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt1 +Dual-state Button bt2 Attributes Scope : local Dragging : 0 @@ -333,7 +406,7 @@ Dual-state Button bt1 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt2 +Dual-state Button bt4 Attributes Scope : local Dragging : 0 @@ -360,7 +433,7 @@ Dual-state Button bt2 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt3 +Dual-state Button bt6 Attributes Scope : local Dragging : 0 @@ -387,7 +460,7 @@ Dual-state Button bt3 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt4 +Dual-state Button bt8 Attributes Scope : local Dragging : 0 @@ -414,7 +487,7 @@ Dual-state Button bt4 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt5 +Dual-state Button bt1 Attributes Scope : local Dragging : 0 @@ -441,7 +514,7 @@ Dual-state Button bt5 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt6 +Dual-state Button bt3 Attributes Scope : local Dragging : 0 @@ -468,7 +541,7 @@ Dual-state Button bt6 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt7 +Dual-state Button bt5 Attributes Scope : local Dragging : 0 @@ -495,7 +568,7 @@ Dual-state Button bt7 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt8 +Dual-state Button bt7 Attributes Scope : local Dragging : 0 @@ -534,9 +607,9 @@ Dual-state Button btUp1 Events Touch Press Event - if(xTempDest.valxTempMin.val) + if(xTempDest1.val>xTempMin1.val) { - xTempDest.val=xTempDest.val-xTempStep.val + xTempDest1.val=xTempDest1.val-xTempStep1.val } // event,buttonPress2,entn,tempUpd,X //craft command @@ -580,7 +653,79 @@ Dual-state Button btDown1 tSend.txt+=entn.txt+"," tSend.txt+="tempUpd," //convert temperature - covx xTempDest.val,tTmp.txt,0,0 + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button bUp2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + if(xTempDest2.valxTempMin2.val) + { + xTempDest2.val=xTempDest2.val-xTempStep2.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 @@ -767,18 +912,18 @@ Timer tmSerial covx tTmp.txt,xTempCurr.val,0,0 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp spstr strCommand.txt,tTmp.txt,"~",7 - covx tTmp.txt,xTempMin.val,0,0 + covx tTmp.txt,xTempMin1.val,0,0 //maxTemp spstr strCommand.txt,tTmp.txt,"~",8 - covx tTmp.txt,xTempMax.val,0,0 + covx tTmp.txt,xTempMax1.val,0,0 //tempStep spstr strCommand.txt,tTmp.txt,"~",9 - covx tTmp.txt,xTempStep.val,0,0 + covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 vis bt1,0