From 8d78e9961d25317af338b4b9e19015982c01ee8d Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Sat, 30 Nov 2019 16:13:22 +0100
Subject: [PATCH] Config: commented out pool stuff / adapted scenes to new
 version

---
 config_creation/manual_config.yaml | 60 +++++++++++++++---------------
 scenes.yaml                        | 25 ++++++++-----
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/config_creation/manual_config.yaml b/config_creation/manual_config.yaml
index 025c89c..8972a94 100644
--- a/config_creation/manual_config.yaml
+++ b/config_creation/manual_config.yaml
@@ -145,36 +145,36 @@ vacuum:
     token: !secret vacuum_token
 
 
-sensor:
-  - platform: template
-    sensors:
-       motion_combined:
-          friendly_name: Bewegung
-          value_template: >
-              {%- set pirs = {'Arbeitszimmer': states.binary_sensor.arbeitszimmer_martin_bewegungsmelder_bewegung, 
-                              'Gang Mitte': states.binary_sensor.gang_bewegungsmelder_mitte, 
-                              'Eingang': states.binary_sensor.gang_bewegungsmelder_ost,
-                              'Gang Hinten': states.binary_sensor.gang_bewegungsmelder_schlafzimmer,
-                              'Gang Wohnzimmer': states.binary_sensor.gang_bewegungsmelder_wohnzimmer} %}
-              {% for pir_name, pir in pirs.items() %}
-                  {% if as_timestamp(pir.last_changed) == as_timestamp(pirs.values() | map(attribute='last_changed') | max) %}
-                  {{ pir_name }}
-                  {% endif %}
-              {% endfor %}
-  - platform: history_stats
-    name: Pool Pumpe Heute
-    entity_id: switch.pool_pumpe
-    type: time
-    state: 'on'
-    start: '{{ now().replace(hour=0).replace(minute=0).replace(second=0) }}'
-    end: '{{ now() }}'
-  - platform: history_stats
-    name: Pool Pumpe Gestern
-    entity_id: switch.pool_pumpe
-    type: time
-    state: 'on'
-    start: '{{ as_timestamp(now().replace(hour=0).replace(minute=0).replace(second=0)) - (60*60 * 24) }}'
-    end: '{{ now().replace(hour=0).replace(minute=0).replace(second=0) }}'
+#sensor:
+#  - platform: template
+#    sensors:
+#       motion_combined:
+#          friendly_name: Bewegung
+#          value_template: >
+#              {%- set pirs = {'Arbeitszimmer': states.binary_sensor.arbeitszimmer_martin_bewegungsmelder_bewegung,
+#                              'Gang Mitte': states.binary_sensor.gang_bewegungsmelder_mitte,
+#                              'Eingang': states.binary_sensor.gang_bewegungsmelder_ost,
+#                              'Gang Hinten': states.binary_sensor.gang_bewegungsmelder_schlafzimmer,
+#                              'Gang Wohnzimmer': states.binary_sensor.gang_bewegungsmelder_wohnzimmer} %}
+#              {% for pir_name, pir in pirs.items() %}
+#                  {% if as_timestamp(pir.last_changed) == as_timestamp(pirs.values() | map(attribute='last_changed') | max) %}
+#                  {{ pir_name }}
+#                  {% endif %}
+#              {% endfor %}
+#  - platform: history_stats
+#    name: Pool Pumpe Heute
+#    entity_id: switch.pool_pumpe
+#    type: time
+#    state: 'on'
+#    start: '{{ now().replace(hour=0).replace(minute=0).replace(second=0) }}'
+#    end: '{{ now() }}'
+#  - platform: history_stats
+#    name: Pool Pumpe Gestern
+#    entity_id: switch.pool_pumpe
+#    type: time
+#    state: 'on'
+#    start: '{{ as_timestamp(now().replace(hour=0).replace(minute=0).replace(second=0)) - (60*60 * 24) }}'
+#    end: '{{ now().replace(hour=0).replace(minute=0).replace(second=0) }}'
 
 
 group: !include groups.yaml
diff --git a/scenes.yaml b/scenes.yaml
index 03b7e5d..6b1d82a 100644
--- a/scenes.yaml
+++ b/scenes.yaml
@@ -246,15 +246,18 @@
       state: on
       brightness: 255
       xy_color: [0.2075, 0.6584]
-    # Ganglicht
     cover.esszimmer_fenster_rollo:
-      position: 100
+      state: open
+      current_position: 100
     cover.kuche_fenster_rollo:
-      position: 100
+      state: open
+      current_position: 100
     cover.wohnzimmer_fenster_rollo:
-      position: 100
+      state: open
+      current_position: 100
     cover.wohnzimmer_terrassentur_rollo:
-      position: 100
+      state: open
+      current_position: 100
 
 
 - name: Wohnbereich Kuscheln
@@ -310,13 +313,17 @@
       state: off
     # Rollos
     cover.esszimmer_fenster_rollo:
-      position: 0
+      state: closed
+      current_position: 0
     cover.kuche_fenster_rollo:
-      position: 0
+      state: closed
+      current_position: 0
     cover.wohnzimmer_fenster_rollo:
-      position: 0
+      state: closed
+      current_position: 0
     cover.wohnzimmer_terrassentur_rollo:
-      position: 0
+      state: closed
+      current_position: 0
 
 
 # --------------------  Schlafzimmer -----------------------------------------