Verified Commit b9739927 authored by Rainer Sokoll's avatar Rainer Sokoll

Merge branch 'master' into caldav

parents 938c2f28 3adbcc1e
......@@ -2,13 +2,13 @@ light.Arbeitszimmer:
hidden: true
light.Arbeitszimmer_deckenlampe:
icon: mdi:ceiling-light
light.Mama:
light.schlafzimmer_nachttischlampe_bine:
icon: mdi:lamp
light.Moritz:
hidden: true
light.Moritz_deckenlampe:
icon: mdi:ceiling-light
light.Papa:
light.schlafzimmer_nachttischlampe_rainer:
icon: mdi:lamp
light.Sophia:
hidden: true
......@@ -22,16 +22,6 @@ light.Wohnzimmer:
hidden: true
light.wohnzimmer_stehlampe:
icon: mdi:floor-lamp
sensor.windfang_bewegungsmelder:
icon: mdi:battery
sensor.arbeitszimmer_fernbedienung:
icon: mdi:battery
sensor.moritz_fernbedienung:
icon: mdi:battery
sensor.sophia_fernbedienung:
icon: mdi:battery
sensor.wohnzimmer_fernbedienung:
icon: mdi:battery
sensor.diesel:
icon: mdi:gas-station
sensor.e10:
......
......@@ -22,8 +22,8 @@ licht:
name: Alle Lampen
entities:
- light.arbeitszimmer_deckenlampe
- light.mama
- light.papa
- light.schlafzimmer_nachttischlampe_bine
- light.schlafzimmer_nachttischlampe_rainer
- light.moritz_deckenlampe
- light.sophia_deckenlampe
- light.wohnzimmer_stehlampe
......@@ -48,6 +48,8 @@ sensoren:
- sensor.moritz_fernbedienung_batteriestand
- sensor.sophia_fernbedienung_batteriestand
- sensor.wohnzimmer_fernbedienung_batteriestand
- sensor.schlafzimmer_fernbedienung_bine_batteriestand
- sensor.schlafzimmer_fernbedienung_rainer_batteriestand
sprit:
name: Sprit Oil!-Tankstelle
entities:
......
......@@ -45,7 +45,7 @@
{% endif %}
arbeitszimmer_fernbedienung_batteriestand:
value_template: '{{ states.sensor.arbeitszimmer_fernbedienung.state }}'
friendly_name: 'Bewegungsmelder Windfang'
friendly_name: 'Bewegungsmelder Arbeitszimmer'
unit_of_measurement: '%'
icon_template: >-
{% set battery_level = states('sensor.arbeitszimmer_fernbedienung')|int('unknown') %}
......@@ -115,6 +115,42 @@
mdi:battery-alert
{% endif %}
{% endif %}
schlafzimmer_fernbedienung_bine_batteriestand:
value_template: '{{ states.sensor.schlafzimmer_fernbedienung_bine.state }}'
friendly_name: 'FB Nachttisch Bine'
unit_of_measurement: '%'
icon_template: >-
{% set battery_level = states('sensor.schlafzimmer_fernbedienung_bine')|int('unknown') %}
{% set battery_round = (battery_level|int / 10)|int * 10 %}
{% if battery_level == 'unknown' %}
mdi:battery-unknown
{% else %}
{% if battery_round >= 100 %}
mdi:battery
{% elif battery_round > 0 %}
mdi:battery-{{ battery_round }}
{% else %}
mdi:battery-alert
{% endif %}
{% endif %}
schlafzimmer_fernbedienung_rainer_batteriestand:
value_template: '{{ states.sensor.schlafzimmer_fernbedienung_rainer.state }}'
friendly_name: 'FB Nachttisch Rainer'
unit_of_measurement: '%'
icon_template: >-
{% set battery_level = states('sensor.schlafzimmer_fernbedienung_rainer')|int('unknown') %}
{% set battery_round = (battery_level|int / 10)|int * 10 %}
{% if battery_level == 'unknown' %}
mdi:battery-unknown
{% else %}
{% if battery_round >= 100 %}
mdi:battery
{% elif battery_round > 0 %}
mdi:battery-{{ battery_round }}
{% else %}
mdi:battery-alert
{% endif %}
{% endif %}
- platform: speedtest
monitored_conditions:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment