Merge remote-tracking branch 'origin/current' into next

This commit is contained in:
Paulus Schoutsen 2018-03-11 15:05:02 -07:00
commit b9a1dc052c
27 changed files with 144 additions and 57 deletions

View file

@ -33,9 +33,38 @@ To integrate a WebDav calendar in Home Assistant, add the following section to y
# Example configuration.yaml entry
calendar:
- platform: caldav
username: john.doe@test.com
password: !secret caldav
url: https://baikal.my-server.net/cal.php/calendars/john.doe@test.com/default
```
This example will generate default binary sensors for each calendar you have in your account. Those calendars will be `on` when there is an ongoing event and `off` if not. Events that last a whole day are ignored in those calendars. You have to setup custom calendars in order to take them into account or for advanced event filtering.
### {% linkable_title Custom calendars %}
You have the possibility to create multiple binary sensors for events that match certain conditions.
```yaml
# Example configuration.yaml entry
calendar:
- platform: caldav
username: john.doe@test.com
password: !secret caldav
url: https://baikal.my-server.net/cal.php/calendars/john.doe@test.com/default
custom_calendars:
- name: 'HomeOffice'
calendar: 'Agenda'
search: 'HomeOffice'
- name: 'WarmupFlat'
calendar: 'Agenda'
search: 'Warmup'
```
This will create two binary sensors for the calendar name Agenda: "HomeOffice" and "WarmupFlat". Those sensors will be `on` if there is an ongoing event matching the regular expression specified in `search`. In custom calendars, events that last a whole day are taken into account.
Please note that when you configure custom calendars, the default ones are not created anymore.
{% configuration %}
url:
required: true
@ -68,7 +97,7 @@ custom_calendars:
type: string
search:
required: true
pending_charges: Regular expression for filtering the events
pending_charges: Regular expression for filtering the events based on the content of their summary, description or location.
type: string
{% endconfiguration %}
@ -82,18 +111,3 @@ custom_calendars:
- **location**: The event Location.
- **start_time**: Start time of event.
- **end_time**: End time of event.
### {% linkable_title Sensor attributes %}
```yaml
# Example configuration.yaml entry
calendar:
- platform: caldav
url: https://baikal.my-server.net/cal.php/calendars/john.doe@test.com/default
username: john.doe@test.com
password: !secret caldav
custom_calendars:
- name: 'HomeOffice'
calendar: 'Agenda'
search: 'HomeOffice'
```

View file

@ -41,7 +41,6 @@ google_assistant:
aliases:
- bright lights
- entry lights
type: light
light.living_room:
expose: false
room: living room
@ -102,10 +101,6 @@ entity_config:
description: Aliases that can also be used to refer to this entity
required: false
type: list
type:
description: Override how Google Assistant interprets the domain of the entity. For example, set to `light` for a switch entity to have it be handled as a light.
required: false
type: string
room:
description: Allows for associating this device to a Room in Google Assistant. This is currently non-functional, but will be enabled in the near future.
required: false
@ -115,15 +110,16 @@ entity_config:
### {% linkable_title Available domains %}
Currently, the following domains are available to be used with Google Assistant, listed with their default types:
- group = switch (on/off)
- scene = scene (on)
- script = scene (on)
- switch = switch (on/off)
- fan = switch (on/off)
- light = light (on/off/brightness/rgb color/color temp)
- cover = switch (on/off/set position (brightness) )
- media_player = switch (on/off/set volume (brightness) )
- climate = thermostat (temperature setting)
- group (on/off)
- input boolean (on/off)
- scene (on)
- script (on)
- switch (on/off)
- fan (on/off)
- light (on/off/brightness/rgb color/color temp)
- cover (on/off/set position (via set brightness))
- media_player (on/off/set volume (via set brightness))
- climate (temperature setting)
It's very important that you use very long strings for `client_id` and `access_token`. Those are essentially the credentials to your Home Assistant instance. You can generate them with the following command:
@ -162,8 +158,8 @@ If you're not using Linux, you can use sites such as [this one](https://www.brow
3. Create a new project in the [developer console](https://console.actions.google.com/).
a. Add/Import project
b. Go to Build under the Actions SDK box
c. Copy the command that looks like:
c. Copy the command that looks like:
`gactions update --action_package PACKAGE_NAME --project doctest-2d0b8`
4. Replace `PACKAGE_NAME` with `project.json` and run that command in a console from the same directory you saved `project.json` in (you'll need to put `./` before `gactions` so that it reads `./gactions` if you're running it on Linux or Windows). It should output a URL like `https://console.actions.google.com/project/doctest-2d0b8/overview` - go there.
5. You'll need to fill out most of the information on that page, but none of it really matters since you won't be addressing the App directly, only through the Smart Home functionality built into Google Assistant.

View file

@ -15,7 +15,7 @@ ha_release: 0.25
The `panel_iframe` support allows you to add additional panels to your Home Assistant frontend. The panels are listed in the sidebar and can contain external resources like the web frontend of your router, your monitoring system, or your media server.
<p class='note warning'>If you are accessing home Assistant over HTTPS using SSL, you cannot access HTTP sites through an iframe panel.</p>
<p class='note warning'>If you are accessing Home Assistant over HTTPS using SSL, you cannot access HTTP sites through an iframe panel.</p>
To enable Panel iFrames in your installation, add the following to your `configuration.yaml` file:

View file

@ -67,5 +67,3 @@ Choose <img src='/images/screenshots/developer-tool-services-icon.png' alt='serv
}
```
This will create the notification entry shown above.
NOTE: if you have defined a ```default_view:``` in your ```Groups:``` configuration you will need to include ```persistent_notification.<notification_id>``` e.g. ```persistent_notification.1234``` as per the example above, to your Groups configuration, in order to see the notification after creating it.

View file

@ -13,7 +13,7 @@ ha_iot_class: "Local Polling"
ha_release: 0.64
---
Sensor for monitoring the contents of a folder. Note that folder paths must be added to [whitelist_external_dirs](https://home-assistant.io/docs/configuration/basic/). Optionally a [wildcard filter]((http://tldp.org/LDP/GNU-Linux-Tools-Summary/html/x11655.htm)) can be applied to the files considered within the folder. The state of the sensor is the size in MB of files within the folder that meet the filter criteria. The number of filtered files in the folder and total size in bytes of those files are exposed as attributes.
Sensor for monitoring the contents of a folder. Note that folder paths must be added to [whitelist_external_dirs](https://home-assistant.io/docs/configuration/basic/). Optionally a [wildcard filter](https://docs.python.org/3.6/library/fnmatch.html) can be applied to the files considered within the folder. The state of the sensor is the size in MB of files within the folder that meet the filter criteria. The number of filtered files in the folder and total size in bytes of those files are exposed as attributes.
To enable the `folder` sensor in your installation, add the following to your `configuration.yaml` file:

View file

@ -22,6 +22,7 @@ weblink:
entities:
- name: Router
url: http://192.168.1.1/
icon: mdi:router-wireless
- name: Home Assistant
url: https://home-assistant.io
- name: Grafana