diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 27a9eda5..d9c583ff 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:32:12.542424222 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:32:13.426433721 +0000 +--- 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 @@ -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:32:12.546424265 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:32:13.426433721 +0000 +--- 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 @@ -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:32:12.542424222 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:32:13.426433721 +0000 +--- 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 @@ -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 bbdde362..bc7b7e57 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:32:12.542424222 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:32:12.970428821 +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 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,34 +11,14 @@ 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:32:12.546424265 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.970428821 +0000 -@@ -466,7 +466,7 @@ - prints crcval,2 - tCode.txt="" - --Hotspot mSwipeNext -+Hotspot mSwipePrev - Attributes - Scope : local - Dragging : 0 -@@ -486,15 +486,15 @@ - //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 left button if swiped on the left side of the screen - // -- spstr tId.txt,tTmp.txt,"|",1 -+ spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { -- click bNext,1 -+ click bPrev,1 +--- 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 } -Hotspot mSwipeUp -+Hotspot mSwipeNext ++Hotspot mSwipePrev Attributes Scope : local Dragging : 0 @@ -47,15 +27,13 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //--------------------------- //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 + spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") -+ spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") { -- click bPrev,1 -+ click bNext,1 + click bPrev,1 } -Hotspot mSwipePrev @@ -77,8 +55,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt click bPrev,1 } diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-21 09:32:12.546424265 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:32:12.974428864 +0000 +--- 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 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,8 +471,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-21 09:32:12.546424265 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:32:12.970428821 +0000 +--- 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 @@ -295,7 +295,7 @@ prints tSend.txt,0 prints crcval,2 @@ -543,8 +521,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Hotspot mSwipePrev diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-21 09:32:12.546424265 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:32:12.974428864 +0000 +--- 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 @@ -795,7 +795,7 @@ prints tSend.txt,0 prints crcval,2 @@ -593,8 +571,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Hotspot mSwipePrev diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-21 09:32:12.546424265 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:32:12.970428821 +0000 +--- 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 @@ -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 4f9009dc..8aa5974c 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,35 +1,15 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:32:13.014429294 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-21 09:32:12.542424222 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:32:12.970428821 +0000 ++++ 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 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.546424265 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.970428821 +0000 -+@@ -466,7 +466,7 @@ -+ prints crcval,2 -+ tCode.txt="" -+ -+-Hotspot mSwipeNext -++Hotspot mSwipePrev -+ Attributes -+ Scope : local -+ Dragging : 0 -+@@ -486,15 +486,15 @@ -+ //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 left button if swiped on the left side of the screen -+ // -+- spstr tId.txt,tTmp.txt,"|",1 -++ spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt=="1") -+ { -+- click bNext,1 -++ click bPrev,1 ++--- 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 + } + +-Hotspot mSwipeUp -++Hotspot mSwipeNext +++Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 @@ -38,15 +18,13 @@ + //--------------------------- + //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 ++ spstr tId.txt,tTmp.txt,"|",0 +- if(tTmp.txt=="2") -++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="1") + { -+- click bPrev,1 -++ click bNext,1 ++ click bPrev,1 + } + +-Hotspot mSwipePrev @@ -67,14 +45,14 @@ + { + click bPrev,1 + } -+--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:32:12.546424265 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:32:12.974428864 +0000 ++--- 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 + 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:32:12.546424265 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:32:12.970428821 +0000 ++--- 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 +@@ -295,7 +295,7 @@ + prints tSend.txt,0 + prints crcval,2 @@ -123,8 +101,8 @@ + + Hotspot mSwipePrev +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:32:12.546424265 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:32:12.974428864 +0000 ++--- 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 +@@ -795,7 +795,7 @@ + prints tSend.txt,0 + prints crcval,2 @@ -172,5 +150,5 @@ + } + + Hotspot mSwipePrev -+--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:32:12.546424265 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:32:12.970428821 +0000 ++--- 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 diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index b4796938..d78a6717 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 mSwipePrev - Attributes - ID : 35 - 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 - } - Hotspot mSwipeNext Attributes - ID : 36 + ID : 35 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1069,6 +1032,43 @@ Hotspot mSwipeNext click bNext,1 } +Hotspot mSwipePrev + Attributes + ID : 36 + 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 + } + Hotspot mSwipeUp Attributes ID : 37 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 2693e889..da0a9ed2 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 @@ -30,14 +30,14 @@ screensaver 35 Component(s) 292 Line(s) of event code 235 Unique line(s) of event code -cardAlarm - 38 Component(s) - 360 Line(s) of event code - 222 Unique line(s) of event code cardQR 28 Component(s) 247 Line(s) of event code 137 Unique line(s) of event code +cardAlarm + 38 Component(s) + 360 Line(s) of event code + 222 Unique line(s) of event code cardGrid 42 Component(s) 435 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 5a43ab1a..1f70eb17 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 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 mSwipeNext Attributes Scope : local @@ -522,6 +494,34 @@ 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 + } + Hotspot mSwipeUp Attributes Scope : local