diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index d9c583ff..4db94e91 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-21 09:36:00.466591225 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:36:01.466642112 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 09:47:26.832276242 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:47:27.912374380 +0000 @@ -11,6 +11,3 @@ // dim value int dimValue=40 @@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - page pageStartup Only in HMI/n2t-out: cardQR.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-21 09:36:00.466591225 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:36:01.470642316 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:47:26.832276242 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:47:27.912374380 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -22,8 +22,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-05-21 09:36:00.466591225 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:36:01.466642112 +0000 +--- HMI/n2t-out/pageTest.txt 2022-05-21 09:47:26.832276242 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:47:27.912374380 +0000 @@ -176,17 +176,3 @@ Touch Press Event bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index bc7b7e57..5f4953a0 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-21 09:36:00.466591225 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:36:00.950615855 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 09:47:26.832276242 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:47:27.368324948 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,52 +11,61 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:36:00.466591225 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:36:00.954616058 +0000 -@@ -494,7 +494,7 @@ - click bNext,1 - } +--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:47:26.832276242 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:47:27.368324948 +0000 +@@ -466,7 +466,7 @@ + prints crcval,2 + tCode.txt="" --Hotspot mSwipeUp +-Hotspot mSwipeNext +Hotspot mSwipePrev Attributes Scope : local Dragging : 0 -@@ -514,15 +514,15 @@ +@@ -486,12 +486,12 @@ //x & y coordinates where the swipe is first detected.) //--------------------------- //The navigation text is stored as local variable within tld.txt -- //Pressing up button if swiped on the top side of the screen +- //Pressing right button if swiped on the right side of the screen + //Pressing left button if swiped on the left side of the screen // - spstr tId.txt,tTmp.txt,"|",0 -- if(tTmp.txt=="2") -+ if(tTmp.txt=="1") +- spstr tId.txt,tTmp.txt,"|",1 ++ spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") { +- click bNext,1 ++ click bPrev,1 + } + + Hotspot mSwipeUp +@@ -522,7 +522,7 @@ click bPrev,1 } -Hotspot mSwipePrev -+Hotspot mSwipeUp ++Hotspot mSwipeNext Attributes Scope : local Dragging : 0 -@@ -542,10 +542,10 @@ +@@ -542,12 +542,12 @@ //x & y coordinates where the swipe is first detected.) //--------------------------- //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen -+ //Pressing up button if swiped on the top side of the screen ++ //Pressing right button if swiped on the right side of the screen // - spstr tId.txt,tTmp.txt,"|",0 -- if(tTmp.txt=="1") -+ if(tTmp.txt=="2") +- spstr tId.txt,tTmp.txt,"|",0 ++ spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") { - click bPrev,1 +- click bPrev,1 ++ click bNext,1 } + + Timer tmSerial diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-21 09:36:00.466591225 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:36:00.954616058 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:47:26.836276606 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:47:27.368324948 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -471,108 +480,114 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-21 09:36:00.466591225 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:36:00.954616058 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-21 09:47:26.832276242 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:47:27.368324948 +0000 @@ -295,7 +295,7 @@ prints tSend.txt,0 prints crcval,2 -Hotspot mSwipeNext -+Hotspot mSwipeUp ++Hotspot mSwipePrev Attributes Scope : local Dragging : 0 -@@ -315,15 +315,15 @@ +@@ -315,12 +315,12 @@ //x & y coordinates where the swipe is first detected.) //--------------------------- //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen -+ //Pressing up button if swiped on the top side of the screen ++ //Pressing left button if swiped on the left side of the screen // - spstr tId.txt,tTmp.txt,"|",1 -- if(tTmp.txt=="1") + spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt=="2") + if(tTmp.txt=="1") { - click bNext,1 + click bPrev,1 } --Hotspot mSwipeUp + Hotspot mSwipeUp +@@ -351,7 +351,7 @@ + click bPrev,1 + } + +-Hotspot mSwipePrev +Hotspot mSwipeNext Attributes Scope : local Dragging : 0 -@@ -343,12 +343,12 @@ +@@ -371,12 +371,12 @@ //x & y coordinates where the swipe is first detected.) //--------------------------- //The navigation text is stored as local variable within tld.txt -- //Pressing up button if swiped on the top side of the screen +- //Pressing left button if swiped on the left side of the screen + //Pressing right button if swiped on the right side of the screen // - spstr tId.txt,tTmp.txt,"|",0 -- if(tTmp.txt=="2") + spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="1") + if(tTmp.txt=="1") { - click bPrev,1 + click bNext,1 } - Hotspot mSwipePrev + Timer tmSerial diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-21 09:36:00.466591225 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:36:00.954616058 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:47:26.832276242 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:47:27.372325311 +0000 @@ -795,7 +795,7 @@ prints tSend.txt,0 prints crcval,2 -Hotspot mSwipeNext -+Hotspot mSwipeUp ++Hotspot mSwipePrev Attributes Scope : local Dragging : 0 -@@ -815,15 +815,15 @@ +@@ -815,12 +815,12 @@ //x & y coordinates where the swipe is first detected.) //--------------------------- //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen -+ //Pressing up button if swiped on the top side of the screen ++ //Pressing left button if swiped on the left side of the screen // - spstr tId.txt,tTmp.txt,"|",1 -- if(tTmp.txt=="1") + spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt=="2") + if(tTmp.txt=="1") { - click bNext,1 + click bPrev,1 } --Hotspot mSwipeUp + Hotspot mSwipeUp +@@ -851,7 +851,7 @@ + click bPrev,1 + } + +-Hotspot mSwipePrev +Hotspot mSwipeNext Attributes Scope : local Dragging : 0 -@@ -843,12 +843,12 @@ +@@ -871,12 +871,12 @@ //x & y coordinates where the swipe is first detected.) //--------------------------- //The navigation text is stored as local variable within tld.txt -- //Pressing up button if swiped on the top side of the screen +- //Pressing left button if swiped on the left side of the screen + //Pressing right button if swiped on the right side of the screen // - spstr tId.txt,tTmp.txt,"|",0 -- if(tTmp.txt=="2") + spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="1") + if(tTmp.txt=="1") { - click bPrev,1 + click bNext,1 } - Hotspot mSwipePrev + Timer tmSerial diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-21 09:36:00.466591225 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:36:00.950615855 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:47:26.832276242 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:47:27.368324948 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 8aa5974c..8098b59d 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,154 +1,169 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:36:00.982617483 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-21 09:36:00.466591225 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:36:00.950615855 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:47:27.384326401 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-21 09:47:26.832276242 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:47:27.368324948 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:36:00.466591225 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:36:00.954616058 +0000 -+@@ -494,7 +494,7 @@ -+ click bNext,1 -+ } ++--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:47:26.832276242 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:47:27.368324948 +0000 ++@@ -466,7 +466,7 @@ ++ prints crcval,2 ++ tCode.txt="" + -+-Hotspot mSwipeUp ++-Hotspot mSwipeNext ++Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 -+@@ -514,15 +514,15 @@ ++@@ -486,12 +486,12 @@ + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt -+- //Pressing up button if swiped on the top side of the screen ++- //Pressing right button if swiped on the right side of the screen ++ //Pressing left button if swiped on the left side of the screen + // -+ spstr tId.txt,tTmp.txt,"|",0 -+- if(tTmp.txt=="2") -++ if(tTmp.txt=="1") ++- spstr tId.txt,tTmp.txt,"|",1 +++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="1") + { ++- click bNext,1 +++ click bPrev,1 ++ } ++ ++ Hotspot mSwipeUp ++@@ -522,7 +522,7 @@ + click bPrev,1 + } + +-Hotspot mSwipePrev -++Hotspot mSwipeUp +++Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 -+@@ -542,10 +542,10 @@ ++@@ -542,12 +542,12 @@ + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt +- //Pressing left button if swiped on the left side of the screen -++ //Pressing up button if swiped on the top side of the screen +++ //Pressing right button if swiped on the right side of the screen + // -+ spstr tId.txt,tTmp.txt,"|",0 -+- if(tTmp.txt=="1") -++ if(tTmp.txt=="2") ++- spstr tId.txt,tTmp.txt,"|",0 +++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="1") + { -+ click bPrev,1 ++- click bPrev,1 +++ click bNext,1 + } -+--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:36:00.466591225 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:36:00.954616058 +0000 ++ ++ Timer tmSerial ++--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:47:26.836276606 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:47:27.368324948 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1728,6 +1956,128 @@ +diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt -+--- HMI/n2t-out/cardQR.txt 2022-05-21 09:36:00.466591225 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:36:00.954616058 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-21 09:47:26.832276242 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:47:27.368324948 +0000 +@@ -295,7 +295,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Hotspot mSwipeNext -++Hotspot mSwipeUp +++Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 -+@@ -315,15 +315,15 @@ ++@@ -315,12 +315,12 @@ + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt +- //Pressing right button if swiped on the right side of the screen -++ //Pressing up button if swiped on the top side of the screen +++ //Pressing left button if swiped on the left side of the screen + // +- spstr tId.txt,tTmp.txt,"|",1 -+- if(tTmp.txt=="1") ++ spstr tId.txt,tTmp.txt,"|",0 -++ if(tTmp.txt=="2") ++ if(tTmp.txt=="1") + { +- click bNext,1 ++ click bPrev,1 + } + -+-Hotspot mSwipeUp ++ Hotspot mSwipeUp ++@@ -351,7 +351,7 @@ ++ click bPrev,1 ++ } ++ ++-Hotspot mSwipePrev ++Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 -+@@ -343,12 +343,12 @@ ++@@ -371,12 +371,12 @@ + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt -+- //Pressing up button if swiped on the top side of the screen ++- //Pressing left button if swiped on the left side of the screen ++ //Pressing right button if swiped on the right side of the screen + // +- spstr tId.txt,tTmp.txt,"|",0 -+- if(tTmp.txt=="2") ++ spstr tId.txt,tTmp.txt,"|",1 -++ if(tTmp.txt=="1") ++ if(tTmp.txt=="1") + { +- click bPrev,1 ++ click bNext,1 + } + -+ Hotspot mSwipePrev ++ Timer tmSerial +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:36:00.466591225 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:36:00.954616058 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:47:26.832276242 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:47:27.372325311 +0000 +@@ -795,7 +795,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Hotspot mSwipeNext -++Hotspot mSwipeUp +++Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 -+@@ -815,15 +815,15 @@ ++@@ -815,12 +815,12 @@ + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt +- //Pressing right button if swiped on the right side of the screen -++ //Pressing up button if swiped on the top side of the screen +++ //Pressing left button if swiped on the left side of the screen + // +- spstr tId.txt,tTmp.txt,"|",1 -+- if(tTmp.txt=="1") ++ spstr tId.txt,tTmp.txt,"|",0 -++ if(tTmp.txt=="2") ++ if(tTmp.txt=="1") + { +- click bNext,1 ++ click bPrev,1 + } + -+-Hotspot mSwipeUp ++ Hotspot mSwipeUp ++@@ -851,7 +851,7 @@ ++ click bPrev,1 ++ } ++ ++-Hotspot mSwipePrev ++Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 -+@@ -843,12 +843,12 @@ ++@@ -871,12 +871,12 @@ + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt -+- //Pressing up button if swiped on the top side of the screen ++- //Pressing left button if swiped on the left side of the screen ++ //Pressing right button if swiped on the right side of the screen + // +- spstr tId.txt,tTmp.txt,"|",0 -+- if(tTmp.txt=="2") ++ spstr tId.txt,tTmp.txt,"|",1 -++ if(tTmp.txt=="1") ++ if(tTmp.txt=="1") + { +- click bPrev,1 ++ click bNext,1 + } + -+ Hotspot mSwipePrev -+--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:36:00.466591225 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:36:00.950615855 +0000 ++ Timer tmSerial ++--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:47:26.832276242 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:47:27.368324948 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index d78a6717..3abee875 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -995,46 +995,9 @@ Button arm4 prints crcval,2 tCode.txt="" -Hotspot mSwipeNext - Attributes - ID : 35 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 311 - y coordinate : 5 - Width : 9 - Height : 470 - Effect : load - Effect Priority : 0 - Effect Time : 300 - - Events - Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } - Hotspot mSwipePrev Attributes - ID : 36 + ID : 35 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1071,7 +1034,7 @@ Hotspot mSwipePrev Hotspot mSwipeUp Attributes - ID : 37 + ID : 36 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1106,6 +1069,43 @@ Hotspot mSwipeUp click bPrev,1 } +Hotspot mSwipeNext + Attributes + ID : 37 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + Timer tmSerial Attributes ID : 5 diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 07eca1be..a8a086d4 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -555,7 +555,7 @@ Dual-state Button btOnOff2 prints tSend.txt,0 prints crcval,2 -Hotspot mSwipeUp +Hotspot mSwipePrev Attributes ID : 25 Scope : local @@ -563,6 +563,43 @@ Hotspot mSwipeUp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + +Hotspot mSwipeUp + Attributes + ID : 26 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 x coordinate : 10 y coordinate : 0 Width : 300 @@ -594,7 +631,7 @@ Hotspot mSwipeUp Hotspot mSwipeNext Attributes - ID : 26 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -629,43 +666,6 @@ Hotspot mSwipeNext click bNext,1 } -Hotspot mSwipePrev - Attributes - ID : 27 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 5 - Width : 9 - Height : 470 - Effect : load - Effect Priority : 0 - Effect Time : 300 - - Events - Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } - Timer tmSerial Attributes ID : 5 diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 8fd3be6c..a472acf9 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -1548,7 +1548,7 @@ Dual-state Button btDown prints tSend.txt,0 prints crcval,2 -Hotspot mSwipeUp +Hotspot mSwipePrev Attributes ID : 53 Scope : local @@ -1556,6 +1556,43 @@ Hotspot mSwipeUp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + +Hotspot mSwipeUp + Attributes + ID : 54 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 x coordinate : 10 y coordinate : 0 Width : 300 @@ -1587,7 +1624,7 @@ Hotspot mSwipeUp Hotspot mSwipeNext Attributes - ID : 54 + ID : 55 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1622,43 +1659,6 @@ Hotspot mSwipeNext click bNext,1 } -Hotspot mSwipePrev - Attributes - ID : 55 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 5 - Width : 9 - Height : 470 - Effect : load - Effect Priority : 0 - Effect Time : 300 - - Events - Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } - Timer tmSerial Attributes ID : 3 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 da0a9ed2..ebea39c5 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 @@ -42,10 +42,6 @@ cardGrid 42 Component(s) 435 Line(s) of event code 252 Unique line(s) of event code -cardThermo - 56 Component(s) - 542 Line(s) of event code - 288 Unique line(s) of event code popupLight 27 Component(s) 341 Line(s) of event code @@ -54,6 +50,10 @@ cardEntities 77 Component(s) 1174 Line(s) of event code 487 Unique line(s) of event code +cardThermo + 56 Component(s) + 542 Line(s) of event code + 288 Unique line(s) of event code Total 13 Page(s) diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 1f70eb17..287e1af2 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -466,34 +466,6 @@ Button arm4 prints crcval,2 tCode.txt="" -Hotspot mSwipeNext - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - - Events - Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } - Hotspot mSwipePrev Attributes Scope : local @@ -550,6 +522,34 @@ Hotspot mSwipeUp click bPrev,1 } +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + Timer tmSerial Attributes Scope : local diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index b65ac942..fb04549a 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -295,6 +295,34 @@ Dual-state Button btOnOff2 prints tSend.txt,0 prints crcval,2 +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Hotspot mSwipeUp Attributes Scope : local @@ -351,34 +379,6 @@ Hotspot mSwipeNext click bNext,1 } -Hotspot mSwipePrev - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - - Events - Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } - Timer tmSerial Attributes Scope : local diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 04ddd7d2..35361768 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -795,6 +795,34 @@ Dual-state Button btDown prints tSend.txt,0 prints crcval,2 +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Hotspot mSwipeUp Attributes Scope : local @@ -851,34 +879,6 @@ Hotspot mSwipeNext click bNext,1 } -Hotspot mSwipePrev - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - - Events - Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } - Timer tmSerial Attributes Scope : local