Compare commits

..

21 Commits

Author SHA1 Message Date
Johannes
beebb0afef Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-06-17 17:26:26 +02:00
Johannes
5e513fbab6 fix timeAddTemplate in combination witht theme config 2022-06-17 17:26:00 +02:00
Johannes
e49f18b125 Update pages.py 2022-06-16 23:16:19 +02:00
Armilar
689f9e8bf8 Bugfix by Grrzzz - Subpages - Issue #286 2022-06-16 22:43:28 +02:00
Armilar
4646781d93 Bugfix by Grrzzz - Subpages - Issue #286 2022-06-16 22:42:06 +02:00
Armilar
c0521bac9e Use localString for time, date and multilingualism
- Date/time in the screensaver based on localString (de-DE/en-EN/nl-NL/etc.)
- Multilingual - config.locale (en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU)
2022-06-16 22:18:37 +02:00
Johannes
4e57b15206 Update pages.py 2022-06-16 19:53:48 +02:00
Armilar
3d927393a4 Language File
en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU
2022-06-16 19:43:11 +02:00
Johannes
41b48a0237 add issue config 2022-06-16 19:18:05 +02:00
Johannes
6b9e8d6b92 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-06-16 19:04:21 +02:00
Johannes
bb07f36327 check type for every button press call 2022-06-16 19:04:14 +02:00
joBr99
5c50bad008 extended length of bText to 20 (add nextion2text) 2022-06-16 16:54:49 +00:00
Johannes
229002088f extended length of bText to 20 2022-06-16 18:54:18 +02:00
Johannes
ae33905463 change link to normal version 2022-06-15 21:49:08 +02:00
joBr99
035a4b5129 extended cardEntities value char limit to 15 (add nextion2text) 2022-06-15 18:19:11 +00:00
Johannes
0be532bbce extended cardEntities value char limit to 15 2022-06-15 20:18:42 +02:00
Johannes
a2a42add20 add color overwrite to statusIcons #233 2022-06-15 17:24:00 +02:00
Johannes
2b252d4327 additional fix for #284 2022-06-15 16:25:31 +02:00
Armilar
e84ce9cc1b V3.0.0 + Bugfix: Sub-Page closes on Button Action (Fix by Grrzzz) 2022-06-14 22:45:37 +02:00
Armilar
69a5dd323d V3.0.0 + Bugfix: Sub-Page closes on Button Action (Fix by Grrzzz) 2022-06-14 22:42:08 +02:00
Armilar
c7346ed02c Bugfix - Sub-Page closes on Button Action - (Many thanks to Grrzzz) 2022-06-14 22:37:22 +02:00
24 changed files with 436 additions and 246 deletions

5
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: NsPanel Lovelace UI Docs
url: https://docs.nspanel.pky.eu
about: All the information related to flashing and configuration.

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-06-12 12:21:18.432756347 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-16 16:54:47.818443964 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-12 12:21:19.348768343 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-16 16:54:48.686499319 +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-06-12 12:21:18.432756347 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-12 12:21:19.348768343 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-16 16:54:48.690499574 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

View File

@@ -83,63 +83,63 @@ Variable (string) strCommand
Variable (string) type1 Variable (string) type1
Attributes Attributes
ID : 45 ID : 41
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) type2 Variable (string) type2
Attributes Attributes
ID : 46 ID : 42
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) type3 Variable (string) type3
Attributes Attributes
ID : 47 ID : 43
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) type4 Variable (string) type4
Attributes Attributes
ID : 48 ID : 44
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) entn1 Variable (string) entn1
Attributes Attributes
ID : 49 ID : 45
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 50 ID : 46
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 51 ID : 47
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 52 ID : 48
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Number nNum1 Number nNum1
Attributes Attributes
ID : 58 ID : 54
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -169,7 +169,7 @@ Number nNum1
Number nNum2 Number nNum2
Attributes Attributes
ID : 59 ID : 55
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -199,7 +199,7 @@ Number nNum2
Number nNum3 Number nNum3
Attributes Attributes
ID : 60 ID : 56
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -229,7 +229,7 @@ Number nNum3
Number nNum4 Number nNum4
Attributes Attributes
ID : 61 ID : 57
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -275,7 +275,7 @@ Text tHeading
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
@@ -666,7 +666,7 @@ Picture p0
Slider hSlider1 Slider hSlider1
Attributes Attributes
ID : 54 ID : 50
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -709,7 +709,7 @@ Slider hSlider1
Slider hSlider2 Slider hSlider2
Attributes Attributes
ID : 55 ID : 51
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -752,7 +752,7 @@ Slider hSlider2
Slider hSlider3 Slider hSlider3
Attributes Attributes
ID : 56 ID : 52
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -795,7 +795,7 @@ Slider hSlider3
Slider hSlider4 Slider hSlider4
Attributes Attributes
ID : 57 ID : 53
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1503,15 +1503,15 @@ Button bNext
Button bText1 Button bText1
Attributes Attributes
ID : 37 ID : 61
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 292 x coordinate : 276
y coordinate : 84 y coordinate : 84
Width : 145 Width : 166
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1527,8 +1527,8 @@ Button bText1
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1550,15 +1550,15 @@ Button bText1
Button bText2 Button bText2
Attributes Attributes
ID : 38 ID : 62
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 291 x coordinate : 276
y coordinate : 140 y coordinate : 140
Width : 145 Width : 166
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1574,8 +1574,8 @@ Button bText2
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1597,15 +1597,15 @@ Button bText2
Button bText3 Button bText3
Attributes Attributes
ID : 39 ID : 63
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 292 x coordinate : 277
y coordinate : 197 y coordinate : 197
Width : 145 Width : 166
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1621,8 +1621,8 @@ Button bText3
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1644,15 +1644,15 @@ Button bText3
Button bText4 Button bText4
Attributes Attributes
ID : 40 ID : 64
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 292 x coordinate : 277
y coordinate : 254 y coordinate : 254
Width : 145 Width : 166
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1668,8 +1668,8 @@ Button bText4
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1897,7 +1897,7 @@ Hotspot mSpecial
Hotspot m2 Hotspot m2
Attributes Attributes
ID : 41 ID : 37
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1905,7 +1905,7 @@ Hotspot m2
Opacity : 127 Opacity : 127
x coordinate : 40 x coordinate : 40
y coordinate : 184 y coordinate : 184
Width : 250 Width : 235
Height : 60 Height : 60
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1928,7 +1928,7 @@ Hotspot m2
Hotspot m1 Hotspot m1
Attributes Attributes
ID : 42 ID : 38
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1936,7 +1936,7 @@ Hotspot m1
Opacity : 127 Opacity : 127
x coordinate : 39 x coordinate : 39
y coordinate : 127 y coordinate : 127
Width : 247 Width : 236
Height : 60 Height : 60
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1959,7 +1959,7 @@ Hotspot m1
Hotspot m0 Hotspot m0
Attributes Attributes
ID : 43 ID : 39
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1967,7 +1967,7 @@ Hotspot m0
Opacity : 127 Opacity : 127
x coordinate : 37 x coordinate : 37
y coordinate : 70 y coordinate : 70
Width : 244 Width : 237
Height : 56 Height : 56
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1990,7 +1990,7 @@ Hotspot m0
Hotspot m3 Hotspot m3
Attributes Attributes
ID : 44 ID : 40
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1998,7 +1998,7 @@ Hotspot m3
Opacity : 127 Opacity : 127
x coordinate : 38 x coordinate : 38
y coordinate : 237 y coordinate : 237
Width : 244 Width : 236
Height : 60 Height : 60
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -2021,7 +2021,7 @@ Hotspot m3
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
ID : 62 ID : 58
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -2041,7 +2041,7 @@ Hotspot mSwipeNext
Hotspot mSwipeUp Hotspot mSwipeUp
Attributes Attributes
ID : 63 ID : 59
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -2049,7 +2049,7 @@ Hotspot mSwipeUp
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
y coordinate : 0 y coordinate : 0
Width : 454 Width : 453
Height : 9 Height : 9
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -2061,7 +2061,7 @@ Hotspot mSwipeUp
Hotspot mSwipePrev Hotspot mSwipePrev
Attributes Attributes
ID : 64 ID : 60
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -2953,7 +2953,7 @@ Timer tmSleep
TouchCap tc0 TouchCap tc0
Attributes Attributes
ID : 53 ID : 49
Scope: local Scope: local
Value: 0 Value: 0

