mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-20 21:24:44 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui
This commit is contained in:
@@ -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-07 15:22:54.832432189 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:22:55.672426594 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-07 15:37:51.728763344 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:37:52.500817194 +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-07 15:22:54.832432189 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:22:55.672426594 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:37:52.500817194 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -10,14 +10,14 @@ pageTest
|
||||
13 Component(s)
|
||||
13 Line(s) of event code
|
||||
13 Unique line(s) of event code
|
||||
popupShutter
|
||||
20 Component(s)
|
||||
193 Line(s) of event code
|
||||
109 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
341 Line(s) of event code
|
||||
185 Unique line(s) of event code
|
||||
popupShutter
|
||||
20 Component(s)
|
||||
193 Line(s) of event code
|
||||
109 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
196 Line(s) of event code
|
||||
|
||||
@@ -154,7 +154,7 @@ Text t1
|
||||
Opacity : 127
|
||||
x coordinate : 25
|
||||
y coordinate : 226
|
||||
Width : 100
|
||||
Width : 229
|
||||
Height : 30
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
@@ -165,11 +165,11 @@ Text t1
|
||||
Font ID : 0
|
||||
Back. Color : 6371
|
||||
Font Color : 65535
|
||||
Horizontal Alignment : center
|
||||
Horizontal Alignment : left
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : Brightness
|
||||
Max. Text Size : 15
|
||||
Max. Text Size : 50
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
@@ -244,7 +244,7 @@ Text t4
|
||||
Opacity : 127
|
||||
x coordinate : 24
|
||||
y coordinate : 143
|
||||
Width : 116
|
||||
Width : 229
|
||||
Height : 30
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
@@ -255,11 +255,11 @@ Text t4
|
||||
Font ID : 0
|
||||
Back. Color : 6371
|
||||
Font Color : 65535
|
||||
Horizontal Alignment : center
|
||||
Horizontal Alignment : left
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : Temperature
|
||||
Max. Text Size : 15
|
||||
Max. Text Size : 50
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
@@ -405,11 +405,11 @@ Text t0
|
||||
Font ID : 0
|
||||
Back. Color : 6371
|
||||
Font Color : 65535
|
||||
Horizontal Alignment : center
|
||||
Horizontal Alignment : left
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : Color
|
||||
Max. Text Size : 15
|
||||
Max. Text Size : 50
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
@@ -618,7 +618,7 @@ Button bColor
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 104
|
||||
x coordinate : 108
|
||||
y coordinate : 68
|
||||
Width : 50
|
||||
Height : 50
|
||||
|
||||
@@ -100,7 +100,7 @@ Text t1
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : Brightness
|
||||
Max. Text Size : 15
|
||||
Max. Text Size : 50
|
||||
|
||||
Text t2
|
||||
Attributes
|
||||
@@ -130,7 +130,7 @@ Text t4
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : Temperature
|
||||
Max. Text Size : 15
|
||||
Max. Text Size : 50
|
||||
|
||||
Text tSend
|
||||
Attributes
|
||||
@@ -180,7 +180,7 @@ Text t0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : Color
|
||||
Max. Text Size : 15
|
||||
Max. Text Size : 50
|
||||
|
||||
Picture p0
|
||||
Attributes
|
||||
|
||||
Reference in New Issue
Block a user