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
17465793b3
commit
b0f9be7705
@@ -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-05-28 19:37:52.047161395 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:37:52.963174145 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-28 19:48:49.099855479 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:48:50.175937273 +0000
|
||||
@@ -11,6 +11,4 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -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-05-28 19:37:52.051161450 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:37:52.963174145 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:48:49.099855479 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:48:50.175937273 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -459,9 +459,9 @@ Text tStatus
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 26
|
||||
y coordinate : 200
|
||||
y coordinate : 186
|
||||
Width : 97
|
||||
Height : 30
|
||||
Height : 60
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
@@ -476,7 +476,7 @@ Text tStatus
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Word wrap : enabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
@@ -519,7 +519,7 @@ Text tCurTempLbl
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 28
|
||||
y coordinate : 85
|
||||
y coordinate : 84
|
||||
Width : 95
|
||||
Height : 30
|
||||
Effect : load
|
||||
@@ -549,7 +549,7 @@ Text tStateLbl
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 27
|
||||
y coordinate : 162
|
||||
y coordinate : 152
|
||||
Width : 95
|
||||
Height : 30
|
||||
Effect : load
|
||||
@@ -669,7 +669,7 @@ Text tCurTemp
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 28
|
||||
y coordinate : 121
|
||||
y coordinate : 118
|
||||
Width : 95
|
||||
Height : 30
|
||||
Effect : load
|
||||
|
||||
Reference in New Issue
Block a user