From 2968bd6c0b8958db57ea548e3b7f8a81338ce5d3 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 29 May 2022 11:05:00 +0000 Subject: [PATCH] edge swipe (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 94 ++++++++- HMI/US/landscape/n2t-out-visual/cardAlarm.txt | 65 ++----- HMI/US/landscape/n2t-out-visual/cardMedia.txt | 8 + HMI/US/landscape/n2t-out-visual/cardQR.txt | 65 ++----- .../n2t-out-visual/nspanel_US_L_Stats.txt | 12 +- HMI/US/landscape/n2t-out/cardAlarm.txt | 65 ++----- HMI/US/landscape/n2t-out/cardMedia.txt | 8 + HMI/US/landscape/n2t-out/cardQR.txt | 65 ++----- HMI/US/portrait/diff-eu-version.txt | 182 ++--------------- HMI/US/portrait/diff-filtered.txt | 184 ++---------------- HMI/US/portrait/n2t-out-visual/cardAlarm.txt | 65 ++----- HMI/US/portrait/n2t-out-visual/cardGrid.txt | 57 +----- HMI/US/portrait/n2t-out-visual/cardMedia.txt | 65 ++----- HMI/US/portrait/n2t-out-visual/cardQR.txt | 65 ++----- HMI/US/portrait/n2t-out-visual/cardThermo.txt | 57 +----- .../n2t-out-visual/nspanel_US_P_Stats.txt | 36 ++-- HMI/US/portrait/n2t-out/cardAlarm.txt | 65 ++----- HMI/US/portrait/n2t-out/cardGrid.txt | 57 +----- HMI/US/portrait/n2t-out/cardMedia.txt | 65 ++----- HMI/US/portrait/n2t-out/cardQR.txt | 65 ++----- HMI/US/portrait/n2t-out/cardThermo.txt | 57 +----- HMI/n2t-out-visual/cardAlarm.txt | 65 ++----- HMI/n2t-out-visual/cardMedia.txt | 65 ++----- HMI/n2t-out-visual/cardQR.txt | 65 ++----- HMI/n2t-out-visual/nspanel_Stats.txt | 16 +- HMI/n2t-out/cardAlarm.txt | 65 ++----- HMI/n2t-out/cardMedia.txt | 65 ++----- HMI/n2t-out/cardQR.txt | 65 ++----- 28 files changed, 355 insertions(+), 1453 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 506bf35a..f7e31528 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:48:56.237095075 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 10:48:57.129101860 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 11:04:58.994702886 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 11:04:59.930701874 +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:48:56.237095075 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-29 10:48:57.129101860 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-29 11:04:58.994702886 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-29 11:04:59.930701874 +0000 @@ -531,7 +531,24 @@ Events @@ -120,9 +120,87 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt bNext.txt="" } // get Type +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-05-29 11:04:58.994702886 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-29 11:04:59.930701874 +0000 +@@ -465,7 +465,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 +@@ -476,7 +493,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 +@@ -487,7 +521,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 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 +--- HMI/n2t-out/cardThermo.txt 2022-05-29 11:04:58.998702881 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-29 11:04:59.930701874 +0000 @@ -804,7 +804,24 @@ Events @@ -233,8 +311,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.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:48:56.237095075 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 10:48:57.129101860 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:04:58.994702886 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 11:04:59.930701874 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 0669f985..84e52341 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -1013,24 +1013,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 @@ -1050,24 +1033,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 @@ -1087,24 +1053,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 @@ -1168,25 +1117,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="" } //text arm1 diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 52ba5c7a..853e925e 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -1050,25 +1050,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/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index 534f9d9a..6f11a74b 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -597,24 +597,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 @@ -634,24 +617,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 @@ -671,24 +637,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 @@ -753,25 +702,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="" } //text qrcode 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 6b5ae0e5..5d4564cf 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 @@ -20,8 +20,8 @@ pageStartup 115 Unique line(s) of event code cardAlarm 38 Component(s) - 364 Line(s) of event code - 224 Unique line(s) of event code + 360 Line(s) of event code + 226 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code @@ -32,16 +32,16 @@ popupShutter 138 Unique line(s) of event code cardQR 30 Component(s) - 363 Line(s) of event code - 207 Unique line(s) of event code + 359 Line(s) of event code + 209 Unique line(s) of event code popupLight 27 Component(s) 348 Line(s) of event code 188 Unique line(s) of event code cardMedia 33 Component(s) - 350 Line(s) of event code - 179 Unique line(s) of event code + 358 Line(s) of event code + 185 Unique line(s) of event code cardThermo 56 Component(s) 546 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index f076f39d..3b44119a 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -475,24 +475,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 @@ -503,24 +486,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 @@ -531,24 +497,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 @@ -611,25 +560,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="" } //text arm1 diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index 3cfbfe02..96515074 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -601,25 +601,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/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 7f60a8ea..d9fe4bd4 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -326,24 +326,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 @@ -354,24 +337,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 @@ -382,24 +348,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 @@ -463,25 +412,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="" } //text qrcode diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 8b004a24..f190f595 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:48:56.237095075 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:48:56.665098330 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 11:04:58.994702886 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:04:59.430702414 +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:48:56.237095075 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:48:56.665098330 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-29 11:04:58.994702886 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:04:59.430702414 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,84 +468,9 @@ 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:48:56.237095075 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 10:48:56.665098330 +0000 -@@ -531,7 +531,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 -@@ -542,7 +559,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 -@@ -553,7 +587,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 -@@ -616,33 +667,25 @@ +--- HMI/n2t-out/cardGrid.txt 2022-05-29 11:04:58.994702886 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 11:04:59.430702414 +0000 +@@ -616,33 +616,25 @@ if(tTmp.txt=="0") { vis bPrev,0 @@ -580,8 +505,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:48:56.237095075 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:48:56.665098330 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-29 11:04:58.994702886 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:04:59.430702414 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -592,84 +517,9 @@ 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 @@ +--- HMI/n2t-out/cardThermo.txt 2022-05-29 11:04:58.998702881 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 11:04:59.430702414 +0000 +@@ -889,33 +889,25 @@ if(tTmp.txt=="0") { vis bPrev,0 @@ -704,8 +554,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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:48:56.237095075 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:48:56.665098330 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:04:58.994702886 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:04:59.430702414 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -725,8 +575,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:48:56.237095075 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:48:56.665098330 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-29 11:04:58.994702886 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:04:59.430702414 +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 33b5b31f..3bc16246 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,88 +1,13 @@ -+++ 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 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 11:04:59.486702354 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-29 11:04:58.994702886 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:04:59.430702414 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-29 11:04:58.994702886 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:04:59.430702414 +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:48:56.237095075 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 10:48:56.665098330 +0000 -+@@ -531,7 +531,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 -+@@ -542,7 +559,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 -+@@ -553,7 +587,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 -+@@ -616,33 +667,25 @@ ++--- HMI/n2t-out/cardGrid.txt 2022-05-29 11:04:58.994702886 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 11:04:59.430702414 +0000 ++@@ -616,33 +616,25 @@ + if(tTmp.txt=="0") + { + vis bPrev,0 @@ -116,87 +41,12 @@ + bNext.txt="" + } + // get Type -+--- 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 ++--- HMI/n2t-out/cardQR.txt 2022-05-29 11:04:58.994702886 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:04:59.430702414 +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 @@ ++--- HMI/n2t-out/cardThermo.txt 2022-05-29 11:04:58.998702881 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 11:04:59.430702414 +0000 ++@@ -889,33 +889,25 @@ + if(tTmp.txt=="0") + { + vis bPrev,0 @@ -230,8 +80,8 @@ + 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 ++--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:04:58.994702886 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:04:59.430702414 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-29 11:04:58.994702886 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:04:59.430702414 +0000 +@@ -471,22 +471,6 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index b25bdace..242b4086 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -1013,24 +1013,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 @@ -1050,24 +1033,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 @@ -1087,24 +1053,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 @@ -1168,25 +1117,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="" } //text arm1 diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 85bcd160..5b6cdf96 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -976,24 +976,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 @@ -1013,24 +996,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 @@ -1050,24 +1016,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 diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 5a041859..33d54b08 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -895,24 +895,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 @@ -932,24 +915,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 @@ -969,24 +935,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 @@ -1050,25 +999,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/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 0ede21e2..3145a9e8 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -597,24 +597,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 @@ -634,24 +617,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 @@ -671,24 +637,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 @@ -753,25 +702,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="" } //text qrcode diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 69f8f369..4b911c19 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/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 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 c455a4a3..7e34ecab 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 @@ -2,6 +2,10 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code +cardAlarm + 38 Component(s) + 360 Line(s) of event code + 226 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -14,26 +18,26 @@ popupNotify 17 Component(s) 200 Line(s) of event code 125 Unique line(s) of event code -cardGrid - 42 Component(s) - 439 Line(s) of event code - 254 Unique line(s) of event code popupLight 27 Component(s) 348 Line(s) of event code 188 Unique line(s) of event code +cardGrid + 42 Component(s) + 427 Line(s) of event code + 250 Unique line(s) of event code +cardThermo + 56 Component(s) + 534 Line(s) of event code + 286 Unique line(s) of event code cardQR 30 Component(s) - 363 Line(s) of event code - 207 Unique line(s) of event code -cardAlarm - 38 Component(s) - 364 Line(s) of event code - 224 Unique line(s) of event code + 359 Line(s) of event code + 209 Unique line(s) of event code cardMedia 33 Component(s) - 350 Line(s) of event code - 179 Unique line(s) of event code + 346 Line(s) of event code + 181 Unique line(s) of event code pageStartup 19 Component(s) 154 Line(s) of event code @@ -50,13 +54,9 @@ cardEntities 77 Component(s) 1359 Line(s) of event code 578 Unique line(s) of event code -cardThermo - 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code Total 13 Page(s) 416 Component(s) - 4681 Line(s) of event code - 1240 Unique line(s) of event code + 4645 Line(s) of event code + 1234 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 f076f39d..3b44119a 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -475,24 +475,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 @@ -503,24 +486,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 @@ -531,24 +497,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 @@ -611,25 +560,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="" } //text arm1 diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 12d623a0..b3d143b3 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -531,24 +531,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 @@ -559,24 +542,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 @@ -587,24 +553,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 diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 3cfbfe02..35913768 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -465,24 +465,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 @@ -493,24 +476,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 @@ -521,24 +487,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 @@ -601,25 +550,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/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 50ada2f8..348cea14 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -326,24 +326,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 @@ -354,24 +337,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 @@ -382,24 +348,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 @@ -463,25 +412,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="" } //text qrcode diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index bfdef103..670ff0b6 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/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 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 1751be37..23b485ae 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1013,24 +1013,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 @@ -1050,24 +1033,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 @@ -1087,24 +1053,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 @@ -1168,25 +1117,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="" } //text arm1 diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index b2433dd3..de4d4a0b 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -895,24 +895,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 @@ -932,24 +915,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 @@ -969,24 +935,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 @@ -1050,25 +999,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/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index 2c97a278..f3fc235d 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -597,24 +597,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 @@ -634,24 +617,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 @@ -671,24 +637,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 @@ -753,25 +702,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="" } //text qrcode diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index f5d69f19..aa9ae10f 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -16,8 +16,8 @@ pageStartup 115 Unique line(s) of event code cardMedia 33 Component(s) - 350 Line(s) of event code - 179 Unique line(s) of event code + 346 Line(s) of event code + 181 Unique line(s) of event code popupNotify 17 Component(s) 200 Line(s) of event code @@ -32,8 +32,8 @@ cardEntities 493 Unique line(s) of event code cardQR 30 Component(s) - 363 Line(s) of event code - 207 Unique line(s) of event code + 359 Line(s) of event code + 209 Unique line(s) of event code popupShutter 20 Component(s) 244 Line(s) of event code @@ -48,8 +48,8 @@ cardGrid 256 Unique line(s) of event code cardAlarm 38 Component(s) - 364 Line(s) of event code - 224 Unique line(s) of event code + 360 Line(s) of event code + 226 Unique line(s) of event code cardThermo 56 Component(s) 542 Line(s) of event code @@ -58,5 +58,5 @@ cardThermo Total 13 Page(s) 404 Component(s) - 4459 Line(s) of event code - 1184 Unique line(s) of event code + 4447 Line(s) of event code + 1178 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index f076f39d..3b44119a 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -475,24 +475,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 @@ -503,24 +486,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 @@ -531,24 +497,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 @@ -611,25 +560,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="" } //text arm1 diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 3cfbfe02..35913768 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -465,24 +465,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 @@ -493,24 +476,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 @@ -521,24 +487,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 @@ -601,25 +550,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/cardQR.txt b/HMI/n2t-out/cardQR.txt index 7f60a8ea..d9fe4bd4 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -326,24 +326,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 @@ -354,24 +337,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 @@ -382,24 +348,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 @@ -463,25 +412,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="" } //text qrcode