View File

@@ -769,8 +769,8 @@ Button bText1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event
@@ -794,8 +794,8 @@ Button bText2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event
@@ -819,8 +819,8 @@ Button bText3
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event
@@ -844,8 +844,8 @@ Button bText4
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event

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-06-12 12:21:18.432756347 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-16 16:54:47.818443964 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-12 12:21:18.872762109 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-16 16:54:48.242471004 +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-06-12 12:21:18.436756399 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-16 16:54:47.818443964 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:21:18.876762161 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-16 16:54:48.242471004 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -213,8 +213,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ State : unpressed + State : unpressed
+ Text : newtxt + Text :
+ Max. Text Size : 10 + Max. Text Size : 20
+ +
+ Events + Events
+ Touch Press Event + Touch Press Event
@@ -468,8 +468,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-06-12 12:21:18.432756347 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:21:18.872762109 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-16 16:54:48.242471004 +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,16 +1,18 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-12 12:21:18.904762528 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-16 16:54:48.258472024 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-16 16:54:47.818443964 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-12 12:21:18.872762109 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-16 16:54:48.242471004 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-12 12:21:18.436756399 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-16 16:54:47.818443964 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:21:18.876762161 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-16 16:54:48.242471004 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
+@@ -286,6 +317,26 @@ +@@ -286,6 +317,26 @@
+@@ -405,6 +456,34 @@ +@@ -405,6 +456,34 @@
+@@ -862,6 +941,106 @@ +@@ -862,6 +941,106 @@
++ Text :
++ Max. Text Size : 20
+@@ -970,6 +1149,33 @@ +@@ -970,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:21:18.872762109 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-16 16:54:48.242471004 +0000

View File

@@ -1684,8 +1684,8 @@ Button bText1
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1731,8 +1731,8 @@ Button bText2
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1778,8 +1778,8 @@ Button bText3
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1825,8 +1825,8 @@ Button bText4
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -2013,8 +2013,8 @@ Button bText5
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

View File

@@ -848,8 +848,8 @@ Button bText1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event
@@ -873,8 +873,8 @@ Button bText2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event
@@ -898,8 +898,8 @@ Button bText3
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event
@@ -923,8 +923,8 @@ Button bText4
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event
@@ -1023,8 +1023,8 @@ Button bText5
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event

Binary file not shown.

Binary file not shown.

View File

