diff --git a/atom.xml b/atom.xml index 03767c7707..f995141e0c 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index 6749de709c..1d089fddeb 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index 889307c718..aeb9d9be04 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index 1ba47472a6..a46f6428b0 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]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 2df9b30de9..b45248217d 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+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 3bbff7cf23..b78fce3e78 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]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index ab013f3c2b..ef966c58c3 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index b34a65f86f..c2385ec97a 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index 8940d84beb..99e81e1335 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index b295a42a46..fba0b9ac41 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]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+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 27adc0754a..9c24d5a13d 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]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index 9e7b428311..9104d1834c 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]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index ac8d4bb40a..182d3962d9 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index 0f5ec9d7d4..5c223be129 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 63ebe0d1c6..aaaf8ca69c 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index 60f036fdfa..18bdec151c 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]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index ca33ed55c3..6c277b3f8b 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index 296531d8d7..bcfdeb09e7 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2016-05-20T00:03:40+00:00 + 2016-05-20T15:20:44+00:00 https://home-assistant.io/ diff --git a/getting-started/scripts-conditions/index.html b/getting-started/scripts-conditions/index.html index 84167bac41..e9f45dd350 100644 --- a/getting-started/scripts-conditions/index.html +++ b/getting-started/scripts-conditions/index.html @@ -108,6 +108,46 @@ +

OR condition

+ +

Test multiple conditions in 1 condition statement. Passes if any embedded conditions is valid.

+ +
+ 
condition: or
+conditions:
+  - condition: state
+    entity_id: 'device_tracker.paulus'
+    state: 'home'
+  - condition: numeric_state
+    entity_id: 'sensor.temperature'
+    below: '20'
+
+
+
+ +

MIXED AND and OR conditions

+ +

Test multiple AND and OR conditions in 1 condition statement. Passes if any embedded conditions is valid.
+This allows you to mix several AND and OR conditions together.

+ +
+ 
condition: and
+conditions:
+  - condition: state
+    entity_id: 'device_tracker.paulus'
+    state: 'home'
+  - condition: or
+    conditions:
+    - condition: state
+      entity_id: sensor.weather_precip
+      state: 'rain'
+    - condition: numeric_state
+      entity_id: 'sensor.temperature'
+      below: '20'
+
+
+
+

Numeric state condition

This type of condition attempts to parse the state of specified entity as a number and triggers if the value matches all of the above or below thresholds.

@@ -127,23 +167,6 @@ -

OR condition

- -

Test multiple conditions in 1 condition statement. Passes if any embedded conditions is valid.

- -
- 
condition: or
-conditions:
-  - condition: state
-    entity_id: 'device_tracker.paulus'
-    state: 'home'
-  - condition: numeric_state
-    entity_id: 'sensor.temperature'
-    below: '20'
-
-
-
-

State condition

Tests if an entity is a specified state.

diff --git a/sitemap.xml b/sitemap.xml index 6a955387cf..4d65098f5d 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1613,26 +1613,26 @@ https://home-assistant.io/demo/frontend.html - 2016-05-20T00:02:47+00:00 + 2016-05-20T15:19:58+00:00 https://home-assistant.io/demo/index.html - 2016-05-20T00:02:47+00:00 + 2016-05-20T15:19:58+00:00 https://home-assistant.io/googlef4f3693c209fe788.html - 2016-05-20T00:02:47+00:00 + 2016-05-20T15:19:58+00:00 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html - 2016-05-20T00:02:47+00:00 + 2016-05-20T15:19:58+00:00 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html - 2016-05-20T00:02:47+00:00 + 2016-05-20T15:19:58+00:00 https://home-assistant.io/static/mdi-demo.html - 2016-05-20T00:02:47+00:00 + 2016-05-20T15:19:58+00:00