h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-13 00:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync US-P (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-21 06:19:27 +00:00
committed by github-actions[bot]
parent 71b973d121
commit deb19a8b75
8 changed files with 53 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
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 06:10:30.103842720 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:10:30.539845715 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:19:26.257557445 +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 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.539845715 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:19:26.261557518 +0000
@@ -466,7 +466,7 @@
prints crcval,2
tCode.txt=""
@@ -77,8 +77,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 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:10:30.543845735 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:19:26.261557518 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -493,8 +493,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 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:10:30.539845715 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:19:26.261557518 +0000
@@ -198,7 +198,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -561,8 +561,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 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 06:10:30.539845715 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 06:19:26.261557518 +0000
@@ -795,7 +795,7 @@
prints tSend.txt,0
prints crcval,2
@@ -611,8 +611,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 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:10:30.539845715 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:19:26.261557518 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -631,18 +631,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -351,7 +351,7 @@
Events
Timer Event
- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
+ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame
frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end
doevents // finish drawing before next timer event triggers
if(frame_ptr.val==1820)
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-05-21 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:10:30.539845715 +0000
--- HMI/n2t-out/pageTest.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:19:26.261557518 +0000
@@ -176,17 +176,3 @@
Touch Press Event
bauds=115200