h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-20 05:04:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-29 10:43:06 +00:00
committed by github-actions[bot]
parent 9fec726e8c
commit 5bfc4540df
8 changed files with 344 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt 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:36:24.748858334 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-29 10:43:04.447010975 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 10:36:25.636870604 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 10:43:05.487062583 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -8,121 +8,121 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset - // fix touch offset
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:36:24.748858334 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-29 10:43:04.447010975 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-29 10:36:25.640870659 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-29 10:43:05.487062583 +0000
@@ -1083,24 +1083,7 @@ @@ -531,7 +531,24 @@
Events Events
Touch Press Event Touch Press Event
- //This thin hotspot down the edge will intercept swipes + //This thin hotspot down the edge will intercept swipes
- //from the bezel into the screen area before the + //from the bezel into the screen area before the
- //Nextion register touch for any other components - + //Nextion register touch for any other components -
- //IF the hotspot is 'layered' at the top (use the up + //IF the hotspot is 'layered' at the top (use the up
- //arrow at the far left of the Nextion Editor Tool Bar). + //arrow at the far left of the Nextion Editor Tool Bar).
- // + //
- //Calibrate how wide the edge hotspot has to be on your + //Calibrate how wide the edge hotspot has to be on your
- //own physical device using this screen to test the + //own physical device using this screen to test the
- //x & y coordinates where the swipe is first detected.) + //x & y coordinates where the swipe is first detected.)
- //--------------------------- + //---------------------------
- //The navigation text is stored as local variable within tld.txt + //The navigation text is stored as local variable within tld.txt
- //Pressing right button if swiped on the right side of the screen + //Pressing right button if swiped on the right side of the screen
- // + //
- spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",1
- if(tTmp.txt=="1") + if(tTmp.txt=="1")
- { + {
click bNext,1 click bNext,1
- } + }
Hotspot mSwipeUp Hotspot mSwipeUp
Attributes Attributes
@@ -1111,24 +1094,7 @@ @@ -542,7 +559,24 @@
Events Events
Touch Press Event Touch Press Event
- //This thin hotspot down the edge will intercept swipes + //This thin hotspot down the edge will intercept swipes
- //from the bezel into the screen area before the + //from the bezel into the screen area before the
- //Nextion register touch for any other components - + //Nextion register touch for any other components -
- //IF the hotspot is 'layered' at the top (use the up + //IF the hotspot is 'layered' at the top (use the up
- //arrow at the far left of the Nextion Editor Tool Bar). + //arrow at the far left of the Nextion Editor Tool Bar).
- // + //
- //Calibrate how wide the edge hotspot has to be on your + //Calibrate how wide the edge hotspot has to be on your
- //own physical device using this screen to test the + //own physical device using this screen to test the
- //x & y coordinates where the swipe is first detected.) + //x & y coordinates where the swipe is first detected.)
- //--------------------------- + //---------------------------
- //The navigation text is stored as local variable within tld.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 up button if swiped on the top side of the screen
- // + //
- spstr tId.txt,tTmp.txt,"|",0 + spstr tId.txt,tTmp.txt,"|",0
- if(tTmp.txt=="2") + if(tTmp.txt=="2")
- { + {
click bPrev,1 click bPrev,1
- } + }
Hotspot mSwipePrev Hotspot mSwipePrev
Attributes Attributes
@@ -1139,24 +1105,7 @@ @@ -553,7 +587,24 @@
Events Events
Touch Press Event Touch Press Event
- //This thin hotspot down the edge will intercept swipes + //This thin hotspot down the edge will intercept swipes
- //from the bezel into the screen area before the + //from the bezel into the screen area before the
- //Nextion register touch for any other components - + //Nextion register touch for any other components -
- //IF the hotspot is 'layered' at the top (use the up + //IF the hotspot is 'layered' at the top (use the up
- //arrow at the far left of the Nextion Editor Tool Bar). + //arrow at the far left of the Nextion Editor Tool Bar).
- // + //
- //Calibrate how wide the edge hotspot has to be on your + //Calibrate how wide the edge hotspot has to be on your
- //own physical device using this screen to test the + //own physical device using this screen to test the
- //x & y coordinates where the swipe is first detected.) + //x & y coordinates where the swipe is first detected.)
- //--------------------------- + //---------------------------
- //The navigation text is stored as local variable within tld.txt + //The navigation text is stored as local variable within tld.txt
- //Pressing left button if swiped on the left 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=="1") + if(tTmp.txt=="1")
- { + {
click bPrev,1 click bPrev,1
- } + }
Timer tmSerial Timer tmSerial
Attributes Attributes
@@ -1219,25 +1168,33 @@ @@ -616,33 +667,25 @@
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
+ tsw mSwipePrev,0 - tsw mSwipePrev,0
+ tsw mSwipeUp,0 - tsw mSwipeUp,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bPrev,1
+ tsw mSwipePrev,1 - tsw mSwipePrev,1
+ tsw mSwipeUp,0 - tsw mSwipeUp,0
bPrev.txt="" bPrev.txt=""
} }
if(tTmp.txt=="2") if(tTmp.txt=="2")
{ {
vis bPrev,1 vis bPrev,1
+ tsw mSwipePrev,0 - tsw mSwipePrev,0
+ tsw mSwipeUp,1 - tsw mSwipeUp,1
bPrev.txt="" bPrev.txt=""
} }
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
+ tsw mSwipeNext,0 - tsw mSwipeNext,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bNext,1 vis bNext,1
+ tsw mSwipeNext,1 - tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:36:24.748858334 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-29 10:43:04.447010975 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 10:36:25.636870604 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 10:43:05.487062583 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

