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

This commit is contained in:
jmbinette
2022-04-01 00:12:30 +00:00
committed by GitHub Actions
parent e7ec0541bb
commit b5b3f3d9ae
2 changed files with 16 additions and 16 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-03-31 22:36:10.109846409 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:36:10.513854100 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-01 00:12:28.772463810 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 00:12:29.268498854 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -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-03-31 22:36:10.109846409 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:36:10.513854100 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-01 00:12:28.776464093 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 00:12:29.268498854 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -781,8 +781,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-03-31 22:36:10.109846409 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:36:10.513854100 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-01 00:12:28.772463810 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 00:12:29.268498854 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled