h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-25 17:02:14 +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-21 09:36:02 +00:00
committed by github-actions[bot]
parent e7c869f680
commit 2460324e2a
6 changed files with 113 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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-21 09:32:12.542424222 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-21 09:36:00.466591225 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:32:13.426433721 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:36:01.466642112 +0000
@@ -11,6 +11,3 @@ @@ -11,6 +11,3 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- page pageStartup - page pageStartup
Only in HMI/n2t-out: cardQR.txt Only in HMI/n2t-out: cardQR.txt
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-21 09:32:12.546424265 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-21 09:36:00.466591225 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:32:13.426433721 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:36:01.470642316 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -22,8 +22,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/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/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-05-21 09:32:12.542424222 +0000 --- HMI/n2t-out/pageTest.txt 2022-05-21 09:36:00.466591225 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:32:13.426433721 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:36:01.466642112 +0000
@@ -176,17 +176,3 @@ @@ -176,17 +176,3 @@
Touch Press Event Touch Press Event
bauds=115200 bauds=115200

58
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-21 09:32:12.542424222 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-21 09:36:00.466591225 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:32:12.970428821 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:36:00.950615855 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,34 +11,14 @@ 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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.546424265 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:36:00.466591225 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.970428821 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:36:00.954616058 +0000
@@ -466,7 +466,7 @@ @@ -494,7 +494,7 @@
prints crcval,2 click bNext,1
tCode.txt=""
-Hotspot mSwipeNext
+Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
@@ -486,15 +486,15 @@
//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
+ //Pressing left button if swiped on the left side of the screen
//
- spstr tId.txt,tTmp.txt,"|",1
+ spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="1")
{
- click bNext,1
+ click bPrev,1
} }
-Hotspot mSwipeUp -Hotspot mSwipeUp
+Hotspot mSwipeNext +Hotspot mSwipePrev
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -47,15 +27,13 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
//--------------------------- //---------------------------
//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
+ //Pressing right button if swiped on the right 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=="2") - if(tTmp.txt=="2")
+ spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt=="1") + if(tTmp.txt=="1")
{ {
- click bPrev,1 click bPrev,1
+ click bNext,1
} }
-Hotspot mSwipePrev -Hotspot mSwipePrev
@@ -77,8 +55,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
click bPrev,1 click bPrev,1
} }
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-21 09:32:12.546424265 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-21 09:36:00.466591225 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:32:12.974428864 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:36:00.954616058 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -493,8 +471,8 @@ 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/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-21 09:32:12.546424265 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-21 09:36:00.466591225 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:32:12.970428821 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:36:00.954616058 +0000
@@ -295,7 +295,7 @@ @@ -295,7 +295,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -543,8 +521,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Hotspot mSwipePrev Hotspot mSwipePrev
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:32:12.546424265 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-21 09:36:00.466591225 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:32:12.974428864 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:36:00.954616058 +0000
@@ -795,7 +795,7 @@ @@ -795,7 +795,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -593,8 +571,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Hotspot mSwipePrev Hotspot mSwipePrev
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-21 09:32:12.546424265 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-21 09:36:00.466591225 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:32:12.970428821 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:36:00.950615855 +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

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