273
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt 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 10:36:24.748858334 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-29 10:43:04.447010975 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:36:25.176864248 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:43:04.919034398 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:36:24.748858334 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-29 10:43:04.447010975 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:36:25.176864248 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:43:04.919034398 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -268,49 +268,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial Hotspot mSpecial
Attributes Attributes
Scope : local Scope : local
@@ -1074,7 +1280,7 @@ @@ -1074,6 +1280,28 @@
page popupLight page popupLight
} }
-Hotspot mSwipeNext
+Hotspot m4 +Hotspot m4
Attributes
Scope : local
Dragging : 0
@@ -1083,25 +1289,30 @@
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")
+ pageIcons.tTmp1.txt=tEntity5.txt
+ pageIcons.tTmp2.txt=entn5.txt
+ if(type5.txt=="shutter")
{
- click bNext,1
+ //popupShutter.tHeading.txt=tEntity5.txt
+ page popupShutter
+ }
+ if(type5.txt=="light")
+ {
+ //popupLight.tEntity.txt=tEntity5.txt
+ page popupLight
}
+Hotspot mSwipeNext
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
@@ -319,96 +281,23 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ +
+ Events + Events
+ Touch Press Event + Touch Press Event
+ click bNext,1 + pageIcons.tTmp1.txt=tEntity5.txt
+ pageIcons.tTmp2.txt=entn5.txt
+ if(type5.txt=="shutter")
+ {
+ //popupShutter.tHeading.txt=tEntity5.txt
+ page popupShutter
+ }
+ if(type5.txt=="light")
+ {
+ //popupLight.tEntity.txt=tEntity5.txt
+ page popupLight
+ }
+ +
Hotspot mSwipeUp Hotspot mSwipeNext
Attributes Attributes
Scope : local Scope : local
@@ -1111,24 +1322,7 @@ @@ -1849,6 +2077,169 @@
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 +1333,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 +1396,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
@@ -1892,6 +2077,169 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
} }
@@ -578,9 +467,121 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
} }
if(tInstruction.txt=="pageType") 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 10:43:04.447010975 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 10:43:04.919034398 +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/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-29 10:36:24.748858334 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-29 10:43:04.447010975 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:36:25.176864248 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:43:04.919034398 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -591,8 +592,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:36:24.748858334 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-29 10:43:04.447010975 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:36:25.176864248 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:43:04.919034398 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -612,8 +613,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-29 10:36:24.748858334 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-29 10:43:04.447010975 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:36:25.176864248 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:43:04.919034398 +0000
@@ -471,22 +471,6 @@ @@ -471,22 +471,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

