Merge branch 'joBr99:main' into main (add nextion2text)

This commit is contained in:
Armilar
2022-06-12 12:27:12 +00:00
committed by github-actions[bot]
parent 8536ad070c
commit 8af9a15eeb
3 changed files with 17 additions and 17 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-12 12:21:18.432756347 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-12 12:21:19.348768343 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-12 12:26:58.639274984 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-12 12:26:59.787287346 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-12 12:21:19.348768343 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:26:58.639274984 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-12 12:26:59.791287389 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200