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

This commit is contained in:
joBr99
2022-03-30 16:28:21 +00:00
committed by GitHub Actions
parent 314b4c58ea
commit 7b7c1b59fa
9 changed files with 28 additions and 52 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-03-30 15:03:45.667488911 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 15:03:46.575489457 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-30 16:28:19.999450404 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 16:28:20.967456859 +0000
@@ -10,6 +10,6 @@
int sleepValue=0
// dim value
@@ -10,21 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
+ // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-30 15:03:45.667488911 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 15:03:46.575489457 +0000
@@ -17,7 +17,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 
+ Text : 
Max. Text Size : 150
Text tTmp1
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-30 15:03:45.667488911 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 15:03:46.575489457 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-30 16:28:19.999450404 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 16:28:20.967456859 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200