Site updated at 2016-05-20 15:21:18 UTC

atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/community/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/esp8266/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/how-to/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/ibeacons/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/internet-of-things/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/mqtt/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/organisation/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/owntracks/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/presence-detection/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/public-service-announcement/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/release-notes/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/survey/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/talks/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/technology/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/user-stories/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/video/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

blog/categories/website/atom.xml

@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-20T00:03:40+00:00</updated>
+  <updated>2016-05-20T15:20:44+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>

getting-started/scripts-conditions/index.html

@@ -108,6 +108,46 @@
 </div>
 </div>
 
+<h4><a class="title-link" name="or-condition" href="#or-condition"></a> OR condition</h4>
+
+<p>Test multiple conditions in 1 condition statement. Passes if any embedded conditions is valid.</p>
+
+<div class="highlighter-coderay"><div class="CodeRay">
+  <div class="code"><pre><span class="key">condition</span>: <span class="string"><span class="content">or</span></span>
+<span class="key">conditions</span>:
+  - <span class="string"><span class="content">condition: state</span></span>
+    <span class="key">entity_id</span>: <span class="string"><span class="content">'device_tracker.paulus'</span></span>
+    <span class="key">state</span>: <span class="string"><span class="content">'home'</span></span>
+  - <span class="string"><span class="content">condition: numeric_state</span></span>
+    <span class="key">entity_id</span>: <span class="string"><span class="content">'sensor.temperature'</span></span>
+    <span class="key">below</span>: <span class="string"><span class="content">'20'</span></span>
+</pre></div>
+</div>
+</div>
+
+<h4><a class="title-link" name="mixed--and-and-or-conditions" href="#mixed--and-and-or-conditions"></a> MIXED  AND and OR conditions</h4>
+
+<p>Test multiple AND and OR conditions in 1 condition statement. Passes if any embedded conditions is valid.<br />
+This allows you to mix several AND and OR conditions together.</p>
+
+<div class="highlighter-coderay"><div class="CodeRay">
+  <div class="code"><pre><span class="key">condition</span>: <span class="string"><span class="content">and</span></span>
+<span class="key">conditions</span>:
+  - <span class="string"><span class="content">condition: state</span></span>
+    <span class="key">entity_id</span>: <span class="string"><span class="content">'device_tracker.paulus'</span></span>
+    <span class="key">state</span>: <span class="string"><span class="content">'home'</span></span>
+  - <span class="string"><span class="content">condition: or</span></span>
+    <span class="key">conditions</span>:
+    - <span class="string"><span class="content">condition: state</span></span>
+      <span class="key">entity_id</span>: <span class="string"><span class="content">sensor.weather_precip</span></span>
+      <span class="key">state</span>: <span class="string"><span class="content">'rain'</span></span>
+    - <span class="string"><span class="content">condition: numeric_state</span></span>
+      <span class="key">entity_id</span>: <span class="string"><span class="content">'sensor.temperature'</span></span>
+      <span class="key">below</span>: <span class="string"><span class="content">'20'</span></span>
+</pre></div>
+</div>
+</div>
+
 <h4><a class="title-link" name="numeric-state-condition" href="#numeric-state-condition"></a> Numeric state condition</h4>
 
 <p>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.</p>
@@ -127,23 +167,6 @@
 </div>
 </div>
 
-<h4><a class="title-link" name="or-condition" href="#or-condition"></a> OR condition</h4>
-
-<p>Test multiple conditions in 1 condition statement. Passes if any embedded conditions is valid.</p>
-
-<div class="highlighter-coderay"><div class="CodeRay">
-  <div class="code"><pre><span class="key">condition</span>: <span class="string"><span class="content">or</span></span>
-<span class="key">conditions</span>:
-  - <span class="string"><span class="content">condition: state</span></span>
-    <span class="key">entity_id</span>: <span class="string"><span class="content">'device_tracker.paulus'</span></span>
-    <span class="key">state</span>: <span class="string"><span class="content">'home'</span></span>
-  - <span class="string"><span class="content">condition: numeric_state</span></span>
-    <span class="key">entity_id</span>: <span class="string"><span class="content">'sensor.temperature'</span></span>
-    <span class="key">below</span>: <span class="string"><span class="content">'20'</span></span>
-</pre></div>
-</div>
-</div>
-
 <h4><a class="title-link" name="state-condition" href="#state-condition"></a> State condition</h4>
 
 <p>Tests if an entity is a specified state.</p>

sitemap.xml

@@ -1613,26 +1613,26 @@
     </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-05-20T00:02:47+00:00</lastmod>
+    <lastmod>2016-05-20T15:19:58+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-05-20T00:02:47+00:00</lastmod>
+    <lastmod>2016-05-20T15:19:58+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-05-20T00:02:47+00:00</lastmod>
+    <lastmod>2016-05-20T15:19:58+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-05-20T00:02:47+00:00</lastmod>
+    <lastmod>2016-05-20T15:19:58+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-05-20T00:02:47+00:00</lastmod>
+    <lastmod>2016-05-20T15:19:58+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-05-20T00:02:47+00:00</lastmod>
+    <lastmod>2016-05-20T15:19:58+00:00</lastmod>
   </url>
 </urlset>