diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 18cf4acf..26ae4a25 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 23:31:12.408706139 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-13 22:10:33.092893183 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-13 22:10:34.040970512 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,9 +8,479 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // 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-13 22:10:33.092893183 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-13 22:10:34.040970512 +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-13 22:10:33.092893183 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-13 22:10:34.040970512 +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-13 22:10:33.092893183 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-13 22:10:34.040970512 +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-13 22:10:33.092893183 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-13 22:10:34.040970512 +0000 +@@ -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-13 22:10:33.092893183 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-13 22:10:34.044970838 +0000 +@@ -594,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 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 23:31:12.412706142 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-13 22:10:33.092893183 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-13 22:10:34.040970512 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index bd5ef5e2..b90ab1b5 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-07 23:31:11.384705439 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 23:31:11.864705767 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-13 22:10:33.092893183 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-13 22:10:33.556931032 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,9 +10,75 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardAlarm.txt 2022-05-13 22:10:33.092893183 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-13 22:10:33.556931032 +0000 +@@ -466,7 +466,7 @@ + prints crcval,2 + tCode.txt="" + +-Hotspot mSwipeNext ++Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 +@@ -486,15 +486,15 @@ + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt +- //Pressing right button if swiped on the right side of the screen ++ //Pressing left button if swiped on the left side of the screen + // +- spstr tId.txt,tTmp.txt,"|",1 ++ spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { +- click bNext,1 ++ click bPrev,1 + } + +-Hotspot mSwipeUp ++Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 +@@ -514,15 +514,15 @@ + //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 ++ //Pressing right button if swiped on the right side of the screen + // +- spstr tId.txt,tTmp.txt,"|",0 +- if(tTmp.txt=="2") ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="1") + { +- click bPrev,1 ++ click bNext,1 + } + +-Hotspot mSwipePrev ++Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 +@@ -542,10 +542,10 @@ + //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 ++ //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 +- if(tTmp.txt=="1") ++ if(tTmp.txt=="2") + { + click bPrev,1 + } diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-07 23:31:11.388705442 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 23:31:11.868705770 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-13 22:10:33.092893183 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-13 22:10:33.556931032 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -294,10 +360,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + page popupLight + } + - Timer tmSerial + Hotspot mSwipeNext Attributes - Scope : local -@@ -1644,6 +1872,128 @@ + Scope : local +@@ -1728,6 +1956,128 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -427,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-07 23:31:11.388705442 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-07 23:31:11.868705770 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-13 22:10:33.092893183 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-13 22:10:33.556931032 +0000 @@ -247,26 +247,30 @@ prints tSend.txt,0 prints crcval,2 @@ -748,8 +814,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 23:31:11.864705767 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-13 22:10:33.092893183 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-13 22:10:33.556931032 +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 c52976ff..9fd7acf4 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,11 +1,80 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 23:31:11.916705803 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 23:31:11.864705767 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-07 23:31:11.388705442 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 23:31:11.868705770 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-13 22:10:33.572932337 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-13 22:10:33.092893183 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-13 22:10:33.556931032 +0000 ++diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ++--- HMI/n2t-out/cardAlarm.txt 2022-05-13 22:10:33.092893183 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-13 22:10:33.556931032 +0000 ++@@ -466,7 +466,7 @@ ++ prints crcval,2 ++ tCode.txt="" ++ ++-Hotspot mSwipeNext +++Hotspot mSwipePrev ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -486,15 +486,15 @@ ++ //x & y coordinates where the swipe is first detected.) ++ //--------------------------- ++ //The navigation text is stored as local variable within tld.txt ++- //Pressing right button if swiped on the right side of the screen +++ //Pressing left button if swiped on the left side of the screen ++ // ++- spstr tId.txt,tTmp.txt,"|",1 +++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="1") ++ { ++- click bNext,1 +++ click bPrev,1 ++ } ++ ++-Hotspot mSwipeUp +++Hotspot mSwipeNext ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -514,15 +514,15 @@ ++ //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 +++ //Pressing right button if swiped on the right side of the screen ++ // ++- spstr tId.txt,tTmp.txt,"|",0 ++- if(tTmp.txt=="2") +++ spstr tId.txt,tTmp.txt,"|",1 +++ if(tTmp.txt=="1") ++ { ++- click bPrev,1 +++ click bNext,1 ++ } ++ ++-Hotspot mSwipePrev +++Hotspot mSwipeUp ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -542,10 +542,10 @@ ++ //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 +++ //Pressing up button if swiped on the top side of the screen ++ // ++ spstr tId.txt,tTmp.txt,"|",0 ++- if(tTmp.txt=="1") +++ if(tTmp.txt=="2") ++ { ++ click bPrev,1 ++ } ++--- HMI/n2t-out/cardEntities.txt 2022-05-13 22:10:33.092893183 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-13 22:10:33.556931032 +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-07 23:31:11.388705442 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-07 23:31:11.868705770 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-13 22:10:33.092893183 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-13 22:10:33.556931032 +0000 +@@ -247,26 +247,30 @@ + prints tSend.txt,0 + prints crcval,2 @@ -324,8 +393,8 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+--- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 23:31:11.864705767 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-13 22:10:33.092893183 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-13 22:10:33.556931032 +0000 +@@ -351,7 +351,7 @@ + + Events diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index a0acf2e2..b4796938 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -995,6 +995,117 @@ Button arm4 prints crcval,2 tCode.txt="" +Hotspot mSwipePrev + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + +Hotspot mSwipeNext + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 37 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 5 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 7f14f350..647a8f43 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2439,6 +2439,117 @@ Hotspot m4 page popupLight } +Hotspot mSwipeNext + Attributes + ID : 74 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 75 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 76 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 30 diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index fdb5dba0..f7c2a06c 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -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 : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot 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 : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot 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 : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 7 diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 81fedbce..15e966e7 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -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 : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot 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 : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 6 diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index ada68fd4..457c8664 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -551,7 +551,7 @@ Button bDown Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 3 + x coordinate : 9 y coordinate : 189 Width : 64 Height : 64 @@ -1146,6 +1146,117 @@ Dual-state Button bt8 prints tSend.txt,0 prints crcval,2 +Hotspot mSwipeNext + Attributes + ID : 41 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 42 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 43 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 5 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 7c9d0d04..6dd923ec 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -18,10 +18,10 @@ popupShutter 20 Component(s) 193 Line(s) of event code 109 Unique line(s) of event code -cardGrid - 39 Component(s) - 420 Line(s) of event code - 246 Unique line(s) of event code +cardMedia + 33 Component(s) + 346 Line(s) of event code + 177 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code @@ -30,29 +30,29 @@ screensaver 35 Component(s) 292 Line(s) of event code 235 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 + 38 Component(s) + 360 Line(s) of event code + 222 Unique line(s) of event code popupLight 27 Component(s) 341 Line(s) of event code 185 Unique line(s) of event code +cardGrid + 42 Component(s) + 435 Line(s) of event code + 252 Unique line(s) of event code cardThermo - 41 Component(s) - 444 Line(s) of event code - 249 Unique line(s) of event code + 44 Component(s) + 459 Line(s) of event code + 255 Unique line(s) of event code cardEntities - 74 Component(s) - 1159 Line(s) of event code - 481 Unique line(s) of event code + 77 Component(s) + 1174 Line(s) of event code + 487 Unique line(s) of event code Total 12 Page(s) - 356 Component(s) - 3894 Line(s) of event code - 1080 Unique line(s) of event code + 371 Component(s) + 3969 Line(s) of event code + 1086 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index a147c095..5a43ab1a 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -466,6 +466,90 @@ Button arm4 prints crcval,2 tCode.txt="" +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 + } + +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 + } + Timer tmSerial Attributes Scope : local diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 9a17912f..0945b287 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1302,6 +1302,90 @@ Hotspot m4 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/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 75c6d368..4845c21b 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/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/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 7494bc84..7e325d51 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -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/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index b43c969e..005a8ad9 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -594,6 +594,90 @@ Dual-state Button bt8 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/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index c58e6812..beca115b 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -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 : 440 + y coordinate : 5 + Width : 39 + 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/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index b1680e76..912202e6 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -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 : 440 + y coordinate : 5 + Width : 40 + 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 : 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 : 30 diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 110374b3..03919846 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -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 : 440 + y coordinate : 5 + Width : 40 + 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 : 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 : 41 + 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 : 7 diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 74573785..f83baffc 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -216,7 +216,7 @@ Text tTitle Opacity : 127 x coordinate : 84 y coordinate : 78 - Width : 360 + Width : 358 Height : 25 Effect : load Effect Priority : 0 @@ -246,7 +246,7 @@ Text tAuthor Opacity : 127 x coordinate : 85 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 : 306 + x coordinate : 302 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 : 203 + x coordinate : 199 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 : 96 + x coordinate : 92 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 : 5 + x coordinate : 7 y coordinate : 201 Width : 50 Height : 50 @@ -501,7 +501,7 @@ Text t3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 397 + x coordinate : 393 y coordinate : 201 Width : 50 Height : 50 @@ -672,7 +672,7 @@ Text t5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 397 + x coordinate : 393 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 : 59 + x coordinate : 61 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 : 440 + y coordinate : 5 + Width : 40 + 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/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 813a15aa..7458c026 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -127,7 +127,7 @@ XFloat xTempCurr Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 148 + x coordinate : 143 y coordinate : 70 Width : 90 Height : 35 @@ -157,7 +157,7 @@ XFloat xTempDest Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 301 + x coordinate : 296 y coordinate : 97 Width : 120 Height : 60 @@ -427,7 +427,7 @@ Text tStatus Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 148 + x coordinate : 143 y coordinate : 115 Width : 86 Height : 30 @@ -457,7 +457,7 @@ Text t2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 422 + x coordinate : 417 y coordinate : 115 Width : 25 Height : 30 @@ -504,7 +504,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 411 + x coordinate : 391 y coordinate : 16 Width : 50 Height : 50 @@ -551,7 +551,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 24 + x coordinate : 9 y coordinate : 16 Width : 50 Height : 50 @@ -1046,7 +1046,7 @@ Dual-state Button btUp1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 337 + x coordinate : 332 y coordinate : 46 Width : 50 Height : 50 @@ -1104,7 +1104,7 @@ Dual-state Button btDown1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 337 + x coordinate : 332 y coordinate : 158 Width : 50 Height : 50 @@ -1154,6 +1154,117 @@ Dual-state Button btDown1 prints tSend.txt,0 prints crcval,2 +Hotspot mSwipeNext + Attributes + ID : 41 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 440 + y coordinate : 5 + Width : 40 + 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 : 42 + 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 : 43 + 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/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index df2b1e9b..a97efb61 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,10 +10,6 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -cardMedia - 30 Component(s) - 331 Line(s) of event code - 171 Unique line(s) of event code popupNotify 17 Component(s) 196 Line(s) of event code @@ -26,10 +22,6 @@ 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 popupShutter 20 Component(s) 193 Line(s) of event code @@ -38,21 +30,29 @@ popupLight 27 Component(s) 341 Line(s) of event code 185 Unique line(s) of event code +cardMedia + 33 Component(s) + 346 Line(s) of event code + 177 Unique line(s) of event code +cardGrid + 42 Component(s) + 435 Line(s) of event code + 252 Unique line(s) of event code cardThermo - 41 Component(s) - 444 Line(s) of event code - 249 Unique line(s) of event code + 44 Component(s) + 459 Line(s) of event code + 255 Unique line(s) of event code cardAlarm - 35 Component(s) - 345 Line(s) of event code - 216 Unique line(s) of event code + 38 Component(s) + 360 Line(s) of event code + 222 Unique line(s) of event code cardEntities - 62 Component(s) - 966 Line(s) of event code - 412 Unique line(s) of event code + 65 Component(s) + 981 Line(s) of event code + 418 Unique line(s) of event code Total 12 Page(s) - 344 Component(s) - 3702 Line(s) of event code - 1025 Unique line(s) of event code + 359 Component(s) + 3777 Line(s) of event code + 1031 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index a147c095..b29a12ea 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/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/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index db0622ec..3ad04936 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/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/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 75c6d368..4845c21b 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/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/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 7494bc84..7e325d51 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -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/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index a31b9c09..d292f748 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -594,6 +594,90 @@ Dual-state Button btDown1 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