@@ -1,35 +1,15 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:32:13.014429294 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:36:00.982617483 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-21 09:32:12.542424222 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 09:36:00.466591225 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:32:12.970428821 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:36:00.950615855 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.546424265 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:36:00.466591225 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.970428821 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:36:00.954616058 +0000
+@@ -466,7 +466,7 @@ +@@ -494,7 +494,7 @@
+ prints crcval,2 + click bNext,1
+ tCode.txt=""
+
+-Hotspot mSwipeNext
++Hotspot mSwipePrev
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -486,15 +486,15 @@
+ //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
++ //Pressing left button if swiped on the left side of the screen
+ //
+- spstr tId.txt,tTmp.txt,"|",1
++ spstr tId.txt,tTmp.txt,"|",0
+ if(tTmp.txt=="1")
+ {
+- click bNext,1
++ click bPrev,1
+ } + }
+ +
+-Hotspot mSwipeUp +-Hotspot mSwipeUp
++Hotspot mSwipeNext ++Hotspot mSwipePrev
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
@@ -38,15 +18,13 @@
+ //--------------------------- + //---------------------------
+ //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
++ //Pressing right button if swiped on the right 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=="2") +- if(tTmp.txt=="2")
++ spstr tId.txt,tTmp.txt,"|",1
++ if(tTmp.txt=="1") ++ if(tTmp.txt=="1")
+ { + {
+- click bPrev,1 + click bPrev,1
++ click bNext,1
+ } + }
+ +
+-Hotspot mSwipePrev +-Hotspot mSwipePrev
@@ -67,14 +45,14 @@
+ { + {
+ click bPrev,1 + click bPrev,1
+ } + }
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:32:12.546424265 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:36:00.466591225 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:32:12.974428864 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:36:00.954616058 +0000
+ Hotspot mSwipeNext + Hotspot mSwipeNext
+ Scope : local + Scope : local
+@@ -1728,6 +1956,128 @@ +@@ -1728,6 +1956,128 @@
+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-21 09:32:12.546424265 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-21 09:36:00.466591225 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:32:12.970428821 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:36:00.954616058 +0000
+@@ -295,7 +295,7 @@ +@@ -295,7 +295,7 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
@@ -123,8 +101,8 @@
+ +
+ Hotspot mSwipePrev + Hotspot mSwipePrev
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:32:12.546424265 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:36:00.466591225 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:32:12.974428864 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:36:00.954616058 +0000
+@@ -795,7 +795,7 @@ +@@ -795,7 +795,7 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
@@ -172,5 +150,5 @@
+ } + }
+ +
+ Hotspot mSwipePrev + Hotspot mSwipePrev
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:32:12.546424265 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:36:00.466591225 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:32:12.970428821 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:36:00.950615855 +0000

76
HMI/US/portrait/n2t-out-visual/cardAlarm.txt
View File

@@ -995,46 +995,9 @@ Button arm4
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
Hotspot mSwipePrev
Attributes
ID : 35
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 5
Width : 9
Height : 470
Effect : load
Effect Priority : 0
Effect Time : 300
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
}
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
ID : 36 ID : 35
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1069,6 +1032,43 @@ Hotspot mSwipeNext
click bNext,1 click bNext,1
} }
Hotspot mSwipePrev
Attributes
ID : 36
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 5
Width : 9
Height : 470
Effect : load
Effect Priority : 0
Effect Time : 300
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
}
Hotspot mSwipeUp Hotspot mSwipeUp
Attributes Attributes
ID : 37 ID : 37

8
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -30,14 +30,14 @@ screensaver
35 Component(s) 35 Component(s)
292 Line(s) of event code 292 Line(s) of event code
235 Unique line(s) of event code 235 Unique line(s) of event code
cardAlarm
38 Component(s)
360 Line(s) of event code
222 Unique line(s) of event code
cardQR cardQR
28 Component(s) 28 Component(s)
247 Line(s) of event code 247 Line(s) of event code
137 Unique line(s) of event code 137 Unique line(s) of event code
cardAlarm
38 Component(s)
360 Line(s) of event code
222 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
435 Line(s) of event code 435 Line(s) of event code

56
HMI/US/portrait/n2t-out/cardAlarm.txt
View File

@@ -466,34 +466,6 @@ Button arm4
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
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
}
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
Scope : local Scope : local
@@ -522,6 +494,34 @@ Hotspot mSwipeNext
click bNext,1 click bNext,1
} }
Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
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
}
Hotspot mSwipeUp Hotspot mSwipeUp
Attributes Attributes
Scope : local Scope : local