Merge branch 'current' into next

This commit is contained in:
Fabian Affolter 2017-11-27 22:20:13 +01:00
commit 379de6fb86
No known key found for this signature in database
GPG key ID: DDF3D6F44AAB1336
22 changed files with 309 additions and 209 deletions

View file

@ -12,6 +12,7 @@ redirect_from: /getting-started/automation-examples/
Just some sample automation rules to get you started.
{% raw %}
```yaml
# Example of entry in configuration.yaml
automation:
@ -64,4 +65,20 @@ automation:
service: notify.notify
data:
message: 'Paulus left the house'
# Send a notification via Pushover with the event of a Xiaomi cube. Custom event from the Xiaomi component.
- alias: 'Xiaomi Cube Action'
hide_entity: false
initial_state: false
trigger:
platform: event
event_type: cube_action
event_data:
entity_id: binary_sensor.cube_158d000103a3de
action:
- service_template: notify.pushover
data_template:
title: "Cube event detected"
message: "Cube has triggered this event: {{ trigger.event }}"
```
{% endraw %}

View file

@ -28,7 +28,7 @@ A service file is needed to control Home Assistant with `systemd`. The template
```
[Unit]
Description=Home Assistant
After=network.target
After=network-online.target
[Service]
Type=simple
@ -46,7 +46,7 @@ If you've setup Home Assistant in `virtualenv` following our [Python installatio
```
[Unit]
Description=Home Assistant
After=network.target
After=network-online.target
[Service]
Type=simple

View file

@ -25,7 +25,7 @@ $ pip3 install --upgrade homeassistant
After updating, you must restart Home Assistant for the changes to take effect. This means that you will have to restart `hass` itself or the [autostarting](/docs/autostart/) daemon (if applicable). Startup can take considerable amount of time (i.e. minutes) depending on your device. This is because all requirements are updated as well.
<p class='note'>
To avoid permission errors, the upgrade must be run as the same user as the installation was completed, again review the documentation specific to your install [HASSIO](/hassio/), [HASSbian](/docs/hassbian/installation/), [Raspberry Pi All-In-One Installer](/docs/installation/raspberry-pi-all-in-one/), [Vagrant](/docs/installation/vagrant/), or [Virtualenv](/docs/installation/virtualenv).
To avoid permission errors, the upgrade must be run as the same user as the installation was completed, again review the documentation specific to your install [Hass.io](/hassio/), [HASSbian](/docs/hassbian/installation/), [Raspberry Pi All-In-One Installer](/docs/installation/raspberry-pi-all-in-one/), [Vagrant](/docs/installation/vagrant/), or [Virtualenv](/docs/installation/virtualenv).
</p>
[BRUH automation](http://www.bruhautomation.com) has created [a tutorial video](https://www.youtube.com/watch?v=tuG2rs1Cl2Y) explaining how to upgrade Home Assistant.

View file

@ -28,7 +28,7 @@ When you add a device, it may initially appear without a specific entity ID (eg
## {% linkable_title Adding Secure Devices %}
Security Z-Wave devices require a network key - you must set the *network_key* configuration variable to use a network key before adding these devices. Some devices only expose their full capabilities when included this way, you should always read the manual for your device to find out the recommended inclusion method. To add (include) a secure Z-Wave device:
Security Z-Wave devices require a network key. You must set the *network_key* configuration variable to use a network key before adding these devices. Some devices only expose their full capabilities when included this way, you should always read the manual for your device to find out the recommended inclusion method. Note, secure devices that had been connected to another hub/network in the past may have a "theft protection" feature which requires to first exclude the device successfully from the previous hub using the previous hub/Software setup before it can be enrolled in a new hub/network. To add (include) a secure Z-Wave device:
1. Go to the [Z-Wave control panel](/docs/z-wave/control-panel/) in the Home Assistant frontend
2. Click the **Add Node Secure** button in the *Z-Wave Network Management* card - this will place the controller in inclusion mode

View file

@ -215,3 +215,7 @@ Button one single tap|1|TBC
Button two single tap|2|TBC
Button three single tap|3|TBC
Button four single tap|4|TBC
### {% linkable_title Zooz Toggle Switches %}
Some models of the Zooz Toggle switches ship with an instruction manual with incorrect instruction for Z-Wave inclusion/exclusion. The instructions say that the switch should be quickly switched on-off-on for inclusion and off-on-off for exclusion. However, the correct method is on-on-on for inclusion and off-off-off for exclusion.