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

This commit is contained in:
joBr99
2022-05-22 19:32:16 +00:00
committed by github-actions[bot]
parent 352ea44f54
commit 90ad6c1908
12 changed files with 76 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-05-22 18:46:01.356130319 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 18:46:02.352144025 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-22 19:32:14.502677064 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 19:32:15.366674234 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -8,9 +8,21 @@ 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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-22 19:32:14.502677064 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-22 19:32:15.366674234 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
Text :
- Max. Text Size: 275
+ Max. Text Size: 270
Variable (string) entn
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-22 18:46:01.356130319 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 18:46:02.352144025 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-22 19:32:14.502677064 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 19:32:15.366674234 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200