mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-24 02:02:15 +01:00
changed edge swipe behaviour on cardEntities (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
b29024dc70
commit
afdc75cefc
@@ -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-28 22:14:04.109091295 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 22:14:04.997103549 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-29 10:36:24.748858334 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 10:36:25.636870604 +0000
|
||||
@@ -11,6 +11,4 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -8,9 +8,121 @@ 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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:36:24.748858334 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-29 10:36:25.640870659 +0000
|
||||
@@ -1083,24 +1083,7 @@
|
||||
|
||||
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
|
||||
@@ -1111,24 +1094,7 @@
|
||||
|
||||
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
|
||||
@@ -1139,24 +1105,7 @@
|
||||
|
||||
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
|
||||
@@ -1219,25 +1168,33 @@
|
||||
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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-28 22:14:04.109091295 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 22:14:04.997103549 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:36:24.748858334 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 10:36:25.636870604 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -2036,24 +2036,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
|
||||
@@ -2073,24 +2056,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
|
||||
@@ -2110,24 +2076,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
|
||||
@@ -2191,25 +2140,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
|
||||
|
||||
@@ -52,11 +52,11 @@ screensaver
|
||||
244 Unique line(s) of event code
|
||||
cardEntities
|
||||
65 Component(s)
|
||||
1133 Line(s) of event code
|
||||
491 Unique line(s) of event code
|
||||
1129 Line(s) of event code
|
||||
493 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
13 Page(s)
|
||||
404 Component(s)
|
||||
4470 Line(s) of event code
|
||||
1175 Unique line(s) of event code
|
||||
4466 Line(s) of event code
|
||||
1183 Unique line(s) of event code
|
||||
|
||||
@@ -1083,24 +1083,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
|
||||
@@ -1111,24 +1094,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
|
||||
@@ -1139,24 +1105,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
|
||||
@@ -1219,25 +1168,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
|
||||
|
||||
Reference in New Issue
Block a user