@@ -83,63 +83,63 @@ Variable (string) strCommand
Variable (string) type1 Variable (string) type1
Attributes Attributes
ID : 45 ID : 41
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) type2 Variable (string) type2
Attributes Attributes
ID : 46 ID : 42
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) type3 Variable (string) type3
Attributes Attributes
ID : 47 ID : 43
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) type4 Variable (string) type4
Attributes Attributes
ID : 48 ID : 44
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) entn1 Variable (string) entn1
Attributes Attributes
ID : 49 ID : 45
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 50 ID : 46
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 51 ID : 47
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 52 ID : 48
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Number nNum1 Number nNum1
Attributes Attributes
ID : 58 ID : 54
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -169,7 +169,7 @@ Number nNum1
Number nNum2 Number nNum2
Attributes Attributes
ID : 59 ID : 55
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -199,7 +199,7 @@ Number nNum2
Number nNum3 Number nNum3
Attributes Attributes
ID : 60 ID : 56
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -229,7 +229,7 @@ Number nNum3
Number nNum4 Number nNum4
Attributes Attributes
ID : 61 ID : 57
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -666,7 +666,7 @@ Picture p0
Slider hSlider1 Slider hSlider1
Attributes Attributes
ID : 54 ID : 50
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -709,7 +709,7 @@ Slider hSlider1
Slider hSlider2 Slider hSlider2
Attributes Attributes
ID : 55 ID : 51
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -752,7 +752,7 @@ Slider hSlider2
Slider hSlider3 Slider hSlider3
Attributes Attributes
ID : 56 ID : 52
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -795,7 +795,7 @@ Slider hSlider3
Slider hSlider4 Slider hSlider4
Attributes Attributes
ID : 57 ID : 53
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1503,15 +1503,15 @@ Button bNext
Button bText1 Button bText1
Attributes Attributes
ID : 37 ID : 61
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 277 x coordinate : 261
y coordinate : 84 y coordinate : 84
Width : 145 Width : 166
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1527,8 +1527,8 @@ Button bText1
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1550,15 +1550,15 @@ Button bText1
Button bText2 Button bText2
Attributes Attributes
ID : 38 ID : 62
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 276 x coordinate : 261
y coordinate : 140 y coordinate : 140
Width : 145 Width : 166
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1574,8 +1574,8 @@ Button bText2
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1597,15 +1597,15 @@ Button bText2
Button bText3 Button bText3
Attributes Attributes
ID : 39 ID : 63
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 277 x coordinate : 262
y coordinate : 197 y coordinate : 197
Width : 145 Width : 166
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1621,8 +1621,8 @@ Button bText3
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1644,15 +1644,15 @@ Button bText3
Button bText4 Button bText4
Attributes Attributes
ID : 40 ID : 64
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 277 x coordinate : 262
y coordinate : 254 y coordinate : 254
Width : 145 Width : 166
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1668,8 +1668,8 @@ Button bText4
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1897,7 +1897,7 @@ Hotspot mSpecial
Hotspot m2 Hotspot m2
Attributes Attributes
ID : 41 ID : 37
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1905,7 +1905,7 @@ Hotspot m2
Opacity : 127 Opacity : 127
x coordinate : 25 x coordinate : 25
y coordinate : 184 y coordinate : 184
Width : 250 Width : 235
Height : 60 Height : 60
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1928,7 +1928,7 @@ Hotspot m2
Hotspot m1 Hotspot m1
Attributes Attributes
ID : 42 ID : 38
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1936,7 +1936,7 @@ Hotspot m1
Opacity : 127 Opacity : 127
x coordinate : 24 x coordinate : 24
y coordinate : 127 y coordinate : 127
Width : 247 Width : 236
Height : 60 Height : 60
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1959,7 +1959,7 @@ Hotspot m1
Hotspot m0 Hotspot m0
Attributes Attributes
ID : 43 ID : 39
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1967,7 +1967,7 @@ Hotspot m0
Opacity : 127 Opacity : 127
x coordinate : 22 x coordinate : 22
y coordinate : 70 y coordinate : 70
Width : 244 Width : 237
Height : 56 Height : 56
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1990,7 +1990,7 @@ Hotspot m0
Hotspot m3 Hotspot m3
Attributes Attributes
ID : 44 ID : 40
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1998,7 +1998,7 @@ Hotspot m3
Opacity : 127 Opacity : 127
x coordinate : 23 x coordinate : 23
y coordinate : 237 y coordinate : 237
Width : 244 Width : 236
Height : 60 Height : 60
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -2021,7 +2021,7 @@ Hotspot m3
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
ID : 62 ID : 58
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -2041,7 +2041,7 @@ Hotspot mSwipeNext
Hotspot mSwipeUp Hotspot mSwipeUp
Attributes Attributes
ID : 63 ID : 59
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -2061,7 +2061,7 @@ Hotspot mSwipeUp
Hotspot mSwipePrev Hotspot mSwipePrev
Attributes Attributes
ID : 64 ID : 60
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -2953,7 +2953,7 @@ Timer tmSleep
TouchCap tc0 TouchCap tc0
Attributes Attributes
ID : 53 ID : 49
Scope: local Scope: local
Value: 0 Value: 0

View File

@@ -769,8 +769,8 @@ Button bText1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event
@@ -794,8 +794,8 @@ Button bText2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event
@@ -819,8 +819,8 @@ Button bText3
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event
@@ -844,8 +844,8 @@ Button bText4
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : newtxt Text :
Max. Text Size : 10 Max. Text Size : 20
Events Events
Touch Press Event Touch Press Event

Binary file not shown.

Binary file not shown.

View File

@@ -259,7 +259,7 @@ class LuiController(object):
self._ha_api.get_entity(entity_id).call_service("unlock") self._ha_api.get_entity(entity_id).call_service("unlock")
else: else:
self._ha_api.get_entity(entity_id).call_service("lock") self._ha_api.get_entity(entity_id).call_service("lock")
else: elif entity_id.startswith('button') or entity_id.startswith('input_button'):
self._ha_api.get_entity(entity_id).call_service("press") self._ha_api.get_entity(entity_id).call_service("press")
# for media page # for media page

View File

