Compare commits

...

9 Commits

27 changed files with 214 additions and 97 deletions

View File

@@ -111,7 +111,7 @@ The following message can be used to update the content on the cardEntities Page
### popupShutter Page ### popupShutter Page
`entityUpdateDetail~*ignored*~*sliderPos*` `entityUpdateDetail~*ignored*~*sliderPos*~2ndrow~textPosition`
`entityUpdateDetail~1~77` `entityUpdateDetail~1~77`

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt 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 09:49:49.312383427 +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 09:49:50.284371694 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:37:52.500817194 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 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 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 09:49:50.284371694 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:37:52.500817194 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

View File

@@ -10,22 +10,22 @@ pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
13 Unique line(s) of event code 13 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupShutter
20 Component(s)
193 Line(s) of event code
109 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
341 Line(s) of event code 341 Line(s) of event code
185 Unique 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 popupNotify
17 Component(s) 17 Component(s)
196 Line(s) of event code 196 Line(s) of event code
123 Unique line(s) of event code 123 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
cardThermo cardThermo
41 Component(s) 41 Component(s)
444 Line(s) of event code 444 Line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -154,7 +154,7 @@ Text t1
Opacity : 127 Opacity : 127
x coordinate : 25 x coordinate : 25
y coordinate : 226 y coordinate : 226
Width : 100 Width : 229
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -165,11 +165,11 @@ Text t1
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -244,7 +244,7 @@ Text t4
Opacity : 127 Opacity : 127
x coordinate : 24 x coordinate : 24
y coordinate : 143 y coordinate : 143
Width : 116 Width : 229
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -255,11 +255,11 @@ Text t4
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -405,11 +405,11 @@ Text t0
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -618,7 +618,7 @@ Button bColor
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 104 x coordinate : 108
y coordinate : 68 y coordinate : 68
Width : 50 Width : 50
Height : 50 Height : 50
@@ -882,11 +882,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

View File

@@ -100,7 +100,7 @@ Text t1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Text t2 Text t2
Attributes Attributes
@@ -130,7 +130,7 @@ Text t4
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Text tSend Text tSend
Attributes Attributes
@@ -180,7 +180,7 @@ Text t0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Picture p0 Picture p0
Attributes Attributes
@@ -536,11 +536,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

Binary file not shown.

Binary file not shown.

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 15:37:51.728763344 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:37:52.104789571 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-07 15:37:51.728763344 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:37:52.104789571 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:37:52.104789571 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

View File

@@ -1,7 +1,7 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 09:49:49.808377439 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:37:52.120790687 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 15:37:51.728763344 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:37:52.104789571 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:37:51.728763344 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:37:52.104789571 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:37:52.104789571 +0000

View File

@@ -14,10 +14,6 @@ popupNotify
17 Component(s) 17 Component(s)
196 Line(s) of event code 196 Line(s) of event code
123 Unique line(s) of event code 123 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
193 Line(s) of event code 193 Line(s) of event code
@@ -26,6 +22,10 @@ cardGrid
39 Component(s) 39 Component(s)
420 Line(s) of event code 420 Line(s) of event code
246 Unique line(s) of event code 246 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
screensaver screensaver
35 Component(s) 35 Component(s)
292 Line(s) of event code 292 Line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -154,7 +154,7 @@ Text t1
Opacity : 127 Opacity : 127
x coordinate : 10 x coordinate : 10
y coordinate : 319 y coordinate : 319
Width : 100 Width : 240
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -165,11 +165,11 @@ Text t1
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -244,7 +244,7 @@ Text t4
Opacity : 127 Opacity : 127
x coordinate : 9 x coordinate : 9
y coordinate : 234 y coordinate : 234
Width : 116 Width : 242
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -255,11 +255,11 @@ Text t4
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -394,7 +394,7 @@ Text t0
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
y coordinate : 57 y coordinate : 57
Width : 64 Width : 141
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -405,11 +405,11 @@ Text t0
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -618,8 +618,8 @@ Button bColor
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 83 x coordinate : 12
y coordinate : 57 y coordinate : 89
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load
@@ -882,11 +882,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

View File