175
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,136 +1,125 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 10:36:25.192864469 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 10:43:04.963036581 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-29 10:36:24.748858334 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 10:43:04.447010975 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:36:25.176864248 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:43:04.919034398 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:36:24.748858334 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-29 10:43:04.447010975 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:36:25.176864248 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:43:04.919034398 +0000
+@@ -1074,7 +1280,7 @@ +@@ -1849,6 +2077,169 @@
+-Hotspot mSwipeNext +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+ Attributes +--- HMI/n2t-out/cardGrid.txt 2022-05-29 10:43:04.447010975 +0000
+ Scope : local ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 10:43:04.919034398 +0000
+ Dragging : 0 +@@ -531,7 +531,24 @@
+@@ -1083,25 +1289,30 @@
+ +
+ Events + Events
+ Touch Press Event + Touch Press Event
+- //This thin hotspot down the edge will intercept swipes ++ //This thin hotspot down the edge will intercept swipes
+- //from the bezel into the screen area before the ++ //from the bezel into the screen area before the
+- //Nextion register touch for any other components - ++ //Nextion register touch for any other components -
+- //IF the hotspot is 'layered' at the top (use the up ++ //IF the hotspot is 'layered' at the top (use the up
+- //arrow at the far left of the Nextion Editor Tool Bar). ++ //arrow at the far left of the Nextion Editor Tool Bar).
+- // ++ //
+- //Calibrate how wide the edge hotspot has to be on your ++ //Calibrate how wide the edge hotspot has to be on your
+- //own physical device using this screen to test the ++ //own physical device using this screen to test the
+- //x & y coordinates where the swipe is first detected.) ++ //x & y coordinates where the swipe is first detected.)
+- //--------------------------- ++ //---------------------------
+- //The navigation text is stored as local variable within tld.txt ++ //The navigation text is stored as local variable within tld.txt
+- //Pressing right button if swiped on the right side of the screen ++ //Pressing right button if swiped on the right side of the screen
+- // ++ //
+- spstr tId.txt,tTmp.txt,"|",1 ++ spstr tId.txt,tTmp.txt,"|",1
+- if(tTmp.txt=="1") ++ if(tTmp.txt=="1")
+ { ++ {
+- click bNext,1 + click bNext,1
+ } ++ }
+ +
++Hotspot mSwipeNext
++ Attributes
++ Scope : local
++ Dragging : 0
++ Disable release event after dragging: 0
++ Send Component ID : disabled
++
++ Events
++ Touch Press Event
++ click bNext,1
+ Hotspot mSwipeUp + Hotspot mSwipeUp
+@@ -1111,24 +1322,7 @@ + Attributes
+@@ -542,7 +559,24 @@
+ +
+ Events + Events
+ Touch Press Event + Touch Press Event
+- //This thin hotspot down the edge will intercept swipes ++ //This thin hotspot down the edge will intercept swipes
+- //from the bezel into the screen area before the ++ //from the bezel into the screen area before the
+- //Nextion register touch for any other components - ++ //Nextion register touch for any other components -
+- //IF the hotspot is 'layered' at the top (use the up ++ //IF the hotspot is 'layered' at the top (use the up
+- //arrow at the far left of the Nextion Editor Tool Bar). ++ //arrow at the far left of the Nextion Editor Tool Bar).
+- // ++ //
+- //Calibrate how wide the edge hotspot has to be on your ++ //Calibrate how wide the edge hotspot has to be on your
+- //own physical device using this screen to test the ++ //own physical device using this screen to test the
+- //x & y coordinates where the swipe is first detected.) ++ //x & y coordinates where the swipe is first detected.)
+- //--------------------------- ++ //---------------------------
+- //The navigation text is stored as local variable within tld.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 up button if swiped on the top side of the screen
+- // ++ //
+- spstr tId.txt,tTmp.txt,"|",0 ++ spstr tId.txt,tTmp.txt,"|",0
+- if(tTmp.txt=="2") ++ if(tTmp.txt=="2")
+- { ++ {
+ click bPrev,1 + click bPrev,1
+- } ++ }
+ +
+ Hotspot mSwipePrev + Hotspot mSwipePrev
+ Attributes + Attributes
+@@ -1139,24 +1333,7 @@ +@@ -553,7 +587,24 @@
+ +
+ Events + Events
+ Touch Press Event + Touch Press Event
+- //This thin hotspot down the edge will intercept swipes ++ //This thin hotspot down the edge will intercept swipes
+- //from the bezel into the screen area before the ++ //from the bezel into the screen area before the
+- //Nextion register touch for any other components - ++ //Nextion register touch for any other components -
+- //IF the hotspot is 'layered' at the top (use the up ++ //IF the hotspot is 'layered' at the top (use the up
+- //arrow at the far left of the Nextion Editor Tool Bar). ++ //arrow at the far left of the Nextion Editor Tool Bar).
+- // ++ //
+- //Calibrate how wide the edge hotspot has to be on your ++ //Calibrate how wide the edge hotspot has to be on your
+- //own physical device using this screen to test the ++ //own physical device using this screen to test the
+- //x & y coordinates where the swipe is first detected.) ++ //x & y coordinates where the swipe is first detected.)
+- //--------------------------- ++ //---------------------------
+- //The navigation text is stored as local variable within tld.txt ++ //The navigation text is stored as local variable within tld.txt
+- //Pressing left button if swiped on the left 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=="1") ++ if(tTmp.txt=="1")
+- { ++ {
+ click bPrev,1 + click bPrev,1
+- } ++ }
+ +
+ Timer tmSerial + Timer tmSerial
+ Attributes + Attributes
+@@ -1219,25 +1396,33 @@ +@@ -616,33 +667,25 @@
+ if(tTmp.txt=="0") + if(tTmp.txt=="0")
+ { + {
+ vis bPrev,0 + vis bPrev,0
++ tsw mSwipePrev,0 +- tsw mSwipePrev,0
++ tsw mSwipeUp,0 +- tsw mSwipeUp,0
+ } + }
+ if(tTmp.txt=="1") + if(tTmp.txt=="1")
+ { + {
+ vis bPrev,1 + vis bPrev,1
++ tsw mSwipePrev,1 +- tsw mSwipePrev,1
++ tsw mSwipeUp,0 +- tsw mSwipeUp,0
+ bPrev.txt="" + bPrev.txt=""
+ } + }
+ if(tTmp.txt=="2") + if(tTmp.txt=="2")
+ { + {
+ vis bPrev,1 + vis bPrev,1
++ tsw mSwipePrev,0 +- tsw mSwipePrev,0
++ tsw mSwipeUp,1 +- tsw mSwipeUp,1
+ bPrev.txt="" + bPrev.txt=""
+ } + }
+ spstr tId.txt,tTmp.txt,"|",1 + spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt=="0") + if(tTmp.txt=="0")
+ { + {
+ vis bNext,0 + vis bNext,0
++ tsw mSwipeNext,0 +- tsw mSwipeNext,0
+ } + }
+ if(tTmp.txt=="1") + if(tTmp.txt=="1")
+ { + {
+ vis bNext,1 + vis bNext,1
++ tsw mSwipeNext,1 +- tsw mSwipeNext,1
+ bNext.txt="" + bNext.txt=""
+ } + }
+ // get Type + // get Type
+@@ -1892,6 +2077,169 @@ +--- HMI/n2t-out/cardQR.txt 2022-05-29 10:43:04.447010975 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:43:04.919034398 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:36:25.176864248 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:43:04.447010975 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:43:04.919034398 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:36:25.176864248 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-29 10:43:04.447010975 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-29 10:36:24.748858334 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:43:04.919034398 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:36:25.176864248 +0000
+@@ -471,22 +471,6 @@ +@@ -471,22 +471,6 @@

