Skip to content

Commit

Permalink
Merge branch 'current' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
balloob committed May 16, 2019
2 parents 11518c7 + 0c607da commit b651334
Show file tree
Hide file tree
Showing 15 changed files with 870 additions and 36 deletions.
6 changes: 3 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ social:

# Home Assistant release details
current_major_version: 0
current_minor_version: 92
current_patch_version: 2
date_released: 2019-05-02
current_minor_version: 93
current_patch_version: 0
date_released: 2019-05-16

# Either # or the anchor link to latest release notes in the blog post.
# Must be prefixed with a # and have double quotes around it.
Expand Down
2 changes: 1 addition & 1 deletion source/_components/ambient_station.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ via personal weather stations from [Ambient Weather](https://ambientweather.net)

Using this component requires both an Application Key and an API Key. To
generate both, simply utilize the profile section of
[your Ambient Weather dashboard](https:/dashboard.ambientweather.net).
[your Ambient Weather dashboard](https://dashboard.ambientweather.net).

## {% linkable_title Configuration %}

Expand Down
1 change: 1 addition & 0 deletions source/_components/denonavr.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Supported devices:
- Denon AVR-X2100W
- Denon AVR-X4100W
- Denon AVR-X4300H
- Denon AVR-X4500H
- Denon AVR-1912
- Denon AVR-2312CI
- Denon AVR-3311CI
Expand Down
2 changes: 1 addition & 1 deletion source/_components/device_tracker.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ If you want to track whether either your GPS based tracker or your local network

## {% linkable_title Device states %}

The state of your tracked device will be `'home'` if it is in the [home zone](/components/zone#home-zone), detected by your network or Bluetooth based presence detection. If you're using a presence detection method that includes coordinates then when it's in a zone the state will be the name of the zone (in lower case). When a device isn't at home and isn't in any zone, the state will be `'not_home'`.
The state of your tracked device will be `'home'` if it is in the [home zone](/components/zone#home-zone), detected by your network or Bluetooth based presence detection. If you're using a presence detection method that includes coordinates then when it's in a zone the state will be the name of the zone (case sensitive). When a device isn't at home and isn't in any zone, the state will be `'not_home'`.

## {% linkable_title `device_tracker.see` service %}

Expand Down
20 changes: 11 additions & 9 deletions source/_components/ecobee.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,24 @@ Now login to the regular consumer portal, and in the hamburger menu there will b

Now under the Name and Summary Section you will have an API key. Copy this key and use it in you configuration section below. Click the **X** to close the Developer section.

The first time you run Home Assistant with this component it will give you a PIN code that you need to authorize in the [ecobee consumer portal](https://www.ecobee.com/consumerportal/index.html). You can do this by clicking **Add Application** in the **My Apps** section in the sidebar.

The PIN can be found from the Home Assistant portal on the Ecobee card or from the **configurator.ecobee** entity in states in the portal.

- If you do not have an ecobee card, you may be using groups with `default_view` that don't show the card. To get around this you can temporarily comment out the `default_view` section or add the `configurator.ecobee` component to your `default_view` and restart Home Assistant.

Once you enter the PIN on the ecobee site, wait approximately 5 minutes and then click on the **I have authorized the app** link at the bottom of the ecobee pop-up window. If everything worked correctly, you should now be able to restart Home Assistant again to see the full ecobee card with all of the sensors populated or see the list of sensors in the developer tools. Now you can re-enable your `default_view` (if you had to disable it) and add the ecobee sensors to a group and/or view.

To set it up, add the following information to your `configuration.yaml` file:
To add the Ecobee component to Home Assistant, add the following information to your [`configuration.yaml`](/docs/configuration/) file:

```yaml
# Example configuration.yaml entry
ecobee:
api_key: YOUR_API_KEY
```
[Restart Home Assistant](https://www.home-assistant.io/docs/configuration/#reloading-changes) for the changes to take effect.
The first time you (re)run Home Assistant with this component it will give you a PIN code that you need to authorize in the [ecobee consumer portal](https://www.ecobee.com/consumerportal/index.html). You can do this by clicking **Add Application** in the **My Apps** section in the sidebar.
The PIN can be found from the Home Assistant portal on the Ecobee card or from the **configurator.ecobee** entity in states in the portal.
- If you do not have an ecobee card, you may be using groups with `default_view` that don't show the card. To get around this you can temporarily comment out the `default_view` section or add the `configurator.ecobee` component to your `default_view` and restart Home Assistant.

Once you enter the PIN on the ecobee site, wait approximately 5 minutes and then click on the **I have authorized the app** link at the bottom of the ecobee pop-up window. If everything worked correctly, you should now be able to restart Home Assistant again to see the full ecobee card with all of the sensors populated or see the list of sensors in the developer tools. Now you can re-enable your `default_view` (if you had to disable it) and add the ecobee sensors to a group and/or view.

{% configuration %}
api_key:
description: Your ecobee API key. This is only needed for the initial setup of the component. Once registered it can be removed. If you revoke the key in the ecobee portal you will need to update this again and remove the ecobee.conf file in the `.homeassistant` configuration path.
Expand Down
6 changes: 3 additions & 3 deletions source/_components/netatmo.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ redirect_from:
The `netatmo` component platform is the main component to integrate all Netatmo related platforms.

There is currently support for the following device types within Home Assistant:

- [Binary Sensor](#binary-sensor)
- [Camera](#camera)
- [Climate](#climate)
Expand Down Expand Up @@ -221,7 +221,7 @@ The `netatmo` camera platform is consuming the information provided by a [Netatm

### {% linkable_title Camera Advanced configuration %}

If you want to select a specific camera,
If you want to select a specific camera,
set discovery to `false` for [netatmo](/components/netatmo/)
and add the following lines to your `configuration.yaml`:

Expand Down Expand Up @@ -269,7 +269,7 @@ The `netatmo` thermostat platform is consuming the information provided by a [Ne

### {% linkable_title Camera Advanced configuration %}

If you want to select specific homes or specific rooms,
If you want to select specific homes or specific rooms,
set discovery to `false` for [netatmo](/components/netatmo/)
and add the following lines to your `configuration.yaml`:

Expand Down
2 changes: 1 addition & 1 deletion source/_components/rpi_gpio.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ invert_logic:
type: boolean
{% endconfiguration %}

For more details about the GPIO layout, visit the Wikipedia [article](https://en.wikipedia.org/wiki/Raspberry_Pi#GPIO_connector) about the Raspberry Pi.
For more details about the GPIO layout, visit the Wikipedia [article](https://en.wikipedia.org/wiki/Raspberry_Pi#General_purpose_input-output_(GPIO)_connector) about the Raspberry Pi.

<p class='note warning'>
Note that a pin managed by HASS is expected to be exclusive to HASS.
Expand Down
2 changes: 1 addition & 1 deletion source/_components/telegram_bot.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Send a photo.
| `password` | yes | Password for a URL which requires HTTP basic authentication. |
| `authentication` | yes | Define which authentication method to use. Set to `digest` to use HTTP digest authentication. Defaults to `basic`. |
| `target` | yes | An array of pre-authorized chat_ids or user_ids to send the notification to. Defaults to the first allowed chat_id. |
| `disable_notification | yes | True/false for send the message silently. iOS users and web users will not receive a notification, Android users will receive a notification with no sound. Defaults to False. |
| `disable_notification` | yes | True/false for send the message silently. iOS users and web users will not receive a notification, Android users will receive a notification with no sound. Defaults to False. |
| `verify_ssl` | yes | True/false for checking the SSL certificate of the server for HTTPS URLs. Defaults to True. |
| `keyboard` | yes | List of rows of commands, comma-separated, to make a custom keyboard. `[]` to reset to no custom keyboard. Example: `["/command1, /command2", "/command3"]` |
| `inline_keyboard` | yes | List of rows of commands, comma-separated, to make a custom inline keyboard with buttons with associated callback data. Example: `["/button1, /button2", "/button3"]` or `[[["Text btn1", "/button1"], ["Text btn2", "/button2"]], [["Text btn3", "/button3"]]]` |
Expand Down
2 changes: 1 addition & 1 deletion source/_components/twilio_call.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ automation:
platform: sun
event: sunset
action:
service: notify.twilio_sms
service: notify.twilio_call
data:
message: 'The sun has set'
target:
Expand Down
2 changes: 1 addition & 1 deletion source/_docs/scripts.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ You can also get the script to abort after the timeout by using `continue_on_tim

{% raw %}
```yaml
# Wait until a valve is < 10 or continue after 1 minute.
# Wait until a valve is < 10 or abort after 1 minute.
- wait_template: "{{ states.climate.kitchen.attributes.valve|int < 10 }}"
timeout: '00:01:00'
continue_on_timeout: 'false'
Expand Down
4 changes: 2 additions & 2 deletions source/_lovelace/history-graph.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ History graph is a basic card, allowing you to display a graph for each of the e

<p class='img'>
<img src='/images/lovelace/lovelace_history_graph.png' alt='Screenshot of the history graph card for entities without a unit_of_measurement'>
Screenshot of the history graph card, when no `unit_of_measurement` is defined.
Screenshot of the history graph card, when the sensor has no `unit_of_measurement` defined.
</p>

<p class='img'>
<img src='/images/lovelace/lovelace_history_graph_lines.png' alt='Screenshot of the history graph card for entities with a unit_of_measurement'>
Screenshot of the history graph card, when a `unit_of_measurement` is defined.
Screenshot of the history graph card, when the sensor has a `unit_of_measurement` defined.
</p>

{% configuration %}
Expand Down
Loading

0 comments on commit b651334

Please sign in to comment.