diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index d3abb836..506bf35a 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-29 10:43:04.447010975 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 10:43:05.487062583 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 10:48:57.129101860 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-29 10:43:04.447010975 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-29 10:43:05.487062583 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-29 10:48:57.129101860 +0000 @@ -531,7 +531,24 @@ Events @@ -120,9 +120,121 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt bNext.txt="" } // get Type +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-29 10:48:57.129101860 +0000 +@@ -804,7 +804,24 @@ + + 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 +@@ -815,7 +832,24 @@ + + 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 +@@ -826,7 +860,24 @@ + + 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 +@@ -889,33 +940,25 @@ + 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="" + } + //entity name diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-29 10:43:04.447010975 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 10:43:05.487062583 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 10:48:57.129101860 +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 e553f356..8b004a24 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-29 10:43:04.447010975 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:43:04.919034398 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:48:56.665098330 +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-29 10:43:04.447010975 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:43:04.919034398 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:48:56.665098330 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-29 10:43:04.447010975 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 10:43:04.919034398 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 10:48:56.665098330 +0000 @@ -531,7 +531,24 @@ Events @@ -580,8 +580,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt } // get Type diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-29 10:43:04.447010975 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:43:04.919034398 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:48:56.665098330 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -591,9 +591,121 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 10:48:56.669098361 +0000 +@@ -804,7 +804,24 @@ + + 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 +@@ -815,7 +832,24 @@ + + 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 +@@ -826,7 +860,24 @@ + + 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 +@@ -889,33 +940,25 @@ + 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="" + } + //entity name diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-29 10:43:04.447010975 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:43:04.919034398 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:48:56.665098330 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -613,8 +725,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-29 10:43:04.447010975 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:43:04.919034398 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-29 10:48:56.237095075 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:48:56.665098330 +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 85405a14..33b5b31f 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 10:43:04.963036581 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-29 10:43:04.447010975 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:43:04.919034398 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:43:04.447010975 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:43:04.919034398 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 10:48:56.685098482 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-29 10:48:56.237095075 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:48:56.665098330 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:48:56.237095075 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:48:56.665098330 +0000 +@@ -1849,6 +2077,169 @@ +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-05-29 10:43:04.447010975 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 10:43:04.919034398 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-05-29 10:48:56.237095075 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 10:48:56.665098330 +0000 +@@ -531,7 +531,24 @@ + + Events @@ -116,10 +116,122 @@ + bNext.txt="" + } + // get Type -+--- HMI/n2t-out/cardQR.txt 2022-05-29 10:43:04.447010975 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:43:04.919034398 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:43:04.447010975 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:43:04.919034398 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-29 10:43:04.447010975 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:43:04.919034398 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-29 10:48:56.237095075 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:48:56.665098330 +0000 ++diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ++--- HMI/n2t-out/cardThermo.txt 2022-05-29 10:48:56.237095075 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 10:48:56.669098361 +0000 ++@@ -804,7 +804,24 @@ ++ ++ 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 ++@@ -815,7 +832,24 @@ ++ ++ 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 ++@@ -826,7 +860,24 @@ ++ ++ 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 ++@@ -889,33 +940,25 @@ ++ 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="" ++ } ++ //entity name ++--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:48:56.237095075 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:48:56.665098330 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-29 10:48:56.237095075 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:48:56.665098330 +0000 +@@ -471,22 +471,6 @@ diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index f9aea850..78617ef6 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1566,24 +1566,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 @@ -1603,24 +1586,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 @@ -1640,24 +1606,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 @@ -1721,25 +1670,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="" } //entity name diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 5908a609..f5d69f19 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -52,11 +52,11 @@ cardAlarm 224 Unique line(s) of event code cardThermo 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code + 542 Line(s) of event code + 292 Unique line(s) of event code Total 13 Page(s) 404 Component(s) - 4463 Line(s) of event code + 4459 Line(s) of event code 1184 Unique line(s) of event code diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index bfdef103..4cf78ed9 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -804,24 +804,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 @@ -832,24 +815,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 @@ -860,24 +826,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 @@ -940,25 +889,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="" } //entity name