Merge branch 'current' into next

This commit is contained in:
Robbie Trencheny 2016-10-24 21:38:16 -07:00
commit 1af9062a5e
20 changed files with 184 additions and 67 deletions

View file

@ -2,7 +2,7 @@
layout: page
title: "Netatmo Thermostat"
description: "Instructions how to integrate Netatmo thermostat into Home Assistant."
date: 2016-11-10 08:10
date: 2016-10-11 08:10
sidebar: true
comments: false
sharing: true
@ -12,27 +12,24 @@ ha_category: Climate
ha_release: 0.31
---
### {% linkable_title Basic Configuration %}
The `netatmo` thermostat platform is consuming the information provided by a [Netatmo Smart Thermostat](https://www.netatmo.com/product/energy/thermostat) thermostat. This component allows you to view the current temperature and setpoint.
To enable the Netatmo thermostat, you first have to set up [netatmo](/components/netatmo/), this will use discovery to add your thermostat.
### {% linkable_title Basic Configuration %}
If you want to select a specific thermostat, set discovery to False for [netatmo](/components/netatmo/) and add the following lines to your `configuration.yaml`:
```yaml
# Example configuration.yaml entry
climate:
platform: netatmo
- platform: netatmo
```
Configuration variables:
- **relay** (*Optional*): Will display the thermostats of this relay only.
- **thermostat** array (*Optional*): Thermostat to use.
- **thermostat_name**: Name of the thermostat to display.
- **thermostat_name**: Name of the thermostat to display.
If **relay** and **thermostat** are not provided, all thermostats will be displayed.

View file

@ -15,6 +15,10 @@ ha_release: pre 0.7
The `asuswrt` platform offers presence detection by looking at connected devices to a [ASUSWRT](http://event.asus.com/2013/nw/ASUSWRT/) based router.
<p class='note warning'>
This platform is **NOT** available for [Microsoft Windows installations](http://pexpect.readthedocs.io/en/stable/overview.html#pexpect-on-windows).
</p>
To use an ASUSWRT router in your installation, add the following to your `configuration.yaml` file:
```yaml

View file

@ -8,7 +8,7 @@ comments: false
sharing: true
footer: true
logo: home-assistant.png
ha_category: "History"
ha_category: History
ha_release: pre 0.7
---
@ -44,7 +44,8 @@ Configuration variables:
Without any `include` or `exclude` configuration the history displays graphs for every entity (well that's not exactly true - for instance `hidden` entities or `scenes` are never shown) on a given date. If you are only interested in some of the entities you several options:
- Define domains and entities to `exclude` (aka. blacklist). This is convenient when you are basically happy with the information displayed, but just want to remove some entities or domains. Usually these are entities/domains which do not change (like `weblink`) or rarely change (`updater` or `automation`).
Define domains and entities to `exclude` (aka. blacklist). This is convenient when you are basically happy with the information displayed, but just want to remove some entities or domains. Usually these are entities/domains which do not change (like `weblink`) or rarely change (`updater` or `automation`).
```yaml
# Example configuration.yaml entry with exclude
history:
@ -57,7 +58,9 @@ history:
- sensor.last_boot
- sensor.date
```
- Define domains and entities to display by using the `include` configuration (aka. whitelist). If you have a lot of entities in your system and your `exclude` lists possibly get very large, it might be better just to define the entities or domains to display.
Define domains and entities to display by using the `include` configuration (aka. whitelist). If you have a lot of entities in your system and your `exclude` lists possibly get very large, it might be better just to define the entities or domains to display.
```yaml
# Example configuration.yaml entry with include
history:
@ -67,7 +70,9 @@ history:
- switch
- media_player
```
- Use the `include` list to define the domains/entities to display, and exclude some of them with in the `exclude` list. This makes sense if you for instance include the `sensor` domain, but want to exclude some specific sensors. Instead of adding every sensor entity to the `include` `entities` list just include the `sensor` domain and exclude the sensor entities you are not interested in.
Use the `include` list to define the domains/entities to display, and exclude some of them with in the `exclude` list. This makes sense if you for instance include the `sensor` domain, but want to exclude some specific sensors. Instead of adding every sensor entity to the `include` `entities` list just include the `sensor` domain and exclude the sensor entities you are not interested in.
```yaml
# Example configuration.yaml entry with include and exclude
history:
@ -84,7 +89,7 @@ history:
#### {% linkable_title Implementation details %}
The history is stored in a SQLite database `home-assistant.db` within your config directory.
The history is stored in a SQLite database `home-assistant_v2.db` within your configuration directory.
- events table is all events except `time_changed` that happened while recorder component was running.
- states table contains all the `new_state` values of `state_changed` events.
@ -96,7 +101,7 @@ The history is stored in a SQLite database `home-assistant.db` within your confi
- `last_updated`: timestamp anything has changed (state, attributes)
- `created`: timestamp this entry was inserted into the database
When the history component queries the states table it only selects states where the state has changed: `WHERE last_changed=last_updated`
When the `history` component queries the states table it only selects states where the state has changed: `WHERE last_changed=last_updated`
#### {% linkable_title On dates %}

View file

@ -15,7 +15,7 @@ ha_release: pre 0.7
The `nma` platform uses [Notify My Android (NMA)](http://www.notifymyandroid.com/) to delivery notifications from Home Assistant to your Android device.
Go to the [NMA website](https://www.notifymyandroid.com) and create a new API key. If you are using the trial offer then keep in mind that your limit is five (5) message per day.
Go to the [NMA website](https://www.notifymyandroid.com) and create a new API key. If you are using the trial offer then keep in mind that your limit is five messages per day.
To add NMA to your installation, add the following to your `configuration.yaml` file:

View file

@ -45,3 +45,4 @@ sensor:
only_named: True
temperature_scale: "°C"
datatype_mask: 1
```