diff --git a/atom.xml b/atom.xml index bde8f70a6b..bc742ce8e2 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index f78eab7dd3..d2eaa308f1 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index 34bcd91207..9848b199e2 100644 --- a/blog/categories/device-tracking/atom.xml +++ b/blog/categories/device-tracking/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Device-Tracking | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index 554e4af192..1f0d2280ec 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index f9756b02aa..82852a4890 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 265b8eff80..0647ff6fa7 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml index fa8eaf4ba8..42d8704de6 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index 9dbe203874..6665e753ca 100644 --- a/blog/categories/iot-data/atom.xml +++ b/blog/categories/iot-data/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: IoT-Data | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml index 0b959567f9..bd6d243ff1 100644 --- a/blog/categories/merchandise/atom.xml +++ b/blog/categories/merchandise/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Merchandise | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index 04f79951c3..620453b4c6 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index 893d161867..1bcc2ced86 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index 5289a604cf..0c2aa96ea8 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index 54a02508da..2bf42c10f2 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index c0b5992f8b..fcc73179c1 100644 --- a/blog/categories/presence-detection/atom.xml +++ b/blog/categories/presence-detection/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Presence-Detection | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml index 099c941764..2c5e6bf86f 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index d8f623c02f..2c69eb83a1 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index d9b85c2e49..1721d6aa21 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index afb863734b..608a92cec8 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 0730e6d5c2..e9ebd50ab6 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index d14f1fb7a4..244e283efa 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index cb0121e7ce..92cf3d0f32 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index 6f3ce4a027..b9e92fb596 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2017-03-20T19:11:21+00:00 + 2017-03-21T19:46:12+00:00 https://home-assistant.io/ diff --git a/components/ifttt.manything/index.html b/components/ifttt.manything/index.html index 9b87b8fe96..835b45882f 100644 --- a/components/ifttt.manything/index.html +++ b/components/ifttt.manything/index.html @@ -71,45 +71,41 @@

After setting up IFTTT, Maker Channel and ManyThing Channel, you can use the following examples to configure Home Assistant.

# Example configuration.yaml entry
 automation:
-- alias: 'ManyThing Recording ON'
-  # This calls an IFTTT recipe to turn on recording of the ManyThing Camera
-  # if we leave the house during the day.
-  trigger:
-   - platform: state
-     entity_id: group.all_devices
-     state: 'not_home'
+  - alias: 'ManyThing Recording ON'
+    # This calls an IFTTT recipe to turn on recording of the ManyThing Camera
+    # if we leave the house during the day.
+    trigger:
+      - platform: state
+        entity_id: group.all_devices
+       state: 'not_home'
+    condition:
+      - platform: state
+        entity_id: sun.sun
+       state: 'above_horizon'
+    action:
+      service: ifttt.trigger
+      data: {"event":"manything_on"}
 
-  condition:
-   - platform: state
-     entity_id: sun.sun
-     state: 'above_horizon'
-
-  action:
-     service: ifttt.trigger
-     data: {"event":"manything_on"}
-
-- alias: 'ManyThing Recording OFF'
-  # This calls an IFTTT recipe to turn off recording of the ManyThing Camera
-  # when we are home unless it's nighttime.
-  trigger:
-   - platform: state
-     entity_id: group.all_devices
-     state: 'home'
-   - platform: state
-     entity_id: sun.sun
-     state: 'above_horizon'
-
-  condition: use_trigger_values
-
-  action:
-     service: ifttt.trigger
-     data: {"event":"manything_off"}
+  - alias: 'ManyThing Recording OFF'
+    # This calls an IFTTT recipe to turn off recording of the ManyThing Camera
+    # when we are home unless it's nighttime.
+    trigger:
+      - platform: state
+        entity_id: group.all_devices
+        state: 'home'
+    condition:
+      - condition: state
+        entity_id: sun.sun
+        state: 'above_horizon'
+    action:
+      service: ifttt.trigger
+      data: {"event":"manything_off"}
 

Setting up a recipe

-You need to setup a unique trigger for each event you sent to IFTTT. +You need to setup a unique trigger for each event you sent to IFTTT. For ManyThing support, you need to set up an on and off event.

Testing your trigger

diff --git a/cookbook/automation_for_rainy_days/index.html b/cookbook/automation_for_rainy_days/index.html index 4a13c535d9..39b323f81b 100644 --- a/cookbook/automation_for_rainy_days/index.html +++ b/cookbook/automation_for_rainy_days/index.html @@ -69,41 +69,36 @@

This requires a Dark Sky sensor with the condition precip_intensity that tells if it’s raining or not. You could also experiment with other attributes such as cloud_cover.

