h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-16 09:56:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
Johannes
2022-05-07 17:43:07 +02:00
parent c46cd3cb34 a6594e0f4a
commit 180e338453
11 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
HMI/US/landscape/diff-eu-version.txt
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 15:22:54.832432189 +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:22:55.672426594 +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 15:22:54.832432189 +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:22:55.672426594 +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

8
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -10,14 +10,14 @@ 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
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

18
HMI/US/landscape/n2t-out-visual/popupLight.txt
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

6
HMI/US/landscape/n2t-out/popupLight.txt
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

12
HMI/US/portrait/diff-eu-version.txt
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 15:22:54.832432189 +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 15:22:55.220427870 +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 15:22:54.836432145 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-07 15:37:51.728763344 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:22:55.224427825 +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 15:22:54.832432189 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:22:55.224427825 +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

14
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,7 +1,7 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:22:55.272427291 +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 15:22:54.832432189 +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 15:22:55.220427870 +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 15:22:54.836432145 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:37:51.728763344 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:22:55.224427825 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:37:52.104789571 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:22:54.832432189 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:22:55.224427825 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:37:52.104789571 +0000

22
HMI/US/portrait/n2t-out-visual/popupLight.txt
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

6
HMI/US/portrait/n2t-out/popupLight.txt
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

18
HMI/n2t-out-visual/popupLight.txt
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

6
HMI/n2t-out/popupLight.txt
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

4
apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
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":