diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 3eb03b5f..aa41901f 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,1122 +1,16 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-15 08:50:22.549240409 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-15 08:50:23.405295820 +0000 -@@ -11,6 +11,4 @@ +--- HMI/n2t-out/Program.s.txt 2022-05-15 09:04:03.078760396 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-15 09:04:04.154766343 +0000 +@@ -11,6 +11,3 @@ // dim value int dimValue=40 int dimValueNormal=100 - // fix touch offset - 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-15 08:50:22.549240409 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-15 08:50:23.405295820 +0000 -@@ -466,90 +466,6 @@ - prints crcval,2 - tCode.txt="" - --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 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 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 -diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-15 08:50:22.553240668 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-15 08:50:23.405295820 +0000 -@@ -1074,90 +1074,6 @@ - page popupLight - } - --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 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 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 -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-15 08:50:22.549240409 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-15 08:50:23.405295820 +0000 -@@ -522,90 +522,6 @@ - page pageTest - } - --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 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 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 -diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-15 08:50:22.549240409 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-15 08:50:23.405295820 +0000 -@@ -223,7 +223,7 @@ - - Events - Touch Press Event -- hVolume.val=hVolume.val-1 -+ hVolume.val=hVolume.val-5 - // event,buttonPress2,internalNameEntity,volumeSlider,50 - //craft command - tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," -@@ -253,7 +253,7 @@ - - Events - Touch Press Event -- hVolume.val=hVolume.val+1 -+ hVolume.val=hVolume.val+5 - // event,buttonPress2,internalNameEntity,volumeSlider,50 - //craft command - tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," -@@ -456,90 +456,6 @@ - prints tSend.txt,0 - prints crcval,2 - --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 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 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 -diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-15 08:50:22.549240409 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-15 08:50:23.405295820 +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,37 +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 -+Text t2 - Attributes - Scope : local - Dragging : 0 -@@ -269,36 +215,6 @@ - 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 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- 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 -@@ -390,7 +306,7 @@ - prints tSend.txt,0 - prints crcval,2 - --Dual-state Button bt2 -+Dual-state Button bt1 - Attributes - Scope : local - Dragging : 0 -@@ -404,7 +320,7 @@ - Touch Press Event - //craft command - tSend.txt="event,buttonPress2,"+entn.txt -- tSend.txt+=",hvac_action,"+va2.txt -+ tSend.txt+=",hvac_action,"+va1.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -417,7 +333,7 @@ - prints tSend.txt,0 - prints crcval,2 - --Dual-state Button bt4 -+Dual-state Button bt2 - Attributes - Scope : local - Dragging : 0 -@@ -431,7 +347,7 @@ - Touch Press Event - //craft command - tSend.txt="event,buttonPress2,"+entn.txt -- tSend.txt+=",hvac_action,"+va4.txt -+ tSend.txt+=",hvac_action,"+va2.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -444,7 +360,7 @@ - prints tSend.txt,0 - prints crcval,2 - --Dual-state Button bt6 -+Dual-state Button bt3 - Attributes - Scope : local - Dragging : 0 -@@ -458,7 +374,7 @@ - Touch Press Event - //craft command - tSend.txt="event,buttonPress2,"+entn.txt -- tSend.txt+=",hvac_action,"+va6.txt -+ tSend.txt+=",hvac_action,"+va3.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -471,13 +387,13 @@ - prints tSend.txt,0 - prints crcval,2 - --Dual-state Button bt1 -+Dual-state Button bt4 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled -- State : pressed -+ State : unpressed - Text :  - Max. Text Size : 10 - -@@ -485,7 +401,7 @@ - Touch Press Event - //craft command - tSend.txt="event,buttonPress2,"+entn.txt -- tSend.txt+=",hvac_action,"+va1.txt -+ tSend.txt+=",hvac_action,"+va4.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -498,7 +414,7 @@ - prints tSend.txt,0 - prints crcval,2 - --Dual-state Button bt3 -+Dual-state Button bt5 - Attributes - Scope : local - Dragging : 0 -@@ -512,7 +428,7 @@ - Touch Press Event - //craft command - tSend.txt="event,buttonPress2,"+entn.txt -- tSend.txt+=",hvac_action,"+va3.txt -+ tSend.txt+=",hvac_action,"+va5.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -525,7 +441,7 @@ - prints tSend.txt,0 - prints crcval,2 - --Dual-state Button bt5 -+Dual-state Button bt6 - Attributes - Scope : local - Dragging : 0 -@@ -539,7 +455,7 @@ - Touch Press Event - //craft command - tSend.txt="event,buttonPress2,"+entn.txt -- tSend.txt+=",hvac_action,"+va5.txt -+ tSend.txt+=",hvac_action,"+va6.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -579,138 +495,21 @@ - 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+="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,"+va8.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -723,7 +522,7 @@ - prints tSend.txt,0 - prints crcval,2 - --Dual-state Button btUp -+Dual-state Button btUp1 - Attributes - Scope : local - Dragging : 0 -@@ -735,9 +534,9 @@ - - Events - Touch Press Event -- if(xTempDest.valxTempMin1.val) -+ if(xTempDest.val>xTempMin.val) - { -- xTempDest.val=xTempDest.val-xTempStep1.val -+ xTempDest.val=xTempDest.val-xTempStep.val - } - // event,buttonPress2,entn,tempUpd,X - //craft command -@@ -795,90 +594,6 @@ - prints tSend.txt,0 - prints crcval,2 - --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 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 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 -@@ -964,22 +679,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 +704,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 +825,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") +- page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-15 08:50:22.549240409 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-15 08:50:23.405295820 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-15 09:04:03.082760419 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-15 09:04:04.154766343 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/Program.s.txt b/HMI/US/landscape/n2t-out-visual/Program.s.txt index f321685e..82d30254 100644 --- a/HMI/US/landscape/n2t-out-visual/Program.s.txt +++ b/HMI/US/landscape/n2t-out-visual/Program.s.txt @@ -11,4 +11,3 @@ Program.s // dim value int dimValue=40 int dimValueNormal=100 - page pageStartup diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index fc701937..32da500c 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -101,7 +101,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 421 + x coordinate : 406 y coordinate : 277 Width : 34 Height : 30 @@ -131,7 +131,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 0 y coordinate : 290 Width : 100 Height : 30 @@ -161,7 +161,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 114 + x coordinate : 99 y coordinate : 290 Width : 39 Height : 30 @@ -995,6 +995,117 @@ Button arm4 prints crcval,2 tCode.txt="" +Hotspot mSwipeNext + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 472 + y coordinate : 5 + Width : 8 + Height : 310 + 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 mSwipeUp + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 426 + 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 mSwipePrev + Attributes + ID : 37 + 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 : 310 + 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 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index b5d38aa0..3d0aafc7 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -144,7 +144,7 @@ Number nNum1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 393 + x coordinate : 394 y coordinate : 76 Width : 46 Height : 50 @@ -174,7 +174,7 @@ Number nNum2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 393 + x coordinate : 394 y coordinate : 132 Width : 46 Height : 50 @@ -204,7 +204,7 @@ Number nNum3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 393 + x coordinate : 394 y coordinate : 186 Width : 45 Height : 50 @@ -234,7 +234,7 @@ Number nNum4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 393 + x coordinate : 394 y coordinate : 242 Width : 44 Height : 50 @@ -264,7 +264,7 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 126 + x coordinate : 127 y coordinate : 26 Width : 227 Height : 30 @@ -294,7 +294,7 @@ Text tEntity1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 92 + x coordinate : 93 y coordinate : 85 Width : 180 Height : 30 @@ -324,7 +324,7 @@ Text tEntity2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 93 + x coordinate : 94 y coordinate : 142 Width : 180 Height : 30 @@ -354,7 +354,7 @@ Text tEntity3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 93 + x coordinate : 94 y coordinate : 198 Width : 180 Height : 30 @@ -384,7 +384,7 @@ Text tEntity4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 93 + x coordinate : 94 y coordinate : 254 Width : 180 Height : 30 @@ -414,7 +414,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 40 + x coordinate : 41 y coordinate : 84 Width : 45 Height : 30 @@ -444,7 +444,7 @@ Text tIcon2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 40 + x coordinate : 41 y coordinate : 141 Width : 45 Height : 30 @@ -474,7 +474,7 @@ Text tIcon3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 40 + x coordinate : 41 y coordinate : 197 Width : 45 Height : 30 @@ -504,7 +504,7 @@ Text tIcon4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 40 + x coordinate : 41 y coordinate : 254 Width : 45 Height : 30 @@ -534,7 +534,7 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 16 y coordinate : 0 Width : 230 Height : 24 @@ -564,7 +564,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 409 + x coordinate : 410 y coordinate : 289 Width : 34 Height : 30 @@ -594,7 +594,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 16 y coordinate : 290 Width : 100 Height : 30 @@ -624,7 +624,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 114 + x coordinate : 115 y coordinate : 290 Width : 39 Height : 30 @@ -654,7 +654,7 @@ Picture p0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 1 y coordinate : 0 Width : 479 Height : 319 @@ -671,7 +671,7 @@ Slider hSlider1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 290 + x coordinate : 291 y coordinate : 79 Width : 100 Height : 43 @@ -714,7 +714,7 @@ Slider hSlider2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 291 + x coordinate : 292 y coordinate : 135 Width : 100 Height : 43 @@ -757,7 +757,7 @@ Slider hSlider3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 291 + x coordinate : 292 y coordinate : 189 Width : 100 Height : 43 @@ -800,7 +800,7 @@ Slider hSlider4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 289 + x coordinate : 290 y coordinate : 244 Width : 100 Height : 43 @@ -843,7 +843,7 @@ Button bDown1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 392 + x coordinate : 393 y coordinate : 75 Width : 50 Height : 50 @@ -890,7 +890,7 @@ Button bUp1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 290 + x coordinate : 291 y coordinate : 75 Width : 50 Height : 50 @@ -937,7 +937,7 @@ Button bStop1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 340 + x coordinate : 341 y coordinate : 75 Width : 50 Height : 50 @@ -984,7 +984,7 @@ Button bStop2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 341 + x coordinate : 342 y coordinate : 132 Width : 50 Height : 50 @@ -1031,7 +1031,7 @@ Button bDown2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 392 + x coordinate : 393 y coordinate : 131 Width : 50 Height : 50 @@ -1078,7 +1078,7 @@ Button bUp2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 290 + x coordinate : 291 y coordinate : 132 Width : 50 Height : 50 @@ -1125,7 +1125,7 @@ Button bStop3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 341 + x coordinate : 342 y coordinate : 185 Width : 50 Height : 50 @@ -1172,7 +1172,7 @@ Button bDown3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 393 + x coordinate : 394 y coordinate : 185 Width : 50 Height : 50 @@ -1219,7 +1219,7 @@ Button bUp3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 290 + x coordinate : 291 y coordinate : 186 Width : 50 Height : 50 @@ -1266,7 +1266,7 @@ Button bStop4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 341 + x coordinate : 342 y coordinate : 241 Width : 50 Height : 50 @@ -1313,7 +1313,7 @@ Button bDown4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 392 + x coordinate : 393 y coordinate : 241 Width : 50 Height : 50 @@ -1360,7 +1360,7 @@ Button bUp4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 290 + x coordinate : 291 y coordinate : 242 Width : 50 Height : 50 @@ -1407,7 +1407,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 24 + x coordinate : 25 y coordinate : 16 Width : 50 Height : 50 @@ -1461,7 +1461,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 406 + x coordinate : 407 y coordinate : 16 Width : 50 Height : 50 @@ -1508,7 +1508,7 @@ Button bText1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 292 + x coordinate : 293 y coordinate : 84 Width : 145 Height : 30 @@ -1555,7 +1555,7 @@ Button bText2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 291 + x coordinate : 292 y coordinate : 140 Width : 145 Height : 30 @@ -1602,7 +1602,7 @@ Button bText3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 292 + x coordinate : 293 y coordinate : 197 Width : 145 Height : 30 @@ -1649,7 +1649,7 @@ Button bText4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 292 + x coordinate : 293 y coordinate : 254 Width : 145 Height : 30 @@ -1696,7 +1696,7 @@ Dual-state Button btOnOff1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 387 + x coordinate : 388 y coordinate : 75 Width : 50 Height : 50 @@ -1741,7 +1741,7 @@ Dual-state Button btOnOff2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 388 + x coordinate : 389 y coordinate : 132 Width : 50 Height : 50 @@ -1786,7 +1786,7 @@ Dual-state Button btOnOff3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 389 + x coordinate : 390 y coordinate : 186 Width : 50 Height : 50 @@ -1831,7 +1831,7 @@ Dual-state Button btOnOff4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 389 + x coordinate : 390 y coordinate : 242 Width : 50 Height : 50 @@ -1876,7 +1876,7 @@ Hotspot mSpecial Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 323 + x coordinate : 324 y coordinate : 0 Width : 83 Height : 67 @@ -1902,7 +1902,7 @@ Hotspot m2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 40 + x coordinate : 41 y coordinate : 184 Width : 250 Height : 60 @@ -1933,7 +1933,7 @@ Hotspot m1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 39 + x coordinate : 40 y coordinate : 127 Width : 247 Height : 60 @@ -1964,7 +1964,7 @@ Hotspot m0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 37 + x coordinate : 38 y coordinate : 70 Width : 244 Height : 56 @@ -1995,7 +1995,7 @@ Hotspot m3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 38 + x coordinate : 39 y coordinate : 237 Width : 244 Height : 60 @@ -2018,6 +2018,117 @@ Hotspot m3 page popupLight } +Hotspot mSwipeNext + Attributes + ID : 62 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 473 + y coordinate : 5 + Width : 7 + Height : 310 + 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 mSwipeUp + Attributes + ID : 63 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 426 + 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 mSwipePrev + Attributes + ID : 64 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 8 + Height : 310 + 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 : 30 diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 58543f86..e66039e4 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -144,9 +144,9 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 126 - y coordinate : 26 - Width : 227 + x coordinate : 125 + y coordinate : 25 + Width : 226 Height : 30 Effect : load Effect Priority : 0 @@ -204,7 +204,7 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 0 y coordinate : 0 Width : 230 Height : 24 @@ -234,7 +234,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 415 + x coordinate : 400 y coordinate : 290 Width : 34 Height : 30 @@ -264,7 +264,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 0 y coordinate : 290 Width : 100 Height : 30 @@ -294,7 +294,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 126 + x coordinate : 111 y coordinate : 290 Width : 39 Height : 30 @@ -940,7 +940,7 @@ Hotspot mSpecial Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 323 + x coordinate : 308 y coordinate : 0 Width : 83 Height : 67 @@ -958,6 +958,117 @@ Hotspot mSpecial page pageTest } +Hotspot mSwipeNext + Attributes + ID : 39 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 471 + y coordinate : 5 + Width : 7 + Height : 310 + 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 mSwipeUp + Attributes + ID : 40 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 425 + Height : 7 + 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 mSwipePrev + Attributes + ID : 41 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 8 + Height : 310 + 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 : 7 diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 2bc18c40..10a4b00b 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -64,7 +64,7 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 16 y coordinate : 0 Width : 230 Height : 15 @@ -94,7 +94,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 29 + x coordinate : 14 y coordinate : 156 Width : 27 Height : 30 @@ -124,7 +124,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 311 + x coordinate : 296 y coordinate : 0 Width : 100 Height : 20 @@ -154,7 +154,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 64 + x coordinate : 49 y coordinate : 159 Width : 30 Height : 30 @@ -216,7 +216,7 @@ Text tTitle Opacity : 127 x coordinate : 99 y coordinate : 78 - Width : 360 + Width : 358 Height : 25 Effect : load Effect Priority : 0 @@ -246,7 +246,7 @@ Text tAuthor Opacity : 127 x coordinate : 100 y coordinate : 108 - Width : 360 + Width : 358 Height : 25 Effect : load Effect Priority : 0 @@ -274,7 +274,7 @@ Text t2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 321 + x coordinate : 317 y coordinate : 145 Width : 50 Height : 50 @@ -323,7 +323,7 @@ Text tPlayPause Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 218 + x coordinate : 214 y coordinate : 145 Width : 50 Height : 50 @@ -372,7 +372,7 @@ Text t0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 111 + x coordinate : 107 y coordinate : 145 Width : 50 Height : 50 @@ -451,7 +451,7 @@ Text t1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 20 + x coordinate : 22 y coordinate : 201 Width : 50 Height : 50 @@ -475,7 +475,7 @@ Text t1 Events Touch Press Event - hVolume.val=hVolume.val-5 + hVolume.val=hVolume.val-1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -501,7 +501,7 @@ Text t3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 412 + x coordinate : 408 y coordinate : 201 Width : 50 Height : 50 @@ -525,7 +525,7 @@ Text t3 Events Touch Press Event - hVolume.val=hVolume.val+5 + hVolume.val=hVolume.val+1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -672,7 +672,7 @@ Text t5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 412 + x coordinate : 408 y coordinate : 145 Width : 50 Height : 50 @@ -738,9 +738,9 @@ Slider hVolume Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 74 + x coordinate : 76 y coordinate : 206 - Width : 335 + Width : 328 Height : 43 Effect : load Effect Priority : 0 @@ -877,6 +877,117 @@ Button bPrev prints tSend.txt,0 prints crcval,2 +Hotspot mSwipeNext + Attributes + ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 472 + y coordinate : 5 + Width : 8 + Height : 310 + 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 mSwipeUp + Attributes + ID : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 426 + 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 mSwipePrev + Attributes + ID : 32 + 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 : 310 + 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 : 6 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 813a15aa..cae75446 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/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 @@ -38,127 +41,125 @@ Page cardThermo vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,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 bPrev,0 vis bNext,0 Variable (string) strCommand Attributes - ID : 6 + ID : 4 Scope : local Text : Max. Text Size: 250 Variable (string) entn Attributes - ID : 19 + ID : 14 Scope : local Text : Max. Text Size: 80 Variable (string) va0 Attributes - ID : 30 + ID : 24 Scope : local Text : Max. Text Size: 10 Variable (string) va1 Attributes - ID : 31 + ID : 25 Scope : local Text : Max. Text Size: 10 Variable (string) va2 Attributes - ID : 32 + ID : 26 Scope : local Text : Max. Text Size: 10 Variable (string) va3 Attributes - ID : 33 + ID : 27 Scope : local Text : Max. Text Size: 10 Variable (string) va4 Attributes - ID : 34 + ID : 28 Scope : local Text : Max. Text Size: 10 Variable (string) va5 Attributes - ID : 35 + ID : 29 Scope : local Text : Max. Text Size: 10 Variable (string) va6 Attributes - ID : 36 + ID : 30 Scope : local Text : Max. Text Size: 10 Variable (string) va7 Attributes - ID : 37 + ID : 31 Scope : local Text : Max. Text Size: 10 -Variable (string) va8 +Variable (string) tInstruction Attributes - ID : 38 + ID : 46 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tId + Attributes + ID : 47 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tTmp + Attributes + ID : 48 Scope : local Text : Max. Text Size: 10 -XFloat xTempCurr +Variable (string) tSend Attributes - ID : 11 + ID : 49 + Scope : local + Text : + Max. Text Size: 100 + +XFloat xTempDest1 + Attributes + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 148 - y coordinate : 70 - Width : 90 - Height : 35 - 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 - Value : 0 - Significant digits left : 0 - Significant digits right : 1 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -XFloat xTempDest - Attributes - ID : 13 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 301 - y coordinate : 97 + x coordinate : 307 + y coordinate : 118 Width : 120 Height : 60 Effect : load @@ -179,217 +180,7 @@ XFloat xTempDest Horizontal Spacing : 0 Vertical Spacing : 0 -XFloat xTempMin - Attributes - ID : 14 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 269 - y coordinate : 0 - Width : 51 - Height : 30 - 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 xTempMax - Attributes - ID : 15 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 320 - y coordinate : 0 - Width : 45 - Height : 30 - 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 xTempStep - Attributes - ID : 16 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 366 - y coordinate : 0 - Width : 45 - Height : 30 - 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 - -Text tSend - Attributes - ID : 2 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 15 - y coordinate : 0 - Width : 230 - Height : 23 - 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 - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tTmp - Attributes - ID : 3 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 421 - y coordinate : 277 - Width : 34 - Height : 30 - 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 - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tInstruction - Attributes - ID : 7 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 15 - y coordinate : 290 - Width : 100 - Height : 30 - 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 - Input Type : character - Text : - Max. Text Size : 20 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tId - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 114 - y coordinate : 290 - Width : 39 - Height : 30 - 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 - Input Type : character - Text : - Max. Text Size : 20 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tHeading +XFloat xTempMin1 Attributes ID : 9 Scope : local @@ -397,9 +188,249 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 5 - y coordinate : 257 - Width : 227 + x coordinate : 395 + y coordinate : 71 + Width : 50 + Height : 22 + 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 xTempMax1 + Attributes + ID : 10 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 395 + y coordinate : 93 + 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 xTempStep1 + Attributes + ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 396 + y coordinate : 181 + 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 xTempDest2 + Attributes + ID : 41 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 154 + 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 : 43 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 243 + 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 : 44 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 243 + 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 : 45 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 244 + y coordinate : 179 + 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 xTempDest + Attributes + ID : 52 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 233 + y coordinate : 119 + 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 + +Text tHeading + Attributes + ID : 5 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 76 + y coordinate : 26 + Width : 320 Height : 30 Effect : load Effect Priority : 0 @@ -421,15 +452,15 @@ Text tHeading Text tStatus Attributes - ID : 10 + ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 148 - y coordinate : 115 - Width : 86 + x coordinate : 23 + y coordinate : 200 + Width : 97 Height : 30 Effect : load Effect Priority : 0 @@ -449,16 +480,16 @@ Text tStatus Horizontal Spacing : 0 Vertical Spacing : 0 -Text t2 +Text tCF1 Attributes - ID : 12 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 422 - y coordinate : 115 + x coordinate : 428 + y coordinate : 116 Width : 25 Height : 30 Effect : load @@ -479,6 +510,186 @@ Text t2 Horizontal Spacing : 0 Vertical Spacing : 0 +Text tCurTempLbl + Attributes + ID : 37 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 25 + 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 : 38 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 24 + 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 tCF2 + Attributes + ID : 40 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 275 + y coordinate : 116 + 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 tALbl + Attributes + ID : 50 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 19 + y coordinate : 260 + Width : 67 + 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 : Action + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tCF + Attributes + ID : 54 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 354 + y coordinate : 116 + 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 tCurTemp + Attributes + ID : 55 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 25 + y coordinate : 121 + 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 : + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -498,13 +709,13 @@ Picture p0 Button bNext Attributes - ID : 4 + ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 411 + x coordinate : 403 y coordinate : 16 Width : 50 Height : 50 @@ -545,13 +756,13 @@ Button bNext Button bPrev Attributes - ID : 20 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 24 + x coordinate : 21 y coordinate : 16 Width : 50 Height : 50 @@ -599,16 +810,16 @@ Button bPrev Dual-state Button bt0 Attributes - ID : 21 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 8 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 94 + y coordinate : 255 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -646,67 +857,18 @@ Dual-state Button bt0 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt1 - Attributes - ID : 22 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 55 - y coordinate : 215 - Width : 30 - Height : 30 - 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 - //craft command - tSend.txt="event,buttonPress2,"+entn.txt - tSend.txt+=",hvac_action,"+va1.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 bt2 Attributes - ID : 23 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 102 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 184 + y coordinate : 255 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -744,67 +906,18 @@ Dual-state Button bt2 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt3 - Attributes - ID : 24 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 149 - y coordinate : 215 - Width : 30 - Height : 30 - 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 - //craft command - tSend.txt="event,buttonPress2,"+entn.txt - tSend.txt+=",hvac_action,"+va3.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 bt4 Attributes - ID : 25 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 196 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 274 + y coordinate : 255 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -842,18 +955,165 @@ Dual-state Button bt4 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt5 +Dual-state Button bt6 Attributes - ID : 26 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 29 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 364 + y coordinate : 255 + Width : 40 + Height : 40 + 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 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt+=",hvac_action,"+va6.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 bt1 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 139 + y coordinate : 255 + Width : 40 + Height : 40 + 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 : pressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt+=",hvac_action,"+va1.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 bt3 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 229 + y coordinate : 255 + Width : 40 + Height : 40 + 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 : pressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt+=",hvac_action,"+va3.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 bt5 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 319 + y coordinate : 255 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -891,67 +1151,18 @@ Dual-state Button bt5 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt6 - Attributes - ID : 27 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 76 - y coordinate : 215 - Width : 30 - Height : 30 - 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 : pressed - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - //craft command - tSend.txt="event,buttonPress2,"+entn.txt - tSend.txt+=",hvac_action,"+va6.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 bt7 Attributes - ID : 28 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 123 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 409 + y coordinate : 255 + Width : 40 + Height : 40 Effect : load Effect Priority : 0 Effect Time : 300 @@ -989,18 +1200,18 @@ Dual-state Button bt7 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt8 +Dual-state Button btUp1 Attributes - ID : 29 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 170 - y coordinate : 215 - Width : 30 - Height : 30 + x coordinate : 343 + y coordinate : 67 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1011,11 +1222,11 @@ Dual-state Button bt8 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 Font Color (Unpressed) : 50712 - Font Color (Pressed) : 64512 + Font Color (Pressed) : 50712 Horizontal Alignment : center Vertical Alignment : center - State : pressed - Text :  + State : unpressed + Text :  Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -1023,9 +1234,18 @@ Dual-state Button bt8 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+="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 : 39 Scope : local @@ -1046,8 +1324,8 @@ Dual-state Button btUp1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 337 - y coordinate : 46 + x coordinate : 190 + y coordinate : 67 Width : 50 Height : 50 Effect : load @@ -1072,17 +1350,17 @@ Dual-state Button btUp1 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 + 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 : 51 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 269 + y coordinate : 68 + 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 mSwipeNext + Attributes + ID : 34 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 472 + y coordinate : 5 + Width : 8 + Height : 310 + 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 mSwipeUp + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 0 + Width : 425 + Height : 8 + 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 mSwipePrev + Attributes + ID : 36 + 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 : 310 + 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 + ID : 3 Scope : local Period (ms): 50 Enabled : yes @@ -1240,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 @@ -1265,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!="") @@ -1386,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") @@ -1493,7 +2010,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 17 + ID : 12 Scope : local Period (ms): 1000 Enabled : yes @@ -1524,7 +2041,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 18 + ID : 13 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 7ed4eba2..dba31bff 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -1,7 +1,7 @@ Program.s 0 Component(s) - 10 Line(s) of event code - 10 Unique line(s) of event code + 9 Line(s) of event code + 9 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -10,49 +10,49 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code -popupNotify - 17 Component(s) - 196 Line(s) of event code - 123 Unique line(s) of event code -popupShutter - 20 Component(s) - 193 Line(s) of event code - 109 Unique line(s) of event code popupLight 27 Component(s) 341 Line(s) of event code 185 Unique line(s) of event code -cardMedia - 30 Component(s) - 331 Line(s) of event code - 171 Unique line(s) of event code -cardAlarm - 35 Component(s) - 345 Line(s) of event code - 216 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code +cardGrid + 42 Component(s) + 435 Line(s) of event code + 252 Unique line(s) of event code screensaver 35 Component(s) 292 Line(s) of event code 235 Unique line(s) of event code -cardGrid - 39 Component(s) - 420 Line(s) of event code - 246 Unique line(s) of event code -cardEntities - 62 Component(s) - 966 Line(s) of event code - 412 Unique line(s) of event code +cardAlarm + 38 Component(s) + 360 Line(s) of event code + 222 Unique line(s) of event code +popupShutter + 20 Component(s) + 193 Line(s) of event code + 109 Unique line(s) of event code +popupNotify + 17 Component(s) + 196 Line(s) of event code + 123 Unique line(s) of event code +cardMedia + 33 Component(s) + 346 Line(s) of event code + 177 Unique line(s) of event code cardThermo - 41 Component(s) - 444 Line(s) of event code - 249 Unique line(s) of event code + 56 Component(s) + 542 Line(s) of event code + 288 Unique line(s) of event code +cardEntities + 65 Component(s) + 981 Line(s) of event code + 418 Unique line(s) of event code Total 12 Page(s) - 344 Component(s) - 3701 Line(s) of event code - 1024 Unique line(s) of event code + 371 Component(s) + 3858 Line(s) of event code + 1059 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 99094960..4c8fe9d2 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -418,8 +418,8 @@ Picture p0 Opacity : 127 x coordinate : 0 y coordinate : 0 - Width : 480 - Height : 320 + Width : 479 + Height : 319 Effect : load Effect Priority : 0 Effect Time : 300 diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 02080052..4170b5b5 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -92,7 +92,7 @@ Text tEntity Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 107 + x coordinate : 108 y coordinate : 21 Width : 263 Height : 30 @@ -122,7 +122,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 26 + x coordinate : 27 y coordinate : 21 Width : 45 Height : 30 @@ -152,9 +152,9 @@ Text t1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 26 y coordinate : 226 - Width : 208 + Width : 211 Height : 30 Effect : load Effect Priority : 0 @@ -182,7 +182,7 @@ Text t2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 26 y coordinate : 267 Width : 45 Height : 30 @@ -212,7 +212,7 @@ Text t3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 26 y coordinate : 181 Width : 45 Height : 30 @@ -242,9 +242,9 @@ Text t4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 24 + x coordinate : 25 y coordinate : 143 - Width : 229 + Width : 242 Height : 30 Effect : load Effect Priority : 0 @@ -272,7 +272,7 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 16 y coordinate : 0 Width : 348 Height : 7 @@ -302,7 +302,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 421 + x coordinate : 422 y coordinate : 277 Width : 34 Height : 30 @@ -332,7 +332,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 16 y coordinate : 290 Width : 100 Height : 30 @@ -362,7 +362,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 115 + x coordinate : 116 y coordinate : 290 Width : 100 Height : 30 @@ -392,7 +392,7 @@ Text t0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 24 + x coordinate : 25 y coordinate : 80 Width : 64 Height : 30 @@ -439,7 +439,7 @@ Picture pColorWheel Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 182 + x coordinate : 183 y coordinate : 69 Width : 160 Height : 160 @@ -481,7 +481,7 @@ Slider hBrightness Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 76 + x coordinate : 77 y coordinate : 261 Width : 335 Height : 43 @@ -526,7 +526,7 @@ Slider hTempSlider Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 76 + x coordinate : 77 y coordinate : 178 Width : 335 Height : 44 @@ -571,7 +571,7 @@ Button b0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 412 + x coordinate : 413 y coordinate : 8 Width : 50 Height : 50 @@ -618,7 +618,7 @@ Button bColor Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 108 + x coordinate : 109 y coordinate : 68 Width : 50 Height : 50 @@ -675,7 +675,7 @@ Dual-state Button btOnOff1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 385 + x coordinate : 386 y coordinate : 79 Width : 50 Height : 50 diff --git a/HMI/US/landscape/n2t-out/Program.s.txt b/HMI/US/landscape/n2t-out/Program.s.txt index f321685e..82d30254 100644 --- a/HMI/US/landscape/n2t-out/Program.s.txt +++ b/HMI/US/landscape/n2t-out/Program.s.txt @@ -11,4 +11,3 @@ Program.s // dim value int dimValue=40 int dimValueNormal=100 - page pageStartup diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index a147c095..b29a12ea 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -466,6 +466,90 @@ Button arm4 prints crcval,2 tCode.txt="" +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 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 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 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index db0622ec..3ad04936 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1074,6 +1074,90 @@ Hotspot m3 page popupLight } +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 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 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 diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 75c6d368..4845c21b 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -522,6 +522,90 @@ Hotspot mSpecial page pageTest } +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 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 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 diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index 7494bc84..08993e47 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -223,7 +223,7 @@ Text t1 Events Touch Press Event - hVolume.val=hVolume.val-5 + hVolume.val=hVolume.val-1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -253,7 +253,7 @@ Text t3 Events Touch Press Event - hVolume.val=hVolume.val+5 + hVolume.val=hVolume.val+1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -456,6 +456,90 @@ Button bPrev prints tSend.txt,0 prints crcval,2 +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 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 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 diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index a31b9c09..a6a138e4 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/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 @@ -30,7 +33,14 @@ Page cardThermo vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,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 bPrev,0 vis bNext,0 @@ -94,13 +104,94 @@ Variable (string) va7 Text : Max. Text Size: 10 -Variable (string) va8 +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 Attributes Scope : local Text : Max. Text Size: 10 -XFloat xTempCurr +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 100 + +XFloat xTempDest1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +XFloat xTempMin1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +XFloat xTempMax1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + 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 Attributes Scope : local Dragging : 0 @@ -118,73 +209,6 @@ XFloat xTempDest Associated Keyboard : none Value : 0 -XFloat xTempMin - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -XFloat xTempMax - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -XFloat xTempStep - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - -Text tTmp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tInstruction - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 20 - -Text tId - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 20 - Text tHeading Attributes Scope : local @@ -205,7 +229,7 @@ Text tStatus Text : Max. Text Size : 10 -Text t2 +Text tCF1 Attributes Scope : local Dragging : 0 @@ -215,6 +239,66 @@ 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 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 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + 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 @@ -306,33 +390,6 @@ Dual-state Button bt0 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt1 - 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 - //craft command - tSend.txt="event,buttonPress2,"+entn.txt - tSend.txt+=",hvac_action,"+va1.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 bt2 Attributes Scope : local @@ -360,33 +417,6 @@ Dual-state Button bt2 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt3 - 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 - //craft command - tSend.txt="event,buttonPress2,"+entn.txt - tSend.txt+=",hvac_action,"+va3.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 bt4 Attributes Scope : local @@ -414,6 +444,87 @@ Dual-state Button bt4 prints tSend.txt,0 prints crcval,2 +Dual-state Button bt6 + 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 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt+=",hvac_action,"+va6.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 bt1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : pressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt+=",hvac_action,"+va1.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 bt3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : pressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt + tSend.txt+=",hvac_action,"+va3.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 bt5 Attributes Scope : local @@ -441,33 +552,6 @@ Dual-state Button bt5 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt6 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : pressed - Text :  - Max. Text Size : 10 - - Events - Touch Press Event - //craft command - tSend.txt="event,buttonPress2,"+entn.txt - tSend.txt+=",hvac_action,"+va6.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 bt7 Attributes Scope : local @@ -495,33 +579,6 @@ Dual-state Button bt7 prints tSend.txt,0 prints crcval,2 -Dual-state Button bt8 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : pressed - Text :  - Max. Text Size : 10 - - Events - 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 @@ -534,17 +591,17 @@ 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 + 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 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 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 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 @@ -679,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 @@ -704,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!="") @@ -825,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") diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 9f331ca3..d8b00360 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-15 08:50:22.549240409 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-15 08:50:22.973267856 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-15 09:04:03.078760396 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-15 09:04:03.594763248 +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-15 08:50:22.549240409 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-15 08:50:22.977268115 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-15 09:04:03.082760419 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-15 09:04:03.594763248 +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-15 08:50:22.553240668 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-15 08:50:22.977268115 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-15 09:04:03.082760419 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-15 09:04:03.594763248 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-15 08:50:22.549240409 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-15 08:50:22.977268115 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-15 09:04:03.082760419 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-15 09:04:03.594763248 +0000 @@ -17,12 +17,9 @@ vis tInstruction,0 vis tTmp,0 @@ -1248,8 +1248,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt } if(tInstruction.txt=="pageType") diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-15 08:50:22.549240409 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-15 08:50:22.977268115 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-15 09:04:03.082760419 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-15 09:04:03.594763248 +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 66ddc7a6..0206eb0e 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-15 08:50:22.989268892 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-15 08:50:22.549240409 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-15 08:50:22.973267856 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-15 09:04:03.610763337 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-15 09:04:03.078760396 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-15 09:04:03.594763248 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-15 08:50:22.549240409 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-15 08:50:22.977268115 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-15 09:04:03.082760419 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-15 09:04:03.594763248 +0000 +@@ -466,7 +466,7 @@ + prints crcval,2 + tCode.txt="" @@ -67,14 +67,14 @@ + { + click bPrev,1 + } -+--- HMI/n2t-out/cardEntities.txt 2022-05-15 08:50:22.553240668 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-15 08:50:22.977268115 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-15 09:04:03.082760419 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-15 09:04:03.594763248 +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-15 08:50:22.549240409 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-15 08:50:22.977268115 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-15 09:04:03.082760419 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-15 09:04:03.594763248 +0000 +@@ -17,12 +17,9 @@ + vis tInstruction,0 + vis tTmp,0 @@ -827,8 +827,8 @@ + } + } + if(tInstruction.txt=="pageType") -+--- HMI/n2t-out/pageStartup.txt 2022-05-15 08:50:22.549240409 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-15 08:50:22.977268115 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-15 09:04:03.082760419 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-15 09:04:03.594763248 +0000 +@@ -351,7 +351,7 @@ + + Events