Turn on a light in the living room when it starts raining, someone is home, and it’s afternoon or later.

automation:
-  alias: 'Rainy Day'
-
-  trigger:
-       - platform: state
-         entity_id: sensor.precip_intensity
-         state: 'rain'
-       - platform: state
-         entity_id: group.all_devices
-         state: 'home'
-       - platform: time
-         after: '14:00'
-         before: '23:00'
-
-  condition: use_trigger_values
-
-  action:
-    service: light.turn_on
-    entity_id: light.couch_lamp
+  - alias: 'Rainy Day'
+    trigger:
+      - platform: state
+        entity_id: sensor.precip_intensity
+        state: 'rain'
+    condition:
+      - platform: state
+        entity_id: group.all_devices
+        state: 'home'
+      - platform: time
+        after: '14:00'
+        before: '23:00'
+    action:
+      service: light.turn_on
+      entity_id: light.couch_lamp
 

And then of course turn off the lamp when it stops raining but only if it’s within an hour before sunset.

-
automation 2:
-  alias: 'Rain is over'
-  trigger:
-       - platform: state
-         entity_id: sensor.precip_intensity
-         state: 'None'
-       - platform: sun
-         event: 'sunset'
-         offset: '-01:00:00'
-
-  condition: use_trigger_values
-  action:
-    service: light.turn_off
-    entity_id: light.couch_lamp
+
  - alias: 'Rain is over'
+    trigger:
+      - platform: state
+        entity_id: sensor.precip_intensity
+        state: 'None'
+    condition:
+      - condition: sun
+        after: 'sunset'
+        offset: '-01:00:00'
+    action:
+      service: light.turn_off
+      entity_id: light.couch_lamp
 
diff --git a/docs/automation/examples/index.html b/docs/automation/examples/index.html index 6482670823..578f86707a 100644 --- a/docs/automation/examples/index.html +++ b/docs/automation/examples/index.html @@ -72,53 +72,53 @@ automation: # Turns on lights 1 hour before sunset if people are home # and if people get home between 16:00-23:00 -- alias: 'Rule 1 Light on in the evening' - trigger: - # Prefix the first line of each trigger configuration - # with a '-' to enter multiple - - platform: sun - event: sunset - offset: '-01:00:00' - - platform: state - entity_id: group.all_devices - state: 'home' - condition: - # Prefix the first line of each condition configuration - # with a '-'' to enter multiple - - condition: state - entity_id: group.all_devices - state: 'home' - - condition: time - after: '16:00:00' - before: '23:00:00' - action: - service: homeassistant.turn_on - entity_id: group.living_room + - alias: 'Rule 1 Light on in the evening' + trigger: + # Prefix the first line of each trigger configuration + # with a '-' to enter multiple + - platform: sun + event: sunset + offset: '-01:00:00' + - platform: state + entity_id: group.all_devices + state: 'home' + condition: + # Prefix the first line of each condition configuration + # with a '-'' to enter multiple + - condition: state + entity_id: group.all_devices + state: 'home' + - condition: time + after: '16:00:00' + before: '23:00:00' + action: + service: homeassistant.turn_on + entity_id: group.living_room # Turn off lights when everybody leaves the house -- alias: 'Rule 2 - Away Mode' - trigger: - platform: state - entity_id: group.all_devices - state: 'not_home' - action: - service: light.turn_off - entity_id: group.all_lights + - alias: 'Rule 2 - Away Mode' + trigger: + platform: state + entity_id: group.all_devices + state: 'not_home' + action: + service: light.turn_off + entity_id: group.all_lights # Notify when Paulus leaves the house in the evening -- alias: 'Leave Home notification' - trigger: - platform: zone - event: leave - zone: zone.home - entity_id: device_tracker.paulus - condition: - condition: time - after: '20:00' - action: - service: notify.notify - data: - message: 'Paulus left the house' + - alias: 'Leave Home notification' + trigger: + platform: zone + event: leave + zone: zone.home + entity_id: device_tracker.paulus + condition: + condition: time + after: '20:00' + action: + service: notify.notify + data: + message: 'Paulus left the house'
diff --git a/sitemap.xml b/sitemap.xml index 0e5d9f5e6b..04e5ba62b6 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -3021,62 +3021,62 @@ https://home-assistant.io/demo/frontend.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/demo/index.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-event.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-info.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-service.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-state.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-template.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/demo/panels/ha-panel-history.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/demo/panels/ha-panel-iframe.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/demo/panels/ha-panel-logbook.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/demo/panels/ha-panel-map.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/googlef4f3693c209fe788.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00 https://home-assistant.io/static/mdi-demo.html -2017-03-20T19:10:15+00:00 +2017-03-21T19:45:26+00:00