jeena/home-assistant.github.io
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'current' into next

Browse source
This commit is contained in:
Fabian Affolter 2017-10-23 10:10:39 +02:00
commit b886491796
No known key found for this signature in database
GPG key ID: DDF3D6F44AAB1336
21 changed files with 120 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/_docs/autostart/synology.markdown
View file

@ -38,13 +38,13 @@ exec /bin/sh /volume1/homeassistant/hass-daemon start
Register the autostart
```bash
$ ln -s homeassistant-conf /etc/init/homeassistant-conf
$ ln -s homeassistant.conf /etc/init/homeassistant.conf
```
Make the relevant files executable:
```bash
$ chmod -r 777 /etc/init/homeassistant-conf
$ chmod -r 777 /etc/init/homeassistant.conf
```
That's it - reboot your NAS and Home Assistant should automatically start

15
source/_docs/backend/database.markdown
View file

@ -10,8 +10,8 @@ footer: true
redirect_from: /details/database/
---
The default database that is used for Home Assistant is [SQLite](https://www.sqlite.org/) and is stored in your [configuration directory](/getting-started/configuration/), eg. `<path to config dir>/.homeassistant/home-assistant_v2.db`. You will need an installation of `sqlite3`, the command-line for SQLite database, or [DB Browser for SQLite](http://sqlitebrowser.org/) which provide an editor for executing SQL commands.
First load your database with `sqlite3`.
The default database that is used for Home Assistant is [SQLite](https://www.sqlite.org/) and is stored in your [configuration directory](/getting-started/configuration/) (e.g., `<path to config dir>/.homeassistant/home-assistant_v2.db`). You will need an installation of `sqlite3`, the command-line for SQLite database, or [DB Browser for SQLite](http://sqlitebrowser.org/), which provides an editor for executing SQL commands.
First load your database with `sqlite3`:
```bash
$ sqlite3 home-assistant_v2.db
@ -20,7 +20,7 @@ Enter ".help" for usage hints.
sqlite>
```
It helps to set some options to make the output better readable.
It helps to set some options to make the output more readable:
```bash
sqlite> .header on
@ -38,7 +38,7 @@ seq name file
### {% linkable_title Schema %}
Get all available tables from your current Home Assistant database.
Get all available tables from your current Home Assistant database:
```bash
sqlite> SELECT sql FROM sqlite_master;
@ -81,7 +81,7 @@ CREATE INDEX states__state_changes ON states (last_changed, last_updated, entity
CREATE TABLE sqlite_stat1(tbl,idx,stat)
```
To only show the details about the `states` table as we are using that one in the next examples.
To only show the details about the `states` table (since we are using that one in the next examples):
```bash
sqlite> SELECT sql FROM sqlite_master WHERE type = 'table' AND tbl_name = 'states';
@ -89,7 +89,7 @@ sqlite> SELECT sql FROM sqlite_master WHERE type = 'table' AND tbl_name = 'state
### {% linkable_title Query %}
The identification of the available columns in the table is done and we are now able to create a query. Let's list of your Top 10 entities.
The identification of the available columns in the table is done and we are now able to create a query. Let's list your Top 10 entities:
```bash
sqlite> .width 30, 10,
@ -110,7 +110,7 @@ group.all_switches 8018
### {% linkable_title Delete %}
If you don't want to keep certain entities, you can delete them permanently.
If you don't want to keep certain entities, you can delete them permanently:
```bash
sqlite> DELETE FROM states WHERE entity_id="sensor.cpu";
@ -123,4 +123,3 @@ sqlite> VACUUM;
```
For a more interactive way to work with the database or the create statistics, checkout our [Jupyter notebooks](http://nbviewer.jupyter.org/github/home-assistant/home-assistant-notebooks/tree/master/).

4
source/_docs/ecosystem/ios/notifications/content_extensions.markdown
View file

@ -57,7 +57,7 @@ You can also pass the following properties under `action_data` to modify the map
The notification thumbnail will be a still image from the camera.
The notification content is a real time MJPEG stream of a camera (assuming the camera supports it).
You can use the attachment parameters `content-type` and `hide-thumbnail` with camera.
You can use the attachment parameters `content-type` and `hide-thumbnail` with camera to control the thumbnail.
You can view an example [here](https://www.youtube.com/watch?v=LmYwpxPKW0g).
@ -66,6 +66,8 @@ service: notify.ios_<your_device_id_here>
data:
message: Motion detected in the Living Room
data:
attachment:
content-type: jpeg
push:
category: camera
entity_id: camera.demo_camera

6
source/_docs/installation/archlinux.markdown
View file

@ -1,7 +1,7 @@
---
layout: page
title: "Installation on ArchLinux"
description: "Installation of Home Assistant on your ArchLinux computer."
title: "Installation on Arch Linux"
description: "Installation of Home Assistant on your Arch Linux computer."
date: 2017-03-01 07:00
sidebar: true
comments: false
@ -9,7 +9,7 @@ sharing: true
footer: true
---
[ArchLinux](https://www.archlinux.org/) is a lightweight and flexible Linux distribution. There are official packages optimized for the i686 and x86-64 architectures available.
[Arch Linux](https://www.archlinux.org/) is a lightweight and flexible Linux distribution. There are official packages optimized for the i686 and x86-64 architectures available.
Install the needed Python packages.

22
source/_docs/scripts.markdown
View file

@ -90,6 +90,28 @@ wait_template: {% raw %}"{{ states.climate.kitchen.attributes.valve < 10 }}"{% e
timeout: 00:01:00
```
When using `wait_template` within an automation `trigger.entity_id` is supported for `state`, `numeric_state` and `template` triggers, see also [Available-Trigger-Data](/docs/automation/templating/#available-trigger-data).
{% raw %}
```yaml
wait_template: "{{ is_state(trigger.entity_id, 'on') }}"
```
{% endraw %}
It is also possible to use dummy variables, e.g., in scripts, when using `wait_template`.
{% raw %}
```yaml
# Service call, e.g. from an automation.
service: script.do_something
data_template:
dummy: "{{ input_boolean.switch }}"
# Inside the script
wait_template: "{{ is_state(dummy, 'off') }}"
```
{% endraw %}
### {% linkable_title Fire an Event %}
This action allows you to fire an event. Events can be used for many things. It could trigger an automation or indicate to another component that something is happening. For instance, in the below example it is used to create an entry in the logbook.

5
source/_docs/z-wave.markdown
View file

@ -32,3 +32,8 @@ There are 2 basic things you'll need to use Z-Wave, a Z-Wave [controller](/docs/
There are 12 different regions for Z-Wave devices, which relates to the frequency the devices use. There is overlap between the regions, but you should ensure that you buy devices for your region. Wikipedia has a list of the [frequencies used](https://en.wikipedia.org/wiki/Z-Wave#Radio_frequencies).
## {% linkable_title Getting started %}
You'll now need to connect your [controller](/docs/z-wave/controllers/), [configure](/docs/z-wave/installation) the Z-Wave component, then [add some devices](/docs/z-wave/adding) using the [control panel](/docs/z-wave/control-panel). [This explains](/docs/z-wave/devices/) about devices, and how [entities are named](/docs/z-wave/entities).
You can get more information on the [available services](/docs/z-wave/services/) and [events](/docs/z-wave/events/), what the [query stages](/docs/z-wave/query-stage) of battery powered devices are, as well as details on configuring [specific devices](/docs/z-wave/device-specific/).

6
source/_docs/z-wave/control-panel.markdown
View file

@ -10,13 +10,17 @@ footer: true
redirect_from: /getting-started/z-wave-panel/
---
<p class='note'>
If you don't see the **Configuration** menu on the menubar, where you'll find the Z-Wave menu, [see here](/components/config/).
</p>
## {% linkable_title Z-Wave Network Management %}
Here is where you [include and exclude](/docs/z-wave/adding/) Z-Wave devices from your network.
* **Add Node** puts the controller into inclusion mode, so you can include (add) a device to your Z-Wave network
* **Add Node Secure** puts the controller into secure inclusion mode (this requires that you've created a [security key](/docs/z-wave/adding#sdding-security-devices))
* **Remove Node** puts the controller into exclusion mdoe, so you can exclude (remove) a device. Note that you can exclude a non-secure device that's been added to another network
* **Remove Node** puts the controller into exclusion mode, so you can exclude (remove) a device. Note that you can exclude a non-secure device that's been added to another network
* **Cancel Command** cancels any of the above
* **Heal Network** tells the controller to "heal" the Z-Wave network. Basically asks the nodes to tell the controller all of their neighbors so the controller can refigure out optimal routing.