mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-16 09:56:58 +01:00
sync us-l (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
9c3837017d
commit
cb5d2d213d
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user