mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-26 01:14:25 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user