Merge pull request #1587 from home-assistant/next

0.35

_config.yml

@@ -130,9 +130,9 @@ social:
 
 # Home Assistant release details
 current_major_version: 0
-current_minor_version: 34
-current_patch_version: 5
-date_released: 2016-12-12
+current_minor_version: 35
+current_patch_version: 0
+date_released: 2016-12-17
 
 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.

source/_components/binary_sensor.flic.markdown

@@ -0,0 +1,63 @@
+---
+layout: page
+title: Flic Smart Button
+description: "Instructions how to integrate flic buttons within Home Assistant."
+date: 2016-12-02 22:03
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: flic.png
+ha_category: Binary Sensor
+ha_iot_class: "Local Push"
+ha_release: 0.35
+---
+
+The `flic` platform allows you to connect with multiple [flic](https://flic.io) smart buttons.
+
+The platform does not directly interact with the buttons, but communicates with the flic service that manages the buttons. The service can run on the same instance as home assistant or any other reachable machine. For setup instructions visit the GitHub repository of the service for [Linux](https://github.com/50ButtonsEach/fliclib-linux-hci), [OS X](https://github.com/50ButtonsEach/flic-service-osx) or [Windows](https://github.com/50ButtonsEach/fliclib-windows).
+
+### {% linkable_title Configuration %}
+
+```yaml
+# Example configuration.yaml entry
+binary_sensor:
+  - platform: flic
+```
+
+Configuration variables:
+
+- **host** (*Optional*): The IP or hostname of the flic service server. (default: `localhost`)
+- **port** (*Optional*): The port of the flic service. (default: `5551`)
+- **discovery** (*Optional*): If `true`, the component is configured to constantly scan for new buttons. (default: `true`)
+
+
+#### {% linkable_title Discovery %}
+
+If discovery is enabled, you can add a new button by pressing it for at least 7s. The button will be paired with the flic service and added to Home Assistant. Otherwise, you have to manually pair it with the flic service. The Home Assistant platform will not scan for new buttons and will only connect to buttons already paired.
+
+
+#### {% linkable_title Events %}
+
+The flic component fires `flic_click` events on the bus. You can capture the events and respond to them in automation scripts like this:
+
+```yaml
+# Example configuration.yaml automation entry
+automation:
+  - alias: Turn on lights in living room if flic is pressed once
+    trigger:
+      platform: event
+      event_type: flic_click
+      event_data:
+        button_name: flic_81e4ac74b6d2
+        click_type: single
+    action:
+      service: homeassistant.turn_off
+      entity_id: group.lights_livingroom
+```
+
+Event data:
+
+- **button_name**: The name of the button, that triggered the event.
+- **button_address**: The bluetooth address of the button, that triggered the event.
+- **click_type**: The type of click. Possible values are `single`, `double` and `hold`.

source/_components/binary_sensor.hikvision.markdown

@@ -0,0 +1,89 @@
+---
+layout: page
+title: Hikvision Binary Sensor
+description: "Instructions on how to set up Hikvision camera binary sensors within Home Assistant."
+date: 2016-12-08
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: hikvision.png
+ha_category: Binary Sensor
+ha_release: 0.35
+ha_iot_class: "Local Push"
+---
+
+The Hikvision Binary Sensor is a platform that parses the event stream of a [Hikvision IP Camera](http://www.hikvision.com/) and presents the camera events to Home Assistant as binary sensors with either an "off" or "on" state.
+
+The platform will automatically add all sensors to Home Assistant that are configured within the camera interface to "Notify the surveillance center" as a trigger.  If you would like to hide a sensor type you can do so by either unchecking "Notify the surveillance center" in the camera configuration or by using the "ignored" customize option detailed below.
+
+For example, if you configure a camera with the name "Front Porch" that has motion detection and line crossing events enabled to notify the surveillance center the following binary sensors will be added to Home Assistant:
+
+```
+binary_sensor.front_porch_motion
+binary_sensor.front_port_line_crossing
+```
+
+This platform should work with all Hikvision cameras, and has been confirmed to work with the following models:
+- DS-2CD3132-I
+- DS-2CD2232-I5
+- DS-2CD2032-I
+- DS-2CD2142FWD-I
+
+To enable this sensor, the following lines are required in your `configuration.yaml`:
+
+```yaml
+binary_sensor:
+  platform: hikvision
+  host: IP_ADDRESS
+  username: user
+  password: pass
+```
+
+Configuration options for a Hikvision Sensor:
+
+- **name** (*Optional*): The name you'd like to give the camera in Home Assistant, defaults to name defined in the camera.
+- **host** (*Required*): The IP address of the camera you would like to connect to.
+- **port** (*Optional*): The port to connect to the camera on, defaults to 80.
+- **ssl** (*Optional*): True if you want to connect with https. Be sure to set the port also.
+- **username** (*Required*): The username to authenticate with.
+- **password** (*Required*): The password to authenticate with.
+- **customize** (*Optional*): This attribute contains sensor-specific override values. Only sensor name needs defined:
+  - **ignored** (*Optional*): Ignore this sensor completely. It won't be shown in the Web Interface and no events are generated for it.
+  - **delay** (*Optional*): Specify the delay to wait after a sensor event ends before notifying Home Assistant. This is useful to catch multiple quick trips in one window without the state toggling on and off.  The default delay is 5 seconds.
+
+Supported sensor/event types are:
+- Motion
+- IO Trigger
+- Line Crossing
+- Field Detection
+- Video Loss
+- Tamper Detection
+- Shelter Alarm
+- Disk Full
+- Disk Error
+- Net Interface Broken
+- IP Conflict
+- Illegal Access
+- Video Mismatch
+- Bad Video
+- PIR Alarm
+- Face Detection
+
+
+Example of a configuration in your `configuration.yaml` that utilizes the customize options:
+
+```yaml
+binary_sensor:
+  platform: hikvision
+  host: 192.168.X.X
+  port: 80
+  ssl: False
+  username: user
+  password: pass
+  customize:
+    sensor_name_1:
+      delay: 30
+    sensor_name_2:
+      ignored: True
+```

source/_components/camera.amcrest.markdown

@@ -32,4 +32,5 @@ Configuration variables:
 - **password** (*Required*): The password for accessing your camera.
 - **name** (*Optional*): This parameter allows you to override the name of your camera. The default is "Amcrest Camera".
 - **port** (*Optional*): The port that the camera is running on. The default is 80.
+- **resolution** (*Optional*): This parameter allows you to specify the camera resolution. For a high resolution (1080/720p), specify the option `high`. For VGA resolution (640x480p), specify the option `low`. If omitted, it defaults to *high*.
 

source/_components/climate.generic_thermostat.markdown

@@ -34,7 +34,7 @@ Configuration variables:
 - **target_temp** (*Optional*): Set initial target temperature. Failure to set this variable will result in target temperature being set to null on startup.
 - **ac_mode** (*Optional*): Set the switch specified in the *heater* option to be treated as a cooling device instead of a heating device.
 - **min_cycle_duration** (*Optional*): Set a minimum amount of time that the switch specified in the *heater* option must be in it's current state prior to being switched either off or on.
-- **tolerance** (*Optional*): Set a minimum amount of temperature change that the sensor specified in the *target_sensor* option must change prior to being switched either off or on.
+- **tolerance** (*Optional*): Set a minimum amount of difference between the temperature read by the sensor specified in the *target_sensor* option and the target temperature that must change prior to being switched either off or on. For example, if the target temperature is 25 and the tolerance is 0.5 the heater will start when the sensor goes below 24.5 and it will stop when the sensor goes above 25.5.
 
 A full configuration example looks like the one below. `min_cycle_duration` must contains at least one of the following entries: `days:`, `hours:`, `minutes:`, `seconds:` or `milliseconds:`.
 

source/_components/demo.markdown

@@ -28,6 +28,7 @@ Available demo platforms:
 - [Remote](/components/remote/) (`remote`)
 - [Sensor](/components/sensor/) (`sensor`)
 - [Switch](/components/switch/) (`switch`)
+- [Text-to-speech](/components/tts/) (`tts`)
 - [Weather](/components/weather/) (`weather`)
 
 To integrate a demo platform in Home Assistant, add the following section to your `configuration.yaml` file:

source/_components/device_tracker.gpslogger.markdown

@@ -25,7 +25,7 @@ device_tracker:
 
 - [GPSLogger for Android](https://play.google.com/store/apps/details?id=com.mendhak.gpslogger)
 
-To configure GPSLogger, you must set up the app to send a `GET` request to your Home Assistant server at `http://<ha_server>/api/gpslogger?latitude=%LAT&longitude=%LON&battery=%BATT&device=%SER&accuracy=%ACC`. Make sure to include the API password if you have configured a password in Home Assistant (add `&api_password=<password>` to the end of the URL). Configure that options under "General Options":
+To configure GPSLogger, you must set up the app to send a `GET` request to your Home Assistant server at `http://<ha_server>/api/gpslogger?latitude=%LAT&longitude=%LON&device=%SER&accuracy=%ACC&battery=%BATT&speed=%SPD&direction=%DIR&altitude=%ALT&provider=%PROV&activity=%ACT`. Make sure to include the API password if you have configured a password in Home Assistant (add `&api_password=<password>` to the end of the URL). Configure that options under "General Options":
 
 - Start on boot: yes
 - Start on app launch: yes
@@ -34,7 +34,7 @@ Set the URL under "General Options -> Logging details":
 
 - Log to GPX: no
 - Log to KML: no
-- Log to custom URL: yes and set `http://<ha_server>/api/gpslogger?latitude=%LAT&longitude=%LON&battery=%BATT&device=%SER&accuracy=%ACC` (be sure you include API password (`&api_password=<password>`) if needed, or you can also use HTTP Basic authentication `http://<username>:<password>@<ha_server>/api/gpslogger...`)
+- Log to custom URL: yes and set `http://<ha_server>/api/gpslogger?latitude=%LAT&longitude=%LON&device=%SER&accuracy=%ACC&battery=%BATT&speed=%SPD&direction=%DIR&altitude=%ALT&provider=%PROV&activity=%ACT` (be sure you include API password (`&api_password=<password>`) if needed, or you can also use HTTP Basic authentication `http://<username>:<password>@<ha_server>/api/gpslogger...`)
 - Log to OpenGTS Server: no
 - Log to Plain Text: no
 - Log to NMEA: no

source/_components/device_tracker.nmap_tracker.markdown

@@ -33,6 +33,8 @@ Configuration variables:
 - **hosts** (*Required*): The network address to scan (in any supported NMap format). Mixing subnets and IPs is possible.
 - **home_interval** (*Optional*): The number of minutes nmap will not scan this device, assuming it is home, in order to preserve the device battery.
 - **exclude** (*Optional*): Hosts not to include in nmap scanning.
+- **scan_options** (*Optional*): Configurable scan options for nmap. Default to `-F --host-timeout 5s`
+
 
 A full example for the `nmap` tracker could look like the following sample:
 
@@ -59,5 +61,19 @@ device_tracker:
       - 10.0.0.15
 ```
 
+An example of how the Nmap scanner can be customized:
+
+Add the capabilities to Nmap. Be sure to specify the full path to wherever you installed Nmap:
+
+`sudo setcap cap_net_raw,cap_net_admin,cap_net_bind_service+eip /usr/bin/nmap
+`
+
+And you can set up the device tracker as
+```yaml
+- platform: nmap_tracker
+  hosts: 192.168.1.1-25
+  scan_options: " --privileged -sP "
+```
+
 
 See the [device tracker component page](/components/device_tracker/) for instructions how to configure the people to be tracked.

source/_components/emulated_hue.markdown

@@ -13,7 +13,8 @@ ha_iot_class: "Local Push"
 ---
 
 The `emulated_hue` component provides a virtual Philips Hue bridge, written entirely in software, that allows services that work with the Hue API to interact with Home Assistant
-entities. The driving use case behind this functionality is to allow Home Assistant to work with an Amazon Echo with no set up cost outside of configuration changes.
+entities. The driving use case behind this functionality is to allow Home Assistant to work with an Amazon Echo or Google Home with no set up cost outside of configuration changes.
+The virtual bridge has the ability to turn entities on or off, or change the brightness of dimmable lights. The volume level of media players can be controlled as brightness.
 
 <p class='note'>
   It is recommended to assign a static IP address to the computer running Home Assistant. This is because the Amazon Echo discovers devices by IP addresses, and if the IP changes, the Echo won't be able to control it. This is easiest done from your router, see your router's manual for details.

source/_components/group.markdown

@@ -45,15 +45,12 @@ group:
     entities:
       - sensor.bedroom_temp
       - sensor.porch_temp
-      - sensor.bathroom_humidity
   awesome_people:
     name: Awesome People
     view: no
     entities:
       - device_tracker.dad_smith
       - device_tracker.mom_smith
-      - device_tracker.dog_smith
-      
 ```
 
 Configuration variables:
@@ -61,6 +58,7 @@ Configuration variables:
 - **view** (*Optional*): If yes then the entry will be shown as a view (tab) at the top.
 - **name** (*Optional*): Name of the group.
 - **icon** (*Optional*): If the group is a view, this icon will show at the top in the frontend instead of the name. If it's not a view, then the icon shows when this group is used in another group.
+- **control** (*Optional*): If hidden then the group switch will be hidden.
 - **entities** (*Required*): array or comma delimited string, list of entities to group.
 
 <p class='img'>
@@ -68,7 +66,7 @@ Configuration variables:
 Example of groups shown as views in the frontend.
 </p>
 
-If all entities in a group are switches or lights then Home Assistant adds a switch at the top of the card that turns them all on/off at once.
+If all entities in a group are switches or lights then Home Assistant adds a switch at the top of the card that turns them all on/off at once. If you want to hide this switch, set `control` to `hidden`.
 
 You can create views (tabs) that contain other groups.
 Notice in the example below that in order to refer to the group "Living Room", you use `group.living_room` (lowercase and spaces replaced with underscores).

source/_components/ha.markdown

@@ -0,0 +1,20 @@
+---
+layout: page
+title: "Home Assistant 0.35"
+description: ""
+date: 2016-12-16 17:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: home-assistant.png
+ha_category: Release
+ha_release: 0.35
+---
+
+Details about the latest release can always be found at:
+
+- [Release blog posts](https://home-assistant.io/blog/categories/release-notes/)
+- [GitHub releases](https://github.com/home-assistant/home-assistant/releases)
+- [Python Package Index](https://pypi.python.org/pypi/homeassistant/)
+

source/_components/input_select.markdown

@@ -43,3 +43,39 @@ Configuration variables:
 
 Pick an icon that you can find on [materialdesignicons.com](https://materialdesignicons.com/) to use for your input and prefix the name with `mdi:`. For example `mdi:car`, `mdi:ambulance`, or  `mdi:motorbike`.
 
+### {% linkable_title Services %}
+
+This components provide three services to modify the state of the `input_select`:
+
+- `input_select.select_option`: This can be used to select a specific option. The option is passed as `option` attribute in the service data.
+- `input_select.select_previous`: Select the previous option.
+- `input_select.select_next`: Select the next option.
+
+The following example shows the usage of the `input_select.select_option` service in an automation:
+
+```yaml
+# Example configuration.yaml entry
+automation:
+  - alias: example automation
+    trigger:
+      platform: event
+      event_type: MY_CUSTOM_EVENT
+    action:
+      - service: input_select.select_option
+        data:
+          entity_id: input_select.who_cooks
+          option: Paulus
+```
+
+### {% linkable_title Scenes %}
+
+To specify a target option in a [Scene](/components/scene/) you have to specify the target as `option` attribute:
+
+```yaml
+# Example configuration.yaml entry
+scene:
+  - name: Example1
+    entities:
+      input_select.who_cooks:
+        option: Paulus
+```

source/_components/light.hue.markdown

@@ -35,22 +35,47 @@ Configuration variables:
 - **allow_unreachable** (*Optional*):  This will allow unreachable bulbs to report their state correctly. By default *name* from the device is used.
 - **filename** (*Optional*): Make this unique if specifying multiple Hue hubs.
 
-### {% linkable_title Using Hue Scenes in Home Assistant %} ###
+### {% linkable_title Using Hue Groups in Home Assistant %}
 
-The Hue platform has it's own concept of Scenes for setting the colors
-of a group of lights at once. Hue Scenes are very cheap, get created
-by all kinds of apps (as it is the only way to have 2 or more lights
-change at the same time), and are rarely deleted. A typical Hue hub
-might have hundreds of scenes stored in them, many that you've never
-used, almost all very poorly named.
+The Hue API allows you to group lights. Home Assistant also supports grouping of entities natively, but sometimes it can be usefull to use Hue Groups to group light bulbs. By doing so, Home Assistant only needs to send one API call to change the state of all the bulbs in those groups instead of one call for every light in the group. This causes all the bulbs to change state simultaniously.
 
-To avoid user interface overload we don't expose Scenes
-directly. Instead there is a
-[light.hue_activate_scene]/(/components/light/#service-lighthue_activate_scene)
-service which can be used by `automation` or `script` components. For
+These Hue Groups can be a `Luminaire`, `Lightsource`, `LightGroup` or `Room`. The `Luminaire` and `Lightsource` can't be created manually since the Hue bridge manages these automatically based on the discovered bulbs. The `Room` and `LightGroup` can be created manually trough the API, or the mobile app. A bulb can only exist in one `Room`, but can exist in multiple `LightGroup`. The `LightGroup` can be usefull to link certain bulbs together since.
+
+The 2nd generation Hue app only allows to create a `Room`. You need to use the first generation app or the API to create a `LightGroup`.
+
+Example:
+
+To create a `LightGroup` named `Ceiling lights` that contains the lights 1, 2 and 3, execute the following command:
+
+```bash
+$ curl -XPOST -d '{"name": "Ceiling lights", "lights": ["1", "2", "3"]}' http://<bridge>/api/<username>/groups
+```
+
+The `<username>` is the string that is used to register Home Assistant on the bridge, you can find it in the `phue.conf` file in your configuration path. `<bridge>` is the IP address or hostname of your Hue bridge.
+
+You can find out the ids of your lights by executing the following command:
+
+```bash
+$ curl http://<bridge>/api/<username>/lights
+```
+
+Home Assistant will automatically detect your new `LightGroup` and add it to the interface.
+
+<p class='note warning'>
+  To support Hue Light Groups, your bridge needs to have at least firmware 1.13 (released on June 3, 2016).
+</p>
+
+More information can be found on the [Philips Hue API documentation](https://www.developers.meethue.com/documentation/groups-api#22_create_group) website.
+
+
+### {% linkable_title Using Hue Scenes in Home Assistant %}
+
+The Hue platform has it's own concept of Scenes for setting the colors of a group of lights at once. Hue Scenes are very cheap, get created by all kinds of apps (as it is the only way to have 2 or more lights change at the same time), and are rarely deleted. A typical Hue hub might have hundreds of scenes stored in them, many that you've never used, almost all very poorly named.
+
+To avoid user interface overload we don't expose Scenes directly. Instead there is a [light.hue_activate_scene](/components/light/#service-lighthue_activate_scene) service which can be used by `automation` or `script` components. For
 instance:
 
-```
+```yaml
 script:
   porch_on:
     sequence:
@@ -64,27 +89,15 @@ script:
 
 How do you find these names?
 
-The easiest way to do this is only use the scenes from the 2nd
-generation Hue app. That is organized by Room (Group) and Scene
-Name. Use the values of Room name and Scene name that you see in the
-app. You can test these work on the `dev-service` console of your Home
-Assistant instance.
+The easiest way to do this is only use the scenes from the 2nd generation Hue app. That is organized by Room (Group) and Scene
+Name. Use the values of Room name and Scene name that you see in the app. You can test these work on the `dev-service` console of your Home Assistant instance.
 
-Alternatively, you can dump all rooms and scene names using this
-[gist](https://gist.github.com/sdague/5479b632e0fce931951c0636c39a9578). This
-does **not** tell you which groups and scenes work together but it's
-sufficient to get values that you can test in the `dev-service` console.
+Alternatively, you can dump all rooms and scene names using this [gist](https://gist.github.com/sdague/5479b632e0fce931951c0636c39a9578). This does **not** tell you which groups and scenes work together but it's sufficient to get values that you can test in the `dev-service` console.
 
 *** Caveats ***
 
-The Hue API doesn't activate Scenes directly, only on a Hue Group
-(typically Rooms, especially if using the 2nd gen app). But Hue Scenes
-don't actually reference their group. So heuristic matching is used.
+The Hue API doesn't activate Scenes directly, only on a Hue Group (typically Rooms, especially if using the 2nd gen app). But Hue Scenes don't actually reference their group. So heuristic matching is used.
 
-Neither Group names or Scene names are guaranteed unique in Hue. If
-you are getting non deterministic behavior, adjust your Hue scenes via
-the App to be more identifying.
+Neither Group names or Scene names are guaranteed unique in Hue. If you are getting non deterministic behavior, adjust your Hue scenes via the App to be more identifying.
 
-The Hue hub has limitted spaces for Scenes, and will delete Scenes if
-new ones get created that would overflow that space. The API docs say
-this is based on Least Recently Used.
+The Hue hub has limitted spaces for Scenes, and will delete Scenes if new ones get created that would overflow that space. The API docs say this is based on Least Recently Used.

source/_components/light.mqtt_template.markdown

@@ -17,7 +17,7 @@ ha_release: 0.33
 The `mqtt_template` light platform lets you control a MQTT-enabled light that receive commands on a command topic and optionally sends status update on a state topic.
 It is format-agnostic so you can use any data format you want (i.e. string, JSON), just configure it with templating.
 
-This platform supports on/off, brightness, RGB colors, transitions, and short/long flashing.
+This platform supports on/off, brightness, RGB colors, transitions, short/long flashing and effects.
 
 In an ideal scenario, the MQTT device will have a state topic to publish state changes. If these messages are published with the RETAIN flag, the MQTT light will receive an instant state update after subscription and will start with the correct state. Otherwise, the initial state of the light will be off.
 
@@ -37,15 +37,17 @@ light:
 Configuration variables:
 
 - **name** (*Optional*): The name of the light. Default is "MQTT Template Light."
+- **effect_list** (*Optional*): List of possible effects.
 - **command_topic** (*Required*): The MQTT topic to publish commands to change the light's state.
 - **state_topic** (*Optional*): The MQTT topic subscribed to receive state updates.
-- **command_on_template** (*Required*): The template for *on* state changes. Available variables: `state`, `brightness`, `red`, `green`, `blue`, `flash` and `transition`.
+- **command_on_template** (*Required*): The template for *on* state changes. Available variables: `state`, `brightness`, `red`, `green`, `blue`, `flash`, `transition` and `effect`.
 - **command_off_template** (*Required*): The template for *off* state changes. Available variables: `state` and `transition`.
 - **state_template** (*Optional*): Template to extract state from the state payload value.
 - **brightness_template** (*Optional*): Template to extract brightness from the state payload value.
 - **red_template** (*Optional*): Template to extract red color from the state payload value.
 - **green_template** (*Optional*): Template to extract green color from the state payload value.
 - **blue_template** (*Optional*): Template to extract blue color from the state payload value.
+- **effect_template** (*Optional*): Template to extract effect from the state payload value.
 - **optimistic** (*Optional*): Flag that defines if the light works in optimistic mode. Default is true if no state topic or state template is defined, else false.
 - **qos** (*Optional*): The maximum QoS level of the state topic. Default is 0 and will also be used to publishing messages.
 
@@ -78,12 +80,15 @@ light:
 
 ### {% linkable_title JSON payload %}
 
-For a JSON payload with the format `{"state": "on", "brightness": 255, "color": [255, 255, 255]}`, add the following to your `configuration.yaml` file:
+For a JSON payload with the format `{"state": "on", "brightness": 255, "color": [255, 255, 255], "effect": "rainbow"}`, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
 light:
   - platform: mqtt_template
+    effect_list:
+      - rainbow
+      - colorloop
     command_topic: "home/rgb1/set"
     state_topic: "home/rgb1/status"
     command_on_template: >{% raw %}
@@ -94,6 +99,9 @@ light:
       {%- if red is defined and green is defined and blue is defined -%}
       , "color": [{{ red }}, {{ green }}, {{ blue }}]
       {%- endif -%}
+      {%- if effect is defined -%}
+      , "effect": "{{ effect }}"
+      {%- endif -%}
       }{% endraw %}
     command_off_template: '{"state": "off"}'
     state_template: '{% raw %}{{ value_json.state }}{% endraw %}'
@@ -101,9 +109,10 @@ light:
     red_template: '{% raw %}{{ value_json.color[0] }}{% endraw %}'
     green_template: '{% raw %}{{ value_json.color[1] }}{% endraw %}'
     blue_template: '{% raw %}{{ value_json.color[2] }}{% endraw %}'
+    effect_template: '{% raw %}{{ value_json.effect }}{% endraw %}'
 ```
 
 ### {% linkable_title No brightness or color support %}
 
-If you don't want brightness or color support, just omit the corresponding configuration sections.
+If you don't want brightness, color or effect support, just omit the corresponding configuration sections.
 

source/_components/media_player.aquostv.markdown

@@ -0,0 +1,48 @@
+---
+layout: page
+title: "Sharp Aquos TV"
+description: "Instructions on how to integrate a Sharp Aquos TV into Home Assistant."
+date: 2016-11-02 12:02
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: sharp_aquos.jpg
+ha_category: Media Player
+featured: false
+ha_release: 0.35
+ha_iot_class: "Local Polling"
+---
+
+The `aquostv` platform allows you to control a [Sharp Aquos TV](http://www.sharp.ca/en-CA/ForHome/HomeEntertainment/LEDTV/QuattronPlus.aspx).
+
+When the TV is first connected, you will need to accept Home Assistant on the TV to allow communication.
+
+To add a TV to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+media_player:
+  - platform: aquostv
+    host: 192.168.0.10
+```
+
+Configuration variables:
+
+- **host** (*Required*): The IP/Hostname of the Samsung Smart TV, eg. `192.168.0.10`.
+- **port** (*Optional*): The port of the Samsung Smart TV. Defaults to 10002.
+- **username** (*Optional*): The username of the Samsung Smart TV. Defaults to admin.
+- **password** (*Optional*): The password of the Samsung Smart TV. Defaults to password.
+- **name** (*Optional*): The name you would like to give to the Sharp Aquos TV.
+
+
+Currently known supported models:
+
+- LC-40LE830U
+- LC-46LE830U
+- LC-52LE830U
+- LC-60LE830U
+- LC-52LE925UN
+- LC-60LE925UN
+
+If your model is not on the list then give it a test, if everything works correctly then add it to the list on [GitHub](https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_components/media_player.aquostv.markdown).

source/_components/media_player.markdown

@@ -16,35 +16,42 @@ Interacts with media players on your network. Please check the sidebar for a ful
 ### {% linkable_title Media control services %}
 Available services: `turn_on`, `turn_off`, `toggle`, `volume_up`, `volume_down`, `media_play_pause`, `media_play`, `media_pause`, `media_stop`, `media_next_track`, `media_previous_track`, `clear_playlist`
 
-| Service data attribute | Optional | Description |
-| ---------------------- | -------- | ----------- |
-| `entity_id`            |      yes | Target a specific media player. Defaults to all.
+| Service data attribute | Optional | Description                                      |
+| ---------------------- | -------- | ------------------------------------------------ |
+| `entity_id`            |      yes | Target a specific media player. Defaults to all. |
 
 #### {% linkable_title Service `media_player/volume_mute` %}
 
 | Service data attribute | Optional | Description                                      |
 |------------------------|----------|--------------------------------------------------|
-| `entity_id`            | yes      | Target a specific media player. Defaults to all. |
-| `is_volume_muted`      | no       | True/false for mute/unmute                       |
+| `entity_id`            |      yes | Target a specific media player. Defaults to all. |
+| `is_volume_muted`      |       no | True/false for mute/unmute                       |
 
 #### {% linkable_title Service `media_player/volume_set` %}
 
 | Service data attribute | Optional | Description                                      |
 |------------------------|----------|--------------------------------------------------|
-| `entity_id`            | yes      | Target a specific media player. Defaults to all. |
-| `volume_level`         | no       | Integer for volume level                         |
+| `entity_id`            |      yes | Target a specific media player. Defaults to all. |
+| `volume_level`         |       no | Integer for volume level                         |
 
 #### {% linkable_title Service `media_player/media_seek` %}
 
 | Service data attribute | Optional | Description                                            |
 |------------------------|----------|--------------------------------------------------------|
-| `entity_id`            | yes      | Target a specific media player. Defaults to all.       |
-| `seek_position`        | no       | Position to seek to. The format is platform dependent. |
+| `entity_id`            |      yes | Target a specific media player. Defaults to all.       |
+| `seek_position`        |       no | Position to seek to. The format is platform dependent. |
 
 #### {% linkable_title Service `media_player/play_media` %}
 
-| Service data attribute          | Optional | Description |
-| ------------------------------- | -------- | ----------- |
-| `entity_id`                     |      yes | Target a specific media player. Defaults to all.
-| `media_content_id`              |       no | A media identifier. The format of this is component dependent. For example, you can provide URLs to Sonos and Cast but only a playlist ID to iTunes.
-| `media_content_type`            |       no | A media type. Must be one of `MUSIC`, `TVSHOW`, `VIDEO`, `EPISODE`, `CHANNEL` or `PLAYLIST`. For example, to play music you would set `media_content_type` to `MUSIC`.
+| Service data attribute | Optional | Description                                                                                                                                                            |
+| -----------------------| -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `entity_id`            |      yes | Target a specific media player. Defaults to all.                                                                                                                       |
+| `media_content_id`     |       no | A media identifier. The format of this is component dependent. For example, you can provide URLs to Sonos and Cast but only a playlist ID to iTunes.                   |
+| `media_content_type`   |       no | A media type. Must be one of `MUSIC`, `TVSHOW`, `VIDEO`, `EPISODE`, `CHANNEL` or `PLAYLIST`. For example, to play music you would set `media_content_type` to `MUSIC`. |
+
+#### {% linkable_title Service `media_player/select_source` %}
+
+| Service data attribute | Optional | Description                                          |
+| ---------------------- | -------- | ---------------------------------------------------- |
+| `entity_id`            |      yes | Target a specific media player. Defaults to all.     |
+| `source`               |       no | Name of the source to switch to. Platform dependent. |

source/_components/media_player.panasonic_viera.markdown

@@ -24,6 +24,8 @@ Currently known supported models:
 
 If your model is not on the list then give it a test, if everything works correctly then add it to the list on [GitHub](https://github.com/home-assistant/home-assistant.io).
 
+Some Panasonic Viera TVs allow Home Assistant to turn them on, if you specify the MAC address with `mac:`.
+
 To add a TV to your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
@@ -36,5 +38,6 @@ media_player:
 Configuration variables:
 
 - **host** (*Required*): The IP of the Panasonic Viera TV, e.g. `192.168.0.10`.
-- **port** (*Optional*): The port of your Panasonic Viera TV. Defaults to `55000`.
+- **port** (*Optional*): The port number of your Panasonic Viera TV. Defaults to `55000`.
+- **mac** (*Optional*): The MAC address of your Panasonic Viera TV, e.g. `AA:BB:CC:DD:99:1A`.
 - **name** (*Optional*): The name you would like to give to the Panasonic Viera TV.

source/_components/media_player.universal.markdown

@@ -51,8 +51,8 @@ Configuration variables:
 
 - **name** (*Required*): The name to assign the player
 - **children** (*Required*): Ordered list of child media players this entity will control
-- **commands** (*Optional*): Commands to be overwritten. Possible entries are *turn_on*, *turn_off*, *volume_up*, *volume_down*, and *volume_mute*.
-- **attributes** (*Optional*): Attributes that can be overwritten. Possible entries are *is_volume_muted* and *state*. The values should be an entity id and state attribute separated by a bar (\|). If the entity id's state should be used, then only the entity id should be provided.
+- **commands** (*Optional*): Commands to be overwritten. Possible entries are *turn_on*, *turn_off*, *select_source*, *volume_set*, *volume_up*, *volume_down*, and *volume_mute*.
+- **attributes** (*Optional*): Attributes that can be overwritten. Possible entries are *is_volume_muted*, *state*, *source*, *source_list, and *volume_level*. The values should be an entity id and state attribute separated by a bar (\|). If the entity id's state should be used, then only the entity id should be provided.
 
 The universal media player will primarily imitate one of its *children*. The first child in the list that is active (not idle/off) will be controlled the universal media player. The universal media player will also inherit its state from the first active child. Entities in the *children* list must be media players.
 
@@ -60,6 +60,8 @@ It is recommended that the command *turn_on*, the command *turn_off*, and the at
 
 It is also recommended that the command *volume_up*, the command *volume_down*, the command *volume_mute*, and the attribute *is_volume_muted* all be provided together. The attribute *is_volume_muted* should return either True or the on state when the volume is muted. The *volume_mute* service should toggle the mute setting.
 
+When providing *select_source* as a command, it is recomended to also provide the attributes *source*, and *source_list*. The *source* attribute is the currently select source, while the *source_list* attribute is a list of all available sources.
+
 Below is an example configuration.
 
 ```yaml
@@ -90,11 +92,26 @@ media_player:
       service: switch.turn_on
       data:
         entity_id: switch.living_room_mute
+    select_source:
+      service: media_player.select_source
+      data_template:
+        entity_id: media_player.receiver
+        source: '{{ source }}'
+    volume_set:
+      service: media_player.volume_set
+      data_template:
+        entity_id: media_player.receiver
+        volume_level: '{{ volume_level }}'
+
   attributes:
     state: switch.living_room_tv
     is_volume_muted: switch.living_room_mute
+    volume_level: media_player.receiver|volume_level
+    source: media_player.receiver|source
+    source_list: media_player.receiver|source_list
+
 ```
 
-In this example, a switch is available to control the power of the television. Switches are also available to turn the volume up, turn the volume down, and mute the audio. These could be command line switches or any other entity in Home Assistant. The *turn_on* and *turn_off* commands will be redirected to the television and the volume commands will be redirected to an audio receiver.
+In this example, a switch is available to control the power of the television. Switches are also available to turn the volume up, turn the volume down, and mute the audio. These could be command line switches or any other entity in Home Assistant. The *turn_on* and *turn_off* commands will be redirected to the television and the volume commands will be redirected to an audio receiver. The *select_source* command will be passed directly to an A/V receiver.
 
 The children are a Chromecast and a Kodi player. If the Chromecast is playing, the Universal Media Player will reflect its status. If the Chromecast is idle and Kodi is playing, the Universal Media player will change to reflect its status.

source/_components/media_player.vlc.markdown

@@ -0,0 +1,30 @@
+---
+layout: page
+title: "VLC"
+description: "Instructions on how to integrate VLC media player into Home Assistant."
+date: 2016-11-02 12:02
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: videolan.png
+ha_category: Media Player
+featured: false
+ha_release: 0.35
+ha_iot_class: "Local Polling"
+---
+
+The `vlc` platform allows you to control [VLC media player](http://www.videolan.org/vlc/index.html).
+
+To add a VLC media player to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+media_player:
+  - platform: vlc
+```
+
+Configuration variables:
+
+- **name** (*Optional*): The name to use in the frontend.
+

source/_components/media_player.webostv.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
-title: "LG WebOS TV"
-description: "Instructions how to integrate a LG WebOS TV within Home Assistant."
+title: "LG webOS Smart TV"
+description: "Instructions how to integrate a LG webOS Smart TV within Home Assistant."
 date: 2016-04-18 23:24
 sidebar: true
 comments: false
@@ -13,7 +13,7 @@ ha_iot_class: "Local Polling"
 ha_release: 0.18
 ---
 
-The `webostv` platform allows you to control a [LG](http://www.lg.com) WebOS Smart TV.
+The `webostv` platform allows you to control a [LG](http://www.lg.com/) webOS Smart TV.
 
 When the TV is first connected, you will need to accept Home Assistant on the TV to allow communication.
 
@@ -27,12 +27,14 @@ media_player:
 
 Configuration variables:
 
-- **host** (*Optional*): The IP of the LG WebOS Smart TV, eg. 192.168.0.10
-- **name** (*Optional*): The name you would like to give to the LG WebOS Smart TV.
+- **host** (*Optional*): The IP of the LG webOS Smart TV, e.g. `192.168.0.10`.
+- **mac** (*Optional*): The MAC address of the TV, e.g. `C8:08:E9:99:99:1A`.
+- **name** (*Optional*): The name you would like to give to the LG webOS Smart TV.
 - **customize** array (*Optional*): List of options to customize.
   - ***sources** array (*Optional*): List of hardware inputs.
 
-If you do not provide a host name, all LG WebOS Smart TV's within your network will be auto-discovered if your TV network name is set to `[LG] webOS TV`.
+If you do not specify `host:`, all LG webOS Smart TVs within your network will be auto-discovered if they use the default name setting of `[LG] webOS TV`.
+Home Assistant is able to turn on a LG webOS Smart TV if you specify its MAC address with `mac:`. Some models require the **Mobile TV On** setting and/or a wired network connection to use Wake-on-LAN.
 
 A full configuration example will look like the sample below:
 
@@ -41,6 +43,7 @@ A full configuration example will look like the sample below:
 media_player:
   - platform: webostv
     host: 192.168.0.10
+    mac: C8:08:E9:99:99:1A
     name: Living Room TV
     customize:
       sources:

source/_components/scene.markdown

@@ -29,6 +29,8 @@ scene:
         state: on
         brightness: 100
       light.ceiling: off
+      media_player.sony_bravia_tv:
+        source: HDMI 1
 ```
 
 Configuration variables:

source/_components/sensor.broadlink.markdown

@@ -9,13 +9,27 @@ sharing: true
 footer: true
 logo: broadlink.png
 ha_category: Sensor
-ha_release: 0.34
+ha_release: 0.35
 ---
 
 
 The `broadlink` sensor platform let you monitor data from an RM2 and A1 E-air.
 There is currently no support for the cloud API.
 
+
+Configuration options:
+- **name** (*Optional*): Default BL. Sensor name
+- **update_interval** (*Optional*): Default 300. Time in seconds to fetch data from sensors
+- **host** (*Required*): The hostname/IP address to connect to.
+- **mac** (*Required*):  Device mac address.
+- **timeout** (*Optional*): Timeout in seconds for the connection to the device
+- **monitored_conditions** array (*Required*): States to monitor.
+    - 'temperature'
+    - 'humidity'
+    - 'air_quality'
+    - 'light'
+    - 'noise'
+
 To set it up, add the following information to your `configuration.yaml` file:
 
 Obtain sensor data from an A1:
@@ -43,16 +57,3 @@ sensor:
     monitored_conditions:
       - temperature
 ```
-
-Configuration options:
-- **name** (*Optional*): Default BL. Sensor name
-- **update_interval** (*Optional*): Default 300. Time in seconds to fetch data from sensors
-- **host** (*Required*): The hostname/IP address to connect to.
-- **mac** (*Required*):  Device mac address.
-- **monitored_conditions** array (*Required*): States to monitor.
-    - 'temperature'
-    - 'humidity'
-    - 'air_quality'
-    - 'light'
-    - 'noise'
-

source/_components/sensor.netdata.markdown

@@ -0,0 +1,44 @@
+---
+layout: page
+title: "Netdata"
+description: "Instructions how to integrate Netdata within Home Assistant."
+date: 2016-12-05 07:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: netdata.png
+ha_category: System Monitor
+ha_release: 0.35
+ha_iot_class: "Local Push"
+---
+
+
+The `netdata` sensor platform allows you to display information collected by [Netdata](http://my-netdata.io/).
+
+To add this platform to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: netdata
+```
+
+Configuration variables:
+
+- **host** (*Optional*): The IP address or hostname of your Netdata instance. Defaults to `localhost`.
+- **port** (*Optional*): The port that the Netdata instance is running on. Defaults to `19999`.
+- **name** (*Optional*): Name of the sensor. Defaults to "Netdata".
+- **resources** (*Optional*) array: List of details to monitor. Defaults is `memory_free`.
+  - 'memory_free': Free memory
+  - 'memory_used': Used memory
+  - 'memory_cached': Cached memory
+  - 'memory_buffers': Buffered memory
+  - 'swap_free': Free swap
+  - 'swap_used': Used swap
+  - 'processes_running': Processes Running
+  - 'processes_blocked': Processes Blocked
+  - 'system_load': System Load 15 min
+  - 'system_io_in': System I/O In
+  - 'system_io_out': System I/O Out
+

source/_components/sensor.sensehat.markdown

@@ -0,0 +1,38 @@
+---
+layout: page
+title: "Sense HAT"
+description: "Instructions how to integrate Sense HAT within Home Assistant."
+date: 2016-12-05 07:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: sense-hat.png
+ha_category: Sensor
+ha_release: 0.35
+ha_iot_class: "Local Push"
+---
+
+
+The `sensehat` sensor platform allows you to display information collected by a [Sense HAT](https://www.raspberrypi.org/products/sense-hat/) add-on board for Raspberry Pi.
+
+To add this platform to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: sensehat
+    display_options:
+        - temperature
+        - humidity
+        - pressure
+```
+
+Configuration variables:
+
+- **display_options** (*Requires*) array: List of details to monitor. Defaults is `memory_free`.
+  - 'temperature'
+  - 'humidity'
+  - 'pressure'
+
+

source/_components/sensor.wunderground.markdown

@@ -73,6 +73,7 @@ sensor:
 Configuration variables:
 - **api_key** (Required): See above.
 - **pws_id** (Optional): You can enter a Personal Weather Station ID. The current list of Wunderground PWS stations is available [here](https://www.wunderground.com/weatherstation/ListStations.asp). If you do not enter a PWS ID, the current location information (latitude and longitude) from your `configuration.yaml` will be used to display weather conditions. 
+- **lang** (Optional): Specify the language that the API returns. The current list of all Wunderground language codes is available [here](https://www.wunderground.com/weather/api/d/docs?d=language-support). If not specified, it defaults to English (EN).
 - **monitored_conditions** array (*Required*): Conditions to display in the frontend. The following conditions can be monitored.
   - **alerts**: Current severe weather advisories
   - **dewpoint_c**: Temperature in Celsius below which water droplets begin to condense and dew can form

source/_components/sensor.zamg.markdown

@@ -0,0 +1,66 @@
+---
+layout: page
+title: "ZAMG Sensor"
+description: "Instructions how to integrate ZAMG sensors within Home Assistant."
+date: 2016-12-06 08:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zamg.png
+ha_category: Weather
+ha_release: 0.35
+---
+
+The `zamg` platform uses meteorological details published by the Austrian weather service [Zentralanstalt für
+ Meteorologie und Geodynamik (ZAMG)](https://www.zamg.ac.at/).
+
+The following stations are available:
+
+| `station_id` | Location         |
+| :----------- |:-----------------|
+| 11010        | Linz/Hörsching   |
+| 11012        | Kremsmünster     |
+| 11022        | Retz             |
+| 11035        | Wien/Hohe Warte  |
+| 11036        | Wien/Schwechat   |
+| 11101        | Bregenz          |
+| 11121        | Innsbruck        |
+| 11126        | Patscherkofel    |
+| 11130        | Kufstein         |
+| 11150        | Salzburg         |
+| 11155        | Feuerkogel       |
+| 11157        | Aigen im Ennstal |
+| 11171        | Mariazell        |
+| 11190        | Eisenstadt       |
+| 11204        | Lienz            |
+
+To add ZAMG to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: zamg
+    station_id: 11035
+    monitored_conditions:
+      - temperature
+      - humidity
+```
+
+Configuration variables:
+
+- **station_id** (*Required*): Your API key for http://openweathermap.org/.
+- **name** (*Optional*): Additional name for the sensors. Defaults to platform name.
+- **monitored_conditions** array (*Required*): Conditions to display in the frontend.
+  - **pressure**: Pressure at station level
+  - **pressure_sealevel**: Pressure at sea Level
+  - **humidity**: Humidity
+  - **wind_speed**: Wind speed
+  - **wind_bearing**: Wind bearing
+  - **wind_max_speed**: Top wind speed
+  - **wind_max_bearing**: Top wind bearing
+  - **sun_last_hour**: Sun last hourpercentage
+  - **temperature**: Temperature
+  - **precipitation**: Precipitation
+  - **dewpoint**: Dew point
+

source/_components/switch.broadlink.markdown

@@ -0,0 +1,80 @@
+---
+layout: page
+title: "Broadlink RM Switch"
+description: "Instructions how to have Broadlink RM switches."
+date: 2016-11-22 22:41
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: broadlink.png
+ha_category: Switch
+ha_release: 0.35
+---
+
+This `Broadlink` switch platform allow to you control Broadlink RM2 Pro and RM mini IR+RF [devices](http://www.ibroadlink.com/rm/).
+
+To enable it, add the following lines to your `configuration.yaml`:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  platform: broadlink
+  host: IP_ADDRESS
+  mac: 'MAC_ADDRESS'
+  switches:
+    reciever:
+      command_on: 'switch_packet on'
+      command_off: 'switch_packet off'
+```
+
+Configuration variables:
+- **host** (*Required*): The hostname/IP address to connect to.
+- **mac** (*Required*):  Device mac address.
+- **timeout** (*Optional*): Timeout in seconds for the connection to the device
+- **switches** (*Optional*): The array that contains all switches.
+  - **identifier** (*Required*): Name of the command switch as slug. Multiple entries are possible.
+    - **friendly_name** (*Optional*): The name used to display the switch in the frontend.
+    - **command_on** (*Required*): Base64 encoded packet from RM device to take for on.
+    - **command_off** (*Required*): Base64 encoded packet from RM device to take for off.
+
+
+
+How to obtain IR/RF packets?
+
+Choose Call Service from the Developer Tools. Choose the service broadlink/learn_command from the list of Available services:  and hit CALL SERVICE. Press the button on your remote with in 20 seconds. The packet will be printed in the log and as a persistent notification.
+
+
+Example config:
+
+```yaml
+- platform: broadlink
+  host: 192.168.1.2
+  mac: 'B4:43:0D:CC:0F:58'
+  timeout: 15
+# Will work on most Phillips tvs:
+    tv:
+      friendly_name: "Phillips Tv"
+      command_on: 'JgAcAB0dHB44HhweGx4cHR06HB0cHhwdHB8bHhwADQUAAAAAAAAAAAAAAAA='
+      command_off: 'JgAaABweOR4bHhwdHB4dHRw6HhsdHR0dOTocAA0FAAAAAAAAAAAAAAAAAAA='
+      
+# Will work on most LG tvs
+    tv_lg:
+      friendly_name: "LG Tv"
+      command_on: 'JgBYAAABIJISExETETcSEhISEhQQFBETETcROBESEjcRNhM1EjcTNRMTERISNxEUERMSExE2EjYSNhM2EhIROBE3ETcREhITEgAFGwABH0oSAAwzAAEfShEADQU='
+      command_off: 'JgBYAAABIJISExETETcSEhISEhQQFBETETcROBESEjcRNhM1EjcTNRMTERISNxEUERMSExE2EjYSNhM2EhIROBE3ETcREhITEgAFGwABH0oSAAwzAAEfShEADQU='
+
+    tv_lg_HDMI1_HDMI2:
+      friendly_name: "LG Tv"
+      command_on: 'JgBIAAABIZMRExITEjYSExMRERURExEUEDkRNxEUEjYSNhM3ETcSNxITETgSNhI2ExMQExE4ETYSNxIUERMSExE4ETcRFBETEQANBQ=='
+      command_off: 'JgBQAAABJJMSEhISETgSEhITEBMSEhMSETcSNxMREjcSNxI3EjcSOBETERITNhM2EhITERM2EzcRNxI3ExISEhI3EjcRExETEgAFLQABJEoRAA0FAAAAAAAAAAA='
+      
+    tv_lg_HDMI3:
+      friendly_name: "LG Tv"
+      command_on: 'JgBIAAABIZMSFBISETgRExEUERQQFBETEjcTNhMSETgRNxE3EjcROBM2ERMSFBE4ERMSNxM2EjUSFBE2ETgRExM2ExITEhATEwANBQ=='
+
+    tv_lg_AV1_AV2:
+      friendly_name: "LG Tv"
+      command_on: 'JgBIAAABIpQPFBITETgSEw8UEhQSEhEVDzgSOBAUETgQOQ84EjgRNxITETgSExA5EDgREhI3EhMROBMSEDkQFBETEjYTEhE4EQANBQ=='
+      command_off: 'JgBIAAABH5YPFBETETgUERAUEBURFBATETgROBEUETcSNxE4ETcSOBISEBUQFREUEjUSFBA5ETcRNxE4ETkQOBAUEjcRFRAUEQANBQ=='
+``` 

source/_components/switch.digitalloggers.markdown

@@ -0,0 +1,43 @@
+---
+layout: page
+title: "Digital Loggers Switch"
+description: "Instructions how to integrate Digital Loggers DIN III relays into Home Assistant."
+date: 2016-10-02 10:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: digitalloggers.png
+ha_category: Switch
+ha_release: 0.35
+---
+
+
+The `digitalloggers` switch platform allows you to control the state of your [Digital Loggers](http://www.digital-loggers.com/dinfaqs.html) switches. 
+
+To use your digitalloggers switch in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: digitalloggers
+    host: 192.168.1.43
+    password: SuperSecret123!!
+    name: FantasticRelayDevice
+
+```
+
+Configuration variables:
+
+- **host** (*Required*): The IP address or FQDN of your DIN III relay, eg. `192.168.1.32` or `myrelay.example.com`.
+- **name** (*Optional*): The name to use when controlling this relay.  Default: `DINRelay`.
+- **username** (*Optional*): Credentials for controlling this relay. Default: `admin`.
+- **password** (*Optional*): Credentials for controlling this relay. Default: `admin`.
+- **timeout** (*Optional*): Default timeout as set by the underlying python-dlipower library is `20` seconds.  Override it if you need to.  Valid range is 1 to 600.
+- **cycletime** (*Optional*): This is the delay enforced by the library when you send multiple commands to the same device.  The default relay cycle time is `2` seconds. Override it if you need to.  Valid range is 1 to 600. A delay is a recommendation of Digital Loggers: 
+>Many loads draw more power when they are initially switched on. Sequencing prevents circuit overloads when loads devices are attached to a single circuit. 
+
+
+Your relays will be available in the form `switch.fantasticrelaydevice_individualrelayname`
+
+**Note:** There is currently a limitation of the [dlipower library](https://github.com/dwighthubbard/python-dlipower) used by the `digitalloggers` component that communication is only available over port 80.

source/_components/tts.google.markdown

@@ -0,0 +1,36 @@
+---
+layout: page
+title: "Google Text-to-Speech"
+description: "Instructions how to setup Google Text-to-Speech with Home Assistant."
+date: 2016-12-13 07:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: google.png
+ha_category: Text-to-speech
+ha_release: 0.35
+---
+
+The `google` text-to-speech platform uses [Google Text-to-Speech engine](https://console.developers.google.com/apis/api/speech.googleapis.com/overview) Text-to-Speech engine to read a text with natural sounding voices.
+
+To enable text-to-speech with Google, add the following lines to your `configuration.yaml`:
+
+```yaml
+# Example configuration.yaml entry
+tts:
+  - platform: google
+```
+
+Configuration variables:
+
+- **language** (*Optional*): The language to use. Defaults to `en`. 
+
+A full configuration sample:
+
+```yaml
+# Example configuration.yaml entry
+tts:
+  - platform: google
+    language: 'de'
+```

source/_components/tts.markdown

@@ -0,0 +1,73 @@
+---
+layout: page
+title: "Text-to-Speech (TTS)"
+description: "Instructions how to setup Text-to-Speech (TTS) with Home Assistant."
+date: 2016-12-13 07:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+ha_release: 0.35
+---
+
+Text-to-speech (TTS) enables Home Assistant to speak to you.
+
+## {% linkable_title Cache %}
+
+The component have two caches. Both caches can be controlled with the `cache` option in the  platform configuration or the service call `say`. A long time cache will be located on the file system. The in-memory cache for fast responses to media players will be auto-cleaned after a short period.
+
+## {% linkable_title Configuring a `tts` platform %}
+
+To get started, add the following lines to your `configuration.yaml` (example for google):
+
+```yaml
+# Example configuration.yaml entry for google tts service
+tts:
+  - platform: google
+```
+
+The following optional parameters can be used with any platform. However the TTS component will only look for global settings under the configuration of the first configured platform:
+
+| Parameter           | Default | Description                                                                                                                                                                                                                                                                                                                                                                               |
+|---------------------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `cache` | True    | Allow TTS to cache voice file to local storage. |
+| `cache_dir`  | tts      | Foldername or path to folder for caching files. |
+| `time_memory`     | 300     | Time to hold the voice data inside memory for fast play on media player. Minimum is 60 s and the maximum 57600 s (16 hours). |
+
+The extended example from above would look like the following sample:
+
+```yaml
+# Example configuration.yaml entry for google tts service
+tts:
+  - platform: google
+    cache: true
+    cache_dir: /tmp/tts
+    time_memory: 300
+```
+
+## {% linkable_title Service say %}
+
+Say to all `media_player` device entities:
+
+```yaml
+service: tts.platform_say
+data:
+  message: 'May the Force be with you.'
+```
+
+```yaml
+service: tts.platform_say
+entity_id: media_player.floor
+data:
+  message: 'May the Force be with you.'
+```
+
+With a template:
+
+```yaml
+service: tts.platform_say
+data_template:
+  message: 'Temperature is {% raw %}{{ sensor.temperature }}{% endraw %}.'
+  cache: false
+```
+

source/_components/tts.voicerss.markdown

@@ -0,0 +1,45 @@
+---
+layout: page
+title: "VoiceRSS"
+description: "Instructions how to setup VoiceRSS TTS with Home Assistant."
+date: 2016-12-13 07:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: voicerss.png
+ha_category: Text-to-speech
+ha_release: 0.35
+---
+
+The `voicerss` text-to-speech platform uses [VoiceRSS](http://www.voicerss.org/) Text-to-Speech engine to read a text with natural sounding voices.
+
+To enable text-to-speech with VoiceRSS, add the following lines to your `configuration.yaml`:
+
+```yaml
+# Example configuration.yaml entry
+tts:
+  - platform: voicerss
+    api_key: 'XXXXXXXX'
+```
+
+Configuration variables:
+
+- **api_key** (*Requered*): API Key for use this service.
+- **language** (*Optional*): The language to use. Defaults to `en-us`.
+- **codec** (*Optional*): Audo codec. Default is 'mp3'.
+- **format** (*Optional*): Audio sample format. Default is '8khz_8bit_mono'
+
+See on api [documentation](http://www.voicerss.org/api/documentation.aspx) for allow values.
+
+A full configuration sample:
+
+```yaml
+# Example configuration.yaml entry
+tts:
+  - platform: voicerss
+    api_key: 'XXXXX'
+    language: 'de-de'
+    codec: mp3
+    format: 8khz_8bit_mono
+```

source/_cookbook/apache_configuration.markdown

@@ -30,6 +30,8 @@ To be able to access to your home assistant instance by using https://home.examp
   ProxyPreserveHost On
   ProxyRequests Off
   ServerName home.example.org
+  ProxyPass /api/websocket ws://localhost:8123/api/websocket
+  ProxyPassReverse /api/websocket ws://localhost:8123/api/websocket
   ProxyPass / http://localhost:8123/
   ProxyPassReverse / http://localhost:8123/
 </VirtualHost>
@@ -74,6 +76,8 @@ To access this instance by using https://countryside.example.org add to `/etc/ht
   ProxyPreserveHost On
   ProxyRequests Off
   ServerName countryside.example.org
+  ProxyPass /api/websocket ws://localhost:8123/api/websocket
+  ProxyPassReverse /api/websocket ws://localhost:8123/api/websocket
   ProxyPass / http://localhost:8124/
   ProxyPassReverse / http://localhost:8124/
 </VirtualHost>

source/_ecosystem/hadashboard/hapush.markdown

@@ -9,7 +9,9 @@ sharing: true
 footer: true
 ---
 
-(Not necessary if you are using Docker)
+# Installing hapush (Manual install only)
+
+This is not necessary if you are using Docker as it is already installed. 
 
 When you have the dashboard correctly displaying and interacting with Home Assistant you are ready to install the final component - `hapush`. Without `hapush` the dashboard would not respond to events that happen outside of the hadashboard system. For instance, if someone uses the Home Assistant interface to turn on a light, or even another App or physical switch, there is no way for the Dashboard to reflect this change. This is where `hapush` comes in.
 

source/_ecosystem/hadashboard/installation.markdown

@@ -34,19 +34,25 @@ $ cd hadashboard
 $ docker build -t hadashboard .
 ```
 
-When the build completes, you can run the dashboard with:
+When the build completes, you can run the dashboard with the following command for unix based systems:
 
 ```bash
 $ docker run --name="hadashboard" -d -v <path_to_hadashboard>/dashboards:/app/dashboards -v <path_to_hadashboard>/lib/ha_conf.rb:/app/lib/ha_conf.rb -v <path_to_hadashboard>/hapush:/app/hapush --net=host hadashboard
 ```
 
+If you are running docker on windows you should not use the `--net` command and explicitly specify the port, aslo for security reason `--net=host` should not be used so the following can also be used in unix. This will also set the process to start when the docker process starts so you do not have to worry about reboots. To map the volumes make sure you have ticked the shred drives in the settings. In this example I am using `c:\hadashboard` as the location where the git clone was done and mapping to port 3030 on the host. 
+
+```powershell
+docker run --restart=always --name="hadashboard" -p 3030:3030 -d -v C:/hadashboard/dashboards:/app/dashboards -v C:/hadashboard/lib/ha_conf.rb:/app/lib/ha_conf.rb -v C:/hadashboard/hapush:/app/hapush hadashboard 
+```
+
 This will use all of the same configuration files as specified below in the configuration sections, although you will need to make a few changes to the `hapush` configuration to match the docker's filesystem, detailed below.
 
 By default, the docker instance should pick up your timezone but if you want to explicitly set it you can add an environment variable for your specific zone as follows:
 
-```
+```bash
  -e "TZ=Europe/Amsterdam"
- ```
+```
 
 ### {% linkable_title Docker on Raspberry Pi %}
 
@@ -109,6 +115,8 @@ You will need to research what works on your particular architecture and also be
 
 Note: This is currently running on various versions of Ruby and there are no strong dependencies however your mileage may vary.
 
+## {% linkable_title Updating configuration (Manual and Docker) %}
+
 Next, in the `./lib` directory, copy the ha_conf.rb.example file to ha_conf.rb and edit its settings to reflect your installation, pointing to the machine Home Assistant is running on and adding your api_key.
 
 ```ruby
@@ -128,12 +136,13 @@ $news_feeds = {
 }
 ```
 
-You can leave these alone for now or if you prefer customize them as described in the News widget section below.
+You can leave these alone for now or if you prefer customize them as described in the News widget section.
 
-When you are done, you can start a local webserver like this:
+When you are done, you can start a local webserver like this or if you are on docker it should start when you start the container.
 
-``` bash
+```bash
 $ dashing start
 ```
 
-Point your browser to **http://localhost:3030** to access the hadashboard on your local machine.and you should see the supplied default dashboard.
+Point your browser to **http://localhost:3030** to access the hadashboard on your local machine.and you should see the supplied default dashboard. If you want to access it remotely ensure you have opened any required firewall rules. 
+

source/_posts/2016-12-17-text-to-speech-aquostv-flic-zamg.markdown

@@ -0,0 +1,131 @@
+---
+layout: post
+title: "0.35: Text-to-speech, VLC, Flic, netdata"
+description: "Home Assistant learned to speak, VLC and AquosTV mediaplayer, Netdata, ZMAG, Flic, and Broadlink"
+date: 2016-12-17 08:04:05 +0000
+date_formatted: "December 17, 2016"
+author: Fabian Affolter et al.
+author_twitter: fabaff
+comments: true
+categories: Release-Notes
+og_image: /images/blog/2016-12-0.35/social.png
+---
+
+5000 stars on GitHub, 2000 people in out Gitter chatroom and over a million monthly pageviews. I don't think we could wish for a better place to be at the end of 2016. Feels like an early Christmas present! Our early one for you is 0.35. It's not a single thing inside a nice wrapping, more like several little gifts inside the 0.35 box.
+
+This will be the last release of 2016 as our developers are taking a well deserved break. We will be back in 2017!
+
+## {% linkable_title Text to Speech %}
+With the addition of a [text-to-speech][tts] component by [@pvizeli] we have been able to bring Home Assistant to a whole new level. The text-to-speech component will take in any text and will play it on a media player that supports to play media. We have tested this on Sonos, Chromecast, and Google Home.
+
+https://www.youtube.com/watch?v=Ke0QuoJ4tRM
+
+## {% linkable_title Call for help with HASSbian (our Raspberry Pi image) %}
+In an effort to make Home Assistant, we're planning to extend the things that people can do out of the box with HASSbian, our Raspberry Pi image. As you might know, the image is currently maintained by [@Landrash]. However he also spends a lot of time on improving the docs and helping out with a ton of other things.
+
+So if you know your Linux-foo and would love to contribute to open source, join the [Hassbian developer chat](https://gitter.im/home-assistant/hassbian) and take a stab at one of [our open issues](https://github.com/home-assistant/pi-gen/issues).
+
+## {% linkable_title VLC media player, Broadlink, and GPSLogger %}
+Let you control [VLC media player][vlc-media] and  play sound on connected speakers.
+
+This Broadlink [switch][bl-switch] platform allow to you control Broadlink RM2 Pro and RM mini IR+RF devices. This Broadlink [sensor][bl-sensor] platform adds support for Broadlink RM2 and A1 Devices.
+
+The [GPSLogger](https://home-assistant.io/components/device_tracker.gpslogger/) now also supports attributes as the speed, direction, altitude, provider, and activity.
+
+## {% linkable_title All changes %}
+- Media player: Support for Sharp [AquaosTV][aquostv] ([@titilambert])
+- Media player: [VLC][vlc-media] support ([@Danielhiversen])
+- Switch: Digital Loggers relay([@dethpickle])
+- Sensor: Support for [Netdata][netdata] ([@fabaff], [@ezar])
+- Sensor: Support weather conditions from Austrian [ZAMG][zamg] ([@mjl])
+- Verisure: Add Verisure smartcam capture service ([@turbokongen])
+- Binary sensor: [Flic][flic] button support added ([@soldag])
+- Sensor: Support for [SenseHat][sensehat] ([@farminf])
+- Binary sensor: [Hikvision][hikvision] binary sensor support ([@mezz64])
+- [Text-to-speech][tts] support ([@pvizeli])
+- Sensor: Support for Broadlink [sensors][bl-sensor] ([@Danielhiversen])
+- Switch: Broadlink [switches][bl-switch] supported now ([@Danielhiversen])
+
+- Media player: Add `source_list` to universal media player ([@danieljkemp])
+- Binary Sensor: Support improvement for Wink ([@w1ll1am23])
+- Sensor: More features for DSMR ([@aequitas])
+- Automation: Parse payload as JSON ([@balloob])
+- Mediap player - Cast: New progress indicator ([@balloob])
+- Device tracker: New attributes ([@balloob], [@Danielhiversen])
+- Binary sensor - netatmo: Add support for tags ([@jabesq])
+- Climate: Add `away_mode` for RadioThermostat ([@trisk])
+- Device tracker - nmap: Make scan option configurable ([@Danielhiversen])
+- Climate - Ecobee: Add SmartAway option ([@devdelay])
+- Light - Hue: Add support for Hue LightGroups ([@michaelarnauts])
+- Media player - Emby: New support for trailer and media position ([@mezz64])
+- Camera - Amcrest: Support for resolution ([@tchellomello])
+- Media player - Kodi: Authentification fixed and fan art ([@balloob], [@joopert])
+- Minor and not so minor features and bug fixes by [@pvizeli], [@jminn], [@magicus], [@teodoc], [@fabaff], [@technicalpickles], [@balloob], [@lukas-hetzenecker], [@rubund], [@dasos], [@trisk], [@armills], [@auduny], [@lwis], [@nkgilley], [@janLo], [@keatontaylor], [@stefan-jonasson], [@Jypy], [@jawilson], [@DavidLP], [@molobrakos], [@jabesq], [@joerocklin], [@kellerza], [@kirichkov], and [@danielperna84].
+
+### {% linkable_title  If you need help... %}
+...don't hesitate to use our [Forum](https://community.home-assistant.io/) or join us for a little [chat](https://gitter.im/home-assistant/home-assistant). The release notes have comments enabled but it's preferred if you use the former communication channels. Thanks.
+
+### {% linkable_title  Reporting Issues %}
+Experiencing issues introduced by this release? Please report them in our [issue tracker](https://github.com/home-assistant/home-assistant/issues). Make sure to fill in all fields of the issue template.
+
+
+[@aequitas]: https://github.com/aequitas
+[@armills]: https://github.com/armills
+[@auduny]: https://github.com/auduny
+[@balloob]: https://github.com/balloob
+[@Danielhiversen]: https://github.com/Danielhiversen
+[@danieljkemp]: https://github.com/danieljkemp
+[@danielperna84]: https://github.com/danielperna84
+[@dasos]: https://github.com/dasos
+[@DavidLP]: https://github.com/DavidLP
+[@dethpickle]: https://github.com/dethpickle
+[@devdelay]: https://github.com/devdelay
+[@ezar]: https://github.com/ezar
+[@fabaff]: https://github.com/fabaff
+[@farminf]: https://github.com/farminf
+[@jabesq]: https://github.com/jabesq
+[@janLo]: https://github.com/janLo
+[@janLo]: https://github.com/janLo
+[@jawilson]: https://github.com/jawilson
+[@jawilson]: https://github.com/jawilson
+[@jminn]: https://github.com/jminn
+[@joerocklin]: https://github.com/joerocklin
+[@joopert]: https://github.com/joopert
+[@Jypy]: https://github.com/Jypy
+[@keatontaylor]: https://github.com/keatontaylor
+[@kellerza]: https://github.com/kellerza
+[@kirichkov]: https://github.com/kirichkov
+[@Landrash]: https://github.com/Landrash
+[@lukas-hetzenecker]: https://github.com/lukas-hetzenecker
+[@lwis]: https://github.com/lwis
+[@magicus]: https://github.com/magicus
+[@MartinHjelmare]: https://github.com/MartinHjelmare
+[@mezz64]: https://github.com/mezz64
+[@michaelarnauts]: https://github.com/michaelarnauts
+[@mjl]: https://github.com/mjl
+[@molobrakos]: https://github.com/molobrakos
+[@nkgilley]: https://github.com/nkgilley
+[@pvizeli]: https://github.com/pvizeli
+[@rubund]: https://github.com/rubund
+[@rubund]: https://github.com/rubund
+[@soldag]: https://github.com/soldag
+[@stefan-jonasson]: https://github.com/stefan-jonasson
+[@tchellomello]: https://github.com/tchellomello
+[@technicalpickles]: https://github.com/technicalpickles
+[@teodoc]: https://github.com/teodoc
+[@titilambert]: https://github.com/titilambert
+[@trisk]: https://github.com/trisk
+[@turbokongen]: https://github.com/turbokongen
+[@w1ll1am23]: https://github.com/w1ll1am23
+
+[vlc-media]: https://home-assistant.io/components/media_player.vlc/
+[aquostv]: https://home-assistant.io/components/media_player.aquostv/
+[digitalloggers]: https://home-assistant.io/components/switch.digitalloggers/
+[netdata]: https://home-assistant.io/components/switch.digitalloggers/
+[bl-sensor]: https://home-assistant.io/components/sensor.broadlink/
+[bl-switch]: https://home-assistant.io/components/switch.broadlink/
+[hikvision]: https://home-assistant.io/components/binary_sensor.hikvision/
+[zamg]: https://home-assistant.io/components/sensor.zamg/
+[flic]: https://home-assistant.io/components/binary_sensor.flic/
+[sensehat]: https://home-assistant.io/components/sensor.sensehat/
+[tts]: https://home-assistant.io/components/tts/

source/getting-started/automation-templating.markdown

@@ -68,6 +68,7 @@ The following tables show the available trigger data per platform.
 | `trigger.platform` | Hardcoded: `mqtt`.
 | `trigger.topic` | Topic that received payload.
 | `trigger.payload` | Payload.
+| `trigger.payload_json` | Dictonary of the JSON parsed payload.
 | `trigger.qos` | QOS of payload.
 
 ### {% linkable_title numeric_state %}