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

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
--- HMI/n2t-out/Program.s.txt 2022-05-21 09:32:12.542424222 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:32:12.970428821 +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:36:00.950615855 +0000
@@ -11,6 +11,6 @@
// dim value
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
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:32:12.546424265 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.970428821 +0000
@@ -466,7 +466,7 @@
prints crcval,2
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
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:36:00.466591225 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:36:00.954616058 +0000
@@ -494,7 +494,7 @@
click bNext,1
}
-Hotspot mSwipeUp
+Hotspot mSwipeNext
+Hotspot mSwipePrev
Attributes
Scope : local
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
- //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")
+ spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt=="1")
{
- click bPrev,1
+ click bNext,1
click bPrev,1
}
-Hotspot mSwipePrev
@@ -77,8 +55,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
click bPrev,1
}
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/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:32:12.974428864 +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:36:00.954616058 +0000
@@ -62,6 +62,16 @@
vis bText4,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")
{
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/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:32:12.970428821 +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:36:00.954616058 +0000
@@ -295,7 +295,7 @@
prints tSend.txt,0
prints crcval,2
@@ -543,8 +521,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Hotspot mSwipePrev
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/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:32:12.974428864 +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:36:00.954616058 +0000
@@ -795,7 +795,7 @@
prints tSend.txt,0
prints crcval,2
@@ -593,8 +571,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Hotspot mSwipePrev
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/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:32:12.970428821 +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:36:00.950615855 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled