Skip to content

Commit 31c4114

Browse files
committed
Merge remote-tracking branch 'origin/current' into next
2 parents 65ab88c + 0591667 commit 31c4114

Some content is hidden

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

54 files changed

+1142
-290
lines changed

_config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@ social:
139139

140140
# Home Assistant release details
141141
current_major_version: 0
142-
current_minor_version: 67
142+
current_minor_version: 68
143143
current_patch_version: 1
144-
date_released: 2018-04-17
144+
date_released: 2018-04-30
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.
148148
# Major release:
149-
patch_version_notes: "#release-0671---april-17"
149+
patch_version_notes: "#release-0681---april-30"
150150
# Minor release (Example #release-0431---april-25):
151151

152152
# Date we moved to Discourse for comments

source/_addons/lets_encrypt.markdown

+21-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: page
33
title: "Let's Encrypt"
44
description: "Automatically manage your SSL certificate using Let's Encrypt."
5-
date: 2017-04-30 13:28
5+
date: 2018-04-18 10:55
66
sidebar: true
77
comments: false
88
sharing: true
@@ -41,4 +41,24 @@ http:
4141
4242
If you use another port such as `8123` or an SSL proxy, change the port number.
4343

44+
## {% linkable_title Enabling auto-renewals %}
45+
46+
Out of the box, the add-on will not automatically renew your certificate. In fact, it only starts, tries to get/renew your certificte, and then stops. It's up to you to manually start it again whenever your certificate comes close to expiry.
47+
48+
However, you can automate this process using Home Assistant.
49+
50+
Use this in your `automations.yaml` to attempt certificate renewal each day at midnight:
51+
52+
```yaml
53+
- id: letsencrypt-renewal
54+
alias: "Let's Encrypt Renewal"
55+
trigger:
56+
- platform: time
57+
at: '00:00:00'
58+
action:
59+
- service: hassio.addon_restart
60+
data:
61+
addon: core_letsencrypt
62+
```
63+
4464
[DuckDNS add-on]: /addons/duckdns/

source/_addons/snips.markdown

+66-39
Original file line numberDiff line numberDiff line change
@@ -2,89 +2,116 @@
22
layout: page
33
title: "Snips.ai"
44
description: "Enhance your Hass.io installation with a local voice assistant."
5-
date: 2018-03-22 13:28
5+
date: 2018-05-02 13:28
66
sidebar: true
77
comments: false
88
sharing: true
99
footer: true
1010
---
1111

