edge swipe (add nextion2text)

This commit is contained in:
joBr99
2022-05-29 11:05:00 +00:00
committed by github-actions[bot]
parent 6e268674ae
commit 2968bd6c0b
28 changed files with 355 additions and 1453 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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