@@ -100,7 +100,7 @@ Text t1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Text t2 Text t2
Attributes Attributes
@@ -130,7 +130,7 @@ Text t4
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Text tSend Text tSend
Attributes Attributes
@@ -180,7 +180,7 @@ Text t0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Picture p0 Picture p0
Attributes Attributes
@@ -536,11 +536,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

Binary file not shown.

Binary file not shown.

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -154,7 +154,7 @@ Text t1
Opacity : 127 Opacity : 127
x coordinate : 10 x coordinate : 10
y coordinate : 226 y coordinate : 226
Width : 100 Width : 244
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -165,11 +165,11 @@ Text t1
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -244,7 +244,7 @@ Text t4
Opacity : 127 Opacity : 127
x coordinate : 9 x coordinate : 9
y coordinate : 143 y coordinate : 143
Width : 116 Width : 242
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -255,11 +255,11 @@ Text t4
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -405,11 +405,11 @@ Text t0
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -618,7 +618,7 @@ Button bColor
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 89 x coordinate : 93
y coordinate : 68 y coordinate : 68
Width : 50 Width : 50
Height : 50 Height : 50
@@ -882,11 +882,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

View File

@@ -100,7 +100,7 @@ Text t1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Text t2 Text t2
Attributes Attributes
@@ -130,7 +130,7 @@ Text t4
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Text tSend Text tSend
Attributes Attributes
@@ -180,7 +180,7 @@ Text t0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Picture p0 Picture p0
Attributes Attributes
@@ -536,11 +536,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

Binary file not shown.

Binary file not shown.

View File

