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

This commit is contained in:
joBr99
2022-08-07 21:12:15 +00:00
committed by github-actions[bot]
parent bf7b315437
commit 1d8848d889
12 changed files with 47 additions and 47 deletions

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-07-23 14:02:48.223325770 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 14:02:48.731331848 +0000
--- HMI/n2t-out/Program.s.txt 2022-08-07 21:12:08.440754014 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-07 21:12:08.996759619 +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-07-23 14:02:48.227325818 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 14:02:48.731331848 +0000
--- HMI/n2t-out/cardEntities.txt 2022-08-07 21:12:08.440754014 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-07 21:12:08.996759619 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -458,8 +458,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-23 14:02:48.223325770 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 14:02:48.731331848 +0000
--- HMI/n2t-out/pageStartup.txt 2022-08-07 21:12:08.440754014 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-07 21:12:08.996759619 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled