Skip to content

Commit 806b740

Browse files
committed
Merge branch 'current' into next
2 parents 038dc31 + abfd390 commit 806b740

21 files changed

+646
-55
lines changed

_config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ social:
140140

141141
# Home Assistant release details
142142
current_major_version: 0
143-
current_minor_version: 46
144-
current_patch_version: 1
145-
date_released: 2017-06-09
143+
current_minor_version: 47
144+
current_patch_version: 0
145+
date_released: 2017-06-17
146146

147147
# Either # or the anchor link to latest release notes in the blog post.
148148
# Must be prefixed with a # and have double quotes around it.
149149
# Major release:
150-
patch_version_notes: "#release-0461---june-9"
150+
patch_version_notes: "#"
151151
# Minor release (Example #release-0431---april-25):
152152

source/_components/binary_sensor.template.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ sensor:
4747
sensors:
4848
furnace_on:
4949
value_template: {% raw %}{{ states.sensor.furnace.state > 2.5 }}{% endraw %}
50-
friendly_name: 'Furnace Running
50+
friendly_name: 'Furnace Running'
5151
device_class: heat
5252
```
5353

source/_components/cover.mqtt.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Configuration variables:
3737
3838
- **name** (*Optional*): The name of the sensor. Default is `MQTT Cover`.
3939
- **state_topic** (*Optional*): The MQTT topic subscribed to receive sensor values.
40-
- **command_topic** (*Required*): The MQTT topic to publish commands to control the rollershutter.
40+
- **command_topic** (*Optional*): The MQTT topic to publish commands to control the rollershutter.
4141
- **payload_open** (*Optional*): The payload that opens the cover. Default is `OPEN`.
4242
- **payload_close** (*Optional*): The payload that closes the cover. Default is `CLOSE`.
4343
- **payload_stop** (*Optional*): The payload that stops the rollershutter. default is `STOP`.

source/_components/dweet.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: page
33
title: "Dweet.io"
4-
description: "Record events in InfluxDB."
4+
description: "Transfer events to Dweet.io."
55
date: 2016-05-07 07:08
66
sidebar: true
77
comments: false
@@ -24,7 +24,7 @@ The `dweet` component makes it possible to transfer details collected with Home
2424
The publishing interval is limited to 1 second. This means that it's possible to miss fast changes.
2525
</p>
2626

27-
To use the `deweet` component in your installation, add the following to your `configuration.yaml` file:
27+
To use the `dweet` component in your installation, add the following to your `configuration.yaml` file:
2828

2929
```yaml
3030
# Example configuration.yaml entry

