h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-13 16:38:17 +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 20:25:08 +00:00
committed by github-actions[bot]
parent e8774696a1
commit b292ad42d1
18 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 20:03:39.950633985 +0000
--- HMI/n2t-out/Program.s.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 20:25:02.840570238 +0000
@@ -14,6 +14,6 @@
//color vars
int defaultFontColor=65535
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:03:39.422634154 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 20:03:39.950633985 +0000
--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 20:25:02.840570238 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -460,8 +460,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
{
Only in HMI/n2t-out: cardPower.txt
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 20:03:39.950633985 +0000
--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 20:25:02.840570238 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -481,8 +481,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 20:03:39.950633985 +0000
--- HMI/n2t-out/pageTest.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 20:25:02.840570238 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event
@@ -618,8 +618,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
- }
-
diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
--- HMI/n2t-out/popupFan.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 20:03:39.950633985 +0000
--- HMI/n2t-out/popupFan.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 20:25:02.840570238 +0000
@@ -82,23 +82,23 @@
Scope: local
Value: 0