sync (add nextion2text)

This commit is contained in:
joBr99
2022-06-06 20:43:20 +00:00
committed by github-actions[bot]
parent 6fbfb7c874
commit 8314bca54d
6 changed files with 34 additions and 40 deletions

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-06-06 20:41:13.393750277 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:41:14.285762803 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-06 20:43:14.701325786 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:43:15.757379552 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -8,23 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-06 20:41:13.397750333 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:41:14.285762803 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:41:14.285762803 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:43:15.757379552 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200