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

This commit is contained in:
joBr99
2022-03-29 10:38:26 +00:00
committed by GitHub Actions
parent 1f8a8927b7
commit 62320d3cc0
3 changed files with 22 additions and 10 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-29 10:24:02.043677457 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 10:24:02.627678365 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-29 10:38:25.862924248 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 10:38:26.258945359 +0000
@@ -10,6 +10,6 @@
int sleepValue=0
// dim value
@@ -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-29 10:24:02.047677463 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 10:24:02.631678371 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-29 10:38:25.866924461 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 10:38:26.262945573 +0000
@@ -31,7 +31,6 @@
vis tEntity1,0
vis bText1,0
@@ -1124,9 +1124,21 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-29 10:38:25.862924248 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 10:38:26.258945359 +0000
@@ -27,7 +27,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 
+ Text : 
Max. Text Size : 150
Text tTmp1
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-29 10:24:02.043677457 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 10:24:02.631678371 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-29 10:38:25.862924248 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 10:38:26.262945573 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -1148,8 +1160,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
{
pageIcons.tTmp1.txt=tTmp.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-29 10:24:02.047677463 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 10:24:02.631678371 +0000
--- HMI/n2t-out/popupLight.txt 2022-03-29 10:38:25.862924248 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 10:38:26.258945359 +0000
@@ -233,8 +233,6 @@
Events

View File

@@ -72,7 +72,7 @@ Text tIcons
Horizontal Alignment : left
Vertical Alignment : top
Input Type : character
Text : 
Text : 
Max. Text Size : 150
Word wrap : enabled
Horizontal Spacing : 0

View File

@@ -27,7 +27,7 @@ Text tIcons
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Text : 
Max. Text Size : 150
Text tTmp1