h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-21 13:44:45 +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

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
--- HMI/n2t-out/Program.s.txt 2022-05-29 10:36:24.748858334 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 10:36:25.176864248 +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:43:04.919034398 +0000
@@ -11,6 +11,6 @@
// dim value
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
page pageStartup
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/US/portrait/n2t-out/cardEntities.txt 2022-05-29 10:36:25.176864248 +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:43:04.919034398 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -268,49 +268,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial
Attributes
Scope : local
@@ -1074,7 +1280,7 @@
@@ -1074,6 +1280,28 @@
page popupLight
}
-Hotspot mSwipeNext
+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
+ Scope : local
+ Dragging : 0
@@ -319,96 +281,23 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+ Events
+ 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
Scope : local
@@ -1111,24 +1322,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 +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 @@
@@ -1849,6 +2077,169 @@
covx tTmp.txt,sys0,0,0
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")
{
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
--- HMI/n2t-out/cardQR.txt 2022-05-29 10:36:24.748858334 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 10:36:25.176864248 +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:43:04.919034398 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -591,8 +592,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn
Attributes
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/US/portrait/n2t-out/pageStartup.txt 2022-05-29 10:36:25.176864248 +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:43:04.919034398 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
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
crcrest 1,0xffff // reset CRC
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/US/portrait/n2t-out/screensaver.txt 2022-05-29 10:36:25.176864248 +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:43:04.919034398 +0000
@@ -471,22 +471,6 @@
vis tMainIconAlt,1
vis tMRIcon,1