diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 5e8a5e61..4934511d 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-19 17:45:29.816254306 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-19 17:45:30.684242787 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 06:10:30.103842720 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 06:10:31.123848546 +0000 @@ -11,6 +11,3 @@ // dim value int dimValue=40 @@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - page pageStartup Only in HMI/n2t-out: cardQR.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-19 17:45:29.816254306 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-19 17:45:30.688242734 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-21 06:10:30.107842748 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 06:10:31.123848546 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -22,8 +22,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-05-19 17:45:29.816254306 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-19 17:45:30.684242787 +0000 +--- HMI/n2t-out/pageTest.txt 2022-05-21 06:10:30.107842748 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 06:10:31.123848546 +0000 @@ -176,17 +176,3 @@ Touch Press Event bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 5a9406f5..e2624722 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-19 17:45:29.816254306 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-19 17:45:30.176249529 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 06:10:30.103842720 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:10:30.539845715 +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-19 17:45:29.816254306 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-19 17:45:30.176249529 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.107842748 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.539845715 +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-19 17:45:29.816254306 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-19 17:45:30.176249529 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-21 06:10:30.107842748 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:10:30.543845735 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -492,765 +492,127 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -Only in HMI/n2t-out: cardQR.txt -diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-19 17:45:29.816254306 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-19 17:45:30.176249529 +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 -@@ -33,14 +30,7 @@ - vis bt5,0 - vis bt6,0 - vis bt7,0 -- vis tCF2,0 -- vis bUp2,0 -- vis bDown2,0 -- vis xTempDest2,0 -- vis tCF1,0 -- vis btUp1,0 -- vis btDown1,0 -- vis xTempDest1,0 -+ vis bt8,0 - vis bPrev,0 - vis bNext,0 - -@@ -104,31 +94,13 @@ - Text : - Max. Text Size: 10 - --Variable (string) tInstruction -- Attributes -- Scope : local -- Text : -- Max. Text Size: 20 -- --Variable (string) tId -- Attributes -- Scope : local -- Text : -- Max. Text Size: 20 -- --Variable (string) tTmp -+Variable (string) va8 - Attributes - Scope : local - Text : - Max. Text Size: 10 - --Variable (string) tSend -- Attributes -- Scope : local -- Text : -- Max. Text Size: 100 -- --XFloat xTempDest1 -+XFloat xTempCurr - Attributes - Scope : local - Dragging : 0 -@@ -137,7 +109,7 @@ - Associated Keyboard : none - Value : 0 - --XFloat xTempMin1 -+XFloat xTempDest - Attributes - Scope : local - Dragging : 0 -@@ -146,7 +118,7 @@ - Associated Keyboard : none - Value : 0 - --XFloat xTempMax1 -+XFloat xTempMin - Attributes - Scope : local - Dragging : 0 -@@ -155,7 +127,7 @@ - Associated Keyboard : none - Value : 0 - --XFloat xTempStep1 -+XFloat xTempMax - Attributes - Scope : local - Dragging : 0 -@@ -164,7 +136,7 @@ - Associated Keyboard : none - Value : 0 - --XFloat xTempDest2 -+XFloat xTempStep - Attributes - Scope : local - Dragging : 0 -@@ -173,41 +145,45 @@ - Associated Keyboard : none - Value : 0 - --XFloat xTempMin2 -+Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Value : 0 -+ Text : newtxt -+ Max. Text Size : 100 - --XFloat xTempMax2 -+Text tTmp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Value : 0 -+ Text : -+ Max. Text Size : 10 - --XFloat xTempStep2 -+Text tInstruction - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Value : 0 -+ Text : -+ Max. Text Size : 20 - --XFloat xTempDest -+Text tId - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Value : 0 -+ Text : -+ Max. Text Size : 20 - - Text tHeading - Attributes -@@ -229,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 -- 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 tCF2 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text :  -- Max. Text Size : 10 -- --Text tALbl -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : Action -- Max. Text Size : 30 -- --Text tCF -+Text t2 - Attributes - Scope : local - Dragging : 0 -@@ -289,16 +215,6 @@ - Text :  - Max. Text Size : 10 - --Text tCurTemp -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 30 -- - Picture p0 - Attributes - Scope : local -@@ -331,26 +247,30 @@ - prints tSend.txt,0 - prints crcval,2 - --Button bPrev -+Button bDown - Attributes - Scope : local - Dragging : 0 +diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt +--- HMI/n2t-out/cardQR.txt 2022-05-21 06:10:30.107842748 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:10:30.539845715 +0000 +@@ -198,7 +198,7 @@ Disable release event after dragging: 0 Send Component ID : disabled State : unpressed -- Text :  +- Text : newtxt + Text : Max. Text Size : 10 Events - Touch Press Event -- tSend.txt="event,buttonPress2,cardThermo," -- if(bPrev.txt=="") -+ if(xTempDest.val>xTempMin.val) +@@ -223,7 +223,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed +- Text : newtxt ++ Text : + Max. Text Size : 10 + + Events +@@ -295,7 +295,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Hotspot mSwipeNext ++Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 +@@ -315,15 +315,15 @@ + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt +- //Pressing right button if swiped on the right side of the screen ++ //Pressing up button if swiped on the top side of the screen + // +- spstr tId.txt,tTmp.txt,"|",1 +- if(tTmp.txt=="1") ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="2") { -- tSend.txt+="bUp" -- }else -- { -- tSend.txt+="bPrev" -+ xTempDest.val=xTempDest.val-xTempStep.val +- click bNext,1 ++ click bPrev,1 } -+ // event,buttonPress2,entn,tempUpd,X -+ //craft command -+ tSend.txt="event,buttonPress2," -+ tSend.txt+=entn.txt+"," -+ tSend.txt+="tempUpd," -+ //convert temperature -+ covx xTempDest.val,tTmp.txt,0,0 -+ tSend.txt+=tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -363,21 +283,30 @@ - prints tSend.txt,0 - prints crcval,2 --Dual-state Button bt0 -+Button bUp +-Hotspot mSwipeUp ++Hotspot mSwipeNext Attributes Scope : local Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text :  -+ Text : - Max. Text Size : 10 - - Events - Touch Press Event -+ if(xTempDest.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+="tempUpdHigh," -- //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) -- { -- xTempDest2.val=xTempDest2.val-xTempStep2.val -- } -- // event,buttonPress2,entn,tempUpd,X - //craft command -- tSend.txt="event,buttonPress2," -- tSend.txt+=entn.txt+"," -- tSend.txt+="tempUpdLow," -- //convert temperature -- covx xTempDest2.val,tTmp.txt,0,0 -- tSend.txt+=tTmp.txt -+ tSend.txt="event,buttonPress2,"+entn.txt -+ tSend.txt+=",hvac_action,"+va6.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -723,30 +540,21 @@ - prints tSend.txt,0 - prints crcval,2 - --Dual-state Button btUp -+Dual-state Button bt7 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled -- State : unpressed -- Text :  -+ State : pressed -+ Text :  - Max. Text Size : 10 - - Events - Touch Press Event -- if(xTempDest.valxTempMin1.val) -- { -- xTempDest.val=xTempDest.val-xTempStep1.val -- } -- // event,buttonPress2,entn,tempUpd,X - //craft command -- tSend.txt="event,buttonPress2," -- tSend.txt+=entn.txt+"," -- tSend.txt+="tempUpd," -- //convert temperature -- covx xTempDest.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 -@@ -964,22 +763,22 @@ - //entity name - spstr strCommand.txt,entn.txt,"~",3 - //currentTemp -- spstr strCommand.txt,tCurTemp.txt,"~",4 -+ spstr strCommand.txt,tTmp.txt,"~",4 -+ covx tTmp.txt,xTempCurr.val,0,0 - //dstTemp - spstr strCommand.txt,tTmp.txt,"~",5 -- covx tTmp.txt,xTempDest1.val,0,0 -- xTempDest.val=xTempDest1.val -+ 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 -@@ -989,6 +788,7 @@ - vis bt5,0 - vis bt6,0 - vis bt7,0 -+ vis bt8,0 - //bt0 - spstr strCommand.txt,bt0.txt,"~",10 - if(bt0.txt!="") -@@ -1109,33 +909,20 @@ - //enable - vis bt7,1 - } -- //Text tCurTempLbl -- spstr strCommand.txt,tCurTempLbl.txt,"~",42 -- //Text tStateLbl -- 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!="") -+ { -+ // set text color on active state -+ spstr strCommand.txt,tTmp.txt,"~",43 -+ covx tTmp.txt,bt8.pco2,0,0 -+ // set state -+ spstr strCommand.txt,tTmp.txt,"~",44 -+ covx tTmp.txt,bt8.val,0,0 -+ // save action -+ spstr strCommand.txt,va8.txt,"~",45 -+ //enable -+ vis bt8,1 - } - } - if(tInstruction.txt=="pageType") + Hotspot mSwipePrev diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-19 17:45:29.816254306 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-19 17:45:30.176249529 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-21 06:10:30.107842748 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:10:30.539845715 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1279,8 +641,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt doevents // finish drawing before next timer event triggers if(frame_ptr.val==1820) diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-05-19 17:45:29.816254306 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-19 17:45:30.176249529 +0000 +--- HMI/n2t-out/pageTest.txt 2022-05-21 06:10:30.107842748 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:10:30.539845715 +0000 @@ -176,17 +176,3 @@ Touch Press Event bauds=115200 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 00aa5aad..a29b09b1 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-19 17:45:30.320247618 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-19 17:45:29.816254306 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-19 17:45:30.176249529 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 06:10:30.627846144 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-21 06:10:30.103842720 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:10:30.539845715 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-19 17:45:29.816254306 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-19 17:45:30.176249529 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.107842748 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.539845715 +0000 +@@ -466,7 +466,7 @@ + prints crcval,2 + tCode.txt="" @@ -67,769 +67,131 @@ + { + click bPrev,1 + } -+--- HMI/n2t-out/cardEntities.txt 2022-05-19 17:45:29.816254306 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-19 17:45:30.176249529 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-21 06:10:30.107842748 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:10:30.543845735 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1728,6 +1956,128 @@ -+Only in HMI/n2t-out: cardQR.txt -+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-19 17:45:29.816254306 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-19 17:45:30.176249529 +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 -+@@ -33,14 +30,7 @@ -+ vis bt5,0 -+ vis bt6,0 -+ vis bt7,0 -+- vis tCF2,0 -+- vis bUp2,0 -+- vis bDown2,0 -+- vis xTempDest2,0 -+- vis tCF1,0 -+- vis btUp1,0 -+- vis btDown1,0 -+- vis xTempDest1,0 -++ vis bt8,0 -+ vis bPrev,0 -+ vis bNext,0 -+ -+@@ -104,31 +94,13 @@ -+ Text : -+ Max. Text Size: 10 -+ -+-Variable (string) tInstruction -+- Attributes -+- Scope : local -+- Text : -+- Max. Text Size: 20 -+- -+-Variable (string) tId -+- Attributes -+- Scope : local -+- Text : -+- Max. Text Size: 20 -+- -+-Variable (string) tTmp -++Variable (string) va8 -+ Attributes -+ Scope : local -+ Text : -+ Max. Text Size: 10 -+ -+-Variable (string) tSend -+- Attributes -+- Scope : local -+- Text : -+- Max. Text Size: 100 -+- -+-XFloat xTempDest1 -++XFloat xTempCurr -+ Attributes -+ Scope : local -+ Dragging : 0 -+@@ -137,7 +109,7 @@ -+ Associated Keyboard : none -+ Value : 0 -+ -+-XFloat xTempMin1 -++XFloat xTempDest -+ Attributes -+ Scope : local -+ Dragging : 0 -+@@ -146,7 +118,7 @@ -+ Associated Keyboard : none -+ Value : 0 -+ -+-XFloat xTempMax1 -++XFloat xTempMin -+ Attributes -+ Scope : local -+ Dragging : 0 -+@@ -155,7 +127,7 @@ -+ Associated Keyboard : none -+ Value : 0 -+ -+-XFloat xTempStep1 -++XFloat xTempMax -+ Attributes -+ Scope : local -+ Dragging : 0 -+@@ -164,7 +136,7 @@ -+ Associated Keyboard : none -+ Value : 0 -+ -+-XFloat xTempDest2 -++XFloat xTempStep -+ Attributes -+ Scope : local -+ Dragging : 0 -+@@ -173,41 +145,45 @@ -+ Associated Keyboard : none -+ Value : 0 -+ -+-XFloat xTempMin2 -++Text tSend -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+- Value : 0 -++ Text : newtxt -++ Max. Text Size : 100 -+ -+-XFloat xTempMax2 -++Text tTmp -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+- Value : 0 -++ Text : -++ Max. Text Size : 10 -+ -+-XFloat xTempStep2 -++Text tInstruction -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+- Value : 0 -++ Text : -++ Max. Text Size : 20 -+ -+-XFloat xTempDest -++Text tId -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+- Value : 0 -++ Text : -++ Max. Text Size : 20 -+ -+ Text tHeading -+ Attributes -+@@ -229,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 -+- 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 tCF2 -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- Associated Keyboard : none -+- Text :  -+- Max. Text Size : 10 -+- -+-Text tALbl -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- Associated Keyboard : none -+- Text : Action -+- Max. Text Size : 30 -+- -+-Text tCF -++Text t2 -+ Attributes -+ Scope : local -+ Dragging : 0 -+@@ -289,16 +215,6 @@ -+ Text :  -+ Max. Text Size : 10 -+ -+-Text tCurTemp -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- Associated Keyboard : none -+- Text : -+- Max. Text Size : 30 -+- -+ Picture p0 -+ Attributes -+ Scope : local -+@@ -331,26 +247,30 @@ -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+-Button bPrev -++Button bDown -+ Attributes -+ Scope : local -+ Dragging : 0 ++diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ++--- HMI/n2t-out/cardQR.txt 2022-05-21 06:10:30.107842748 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:10:30.539845715 +0000 ++@@ -198,7 +198,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed -+- Text :  ++- Text : newtxt ++ Text : + Max. Text Size : 10 + + Events -+ Touch Press Event -+- tSend.txt="event,buttonPress2,cardThermo," -+- if(bPrev.txt=="") -++ if(xTempDest.val>xTempMin.val) ++@@ -223,7 +223,7 @@ ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++- Text : newtxt +++ Text : ++ Max. Text Size : 10 ++ ++ Events ++@@ -295,7 +295,7 @@ ++ prints tSend.txt,0 ++ prints crcval,2 ++ ++-Hotspot mSwipeNext +++Hotspot mSwipeUp ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -315,15 +315,15 @@ ++ //x & y coordinates where the swipe is first detected.) ++ //--------------------------- ++ //The navigation text is stored as local variable within tld.txt ++- //Pressing right button if swiped on the right side of the screen +++ //Pressing up button if swiped on the top side of the screen ++ // ++- spstr tId.txt,tTmp.txt,"|",1 ++- if(tTmp.txt=="1") +++ spstr tId.txt,tTmp.txt,"|",0 +++ if(tTmp.txt=="2") + { -+- tSend.txt+="bUp" -+- }else -+- { -+- tSend.txt+="bPrev" -++ xTempDest.val=xTempDest.val-xTempStep.val ++- click bNext,1 +++ click bPrev,1 + } -++ // event,buttonPress2,entn,tempUpd,X -++ //craft command -++ tSend.txt="event,buttonPress2," -++ tSend.txt+=entn.txt+"," -++ tSend.txt+="tempUpd," -++ //convert temperature -++ covx xTempDest.val,tTmp.txt,0,0 -++ tSend.txt+=tTmp.txt -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+@@ -363,21 +283,30 @@ -+ prints tSend.txt,0 -+ prints crcval,2 + -+-Dual-state Button bt0 -++Button bUp ++-Hotspot mSwipeUp +++Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text :  -++ Text : -+ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event -++ if(xTempDest.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+="tempUpdHigh," -+- //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) -+- { -+- xTempDest2.val=xTempDest2.val-xTempStep2.val -+- } -+- // event,buttonPress2,entn,tempUpd,X -+ //craft command -+- tSend.txt="event,buttonPress2," -+- tSend.txt+=entn.txt+"," -+- tSend.txt+="tempUpdLow," -+- //convert temperature -+- covx xTempDest2.val,tTmp.txt,0,0 -+- tSend.txt+=tTmp.txt -++ tSend.txt="event,buttonPress2,"+entn.txt -++ tSend.txt+=",hvac_action,"+va6.txt -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+@@ -723,30 +540,21 @@ -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+-Dual-state Button btUp -++Dual-state Button bt7 -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+- State : unpressed -+- Text :  -++ State : pressed -++ Text :  -+ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event -+- if(xTempDest.valxTempMin1.val) -+- { -+- xTempDest.val=xTempDest.val-xTempStep1.val -+- } -+- // event,buttonPress2,entn,tempUpd,X -+ //craft command -+- tSend.txt="event,buttonPress2," -+- tSend.txt+=entn.txt+"," -+- tSend.txt+="tempUpd," -+- //convert temperature -+- covx xTempDest.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 -+@@ -964,22 +763,22 @@ -+ //entity name -+ spstr strCommand.txt,entn.txt,"~",3 -+ //currentTemp -+- spstr strCommand.txt,tCurTemp.txt,"~",4 -++ spstr strCommand.txt,tTmp.txt,"~",4 -++ covx tTmp.txt,xTempCurr.val,0,0 -+ //dstTemp -+ spstr strCommand.txt,tTmp.txt,"~",5 -+- covx tTmp.txt,xTempDest1.val,0,0 -+- xTempDest.val=xTempDest1.val -++ 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 -+@@ -989,6 +788,7 @@ -+ vis bt5,0 -+ vis bt6,0 -+ vis bt7,0 -++ vis bt8,0 -+ //bt0 -+ spstr strCommand.txt,bt0.txt,"~",10 -+ if(bt0.txt!="") -+@@ -1109,33 +909,20 @@ -+ //enable -+ vis bt7,1 -+ } -+- //Text tCurTempLbl -+- spstr strCommand.txt,tCurTempLbl.txt,"~",42 -+- //Text tStateLbl -+- 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!="") -++ { -++ // set text color on active state -++ spstr strCommand.txt,tTmp.txt,"~",43 -++ covx tTmp.txt,bt8.pco2,0,0 -++ // set state -++ spstr strCommand.txt,tTmp.txt,"~",44 -++ covx tTmp.txt,bt8.val,0,0 -++ // save action -++ spstr strCommand.txt,va8.txt,"~",45 -++ //enable -++ vis bt8,1 -+ } -+ } -+ if(tInstruction.txt=="pageType") -+--- HMI/n2t-out/pageStartup.txt 2022-05-19 17:45:29.816254306 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-19 17:45:30.176249529 +0000 ++ Hotspot mSwipePrev ++--- HMI/n2t-out/pageStartup.txt 2022-05-21 06:10:30.107842748 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:10:30.539845715 +0000 +@@ -351,7 +351,7 @@ + + Events @@ -840,8 +202,8 @@ + doevents // finish drawing before next timer event triggers + if(frame_ptr.val==1820) +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-05-19 17:45:29.816254306 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-19 17:45:30.176249529 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-05-21 06:10:30.107842748 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:10:30.539845715 +0000 +@@ -176,17 +176,3 @@ + Touch Press Event + bauds=115200 diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt new file mode 100644 index 00000000..07eca1be --- /dev/null +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -0,0 +1,885 @@ +Page cardQR + Attributes + ID : 0 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + Width : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + Fill : solid color + Back. Color : 6371 + + Events + Preinitialize Event + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + +Variable (string) strCommand + Attributes + ID : 6 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) entn + Attributes + ID : 7 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) tSend + Attributes + ID : 10 + Scope : local + Text : + Max. Text Size: 100 + +Variable (string) tTmp + Attributes + ID : 11 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) tId + Attributes + ID : 12 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + ID : 13 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) entn1 + Attributes + ID : 23 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + ID : 24 + Scope : local + Text : + Max. Text Size: 80 + +Text tEntity1 + Attributes + ID : 15 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 112 + y coordinate : 292 + Width : 170 + 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 : left + Vertical Alignment : center + Input Type : character + Text : tEntity1 + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon1 + Attributes + ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 60 + y coordinate : 291 + Width : 45 + 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 : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tEntity2 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 113 + y coordinate : 388 + Width : 170 + 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 : left + Vertical Alignment : center + Input Type : character + Text : tEntity1 + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon2 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 61 + y coordinate : 387 + Width : 45 + 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 : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHeading + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 66 + y coordinate : 26 + Width : 189 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 2 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : testHeading + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Picture p0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 319 + Height : 479 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +QR Code qr0 + Attributes + ID : 14 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 68 + y coordinate : 78 + Width : 200 + Height : 200 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Logo overlay : no + Text : WIFI:S:SSID;T:WPA;P:PASSWORD;; + Max. Text Size : 105 + +Button bNext + Attributes + ID : 3 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + 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 + tSend.txt="event,buttonPress2,cardAlarm,bNext" + //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 + +Button bPrev + Attributes + ID : 4 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 9 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + 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 + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //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 + +Button bText1 + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 61 + y coordinate : 339 + Width : 214 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + 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 + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //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 + +Button bText2 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 63 + y coordinate : 434 + Width : 213 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + 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 + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //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 btOnOff1 + Attributes + ID : 2 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 225 + y coordinate : 330 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed) : 1 + Back. Picture ID (Pressed) : 2 + 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 + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.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 btOnOff2 + Attributes + ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 226 + y coordinate : 425 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed) : 1 + Back. Picture ID (Pressed) : 2 + 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 + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.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 + +Hotspot mSwipeUp + Attributes + ID : 25 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipeNext + Attributes + ID : 26 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipePrev + Attributes + ID : 27 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + +Timer tmSerial + Attributes + ID : 5 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPosxTempMin.val) - { - xTempDest.val=xTempDest.val-xTempStep.val - } - // event,buttonPress2,entn,tempUpd,X - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," - //convert temperature - covx xTempDest.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 - -Button bUp - Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 251 - y coordinate : 189 - Width : 64 - Height : 64 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : image - Font ID : 0 - Background Picture ID (Unpressed) : 9 - Back. Picture ID (Pressed) : 9 - 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(xTempDest.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+="tempUpdHigh," + //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 + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 57 + y coordinate : 168 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1122,8 +1341,8 @@ Dual-state Button bt8 Font Color (Pressed) : 64512 Horizontal Alignment : center Vertical Alignment : center - State : pressed - Text :  + State : unpressed + Text :  Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -1131,9 +1350,18 @@ Dual-state Button bt8 Events Touch Press Event + if(xTempDest2.valxTempMin2.val) { - click bNext,1 + xTempDest2.val=xTempDest2.val-xTempStep2.val } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdLow," + //convert temperature + covx xTempDest2.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 btUp + Attributes + ID : 48 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 136 + y coordinate : 169 + 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) : 50712 + 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(xTempDest.valxTempMin1.val) + { + xTempDest.val=xTempDest.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.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 Hotspot mSwipeUp Attributes - ID : 42 + ID : 53 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1220,9 +1585,46 @@ Hotspot mSwipeUp click bPrev,1 } +Hotspot mSwipeNext + Attributes + ID : 54 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + Hotspot mSwipePrev Attributes - ID : 43 + ID : 55 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1259,7 +1661,7 @@ Hotspot mSwipePrev Timer tmSerial Attributes - ID : 5 + ID : 3 Scope : local Period (ms): 50 Enabled : yes @@ -1343,22 +1745,22 @@ Timer tmSerial //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,xTempCurr.val,0,0 + spstr strCommand.txt,tCurTemp.txt,"~",4 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 + xTempDest.val=xTempDest1.val //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 @@ -1368,7 +1770,6 @@ Timer tmSerial vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,0 //bt0 spstr strCommand.txt,bt0.txt,"~",10 if(bt0.txt!="") @@ -1489,20 +1890,33 @@ Timer tmSerial //enable vis bt7,1 } - //bt8 - spstr strCommand.txt,bt8.txt,"~",42 - if(bt8.txt!="") + //Text tCurTempLbl + spstr strCommand.txt,tCurTempLbl.txt,"~",42 + //Text tStateLbl + 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!="") { - // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",43 - covx tTmp.txt,bt8.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,"~",44 - covx tTmp.txt,bt8.val,0,0 - // save action - spstr strCommand.txt,va8.txt,"~",45 - //enable - vis bt8,1 + 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") @@ -1596,7 +2010,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 19 + ID : 12 Scope : local Period (ms): 1000 Enabled : yes @@ -1627,7 +2041,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 20 + ID : 13 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 41eda19a..802e498b 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -18,6 +18,10 @@ popupShutter 20 Component(s) 193 Line(s) of event code 109 Unique line(s) of event code +cardMedia + 33 Component(s) + 346 Line(s) of event code + 177 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code @@ -30,10 +34,10 @@ cardAlarm 38 Component(s) 360 Line(s) of event code 222 Unique line(s) of event code -cardMedia - 33 Component(s) - 346 Line(s) of event code - 177 Unique line(s) of event code +cardQR + 28 Component(s) + 247 Line(s) of event code + 137 Unique line(s) of event code popupLight 27 Component(s) 341 Line(s) of event code @@ -43,16 +47,16 @@ cardGrid 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 + 56 Component(s) + 542 Line(s) of event code + 288 Unique line(s) of event code cardEntities 77 Component(s) 1174 Line(s) of event code 487 Unique line(s) of event code Total - 12 Page(s) - 371 Component(s) - 3969 Line(s) of event code - 1086 Unique line(s) of event code + 13 Page(s) + 411 Component(s) + 4299 Line(s) of event code + 1117 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt new file mode 100644 index 00000000..b65ac942 --- /dev/null +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -0,0 +1,595 @@ +Page cardQR + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + + Events + Preinitialize Event + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) entn + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 100 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) entn1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Text tEntity1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity1 + Max. Text Size : 30 + +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text tEntity2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity1 + Max. Text Size : 30 + +Text tIcon2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text tHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : testHeading + Max. Text Size : 40 + +Picture p0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +QR Code qr0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Text : WIFI:S:SSID;T:WPA;P:PASSWORD;; + Max. Text Size : 105 + +Button bNext + 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 + tSend.txt="event,buttonPress2,cardAlarm,bNext" + //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 + +Button bPrev + 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 + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //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 + +Button bText1 + 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 + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //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 + +Button bText2 + 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 + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //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 btOnOff1 + 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 + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.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 btOnOff2 + 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 + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.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 + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + +Timer tmSerial + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPosxTempMin.val) - { - xTempDest.val=xTempDest.val-xTempStep.val - } - // event,buttonPress2,entn,tempUpd,X - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," - //convert temperature - covx xTempDest.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 - -Button bUp - 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(xTempDest.valxTempMin1.val) { - click bNext,1 + xTempDest1.val=xTempDest1.val-xTempStep1.val } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdHigh," + //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) + { + xTempDest2.val=xTempDest2.val-xTempStep2.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdLow," + //convert temperature + covx xTempDest2.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 btUp + 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(xTempDest.valxTempMin1.val) + { + xTempDest.val=xTempDest.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.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 Hotspot mSwipeUp Attributes @@ -650,6 +823,34 @@ Hotspot mSwipeUp click bPrev,1 } +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + Hotspot mSwipePrev Attributes Scope : local @@ -763,22 +964,22 @@ Timer tmSerial //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,xTempCurr.val,0,0 + spstr strCommand.txt,tCurTemp.txt,"~",4 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 + xTempDest.val=xTempDest1.val //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 @@ -788,7 +989,6 @@ Timer tmSerial vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,0 //bt0 spstr strCommand.txt,bt0.txt,"~",10 if(bt0.txt!="") @@ -909,20 +1109,33 @@ Timer tmSerial //enable vis bt7,1 } - //bt8 - spstr strCommand.txt,bt8.txt,"~",42 - if(bt8.txt!="") + //Text tCurTempLbl + spstr strCommand.txt,tCurTempLbl.txt,"~",42 + //Text tStateLbl + 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!="") { - // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",43 - covx tTmp.txt,bt8.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,"~",44 - covx tTmp.txt,bt8.val,0,0 - // save action - spstr strCommand.txt,va8.txt,"~",45 - //enable - vis bt8,1 + 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")