Merge remote-tracking branch 'origin/current' into release-0-42

This commit is contained in:
Paulus Schoutsen 2017-04-08 15:05:40 -07:00
commit da05d9ab68
8 changed files with 46 additions and 15 deletions

View file

@ -25,15 +25,15 @@ The virtual bridge has the ability to turn entities on or off, or change the bri
To enable the emulated Hue bridge, add one of the following configs to your `configuration.yaml` file:
```yaml
# Amazon Echo example configuration.yaml entry
# Google Home example configuration.yaml entry
emulated_hue:
# Google Home does not work on different ports.
```
```yaml
# Google Home example configuration.yaml entry
# Amazon Echo example configuration.yaml entry
emulated_hue:
type: google_home
# Google Home does not work on different ports.
type: alexa
listen_port: 80
```

View file

@ -45,6 +45,7 @@ Configuration variables:
- **payload_off** (*Optional*): The payload that represents disabled state. Default is "OFF".
- **payload_on** (*Optional*): The payload that represents enabled state. Default is "ON".
- **qos** (*Optional*): The maximum QoS level of the state topic. Default is 0 and will also be used to publishing messages.
- **retain** (*Optional*): If the published message should have the retain flag on or not.
- **rgb_command_topic** (*Optional*): The MQTT topic to publish commands to change the light's RGB state.
- **rgb_state_topic** (*Optional*): The MQTT topic subscribed to receive RGB state updates.
- **rgb_value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the RGB value.

View file

@ -17,3 +17,8 @@ The `vera` platform allows you to get data from your [Vera](http://getvera.com/)
They will be automatically discovered if the vera component is loaded.
Please note that some vera sensors (such as _motion_ and _flood_ sensors) are _armable_ which means that vera will send alerts (email messages ot txts) when they are _armed_ an change state.
Home Assistant will display the state of these sensors regardless of the _armed_ state.
To allow you to change the _armed state_ - Home Assistant will create a switch as well as a sensor for each _Armable_ sensor. You can hide these switches using customization if you wish.

View file

@ -43,14 +43,14 @@ Configuration variables:
- **devices** (*Optional*): A list of devices with their name to use in the frontend.
- **device_defaults**: (*Optional*)
- **fire_event_** (*Optional*): Set default `fire_event` for RFLink switch devices (see below).
- **fire_event** (*Optional*): Set default `fire_event` for RFLink switch devices (see below).
- **signal_repetitions** (*Optional*): Set default `signal_repetitions` for RFLink switch devices (see below).
Device configuration variables:
- **name** (*Optional*): Name for the device, defaults to RFLink ID.
- **aliasses** (*Optional*): Alternative RFLink ID's this device is known by.
- **fire_event_** (*Optional*): Fire an `button_pressed` event if this device is turned on or off (default: False).
- **fire_event** (*Optional*): Fire an `button_pressed` event if this device is turned on or off (default: False).
- **signal_repetitions** (*Optional*): Repeat every RFLink command this number of times (default: 1)
### {% linkable_title Switch state %}