mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-01-31 02:24:12 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
463b852172
commit
b1bfc284da
@@ -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:53:05.707805712 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-21 09:56:57.358746022 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:53:06.767837124 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:56:58.218752853 +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:53:05.711805831 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:56:57.358746022 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:53:06.767837124 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:56:58.218752853 +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:53:05.707805712 +0000
|
--- HMI/n2t-out/pageTest.txt 2022-05-21 09:56:57.358746022 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:53:06.767837124 +0000
|
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:56:58.218752853 +0000
|
||||||
@@ -176,17 +176,3 @@
|
@@ -176,17 +176,3 @@
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
bauds=115200
|
bauds=115200
|
||||||
|
|||||||
@@ -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:53:05.707805712 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-21 09:56:57.358746022 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:53:06.227821122 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:56:57.790749453 +0000
|
||||||
@@ -11,6 +11,6 @@
|
@@ -11,6 +11,6 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -10,62 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
|||||||
+ // fix touch offset (Removed for US version)
|
+ // fix touch offset (Removed for US version)
|
||||||
+ //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
|
|
||||||
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:53:05.711805831 +0000
|
|
||||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:53:06.227821122 +0000
|
|
||||||
@@ -466,7 +466,7 @@
|
|
||||||
prints crcval,2
|
|
||||||
tCode.txt=""
|
|
||||||
|
|
||||||
-Hotspot mSwipeNext
|
|
||||||
+Hotspot mSwipePrev
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
@@ -486,12 +486,12 @@
|
|
||||||
//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
|
|
||||||
@@ -522,7 +522,7 @@
|
|
||||||
click bPrev,1
|
|
||||||
}
|
|
||||||
|
|
||||||
-Hotspot mSwipePrev
|
|
||||||
+Hotspot mSwipeNext
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
Dragging : 0
|
|
||||||
@@ -542,12 +542,12 @@
|
|
||||||
//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
|
|
||||||
+ //Pressing right button if swiped on the right side of the screen
|
|
||||||
//
|
|
||||||
- spstr tId.txt,tTmp.txt,"|",0
|
|
||||||
+ spstr tId.txt,tTmp.txt,"|",1
|
|
||||||
if(tTmp.txt=="1")
|
|
||||||
{
|
|
||||||
- click bPrev,1
|
|
||||||
+ click bNext,1
|
|
||||||
}
|
|
||||||
|
|
||||||
Timer tmSerial
|
|
||||||
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:53:05.711805831 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:56:57.358746022 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:53:06.227821122 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:56:57.794749485 +0000
|
||||||
@@ -62,6 +62,16 @@
|
@@ -62,6 +62,16 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -480,8 +427,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/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:53:05.711805831 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:56:57.358746022 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:53:06.227821122 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:56:57.790749453 +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
|
||||||
|
|||||||
@@ -1,63 +1,10 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:53:06.275822544 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:56:57.806749580 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-05-21 09:53:05.707805712 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-05-21 09:56:57.358746022 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:53:06.227821122 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:56:57.790749453 +0000
|
||||||
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:56:57.358746022 +0000
|
||||||
+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:53:05.711805831 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:56:57.794749485 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:53:06.227821122 +0000
|
|
||||||
+@@ -466,7 +466,7 @@
|
|
||||||
+ prints crcval,2
|
|
||||||
+ tCode.txt=""
|
|
||||||
+
|
|
||||||
+-Hotspot mSwipeNext
|
|
||||||
++Hotspot mSwipePrev
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Dragging : 0
|
|
||||||
+@@ -486,12 +486,12 @@
|
|
||||||
+ //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
|
|
||||||
+@@ -522,7 +522,7 @@
|
|
||||||
+ click bPrev,1
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+-Hotspot mSwipePrev
|
|
||||||
++Hotspot mSwipeNext
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Dragging : 0
|
|
||||||
+@@ -542,12 +542,12 @@
|
|
||||||
+ //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
|
|
||||||
++ //Pressing right button if swiped on the right side of the screen
|
|
||||||
+ //
|
|
||||||
+- spstr tId.txt,tTmp.txt,"|",0
|
|
||||||
++ spstr tId.txt,tTmp.txt,"|",1
|
|
||||||
+ if(tTmp.txt=="1")
|
|
||||||
+ {
|
|
||||||
+- click bPrev,1
|
|
||||||
++ click bNext,1
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ Timer tmSerial
|
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:53:05.711805831 +0000
|
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:53:06.227821122 +0000
|
|
||||||
+ Hotspot mSwipeNext
|
+ Hotspot mSwipeNext
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
+@@ -1728,6 +1956,128 @@
|
+@@ -1728,6 +1956,128 @@
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:53:05.711805831 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:56:57.358746022 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:53:06.227821122 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:56:57.790749453 +0000
|
||||||
|
|||||||
@@ -995,7 +995,7 @@ Button arm4
|
|||||||
prints crcval,2
|
prints crcval,2
|
||||||
tCode.txt=""
|
tCode.txt=""
|
||||||
|
|
||||||
Hotspot mSwipePrev
|
Hotspot mSwipeNext
|
||||||
Attributes
|
Attributes
|
||||||
ID : 35
|
ID : 35
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -1003,7 +1003,7 @@ Hotspot mSwipePrev
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 0
|
x coordinate : 311
|
||||||
y coordinate : 5
|
y coordinate : 5
|
||||||
Width : 9
|
Width : 9
|
||||||
Height : 470
|
Height : 470
|
||||||
@@ -1024,12 +1024,12 @@ Hotspot mSwipePrev
|
|||||||
//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 right button if swiped on the right side of the screen
|
||||||
//
|
//
|
||||||
spstr tId.txt,tTmp.txt,"|",0
|
spstr tId.txt,tTmp.txt,"|",1
|
||||||
if(tTmp.txt=="1")
|
if(tTmp.txt=="1")
|
||||||
{
|
{
|
||||||
click bPrev,1
|
click bNext,1
|
||||||
}
|
}
|
||||||
|
|
||||||
Hotspot mSwipeUp
|
Hotspot mSwipeUp
|
||||||
@@ -1069,7 +1069,7 @@ Hotspot mSwipeUp
|
|||||||
click bPrev,1
|
click bPrev,1
|
||||||
}
|
}
|
||||||
|
|
||||||
Hotspot mSwipeNext
|
Hotspot mSwipePrev
|
||||||
Attributes
|
Attributes
|
||||||
ID : 37
|
ID : 37
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -1077,7 +1077,7 @@ Hotspot mSwipeNext
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 311
|
x coordinate : 0
|
||||||
y coordinate : 5
|
y coordinate : 5
|
||||||
Width : 9
|
Width : 9
|
||||||
Height : 470
|
Height : 470
|
||||||
@@ -1098,12 +1098,12 @@ Hotspot mSwipeNext
|
|||||||
//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 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")
|
if(tTmp.txt=="1")
|
||||||
{
|
{
|
||||||
click bNext,1
|
click bPrev,1
|
||||||
}
|
}
|
||||||
|
|
||||||
Timer tmSerial
|
Timer tmSerial
|
||||||
|
|||||||
@@ -466,7 +466,7 @@ Button arm4
|
|||||||
prints crcval,2
|
prints crcval,2
|
||||||
tCode.txt=""
|
tCode.txt=""
|
||||||
|
|
||||||
Hotspot mSwipePrev
|
Hotspot mSwipeNext
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
@@ -486,12 +486,12 @@ Hotspot mSwipePrev
|
|||||||
//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 right button if swiped on the right side of the screen
|
||||||
//
|
//
|
||||||
spstr tId.txt,tTmp.txt,"|",0
|
spstr tId.txt,tTmp.txt,"|",1
|
||||||
if(tTmp.txt=="1")
|
if(tTmp.txt=="1")
|
||||||
{
|
{
|
||||||
click bPrev,1
|
click bNext,1
|
||||||
}
|
}
|
||||||
|
|
||||||
Hotspot mSwipeUp
|
Hotspot mSwipeUp
|
||||||
@@ -522,7 +522,7 @@ Hotspot mSwipeUp
|
|||||||
click bPrev,1
|
click bPrev,1
|
||||||
}
|
}
|
||||||
|
|
||||||
Hotspot mSwipeNext
|
Hotspot mSwipePrev
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
Dragging : 0
|
Dragging : 0
|
||||||
@@ -542,12 +542,12 @@ Hotspot mSwipeNext
|
|||||||
//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 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")
|
if(tTmp.txt=="1")
|
||||||
{
|
{
|
||||||
click bNext,1
|
click bPrev,1
|
||||||
}
|
}
|
||||||
|
|
||||||
Timer tmSerial
|
Timer tmSerial
|
||||||
|
|||||||
Reference in New Issue
Block a user