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

This commit is contained in:
joBr99
2022-05-21 09:56:58 +00:00
committed by github-actions[bot]
parent 463b852172
commit b1bfc284da
5 changed files with 37 additions and 143 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 09:53:05.707805712 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:53:06.767837124 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 09:56:57.358746022 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:56:58.218752853 +0000
@@ -11,6 +11,3 @@
// dim value
int dimValue=40
@@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- page pageStartup
Only in HMI/n2t-out: cardQR.txt
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:53:05.711805831 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:53:06.767837124 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:56:57.358746022 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:56:58.218752853 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -22,8 +22,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-05-21 09:53:05.707805712 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:53:06.767837124 +0000
--- HMI/n2t-out/pageTest.txt 2022-05-21 09:56:57.358746022 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:56:58.218752853 +0000
@@ -176,17 +176,3 @@
Touch Press Event
bauds=115200