@@ -139,7 +139,7 @@ class LuiPagesGen(object):
entity = self._ha_api.get_entity(statusIcon.get("entity")) entity = self._ha_api.get_entity(statusIcon.get("entity"))
entityType = statusIcon.get("entity").split(".")[0] entityType = statusIcon.get("entity").split(".")[0]
icon = get_icon_id_ha(entityType, state=entity.state, device_class=entity.attributes.get("device_class", ""), overwrite=icon) icon = get_icon_id_ha(entityType, state=entity.state, device_class=entity.attributes.get("device_class", ""), overwrite=icon)
color = self.get_entity_color(entity) color = self.get_entity_color(entity, overwrite=statusIcon.get("color", None))
status_res += f"~{icon}~{color}" status_res += f"~{icon}~{color}"
self._send_mqtt_msg(f"weatherUpdate~{icon_cur}~{text_cur}{weather_res}{altLayout}{status_res}") self._send_mqtt_msg(f"weatherUpdate~{icon_cur}~{text_cur}{weather_res}{altLayout}{status_res}")
@@ -172,7 +172,9 @@ class LuiPagesGen(object):
status_entity = self._ha_api.get_entity(item.status) status_entity = self._ha_api.get_entity(item.status)
icon_color = self.get_entity_color(status_entity) icon_color = self.get_entity_color(status_entity)
if item.status.startswith("sensor") and cardType == "cardGrid": if item.status.startswith("sensor") and cardType == "cardGrid":
icon_id = status_entity.state icon_id = status_entity.state[:4]
if icon_id[-1] == ".":
icon_id = icon_id[:-1]
else: else:
icon_color = 17299 icon_color = 17299
return f"~button~{entityId}~{icon_id}~{icon_color}~{name}~{text}" return f"~button~{entityId}~{icon_id}~{icon_color}~{name}~{text}"
@@ -234,7 +236,7 @@ class LuiPagesGen(object):
unit_of_measurement = entity.attributes.get("unit_of_measurement", "") unit_of_measurement = entity.attributes.get("unit_of_measurement", "")
value = entity.state + " " + unit_of_measurement value = entity.state + " " + unit_of_measurement
if cardType == "cardGrid" and entityType == "sensor": if cardType == "cardGrid" and entityType == "sensor":
icon_id = entity.state[:3] icon_id = entity.state[:4]
if icon_id[-1] == ".": if icon_id[-1] == ".":
icon_id = icon_id[:-1] icon_id = icon_id[:-1]
else: else:
@@ -272,7 +274,7 @@ class LuiPagesGen(object):
icon_id = get_icon_id_ha("input_text", overwrite=icon) icon_id = get_icon_id_ha("input_text", overwrite=icon)
value = entity.state value = entity.state
return f"~text~{entityId}~{icon_id}~17299~{name}~{value}" return f"~text~{entityId}~{icon_id}~17299~{name}~{value}"
return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~error~" return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~unsupported~"
def generate_entities_page(self, navigation, heading, items, cardType): def generate_entities_page(self, navigation, heading, items, cardType):
command = f"entityUpd~{heading}~{navigation}" command = f"entityUpd~{heading}~{navigation}"

View File

