Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2017-05-24 16:31:52 -07:00
commit be219c8d59
24 changed files with 307 additions and 86 deletions

View file

@ -29,7 +29,7 @@ axis:
- camera
- motion
- pir
- audio
- sound
- daynight
trigger_time: 0
location: köket

View file

@ -19,7 +19,7 @@ The `mqtt` binary sensor platform uses the MQTT message payload as the sensor va
To use your MQTT binary sensor in your installation, add the following to your `configuration.yaml` file:
```yaml
# Example configuration.yml entry
# Example configuration.yaml entry
binary_sensor:
- platform: mqtt
state_topic: "home-assistant/window/contact"
@ -44,7 +44,7 @@ $ mosquitto_pub -h 127.0.0.1 -t home-assistant/window/contact -m "OFF"
An extended configuration for the same sensor could look like this if you want/need to be more specific.
```yaml
# Example configuration.yml entry
# Example configuration.yaml entry
binary_sensor:
- platform: mqtt
state_topic: "home-assistant/window/contact"

View file

@ -38,10 +38,12 @@ binary_sensor:
### {% linkable_title Setup of the myStrom Buttons %}
After the Wifi Buttons are connected to your Wireless network, you have three minutes to set the actions for the push patterns. The fastest way is to use `curl`. Check the [documentation](https://mystrom.ch/wp-content/uploads/REST_API_WBP.txt) of the WiFi Button for further details about implementation (`http://` is replaced by `get://` or `post://`). `action` is the name of the corresponding push pattern.
You need to configure every button to make it work with Home Assistant. First connect the Wifi Buttons to your wireless network. Keep in mind that they only support WPS (Wi-FI Protected Setup). Once a button is connected you have three minutes to set the actions for the push patterns. The fastest way is to use `curl`. Check the [documentation](https://mystrom.ch/wp-content/uploads/REST_API_WBP.txt) of the WiFi Button for further details about the implementation (`http://` is replaced by `get://` or `post://`). `action` is the name of the corresponding push pattern (see above).
The endpoint that is recieving the data is `[IP address Home Assistant]:8123/api/mystrom`.
```bash
$ curl -d "[action]=get://[IP address Home Assistant]:8123/api/mystrom?single%3D[ID of the button]" http://[IP address of the button]/api/v1/device/[MAC address of the button]
$ curl -d "[action]=get://[IP address Home Assistant]:8123/api/mystrom?[action]%3D[ID of the button]" http://[IP address of the button]/api/v1/device/[MAC address of the button]
{
"[MAC address of the button]": {
"type": "button",
@ -51,7 +53,7 @@ $ curl -d "[action]=get://[IP address Home Assistant]:8123/api/mystrom?single%3D
"charge": true,
"voltage": 4.292,
"fw_version": "2.26",
"single": "get://[IP address Home Assistant]:8123/api/mystrom?single=[if of the button]",
"single": "get://[IP address Home Assistant]:8123/api/mystrom?single=[id of the button]",
"double": "",
"long": "",
"touch": ""

View file

@ -11,6 +11,7 @@ logo: home-assistant.png
ha_category: Image Processing
featured: false
ha_release: 0.45
og_image: /images/screenshots/ssocr.png
---
The `seven_segments` image processing platform allows you to read physical seven segments displays through Home Assistant. [`ssocr`](https://www.unix-ag.uni-kl.de/~auerswal/ssocr/) is used to extract the value shown on the display which is observed by a [camera](/components/camera/). `ssocr` need to be available on your system. Check the installation instruction for Fedora below or use `$ sudo apt-get install ssocr` on a Debian-based system:
@ -35,7 +36,7 @@ image_processing:
Configuration variables:
- **ssocr_bin** (*Optional*): The command line tool `ssocr`. Set it if you use a different name for the executable. Defaults to `ssorc`.
- **ssocr_bin** (*Optional*): The command line tool `ssocr`. Set it if you use a different name for the executable. Defaults to `ssocr`.
- **x_position** (*Optional*): X coordinate of the upper left corner of the area to crop. Defaults to `0`.
- **y_position** (*Optional*): Y coordinate of the upper left corner of the area to crop. Defaults to `0`.
- **height** (*Optional*): Height of the area to crop. Defaults to `0`.

View file

@ -33,7 +33,7 @@ kira:
host: 0.0.0.0
port: 65432
remotes:
name: kira_remote
- name: kira_remote
host: 192.168.100.1
port: 65432
```

View file

@ -21,12 +21,15 @@ Supported devices:
- Denon DRA-N5
- Denon RCD-N8 (untested)
- Denon RCD-N9 (partial support)
- Denon AVR receivers with Integrated Network support (partial support)
- Denon AVR receivers with integrated Network support (partial support)
- Denon AVR-X4100W (via denonavr platform)
- Denon AVR receivers (via denonavr platform (untested))
- Marantz M-RC610 (via denonavr platform)
- Marantz receivers (experimental via denonavr platform)
<pre class='note'>
If you have something else using the IP controller for your Denon AVR 3808CI, such as your URC controller, it will not work! There is either a bug or security issue with some models where only one device could be controlling the IP functionality.
</pre>
To add a Denon Network Receiver to your installation, add the following to your `configuration.yaml` file:

View file

@ -27,6 +27,7 @@ Configuration variables:
- **host** (*Required*): The host FQDN (or IP) to retrieve certificate from.
- **port** (*Optional*): The port number where the server is running. Defaults to `443`.
- **name** (*Optional*): The friendly name for the certificate.
<p class='note warning'>
Make sure that the URL exactly matches your endpoint or resource.

View file

@ -14,7 +14,7 @@ ha_release: 0.45
---
The `file` sensor platform reading the entries from a plain-text file and shows the found value. Only the last line of the file is used. This is similar to do `$ tail -n 1 sensor.txt` on the command-line.
The `file` sensor platform reads the entries from a plain-text file and shows the found value. Only the last line of the file is used. This is similar to do `$ tail -n 1 sensor.txt` on the command-line.
To enable the `file` sensor, add the following lines to your `configuration.yaml`:

View file

@ -8,6 +8,7 @@ comments: false
sharing: true
footer: true
logo: telegram.png
ha_category: Hub
ha_release: 0.42
---
@ -258,8 +259,8 @@ Text repeater:
- service: telegram_bot.send_message
data_template:
title: '*Dumb automation*'
target: '{{ trigger.event.data.user_id }}'
message: 'You said: ``` {{ trigger.event.data.text }} ```'
target: {% raw %}'{{ trigger.event.data.user_id }}'{% endraw %}
message: 'You said: {% raw %}{{ trigger.event.data.text }}{% endraw %}'
disable_notification: true
inline_keyboard:
- '/edit,/NO'
@ -283,16 +284,16 @@ Message editor:
show_alert: true
- service: telegram_bot.edit_message
data_template:
message_id: '{{ trigger.event.data.message.message_id }}'
chat_id: '{{ trigger.event.data.user_id }}'
message_id: {% raw %}'{{ trigger.event.data.message.message_id }}'{% endraw %}
chat_id: {% raw %}'{{ trigger.event.data.user_id }}'{% endraw %}
title: '*Message edit*'
inline_keyboard:
- '/edit,/NO'
- '/remove button'
message: >
Callback received from {{ trigger.event.data.from_first }}.
Message id: {{ trigger.event.data.message.message_id }}.
Data: ``` {{ trigger.event.data.data }} ```
{% raw %}Callback received from {% raw %}{{ trigger.event.data.from_first }}{% endraw %}.
Message id: {% raw %}{{ trigger.event.data.message.message_id }}{% endraw %}.
Data: {% raw %}{{ trigger.event.data.data }}{% endraw %}
```
Keyboard editor:
@ -307,12 +308,12 @@ Keyboard editor:
action:
- service: telegram_bot.answer_callback_query
data_template:
callback_query_id: '{{ trigger.event.data.id }}'
callback_query_id: {% raw %}'{{ trigger.event.data.id }}'{% endraw %}
message: 'Callback received for editing the inline keyboard!'
- service: telegram_bot.edit_replymarkup
data_template:
message_id: 'last'
chat_id: '{{ trigger.event.data.user_id }}'
chat_id: {% raw %}'{{ trigger.event.data.user_id }}'{% endraw %}
inline_keyboard:
- '/edit,/NO'
```
@ -329,7 +330,7 @@ Only acknowledges the 'NO' answer:
action:
- service: telegram_bot.answer_callback_query
data_template:
callback_query_id: '{{ trigger.event.data.id }}'
callback_query_id: {% raw %}'{{ trigger.event.data.id }}'{% endraw %}
message: 'OK, you said no!'
```
@ -406,4 +407,4 @@ class TelegramBotEventListener(appapi.AppDaemon):
self.call_service('telegram_bot/answer_callback_query',
message='OK, you said no!',
callback_query_id=callback_id)
```
```