h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-15 17:36:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2022-09-17 17:53:26 +00:00
committed by github-actions[bot]
parent 82bc52e85b
commit a0bbdf67f1
5 changed files with 56 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
HMI/US/landscape/diff-eu-version.txt
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-09-17 13:59:14.951896133 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 13:59:15.879909718 +0000
--- HMI/n2t-out/Program.s.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 17:53:21.343850547 +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 13:59:14.951896133 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 13:59:15.883909777 +0000
--- HMI/n2t-out/cardEntities.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 17:53:21.347850562 +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 13:59:14.951896133 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 13:59:15.879909718 +0000
--- HMI/n2t-out/pageStartup.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 17:53:21.347850562 +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 13:59:14.951896133 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 13:59:15.883909777 +0000
--- HMI/n2t-out/pageTest.txt 2022-09-17 17:53:20.407846944 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 17:53:21.347850562 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event