Skip to content

Commit 8a75866

Browse files
committed
Merge remote-tracking branch 'origin/next' into update_tradfri
2 parents 0a2a778 + 2fae62a commit 8a75866

File tree

163 files changed

+2812
-664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+2812
-664
lines changed

README.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This is the source for the [Home-Assistant.io website](https://home-assistant.io
99

1010
## Setup
1111

12-
Setting up to contribute to documentation and the process for submitting pull requests is [explained here](https://home-assistant.io/developers/website/).
12+
Setting up to contribute to documentation and the process for submitting pull requests is [explained here](https://home-assistant.io/developers/documentation/).
1313

1414
## Site preview
1515

_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ social:
139139

140140
# Home Assistant release details
141141
current_major_version: 0
142-
current_minor_version: 54
142+
current_minor_version: 55
143143
current_patch_version: 0
144-
date_released: 2017-09-23
144+
date_released: 2017-10-07
145145

146146
# Either # or the anchor link to latest release notes in the blog post.
147147
# Must be prefixed with a # and have double quotes around it.

sass/custom/_print.scss

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
@media print {
2+
3+
/* General Overrides */
4+
header div.grid__item nav {
5+
display: none;
6+
}
7+
aside#sidebar {
8+
display: none;
9+
}
10+
.grid__item {
11+
display: block;
12+
width: 100%;
13+
}
14+
15+
/* Components List */
16+
div.filter-button-group {
17+
display: none;
18+
}
19+
.hass-option-cards.show-items {
20+
display: block;
21+
}
22+
.hass-option-cards.show-items a.option-card {
23+
display: block;
24+
opacity: 1;
25+
width: 100%;
26+
height: auto;
27+
min-height: 80px;
28+
margin-bottom: 8px;
29+
}
30+
.hass-option-cards.show-items a.option-card .img-container {
31+
float: left;
32+
width: 33%;
33+
text-align: center;
34+
}
35+
.hass-option-cards.show-items a.option-card div.title {
36+
height: 1.5em;
37+
margin-top: 8px;
38+
}
39+
}

sass/inuitcss/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ stone, and you are encouranged to override and experiment with them.
180180
It is tempting to modify their vaules in the inuit.css submodule but this is
181181
**not** the correct method for modifying inuit.css, and in doing so you will
182182
prevent yourself from being able to update inuit.css’ core library. The correct
183-
proceedure is to redefine that variable in `_vars.scss` found in the inuit.css
183+
procedure is to redefine that variable in `_vars.scss` found in the inuit.css
184184
web template. Let’s take an example…
185185

186186
In inuit.css’ `_defaults.scss` we find the following:

sass/screen.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
@import 'custom/paulus';
33
@import 'custom/component_page';
44
@import 'custom/syntax';
5+
@import 'custom/print';

source/_addons/configurator.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Screenshot of the HASS Configurator.
2828
- Upload and download files.
2929
- Stage and commit changes in Git repositories, create and switch between branches, push to remotes.
3030
- Lists of available triggers, events, entities, conditions and services. Selected element gets inserted into the editor at the last cursor position.
31-
- Restart Home Assitant directly with the click of a button. Reloading groups, automations etc. can be done as well. An API-password is required.
31+
- Restart Home Assistant directly with the click of a button. Reloading groups, automations etc. can be done as well. An API-password is required.
3232
- SSL support.
3333
- Optional authentication and IP filtering for added security.
3434
- Direct links to Home Assistant documentation and icons.

source/_addons/dhcp_server.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Configuration variables:
4747
 - **range_end** (*Required*): End address for dhcp leases.
4848
 - **broadcast** (*Required*): Network broadcast address.
4949
 - **gateway** (*Required*): A List of gateways.
50-
- **interface** (*Required*): Inteface on that will be listen. Normaly is `eth0` for ethernet wired connection and `wlan0` for wireless connection.
50+
- **interface** (*Required*): Inteface on that will be listen. Normally is `eth0` for ethernet wired connection and `wlan0` for wireless connection.
5151
- **hosts** (*Optional*): A list of fixed IPs for devices.
5252
- **name** (*Required*): Name/hostname of your device.
5353
 - **mac** (*Required*): Mac address of your device.

source/_addons/dnsmasq.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ Configuration variables:
3333
- **defaults** (*Required*): A list of dns server to forward default requests.
3434
- **forwards** (*Optional*): A list of domains that will forward to a specific server.
3535
- **hosts** (*Optional*): A list of hosts to resolve it static.
36-
- **interface** (*Optional*): If a interface is set, it listen only on this interface. Need to set for resinos. Normaly is `eth0` for ethernet wired connection and `wlan0` for wireless connection.
36+
- **interface** (*Optional*): If a interface is set, it listen only on this interface. Need to set for resinos. Normally is `eth0` for ethernet wired connection and `wlan0` for wireless connection.

source/_addons/mariadb.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ sharing: true
99
footer: true
1010
---
1111

12-
Set up a [mariadb](https://mariadb.org/) SQL server. It support multible database, users and permission. If you want only connect from inside use `core-mariadb` as host address.
12+
Set up a [mariadb](https://mariadb.org/) SQL server. It supports multiple databases, users and permission settings. If you want to only connect from inside home assistant use `core-mariadb` as the host address.
1313

1414
```json
1515
{

source/_addons/rpc_shutdown.markdown

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
layout: page
3+
title: "RPC Shutdown"
4+
description: "Simple way for remote windows shutdowns."
5+
date: 2017-09-25 14:00
6+
sidebar: true
7+
comments: false
8+
sharing: true
9+
footer: true
10+
---
11+
12+
Allow to shutdown a computer with a service call from Home-Assistant.
13+
14+
```json
15+
{
16+
"computers": [
17+
{
18+
"alias": "test-pc",
19+
"address": "192.168.0.1",
20+
"credentials": "user%password"
21+
}
22+
]
23+
}
24+
```
25+
26+
- **computers** (*Required*): A list of computer object to shutdown from Home-Assistant.
27+
- **computers/alias** (*Required*): Set a alias for this record and that is the name for the input.
28+
- **computers/address** (*Required*): IP address or netbios name of the computer for shutdown.
29+
- **computers/credentials** (*Required*): Credentials for logging into computer. Use a `%` as delimiter of username and password.
30+
31+
## {% linkable_title Home Assistant %}
32+
33+
Use the following inside Home Assistant service call to use it:
34+
35+
```yaml
36+
service: hassio.addon_stdin
37+
data:
38+
addon: core_rpc_shutdown
39+
input: test-pc
40+
```

source/_addons/samba.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ Configuration variables:
3838
- **map** (*Optional*): Control which folder will be expose. `config` is for Home Assistant configuration folder. `addons` for local custom repositiory. `share` is a folder that can access from add-ons and Home Assistant too. `backup` for access to snapshot files. `ssl` for certificate storage, be careful with this option! Defaults all to `true`, except for `ssl`.
3939
- **username** (*Optional*): The username for logging in if guest login is not used.
4040
- **password** (*Optional*): Password for `username`. An empty password is not supported.
41-
- **interface** (*Optional*): Interface on that will start the share. Normaly is `eth0` for ethernet wired connection and `wlan0` for wireless connection.
41+
- **interface** (*Optional*): Interface on that will start the share. Normally is `eth0` for ethernet wired connection and `wlan0` for wireless connection.

source/_components/alarm_control_panel.egardia.markdown

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,26 +61,30 @@ alarm_control_panel:
6161
triggered: XXXXXXXXXXXXXXXX, XXXXXXXXXXXXXXXX, XXXXXXXXXXXXXXXX
6262
ignore: XXXXXXXXXXXXXXXX
6363
```
64-
Note that for triggered, arm and disarm multiple codes can be entered since each sensor triggers with a different code and each user of the system has its own arm and disarm codes. Also note that your system will do regular system checks which will be reported as well. Since Home Assistant provides no way of handling them properly, you can enter those codes as ignore (again, multiple codes can be used here). The egardia component will ignore these codes and continue returning the old status if it receives any of the codes that are listed as ignore. This is useful for example when you have armed your alarm at night: normally a system check will occur at least once during the night and if that code is not specified anywhere Home Assistant will set the status of the alarm to its default, which is unarmed. This is in fact wrong. Listing the code as ignore changes this behavior and Home Assistant will continue to show the status the alarm is in (disarm, arm, armhome, triggered) even when system checks occur.
6564

66-
5. Start the `egardiaserver.py` script on boot of your Home Assistant machine, for example by using systemd. To use this method, create a shell script named `egardiaserver.sh` that contains the following:
65+
Note that for triggered, arm and disarm multiple codes can be entered since each sensor triggers with a different code and each user of the system has its own arm and disarm codes. Also note that your system will do regular system checks which will be reported as well. Since Home Assistant provides no way of handling them properly, you can enter those codes as ignore (again, multiple codes can be used here). The egardia component will ignore these codes and continue returning the old status if it receives any of the codes that are listed as ignore. This is useful for example when you have armed your alarm at night: normally a system check will occur at least once during the night and if that code is not specified anywhere Home Assistant will set the status of the alarm to its default, which is unarmed. This is in fact wrong. Listing the code as ignore changes this behavior and Home Assistant will continue to show the status the alarm is in (disarm, arm, armhome, triggered) even when system checks occur.
66+
67+
5. Start the `egardiaserver.py` script on boot of your Home Assistant machine, for example by using `systemctl` by `systemd`. To use this method, create a shell script named `egardiaserver.sh` that contains something like the following:
68+
6769
```bash
68-
source /srv/homeassistant/homeassistant_venv/bin/activate
69-
python3 /srv/homeassistant/homeassistant_venv/lib/python3.4/site-packages/pythonegardia/egardiaserver.py -host [YOURHOST] -password '[YOURPASSWORD]' -ssl True > /tmp/egardiaserver.log 2>&1
70+
$ source /srv/homeassistant/bin/activate
71+
$ python3 /srv/homeassistant/lib/python3.5/site-packages/pythonegardia/egardiaserver.py -host [YOURHOST] -password '[YOURPASSWORD]' -ssl True > /tmp/egardiaserver.log 2>&1
7072
```
7173

7274
Mark it as executable (`$ chmod +x`) and run `sudo nano /lib/systemd/system/egardiaserver.service`. Enter the following into the `egardiaserver.service` file:
75+
7376
```bash
7477
[Unit]
7578
Description=Egardia Server Service
7679
7780
[Service]
78-
ExecStart=/srv/homeassistant/homeassistant_venv/lib/python3.4/site-packages/pythonegardia/egardiaserver.sh
81+
ExecStart=/bin/bash /srv/homeassistant/homeassistant_venv/lib/python3.5/site-packages/pythonegardia/egardiaserver.sh
7982
StandardOutput=journal+console
8083
8184
[Install]
8285
WantedBy=multi-user.target
8386
Alias=egardiaserver.service
8487
```
88+
8589
Save and then run `sudo systemctl enable egardiaserver.service` and `sudo systemctl start egardiaserver.service`.
8690
6. Test your setup and enjoy. The component will update if the alarm status changes, including triggers. You can use this to build your own automations and send notifications as you wish.

source/_components/alarm_control_panel.manual_mqtt.markdown

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ The component will accept the following commands from your Alarm Panel via the `
2121
- `DISARM`
2222
- `ARM_HOME`
2323
- `ARM_AWAY`
24+
- `ARM_NIGHT`
2425

2526
When the state of the manual alarm changes, Home Assistant will publish one of the following states to the `state_topic`:
2627

2728
- 'disarmed'
2829
- 'armed_home'
2930
- 'armed_away'
31+
- 'armed_night'
3032
- 'pending'
3133
- 'triggered'
3234

@@ -47,6 +49,8 @@ All configuration variables from the base manual alarm platform are available:
4749
- **pending_time** (*Optional*): The time in seconds of the pending time before arming the alarm. Default is 60 seconds.
4850
- **trigger_time** (*Optional*): The time in seconds of the trigger time in which the alarm is firing. Default is 120 seconds.
4951
- **disarm_after_trigger** (*Optional*): If true, the alarm will automatically disarm after it has been triggered instead of returning to the previous state.
52+
- **armed_home|armed_away|armed_night|triggered** (*Optional*): State specific settings
53+
- **pending_time**: State specific pending time override.
5054
5155
Additionally, the following MQTT configuration variables are also available:
5256
@@ -56,6 +60,23 @@ Additionally, the following MQTT configuration variables are also available:
5660
- **payload_disarm** (*Optional*): The payload to disarm this Alarm Panel. Default is "DISARM".
5761
- **payload_arm_home** (*Optional*): The payload to set armed-home mode on this Alarm Panel. Default is "ARM_HOME".
5862
- **payload_arm_away** (*Optional*): The payload to set armed-away mode on this Alarm Panel. Default is "ARM_AWAY".
63+
- **payload_arm_night** (*Optional*): The payload to set armed-night mode on this Alarm Panel. Default is "ARM_NIGHT".
64+
65+
In the config example below, armed_home state will have no pending time and triggered state will have a pending time of 20 seconds whereas armed_away state will have a default pending time of 30 seconds.
66+
67+
```yaml
68+
# Example configuration.yaml entry
69+
alarm_control_panel:
70+
- platform: manual_mqtt
71+
state_topic: home/alarm
72+
command_topic: home/alarm/set
73+
pending_time: 30
74+
armed_home:
75+
pending_time: 0
76+
triggered:
77+
pending_time: 20
78+
trigger_time: 4
79+
```
5980
6081
## {% linkable_title Examples %}
6182
@@ -70,11 +91,13 @@ To change the state of the alarm, publish one of the following messages to the `
7091
- `DISARM`
7192
- `ARM_HOME`
7293
- `ARM_AWAY`
94+
- `ARM_NIGHT`
7395

7496
To receive state updates from HA, subscribe to the `state_topic`. Home Assistant will publish a new message whenever the state changes:
7597

7698
- `disarmed`
7799
- `armed_home`
78100
- `armed_away`
101+
- `armed_night`
79102
- `pending`
80103
- `triggered`

source/_components/alexa.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The built-in Alexa component allows you to integrate Home Assistant into Alexa/A
3333

3434
### {% linkable_title Requirements %}
3535

36-
Amazon requires the endpoint of a skill to be hosted via SSL. Self-signed certificates are OK because our skills will only run in development mode. Read more on [our blog][blog-lets-encrypt] about how to set up encryption for Home Assistant. When running Hass.io, using the [Let's Encrypt](/addons/lets_encrypt/) the and [Duck DNS](/addons/duckdns/) add-ons is the easiest method. If you are unable to get HTTPS up and running, consider using [this AWS Lambda proxy for Alexa skills](https://community.home-assistant.io/t/aws-lambda-proxy-custom-alexa-skill-when-you-dont-have-https/5230).
36+
Amazon requires the endpoint of a skill to be hosted via SSL. Self-signed certificates are OK because our skills will only run in development mode. Read more on [our blog][blog-lets-encrypt] about how to set up encryption for Home Assistant. When running Hass.io, using the [Let's Encrypt](/addons/lets_encrypt/) and [Duck DNS](/addons/duckdns/) add-ons is the easiest method. If you are unable to get HTTPS up and running, consider using [this AWS Lambda proxy for Alexa skills](https://community.home-assistant.io/t/aws-lambda-proxy-custom-alexa-skill-when-you-dont-have-https/5230).
3737

3838
Additionally, note that at the time of this writing, your Alexa skill endpoint *must* accept requests over port 443 (Home Assistant default to 8123). There are two ways you can handle this:
3939

source/_components/binary_sensor.modbus.markdown

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,22 @@ Configuration variables:
3636
- **name** (*Required*): Name of the sensor.
3737
- **slave** (*Required*): The number of the slave (Optional for TCP and UDP Modbus).
3838
- **coil** (*Required*): Coil number.
39+
40+
It's possible to change the default 30 seconds scan interval for the sensor updates as shown in the [Platform options](/docs/configuration/platform_options/#scan-interval) documentation.
41+
42+
### {% linkable_title Full example %}
43+
44+
Example a sensor with a 10 seconds scan interval:
45+
46+
```yaml
47+
binary_sensor:
48+
- platform: modbus
49+
scan_interval: 10
50+
coils:
51+
- name: Sensor1
52+
slave: 1
53+
coil: 100
54+
- name: Sensor2
55+
slave: 1
56+
coil: 110
57+
```
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
layout: page
3+
title: "Skybell Binary Sensor"
4+
description: "Instructions on how to integrate your Skybell HD devices within Home Assistant."
5+
date: 2017-10-03 16:00
6+
sidebar: true
7+
comments: false
8+
sharing: true
9+
footer: true
10+
logo: skybell.png
11+
ha_category: Binary Sensor
12+
ha_release: 0.56
13+
ha_iot_class: "Cloud Polling"
14+
---
15+
16+
To get your [Skybell.com](https://skybell.com/) binary sensors working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
17+
18+
Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
19+
20+
```yaml
21+
# Example configuration.yaml entry
22+
binary_sensor:
23+
- platform: skybell
24+
monitored_conditions:
25+
- button
26+
- motion
27+
```
28+
29+
Configuration variables:
30+
31+
- **monitored_conditions** array (*Required*): Conditions to display in the frontend. The following conditions can be monitored.
32+
- **button**: Return a boolean value when the doorbell button was pressed.
33+
- **motion**: Return a boolean value when movement was detected by the Skybell doorbell.

source/_components/binary_sensor.wink.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The requirement is that you have setup [Wink](/components/wink/).
2525
- Window/Door sensors
2626
- Motion sensors
2727
- Ring Door bells (No hub required)
28-
- Liquid presense sensors
28+
- Liquid presence sensors
2929
- Z-wave lock key codes
3030
- Lutron connected bulb remote buttons
3131
- Wink Relay buttons and presence detection

source/_components/binary_sensor.xiaomi_aqara.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Available events are `single`, `double`, `hold`, `long_click_press` and `long_cl
183183

184184
#### {% linkable_title Xiaomi Cube %}
185185

186-
Available events are `flip90`, `flip180`, `move`, `tap_twice`, `shake_air`, `swing`, `alert`, `free_fall` and `rotate`.
186+
Available events are `flip90`, `flip180`, `move`, `tap_twice`, `shake_air`, `swing`, `alert`, `free_fall` and `rotate`. The component stores the last action as the attribute `last_action`.
187187

188188
```yaml
189189
- alias: Cube event flip90
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
layout: page
3+
title: "Skybell Camera"
4+
description: "Instructions on how to integrate your Skybell HD devices within Home Assistant."
5+
date: 2017-10-03 16:00
6+
sidebar: true
7+
comments: false
8+
sharing: true
9+
footer: true
10+
logo: skybell.png
11+
ha_category: Camera
12+
ha_release: 0.56
13+
ha_iot_class: "Cloud Polling"
14+
---
15+
16+
To get your [Skybell.com](https://skybell.com/) cameras working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
17+
18+
Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
19+
20+
```yaml
21+
# Example configuration.yaml entry
22+
camera:
23+
- platform: skybell
24+
```

0 commit comments

Comments
 (0)