mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-18 02:47:00 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
bf7b315437
commit
1d8848d889
@@ -1,6 +1,6 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-07-23 14:02:48.223325770 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 14:02:49.219337687 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-08-07 21:12:08.440754014 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-07 21:12:09.588765588 +0000
|
||||
@@ -14,6 +14,3 @@
|
||||
//color vars
|
||||
int defaultFontColor=65535
|
||||
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
- lcd_dev fffb 0002 0000 0020
|
||||
- page pageStartup
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-07-23 14:02:48.223325770 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 14:02:49.219337687 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-08-07 21:12:08.440754014 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-07 21:12:09.592765628 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -10,10 +10,6 @@ popupNotify
|
||||
17 Component(s)
|
||||
226 Line(s) of event code
|
||||
143 Unique line(s) of event code
|
||||
popupFan
|
||||
20 Component(s)
|
||||
236 Line(s) of event code
|
||||
150 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
386 Line(s) of event code
|
||||
@@ -42,6 +38,10 @@ pageStartup
|
||||
19 Component(s)
|
||||
167 Line(s) of event code
|
||||
122 Unique line(s) of event code
|
||||
popupFan
|
||||
20 Component(s)
|
||||
236 Line(s) of event code
|
||||
150 Unique line(s) of event code
|
||||
screensaver
|
||||
38 Component(s)
|
||||
332 Line(s) of event code
|
||||
|
||||
@@ -117,7 +117,7 @@ Text tEntity
|
||||
Horizontal Alignment : left
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : tEntity1
|
||||
Text :
|
||||
Max. Text Size : 25
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
@@ -147,7 +147,7 @@ Text tIcon1
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : î´
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
@@ -177,7 +177,7 @@ Text t1
|
||||
Horizontal Alignment : left
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : Speed
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
|
||||
@@ -88,7 +88,7 @@ Text tEntity
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : tEntity1
|
||||
Text :
|
||||
Max. Text Size : 25
|
||||
|
||||
Text tIcon1
|
||||
@@ -98,7 +98,7 @@ Text tIcon1
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : î´
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
|
||||
Text t1
|
||||
@@ -108,7 +108,7 @@ Text t1
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : Speed
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
|
||||
Text tSend
|
||||
|
||||
Reference in New Issue
Block a user