h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-18 19:06:58 +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 b82187a4f0
commit 8649bd562e
8 changed files with 63 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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