diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 051407be..8cb359bb 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-28 22:14:04.109091295 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 22:14:04.997103549 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 10:36:25.636870604 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,9 +8,121 @@ 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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt +--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-29 10:36:25.640870659 +0000 +@@ -1083,24 +1083,7 @@ + + 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 +@@ -1111,24 +1094,7 @@ + + 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 +@@ -1139,24 +1105,7 @@ + + 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 +@@ -1219,25 +1168,33 @@ + if(tTmp.txt=="0") + { + vis bPrev,0 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 + bPrev.txt="" + } + if(tTmp.txt=="2") + { + vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 + bPrev.txt="" + } + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="0") + { + vis bNext,0 ++ tsw mSwipeNext,0 + } + if(tTmp.txt=="1") + { + vis bNext,1 ++ tsw mSwipeNext,1 + bNext.txt="" + } + // get Type diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-28 22:14:04.109091295 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 22:14:04.997103549 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 10:36:25.636870604 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index a80481ef..28d83f18 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2036,24 +2036,7 @@ Hotspot mSwipeNext 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 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -2073,24 +2056,7 @@ Hotspot mSwipeUp 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 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -2110,24 +2076,7 @@ Hotspot mSwipePrev 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 - } + click bPrev,1 Timer tmSerial Attributes @@ -2191,25 +2140,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 40de37a7..6b5ae0e5 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -52,11 +52,11 @@ screensaver 244 Unique line(s) of event code cardEntities 65 Component(s) - 1133 Line(s) of event code - 491 Unique line(s) of event code + 1129 Line(s) of event code + 493 Unique line(s) of event code Total 13 Page(s) 404 Component(s) - 4470 Line(s) of event code - 1175 Unique line(s) of event code + 4466 Line(s) of event code + 1183 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 0440bb4f..84a12478 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1083,24 +1083,7 @@ Hotspot mSwipeNext 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 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1111,24 +1094,7 @@ Hotspot mSwipeUp 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 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1139,24 +1105,7 @@ Hotspot mSwipePrev 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 - } + click bPrev,1 Timer tmSerial Attributes @@ -1219,25 +1168,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index af2058dc..350108a8 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-28 22:14:04.109091295 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 22:14:04.545095984 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:36:25.176864248 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-28 22:14:04.109091295 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 22:14:04.545095984 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:36:25.176864248 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -268,11 +268,49 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSpecial Attributes Scope : local -@@ -1074,6 +1280,28 @@ +@@ -1074,7 +1280,7 @@ page popupLight } +-Hotspot mSwipeNext +Hotspot m4 + Attributes + Scope : local + Dragging : 0 +@@ -1083,25 +1289,30 @@ + + 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") ++ pageIcons.tTmp1.txt=tEntity5.txt ++ pageIcons.tTmp2.txt=entn5.txt ++ if(type5.txt=="shutter") + { +- click bNext,1 ++ //popupShutter.tHeading.txt=tEntity5.txt ++ page popupShutter ++ } ++ if(type5.txt=="light") ++ { ++ //popupLight.tEntity.txt=tEntity5.txt ++ page popupLight + } + ++Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 @@ -281,23 +319,96 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + + Events + Touch Press Event -+ pageIcons.tTmp1.txt=tEntity5.txt -+ pageIcons.tTmp2.txt=entn5.txt -+ if(type5.txt=="shutter") -+ { -+ //popupShutter.tHeading.txt=tEntity5.txt -+ page popupShutter -+ } -+ if(type5.txt=="light") -+ { -+ //popupLight.tEntity.txt=tEntity5.txt -+ page popupLight -+ } ++ click bNext,1 + - Hotspot mSwipeNext + Hotspot mSwipeUp Attributes Scope : local -@@ -1892,6 +2120,169 @@ +@@ -1111,24 +1322,7 @@ + + 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 +@@ -1139,24 +1333,7 @@ + + 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 +@@ -1219,25 +1396,33 @@ + if(tTmp.txt=="0") + { + vis bPrev,0 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 + bPrev.txt="" + } + if(tTmp.txt=="2") + { + vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 + bPrev.txt="" + } + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="0") + { + vis bNext,0 ++ tsw mSwipeNext,0 + } + if(tTmp.txt=="1") + { + vis bNext,1 ++ tsw mSwipeNext,1 + bNext.txt="" + } + // get Type +@@ -1892,6 +2077,169 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -468,8 +579,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-28 22:14:04.109091295 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 22:14:04.545095984 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:36:25.176864248 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -480,8 +591,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-28 22:14:04.109091295 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 22:14:04.545095984 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:36:25.176864248 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -501,8 +612,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-28 22:14:04.109091295 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 22:14:04.545095984 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:36:25.176864248 +0000 @@ -471,22 +471,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 23d417e3..d35f4178 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,136 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 22:14:04.597096855 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-28 22:14:04.109091295 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 22:14:04.545095984 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-28 22:14:04.109091295 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 22:14:04.545095984 +0000 -+--- HMI/n2t-out/cardQR.txt 2022-05-28 22:14:04.109091295 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 22:14:04.545095984 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-28 22:14:04.109091295 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 22:14:04.545095984 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-28 22:14:04.109091295 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 22:14:04.545095984 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 10:36:25.192864469 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-29 10:36:24.748858334 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:36:25.176864248 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:36:24.748858334 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:36:25.176864248 +0000 ++@@ -1074,7 +1280,7 @@ ++-Hotspot mSwipeNext ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -1083,25 +1289,30 @@ ++ ++ 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 mSwipeNext +++ Attributes +++ Scope : local +++ Dragging : 0 +++ Disable release event after dragging: 0 +++ Send Component ID : disabled +++ +++ Events +++ Touch Press Event +++ click bNext,1 ++ Hotspot mSwipeUp ++@@ -1111,24 +1322,7 @@ ++ ++ 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 ++@@ -1139,24 +1333,7 @@ ++ ++ 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 ++@@ -1219,25 +1396,33 @@ ++ if(tTmp.txt=="0") ++ { ++ vis bPrev,0 +++ tsw mSwipePrev,0 +++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 +++ tsw mSwipePrev,1 +++ tsw mSwipeUp,0 ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 +++ tsw mSwipePrev,0 +++ tsw mSwipeUp,1 ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 +++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 +++ tsw mSwipeNext,1 ++ bNext.txt="" ++ } ++ // get Type ++@@ -1892,6 +2077,169 @@ ++--- HMI/n2t-out/cardQR.txt 2022-05-29 10:36:24.748858334 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:36:25.176864248 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:36:24.748858334 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:36:25.176864248 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-29 10:36:24.748858334 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:36:25.176864248 +0000 +@@ -471,22 +471,6 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 0efd53d3..3861fe1b 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2457,24 +2457,7 @@ Hotspot mSwipeNext 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 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -2494,24 +2477,7 @@ Hotspot mSwipeUp 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 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -2531,24 +2497,7 @@ Hotspot mSwipePrev 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 - } + click bPrev,1 Timer tmSerial Attributes @@ -2612,25 +2561,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type 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 01a63674..c455a4a3 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 @@ -48,8 +48,8 @@ screensaver 229 Unique line(s) of event code cardEntities 77 Component(s) - 1363 Line(s) of event code - 576 Unique line(s) of event code + 1359 Line(s) of event code + 578 Unique line(s) of event code cardThermo 56 Component(s) 546 Line(s) of event code @@ -58,5 +58,5 @@ cardThermo Total 13 Page(s) 416 Component(s) - 4685 Line(s) of event code - 1232 Unique line(s) of event code + 4681 Line(s) of event code + 1240 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 8805505a..96e2e362 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1311,24 +1311,7 @@ Hotspot mSwipeNext 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 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1339,24 +1322,7 @@ Hotspot mSwipeUp 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 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1367,24 +1333,7 @@ Hotspot mSwipePrev 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 - } + click bPrev,1 Timer tmSerial Attributes @@ -1447,25 +1396,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type