65
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -2036,24 +2036,7 @@ Hotspot mSwipeNext
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bNext,1
//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 Hotspot mSwipeUp
Attributes Attributes
@@ -2073,24 +2056,7 @@ Hotspot mSwipeUp
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bPrev,1
//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 Hotspot mSwipePrev
Attributes Attributes
@@ -2110,24 +2076,7 @@ Hotspot mSwipePrev
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bPrev,1
//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 Timer tmSerial
Attributes Attributes
@@ -2191,25 +2140,33 @@ Timer tmSerial
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="" bPrev.txt=""
} }
if(tTmp.txt=="2") if(tTmp.txt=="2")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="" bPrev.txt=""
} }
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
tsw mSwipeNext,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bNext,1 vis bNext,1
tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type

65
HMI/n2t-out-visual/cardGrid.txt
View File

@@ -976,24 +976,7 @@ Hotspot mSwipeNext
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bNext,1
//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 Hotspot mSwipeUp
Attributes Attributes
@@ -1013,24 +996,7 @@ Hotspot mSwipeUp
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bPrev,1
//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 Hotspot mSwipePrev
Attributes Attributes
@@ -1050,24 +1016,7 @@ Hotspot mSwipePrev
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bPrev,1
//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 Timer tmSerial
Attributes Attributes
@@ -1131,25 +1080,33 @@ Timer tmSerial
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="" bPrev.txt=""
} }
if(tTmp.txt=="2") if(tTmp.txt=="2")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="" bPrev.txt=""
} }
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
tsw mSwipeNext,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bNext,1 vis bNext,1
tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type