12-
[Snips.ai] is an AI-powered voice assistant that runs on the Raspberry Pi 3 and x86 platforms. It runs on-device and is Private by Design.
12+
[Snips.ai](https://snips.ai/) is an AI-powered voice assistant that runs on the Raspberry Pi 3 and x86 platforms. It runs on-device and is Private by Design.
1313

1414
The Snips add-on depends on the Mosquitto add on to bridge to Home Assistant, so make sure that is installed.
1515

1616
HomeAssistant comes with certain Intents builtin to handle common tasks. A complete list of Intents can be found in this wiki [Hass Snips Bundle](https://github.com/tschmidty69/hass-snips-bundle-intents/wiki).
1717

1818
The Snips addon by default comes with an assistant that allows you to turn on lights or switches, open covers, or add and list items to a shopping list if that component is enabled.
1919

20-
If using a USB microphone and speakers plugged into the raspberry pi output, Snips will work without any change to the configuration. Trying saying things like:
20+
If using a USB microphone and speakers plugged into the Raspberry Pi output, Snips will work without any change to the configuration. Trying saying things like:
2121

2222
```
2323
Turn on kitchen light
2424
Open garage door
2525
What is on my shopping list
2626
```
2727

28-
To get started creating your own configuration, follow [their tutorial](https://github.com/snipsco/snips-platform-documentation/wiki/2.-Create-an-assistant-using-an-existing-bundle) to create an assistant and download the training data. You can add the HomeAssistant bundle to your assistant to enable the built-in intents, and add or create your own intents to do more complex tasks.
29-
30-
Now install and activate the [Samba] add-on so you can upload your training data. Connect to the "share" Samba share and copy your training data over. Name the file `assistant.zip`.
31-
32-
Now it's time to start Snips for the first time. When the Snips add-on starts, it will output your audio devices. If you are using a USB mic and the raspberry pi output, you won't need to change anything:
33-
34-
```text
35-
**** List of PLAYBACK Hardware Devices ****
36-
card 0: ALSA [bcm2835 ALSA], device 0: bcm2835 ALSA [bcm2835 ALSA]
37-
Subdevices: 8/8
38-
Subdevice #0: subdevice #0
39-
Subdevice #1: subdevice #1
40-
Subdevice #2: subdevice #2
41-
Subdevice #3: subdevice #3
42-
Subdevice #4: subdevice #4
43-
Subdevice #5: subdevice #5
44-
Subdevice #6: subdevice #6
45-
Subdevice #7: subdevice #7
46-
card 0: ALSA [bcm2835 ALSA], device 1: bcm2835 ALSA [bcm2835 IEC958/HDMI]
47-
Subdevices: 1/1
48-
Subdevice #0: subdevice #0
49-
```
50-
51-
You need to use this information to point the add-on at the right speakers and microphone. The information describes different cards and devices. On a Raspberry Pi 3, card 0 - device 0 is the built-in headset port, card 0 - device 1 is the HDMI port. In the example above, the USB microphone showed up as card 1 - device 0.
28+
To get started creating your own configuration, follow [their tutorial](https://snips.gitbook.io/documentation/console) to create an assistant and download the training data. You can also add the HomeAssistant Skill to your assistant to enable the built-in intents, and add or create your own intents to do more complex tasks.
5229

53-
Find the microphone and speakers that you want to use and note down their device and card number. We will need that to configure the add-on options `mic` (microphone to use) and `speaker` (speaker to use). The format for these options is `<card #>,<device #>`. Change the configuration options and click save.
30+
Now install and activate the [Samba](/addons/samba/) add-on so you can upload your training data. Connect to the "share" Samba share and copy your assistant over. Name the file `assistant.zip` or whatever you have configured in the configuration options.
5431

55-
Now start the add-on.
32+
Now it's time to start Snips for the first time. You can configure the microphone and sound card using the Add-on interface. Now start the add-on.
5633

57-
### Add-On configuration
34+
### {% linkable_title Add-On configuration %}
5835

5936
```json
6037
{
61-
"mic": "1,0",
62-
"speaker": "1,0",
63-
"assistant": "assistant.zip",
6438
"mqtt_bridge": {
6539
"active": true,
6640
"host": "172.17.0.1",
6741
"port": 1883,
6842
"user": "",
6943
"password": ""
7044
},
45+
"assistant": "assistant.zip",
46+
"language": "en",
47+
"custom_tts": false,
48+
"tts_platform": "amazon_polly"
7149
}
7250
```
7351

7452
Configuration variables:
7553

76-
- **mqtt_bridge** : Snips uses MQTT to communicate and defaults to their own broker. Use this config option to bridge their broker to your the Mosquitto add-on.
77-
- **mic**: This is the hardware address of your microphone. Look at the Snips output if you are using different hardware.
54+
- **mqtt_bridge**: Snips uses MQTT to communicate and defaults to their own broker. Use this config option to bridge their broker to your the Mosquitto add-on.
55+
- **assistant**: The name of your custom assistant in `/share`. If no assistant is found then a default assistant will be used.
56+
- **language**: Language. This is used to select the default custom assistant, Currently `en`, `de` and `fr` are supported.
57+
- **custom_tts**: Whether to use a TTS provider from Home Assistant for a variety of voices.
58+
- **tts_platform**: Which TTS platform to use.
7859

7960
### {% linkable_title Home Assistant configuration %}
8061

81-
Use the Home Assistant [Snips.ai component][comp] to integrate the add-on into Home Assistant.
62+
A simple configuration just requires this. Consult [Snips.ai component](/components/snips/) for more options.
8263

8364
```yaml
8465
snips:
8566
```
8667
87-
[Snips.ai]: https://snips.ai/
68+
### {% linkable_title Home Assistant configuration %}
69+
70+
There is an active [discord](https://discordapp.com/invite/3939Kqx) channel for further support.
71+
72+
### {% linkable_title Examples %}
73+
74+
So now you can turn lights on and off, let's check the weather. Log on to the [console](https://console.snips.ai/). If this is your first time, create a new assistant and add the Home Assistant skill, along with the Weather skill by snips. Download your assistant manually and copy it to the `/share` folder on your HassIO installation using the Samba addon.
75+
76+
Next create a weather sensor, e.g., one for (Dark Sky)[/components/sensor.darksky/] and put the `api_key` in your `secrets.yaml` file.
77+
78+
```yaml
79+
- platform: darksky
80+
name: "Dark Sky Weather"
81+
api_key: !secret dark_sky_key
82+
update_interval:
83+
minutes: 10
84+
monitored_conditions:
85+
- summary
86+
- hourly_summary
87+
- temperature
88+
- temperature_max
89+
- temperature_min
90+
```
91+
Next add this to your `configuration.yaml` file to reference a new `intent_script` component. This is a good practice to [split your configuration files](/docs/configuration/splitting_configuration/) up.
92+
93+
```yaml
94+
intent_script: !include intent_script.yaml
95+
```
96+
97+
Finally, create this `intent_script.yaml` file in your configuration directory.
98+
99+
{% raw %}
100+
```yaml
101+
searchWeatherForecast:
102+
speech:
103+
type: plain
104+
text: >
105+
The weather is currently
106+
{{ states('sensor.dark_sky_weather_temperature') | round(0) }}
107+
degrees outside and {{ states('sensor.dark_sky_weather_summary') }}.
108+
The high today will be
109+
{{ states('sensor.dark_sky_weather_daily_high_temperature') | round(0)}}
110+
and {{ states('sensor.dark_sky_weather_hourly_summary') }}
111+
```
112+
{% endraw %}
113+
114+
Now just restart HassIO and ask it what the weather is like.
115+
88116
[their tutorial]: https://github.com/snipsco/snips-platform-documentation/wiki/2.-Create-an-assistant-using-an-existing-bundle
89-
[Samba]: /addons/samba/
90-
[comp]: /components/snips/
117+

source/_components/alarm_control_panel.alarmdecoder.markdown

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ The Alarm Decoder component gives you access to several services for you to cont
2727
- `alarm_disarm`: Disarms the alarm from any state. Also clears a `check_zone` flag after an alarm was triggered.
2828
- `alarmdecoder_alarm_toggle_chime`: Toggles the alarm's chime state.
2929

30-
**Note**: `alarm_arm_custom_bypass` and `alarm_trigger`, while available in the services list in Home Assistant, are not currently implemented in the Alarm Decoder component.
30+
<p class='note'>
31+
`alarm_arm_custom_bypass` and `alarm_trigger`, while available in the services list in Home Assistant, are not currently implemented in the Alarm Decoder platform.
32+
</p>
3133

3234
### {% linkable_title Attributes %}
3335

source/_components/binary_sensor.hive.markdown

+5-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ ha_iot_class: "Cloud Polling"
1414
---
1515

1616

17-
The 'hive' binary sensor component integrates your Hive sensors into Home Assistant.
17+
The `hive` binary sensor component integrates your Hive sensors into Home Assistant.
1818

19-
The Hive binary sensor component supports the following Hive products:
20-
- **Hive Window or Door Sensor**
21-
- **Hive Motion Sensor**
19+
The platform supports the following Hive products:
20+
21+
- Hive Window or Door Sensor
22+
- Hive Motion Sensor
2223

2324

2425
<p class='note'>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
layout: page
3+
title: "QwikSwitch Binary Sensor"
4+
description: "Instructions on how to integrate Qwikswitch dimmers and relays as sensors into Home Assistant."
5+
date: 2016-05-04 00:00
6+
sidebar: true
7+
comments: false
8+
sharing: true
9+
footer: true
10+
logo: qwikswitch.png
11+
ha_category: Sensor
12+
ha_iot_class: "Local Push"
13+
ha_release: "0.68"
14+
---
15+
16+
The `qwikswitch` binary_sensor platform allows you to use your [QwikSwitch](http://www.qwikswitch.co.za/) sensors within Home Assistant.
17+
18+
The platform is configured through the [QwikSwitch component](/components/qwikswitch/).

source/_components/binary_sensor.random.markdown

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ha_release: 0.57
1616

1717
The `random` binary sensor platform is creating random states (`True`, 1, `on` or `False`, 0, `off`). This can be useful if you want to test automation rules. It generates a new state every time it is polled.
1818

19+
## {% linkable_title Configuration %}
20+
1921
To enable the random binary sensor, add the following lines to your `configuration.yaml`:
2022

2123
```yaml

source/_components/binary_sensor.workday.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To enable the `workday` sensor in your installation, add the following to your `
2626
binary_sensor:
2727
- platform: workday
2828
country: DE
29-
workdays: [ mon, wed, fri ]
29+
workdays: [mon, wed, fri]
3030
```
3131
3232
Configuration variables:

source/_components/calendar.google.markdown

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ha_release: 0.33
1616

1717
The `google` calendar platform allows you to connect to your [Google Calendars](https://calendar.google.com) and generate binary sensors. The sensors created can trigger based on any event on the calendar or only for matching events. When you first setup this component it will generate a new configuration file `google_calendars.yaml` that will contain information about all of the calendars you can see.
1818

19-
### {% linkable_title Prerequisites %}
19+
## {% linkable_title Prerequisites %}
2020

2121
Generate a Client ID and Client Secret on [Google Developers Console](https://console.developers.google.com/start/api?id=calendar).
2222

@@ -30,7 +30,7 @@ Generate a Client ID and Client Secret on [Google Developers Console](https://co
3030
1. Save the client ID and secret as you will need to put these in your `configuration.yaml` file.
3131
1. Click on "Library", search for "Google Calendar API" and enable it.
3232

33-
### {% linkable_title Basic Setup %}
33+
## {% linkable_title Configuration %}
3434

3535
To integrate Google Calendar in Home Assistant, add the following section to your `configuration.yaml` file:
3636

@@ -61,7 +61,7 @@ The next steps will require you to have Home Assistant running.
6161
6262
After you have it running complete the Google authentication that pops up. It will give you a URL and a code to enter. This will grant your Home Assistant service access to all the Google Calendars that the account you authenticate with can read. This is a Read-Only view of these calendars.
6363
64-
### {% linkable_title Calendar Configuration %}
64+
## {% linkable_title Calendar Configuration %}
6565
6666
Editing the `google_calendars.yaml` file.
6767

source/_components/camera.local_file.markdown

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: page
33
title: "Local File"
4-
description: "Instructions on how to use Local File as a Camera within Home Assistant."
4+
description: "Instructions how to use Local File as a Camera within Home Assistant."
55
date: 2016-06-12 17:00
66
sidebar: true
77
comments: false
@@ -13,9 +13,9 @@ ha_iot_class: "Local Polling"
1313
ha_release: 0.22
1414
---
1515

16-
The `local_file` camera platform allows you to integrate any readable image file from disk into Home Assistant as a camera. If the image is updated on the file system the image displayed in Home Assistant will also be updated.
16+
The `local_file` camera platform allows you to integrate an image file from disk into Home Assistant as a camera. If the image is updated on the file system the image displayed in Home Assistant will also be updated. The service `local_file_update_file_path` can be used to update the image using an automation.
1717

18-
This can for example be used with various camera platforms that save a temporary images locally. It can also be used to display a graph that you render periodically and will then be displayed in Home Assistant.
18+
The `local_file` camera can for example be used with various camera platforms that save a temporary images locally. It can also be used to display a graph that you render periodically and will then be displayed in Home Assistant.
1919

2020
To enable this camera in your installation, add the following to your `configuration.yaml` file:
2121

@@ -31,7 +31,11 @@ Configuration variables:
3131
- **file_path** (*Required*): File to serve as the camera.
3232
- **name** (*Optional*): Name of the camera
3333
34-
<p class='note'>
35-
The given `file_path` must be an existing file because the camera platform setup make a readable check on it.
36-
</p>
34+
### {% linkable_title Service `camera.local_file_update_file_path` %}
3735

36+
Use this service to change the file displayed by the camera.
37+
38+
| Service data attribute | Description |
39+
| -----------------------| ----------- |
40+
| `entity_id` | String of the `entity_id` of the camera to update. |
41+
| `file_path` | The full path to the new image file to be displayed. |

source/_components/climate.hive.markdown

+7-5
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ ha_iot_class: "Cloud Polling"
1414
---
1515

1616

17-
The 'hive' climate component integrates your Hive thermostat and hot water into Home Assistant, enabling control of setting the **mode** and setting the **target temperature**.
17+
The `hive` climate platform integrates your Hive thermostat and hot water into Home Assistant, enabling control of setting the **mode** and setting the **target temperature**.
18+
1819
A short boost for Hive Heating or Hive Hot water can be set by using the **Aux Heat** function, this will turn on the boost feature for Hive Heating or Hive Hot water for 30 minutes at 0.5 degrees higher than the current temperature.
1920

20-
The Hive climate component supports the following Hive products:
21-
- **Hive Active Heating**
22-
- **Hive Multizone**
23-
- **Hot water control**
21+
The platform supports the following Hive products:
22+
23+
- Hive Active Heating
24+
- Hive Multizone
25+
- Hot water control
2426

2527

2628
<p class='note'>

source/_components/deconz.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ha_iot_class: "Local Push"
3434

3535
Home Assistant will automatically discover deCONZ presence on your network, if `discovery:` is present in your `configuration.yaml` file.
3636

37-
If you don't have the API key, you can generate an API key for deCONZ by using the one-click functionality similar to Philips Hue. Go to **Menu** -> **Settings** -> **Unlock Gateway** in deCONZ and then use the deCONZ configurator in Home Assistant frontend to create an API key. When you've generated the API key from Home Assistant, the API key will be stored in `deconz.conf` inside the `.homeassistant` folder.
37+
If you don't have the API key, you can generate an API key for deCONZ by using the one-click functionality similar to Philips Hue. Go to **Menu** -> **Settings** -> **Unlock Gateway** in deCONZ and then use the deCONZ configurator in Home Assistant frontend to create an API key. When you've generated the API key from Home Assistant, the API key will be stored in `.config_entries.json` inside the `.homeassistant` folder.
3838

3939
You can add the following to your configuration.yaml file if you are not using the `discovery:` component:
4040

source/_components/device_tracker.google_maps.markdown

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ To integrate Google Maps Location Sharing in Home Assistant, add the following s
2929
```yaml
3030
# Example configuration.yaml entry
3131
device_tracker:
32-
platform: google_maps
33-
34-
password: password
32+
- platform: google_maps
33+
username: YOUR_USERNAME
34+
password: YOUR_PASSWORD
3535
```
3636
3737
{% configuration %}

source/_components/device_tracker.markdown

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ The following optional parameters can be used with any platform. However device
4040
| `consider_home` | 180 | Seconds to wait till marking someone as not home after not being seen. This parameter is most useful for households with Apple iOS devices that go into sleep mode while still at home to conserve battery life. iPhones will occasionally drop off the network and then re-appear. `consider_home` helps prevent false alarms in presence detection when using IP scanners such as Nmap. `consider_home` accepts various time representations, (e.g., the following all represents 3 minutes: `180`, `0:03`, `0:03:00`) |
4141
| `new_device_defaults`| | Default values for new discovered devices. Available options `track_new_devices` (default: `True`), `hide_if_away` (default: `False`) |
4242

43+
<p class='note'>
44+
Note that setting `track_new_devices: False` will still result in new devices being recorded in `known_devices.yaml`, but they won't be tracked (`track: no`).
45+
</p>
46+
4347
The extended example from above would look like the following sample:
4448

4549
```yaml

0 commit comments

Comments
 (0)