@@ -23,7 +23,8 @@ default_screensaver_color_mapping = {
"tForecast4Val": "65535", "tForecast4Val": "65535",
"bar": "65535", "bar": "65535",
"tMRIcon": "65535", "tMRIcon": "65535",
"tMR": "65535" "tMR": "65535",
"tTimeAdd": "65535"
} }
default_weather_icon_color_mapping = { default_weather_icon_color_mapping = {

View File

@@ -138,6 +138,7 @@ Example for the theme config:
#bar: [220, 0, 255] #bar: [220, 0, 255]
#tMRIcon: [220, 0, 255] #tMRIcon: [220, 0, 255]
#tMR: [220, 0, 255] #tMR: [220, 0, 255]
#tTimeAdd: [220, 0, 255]
#autoWeather automatically colors the screensaver weather icons based upon weather. Uncomment the following line to enable. #autoWeather automatically colors the screensaver weather icons based upon weather. Uncomment the following line to enable.
#autoWeather: true #autoWeather: true

View File

@@ -1,6 +1,6 @@
# Flash Tasmota to your NSPanel # Flash Tasmota to your NSPanel
You need to connect to your nspanel via serial and flash tasmtoa [tasmota32-nspanel.factory.bin](https://tasmota.github.io/install/firmware/development/tasmota32-nspanel.factory.bin) to your NSPanel. You need to connect to your nspanel via serial and flash tasmtoa [tasmota32-nspanel.bin](https://tasmota.github.io/install/firmware/development/tasmota32-nspanel.bin) to your NSPanel.
You can use the Tasmota Web Installer to do so. [Tasmota Web Installer](https://tasmota.github.io/install/) You can use the Tasmota Web Installer to do so. [Tasmota Web Installer](https://tasmota.github.io/install/)
Checkout Blakadders Template Repo for more information on flashing, do not use the autoexec.be from this page. Checkout Blakadders Template Repo for more information on flashing, do not use the autoexec.be from this page.

View File

@@ -1,6 +1,6 @@
# Flash Tasmota to your NSPanel # Flash Tasmota to your NSPanel
You need to connect to your nspanel via serial and flash tasmtoa [tasmota32-nspanel.factory.bin](https://tasmota.github.io/install/firmware/development/tasmota32-nspanel.factory.bin) to your NSPanel. You need to connect to your nspanel via serial and flash tasmtoa [tasmota32-nspanel.bin](https://tasmota.github.io/install/firmware/development/tasmota32-nspanel.bin) to your NSPanel.
You can use the Tasmota Web Installer to do so. [Tasmota Web Installer](https://tasmota.github.io/install/) You can use the Tasmota Web Installer to do so. [Tasmota Web Installer](https://tasmota.github.io/install/)
Checkout Blakadders Template Repo for more information on flashing, do not use the autoexec.be from this page. Checkout Blakadders Template Repo for more information on flashing, do not use the autoexec.be from this page.

View File

@@ -1,6 +1,6 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
TypeScript zur Steuerung des SONOFF NSPanel mit dem ioBroker TypeScript zur Steuerung des SONOFF NSPanel mit dem ioBroker
- abgestimmt auf TFT 36 / v2.9.0 / BerryDriver 4 / Tasmota 11.1.0 - abgestimmt auf TFT 37 / v3.0.0 / BerryDriver 4 / Tasmota 11.1.0
joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen) icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen)
@@ -15,6 +15,9 @@ ReleaseNotes:
- 08.05.2022 - Schalter (Licht, Dimmer, Hue, etc) in cardGrid lassen sich wieder schalten - 08.05.2022 - Schalter (Licht, Dimmer, Hue, etc) in cardGrid lassen sich wieder schalten
- 14.06.2022 - Aktion auf Submenüs schaltet unmittelbar auf vorheriges Mainmenu (Many thanks to Grrzzz) - 14.06.2022 - Aktion auf Submenüs schaltet unmittelbar auf vorheriges Mainmenu (Many thanks to Grrzzz)
- 14.06.2022 - Menü-Pfeile in Subpages (z.B. card QR, cardMedia, etc) (Many thanks to Grrzzz) - 14.06.2022 - Menü-Pfeile in Subpages (z.B. card QR, cardMedia, etc) (Many thanks to Grrzzz)
- 15.06.2022 - Date/Time im Screensaver auf Basis localString (de-DE/en-EN/nl-NL/etc.)
- 16.06.2022 - Multilingual - config.locale (en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU)
- 16.06.2022 - Bugfix by Grrzzz - Subpages
Wenn Rule definiert, dann können die Hardware-Tasten ebenfalls für Seitensteuerung (dann nicht mehr als Releais) genutzt werden Wenn Rule definiert, dann können die Hardware-Tasten ebenfalls für Seitensteuerung (dann nicht mehr als Releais) genutzt werden
Tasmota Konsole: Tasmota Konsole:
@@ -68,10 +71,8 @@ Interne Sonoff-Sensoren (über Tasmota):
(!!! Achtung: der interne Sonoff-Sensor liefert keine exakten Daten, da das NSPanel-Board und der ESP selbst Hitze produzieren !!! (!!! Achtung: der interne Sonoff-Sensor liefert keine exakten Daten, da das NSPanel-Board und der ESP selbst Hitze produzieren !!!
ggf. Offset einplanen oder besser einen externen Sensor über Zigbee etc. verwenden) ggf. Offset einplanen oder besser einen externen Sensor über Zigbee etc. verwenden)
Timestamp - wird in 0_userdata.0. Zeitpunkt der letzten Sensorübertragung Timestamp - wird in 0_userdata.0. Zeitpunkt der letzten Sensorübertragung
Tasmota-Status0 - (zyklische Ausführung) Tasmota-Status0 - (zyklische Ausführung)
liefert relevanten Tasmota-Informationen und kann bei Bedarf in "function get_tasmota_status0()" erweitert werden. Daten werden in 0_userdata.0. abgelegt liefert relevanten Tasmota-Informationen und kann bei Bedarf in "function get_tasmota_status0()" erweitert werden. Daten werden in 0_userdata.0. abgelegt
Erforderliche Adapter: Erforderliche Adapter:
Accu-Wheater: - Bei Nutzung der Wetterfunktionen (und zur Icon-Konvertierung) im Screensaver Accu-Wheater: - Bei Nutzung der Wetterfunktionen (und zur Icon-Konvertierung) im Screensaver
Alexa2: - Bei Nutzung der dynamischen SpeakerList in der cardMedia Alexa2: - Bei Nutzung der dynamischen SpeakerList in der cardMedia
@@ -79,10 +80,9 @@ Erforderliche Adapter:
Alias-Manager - !!! ausschießlich für MEDIA-Alias Alias-Manager - !!! ausschießlich für MEDIA-Alias
MQTT-Adapter - Für Kommunikation zwischen Skript und Tasmota MQTT-Adapter - Für Kommunikation zwischen Skript und Tasmota
JavaScript-Adapter JavaScript-Adapter
Upgrades in Konsole: Upgrades in Konsole:
Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1 Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1
TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v2.9.0.tft TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v3.0.0.tft
--------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------
*/ */
var Icons = new IconsSelector(); var Icons = new IconsSelector();
@@ -91,8 +91,9 @@ const NSPanel_Path = "0_userdata.0.NSPanel.1."
const Debug = false; const Debug = false;
var manually_Update = true; var manually_Update = true;
const Months = ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"]; //const Months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
const Days = ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"]; //const Days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
//const Off: RGB = { red: 68, green: 115, blue: 158 }; //Blau-Off //const Off: RGB = { red: 68, green: 115, blue: 158 }; //Blau-Off
const Off: RGB = { red: 253, green: 128, blue: 0 }; //Orange-Off - schönere Farbübergänge const Off: RGB = { red: 253, green: 128, blue: 0 }; //Orange-Off - schönere Farbübergänge
const On: RGB = { red: 253, green: 216, blue: 53 }; const On: RGB = { red: 253, green: 216, blue: 53 };
@@ -328,7 +329,7 @@ var WLAN: PageQR =
"heading": "Gäste WLAN", "heading": "Gäste WLAN",
"useColor": true, "useColor": true,
"subPage": true, "subPage": true,
"parent": WLAN, "parent": Subpages_1,
"items": [<PageItem>{ id: "alias.0.NSPanel_1.Guest_Wifi" }] "items": [<PageItem>{ id: "alias.0.NSPanel_1.Guest_Wifi" }]
}; };
@@ -445,9 +446,9 @@ export const config: Config = {
dimmode: 8, dimmode: 8,
active: 100, //Standard-Brightness TFT active: 100, //Standard-Brightness TFT
screenSaverDoubleClick: false, screenSaverDoubleClick: false,
locale: "de_DE", locale: "en-EN", //en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU
timeFormat: "%H:%M", timeFormat: "%H:%M", //currently not used
dateFormat: "%A, %d. %B %Y", dateFormat: "%A, %d. %B %Y", //currently not used
weatherEntity: "alias.0.Wetter", weatherEntity: "alias.0.Wetter",
defaultOffColor: Off, defaultOffColor: Off,
defaultOnColor: On, defaultOnColor: On,
@@ -542,15 +543,29 @@ schedule("*/30 * * * *", function () {
}); });
//Mit Start auf Updates checken //Mit Start auf Updates checken
get_locales();
setState(config.panelSendTopic, 'pageType~pageStartup'); setState(config.panelSendTopic, 'pageType~pageStartup');
get_tasmota_status0() get_tasmota_status0();
get_panel_update_data(); get_panel_update_data();
check_updates(); check_updates();
//------------------Begin Update Functions //------------------Begin Update Functions
function get_locales() {
exec('curl https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/ioBroker/ioBroker_NSPanel_locales.json', function (error, result, stderr){
if (result) {
let BerryDriverVersionOnline = result.substring((result.indexOf("version_of_this_script = ") + 24), result.indexOf("version_of_this_script = ") + 27).replace(/\s+/g, '');
createState(NSPanel_Path + "NSPanel_locales_json");
var timer = setTimeout(function() {
setIfExists(NSPanel_Path + 'NSPanel_locales_json', result);
}, 2000);
}
});
}
function check_updates() { function check_updates() {
const desired_display_firmware_version = 36; const desired_display_firmware_version = 37;
const berry_driver_version = 4; const berry_driver_version = 4;
if (Debug) console.log("Check-Updates"); if (Debug) console.log("Check-Updates");
@@ -784,7 +799,7 @@ function update_berry_driver_version() {
} }
function update_tft_firmware() { function update_tft_firmware() {
const tft_version : string = "v2.9.0"; const tft_version : string = "v3.0.0";
var desired_display_firmware_url = "http://nspanel.pky.eu/lovelace-ui/github/nspanel-" + tft_version + ".tft" var desired_display_firmware_url = "http://nspanel.pky.eu/lovelace-ui/github/nspanel-" + tft_version + ".tft"
require("request")((['http://',get_current_tasmota_ip_address(),'/cm?cmnd=FlashNextion ', desired_display_firmware_url].join('')), async function (error, response, result) { require("request")((['http://',get_current_tasmota_ip_address(),'/cm?cmnd=FlashNextion ', desired_display_firmware_url].join('')), async function (error, response, result) {
createState(NSPanel_Path + "TFT_Firmware.onlineVersion"); createState(NSPanel_Path + "TFT_Firmware.onlineVersion");
@@ -884,7 +899,7 @@ function HandleMessage(typ: string, method: string, page: number, words: Array<s
} }
function findPageItem(searching: String) : PageItem { function findPageItem(searching: String) : PageItem {
let pageItem = config.pages[pageId].items.find(e => e.id === searching); let pageItem = activePage.items.find(e => e.id === searching);
if (pageItem !== undefined) { if (pageItem !== undefined) {
return pageItem; return pageItem;
@@ -947,27 +962,32 @@ function HandleStartupProcess(): void {
} }
function SendDate(): void { function SendDate(): void {
var d = new Date(); var d = new Date();
var day = Days[d.getDay()];
var date = d.getDate();
var month = Months[d.getMonth()];
var year = d.getFullYear(); var year = d.getFullYear();
var _sendDate = "date~" + day + " " + date + " " + month + " " + year; var month = d.getMonth();
SendToPanel(<Payload>{ payload: _sendDate }); var day = d.getDate();
const date = new Date(year,month,day,1,1,1);
const options : any = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' };
var _SendDate = date.toLocaleDateString(config.locale, options);
SendToPanel(<Payload>{ payload: "date~" + _SendDate });
} }
function SendTime(): void { function SendTime(): void {
var d = new Date();
var hr = d.getHours().toString();
var min = d.getMinutes().toString();
if (d.getHours() < 10) { var d = new Date();
hr = "0" + d.getHours().toString(); var year = d.getFullYear();
} var month = d.getMonth();
if (d.getMinutes() < 10) { var day = d.getDate();
min = "0" + d.getMinutes().toString(); var hr = d.getHours();
} var min = d.getMinutes();
SendToPanel(<Payload>{ payload: "time~" + hr + ":" + min }); const date = new Date(year, month, day, hr, min, 1);
var _SendTime = date.toLocaleTimeString(config.locale, { hour: '2-digit', minute: '2-digit', hour12: false});
SendToPanel(<Payload>{ payload: "time~" + _SendTime });
} }
function ScreensaverDimmode() { function ScreensaverDimmode() {
@@ -1216,12 +1236,12 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
if (getState(pageItem.id + ".ACTUAL").val) { if (getState(pageItem.id + ".ACTUAL").val) {
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == "door" ? Icons.GetIcon("door-open") : Icons.GetIcon("window-open-variant"); iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == "door" ? Icons.GetIcon("door-open") : Icons.GetIcon("window-open-variant");
iconColor = GetIconColor(pageItem, false, useColors); iconColor = GetIconColor(pageItem, false, useColors);
var windowState = "opened" var windowState = findLocale("window","opened");
} else { } else {
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == "door" ? Icons.GetIcon("door-closed") : Icons.GetIcon("window-closed-variant"); iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : o.common.role == "door" ? Icons.GetIcon("door-closed") : Icons.GetIcon("window-closed-variant");
//iconId = Icons.GetIcon("window-closed-variant"); //iconId = Icons.GetIcon("window-closed-variant");
iconColor = GetIconColor(pageItem, true, useColors); iconColor = GetIconColor(pageItem, true, useColors);
var windowState = "closed" var windowState = findLocale("window","closed");
} }
RegisterEntityWatcher(pageItem.id + ".ACTUAL"); RegisterEntityWatcher(pageItem.id + ".ACTUAL");
} }
@@ -1282,11 +1302,11 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
if (getState(pageItem.id + ".ACTUAL").val) { if (getState(pageItem.id + ".ACTUAL").val) {
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon("lock"); iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon("lock");
iconColor = GetIconColor(pageItem, true, useColors); iconColor = GetIconColor(pageItem, true, useColors);
var lockState = "UNLOCK" var lockState = findLocale("lock","UNLOCK")
} else { } else {
iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon("lock-open-variant"); iconId = pageItem.icon !== undefined ? Icons.GetIcon(pageItem.icon) : Icons.GetIcon("lock-open-variant");
iconColor = GetIconColor(pageItem, false, useColors); iconColor = GetIconColor(pageItem, false, useColors);
var lockState = "LOCK" var lockState = findLocale("lock","LOCK")
} }
lockState = pageItem.buttonText !== undefined ? pageItem.buttonText : lockState; lockState = pageItem.buttonText !== undefined ? pageItem.buttonText : lockState;
RegisterEntityWatcher(pageItem.id + ".ACTUAL"); RegisterEntityWatcher(pageItem.id + ".ACTUAL");
@@ -1355,6 +1375,20 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
return "~delete~~~~~" return "~delete~~~~~"
} }
function findLocale(controlsObject: string, controlsState: string) : string {
var locale = config.locale;
var strJson = getState(NSPanel_Path + 'NSPanel_locales_json').val;
var obj = JSON.parse(strJson);
var strLocale = obj[controlsObject][controlsState][locale];
if (strLocale != undefined) {
return strLocale;
} else {
return controlsState;
}
}
function GetIconColor(pageItem: PageItem, value: (boolean | number), useColors: boolean): number { function GetIconColor(pageItem: PageItem, value: (boolean | number), useColors: boolean): number {
// dimmer // dimmer
if ((pageItem.useColor || useColors) && pageItem.interpolateColor && typeof (value) === "number") { if ((pageItem.useColor || useColors) && pageItem.interpolateColor && typeof (value) === "number") {
@@ -1380,16 +1414,16 @@ function GetIconColor(pageItem: PageItem, value: (boolean | number), useColors:
} }
function RegisterEntityWatcher(id: string): void { function RegisterEntityWatcher(id: string): void {
if (subscriptions.hasOwnProperty(id) || activePage.subPage ) { if (subscriptions.hasOwnProperty(id)) {
return; return;
} }
subscriptions[id] = (on({ id: id, change: 'any' }, function (data) { subscriptions[id] = (on({ id: id, change: 'any' }, function (data) {
if(pageId >= 0)
SendToPanel({ payload: GeneratePageElements(config.pages[pageId]) });
if(pageId == -1 && config.button1Page != undefined) if(pageId == -1 && config.button1Page != undefined)
SendToPanel({ payload: GeneratePageElements(config.button1Page) }); SendToPanel({ payload: GeneratePageElements(config.button1Page) });
if(pageId == -2 && config.button2Page != undefined) if(pageId == -2 && config.button2Page != undefined)
SendToPanel({ payload: GeneratePageElements(config.button2Page) }); SendToPanel({ payload: GeneratePageElements(config.button2Page) });
if(activePage!=undefined)
SendToPanel({ payload: GeneratePageElements(activePage) });
})) }))
} }
@@ -1624,21 +1658,23 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
+ name + "~" //Heading + name + "~" //Heading
+ GetNavigationString(pageId) + "~" //Page Navigation + GetNavigationString(pageId) + "~" //Page Navigation
+ id + "~" //internalNameEntiy + id + "~" //internalNameEntiy
+ currentTemp + "°C" + "~" //Ist-Temperatur (String) + currentTemp + config.temperatureUnit + "~" //Ist-Temperatur (String)
+ destTemp + "~" //Soll-Temperatur (numerisch ohne Komma) + destTemp + "~" //Soll-Temperatur (numerisch ohne Komma)
+ statusStr + "~" //Mode + statusStr + "~" //Mode
+ minTemp + "~" //Thermostat Min-Temperatur + minTemp + "~" //Thermostat Min-Temperatur
+ maxTemp + "~" //Thermostat Max-Temperatur + maxTemp + "~" //Thermostat Max-Temperatur
+ stepTemp + "~" //Schritte für Soll (5°C) + stepTemp + "~" //Schritte für Soll (5°C)
+ icon_res //Icons Status + icon_res //Icons Status
+ "Aktuell" + "~" //Bezeicher vor Aktueller Raumtemperatur + findLocale("thermostat","Currently") + "~" //Bezeicher vor Aktueller Raumtemperatur
+ "Status" + "~" //Bezeicner vor + findLocale("thermostat","State") + "~" //Bezeicner vor
+ "HVAC" + "~" //Bezeichner vor HVAC + findLocale("thermostat","Action") + "~" //Bezeichner vor HVAC
+ "°C"}) //Bezeichner Hinter Solltemp + config.temperatureUnit + "~" //Bezeichner hinter Solltemp
+ "" + "~" //iconTemperature
+ "" //dstTempTwoTempMode
});
} }
if (Debug) console.log(out_msgs); if (Debug) console.log(out_msgs);
return out_msgs return out_msgs
} }
@@ -1931,7 +1967,7 @@ function HandleButtonEvent(words): void {
} }
} else { } else {
if (Debug) console.log("bExit: " + words[4] + " - "+ pageId) if (Debug) console.log("bExit: " + words[4] + " - "+ pageId)
GeneratePage(config.pages[pageId]); GeneratePage(activePage);
} }
break; break;
case "notifyAction": case "notifyAction":
@@ -2276,9 +2312,9 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
+ "disable" + "~" //sliderBrightnessPos + "disable" + "~" //sliderBrightnessPos
+ "disable" + "~" //sliderColorTempPos + "disable" + "~" //sliderColorTempPos
+ "disable" + "~" //colorMode + "disable" + "~" //colorMode
+ "Color" + "~" //Color-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ "Temperature" + "~" //Temperature-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ "Brightness" }) //Brightness-Bezeichnung + findLocale("lights","Brightness")}); //Brightness-Bezeichnung
} }
//Dimmer //Dimmer
@@ -2323,9 +2359,9 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
+ brightness + "~" //sliderBrightnessPos + brightness + "~" //sliderBrightnessPos
+ "disable" + "~" //sliderColorTempPos + "disable" + "~" //sliderColorTempPos
+ "disable" + "~" //colorMod + "disable" + "~" //colorMod
+ "Color" + "~" //Color-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ "Temperature" + "~" //Temperature-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ "Brightness" }) //Brightness-Bezeichnung + findLocale("lights","Brightness")}); //Brightness-Bezeichnung
} }
@@ -2387,9 +2423,9 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
+ brightness + "~" //sliderBrightnessPos + brightness + "~" //sliderBrightnessPos
+ colorTemp + "~" //sliderColorTempPos + colorTemp + "~" //sliderColorTempPos
+ colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable)
+ "Color" + "~" //Color-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ "Temperature" + "~" //Temperature-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ "Brightness" }) //Brightness-Bezeichnung + findLocale("lights","Brightness")}); //Brightness-Bezeichnung
} }
//RGB-Licht //RGB-Licht
@@ -2449,9 +2485,9 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
+ brightness + "~" //sliderBrightnessPos + brightness + "~" //sliderBrightnessPos
+ colorTemp + "~" //sliderColorTempPos + colorTemp + "~" //sliderColorTempPos
+ colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable)
+ "Color" + "~" //Color-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ "Temperature" + "~" //Temperature-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ "Brightness" }) //Brightness-Bezeichnung + findLocale("lights","Brightness")}); //Brightness-Bezeichnung
} }
//RGB-Licht-einzeln (HEX) //RGB-Licht-einzeln (HEX)
@@ -2515,9 +2551,9 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
+ brightness + "~" //sliderBrightnessPos + brightness + "~" //sliderBrightnessPos
+ colorTemp + "~" //sliderColorTempPos + colorTemp + "~" //sliderColorTempPos
+ colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable)
+ "Color" + "~" //Color-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ "Temperature" + "~" //Temperature-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ "Brightness" }) //Brightness-Bezeichnung) + findLocale("lights","Brightness")}); //Brightness-Bezeichnung
} }
//Farbtemperatur //Farbtemperatur
@@ -2569,9 +2605,9 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
+ brightness + "~" //sliderBrightnessPos + brightness + "~" //sliderBrightnessPos
+ colorTemp + "~" //sliderColorTempPos + colorTemp + "~" //sliderColorTempPos
+ colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable)
+ "Color" + "~" //Color-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ "Temperature" + "~" //Temperature-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ "Brightness" }) //Brightness-Bezeichnung + findLocale("lights","Brightness")}); //Brightness-Bezeichnung
} }
} }
@@ -2588,7 +2624,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail
+ val + "~" //Shutterposition + val + "~" //Shutterposition
+ "" + "~" + "" + "~"
+ "Position"}) //Position-Bezeichnung + findLocale("blinds","Position")}); //Position-Bezeichnung
} }
} }
return out_msgs return out_msgs
@@ -2630,7 +2666,7 @@ function HandleScreensaverUpdate(): void {
let TempMax = getState("accuweather.0.Summary.TempMax_d" + i).val; let TempMax = getState("accuweather.0.Summary.TempMax_d" + i).val;
let DayOfWeek = getState("accuweather.0.Summary.DayOfWeek_d" + i).val; let DayOfWeek = getState("accuweather.0.Summary.DayOfWeek_d" + i).val;
let WeatherIcon = GetAccuWeatherIcon(getState("accuweather.0.Summary.WeatherIcon_d" + i).val); let WeatherIcon = GetAccuWeatherIcon(getState("accuweather.0.Summary.WeatherIcon_d" + i).val);
payloadString += DayOfWeek + "~" + Icons.GetIcon(WeatherIcon) + "~" + TempMax + " °C~"; payloadString += DayOfWeek + "~" + Icons.GetIcon(WeatherIcon) + "~" + TempMax + " " + config.temperatureUnit + "~";
} }
} }
else { else {

View File

@@ -0,0 +1,143 @@
{
"lights":{
"Brightness":{
"en-EN":"Brightness",
"de-DE":"Helligkeit",
"nl-NL":"Helderheid",
"da-DK":"Lysstyrke",
"es-ES":"Brillo",
"fr-FR":"Luminosité",
"it-IT":"Luminosità",
"ru-RU":"Яркость"
},
"Color":{
"en-EN":"Color",
"de-DE":"Farbe",
"nl-NL":"Kleur",
"da-DK":"Farve",
"es-ES":"Colore",
"fr-FR":"Couleur",
"ru-RU":"цвет"
},
"Temperature":{
"en-EN":"Temperature",
"de-DE":"Temperatur",
"nl-NL":"Temperatuur",
"da-DK":"Temperatur",
"es-ES":"temperatura",
"fr-FR":"Température",
"it-IT":"Temperatura",
"ru-RU":"температура"
}
},
"window":{
"closed":{
"en-EN":"closed",
"de-DE":"geschlossen",
"nl-NL":"gesloten",
"da-DK":"lukket",
"es-ES":"cerrada",
"fr-FR":"fermée ",
"it-IT":"chiusa",
"ru-RU":"закрыто"
},
"opened":{
"en-EN":"opened",
"de-DE":"offen",
"nl-NL":"geopend",
"da-DK":"åbnede",
"es-ES":"abierta",
"fr-FR":"ouverte ",
"it-IT":"aperta",
"ru-RU":"открыто"
}
},
"door":{
"closed":{
"en-EN":"closed",
"de-DE":"geschlossen",
"nl-NL":"gesloten",
"da-DK":"lukket",
"es-ES":"cerrada",
"fr-FR":"fermée ",
"it-IT":"chiusa",
"ru-RU":"закрыто"
},
"opened":{
"en-EN":"opened",
"de-DE":"offen",
"nl-NL":"geopend",
"da-DK":"åbnede",
"es-ES":"abierta",
"fr-FR":"ouverte ",
"it-IT":"aperta",
"ru-RU":"открыто"
}
},
"lock":{
"LOCK":{
"en-EN":"lock",
"de-DE":"schließen",
"nl-NL":"stilgelegd",
"da-DK":"låse",
"es-ES":"cerrar",
"fr-FR":"bloquer ",
"it-IT":"serratura",
"ru-RU":"замок"
},
"UNLOCK":{
"en-EN":"unlock",
"de-DE":"öffnen",
"nl-NL":"openen",
"da-DK":"at åbne",
"es-ES":"abrir",
"fr-FR":"ouvrir ",
"it-IT":"aprire",
"ru-RU":"открыть"
}
},
"blinds":{
"Position":{
"en-EN":"Position",
"de-DE":"Position",
"nl-NL":"Positie",
"da-DK":"Blindstilling",
"es-ES":"Posición",
"fr-FR":"Position ",
"it-IT":"Posizione",
"ru-RU":"Слепая"
}
},
"thermostat":{
"Currently":{
"en-EN":"Currently",
"de-DE":"Aktuell",
"nl-NL":"momenteel",
"da-DK":"i øjeblikket",
"es-ES":"corrientemente",
"fr-FR":"actuellement ",
"it-IT":"attualmente",
"ru-RU":"актуальный"
},
"State":{
"en-EN":"State",
"de-DE":"Status",
"nl-NL":"toestand",
"da-DK":"stat",
"es-ES":"estado",
"fr-FR":"statut ",
"it-IT":"stato",
"ru-RU":"статус"
},
"Action":{
"en-EN":"Action",
"de-DE":"Aktion",
"nl-NL":"actie",
"da-DK":"handling",
"es-ES":"acción",
"fr-FR":"action ",
"it-IT":"azione",
"ru-RU":"действие"
}
}
}