16
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -26,6 +26,10 @@ popupLight
27 Component(s) 27 Component(s)
348 Line(s) of event code 348 Line(s) of event code
188 Unique line(s) of event code 188 Unique line(s) of event code
cardEntities
65 Component(s)
1129 Line(s) of event code
493 Unique line(s) of event code
cardQR cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
@@ -40,8 +44,8 @@ screensaver
244 Unique line(s) of event code 244 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
439 Line(s) of event code 435 Line(s) of event code
254 Unique line(s) of event code 256 Unique line(s) of event code
cardAlarm cardAlarm
38 Component(s) 38 Component(s)
364 Line(s) of event code 364 Line(s) of event code
@@ -50,13 +54,9 @@ cardThermo
56 Component(s) 56 Component(s)
546 Line(s) of event code 546 Line(s) of event code
290 Unique line(s) of event code 290 Unique line(s) of event code
cardEntities
65 Component(s)
1133 Line(s) of event code
491 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
404 Component(s) 404 Component(s)
4471 Line(s) of event code 4463 Line(s) of event code
1176 Unique line(s) of event code 1184 Unique line(s) of event code

65
HMI/n2t-out/cardEntities.txt
View File

@@ -1083,24 +1083,7 @@ Hotspot mSwipeNext
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bNext,1
//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 Hotspot mSwipeUp
Attributes Attributes
@@ -1111,24 +1094,7 @@ Hotspot mSwipeUp
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bPrev,1
//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 Hotspot mSwipePrev
Attributes Attributes
@@ -1139,24 +1105,7 @@ Hotspot mSwipePrev
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bPrev,1
//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 Timer tmSerial
Attributes Attributes
@@ -1219,25 +1168,33 @@ Timer tmSerial
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="" bPrev.txt=""
} }
if(tTmp.txt=="2") if(tTmp.txt=="2")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="" bPrev.txt=""
} }
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
tsw mSwipeNext,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bNext,1 vis bNext,1
tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type

65
HMI/n2t-out/cardGrid.txt
View File

@@ -531,24 +531,7 @@ Hotspot mSwipeNext
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bNext,1
//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 Hotspot mSwipeUp
Attributes Attributes
@@ -559,24 +542,7 @@ Hotspot mSwipeUp
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bPrev,1
//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 Hotspot mSwipePrev
Attributes Attributes
@@ -587,24 +553,7 @@ Hotspot mSwipePrev
Events Events
Touch Press Event Touch Press Event
//This thin hotspot down the edge will intercept swipes click bPrev,1
//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 Timer tmSerial
Attributes Attributes
@@ -667,25 +616,33 @@ Timer tmSerial
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="" bPrev.txt=""
} }
if(tTmp.txt=="2") if(tTmp.txt=="2")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="" bPrev.txt=""
} }
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
tsw mSwipeNext,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bNext,1 vis bNext,1
tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type