h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-23 07:54:25 +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:53:07 +00:00
committed by github-actions[bot]
parent 3c0fcdf98f
commit 860d19af2e
8 changed files with 63 additions and 275 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
--- HMI/n2t-out/Program.s.txt 2022-05-21 09:47:26.832276242 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:47:27.912374380 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 09:53:05.707805712 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:53:06.767837124 +0000
@@ -11,6 +11,3 @@
// dim value
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
Only in HMI/n2t-out: cardQR.txt
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:47:26.832276242 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:47:27.912374380 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:53:05.711805831 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:53:06.767837124 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -22,8 +22,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-05-21 09:47:26.832276242 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:47:27.912374380 +0000
--- HMI/n2t-out/pageTest.txt 2022-05-21 09:53:05.707805712 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:53:06.767837124 +0000
@@ -176,17 +176,3 @@
Touch Press Event
bauds=115200

122
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-21 09:47:26.832276242 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:47:27.368324948 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 09:53:05.707805712 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:53:06.227821122 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:47:26.832276242 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:47:27.368324948 +0000
--- 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=""
@@ -64,8 +64,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Timer tmSerial
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:47:26.836276606 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:47:27.368324948 +0000
--- 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
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -479,115 +479,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-21 09:47:26.832276242 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:47:27.368324948 +0000
@@ -295,7 +295,7 @@
prints tSend.txt,0
prints crcval,2
-Hotspot mSwipeNext
+Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
@@ -315,12 +315,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
@@ -351,7 +351,7 @@
click bPrev,1
}
-Hotspot mSwipePrev
+Hotspot mSwipeNext
Attributes
Scope : local
Dragging : 0
@@ -371,12 +371,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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:47:26.832276242 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:47:27.372325311 +0000
@@ -795,7 +795,7 @@
prints tSend.txt,0
prints crcval,2
-Hotspot mSwipeNext
+Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
@@ -815,12 +815,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
@@ -851,7 +851,7 @@
click bPrev,1
}
-Hotspot mSwipePrev
+Hotspot mSwipeNext
Attributes
Scope : local
Dragging : 0
@@ -871,12 +871,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/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:47:26.832276242 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:47:27.368324948 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:53:05.711805831 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:53:06.227821122 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:47:27.384326401 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-21 09:47:26.832276242 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:47:27.368324948 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:53:06.275822544 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-21 09:53:05.707805712 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:53:06.227821122 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:47:26.832276242 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:47:27.368324948 +0000
+--- 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=""
@@ -54,116 +54,10 @@
+ }
+
+ Timer tmSerial
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:47:26.836276606 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:47:27.368324948 +0000
+--- 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
+ Scope : local
+@@ -1728,6 +1956,128 @@
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
+--- HMI/n2t-out/cardQR.txt 2022-05-21 09:47:26.832276242 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:47:27.368324948 +0000
+@@ -295,7 +295,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Hotspot mSwipeNext
++Hotspot mSwipePrev
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -315,12 +315,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
+@@ -351,7 +351,7 @@
+ click bPrev,1
+ }
+
+-Hotspot mSwipePrev
++Hotspot mSwipeNext
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -371,12 +371,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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:47:26.832276242 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:47:27.372325311 +0000
+@@ -795,7 +795,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Hotspot mSwipeNext
++Hotspot mSwipePrev
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -815,12 +815,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
+@@ -851,7 +851,7 @@
+ click bPrev,1
+ }
+
+-Hotspot mSwipePrev
++Hotspot mSwipeNext
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -871,12 +871,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/pageStartup.txt 2022-05-21 09:47:26.832276242 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:47:27.368324948 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:53:05.711805831 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:53:06.227821122 +0000

20
HMI/US/portrait/n2t-out-visual/cardQR.txt
View File

@@ -555,7 +555,7 @@ Dual-state Button btOnOff2
prints tSend.txt,0
prints crcval,2
Hotspot mSwipePrev
Hotspot mSwipeNext
Attributes
ID : 25
Scope : local
@@ -563,7 +563,7 @@ Hotspot mSwipePrev
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
x coordinate : 311
y coordinate : 5
Width : 9
Height : 470
@@ -584,12 +584,12 @@ Hotspot mSwipePrev
//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
}
Hotspot mSwipeUp
@@ -629,7 +629,7 @@ Hotspot mSwipeUp
click bPrev,1
}
Hotspot mSwipeNext
Hotspot mSwipePrev
Attributes
ID : 27
Scope : local
@@ -637,7 +637,7 @@ Hotspot mSwipeNext
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 311
x coordinate : 0
y coordinate : 5
Width : 9
Height : 470
@@ -658,12 +658,12 @@ Hotspot mSwipeNext
//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
}
Timer tmSerial

20
HMI/US/portrait/n2t-out-visual/cardThermo.txt
View File

@@ -1548,7 +1548,7 @@ Dual-state Button btDown
prints tSend.txt,0
prints crcval,2
Hotspot mSwipePrev
Hotspot mSwipeNext
Attributes
ID : 53
Scope : local
@@ -1556,7 +1556,7 @@ Hotspot mSwipePrev
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
x coordinate : 311
y coordinate : 5
Width : 9
Height : 470
@@ -1577,12 +1577,12 @@ Hotspot mSwipePrev
//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
}
Hotspot mSwipeUp
@@ -1622,7 +1622,7 @@ Hotspot mSwipeUp
click bPrev,1
}
Hotspot mSwipeNext
Hotspot mSwipePrev
Attributes
ID : 55
Scope : local
@@ -1630,7 +1630,7 @@ Hotspot mSwipeNext
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 311
x coordinate : 0
y coordinate : 5
Width : 9
Height : 470
@@ -1651,12 +1651,12 @@ Hotspot mSwipeNext
//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
}
Timer tmSerial

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

@@ -42,6 +42,10 @@ cardGrid
42 Component(s)
435 Line(s) of event code
252 Unique line(s) of event code
cardThermo
56 Component(s)
542 Line(s) of event code
288 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
@@ -50,10 +54,6 @@ cardEntities
77 Component(s)
1174 Line(s) of event code
487 Unique line(s) of event code
cardThermo
56 Component(s)
542 Line(s) of event code
288 Unique line(s) of event code
Total
13 Page(s)

16
HMI/US/portrait/n2t-out/cardQR.txt
View File

@@ -295,7 +295,7 @@ Dual-state Button btOnOff2
prints tSend.txt,0
prints crcval,2
Hotspot mSwipePrev
Hotspot mSwipeNext
Attributes
Scope : local
Dragging : 0
@@ -315,12 +315,12 @@ Hotspot mSwipePrev
//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
}
Hotspot mSwipeUp
@@ -351,7 +351,7 @@ Hotspot mSwipeUp
click bPrev,1
}
Hotspot mSwipeNext
Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
@@ -371,12 +371,12 @@ Hotspot mSwipeNext
//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
}
Timer tmSerial

16
HMI/US/portrait/n2t-out/cardThermo.txt
View File

@@ -795,7 +795,7 @@ Dual-state Button btDown
prints tSend.txt,0
prints crcval,2
Hotspot mSwipePrev
Hotspot mSwipeNext
Attributes
Scope : local
Dragging : 0
@@ -815,12 +815,12 @@ Hotspot mSwipePrev
//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
}
Hotspot mSwipeUp
@@ -851,7 +851,7 @@ Hotspot mSwipeUp
click bPrev,1
}
Hotspot mSwipeNext
Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
@@ -871,12 +871,12 @@ Hotspot mSwipeNext
//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
}
Timer tmSerial