Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2022-05-21 14:55:47 +00:00
committed by github-actions[bot]
parent a4775f95f4
commit 0e34839e5a
6 changed files with 25 additions and 89 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-05-21 14:48:41.110663520 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 14:48:42.006669223 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 14:55:46.021052258 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 14:55:46.849063256 +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-05-21 14:48:41.110663520 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 14:48:42.006669223 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:55:46.025052311 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 14:55:46.849063256 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200