@@ -17,6 +17,9 @@ translations = {
'run': "Hardloop", 'run': "Hardloop",
'lock': "Sluit toe", 'lock': "Sluit toe",
'unlock': "Sluit oop", 'unlock': "Sluit oop",
'brightness': "Helderheid",
'color_temperature': "Kleur temperatuur",
'position': "Posisie",
}, },
'ar': { 'ar': {
'ACTIVATE': "تفعيل", 'ACTIVATE': "تفعيل",
@@ -36,6 +39,9 @@ translations = {
'run': "تشغيل", 'run': "تشغيل",
'lock': "قفل", 'lock': "قفل",
'unlock': "فتح", 'unlock': "فتح",
'brightness': "السطوع",
'color_temperature': "درجة حرارة اللون",
'position': "موضع",
}, },
'bg': { 'bg': {
'ACTIVATE': "Активирай", 'ACTIVATE': "Активирай",
@@ -56,6 +62,9 @@ translations = {
'run': "Изпълни", 'run': "Изпълни",
'lock': "Заключване", 'lock': "Заключване",
'unlock': "Отключване", 'unlock': "Отключване",
'brightness': "Яркост",
'color_temperature': "Цветова температура",
'position': "Позиция",
}, },
'ca': { 'ca': {
'PRESS': "Prem", 'PRESS': "Prem",
@@ -77,6 +86,9 @@ translations = {
'run': "Executa", 'run': "Executa",
'lock': "Bloquejar", 'lock': "Bloquejar",
'unlock': "Desbloquejar", 'unlock': "Desbloquejar",
'brightness': "Brillantor",
'color_temperature': "Temperatura de color",
'position': "Posició",
}, },
'cs': { 'cs': {
'PRESS': "Stisknutí", 'PRESS': "Stisknutí",
@@ -98,6 +110,9 @@ translations = {
'run': "Spustit", 'run': "Spustit",
'lock': "Zamknout", 'lock': "Zamknout",
'unlock': "Odemknout", 'unlock': "Odemknout",
'brightness': "Jas",
'color_temperature': "Teplota barvy",
'position': "Pozice",
}, },
'da': { 'da': {
'PRESS': "Tryk", 'PRESS': "Tryk",
@@ -119,6 +134,9 @@ translations = {
'run': "Kør", 'run': "Kør",
'lock': "Lås", 'lock': "Lås",
'unlock': "Lås op", 'unlock': "Lås op",
'brightness': "Lysstyrke",
'color_temperature': "Farvetemperatur",
'position': "Position",
}, },
'de': { 'de': {
'PRESS': "Drücken", 'PRESS': "Drücken",
@@ -140,6 +158,9 @@ translations = {
'run': "Ausführen", 'run': "Ausführen",
'lock': "Verriegeln", 'lock': "Verriegeln",
'unlock': "Entriegeln", 'unlock': "Entriegeln",
'brightness': "Helligkeit",
'color_temperature': "Farbtemperatur",
'position': "Position",
}, },
'el': { 'el': {
'PRESS': "Πατήστε", 'PRESS': "Πατήστε",
@@ -161,6 +182,9 @@ translations = {
'run': "Εκτέλεση", 'run': "Εκτέλεση",
'lock': "Κλείδωμα", 'lock': "Κλείδωμα",
'unlock': "Ξεκλείδωμα", 'unlock': "Ξεκλείδωμα",
'brightness': "Φωτεινότητα",
'color_temperature': "Θερμοκρασία χρώματος",
'position': "Θέση",
}, },
'en': { 'en': {
'PRESS': "Press", 'PRESS': "Press",
@@ -182,6 +206,9 @@ translations = {
'run': "Run", 'run': "Run",
'lock': "Lock", 'lock': "Lock",
'unlock': "Unlock", 'unlock': "Unlock",
'brightness': "Brightness",
'color_temperature': "Color temperature",
'position': "Position",
}, },
'es': { 'es': {
'PRESS': "Pulsa", 'PRESS': "Pulsa",
@@ -203,6 +230,9 @@ translations = {
'run': "Ejecutar", 'run': "Ejecutar",
'lock': "Bloquear", 'lock': "Bloquear",
'unlock': "Desbloquear", 'unlock': "Desbloquear",
'brightness': "Brillo",
'color_temperature': "Temperatura del color",
'position': "Posición",
}, },
'et': { 'et': {
'PRESS': "Vajuta nuppu", 'PRESS': "Vajuta nuppu",
@@ -224,6 +254,9 @@ translations = {
'run': "Käivita", 'run': "Käivita",
'lock': "Lukusta", 'lock': "Lukusta",
'unlock': "Ava", 'unlock': "Ava",
'brightness': "Heledus",
'color_temperature': "Värvustemperatuur",
'position': "Asend",
}, },
'fa': { 'fa': {
'ACTIVATE': "فعال سازی", 'ACTIVATE': "فعال سازی",
@@ -243,6 +276,9 @@ translations = {
'run': "اجرا", 'run': "اجرا",
'lock': "قفل", 'lock': "قفل",
'unlock': "باز کردن", 'unlock': "باز کردن",
'brightness': "روشنایی",
'color_temperature': "دمای رنگ",
'position': "موقعیت",
}, },
'fi': { 'fi': {
'PRESS': "Paina", 'PRESS': "Paina",
@@ -264,6 +300,9 @@ translations = {
'run': "Suorita", 'run': "Suorita",
'lock': "Lukitse", 'lock': "Lukitse",
'unlock': "Avaa lukitus", 'unlock': "Avaa lukitus",
'brightness': "Kirkkaus",
'color_temperature': "Värilämpötila",
'position': "Sijainti",
}, },
'fr': { 'fr': {
'PRESS': "Appui", 'PRESS': "Appui",
@@ -285,6 +324,9 @@ translations = {
'run': "Exécuter", 'run': "Exécuter",
'lock': "Verrouiller", 'lock': "Verrouiller",
'unlock': "Déverrouiller", 'unlock': "Déverrouiller",
'brightness': "Luminosité",
'color_temperature': "Température de couleur",
'position': "Position",
}, },
'he': { 'he': {
'PRESS': "לחיצה", 'PRESS': "לחיצה",
@@ -306,6 +348,9 @@ translations = {
'run': "רוץ", 'run': "רוץ",
'lock': "נעילה", 'lock': "נעילה",
'unlock': "ביטול נעילה", 'unlock': "ביטול נעילה",
'brightness': "בהירות",
'color_temperature': "טמפרטורת הצבע",
'position': "מיקום",
}, },
'hr': { 'hr': {
'ACTIVATE': "Aktivirati", 'ACTIVATE': "Aktivirati",
@@ -325,6 +370,9 @@ translations = {
'run': "Pokreni", 'run': "Pokreni",
'lock': "zaključati", 'lock': "zaključati",
'unlock': "Otključati", 'unlock': "Otključati",
'brightness': "Svjetlina",
'color_temperature': "Temperatura boje",
'position': "Pozicija",
}, },
'hu': { 'hu': {
'PRESS': "Gombnyomás", 'PRESS': "Gombnyomás",
@@ -346,6 +394,9 @@ translations = {
'run': "Futtatás", 'run': "Futtatás",
'lock': "Bezár", 'lock': "Bezár",
'unlock': "Kinyit", 'unlock': "Kinyit",
'brightness': "Fényerő",
'color_temperature': "Színhőmérséklet",
'position': "Pozíció",
}, },
'hy': { 'hy': {
'ACTIVATE': "Ակտիվացնել", 'ACTIVATE': "Ակտիվացնել",
@@ -364,6 +415,9 @@ translations = {
'disarm': "Զինաթափել", 'disarm': "Զինաթափել",
'lock': "Կողպեք", 'lock': "Կողպեք",
'unlock': "Բացել", 'unlock': "Բացել",
'brightness': "Պայծառություն",
'color_temperature': "Գունային ջերմաստիճան",
'position': "Դիրք",
}, },
'id': { 'id': {
'PRESS': "Tekan", 'PRESS': "Tekan",
@@ -385,6 +439,9 @@ translations = {
'run': "Jalankan", 'run': "Jalankan",
'lock': "Kunci", 'lock': "Kunci",
'unlock': "Buka", 'unlock': "Buka",
'brightness': "Kecerahan",
'color_temperature': "Temperatur warna",
'position': "Posisi",
}, },
'is': { 'is': {
'PRESS': "Ýttu á", 'PRESS': "Ýttu á",
@@ -405,6 +462,9 @@ translations = {
'run': "Keyra", 'run': "Keyra",
'lock': "Læsa", 'lock': "Læsa",
'unlock': "Aflæsa", 'unlock': "Aflæsa",
'brightness': "Birtustig",
'color_temperature': "Litastig",
'position': "Staðsetning",
}, },
'it': { 'it': {
'PRESS': "Premi", 'PRESS': "Premi",
@@ -426,6 +486,9 @@ translations = {
'run': "Esegui", 'run': "Esegui",
'lock': "Blocca", 'lock': "Blocca",
'unlock': "Sblocca", 'unlock': "Sblocca",
'brightness': "Luminosità",
'color_temperature': "Temperatura colore",
'position': "Apertura",
}, },
'lb': { 'lb': {
'ACTIVATE': "Aktivéieren", 'ACTIVATE': "Aktivéieren",
@@ -445,6 +508,9 @@ translations = {
'run': "Ausféieren", 'run': "Ausféieren",
'lock': "Spären", 'lock': "Spären",
'unlock': "Entspären", 'unlock': "Entspären",
'brightness': "Hellegkeet",
'color_temperature': "Faarf Temperatur",
'position': "Positioun",
}, },
'lt': { 'lt': {
'ACTIVATE': "Suaktyvinti", 'ACTIVATE': "Suaktyvinti",
@@ -463,6 +529,9 @@ translations = {
'run': "Paleisti", 'run': "Paleisti",
'lock': "Užrakinti", 'lock': "Užrakinti",
'unlock': "Atrakinti", 'unlock': "Atrakinti",
'brightness': "Ryškumas",
'color_temperature': "Spalvos temperatūra",
'position': "Padėtis",
}, },
'lv': { 'lv': {
'ACTIVATE': "Aktivizēt", 'ACTIVATE': "Aktivizēt",
@@ -481,6 +550,9 @@ translations = {
'disarm': "Atslēgt", 'disarm': "Atslēgt",
'lock': "Aizslēgt", 'lock': "Aizslēgt",
'unlock': "Atslēgt", 'unlock': "Atslēgt",
'brightness': "Spilgtums",
'color_temperature': "Krāsu temperatūra",
'position': "Pozīcija",
}, },
'nb': { 'nb': {
'PRESS': "trykk", 'PRESS': "trykk",
@@ -502,6 +574,9 @@ translations = {
'run': "Kjør", 'run': "Kjør",
'lock': "Lås", 'lock': "Lås",
'unlock': "Lås opp", 'unlock': "Lås opp",
'brightness': "Lysstyrke",
'color_temperature': "Fargetemperatur",
'position': "Posisjon",
}, },
'nl': { 'nl': {
'PRESS': "Klik", 'PRESS': "Klik",
@@ -523,6 +598,9 @@ translations = {
'run': "Uitvoeren", 'run': "Uitvoeren",
'lock': "Vergrendelen", 'lock': "Vergrendelen",
'unlock': "Ontgrendelen", 'unlock': "Ontgrendelen",
'brightness': "Helderheid",
'color_temperature': "Kleurtemperatuur",
'position': "Positie",
}, },
'nn': { 'nn': {
'ACTIVATE': "Aktiver", 'ACTIVATE': "Aktiver",
@@ -543,6 +621,9 @@ translations = {
'run': "Køyr", 'run': "Køyr",
'lock': "Lås", 'lock': "Lås",
'unlock': "Lås opp", 'unlock': "Lås opp",
'brightness': "Lysstyrke",
'color_temperature': "Fargetemperatur",
'position': "Posisjon",
}, },
'pl': { 'pl': {
'PRESS': "Naciśnij", 'PRESS': "Naciśnij",
@@ -564,6 +645,9 @@ translations = {
'run': "Uruchom", 'run': "Uruchom",
'lock': "Zablokuj", 'lock': "Zablokuj",
'unlock': "Odblokuj", 'unlock': "Odblokuj",
'brightness': "Jasność",
'color_temperature': "Temperatura barwy",
'position': "Pozycja",
}, },
'pt': { 'pt': {
'PRESS': "Pressione", 'PRESS': "Pressione",
@@ -584,6 +668,9 @@ translations = {
'run': "Executar", 'run': "Executar",
'lock': "Bloquear", 'lock': "Bloquear",
'unlock': "Desbloquear", 'unlock': "Desbloquear",
'brightness': "Brilho",
'color_temperature': "Temperatura de cor",
'position': "Posição",
}, },
'ro': { 'ro': {
'ACTIVATE': "Activați", 'ACTIVATE': "Activați",
@@ -604,6 +691,9 @@ translations = {
'run': "Rulați", 'run': "Rulați",
'lock': "Blocat", 'lock': "Blocat",
'unlock': "Deblocare", 'unlock': "Deblocare",
'brightness': "Luminozitate",
'color_temperature': "Temperatură de culoare",
'position': "Poziţie",
}, },
'ru': { 'ru': {
'PRESS': "Нажать", 'PRESS': "Нажать",
@@ -625,6 +715,9 @@ translations = {
'run': "Запустить", 'run': "Запустить",
'lock': "Закрыть", 'lock': "Закрыть",
'unlock': "Открыть", 'unlock': "Открыть",
'brightness': "Яркость",
'color_temperature': "Цветовая температура",
'position': "Положение",
}, },
'sk': { 'sk': {
'ACTIVATE': "Aktivovať", 'ACTIVATE': "Aktivovať",
@@ -645,6 +738,9 @@ translations = {
'run': "Spustiť", 'run': "Spustiť",
'lock': "Zamknúť", 'lock': "Zamknúť",
'unlock': "Odomknúť", 'unlock': "Odomknúť",
'brightness': "Jas",
'color_temperature': "Teplota farby",
'position': "Poloha",
}, },
'sl': { 'sl': {
'PRESS': "Pritisnite", 'PRESS': "Pritisnite",
@@ -665,6 +761,9 @@ translations = {
'run': "Poženi", 'run': "Poženi",
'lock': "Zakleni", 'lock': "Zakleni",
'unlock': "Odkleni", 'unlock': "Odkleni",
'brightness': "Svetlost",
'color_temperature': "Temperatura barve",
'position': "Položaj",
}, },
'sv': { 'sv': {
'PRESS': "Tryck", 'PRESS': "Tryck",
@@ -686,6 +785,9 @@ translations = {
'run': "Kör", 'run': "Kör",
'lock': "Lås", 'lock': "Lås",
'unlock': "Lås upp", 'unlock': "Lås upp",
'brightness': "Ljusstyrka",
'color_temperature': "Färgtemperatur",
'position': "Position",
}, },
'th': { 'th': {
'PRESS': "กด", 'PRESS': "กด",
@@ -705,6 +807,9 @@ translations = {
'disarm': "ปิดระบบสัญญาณกันขโมย", 'disarm': "ปิดระบบสัญญาณกันขโมย",
'lock': "ล็อค", 'lock': "ล็อค",
'unlock': "ปลดล็อค", 'unlock': "ปลดล็อค",
'brightness': "ความสว่าง",
'color_temperature': "อุณหภูมิสี",
'position': "ตำแหน่ง",
}, },
'tr': { 'tr': {
'PRESS': "Basınız", 'PRESS': "Basınız",
@@ -726,6 +831,9 @@ translations = {
'run': "Çalıştır", 'run': "Çalıştır",
'lock': "Kilitle", 'lock': "Kilitle",
'unlock': "Kilidi aç", 'unlock': "Kilidi aç",
'brightness': "Parlaklık",
'color_temperature': "Renk sıcaklığı",
'position': "Pozisyon",
}, },
'uk': { 'uk': {
'PRESS': "Натисніть", 'PRESS': "Натисніть",
@@ -746,6 +854,9 @@ translations = {
'run': "Запустити", 'run': "Запустити",
'lock': "Блокувати", 'lock': "Блокувати",
'unlock': "Розблокувати", 'unlock': "Розблокувати",
'brightness': "Яскравість",
'color_temperature': "Кольорова температура",
'position': "Положення",
}, },
'vi': { 'vi': {
'ACTIVATE': "Kích hoạt", 'ACTIVATE': "Kích hoạt",
@@ -765,6 +876,9 @@ translations = {
'run': "Chạy", 'run': "Chạy",
'lock': "Khóa", 'lock': "Khóa",
'unlock': "Mở khóa", 'unlock': "Mở khóa",
'brightness': "Độ sáng",
'color_temperature': "Nhiệt độ màu",
'position': "Vị trí",
}, },
} }
@@ -774,4 +888,3 @@ def get_translation(locale, input):
return translations.get(locale).get(input, en_fallback_res) return translations.get(locale).get(input, en_fallback_res)
else: else:
return en_fallback_res return en_fallback_res

View File

@@ -402,12 +402,16 @@ class LuiPagesGen(object):
color = "enable" color = "enable"
else: else:
color = "disable" color = "disable"
self._send_mqtt_msg(f"entityUpdateDetail~{get_icon_id('lightbulb')}~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}") color_translation = "Color"
brightness_translation = get_translation(self._locale, "brightness")
color_temp_translation = get_translation(self._locale, "color_temperature")
self._send_mqtt_msg(f"entityUpdateDetail~{get_icon_id('lightbulb')}~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}~{color_translation}~{color_temp_translation}~{brightness_translation}")
def generate_shutter_detail_page(self, entity): def generate_shutter_detail_page(self, entity):
entity = self._ha_api.get_entity(entity) entity = self._ha_api.get_entity(entity)
pos = int(entity.attributes.get("current_position", 50)) pos = int(entity.attributes.get("current_position", 50))
self._send_mqtt_msg(f"entityUpdateDetail~{pos}") pos_translation = get_translation(self._locale, "position")
self._send_mqtt_msg(f"entityUpdateDetail~{pos}~~{pos_translation}")
def send_message_page(self, id, heading, msg, b1, b2): def send_message_page(self, id, heading, msg, b1, b2):
self._send_mqtt_msg(f"pageType~popupNotify") self._send_mqtt_msg(f"pageType~popupNotify")

View File

@@ -24,8 +24,8 @@ class NsPanelLovelaceUIManager(hass.Hass):
controller = LuiController(self, cfg, send_mqtt_msg) controller = LuiController(self, cfg, send_mqtt_msg)
desired_display_firmware_version = 33 desired_display_firmware_version = 34
version = "v2.8.0" version = "v2.8.1"
model = cfg.get("model") model = cfg.get("model")
if model == "us-l": if model == "us-l":