source/_components/light.markdown

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ Most lights do not support all attributes. You can check the platform documentat
2424
| Service data attribute | Optional | Description |
2525
| ---------------------- | -------- | ----------- |
2626
| `entity_id` | no | String or list of strings that point at `entity_id`s of lights. Else targets all.
27-
| `transition` | yes | Integer that represents the time the light should take to transition to the new state in seconds.
28-
| `profile` | yes | String with the name of one of the [built-in profiles](https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/light/light_profiles.csv) (relax, energize, concentrate, reading) or one of the custom profiles defined in `light_profiles.csv` in the current working directory. Light profiles define a xy color and a brightness. If a profile is given and a brightness or xy color then the profile values will be overwritten.
27+
| `transition` | yes | Number that represents the time (in seconds) the light should take to transition to the new state.
28+
| `profile` | yes | String with the name of one of the [built-in profiles](https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/light/light_profiles.csv) (relax, energize, concentrate, reading) or one of the custom profiles defined in `light_profiles.csv` in the current working directory. Light profiles define a xy color and a brightness. If a profile is given and a brightness then the profile brightness will be overwritten.
2929
| `xy_color` | yes | A list containing two floats representing the xy color you want the light to be. Two comma separated floats that represent the color in XY.
3030
| `rgb_color` | yes | A list containing three integers representing the rgb color you want the light to be. Three comma separated integers that represent the color in RGB. You can find a great chart here: [Hue Color Chart](http://www.developers.meethue.com/documentation/hue-xy-values)
31-
| `color_temp` | yes | An INT in mireds representing the color temperature you want the light to be.
31+
| `white_value` | yes | Integer between 0 and 255 for how bright a dedicated white LED should be.
32+
| `color_temp` | yes | An integer in mireds representing the color temperature you want the light to be.
3233
| `kelvin` | yes | Alternatively, you can specify the color temperature in Kelvin.
3334
| `color_name` | yes | A human readable string of a color name, such as `blue` or `goldenrod`. All [CSS3 color names](https://www.w3.org/TR/2010/PR-css3-color-20101028/#svg-color) are supported.
3435
| `brightness` | yes | Integer between 0 and 255 for how bright the color should be.

source/_components/mailgun.markdown

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
layout: page
3+
title: "Mailgun"
4+
description: "Instructions how to add Mailgun mail notifications to Home Assistant."
5+
date: 2017-02-06 16:52
6+
sidebar: true
7+
comments: false
8+
sharing: true
9+
footer: true
10+
logo: mailgun.png
11+
ha_category: Notifications
12+
ha_release: 0.38
13+
---
14+
15+
The component supports push messages and generates events based on inbound data. To use, add a Route set to Store and Notify with a URL of the following form: `https://<domain>/api/mailgun?api_password=<password>`
16+
17+
To send messages, use the [Mailgun notify platform][notify].
18+
19+
[notify]: /components/notify.mailgun/
20+
21+
## {% linkable_title Sample configuration %}
22+
23+
```yaml
24+
# Example configuration.yaml entry
25+
mailgun:
26+
domain: mg.example.com
27+
api_key: token-XXXXXXXXX
28+
sandbox: False
29+
```
30+
31+
Configuration variables:
32+
33+
- **domain** (*Optional*): This is the domain name to be used when sending out mail. Defaults to the first custom domain you have set up.
34+
- **sandbox** (*Optional*): Whether to use the sandboxed domain for outgoing mail. The `domain` item takes precedence over this. Defaults to `False`.
35+
- **api_key** (*Required*): This is the API token that has been generated in your Mailgun account.

source/_components/notify.group.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ Configuration variables:
3232
3333
- **name** (*Required*): Setting the parameter `name` sets the name of the group.
3434
- **services** (*Required*): A list of all the services to be included in the group.
35-
- **service** (*Required*): The service part of an entity ID, i.e. if you use `notify.html5` normally, just put `html5`.
35+
- **service** (*Required*): The service part of an entity ID, i.e. if you use `notify.html5` normally, just put `html5`. Note that you must put everything in lower case here. Although you might have capitals written in the actual notification services!
3636
- **data** (*Optional*): A dictionary containing parameters to add to all notify payloads. This can be anything that is valid to use in a payload, such as `data`, `message`, `target`, `title`.

source/_components/notify.mailgun.markdown

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: page
3-
title: "Mailgun"
3+
title: "Mailgun Notify"
44
description: "Instructions how to add Mailgun mail notifications to Home Assistant."
55
date: 2017-02-06 16:52
66
sidebar: true
@@ -12,18 +12,23 @@ ha_category: Notifications
1212
ha_release: 0.38
1313
---
1414

15-
The Mailgun notification service allows you to send emails via Mailgun's REST API.
15+
The Mailgun notification service allows you to send emails via Mailgun's REST API. It requires the [Mailgun component] to be set up.
16+
17+
[Mailgun component]: /components/mailgun/
1618

1719
## {% linkable_title Sample configuration %}
1820

1921
```yaml
2022
# Example configuration.yaml entry
23+
mailgun:
24+
domain: mg.example.com
25+
api_key: token-XXXXXXXXX
26+
sandbox: False
27+
2128
notify:
22-
- name: NOTIFIER_NAME
29+
- name: mailgun
2330
platform: mailgun
24-
domain: YOUR_MAILGUN_DOMAIN
25-
token: TOKEN
26-
recipient: RECIPIENT_EMAIL
31+
recipient: me@example.com
2732
```
2833
2934
Configuration variables:
@@ -34,21 +39,6 @@ Configuration variables:
3439
- **recipient** (*Required*): The email address of the recipient.
3540
- **sender** (*Optional*): The sender's email address. Defaults to `hass@DOMAIN`, where `DOMAIN` is outgoint mail domain, as defined by the `domain` and `sanbox` configuration entries.
3641

37-
## {% linkable_title Full configuration %}
38-
39-
A full configuration example for the Mailgun notifier system can look like this:
40-
41-
```yaml
42-
# Example configuration.yaml entry
43-
notify:
44-
- name: mailgun
45-
platform: mailgun
46-
domain: mg.example.com
47-
sanbox: False
48-
token: 'token-XXXXXXXXX'
49-
recipient: me@example.com
50-
```
51-
5242
## {% linkable_title Example automation %}
5343

5444
The following automation reacts to an event by sending out an email with two attachments.

source/_components/python_script.markdown

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,16 @@ ha_category: Automation
1212
ha_release: 0.47
1313
---
1414

15-
This component allows you to write Python scripts that are exposed as services in Home Assistant. Each Python file created in the `<config>/python_scripts/` folder will be exposed as a service. The content is not cached so you can easily develop: edit file, save changes, call service. The scripts are run in a sandboxed environment with access to the `hass` object, the service call data as `data` and a logger as `logger`.
15+
This component allows you to write Python scripts that are exposed as services in Home Assistant. Each Python file created in the `<config>/python_scripts/` folder will be exposed as a service. The content is not cached so you can easily develop: edit file, save changes, call service. The scripts are run in a sandboxed environment. The following variables are available in the sandbox:
16+
17+
| Name | Description |
18+
| ---- | ----------- |
19+
| `hass` | The Home Assistant object. Access is only allowed to call services, set/remove states and fire events. [API reference][hass-api]
20+
| `data` | The data passed to the Python Script service call.
21+
| `logger` | A logger to allow you to log messages: `logger.info()`, `logger.warning()`, `logger.error()`. [API reference][logger-api]
22+
23+
[hass-api]: https://home-assistant.io/developers/development_hass_object/
24+
[logger-api]: https://docs.python.org/3.4/library/logging.html#logger-objects
1625

1726
## {% linkable_title Writing your first script %}
1827

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
layout: page
3+
title: "Ecobee Sensor"
4+
description: "Instructions how to setup the Ecobee sensors within Home Assistant."
5+
date: 2015-11-30 18:00
6+
sidebar: true
7+
comments: false
8+
sharing: true
9+
footer: true
10+
logo: ecobee.png
11+
ha_category: Binary Sensor
12+
ha_release: 0.9
13+
ha_iot_class: "Local Push"
14+
---
15+
16+
To get your Ecobee sensors working with Home Assistant, follow the instructions for the general [Ecobee component](/components/ecobee/).

source/_docs/backend/updater.markdown

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ redirect_from: /details/updater/
1212

1313
Starting with 0.31 the [updater component](/components/updater/) sends an optional report about Home Assistant instance.
1414

15+
If you want to opt-in to include component information, add `include_used_components` to your config. This will allow the Home Assistant developers to focus development efforts on the most popular components.
16+
17+
```yaml
18+
updater:
19+
include_used_components: true
20+
```
21+
1522
We are only collecting this information to better understand our user base to provide better long term support and feature development.
1623
1724
| Name | Description | Example | Data Source |
@@ -49,4 +56,4 @@ The server also adds two timestamps to the data:
4956
- the original date your instance UUID was first seen
5057
- the timestamp of the last time we have seen your instance
5158

52-
There are currently no plans to publicly expose any of this information. If we did do such a thing in the future we would of course notify you in advance. It must also be stated that we will never sell or allow the use of this information for non-Home Assistant purposes.
59+
We will never publicly expose individual gathered data. We might however publish aggregated stats about our user base (example: 70% of all users use Linux). We will never sell or allow the use of this information for non-Home Assistant development purposes.

source/_docs/z-wave.markdown

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ zwave:
3535
Configuration variables:
3636
3737
- **usb_path** (*Optional*): The port where your device is connected to your Home Assistant host.
38+
- **network_key** (*Optional*): The 16 byte network key in the form `"0x01,0x02..."` used in order to connect securely to compatible devices.
3839
- **config_path** (*Optional*): The path to the Python OpenZWave configuration files. Defaults to the 'config' that is installed by python-openzwave
3940
- **autoheal** (*Optional*): Allows disabling auto Z-Wave heal at midnight. Defaults to True.
4041
- **polling_interval** (*Optional*): The time period in milliseconds between polls of a nodes value. Be careful about using polling values below 30000 (30 seconds) as polling can flood the zwave network and cause problems.
@@ -89,19 +90,7 @@ To add a Z-Wave device to your system, go to the Services menu and select the `z
8990

9091
### {% linkable_title Adding Security Devices %}
9192

92-
Security Z-Wave devices require a network key before being added to the network using the `zwave.add_node_secure` service. You must edit the `options.xml` file, located in your `python-openzwave config_path` to use a network key before adding these devices.
93-
94-
Edit your `options.xml` file:
95-
96-
```bash
97-
<!-- <Option name="NetworkKey" value="0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F 0x10" /> -->
98-
```
99-
Uncomment the line:
100-
```bash
101-
<Option name="NetworkKey" value="0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10" />
102-
```
103-
104-
You can replace these values with your own 16 byte network key. For more information on this process see the [OpenZwave](https://github.com/OpenZWave/open-zwave) wiki article [Adding Security Devices to OZW](https://github.com/OpenZWave/open-zwave/wiki/Adding-Security-Devices-to-OZW)
93+
Security Z-Wave devices require a network key before being added to the network using the `zwave.add_node_secure` service. You must set the *network_key* configuration variable to use a network key before adding these devices.
10594

10695
An easy script to generate a random key:
10796
```bash

source/_posts/2017-05-06-zigbee-opencv-dlib.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ categories: Release-Notes
1111
og_image: /images/blog/2017-05-0.44/components.png
1212
---
1313

14-
<a href='/components/#added_in_current_version'><img src='/images/blog/2017-05-0.44/components.png' style='border: 0;box-shadow: none;'></a>
14+
<a href='/components/#version/0.44'><img src='/images/blog/2017-05-0.44/components.png' style='border: 0;box-shadow: none;'></a>
1515

1616
This release brings some great new integrations. The biggest one is the [native ZigBee integration][zha docs] by [Russell Cloran][@rcloran]. This will allow Home Assistant to natively control Philips Hue lights without the need for a hub! (IKEA Tradfri lights not yet due to implementing a different profile)
1717

source/_posts/2017-05-20-automation-editor-zwave-panel-ocr.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ categories: Release-Notes
1111
og_image: /images/blog/2017-05-0.45/components.png
1212
---
1313

14-
<a href='/components/#added_in_current_version'><img src='/images/blog/2017-05-0.45/components.png' style='border: 0;box-shadow: none;'></a>
14+
<a href='/components/#version/0.45'><img src='/images/blog/2017-05-0.45/components.png' style='border: 0;box-shadow: none;'></a>
1515

1616
Welcome to another great release of Home Assistant! While some of contributors and users are gathering at PyCon US 2017, we still managed to get a great release together!
1717

source/_posts/2017-06-04-release-46.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ categories: Release-Notes
1111
og_image: /images/blog/2017-06-0.46/components.png
1212
---
1313

14-
<a href='/components/#added_in_current_version'><img src='/images/blog/2017-06-0.46/components.png' style='border: 0;box-shadow: none;'></a>
14+
<a href='/components/#version/0.46'><img src='/images/blog/2017-06-0.46/components.png' style='border: 0;box-shadow: none;'></a>
1515

1616
It's time for 0.46! This release does not have too many new integrations, instead it focussed on bug fixes.
1717

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
layout: post
3+
title: "ZWave Entity IDs"
4+
description: "Information on the past and future of ZWave Entity IDs."
5+
date: 2017-06-15 08:00:00 -0400
6+
date_formatted: "June 15, 2017"
7+
author: Adam Mills
8+
comments: true
9+
categories: Technology
10+
---
11+
12+
ZWave entity_ids have long been a source of frustration in Home Assistant. The first problem we faced was that depending on the order of node discovery, entity_ids could be discovered with different names on each run. To solve this we added the node id as a suffix to the entity_id. This ensured that entity_ids were generated deterministically on each run, but additional suffixes had to be added to handle edge cases where there would otherwise be a conflict. The resulting entity_ids worked, but have been difficult to work with and makes ZWave a strange exception among other Home Assistant components.
13+
14+
Thanks to the awesome work of [@turbokongen], a growing number of ZWave configuration options are now available from the new ZWave panel in the Home Assistant frontend. Among these new features is support for renaming of ZWave nodes and their underlying values. (These renames are persisted in zwcfg_*.xml) This is important, because these items are combined to form the Home Assistant entity name, which is used to generate the entity_id. Now that these options are available, ZWave users can rename nodes and values, influencing the entity_ids that are generated by Home Assistant.
15+
16+
Now that users are able to control these names, we will be making changes to how the entity_ids are generated for ZWave entities. The ZWave entity_ids are going to switch back to using the standard entity_id generation from Home Assistant core, based on the entity names. Moving forward, if there is a conflict when generating entity_ids, a suffix will be added, and it will be the responsibility of the user to rename their nodes and values to avoid the conflict. This is the same as any other platform in Home Assistant where two devices are discovered with the same name.
17+
18+
With the release of 0.47, this feature will be opt-in. Setting `new_entity_ids: true` under `zwave:` in your configuration.yaml will enable the new generation. After 0.48 this feature will become opt-out. From 0.48 onward, unless you’ve declared `new_entity_ids: false` you will switch to the new entity_id generation. At an undecided point in the future, the old entity_id generation will be removed completely.
19+
20+
I’m sure all ZWave users understand that the current entity_ids aren’t easy to use. They’re annoying to type in configuration.yaml, and break if a node needs to be re-included to the network. We know that breaking changes are painful, and so we’re doing what we can to roll this change out as smoothly as possible. The end result should be a dramatic simplification of most ZWave configurations. We hope that this change will ultimately make ZWave much easier to work with, and bring ZWave configuration just a little closer to the rest of the Home Assistant platforms.
21+
22+
[@turbokongen]: https://github.com/turbokongen

0 commit comments

Comments
 (0)