mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-01-08 23:53:58 +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:38:25.862924248 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 10:38:26.258945359 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-03-29 10:42:30.588162981 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 10:42:30.980165342 +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:38:25.866924461 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 10:38:26.262945573 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-03-29 10:42:30.592163005 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 10:42:30.984165366 +0000
|
||||
@@ -31,7 +31,6 @@
|
||||
vis tEntity1,0
|
||||
vis bText1,0
|
||||
@@ -1125,8 +1125,8 @@ 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
|
||||
--- HMI/n2t-out/pageIcons.txt 2022-03-29 10:42:30.588162981 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 10:42:30.980165342 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -1137,8 +1137,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
||||
|
||||
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:38:25.862924248 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 10:38:26.262945573 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-03-29 10:42:30.592163005 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 10:42:30.984165366 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -1148,6 +1148,15 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
Max. Text Size : 100
|
||||
|
||||
Text tVersion
|
||||
@@ -152,7 +152,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
- Text : 22
|
||||
+ Text : 21
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
@@ -297,10 +297,6 @@
|
||||
{
|
||||
page cardThermo
|
||||
@@ -1160,8 +1169,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:38:25.862924248 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 10:38:26.258945359 +0000
|
||||
--- HMI/n2t-out/popupLight.txt 2022-03-29 10:42:30.592163005 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 10:42:30.984165366 +0000
|
||||
@@ -233,8 +233,6 @@
|
||||
|
||||
Events
|
||||
|
||||
@@ -18,6 +18,10 @@ popupShutter
|
||||
19 Component(s)
|
||||
179 Line(s) of event code
|
||||
102 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
179 Line(s) of event code
|
||||
@@ -30,10 +34,6 @@ cardMedia
|
||||
30 Component(s)
|
||||
278 Line(s) of event code
|
||||
139 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
cardThermo
|
||||
42 Component(s)
|
||||
406 Line(s) of event code
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 21
|
||||
Text : 22
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
|
||||
@@ -152,7 +152,7 @@ Text tVersion
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : 21
|
||||
Text : 22
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
Reference in New Issue
Block a user