diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index f7e31528..add089f7 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 11:04:58.994702886 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 11:04:59.930701874 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 11:14:46.568572153 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 11:14:47.428560992 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,311 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- 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 - 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 @@ - if(tTmp.txt=="0") - { - vis bPrev,0 -- tsw mSwipePrev,0 -- tsw mSwipeUp,0 - } - if(tTmp.txt=="1") - { - vis bPrev,1 -- tsw mSwipePrev,1 -- tsw mSwipeUp,0 - bPrev.txt="" - } - if(tTmp.txt=="2") - { - vis bPrev,1 -- tsw mSwipePrev,0 -- tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") - { - vis bNext,0 -- tsw mSwipeNext,0 - } - if(tTmp.txt=="1") - { - vis bNext,1 -- tsw mSwipeNext,1 - bNext.txt="" - } - // get Type -diff -bur HMI/n2t-out/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 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 - Touch Press Event -+ //This thin hotspot down the edge will intercept swipes -+ //from the bezel into the screen area before the -+ //Nextion register touch for any other components - -+ //IF the hotspot is 'layered' at the top (use the up -+ //arrow at the far left of the Nextion Editor Tool Bar). -+ // -+ //Calibrate how wide the edge hotspot has to be on your -+ //own physical device using this screen to test the -+ //x & y coordinates where the swipe is first detected.) -+ //--------------------------- -+ //The navigation text is stored as local variable within tld.txt -+ //Pressing right button if swiped on the right side of the screen -+ // -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="1") -+ { - click bNext,1 -+ } - - Hotspot mSwipeUp - Attributes -@@ -815,7 +832,24 @@ - - Events - Touch Press Event -+ //This thin hotspot down the edge will intercept swipes -+ //from the bezel into the screen area before the -+ //Nextion register touch for any other components - -+ //IF the hotspot is 'layered' at the top (use the up -+ //arrow at the far left of the Nextion Editor Tool Bar). -+ // -+ //Calibrate how wide the edge hotspot has to be on your -+ //own physical device using this screen to test the -+ //x & y coordinates where the swipe is first detected.) -+ //--------------------------- -+ //The navigation text is stored as local variable within tld.txt -+ //Pressing up button if swiped on the top side of the screen -+ // -+ spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt=="2") -+ { - click bPrev,1 -+ } - - Hotspot mSwipePrev - Attributes -@@ -826,7 +860,24 @@ - - Events - Touch Press Event -+ //This thin hotspot down the edge will intercept swipes -+ //from the bezel into the screen area before the -+ //Nextion register touch for any other components - -+ //IF the hotspot is 'layered' at the top (use the up -+ //arrow at the far left of the Nextion Editor Tool Bar). -+ // -+ //Calibrate how wide the edge hotspot has to be on your -+ //own physical device using this screen to test the -+ //x & y coordinates where the swipe is first detected.) -+ //--------------------------- -+ //The navigation text is stored as local variable within tld.txt -+ //Pressing left button if swiped on the left side of the screen -+ // -+ spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt=="1") -+ { - click bPrev,1 -+ } - - Timer tmSerial - Attributes -@@ -889,33 +940,25 @@ - if(tTmp.txt=="0") - { - vis bPrev,0 -- tsw mSwipePrev,0 -- tsw mSwipeUp,0 - } - if(tTmp.txt=="1") - { - vis bPrev,1 -- tsw mSwipePrev,1 -- tsw mSwipeUp,0 - bPrev.txt="" - } - if(tTmp.txt=="2") - { - vis bPrev,1 -- tsw mSwipePrev,0 -- tsw mSwipeUp,1 - bPrev.txt="" - } - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="0") - { - vis bNext,0 -- tsw mSwipeNext,0 - } - if(tTmp.txt=="1") - { - vis bNext,1 -- tsw mSwipeNext,1 - bNext.txt="" - } - //entity name diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-29 11:04:58.994702886 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 11:04:59.930701874 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:14:46.568572153 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 11:14:47.428560992 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 7115454f..537c73a9 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/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 @@ -1131,25 +1080,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 853e925e..15083a7c 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/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 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 2812073d..5cdaea0c 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -1566,24 +1566,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1603,24 +1586,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1640,24 +1606,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1721,25 +1670,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 5d4564cf..a06ec260 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 @@ -18,14 +18,10 @@ pageStartup 19 Component(s) 154 Line(s) of event code 115 Unique line(s) of event code -cardAlarm - 38 Component(s) - 360 Line(s) of event code - 226 Unique line(s) of event code -cardGrid - 42 Component(s) - 439 Line(s) of event code - 254 Unique line(s) of event code +cardThermo + 56 Component(s) + 542 Line(s) of event code + 292 Unique line(s) of event code popupShutter 20 Component(s) 244 Line(s) of event code @@ -38,14 +34,18 @@ popupLight 27 Component(s) 348 Line(s) of event code 188 Unique line(s) of event code +cardGrid + 42 Component(s) + 435 Line(s) of event code + 256 Unique line(s) of event code +cardAlarm + 38 Component(s) + 360 Line(s) of event code + 226 Unique line(s) of event code cardMedia 33 Component(s) - 358 Line(s) of event code - 185 Unique line(s) of event code -cardThermo - 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code + 346 Line(s) of event code + 181 Unique line(s) of event code screensaver 37 Component(s) 305 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 404 Component(s) - 4466 Line(s) of event code - 1183 Unique line(s) of event code + 4446 Line(s) of event code + 1177 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 12d623a0..90641005 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/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 @@ -667,25 +616,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index 96515074..35913768 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/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 diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index bfdef103..4cf78ed9 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -804,24 +804,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -832,24 +815,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -860,24 +826,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -940,25 +889,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index f190f595..7c46570c 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 11:04:58.994702886 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:04:59.430702414 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 11:14:46.568572153 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:14:46.984566754 +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 11:04:58.994702886 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:04:59.430702414 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-29 11:14:46.568572153 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:14:46.984566754 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-29 11:04:58.994702886 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 11:04:59.430702414 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-29 11:14:46.568572153 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 11:14:46.984566754 +0000 @@ -616,33 +616,25 @@ if(tTmp.txt=="0") { @@ -505,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 11:04:58.994702886 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:04:59.430702414 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-29 11:14:46.568572153 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:14:46.984566754 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -517,8 +517,8 @@ 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 11:04:58.998702881 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 11:04:59.430702414 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-29 11:14:46.568572153 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 11:14:46.984566754 +0000 @@ -889,33 +889,25 @@ if(tTmp.txt=="0") { @@ -554,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 11:04:58.994702886 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:04:59.430702414 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:14:46.568572153 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:14:46.984566754 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -575,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 11:04:58.994702886 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:04:59.430702414 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-29 11:14:46.568572153 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:14:46.984566754 +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 3bc16246..deffa184 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 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 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 11:14:46.996566599 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-29 11:14:46.568572153 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:14:46.984566754 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-29 11:14:46.568572153 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:14:46.984566754 +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 11:04:58.994702886 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 11:04:59.430702414 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-05-29 11:14:46.568572153 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 11:14:46.984566754 +0000 +@@ -616,33 +616,25 @@ + if(tTmp.txt=="0") + { @@ -41,11 +41,11 @@ + bNext.txt="" + } + // get Type -+--- 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 ++--- HMI/n2t-out/cardQR.txt 2022-05-29 11:14:46.568572153 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:14:46.984566754 +0000 +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- 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 ++--- HMI/n2t-out/cardThermo.txt 2022-05-29 11:14:46.568572153 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 11:14:46.984566754 +0000 +@@ -889,33 +889,25 @@ + if(tTmp.txt=="0") + { @@ -80,8 +80,8 @@ + bNext.txt="" + } + //entity name -+--- 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 ++--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:14:46.568572153 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:14:46.984566754 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-29 11:14:46.568572153 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:14:46.984566754 +0000 +@@ -471,22 +471,6 @@