Skip to content

Commit

Permalink
v4.0.36-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
jemu75 committed Apr 17, 2024
1 parent 0ee7c27 commit c6d96b9
Show file tree
Hide file tree
Showing 35 changed files with 784 additions and 114 deletions.
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ Durch Aktivierung der folgenden Optionen wird das Optionsmenü oben rechts in de
|Tag/Nacht-Modus|Umschaltung zwischen hellem und dunklem Farbschema|
|Seite aktualisieren|Neuladen von **FHEMApp** auslösen. Diese Option ist im Normalfall nicht nötig. Sie kann jedoch im Einzelfall helfen, wenn Panels bei Longpoll-verbindungen nicht aktualisiert werden|
|Einstellungen|Aktiviert direkten Zugriff auf die Einstellungen von **FHEMApp** über das Optionsmenü|
|Updates|der Punkt "Aktualisierung" wird angezeigt, sobald ein Update für **FHEMApp** verfügbar ist. Die Funktion prüft das Reading `update_available`. Damit sind Updates von FHEMApp einfach und direkt über FHEMApp möglich. Nachdem ein Update ausgeführt wurde, wird automatisch auch ein Reload von **FHEMApp** ausgeführt|
|Sprachen|ermöglicht die Umstellung der Sprache. Siehe hierzu auch den Abschnitt [Sprachen](#sprachen)|

## Optionsmenü FHEM Befehle
Expand Down Expand Up @@ -658,7 +659,10 @@ Neben festen Sprachvariablen kann die Ersetzung `%t()` auch mit den Werten von F

## Standardvorlagen
Mit **FHEMApp** werden verschiedene Standardvorlagen bereitgestellt, die den Einstieg besonders einfach machen.
|Vorlage|Beispiel|
|Beschreibung|Beispiel|
|---|---|
|[shellyPlus_1pm](./public/templates/shellyPlus_1pm.json)|![](./docs/media/example_panel.png)|
|...||
|Name: *switch* <br>Devicekeys: *switch*<br>Readings: *alias, **room**, group, **state*** <br><br>Einsatz: Steckdosen<br>JSON: [switch](./public/templates/switch.json)|![](./docs/media/template_switch.png)|
|Name: *light* <br>Devicekeys: *light*<br>Readings: *alias, **room**, group, **state*** <br><br>Einsatz: Lichtschalter<br>JSON: [light](./public/templates/light.json)|![](./docs/media/template_light.png)|
|Name: *dimmer* <br>Devicekeys: *dimmer*<br>Readings: *alias, **room**, group, **state**, **pct*** <br><br>Einsatz: Dimmer<br>JSON: [dimmer](./public/templates/dimmer.json)|![](./docs/media/template_dimmer.png)|
|Name: *contact* <br>Devicekeys: *contact*<br>Readings: *alias, **room**, group, **state*** <br><br>Einsatz: Tür-/Fensterkontakte<br>JSON: [contact](./public/templates/contact.json)|![](./docs/media/template_contact.png)|
|Name: *blind* <br>Devicekeys: *blind*<br>Readings: *alias, **room**, group, **state**, **pct**, motor* <br><br>Einsatz: Jalousien<br>JSON: [blind](./public/templates/blind.json)|![](./docs/media/template_blind.png)|
Binary file added docs/media/template_blind.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/template_contact.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/template_dimmer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/template_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/template_switch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# v4.0.36-beta (17.04.2024)
## App
- providing default templates
## Core
- bugfix don't show navigation items without name
# v4.0.35-beta (10.04.2024)
## OptionsMenu
- App Update Function
Expand Down
Binary file added public/images/header_01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
94 changes: 94 additions & 0 deletions public/templates/blind.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"name": "blind",
"author": "jemu",
"date": "2024-04-16",
"panel": {
"devicekeys": [
"blind:FHEM blind device"
],
"navigation": [
"blind-a-room::Räume->%s",
"blind-a-group::Gruppen->%s"
],
"sortby": [
"blind-a-sortby::%s"
]
},
"status": {
"title": [
"blind-a-alias:^.+$:%s",
"blind-i-NAME::%s"
],
"imageUrl": [
"::images/header_01.png"
],
"bar": [
"blind-state:off:0",
"blind-pct::%n(0)"
]
},
"main": [
{
"level": {
"mid": "info",
"left1": "btn",
"right2": "btn"
},
"mid": {
"text": [
"blind-motor:up:öffnet...",
"blind-motor:down:schließt...",
"blind-pct:1:offen",
"blind-pct::geschlossen"
],
"divider": [
"::true"
],
"size": [
"::7"
]
},
"left1": {
"btn": [
"::mdi-chevron-down"
],
"click": [
"blind-motor:stop:set blind off",
"::set blind stop"
],
"longClick": [
"::set blind off"
],
"longRelease": [
"::set blind stop"
],
"divider": [
"::true"
]
},
"right2": {
"btn": [
"::mdi-chevron-up"
],
"click": [
"blind-motor:stop:set blind on",
"::set blind stop"
],
"longClick": [
"::set blind on"
],
"longRelease": [
"::set blind stop"
]
}
}
],
"info": {
"left1": [
"blind-motor:up::mdi-window-shutter-alert",
"blind-motor:down::mdi-window-shutter-alert",
"blind-pct:1::mdi-window-shutter-open",
":::mdi-window-shutter"
]
}
}
50 changes: 50 additions & 0 deletions public/templates/contact.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"name": "contact",
"author": "jemu",
"date": "2024-04-16",
"panel": {
"devicekeys": [
"contact:FHEM contact device"
],
"navigation": [
"contact-a-room::Räume->%s",
"contact-a-group::Gruppen->%s"
],
"sortby": [
"contact-a-sortby::%s"
]
},
"status": {
"title": [
"contact-a-alias:^.+$:%s",
"contact-i-NAME::%s"
],
"imageUrl": [
"::images/header_01.png"
],
"bar": [
"contact-state:closed:100",
"contact-state::0"
]
},
"main": [
{
"level": {
"mid": "info"
},
"mid": {
"text": [
"contact-state:closed:geschlossen",
"contact-state:open:offen",
"contact-state::%s"
]
}
}
],
"info": {
"left1": [
"contact-state:closed::mdi-door",
":::mdi-door-open"
]
}
}
70 changes: 70 additions & 0 deletions public/templates/dimmer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"name": "dimmer",
"author": "jemu",
"date": "2024-04-16",
"panel": {
"devicekeys": [
"dimmer:FHEM dimmer device"
],
"navigation": [
"dimmer-a-room::Räume->%s",
"dimmer-a-group::Gruppen->%s"
],
"sortby": [
"dimmer-a-sortby::%s"
]
},
"status": {
"title": [
"dimmer-a-alias:^.+$:%s",
"dimmer-i-NAME::%s"
],
"imageUrl": [
"::images/header_01.png"
],
"bar": [
"dimmer-state:off:0",
"dimmer-pct::%n(0)"
]
},
"main": [
{
"level": {
"mid": "slider",
"left1": "btn",
"right2": "btn"
},
"mid": {
"slider": [
"dimmer-pct::set dimmer pct %v:%n(0):success:0:100"
],
"size": [
"8"
]
},
"left1": {
"btn": [
"::mdi-lightbulb-outline"
],
"click": [
"::set dimmer off"
]
},
"right2": {
"btn": [
"::mdi-lightbulb-on-outline"
],
"click": [
"::set dimmer on"
]
}
}
],
"info": {
"left1": [
"dimmer-state:off::mdi-lightbulb-off",
"dimmer-pct:0.1::mdi-lightbulb",
":::mdi-lightbulb-off"
]
}
}
77 changes: 77 additions & 0 deletions public/templates/light.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"name": "light",
"author": "jemu",
"date": "2024-04-16",
"panel": {
"devicekeys": [
"light:FHEM lightswitch device"
],
"navigation": [
"light-a-room::Räume->%s",
"light-a-group::Gruppen->%s"
],
"sortby": [
"light-a-sortby::%s"
]
},
"status": {
"title": [
"light-a-alias:^.+$:%s",
"light-i-NAME::%s"
],
"imageUrl": [
"::images/header_01.png"
],
"bar": [
"light-state:on:100",
"light-state::0"
]
},
"main": [
{
"level": {
"left1": "btn",
"mid": "info",
"right2": "btn"
},
"left1": {
"btn": [
"::mdi-power-off"
],
"divider": [
"::true"
],
"click": [
"::set light off"
]
},
"mid": {
"text": [
"light-state:on:an",
"light-state:off:aus",
"light-state::%s"
],
"divider": [
"::true"
],
"size": [
"::7"
]
},
"right2": {
"btn": [
"::mdi-power-on"
],
"click": [
"::set light on"
]
}
}
],
"info": {
"left1": [
"light-state:on::mdi-lightbulb",
":::mdi-lightbulb-off"
]
}
}
42 changes: 0 additions & 42 deletions public/templates/shellyPlus_1pm.json

This file was deleted.

Loading

0 comments on commit c6d96b9

Please sign in to comment.