mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-11 15:47:42 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
e8774696a1
commit
b292ad42d1
@@ -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-09-17 20:03:39.418634155 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 20:03:40.530633799 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 20:25:03.348580431 +0000
|
||||
@@ -14,6 +14,3 @@
|
||||
//color vars
|
||||
int defaultFontColor=65535
|
||||
@@ -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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:03:39.422634154 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 20:03:40.534633798 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 20:25:03.348580431 +0000
|
||||
@@ -786,7 +786,7 @@
|
||||
Send Component ID : disabled
|
||||
State : unpressed
|
||||
@@ -49,8 +49,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
Touch Press Event
|
||||
Only in HMI/n2t-out: cardPower.txt
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:03:39.418634155 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 20:03:40.530633799 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 20:25:03.348580431 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
@@ -61,8 +61,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-09-17 20:03:39.418634155 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 20:03:40.534633798 +0000
|
||||
--- HMI/n2t-out/pageTest.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 20:25:03.348580431 +0000
|
||||
@@ -13,36 +13,6 @@
|
||||
Events
|
||||
Preinitialize Event
|
||||
|
||||
Reference in New Issue
Block a user