Merge branch 'master' of github.com:eifinger/homeassistant-config

eifinger · May 16, 2021 · 023c601 · 023c601
2 parents 674f878 + f193181
commit 023c601
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 67 deletions.
diff --git a/packages/next_alarm.yaml b/packages/next_alarm.yaml
@@ -24,6 +24,12 @@ automation:
           ((as_timestamp(states.sensor.oneplus_a3003_nachster_wecker.state)
           | int - 7200) | timestamp_custom('%Y-%m-%d, %H:%M', True))
           and (states('person.sina') == 'home') }}
+      - platform: template
+        value_template: >
+          {{ states('sensor.date_time') ==
+          ((as_timestamp(states.sensor.kevin_s_echo_dot_schlafzimmer_next_alarm.state)
+          | int - 7200) | timestamp_custom('%Y-%m-%d, %H:%M', True))
+          and (states('person.sina') == 'home') }}
     action:
       - service: script.turn_on
         entity_id: script.warm_bath_before_wakeup
@@ -77,6 +83,3 @@ script:
         data:
           entity_id: "{{ climate_entity_id }}"
           temperature: "{{ old_temperature }}"
-      - service: notify.group_notifications
-        data:
-          message: "Ich habe {{ state_attr(climate_entity_id, 'friendly_name') }} auf {{ old_temperature }}C° gestellt."
diff --git a/packages/uptime.yaml b/packages/uptime.yaml
diff --git a/packages/version.yaml b/packages/version.yaml
diff --git a/packages/zone.yaml b/packages/zone.yaml
@@ -35,10 +35,6 @@ automation:
         entity_id: "person.sina"
         zone: "zone.elmo"
         event: "enter"
-    condition:
-      - alias: "Only if Kevin is not nearby"
-        condition: template
-        value_template: "{{ distance('device_tracker.sm_g975f', 'device_tracker.oneplus_a3003') < 1 }}"
     action:
       - alias: "Wait until Sina leaves Zone again"
         wait_for_trigger:
@@ -49,7 +45,10 @@ automation:
         timeout: "00:30:00"
       - alias: "Only continue when at least 30 minutes in zone"
         condition: template
-        value_template: "{{ wait.completed }}"
+        value_template: "{{ wait.remaining == 0 }}"
+      - alias: "Only if Kevin is not nearby"
+        condition: template
+        value_template: "{{ distance('device_tracker.sm_g975f', 'device_tracker.oneplus_a3003') < 1 }}"
       - alias: "Update travel time home of Sina"
         service: homeassistant.update_entity
         entity_id: sensor.travel_time_home_user_two_here