diff --git a/Gemfile b/Gemfile
index b02ee4b1a0b..38742128962 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,7 @@ group :development do
gem 'rubypants', '~> 0.2.0'
gem 'rb-fsevent', '~> 0.9'
gem 'stringex', '~> 1.4.0'
+ gem 'jekyll-time-to-read'
end
gem 'sinatra', '~> 1.4.2'
diff --git a/_config.yml b/_config.yml
index 175f9128c14..4430b9edd33 100644
--- a/_config.yml
+++ b/_config.yml
@@ -42,6 +42,9 @@ rdiscount:
- smart
highlighter: pygments # default python pygments have been replaced by pygments.rb
+gems:
+ - jekyll-time-to-read
+
paginate: 10 # Posts per page on the blog index
paginate_path: "blog/posts/:num" # Directory base for pagination URLs eg. /posts/2/
recent_posts: 5 # Posts in the sidebar Recent Posts section
diff --git a/sass/custom/_paulus.scss b/sass/custom/_paulus.scss
index 88ae7e5dc35..e757170c0e8 100644
--- a/sass/custom/_paulus.scss
+++ b/sass/custom/_paulus.scss
@@ -25,7 +25,7 @@
}
}
-article.post, article.page {
+article.post, article.page, article.listing {
img, table {
border-radius: 3px;
box-shadow: rgba(0,0,0,0.06) 0 0 10px;
@@ -39,46 +39,65 @@ article.post, article.page {
& > table {
background-color: #F3FCF5;
}
+
+ p.img {
+ background-color: #FFF;
+ border-radius: 5px;
+ text-align: center;
+ padding-bottom: 3px;
+ font-size: .9rem;
+ box-shadow: rgba(0,0,0,0.06) 0 0 10px;
+
+ img {
+ display: block;
+ box-shadow: none;
+ margin: 0 auto;
+ }
+ }
+
+ li {
+ margin-bottom: 10px;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
}
-.note {
+p.note {
+ position: relative;
+
background: #e7f2fa;
- padding: 12px;
- margin-bottom: 24px;
+
+ padding: 40px 12px 6px 12px;
box-shadow: rgba(0,0,0,0.06) 0 0 10px;
- .title::before {
+ &::before {
font-family: "FontAwesome";
- content: "\f05a";
- margin-right: 5px;
- }
+ content: "\f05a" " Note " attr(data-title);
+ background-color: #6ab0de;
+ color: white;
+ font-weight: bold;
- .title {
border-top-left-radius: 3px;
border-top-right-radius: 3px;
- font-weight: bold;
- display: block;
- color: #fff;
- background: #6ab0de;
- margin: -12px;
- padding: 6px 12px;
- margin-bottom: 12px;
- box-sizing: border-box;
- }
+ padding: 6px 14px;
- .content {
- margin-bottom: 0;
+ line-height: 1.5em;
+
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
}
&.warning {
background-color: #F7F9E1;
- .title {
+ &::before {
background-color: rgb(187, 185, 13);;
- }
-
- .title::before {
- content: "\f071";
+ content: "\f071" " Warning " attr(data-title);
}
}
-}
\ No newline at end of file
+
+}
diff --git a/sass/oscailte/base/_global.scss b/sass/oscailte/base/_global.scss
index e29efaafbb8..5c3712590f2 100644
--- a/sass/oscailte/base/_global.scss
+++ b/sass/oscailte/base/_global.scss
@@ -40,7 +40,8 @@ a {
}
article.post,
-article.page {
+article.page,
+article.listing {
img {
border: 5px solid #fff;
border-radius: 3px;
diff --git a/sass/oscailte/base/_post.scss b/sass/oscailte/base/_post.scss
index e2805bd1916..34dbf33a453 100644
--- a/sass/oscailte/base/_post.scss
+++ b/sass/oscailte/base/_post.scss
@@ -70,7 +70,8 @@ article {
font-size: 12px;
padding: 0 0 5px;
> * {
- margin-right: 20px;
+ margin-right: 15px;
+ white-space: nowrap;
&:last-child {
margin-right: 0;
diff --git a/source/_includes/blog/post/article.html b/source/_includes/blog/post/article.html
index 94b0bbcc860..c6792e75fcb 100644
--- a/source/_includes/blog/post/article.html
+++ b/source/_includes/blog/post/article.html
@@ -11,10 +11,11 @@
@@ -26,8 +27,8 @@
{% if excerpted == 'true' and index %}
{% else %}
- {{ content }}
+ {{ content | replace: site.excerpt_separator, '' }}
{% endif %}
\ No newline at end of file
diff --git a/source/_includes/post/time_to_read.html b/source/_includes/post/time_to_read.html
new file mode 100644
index 00000000000..4c72aa0700a
--- /dev/null
+++ b/source/_includes/post/time_to_read.html
@@ -0,0 +1 @@
+ {{ content | reading_time_as_s }} reading time
\ No newline at end of file
diff --git a/source/_layouts/post.html b/source/_layouts/post.html
index 788953843a5..a34d4bde268 100644
--- a/source/_layouts/post.html
+++ b/source/_layouts/post.html
@@ -9,7 +9,7 @@ is_post: true
{% if site.disqus_short_name and page.comments == true %}
{% endif %}
\ No newline at end of file
diff --git a/source/_posts/2014-12-18-website-launched.markdown b/source/_posts/2014-12-18-website-launched.markdown
index 31e4e171b87..ab1212f96c1 100644
--- a/source/_posts/2014-12-18-website-launched.markdown
+++ b/source/_posts/2014-12-18-website-launched.markdown
@@ -5,7 +5,6 @@ date: 2014-12-18 23:24:45 -0800
date_formatted: "December 18, 2014"
comments: true
categories: website
-author: "Paulus Schoutsen"
---
I finally took the time to setup a simple website to help people getting started with Home Assistant. The process was super smooth thanks to the great tools [Jekyll](http://jekyllrb.com) and [Octopress](http://octopress.org) and the great services [GitHub Pages](https://pages.github.com) and [CloudFlare](https://cloudflare.com).
diff --git a/source/_posts/2014-12-25-home-control-home-automation-and-the-smart-home.markdown b/source/_posts/2014-12-25-home-control-home-automation-and-the-smart-home.markdown
new file mode 100644
index 00000000000..441ec842b37
--- /dev/null
+++ b/source/_posts/2014-12-25-home-control-home-automation-and-the-smart-home.markdown
@@ -0,0 +1,67 @@
+---
+layout: post
+title: "Home Control, Automation & the Smart Home"
+date: 2014-12-25 10:23:13 -0800
+date_formatted: December 25, 2014
+comments: true
+categories:
+---
+
+The internet has been buzzing over the last year about home automation. A lot of different terms fly around like the internet of things, home automation and the smart home.
+This article will try to explain how they all relate.
+
+The first thing to introduce is the **Internet of Things** (IoT). This refers to a new generation of devices that cannot only be controlled by humans via buttons or remotes but also provide an interface to communicate with other devices and applications. For example, an IoT-capable coffee machine could receive commands to create different types of coffee and be able to broadcast the amount of water left in its resevoir.
+
+There is no widely adopted open standard for smart device communication. This prevents a lot of devices to communicate with one another. And even if they could, most devices are not designed to manage other devices. To solve this we need a device to be able to communicate with and manage all these connected devices. This device is called a **hub**.
+
+As a bare minimum a hub has to keep track of the state of each device and should be able to control them if possible. For example, it has to know which lights are on or off and offer a way to control the lights. For a sensor it only has to know the value. A hub with these capabilities offers **home control**.
+
+
+
+ 
+
+ Example of a hub's dashboard. Showing the state of 2 persons, 4 lights and the sun.
+
+
+A step up from home control is to have the user setup triggers to send commands based on information in the home control layer. For example, to turn on the lights when a person arrives home. A hub with these capabilities is capable of **home automation**.
+
+Most hubs on the market today offer this in various degrees of functionality and usability. Some IoT-capable devices offer this too, but only control themselves and are usually limited to location and time-based events.
+
+The last category, and this is still very much in the future, is the **smart home**. A self-learning and adopting system that will decide which events should impact other devices.
+
+An example of a smart home in action is that it observes that when person A comes home, the lights in the living room and the kitchen switch on. While if person B comes home, the lights in the living room and the study room are switched on. The next time person A or B comes home, the smart home will turn on its preferred lights without any configuration being set by the user.
+
+A glimpse today at how the future can look is the [Nest thermostat](https://nest.com/). A thermostat smart enough to learn your schedule and adjust its own temperature accordingly.
+
+All this results in the following overview of Home Automation.
+
+
+
+ 
+
+ Overview of the home automation landscape.
+
+
+### Challenges
+
+You are probably wondering, this all seems relatively simple, why don't I have my very own smart home yet? There are a couple of challenges today that keep us from stepping into the future.
+
+#### More Internet of Things-capable devices
+
+The majority of the IoT products out there are either lights, switches or presence detection. That's not enough for your home to be very smart about. We need televisions, fridges, ovens and more to join the party to increase the number of devices that we can control.
+
+#### More data
+
+Most first generation IoT devices are only exposing information that is needed for controlling it. We need to be able to track all interactions with each device for our smart home to learn how interaction with devices influence other things. For example, we need to be able to track how many cups of coffee were made or how often the fridge was open. This will increase the information flow and open up a whole bunch of new possibilities. For example, the smart home can order new coffee when you're running low.
+
+#### Easy to use, open software that we can trust
+
+To increase adoption we will need people to trust their smart home system. It will be very tought to convince people to upgrade all their devices and upload all interactions with each of them to the cloud. This data could reveal their whole life including all bad habits. That's why such a system should be simple and open-source so people can validate that their data generated at home stay home.
+
+Anoter important booster for adoption is that the software should be easy to set up and use by the average user. A lot of people are not burning their hands yet on Home Automation because they are scared of having to configure it all.
+
+Home Assistant is trying to be this software. It is not there yet but trying hard. Device discovery and a user interface for configuring home automation are problems we hope to tackle in 2015 while not sacrificing modularity or usability.
+
+Happy new year!
diff --git a/source/blog/index.html b/source/blog/index.html
index 7f304b867dd..f79819923c1 100644
--- a/source/blog/index.html
+++ b/source/blog/index.html
@@ -1,5 +1,6 @@
---
layout: default
+sidebar: false
---
{% assign index = true %}
{% for post in paginator.posts %}
diff --git a/source/components/index.markdown b/source/components/index.markdown
index d96e0025188..fa68bcc9008 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -3,7 +3,7 @@ layout: page
title: "Components"
date: 2014-12-21 13:35
sidebar: false
-comments: true
+comments: false
sharing: true
footer: true
---
diff --git a/source/developers/add_new_platform.markdown b/source/developers/add_new_platform.markdown
index bab81d64959..0427b8d97b0 100644
--- a/source/developers/add_new_platform.markdown
+++ b/source/developers/add_new_platform.markdown
@@ -3,7 +3,7 @@ layout: page
title: "Adding support for a new platform"
date: 2014-12-21 13:27
sidebar: false
-comments: true
+comments: false
sharing: true
footer: true
---
@@ -20,6 +20,6 @@ For example, the built-in `switch` component consists of the following files in
If you are planning to add support for a new type of device to an existing component, you can get away with only writing platform logic. Have a look at how the component works with other platforms and create a similar file for the platform that you would like to add.
-Note
+
Platform logic should not interface directly with the devices but use a third-party Python 3 library that speaks the actual API.
-
Note
+
You can append ?api_password=YOUR_PASSWORD to any url to log in automatically.
-
Note
+
The result will include any changed states that changed while the service was being executed, even if their change was the result of something else happening in the system.
-
Note
+
If your client does not support DELETE HTTP requests you can add an optional attribute _METHOD and set its value to DELETE.
-
-
+Before we dive into the Home Assistant architecture, it is important to get a clear overview of the home automation landscape as a whole. This will allow us to show how the different parts of Home Assistant fit in the picture. For a more lengthy discussion about what each part in this overview is responsible for, check out our blog. A tl;dr version of the blog:
-The core of Home Assistant exists of the following parts.
+ * Home Control is responsible for collecting information on- and controlling devices.
+ * Home Automation triggers commands based on user configurations.
+ * Smart Home triggers commands based on previous behavior.
-The **Event Bus** facilitates the firing and listening of events. This is the beating heart of Home Assistant.
+
+
+
+
+ Overview of the home automation landscape.
+
-The **State Machine** keeps track of the states of things. Fires a state_changed event when a state has been changed.
+The core of Home Assistant is responsible for the Home Control part and is made up:
-The **Service Registry** listens on the event bus for call_service events and allows other code to register services.
+ * The **Event Bus** facilitates the firing and listening of events. This is the beating heart of Home Assistant.
+ * The **State Machine** keeps track of the states of things. Fires a `state_changed` event when a state has been changed.
+ * The **Service Registry** listens on the event bus for `call_service` events and allows other code to register services.
+ * The **Timer** will send every 10 seconds a `time_changed` event on the event bus.
-The **Timer** will send every 10 seconds a time_changed event on the event bus.
+
+
+ 
+
+ Overview of the Home Assistant architecture
+
-Take for example the device_tracker component. This component is responsible for keeping track which devices are home. It checks which devices are home every time a time_changed event is fired on the event bus. It will then update the state machine with the information for each device.
+Home Assistant can be extended by **components**. Each component is responsible for a specific domain within Home Assistant. Components can listen for- or trigger events, offer services and maintain states. Components are written in Python and can do all the goodness that Python has to offer. Out of the box, Home Assistant offers a bunch of [built-in components]({{site_root}}/components/).
-This setup allows us to create simple yet powerful logic for controlling your home:
+We can differentiate between two different types of
+components within Home Assistant.
+
+#### Components that interact with an Internet of Things domain
+These components will track devices within a specific domain and make this information available via the State Machine and the Event Bus. The component will also register services in the Service Registry to expose control of the devices. Each of these components exist of a core part and small pieces of platform specific logic.
+
+For example, one of the built-in components is the `switch` component. This component is responsible for interaction with different types of switches.
+
+If you are planning to add support for a new platform, please check out the [add new platform section]({{root_url}}/developers/add_new_platform.html).
+
+#### Components that respond to events that happen within Home Assistant
+These components provide small pieces of home automation logic or services that do common tasks within your house.
+
+For example the `device_sun_light_trigger` component tracks the state of devices and the sun to make sure that the lights are turned on when it gets dark and there are people home. The component uses logic along the following lines:
In the event that device 'Paulus Nexus 5' changes to the 'Home' state:
If the sun has set and the lights are not on:
@@ -42,15 +69,18 @@ This setup allows us to create simple yet powerful logic for controlling your ho
If the lights are off and the combined state of all tracked device equals 'Home':
Turn on the lights
-By using the Bus as a central communication hub between components it is easy to replace components or add functionality. If you would want to change the way devices are detected you only have to write a component that updates the device states in the State Machine.
+Another example of a home automation component can be found in [`/config/custom_components/example.py`](https://github.com/balloob/home-assistant/blob/master/config/custom_components/example.py).
## Multiple connected instances
-Home Assistant supports running multiple synchronzied instances using a master-slave model. Slaves forward all local events fired and states set to the master instance which will then replicate it to each slave.
+Home Assistant supports running multiple synchronzied instances using a master-slave model. Slaves forward all local fired events and set states to the master instance which will then replicate it to each slave.
-
- 
-
+
+
+ 
+
+ Overview of the Home Assistant architecture for multiple devices.
+
A slave instance can be started with the following code and has the same support for components as a master-instance.
@@ -68,6 +98,6 @@ hass.start()
hass.block_till_stopped()
```
-Note
+
Because each slave maintains its own ServiceRegistry it is possible to have multiple slaves respond to one service call.
-
Warning
+
You can override a built-in component by having a component with the same name in your config/custom_components folder. This is not recommended and will probably break things!
-
Note
+
Home Assistant will use the directory that contains your config file as the directory that holds your customizations. By default this is the config folder in your current work directory. You can use a different folder by running Home Assistant with the --config argument: python3 homeassistant --config /YOUR/CONFIG/PATH/.
-
Warning
+
Do not use development mode in production. Home Assistant uses aggresive caching to improve the mobile experience. This is disabled during development so that you do not have to restart the server in between changes.
-
Note
+
You can append ?api_password=YOUR_PASSWORD to any url to log in automatically.
-
Note
+
For the light and switch component, you can specify multiple platforms by using sequential sections: [switch], [switch 2], [switch 3] etc
-
Note on Tomato
+
Tomato requires an extra config variable called `http_id`. The value can be obtained by logging in to the Tomato admin interface and search for `http_id` in the page source code.
-
Note on Luci
+
Before the Luci scanner can be used you have to install the luci RPC package on OpenWRT: opkg install luci-mod-rpc.
-