Merge pull request #7335 from home-assistant/release-0-43-2

0.43.2
Right fix for Python Open Z-Wave in Docker (#7337 )
2017-04-27 12:42:25 -07:00 · 2017-04-27 09:28:40 -07:00 · 2017-04-27 09:27:31 -07:00 · 2017-04-27 09:05:58 -07:00 · 2017-04-27 09:05:58 -07:00 · 2017-04-27 09:03:54 -07:00
346 changed files with 11953 additions and 5367 deletions
@@ -8,6 +8,9 @@ omit =
    homeassistant/helpers/signal.py

    # omit pieces of code that rely on external devices being present
+    homeassistant/components/alarmdecoder.py
+    homeassistant/components/*/alarmdecoder.py
+
    homeassistant/components/apcupsd.py
    homeassistant/components/*/apcupsd.py

@@ -94,6 +97,9 @@ omit =

    homeassistant/components/*/thinkingcleaner.py

+    homeassistant/components/tradfri.py
+    homeassistant/components/*/tradfri.py
+
    homeassistant/components/twilio.py
    homeassistant/components/notify/twilio_sms.py
    homeassistant/components/notify/twilio_call.py
@@ -147,17 +153,19 @@ omit =

    homeassistant/components/tado.py
    homeassistant/components/*/tado.py
-    
+
    homeassistant/components/alarm_control_panel/alarmdotcom.py
    homeassistant/components/alarm_control_panel/concord232.py
    homeassistant/components/alarm_control_panel/nx584.py
    homeassistant/components/alarm_control_panel/simplisafe.py
+    homeassistant/components/alarm_control_panel/totalconnect.py
    homeassistant/components/apiai.py
    homeassistant/components/binary_sensor/arest.py
    homeassistant/components/binary_sensor/concord232.py
    homeassistant/components/binary_sensor/flic.py
    homeassistant/components/binary_sensor/hikvision.py
    homeassistant/components/binary_sensor/iss.py
+    homeassistant/components/binary_sensor/ping.py
    homeassistant/components/binary_sensor/rest.py
    homeassistant/components/browser.py
    homeassistant/components/camera/amcrest.py
@@ -174,7 +182,6 @@ omit =
    homeassistant/components/climate/oem.py
    homeassistant/components/climate/proliphix.py
    homeassistant/components/climate/radiotherm.py
-    homeassistant/components/config/zwave.py
    homeassistant/components/cover/garadget.py
    homeassistant/components/cover/homematic.py
    homeassistant/components/cover/myq.py
@@ -224,17 +231,22 @@ omit =
    homeassistant/components/light/flux_led.py
    homeassistant/components/light/hue.py
    homeassistant/components/light/hyperion.py
-    homeassistant/components/light/lifx.py
+    homeassistant/components/light/lifx/*.py
+    homeassistant/components/light/lifx_legacy.py
    homeassistant/components/light/limitlessled.py
+    homeassistant/components/light/mystrom.py
    homeassistant/components/light/osramlightify.py
+    homeassistant/components/light/rpi_gpio_pwm.py
+    homeassistant/components/light/piglow.py
    homeassistant/components/light/tikteck.py
+    homeassistant/components/light/tradfri.py
    homeassistant/components/light/x10.py
    homeassistant/components/light/yeelight.py
    homeassistant/components/light/yeelightsunflower.py
-    homeassistant/components/light/piglow.py
    homeassistant/components/light/zengge.py
    homeassistant/components/lirc.py
    homeassistant/components/lock/nuki.py
+    homeassistant/components/lock/lockitron.py
    homeassistant/components/media_player/anthemav.py
    homeassistant/components/media_player/apple_tv.py
    homeassistant/components/media_player/aquostv.py
@@ -271,6 +283,7 @@ omit =
    homeassistant/components/media_player/samsungtv.py
    homeassistant/components/media_player/snapcast.py
    homeassistant/components/media_player/sonos.py
+    homeassistant/components/media_player/spotify.py
    homeassistant/components/media_player/squeezebox.py
    homeassistant/components/media_player/vlc.py
    homeassistant/components/media_player/volumio.py
@@ -312,6 +325,7 @@ omit =
    homeassistant/components/remote/harmony.py
    homeassistant/components/remote/itach.py
    homeassistant/components/scene/hunterdouglas_powerview.py
+    homeassistant/components/scene/lifx_cloud.py
    homeassistant/components/sensor/amcrest.py
    homeassistant/components/sensor/arest.py
    homeassistant/components/sensor/arwn.py
@@ -323,6 +337,7 @@ omit =
    homeassistant/components/sensor/coinmarketcap.py
    homeassistant/components/sensor/comed_hourly_pricing.py
    homeassistant/components/sensor/cpuspeed.py
+    homeassistant/components/sensor/crimereports.py
    homeassistant/components/sensor/cups.py
    homeassistant/components/sensor/currencylayer.py
    homeassistant/components/sensor/darksky.py
@@ -332,6 +347,7 @@ omit =
    homeassistant/components/sensor/dovado.py
    homeassistant/components/sensor/dte_energy_bridge.py
    homeassistant/components/sensor/ebox.py
+    homeassistant/components/sensor/eddystone_temperature.py
    homeassistant/components/sensor/eliqonline.py
    homeassistant/components/sensor/emoncms.py
    homeassistant/components/sensor/fastdotcom.py
@@ -357,9 +373,11 @@ omit =
    homeassistant/components/sensor/linux_battery.py
    homeassistant/components/sensor/loopenergy.py
    homeassistant/components/sensor/lyft.py
+    homeassistant/components/sensor/metoffice.py
    homeassistant/components/sensor/miflora.py
    homeassistant/components/sensor/modem_callerid.py
    homeassistant/components/sensor/mqtt_room.py
+    homeassistant/components/sensor/mvglive.py
    homeassistant/components/sensor/netdata.py
    homeassistant/components/sensor/neurio_energy.py
    homeassistant/components/sensor/nut.py
@@ -368,6 +386,7 @@ omit =
    homeassistant/components/sensor/onewire.py
    homeassistant/components/sensor/openevse.py
    homeassistant/components/sensor/openexchangerates.py
+    homeassistant/components/sensor/opensky.py
    homeassistant/components/sensor/openweathermap.py
    homeassistant/components/sensor/pi_hole.py
    homeassistant/components/sensor/plex.py
@@ -425,18 +444,17 @@ omit =
    homeassistant/components/switch/tplink.py
    homeassistant/components/switch/transmission.py
    homeassistant/components/switch/wake_on_lan.py
-    homeassistant/components/telegram_webhooks.py
+    homeassistant/components/telegram_bot/*
    homeassistant/components/thingspeak.py
    homeassistant/components/tts/amazon_polly.py
    homeassistant/components/tts/picotts.py
    homeassistant/components/upnp.py
    homeassistant/components/weather/bom.py
+    homeassistant/components/weather/metoffice.py
    homeassistant/components/weather/openweathermap.py
    homeassistant/components/weather/zamg.py
    homeassistant/components/zeroconf.py
-    homeassistant/components/zwave/__init__.py
    homeassistant/components/zwave/util.py
-    homeassistant/components/zwave/workaround.py


 [report]
@@ -1,15 +1,4 @@
 config/*
-!config/home-assistant.conf.default
-
-# There is not a better solution afaik..
-!config/custom_components
-config/custom_components/*
-!config/custom_components/example.py
-!config/custom_components/hello_world.py
-!config/custom_components/mqtt_example.py
-!config/panels
-config/panels/*
-!config/panels/react.html

 tests/testing_config/deps
 tests/testing_config/home-assistant.log
@@ -8,6 +8,7 @@ MAINTAINER Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>
 #ENV INSTALL_OPENZWAVE no
 #ENV INSTALL_LIBCEC no
 #ENV INSTALL_PHANTOMJS no
+#ENV INSTALL_COAP_CLIENT no

 VOLUME /config

@@ -21,7 +22,7 @@ RUN virtualization/Docker/setup_docker_prereqs
 # Install hass component dependencies
 COPY requirements_all.txt requirements_all.txt
 RUN pip3 install --no-cache-dir -r requirements_all.txt && \
-    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop
+    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop cchardet

 # Copy source
 COPY . .
@@ -1,9 +1,7 @@
 Home Assistant |Build Status| |Coverage Status| |Join the chat at https://gitter.im/home-assistant/home-assistant| |Join the dev chat at https://gitter.im/home-assistant/home-assistant/devs|
 ==============================================================================================================================================================================================

-Home Assistant is a home automation platform running on Python 3. The
-goal of Home Assistant is to be able to track and control all devices at
-home and offer a platform for automating control.
+Home Assistant is a home automation platform running on Python 3. It is able to track and control all devices at home and offer a platform for automating control.

 To get started:

@@ -12,83 +10,22 @@ To get started:
    python3 -m pip install homeassistant
    hass --open-ui

-Check out `the website <https://home-assistant.io>`__ for `a
-demo <https://home-assistant.io/demo/>`__, installation instructions,
-tutorials and documentation.
+Check out `home-assistant.io <https://home-assistant.io>`__ for `a
+demo <https://home-assistant.io/demo/>`__, `installation instructions <https://home-assistant.io/getting-started/>`__,
+`tutorials <https://home-assistant.io/getting-started/automation-2/>`__ and `documentation <https://home-assistant.io/docs/>`__.

 |screenshot-states|

-Examples of devices Home Assistant can interface with:
+Featured integrations
+---------------------

-  Monitoring connected devices to a wireless router:
-   `OpenWrt <https://openwrt.org/>`__,
-   `Tomato <http://www.polarcloud.com/tomato>`__,
-   `Netgear <http://netgear.com>`__,
-   `DD-WRT <http://www.dd-wrt.com/site/index>`__,
-   `TPLink <http://www.tp-link.us/>`__,
-   `ASUSWRT <http://event.asus.com/2013/nw/ASUSWRT/>`__,
-   `Xiaomi <http://miwifi.com/>`__ and any SNMP
-   capable Linksys WAP/WRT
-  `Philips Hue <http://meethue.com>`__ lights,
-   `WeMo <http://www.belkin.com/us/Products/home-automation/c/wemo-home-automation/>`__
-   switches, `Edimax <http://www.edimax.com/>`__ switches,
-   `Efergy <https://efergy.com>`__ energy monitoring, and
-   `Tellstick <http://www.telldus.se/products/tellstick>`__ devices and
-   sensors
-  `Google
-   Chromecasts <http://www.google.com/intl/en/chrome/devices/chromecast>`__,
-   `Music Player Daemon <http://www.musicpd.org/>`__, `Logitech
-   Squeezebox <https://en.wikipedia.org/wiki/Squeezebox_%28network_music_player%29>`__,
-   `Plex <https://plex.tv/>`__, `Kodi (XBMC) <http://kodi.tv/>`__,
-   iTunes (by way of
-   `itunes-api <https://github.com/maddox/itunes-api>`__), and Amazon
-   Fire TV (by way of
-   `python-firetv <https://github.com/happyleavesaoc/python-firetv>`__)
-  Support for
-   `ISY994 <https://www.universal-devices.com/residential/isy994i-series/>`__
-   (Insteon and X10 devices), `Z-Wave <http://www.z-wave.com/>`__, `Nest
-   Thermostats <https://nest.com/>`__,
-   `RFXtrx <http://www.rfxcom.com/>`__,
-   `Arduino <https://www.arduino.cc/>`__, `Raspberry
-   Pi <https://www.raspberrypi.org/>`__, and
-   `Modbus <http://www.modbus.org/>`__
-  Interaction with `IFTTT <https://ifttt.com/>`__
-  Integrate data from the `Bitcoin <https://bitcoin.org>`__ network,
-   meteorological data from
-   `OpenWeatherMap <http://openweathermap.org/>`__ and
-   `Forecast.io <https://forecast.io/>`__,
-   `Transmission <http://www.transmissionbt.com/>`__, or
-   `SABnzbd <http://sabnzbd.org>`__.
-  `See full list of supported
-   devices <https://home-assistant.io/components/>`__
+|screenshot-components|

-Build home automation on top of your devices:
-
-  Keep a precise history of every change to the state of your house
-  Turn on the lights when people get home after sunset
-  Turn on lights slowly during sunset to compensate for less light
-  Turn off all lights and devices when everybody leaves the house
-  Offers a `REST API <https://home-assistant.io/developers/rest_api/>`__
-   and can interface with MQTT for easy integration with other projects
-   like `OwnTracks <http://owntracks.org/>`__
-  Allow sending notifications using
-   `Instapush <https://instapush.im>`__, `Notify My Android
-   (NMA) <http://www.notifymyandroid.com/>`__,
-   `PushBullet <https://www.pushbullet.com/>`__,
-   `PushOver <https://pushover.net/>`__,
-   `Slack <https://slack.com/>`__,
-   `Telegram <https://telegram.org/>`__, `Join <http://joaoapps.com/join/>`__, and `Jabber
-   (XMPP) <http://xmpp.org>`__
-
-The system is built using a modular approach so support for other devices or actions can
-be implemented easily. See also the `section on
-architecture <https://home-assistant.io/developers/architecture/>`__
-and the `section on creating your own
+The system is built using a modular approach so support for other devices or actions can be implemented easily. See also the `section on architecture <https://home-assistant.io/developers/architecture/>`__ and the `section on creating your own
 components <https://home-assistant.io/developers/creating_components/>`__.

 If you run into issues while using Home Assistant or during development
-of a component, check the `Home Assistant help
-section <https://home-assistant.io/help/>`__ of our website for further help and information.
+of a component, check the `Home Assistant help section <https://home-assistant.io/help/>`__ of our website for further help and information.

 .. |Build Status| image:: https://travis-ci.org/home-assistant/home-assistant.svg?branch=master
   :target: https://travis-ci.org/home-assistant/home-assistant
@@ -100,3 +37,5 @@ section <https://home-assistant.io/help/>`__ of our website for further help and
   :target: https://gitter.im/home-assistant/home-assistant/devs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 .. |screenshot-states| image:: https://raw.github.com/home-assistant/home-assistant/master/docs/screenshots.png
   :target: https://home-assistant.io/demo/
+.. |screenshot-components| image:: https://raw.github.com/home-assistant/home-assistant/dev/docs/screenshot-components.png
+   :target: https://home-assistant.io/components/
@@ -1,158 +0,0 @@
-homeassistant:
-  # Omitted values in this section will be auto detected using freegeoip.io
-
-  # Location required to calculate the time the sun rises and sets.
-  # Coordinates are also used for location for weather related components.
-  # Google Maps can be used to determine more precise GPS coordinates.
-  latitude: 32.87336
-  longitude: 117.22743
-
-  # Impacts weather/sunrise data
-  elevation: 665
-
-  # 'metric' for Metric System, 'imperial' for imperial system
-  unit_system: metric
-
-  # Pick yours from here:
-  # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-  time_zone: America/Los_Angeles
-
-  # Name of the location where Home Assistant is running
-  name: Home
-
-http:
-  api_password: mypass
-  # Set to 1 to enable development mode
-  # development: 1
-
-# Enable the frontend
-frontend:
-
-light:
-#  platform: hue
-
-wink:
-  # Get your token at https://winkbearertoken.appspot.com
-  access_token: 'YOUR_TOKEN'
-
-device_tracker:
-  # The following tracker are available:
-  # https://home-assistant.io/components/#presence-detection
-  platform: netgear
-  host: 192.168.1.1
-  username: admin
-  password: PASSWORD
-
-switch:
-  platform: wemo
-
-climate:
-  platform: nest
-  # Required: username and password that are used to login to the Nest thermostat.
-  username: myemail@mydomain.com
-  password: mypassword
-
-downloader:
-  download_dir: downloads
-
-notify:
-  platform: pushbullet
-  api_key: ABCDEFGHJKLMNOPQRSTUVXYZ
-
-device_sun_light_trigger:
-  # Optional: specify a specific light/group of lights that has to be turned on
-  light_group: group.living_room
-  # Optional: specify which light profile to use when turning lights on
-  light_profile: relax
-  # Optional: disable lights being turned off when everybody leaves the house
-  # disable_turn_off: 1
-
-# A comma separated list of states that have to be tracked as a single group
-# Grouped states should share the same type of states (ON/OFF or HOME/NOT_HOME)
-# You can also have groups within groups.
-# https://home-assistant.io/components/group/
-group:
-  default_view:
-    view: yes
-    entities:
-      - group.awesome_people
-      - group.climate
-  kitchen:
-    name: Kitchen
-    entities:
-      - switch.kitchen_pin_3
-  upstairs:
-    name: Kids
-    icon: mdi:account-multiple
-    view: yes
-    entities:
-      - input_boolean.notify_home
-      - camera.demo_camera
-
-browser:
-keyboard:
-
-# https://home-assistant.io/getting-started/automation/
-automation:
-  - alias: Turn on light when sun sets
-    trigger:
-      platform: sun
-      event: sunset
-      offset: "-01:00:00"
-    condition:
-      condition: state
-      entity_id: group.all_devices
-      state: 'home'
-    action:
-      service: light.turn_on
-
-# Another way to do is to collect all entries under one "sensor:"
-# sensor:
-#   - platform: mqtt
-#     name: "MQTT Sensor 1"
-#   - platform: mqtt
-#     name: "MQTT Sensor 2"
-#
-# Details: https://home-assistant.io/getting-started/devices/
-
-sensor:
-  platform: systemmonitor
-  resources:
-    - type: 'disk_use_percent'
-      arg: '/'
-    - type: 'disk_use_percent'
-      arg: '/home'
-
-sensor 2:
-  platform: cpuspeed
-
-script:
-  wakeup:
-    alias: Wake Up
-    sequence:
-      - event: LOGBOOK_ENTRY
-        event_data:
-          name: Paulus
-          message: is waking up
-          entity_id: device_tracker.paulus
-          domain: light
-      - alias: Bedroom lights on
-        service: light.turn_on
-        data:
-          entity_id: group.bedroom
-          brightness: 100
-      - delay:
-          minutes: 1
-      - alias: Living room lights on
-        service: light.turn_on
-        data:
-          entity_id: group.living_room
-
-scene:
-  - name: Romantic
-    entities:
-      light.tv_back_light: on
-      light.ceiling:
-        state: on
-        xy_color: [0.33, 0.66]
-        brightness: 200
@@ -1,149 +0,0 @@
-"""
-Example of a custom component.
-
-Example component to target an entity_id to:
- - turn it on at 7AM in the morning
- - turn it on if anyone comes home and it is off
- - turn it off if all lights are turned off
- - turn it off if all people leave the house
- - offer a service to turn it on for 10 seconds
-
-Configuration:
-
-To use the Example custom component you will need to add the following to
-your configuration.yaml file.
-
-example:
-  target: TARGET_ENTITY
-
-Variable:
-
-target
-*Required
-TARGET_ENTITY should be one of your devices that can be turned on and off,
-ie a light or a switch. Example value could be light.Ceiling or switch.AC
-(if you have these devices with those names).
-"""
-import time
-import logging
-
-from homeassistant.const import STATE_HOME, STATE_NOT_HOME, STATE_ON, STATE_OFF
-from homeassistant.helpers import validate_config
-from homeassistant.helpers.event_decorators import \
-    track_state_change, track_time_change
-from homeassistant.helpers.service import service
-import homeassistant.components as core
-from homeassistant.components import device_tracker
-from homeassistant.components import light
-
-# The domain of your component. Should be equal to the name of your component.
-DOMAIN = "example"
-
-# List of component names (string) your component depends upon.
-# We depend on group because group will be loaded after all the components that
-# initialize devices have been setup.
-DEPENDENCIES = ['group', 'device_tracker', 'light']
-
-# Configuration key for the entity id we are targeting.
-CONF_TARGET = 'target'
-
-# Variable for storing configuration parameters.
-TARGET_ID = None
-
-# Name of the service that we expose.
-SERVICE_FLASH = 'flash'
-
-# Shortcut for the logger
-_LOGGER = logging.getLogger(__name__)
-
-
-def setup(hass, config):
-    """Setup example component."""
-    global TARGET_ID
-
-    # Validate that all required config options are given.
-    if not validate_config(config, {DOMAIN: [CONF_TARGET]}, _LOGGER):
-        return False
-
-    TARGET_ID = config[DOMAIN][CONF_TARGET]
-
-    # Validate that the target entity id exists.
-    if hass.states.get(TARGET_ID) is None:
-        _LOGGER.error("Target entity id %s does not exist",
-                      TARGET_ID)
-
-        # Tell the bootstrapper that we failed to initialize and clear the
-        # stored target id so our functions don't run.
-        TARGET_ID = None
-        return False
-
-    # Tell the bootstrapper that we initialized successfully.
-    return True
-
-
-@track_state_change(device_tracker.ENTITY_ID_ALL_DEVICES)
-def track_devices(hass, entity_id, old_state, new_state):
-    """Called when the group.all devices change state."""
-    # If the target id is not set, return
-    if not TARGET_ID:
-        return
-
-    # If anyone comes home and the entity is not on, turn it on.
-    if new_state.state == STATE_HOME and not core.is_on(hass, TARGET_ID):
-
-        core.turn_on(hass, TARGET_ID)
-
-    # If all people leave the house and the entity is on, turn it off.
-    elif new_state.state == STATE_NOT_HOME and core.is_on(hass, TARGET_ID):
-
-        core.turn_off(hass, TARGET_ID)
-
-
-@track_time_change(hour=7, minute=0, second=0)
-def wake_up(hass, now):
-    """Turn light on in the morning.
-
-    Turn the light on at 7 AM if there are people home and it is not already
-    on.
-    """
-    if not TARGET_ID:
-        return
-
-    if device_tracker.is_on(hass) and not core.is_on(hass, TARGET_ID):
-        _LOGGER.info('People home at 7AM, turning it on')
-        core.turn_on(hass, TARGET_ID)
-
-
-@track_state_change(light.ENTITY_ID_ALL_LIGHTS, STATE_ON, STATE_OFF)
-def all_lights_off(hass, entity_id, old_state, new_state):
-    """If all lights turn off, turn off."""
-    if not TARGET_ID:
-        return
-
-    if core.is_on(hass, TARGET_ID):
-        _LOGGER.info('All lights have been turned off, turning it off')
-        core.turn_off(hass, TARGET_ID)
-
-
-@service(DOMAIN, SERVICE_FLASH)
-def flash_service(hass, call):
-    """Service that will toggle the target.
-
-    Set the light to off for 10 seconds if on and vice versa.
-    """
-    if not TARGET_ID:
-        return
-
-    if core.is_on(hass, TARGET_ID):
-        core.turn_off(hass, TARGET_ID)
-
-        time.sleep(10)
-
-        core.turn_on(hass, TARGET_ID)
-
-    else:
-        core.turn_on(hass, TARGET_ID)
-
-        time.sleep(10)
-
-        core.turn_off(hass, TARGET_ID)
@@ -1,27 +0,0 @@
-"""
-The "hello world" custom component.
-
-This component implements the bare minimum that a component should implement.
-
-Configuration:
-
-To use the hello_word component you will need to add the following to your
-configuration.yaml file.
-
-hello_world:
-"""
-
-# The domain of your component. Should be equal to the name of your component.
-DOMAIN = "hello_world"
-
-# List of component names (string) your component depends upon.
-DEPENDENCIES = []
-
-
-def setup(hass, config):
-    """Setup our skeleton component."""
-    # States are in the format DOMAIN.OBJECT_ID.
-    hass.states.set('hello_world.Hello_World', 'Works!')
-
-    # Return boolean to indicate that initialization was successfully.
-    return True
@@ -1,55 +0,0 @@
-"""
-Example of a custom MQTT component.
-
-Shows how to communicate with MQTT. Follows a topic on MQTT and updates the
-state of an entity to the last message received on that topic.
-
-Also offers a service 'set_state' that will publish a message on the topic that
-will be passed via MQTT to our message received listener. Call the service with
-example payload {"new_state": "some new state"}.
-
-Configuration:
-
-To use the mqtt_example component you will need to add the following to your
-configuration.yaml file.
-
-mqtt_example:
-  topic: "home-assistant/mqtt_example"
-"""
-import homeassistant.loader as loader
-
-# The domain of your component. Should be equal to the name of your component.
-DOMAIN = "mqtt_example"
-
-# List of component names (string) your component depends upon.
-DEPENDENCIES = ['mqtt']
-
-CONF_TOPIC = 'topic'
-DEFAULT_TOPIC = 'home-assistant/mqtt_example'
-
-
-def setup(hass, config):
-    """Setup the MQTT example component."""
-    mqtt = loader.get_component('mqtt')
-    topic = config[DOMAIN].get('topic', DEFAULT_TOPIC)
-    entity_id = 'mqtt_example.last_message'
-
-    # Listen to a message on MQTT.
-    def message_received(topic, payload, qos):
-        """A new MQTT message has been received."""
-        hass.states.set(entity_id, payload)
-
-    mqtt.subscribe(hass, topic, message_received)
-
-    hass.states.set(entity_id, 'No messages')
-
-    # Service to publish a message on MQTT.
-    def set_state_service(call):
-        """Service to send a message."""
-        mqtt.publish(hass, topic, call.data.get('new_state'))
-
-    # Register our service with Home Assistant.
-    hass.services.register(DOMAIN, 'set_state', set_state_service)
-
-    # Return boolean to indicate that initialization was successfully.
-    return True
@@ -1,432 +0,0 @@
-<!--
-Custom Home Assistant panel example.
-
-Currently only works in Firefox and Chrome because it uses ES6.
-
-Make sure this file is in <config>/panels/react.html
-
-Add to your configuration.yaml:
-
-panel_custom:
-  - name: react
-    sidebar_title: TodoMVC
-    sidebar_icon: mdi:checkbox-marked-outline
-    config:
-      title: Wow hello!
-->
-
-<script src="https://fb.me/react-15.2.1.min.js"></script>
-<script src="https://fb.me/react-dom-15.2.1.min.js"></script>
-
-<!-- for development, replace with:
-<script src="https://fb.me/react-15.2.1.js"></script>
-<script src="https://fb.me/react-dom-15.2.1.js"></script>
-->
-
-<!--
-  CSS taken from ReactJS TodoMVC example by Pete Hunt
-  http://todomvc.com/examples/react/
-->
-
-<style>
-  .todoapp input[type="checkbox"] {
-    outline: none;
-  }
-
-  .todoapp {
-    background: #fff;
-    margin: 130px 0 40px 0;
-    position: relative;
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2),
-                0 25px 50px 0 rgba(0, 0, 0, 0.1);
-  }
-
-  .todoapp h1 {
-    position: absolute;
-    top: -155px;
-    width: 100%;
-    font-size: 100px;
-    font-weight: 100;
-    text-align: center;
-    color: rgba(175, 47, 47, 0.15);
-    -webkit-text-rendering: optimizeLegibility;
-    -moz-text-rendering: optimizeLegibility;
-    text-rendering: optimizeLegibility;
-  }
-
-  .todoapp .main {
-    position: relative;
-    border-top: 1px solid #e6e6e6;
-  }
-
-  .todoapp .todo-list {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-  }
-
-  .todoapp .todo-list li {
-    position: relative;
-    font-size: 24px;
-    border-bottom: 1px solid #ededed;
-  }
-
-  .todoapp .todo-list li:last-child {
-    border-bottom: none;
-  }
-
-  .todoapp .todo-list li .toggle {
-    text-align: center;
-    width: 40px;
-    /* auto, since non-WebKit browsers doesn't support input styling */
-    height: auto;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    margin: auto 0;
-    border: none; /* Mobile Safari */
-    -webkit-appearance: none;
-    appearance: none;
-    cursor: pointer;
-  }
-
-  .todoapp .todo-list li .toggle:focus {
-    border-left: 3px solid rgba(175, 47, 47, 0.35);
-  }
-
-  .todoapp .todo-list li .toggle:after {
-    content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="-10 -18 100 135"><circle cx="50" cy="50" r="50" fill="none" stroke="#ededed" stroke-width="3"/></svg>');
-  }
-
-  .todoapp .todo-list li .toggle:checked:after {
-    content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="-10 -18 100 135"><circle cx="50" cy="50" r="50" fill="none" stroke="#bddad5" stroke-width="3"/><path fill="#5dc2af" d="M72 25L42 71 27 56l-4 4 20 20 34-52z"/></svg>');
-  }
-
-  .todoapp .todo-list li label {
-    white-space: pre-line;
-    word-break: break-all;
-    padding: 15px 60px 15px 15px;
-    margin-left: 45px;
-    display: block;
-    line-height: 1.2;
-    transition: color 0.4s;
-  }
-
-  .todoapp .todo-list li.completed label {
-    color: #d9d9d9;
-    text-decoration: line-through;
-  }
-
-  .todoapp .footer {
-    color: #777;
-    padding: 10px 15px;
-    height: 20px;
-    text-align: center;
-    border-top: 1px solid #e6e6e6;
-  }
-
-  .todoapp .footer:before {
-    content: '';
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    height: 50px;
-    overflow: hidden;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2),
-                0 8px 0 -3px #f6f6f6,
-                0 9px 1px -3px rgba(0, 0, 0, 0.2),
-                0 16px 0 -6px #f6f6f6,
-                0 17px 2px -6px rgba(0, 0, 0, 0.2);
-  }
-
-  .todoapp .todo-count {
-    float: left;
-    text-align: left;
-    font-weight: 300;
-  }
-
-  .todoapp .toggle-menu {
-    position: absolute;
-    right: 15px;
-    font-weight: 300;
-    color: rgba(175, 47, 47, 0.75);
-  }
-
-  .todoapp .filters {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    position: absolute;
-    right: 0;
-    left: 0;
-  }
-
-  .todoapp .filters li {
-    display: inline;
-  }
-
-  .todoapp .filters li a {
-    color: inherit;
-    margin: 3px;
-    padding: 3px 7px;
-    text-decoration: none;
-    border: 1px solid transparent;
-    border-radius: 3px;
-  }
-
-  .todoapp .filters li a.selected,
-  .filters li a:hover {
-    border-color: rgba(175, 47, 47, 0.1);
-  }
-
-  .todoapp .filters li a.selected {
-    border-color: rgba(175, 47, 47, 0.2);
-  }
-
-  /*
-    Hack to remove background from Mobile Safari.
-    Can't use it globally since it destroys checkboxes in Firefox
-  */
-  @media screen and (-webkit-min-device-pixel-ratio:0) {
-    .todoapp .toggle-all,
-    .todoapp .todo-list li .toggle {
-      background: none;
-    }
-
-    .todoapp .todo-list li .toggle {
-      height: 40px;
-    }
-
-    .todoapp .toggle-all {
-      -webkit-transform: rotate(90deg);
-      transform: rotate(90deg);
-      -webkit-appearance: none;
-      appearance: none;
-    }
-  }
-
-  @media (max-width: 430px) {
-    .todoapp .footer {
-      height: 50px;
-    }
-
-    .todoapp .filters {
-      bottom: 10px;
-    }
-  }
-</style>
-
-<dom-module id='ha-panel-react'>
-  <template>
-    <style>
-      :host {
-        background: #f5f5f5;
-        display: block;
-        height: 100%;
-        overflow: auto;
-      }
-      .mount {
-        font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-        line-height: 1.4em;
-        color: #4d4d4d;
-        min-width: 230px;
-        max-width: 550px;
-        margin: 0 auto;
-        -webkit-font-smoothing: antialiased;
-        -moz-font-smoothing: antialiased;
-        font-smoothing: antialiased;
-        font-weight: 300;
-      }
-    </style>
-    <div id='mount' class='mount'></div>
-  </template>
-</dom-module>
-
-<script>
-// Example uses ES6. Will only work in modern browsers
-class TodoMVC extends React.Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      filter: 'all',
-      // load initial value of entities
-      entities: this.props.hass.reactor.evaluate(
-        this.props.hass.entityGetters.visibleEntityMap),
-    };
-  }
-
-  componentDidMount() {
-    // register to entity updates
-    this._unwatchHass = this.props.hass.reactor.observe(
-      this.props.hass.entityGetters.visibleEntityMap,
-      entities => this.setState({entities}))
-  }
-
-  componentWillUnmount() {
-    // unregister to entity updates
-    this._unwatchHass();
-  }
-
-  handlePickFilter(filter, ev) {
-    ev.preventDefault();
-    this.setState({filter});
-  }
-
-  handleEntityToggle(entity, ev) {
-    this.props.hass.serviceActions.callService(
-      entity.domain, 'toggle', { entity_id: entity.entityId });
-  }
-
-  handleToggleMenu(ev) {
-    ev.preventDefault();
-    Polymer.Base.fire('open-menu', null, {node: ev.target});
-  }
-
-  entityRow(entity) {
-    const completed = entity.state === 'on';
-
-    return React.createElement(
-      'li', {
-        className: completed && 'completed',
-        key: entity.entityId,
-      },
-      React.createElement(
-        "div", { className: "view" },
-        React.createElement(
-          "input", {
-            checked: completed,
-            className: "toggle",
-            type: "checkbox",
-            onChange: ev => this.handleEntityToggle(entity, ev),
-          }),
-        React.createElement("label", null, entity.entityDisplay)));
-  }
-
-  filterRow(filter) {
-    return React.createElement(
-      "li", { key: filter },
-      React.createElement(
-        "a", {
-          href: "#",
-          className: this.state.filter === filter && "selected",
-          onClick: ev => this.handlePickFilter(filter, ev),
-        },
-        filter.substring(0, 1).toUpperCase() + filter.substring(1)
-      )
-    );
-  }
-
-  render() {
-    const { entities, filter } = this.state;
-
-    if (!entities) return null;
-
-    const filters = ['all', 'light', 'switch'];
-
-    const showEntities = filter === 'all' ?
-      entities.filter(ent => filters.includes(ent.domain)) :
-      entities.filter(ent => ent.domain == filter);
-
-    return React.createElement(
-      'div', { className: 'todoapp-wrapper' },
-      React.createElement(
-        "section", { className: "todoapp" },
-        React.createElement(
-          "div", null,
-          React.createElement(
-            "header", { className: "header" },
-            React.createElement("h1", null, this.props.title || "todos")
-          ),
-          React.createElement(
-            "section", { className: "main" },
-            React.createElement(
-              "ul", { className: "todo-list" },
-              showEntities.valueSeq().map(ent => this.entityRow(ent)))
-            )
-          ),
-          React.createElement(
-            "footer", { className: "footer" },
-            React.createElement(
-              "span", { className: "todo-count" },
-              showEntities.filter(ent => ent.state === 'off').size + " items left"
-            ),
-            React.createElement(
-              "ul", { className: "filters" },
-              filters.map(filter => this.filterRow(filter))
-            ),
-            !this.props.showMenu && React.createElement(
-              "a", {
-                className: "toggle-menu",
-                href: '#',
-                onClick: ev => this.handleToggleMenu(ev),
-              },
-              "Show menu"
-            )
-          )
-        ));
-  }
-}
-
-Polymer({
-  is: 'ha-panel-react',
-
-  properties: {
-    // Home Assistant object
-    hass: {
-      type: Object,
-    },
-
-    // If should render in narrow mode
-    narrow: {
-      type: Boolean,
-      value: false,
-    },
-
-    // If sidebar is currently shown
-    showMenu: {
-      type: Boolean,
-      value: false,
-    },
-
-    // Home Assistant panel info
-    // panel.config contains config passed to register_panel serverside
-    panel: {
-      type: Object,
-    }
-  },
-
-  // This will make sure we forward changed properties to React
-  observers: [
-    'propsChanged(hass, narrow, showMenu, panel)',
-  ],
-
-  // Mount React when element attached
-  attached: function () {
-    this.mount(this.hass, this.narrow, this.showMenu, this.panel);
-  },
-
-  // Called when properties change
-  propsChanged: function (hass, narrow, showMenu, panel) {
-    this.mount(hass, narrow, showMenu, panel);
-  },
-
-  // Render React. Debounce in case multiple properties change.
-  mount: function (hass, narrow, showMenu, panel) {
-    this.debounce('mount', function () {
-      ReactDOM.render(React.createElement(TodoMVC, {
-        hass: hass,
-        narrow: narrow,
-        showMenu: showMenu,
-        title: panel.config ? panel.config.title : null
-      }), this.$.mount);
-    }.bind(this));
-  },
-
-  // Unmount React node when panel no longer in use.
-  detached: function () {
-    ReactDOM.unmountComponentAtNode(this.$.mount);
-  },
-});
-</script>
@@ -20,6 +20,17 @@ from homeassistant.const import (
 from homeassistant.util.async import run_callback_threadsafe


+def attempt_use_uvloop():
+    """Attempt to use uvloop."""
+    import asyncio
+
+    try:
+        import uvloop
+        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+    except ImportError:
+        pass
+
+
 def monkey_patch_asyncio():
    """Replace weakref.WeakSet to address Python 3 bug.

@@ -311,8 +322,7 @@ def setup_and_run_hass(config_dir: str,
            EVENT_HOMEASSISTANT_START, open_browser
        )

-    hass.start()
-    return hass.exit_code
+    return hass.start()


 def try_to_restart() -> None:
@@ -359,11 +369,13 @@ def try_to_restart() -> None:

 def main() -> int:
    """Start Home Assistant."""
+    validate_python()
+
+    attempt_use_uvloop()
+
    if sys.version_info[:3] < (3, 5, 3):
        monkey_patch_asyncio()

-    validate_python()
-
    args = get_arguments()

    if args.script is not None:
@@ -27,7 +27,8 @@ _LOGGER = logging.getLogger(__name__)

 ERROR_LOG_FILENAME = 'home-assistant.log'
 FIRST_INIT_COMPONENT = set((
-    'recorder', 'mqtt', 'mqtt_eventstream', 'logger', 'introduction'))
+    'recorder', 'mqtt', 'mqtt_eventstream', 'logger', 'introduction',
+    'frontend', 'history'))


 def from_config_dict(config: Dict[str, Any],
@@ -74,8 +75,6 @@ def async_from_config_dict(config: Dict[str, Any],
    This method is a coroutine.
    """
    start = time()
-    hass.async_track_tasks()
-
    core_config = config.get(core.DOMAIN, {})

    try:
@@ -140,10 +139,10 @@ def async_from_config_dict(config: Dict[str, Any],
            continue
        hass.async_add_job(async_setup_component(hass, component, config))

-    yield from hass.async_stop_track_tasks()
+    yield from hass.async_block_till_done()

    stop = time()
-    _LOGGER.info('Home Assistant initialized in %ss', round(stop-start, 2))
+    _LOGGER.info('Home Assistant initialized in %.2fs', stop-start)

    async_register_signal_handling(hass)
    return hass
@@ -0,0 +1,119 @@
+"""
+Support for AlarmDecoder-based alarm control panels (Honeywell/DSC).
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.alarmdecoder/
+"""
+import asyncio
+import logging
+
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+import homeassistant.components.alarm_control_panel as alarm
+
+from homeassistant.components.alarmdecoder import (DATA_AD,
+                                                   SIGNAL_PANEL_MESSAGE)
+
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
+    STATE_UNKNOWN, STATE_ALARM_TRIGGERED)
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['alarmdecoder']
+
+
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Perform the setup for AlarmDecoder alarm panels."""
+    _LOGGER.debug("AlarmDecoderAlarmPanel: setup")
+
+    device = AlarmDecoderAlarmPanel("Alarm Panel", hass)
+
+    async_add_devices([device])
+
+    return True
+
+
+class AlarmDecoderAlarmPanel(alarm.AlarmControlPanel):
+    """Representation of an AlarmDecoder-based alarm panel."""
+
+    def __init__(self, name, hass):
+        """Initialize the alarm panel."""
+        self._display = ""
+        self._name = name
+        self._state = STATE_UNKNOWN
+
+        _LOGGER.debug("AlarmDecoderAlarm: Setting up panel")
+
+    @asyncio.coroutine
+    def async_added_to_hass(self):
+        """Register callbacks."""
+        async_dispatcher_connect(
+            self.hass, SIGNAL_PANEL_MESSAGE, self._message_callback)
+
+    @callback
+    def _message_callback(self, message):
+        if message.alarm_sounding or message.fire_alarm:
+            if self._state != STATE_ALARM_TRIGGERED:
+                self._state = STATE_ALARM_TRIGGERED
+                self.hass.async_add_job(self.async_update_ha_state())
+        elif message.armed_away:
+            if self._state != STATE_ALARM_ARMED_AWAY:
+                self._state = STATE_ALARM_ARMED_AWAY
+                self.hass.async_add_job(self.async_update_ha_state())
+        elif message.armed_home:
+            if self._state != STATE_ALARM_ARMED_HOME:
+                self._state = STATE_ALARM_ARMED_HOME
+                self.hass.async_add_job(self.async_update_ha_state())
+        else:
+            if self._state != STATE_ALARM_DISARMED:
+                self._state = STATE_ALARM_DISARMED
+                self.hass.async_add_job(self.async_update_ha_state())
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    @property
+    def code_format(self):
+        """Regex for code format or None if no code is required."""
+        return '^\\d{4,6}$'
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    @asyncio.coroutine
+    def async_alarm_disarm(self, code=None):
+        """Send disarm command."""
+        _LOGGER.debug("AlarmDecoderAlarm::alarm_disarm: %s", code)
+        if code:
+            _LOGGER.debug("AlarmDecoderAlarm::alarm_disarm: sending %s1",
+                          str(code))
+            self.hass.data[DATA_AD].send("{!s}1".format(code))
+
+    @asyncio.coroutine
+    def async_alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        _LOGGER.debug("AlarmDecoderAlarm::alarm_arm_away: %s", code)
+        if code:
+            _LOGGER.debug("AlarmDecoderAlarm::alarm_arm_away: sending %s2",
+                          str(code))
+            self.hass.data[DATA_AD].send("{!s}2".format(code))
+
+    @asyncio.coroutine
+    def async_alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        _LOGGER.debug("AlarmDecoderAlarm::alarm_arm_home: %s", code)
+        if code:
+            _LOGGER.debug("AlarmDecoderAlarm::alarm_arm_home: sending %s3",
+                          str(code))
+            self.hass.data[DATA_AD].send("{!s}3".format(code))
@@ -1,13 +1,13 @@
 """
+
 Interfaces with Alarm.com alarm control panels.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.alarmdotcom/
 """
 import logging
-
+import asyncio
 import voluptuous as vol
-
 import homeassistant.components.alarm_control_panel as alarm
 from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
 from homeassistant.const import (
@@ -15,10 +15,9 @@ from homeassistant.const import (
    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN, CONF_CODE,
    CONF_NAME)
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession

-REQUIREMENTS = ['https://github.com/Xorso/pyalarmdotcom'
-                '/archive/0.1.1.zip'
-                '#pyalarmdotcom==0.1.1']
+REQUIREMENTS = ['pyalarmdotcom==0.3.0']

 _LOGGER = logging.getLogger(__name__)

@@ -32,14 +31,17 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


-def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup an Alarm.com control panel."""
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Setup a Alarm.com control panel."""
    name = config.get(CONF_NAME)
    code = config.get(CONF_CODE)
    username = config.get(CONF_USERNAME)
    password = config.get(CONF_PASSWORD)

-    add_devices([AlarmDotCom(hass, name, code, username, password)], True)
+    alarmdotcom = AlarmDotCom(hass, name, code, username, password)
+    yield from alarmdotcom.async_login()
+    async_add_devices([alarmdotcom])


 class AlarmDotCom(alarm.AlarmControlPanel):
@@ -47,18 +49,30 @@ class AlarmDotCom(alarm.AlarmControlPanel):

    def __init__(self, hass, name, code, username, password):
        """Initialize the Alarm.com status."""
-        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
-        self._alarm = Alarmdotcom(username, password, timeout=10)
+        from pyalarmdotcom import Alarmdotcom
+        _LOGGER.debug('Setting up Alarm.com...')
        self._hass = hass
        self._name = name
        self._code = str(code) if code else None
        self._username = username
        self._password = password
+        self._websession = async_get_clientsession(self._hass)
        self._state = STATE_UNKNOWN
+        self._alarm = Alarmdotcom(username,
+                                  password,
+                                  self._websession,
+                                  hass.loop)

-    def update(self):
+    @asyncio.coroutine
+    def async_login(self):
+        """Login to Alarm.com."""
+        yield from self._alarm.async_login()
+
+    @asyncio.coroutine
+    def async_update(self):
        """Fetch the latest state."""
-        self._state = self._alarm.state
+        yield from self._alarm.async_update()
+        return self._alarm.state

    @property
    def name(self):
@@ -73,45 +87,36 @@ class AlarmDotCom(alarm.AlarmControlPanel):
    @property
    def state(self):
        """Return the state of the device."""
-        if self._state == 'Disarmed':
+        if self._alarm.state.lower() == 'disarmed':
            return STATE_ALARM_DISARMED
-        elif self._state == 'Armed Stay':
+        elif self._alarm.state.lower() == 'armed stay':
            return STATE_ALARM_ARMED_HOME
-        elif self._state == 'Armed Away':
+        elif self._alarm.state.lower() == 'armed away':
            return STATE_ALARM_ARMED_AWAY
        else:
            return STATE_UNKNOWN

-    def alarm_disarm(self, code=None):
+    @asyncio.coroutine
+    def async_alarm_disarm(self, code=None):
        """Send disarm command."""
-        if not self._validate_code(code, 'disarming home'):
-            return
-        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
-        # Open another session to alarm.com to fire off the command
-        _alarm = Alarmdotcom(self._username, self._password, timeout=10)
-        _alarm.disarm()
+        if self._validate_code(code):
+            yield from self._alarm.async_alarm_disarm()

-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        if not self._validate_code(code, 'arming home'):
-            return
-        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
-        # Open another session to alarm.com to fire off the command
-        _alarm = Alarmdotcom(self._username, self._password, timeout=10)
-        _alarm.arm_stay()
+    @asyncio.coroutine
+    def async_alarm_arm_home(self, code=None):
+        """Send arm hom command."""
+        if self._validate_code(code):
+            yield from self._alarm.async_alarm_arm_home()

-    def alarm_arm_away(self, code=None):
+    @asyncio.coroutine
+    def async_alarm_arm_away(self, code=None):
        """Send arm away command."""
-        if not self._validate_code(code, 'arming home'):
-            return
-        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
-        # Open another session to alarm.com to fire off the command
-        _alarm = Alarmdotcom(self._username, self._password, timeout=10)
-        _alarm.arm_away()
+        if self._validate_code(code):
+            yield from self._alarm.async_alarm_arm_away()

-    def _validate_code(self, code, state):
+    def _validate_code(self, code):
        """Validate given code."""
        check = self._code is None or code == self._code
        if not check:
-            _LOGGER.warning('Wrong code entered for %s', state)
+            _LOGGER.warning('Wrong code entered.')
        return check
@@ -0,0 +1,87 @@
+"""Interfaces with TotalConnect alarm control panels."""
+import logging
+
+import voluptuous as vol
+
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
+from homeassistant.const import (
+    CONF_PASSWORD, CONF_USERNAME, STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN,
+    CONF_NAME)
+import homeassistant.helpers.config_validation as cv
+
+REQUIREMENTS = ['total_connect_client==0.7']
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'Total Connect'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup a TotalConnect control panel."""
+    name = config.get(CONF_NAME)
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+
+    total_connect = TotalConnect(name, username, password)
+    add_devices([total_connect], True)
+
+
+class TotalConnect(alarm.AlarmControlPanel):
+    """Represent an TotalConnect status."""
+
+    def __init__(self, name, username, password):
+        """Initialize the TotalConnect status."""
+        from total_connect_client import TotalConnectClient
+
+        _LOGGER.debug('Setting up TotalConnect...')
+        self._name = name
+        self._username = username
+        self._password = password
+        self._state = STATE_UNKNOWN
+        self._client = TotalConnectClient.TotalConnectClient(username,
+                                                             password)
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    def update(self):
+        """Return the state of the device."""
+        status = self._client.get_armed_status()
+
+        if status == self._client.DISARMED:
+            state = STATE_ALARM_DISARMED
+        elif status == self._client.ARMED_STAY:
+            state = STATE_ALARM_ARMED_HOME
+        elif status == self._client.ARMED_AWAY:
+            state = STATE_ALARM_ARMED_AWAY
+        else:
+            state = STATE_UNKNOWN
+
+        self._state = state
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        self._client.disarm()
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        self._client.arm_stay()
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        self._client.arm_away()
@@ -0,0 +1,171 @@
+"""
+Support for AlarmDecoder devices.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/alarmdecoder/
+"""
+import asyncio
+import logging
+
+import voluptuous as vol
+import homeassistant.helpers.config_validation as cv
+
+from homeassistant.core import callback
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+
+from homeassistant.helpers.discovery import async_load_platform
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+
+REQUIREMENTS = ['alarmdecoder==0.12.1.0']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'alarmdecoder'
+
+DATA_AD = 'alarmdecoder'
+
+
+CONF_DEVICE = 'device'
+CONF_DEVICE_TYPE = 'type'
+CONF_DEVICE_HOST = 'host'
+CONF_DEVICE_PORT = 'port'
+CONF_DEVICE_PATH = 'path'
+CONF_DEVICE_BAUD = 'baudrate'
+
+CONF_ZONES = 'zones'
+CONF_ZONE_NAME = 'name'
+CONF_ZONE_TYPE = 'type'
+
+CONF_PANEL_DISPLAY = 'panel_display'
+
+DEFAULT_DEVICE_TYPE = 'socket'
+DEFAULT_DEVICE_HOST = 'localhost'
+DEFAULT_DEVICE_PORT = 10000
+DEFAULT_DEVICE_PATH = '/dev/ttyUSB0'
+DEFAULT_DEVICE_BAUD = 115200
+
+DEFAULT_PANEL_DISPLAY = False
+
+DEFAULT_ZONE_TYPE = 'opening'
+
+SIGNAL_PANEL_MESSAGE = 'alarmdecoder.panel_message'
+SIGNAL_PANEL_ARM_AWAY = 'alarmdecoder.panel_arm_away'
+SIGNAL_PANEL_ARM_HOME = 'alarmdecoder.panel_arm_home'
+SIGNAL_PANEL_DISARM = 'alarmdecoder.panel_disarm'
+
+SIGNAL_ZONE_FAULT = 'alarmdecoder.zone_fault'
+SIGNAL_ZONE_RESTORE = 'alarmdecoder.zone_restore'
+
+DEVICE_SOCKET_SCHEMA = vol.Schema({
+    vol.Required(CONF_DEVICE_TYPE): 'socket',
+    vol.Optional(CONF_DEVICE_HOST, default=DEFAULT_DEVICE_HOST): cv.string,
+    vol.Optional(CONF_DEVICE_PORT, default=DEFAULT_DEVICE_PORT): cv.port})
+
+DEVICE_SERIAL_SCHEMA = vol.Schema({
+    vol.Required(CONF_DEVICE_TYPE): 'serial',
+    vol.Optional(CONF_DEVICE_PATH, default=DEFAULT_DEVICE_PATH): cv.string,
+    vol.Optional(CONF_DEVICE_BAUD, default=DEFAULT_DEVICE_BAUD): cv.string})
+
+DEVICE_USB_SCHEMA = vol.Schema({
+    vol.Required(CONF_DEVICE_TYPE): 'usb'})
+
+ZONE_SCHEMA = vol.Schema({
+    vol.Required(CONF_ZONE_NAME): cv.string,
+    vol.Optional(CONF_ZONE_TYPE, default=DEFAULT_ZONE_TYPE): cv.string})
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_DEVICE): vol.Any(DEVICE_SOCKET_SCHEMA,
+                                           DEVICE_SERIAL_SCHEMA,
+                                           DEVICE_USB_SCHEMA),
+        vol.Optional(CONF_PANEL_DISPLAY,
+                     default=DEFAULT_PANEL_DISPLAY): cv.boolean,
+        vol.Optional(CONF_ZONES): {vol.Coerce(int): ZONE_SCHEMA},
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+
+@asyncio.coroutine
+def async_setup(hass, config):
+    """Common setup for AlarmDecoder devices."""
+    from alarmdecoder import AlarmDecoder
+    from alarmdecoder.devices import (SocketDevice, SerialDevice, USBDevice)
+
+    conf = config.get(DOMAIN)
+
+    device = conf.get(CONF_DEVICE)
+    display = conf.get(CONF_PANEL_DISPLAY)
+    zones = conf.get(CONF_ZONES)
+
+    device_type = device.get(CONF_DEVICE_TYPE)
+    host = DEFAULT_DEVICE_HOST
+    port = DEFAULT_DEVICE_PORT
+    path = DEFAULT_DEVICE_PATH
+    baud = DEFAULT_DEVICE_BAUD
+
+    sync_connect = asyncio.Future(loop=hass.loop)
+
+    def handle_open(device):
+        """Callback for a successful connection."""
+        _LOGGER.info("Established a connection with the alarmdecoder.")
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, stop_alarmdecoder)
+        sync_connect.set_result(True)
+
+    @callback
+    def stop_alarmdecoder(event):
+        """Callback to handle shutdown alarmdecoder."""
+        _LOGGER.debug("Shutting down alarmdecoder.")
+        controller.close()
+
+    @callback
+    def handle_message(sender, message):
+        """Callback to handle message from alarmdecoder."""
+        async_dispatcher_send(hass, SIGNAL_PANEL_MESSAGE, message)
+
+    def zone_fault_callback(sender, zone):
+        """Callback to handle zone fault from alarmdecoder."""
+        async_dispatcher_send(hass, SIGNAL_ZONE_FAULT, zone)
+
+    def zone_restore_callback(sender, zone):
+        """Callback to handle zone restore from alarmdecoder."""
+        async_dispatcher_send(hass, SIGNAL_ZONE_RESTORE, zone)
+
+    controller = False
+    if device_type == 'socket':
+        host = device.get(CONF_DEVICE_HOST)
+        port = device.get(CONF_DEVICE_PORT)
+        controller = AlarmDecoder(SocketDevice(interface=(host, port)))
+    elif device_type == 'serial':
+        path = device.get(CONF_DEVICE_PATH)
+        baud = device.get(CONF_DEVICE_BAUD)
+        controller = AlarmDecoder(SerialDevice(interface=path))
+    elif device_type == 'usb':
+        AlarmDecoder(USBDevice.find())
+        return False
+
+    controller.on_open += handle_open
+    controller.on_message += handle_message
+    controller.on_zone_fault += zone_fault_callback
+    controller.on_zone_restore += zone_restore_callback
+
+    hass.data[DATA_AD] = controller
+
+    controller.open(baud)
+
+    result = yield from sync_connect
+
+    if not result:
+        return False
+
+    hass.async_add_job(async_load_platform(hass, 'alarm_control_panel', DOMAIN,
+                                           conf, config))
+
+    if zones:
+        hass.async_add_job(async_load_platform(
+            hass, 'binary_sensor', DOMAIN, {CONF_ZONES: zones}, config))
+
+    if display:
+        hass.async_add_job(async_load_platform(hass, 'sensor', DOMAIN,
+                                               conf, config))
+
+    return True
@@ -26,17 +26,24 @@ from homeassistant.util.dt import utcnow
 from homeassistant.components.camera.mjpeg import (
    CONF_MJPEG_URL, CONF_STILL_IMAGE_URL)

-DOMAIN = 'android_ip_webcam'
-REQUIREMENTS = ["pydroid-ipcam==0.6"]
+REQUIREMENTS = ['pydroid-ipcam==0.8']

 _LOGGER = logging.getLogger(__name__)
-SCAN_INTERVAL = timedelta(seconds=10)
-
-DATA_IP_WEBCAM = 'android_ip_webcam'

+ATTR_AUD_CONNS = 'Audio Connections'
 ATTR_HOST = 'host'
 ATTR_VID_CONNS = 'Video Connections'
-ATTR_AUD_CONNS = 'Audio Connections'
+
+CONF_MOTION_SENSOR = 'motion_sensor'
+
+DATA_IP_WEBCAM = 'android_ip_webcam'
+DEFAULT_NAME = 'IP Webcam'
+DEFAULT_PORT = 8080
+DEFAULT_TIMEOUT = 10
+DOMAIN = 'android_ip_webcam'
+
+SCAN_INTERVAL = timedelta(seconds=10)
+SIGNAL_UPDATE_DATA = 'android_ip_webcam_update'

 KEY_MAP = {
    'audio_connections': 'Audio Connections',
@@ -123,15 +130,6 @@ SENSORS = ['audio_connections', 'battery_level', 'battery_temp',
           'battery_voltage', 'light', 'motion', 'pressure', 'proximity',
           'sound', 'video_connections']

-SIGNAL_UPDATE_DATA = 'android_ip_webcam_update'
-
-CONF_MOTION_SENSOR = 'motion_sensor'
-
-DEFAULT_NAME = 'IP Webcam'
-DEFAULT_PORT = 8080
-DEFAULT_TIMEOUT = 10
-
-
 CONFIG_SCHEMA = vol.Schema({
    DOMAIN: vol.All(cv.ensure_list, [vol.Schema({
        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@@ -153,7 +151,7 @@ CONFIG_SCHEMA = vol.Schema({

@asyncio.coroutine
 def async_setup(hass, config):
-    """Setup the IP Webcam component."""
+    """Set up the IP Webcam component."""
    from pydroid_ipcam import PyDroidIPCam

    webcams = hass.data[DATA_IP_WEBCAM] = {}
@@ -161,7 +159,7 @@ def async_setup(hass, config):

    @asyncio.coroutine
    def async_setup_ipcamera(cam_config):
-        """Setup a ip camera."""
+        """Set up an IP camera."""
        host = cam_config[CONF_HOST]
        username = cam_config.get(CONF_USERNAME)
        password = cam_config.get(CONF_PASSWORD)
@@ -171,7 +169,7 @@ def async_setup(hass, config):
        sensors = cam_config[CONF_SENSORS]
        motion = cam_config[CONF_MOTION_SENSOR]

-        # init ip webcam
+        # Init ip webcam
        cam = PyDroidIPCam(
            hass.loop, websession, host, cam_config[CONF_PORT],
            username=username, password=password,
@@ -192,7 +190,7 @@ def async_setup(hass, config):

        @asyncio.coroutine
        def async_update_data(now):
-            """Update data from ipcam in SCAN_INTERVAL."""
+            """Update data from IP camera in SCAN_INTERVAL."""
            yield from cam.update()
            async_dispatcher_send(hass, SIGNAL_UPDATE_DATA, host)

@@ -201,7 +199,7 @@ def async_setup(hass, config):

        yield from async_update_data(None)

-        # load platforms
+        # Load platforms
        webcams[host] = cam

        mjpeg_camera = {
@@ -17,9 +17,9 @@ from homeassistant.bootstrap import ERROR_LOG_FILENAME
 from homeassistant.const import (
    EVENT_HOMEASSISTANT_STOP, EVENT_TIME_CHANGED,
    HTTP_BAD_REQUEST, HTTP_CREATED, HTTP_NOT_FOUND,
-    HTTP_UNPROCESSABLE_ENTITY, MATCH_ALL, URL_API, URL_API_COMPONENTS,
+    MATCH_ALL, URL_API, URL_API_COMPONENTS,
    URL_API_CONFIG, URL_API_DISCOVERY_INFO, URL_API_ERROR_LOG,
-    URL_API_EVENT_FORWARD, URL_API_EVENTS, URL_API_SERVICES,
+    URL_API_EVENTS, URL_API_SERVICES,
    URL_API_STATES, URL_API_STATES_ENTITY, URL_API_STREAM, URL_API_TEMPLATE,
    __version__)
 from homeassistant.exceptions import TemplateError
@@ -48,11 +48,12 @@ def setup(hass, config):
    hass.http.register_view(APIEventView)
    hass.http.register_view(APIServicesView)
    hass.http.register_view(APIDomainServicesView)
-    hass.http.register_view(APIEventForwardingView)
    hass.http.register_view(APIComponentsView)
-    hass.http.register_view(APIErrorLogView)
    hass.http.register_view(APITemplateView)

+    hass.http.register_static_path(
+        URL_API_ERROR_LOG, hass.config.path(ERROR_LOG_FILENAME), False)
+
    return True


@@ -317,79 +318,6 @@ class APIDomainServicesView(HomeAssistantView):
        return self.json(changed_states)


-class APIEventForwardingView(HomeAssistantView):
-    """View to handle EventForwarding requests."""
-
-    url = URL_API_EVENT_FORWARD
-    name = "api:event-forward"
-    event_forwarder = None
-
-    @asyncio.coroutine
-    def post(self, request):
-        """Setup an event forwarder."""
-        _LOGGER.warning('Event forwarding is deprecated. '
-                        'Will be removed by 0.43')
-        hass = request.app['hass']
-        try:
-            data = yield from request.json()
-        except ValueError:
-            return self.json_message("No data received.", HTTP_BAD_REQUEST)
-
-        try:
-            host = data['host']
-            api_password = data['api_password']
-        except KeyError:
-            return self.json_message("No host or api_password received.",
-                                     HTTP_BAD_REQUEST)
-
-        try:
-            port = int(data['port']) if 'port' in data else None
-        except ValueError:
-            return self.json_message("Invalid value received for port.",
-                                     HTTP_UNPROCESSABLE_ENTITY)
-
-        api = rem.API(host, api_password, port)
-
-        valid = yield from hass.loop.run_in_executor(
-            None, api.validate_api)
-        if not valid:
-            return self.json_message("Unable to validate API.",
-                                     HTTP_UNPROCESSABLE_ENTITY)
-
-        if self.event_forwarder is None:
-            self.event_forwarder = rem.EventForwarder(hass)
-
-        self.event_forwarder.async_connect(api)
-
-        return self.json_message("Event forwarding setup.")
-
-    @asyncio.coroutine
-    def delete(self, request):
-        """Remove event forwarder."""
-        try:
-            data = yield from request.json()
-        except ValueError:
-            return self.json_message("No data received.", HTTP_BAD_REQUEST)
-
-        try:
-            host = data['host']
-        except KeyError:
-            return self.json_message("No host received.", HTTP_BAD_REQUEST)
-
-        try:
-            port = int(data['port']) if 'port' in data else None
-        except ValueError:
-            return self.json_message("Invalid value received for port.",
-                                     HTTP_UNPROCESSABLE_ENTITY)
-
-        if self.event_forwarder is not None:
-            api = rem.API(host, None, port)
-
-            self.event_forwarder.async_disconnect(api)
-
-        return self.json_message("Event forwarding cancelled.")
-
-
 class APIComponentsView(HomeAssistantView):
    """View to handle Components requests."""

@@ -402,20 +330,6 @@ class APIComponentsView(HomeAssistantView):
        return self.json(request.app['hass'].config.components)


-class APIErrorLogView(HomeAssistantView):
-    """View to handle ErrorLog requests."""
-
-    url = URL_API_ERROR_LOG
-    name = "api:error-log"
-
-    @asyncio.coroutine
-    def get(self, request):
-        """Serve error log."""
-        resp = yield from self.file(
-            request, request.app['hass'].config.path(ERROR_LOG_FILENAME))
-        return resp
-
-
 class APITemplateView(HomeAssistantView):
    """View to handle requests."""

@@ -13,7 +13,7 @@ from homeassistant.const import (
 from homeassistant.const import CONF_PORT
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['PyMata==2.13']
+REQUIREMENTS = ['PyMata==2.14']

 _LOGGER = logging.getLogger(__name__)

@@ -29,18 +29,25 @@ CONFIG_SCHEMA = vol.Schema({


 def setup(hass, config):
-    """Setup the Arduino component."""
+    """Set up the Arduino component."""
    import serial
+
+    port = config[DOMAIN][CONF_PORT]
+
    global BOARD
    try:
-        BOARD = ArduinoBoard(config[DOMAIN][CONF_PORT])
+        BOARD = ArduinoBoard(port)
    except (serial.serialutil.SerialException, FileNotFoundError):
-        _LOGGER.exception("Your port is not accessible.")
+        _LOGGER.error("Your port %s is not accessible", port)
        return False

-    if BOARD.get_firmata()[1] <= 2:
-        _LOGGER.error("The StandardFirmata sketch should be 2.2 or newer.")
-        return False
+    try:
+        if BOARD.get_firmata()[1] <= 2:
+            _LOGGER.error("The StandardFirmata sketch should be 2.2 or newer")
+            return False
+    except IndexError:
+        _LOGGER.warning("The version of the StandardFirmata sketch was not"
+                        "detected. This may lead to side effects")

    def stop_arduino(event):
        """Stop the Arduino service."""
@@ -67,25 +74,20 @@ class ArduinoBoard(object):
    def set_mode(self, pin, direction, mode):
        """Set the mode and the direction of a given pin."""
        if mode == 'analog' and direction == 'in':
-            self._board.set_pin_mode(pin,
-                                     self._board.INPUT,
-                                     self._board.ANALOG)
+            self._board.set_pin_mode(
+                pin, self._board.INPUT, self._board.ANALOG)
        elif mode == 'analog' and direction == 'out':
-            self._board.set_pin_mode(pin,
-                                     self._board.OUTPUT,
-                                     self._board.ANALOG)
+            self._board.set_pin_mode(
+                pin, self._board.OUTPUT, self._board.ANALOG)
        elif mode == 'digital' and direction == 'in':
-            self._board.set_pin_mode(pin,
-                                     self._board.INPUT,
-                                     self._board.DIGITAL)
+            self._board.set_pin_mode(
+                pin, self._board.INPUT, self._board.DIGITAL)
        elif mode == 'digital' and direction == 'out':
-            self._board.set_pin_mode(pin,
-                                     self._board.OUTPUT,
-                                     self._board.DIGITAL)
+            self._board.set_pin_mode(
+                pin, self._board.OUTPUT, self._board.DIGITAL)
        elif mode == 'pwm':
-            self._board.set_pin_mode(pin,
-                                     self._board.OUTPUT,
-                                     self._board.PWM)
+            self._board.set_pin_mode(
+                pin, self._board.OUTPUT, self._board.PWM)

    def get_analog_inputs(self):
        """Get the values from the pins."""
@@ -12,10 +12,11 @@ import os
 import voluptuous as vol

 from homeassistant.setup import async_prepare_setup_platform
+from homeassistant.core import CoreState
 from homeassistant import config as conf_util
 from homeassistant.const import (
    ATTR_ENTITY_ID, CONF_PLATFORM, STATE_ON, SERVICE_TURN_ON, SERVICE_TURN_OFF,
-    SERVICE_TOGGLE, SERVICE_RELOAD)
+    SERVICE_TOGGLE, SERVICE_RELOAD, EVENT_HOMEASSISTANT_START)
 from homeassistant.components import logbook
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import extract_domain_configs, script, condition
@@ -81,8 +82,7 @@ _CONDITION_SCHEMA = vol.All(cv.ensure_list, [cv.CONDITION_SCHEMA])

 PLATFORM_SCHEMA = vol.Schema({
    CONF_ALIAS: cv.string,
-    vol.Optional(CONF_INITIAL_STATE,
-                 default=DEFAULT_INITIAL_STATE): cv.boolean,
+    vol.Optional(CONF_INITIAL_STATE): cv.boolean,
    vol.Optional(CONF_HIDE_ENTITY, default=DEFAULT_HIDE_ENTITY): cv.boolean,
    vol.Required(CONF_TRIGGER): _TRIGGER_SCHEMA,
    vol.Optional(CONF_CONDITION): _CONDITION_SCHEMA,
@@ -101,15 +101,13 @@ TRIGGER_SERVICE_SCHEMA = vol.Schema({
 RELOAD_SERVICE_SCHEMA = vol.Schema({})


-def is_on(hass, entity_id=None):
+def is_on(hass, entity_id):
    """
    Return true if specified automation entity_id is on.

-    Check all automation if no entity_id specified.
+    Async friendly.
    """
-    entity_ids = [entity_id] if entity_id else hass.states.entity_ids(DOMAIN)
-    return any(hass.states.is_state(entity_id, STATE_ON)
-               for entity_id in entity_ids)
+    return hass.states.is_state(entity_id, STATE_ON)


 def turn_on(hass, entity_id=None):
@@ -231,7 +229,6 @@ class AutomationEntity(ToggleEntity):
        self._async_detach_triggers = None
        self._cond_func = cond_func
        self._async_action = async_action
-        self._enabled = False
        self._last_triggered = None
        self._hidden = hidden
        self._initial_state = initial_state
@@ -261,38 +258,62 @@ class AutomationEntity(ToggleEntity):
    @property
    def is_on(self) -> bool:
        """Return True if entity is on."""
-        return self._enabled
+        return self._async_detach_triggers is not None

    @asyncio.coroutine
    def async_added_to_hass(self) -> None:
        """Startup with initial state or previous state."""
-        state = yield from async_get_last_state(self.hass, self.entity_id)
-        if state is None:
-            if self._initial_state:
-                yield from self.async_enable()
+        if self._initial_state is not None:
+            enable_automation = self._initial_state
+            _LOGGER.debug("Automation %s initial state %s from config "
+                          "initial_state", self.entity_id, enable_automation)
        else:
-            self._last_triggered = state.attributes.get('last_triggered')
-            if state.state == STATE_ON:
+            state = yield from async_get_last_state(self.hass, self.entity_id)
+            if state:
+                enable_automation = state.state == STATE_ON
+                self._last_triggered = state.attributes.get('last_triggered')
+                _LOGGER.debug("Automation %s initial state %s from recorder "
+                              "last state %s", self.entity_id,
+                              enable_automation, state)
+            else:
+                enable_automation = DEFAULT_INITIAL_STATE
+                _LOGGER.debug("Automation %s initial state %s from default "
+                              "initial state", self.entity_id,
+                              enable_automation)
+
+        if not enable_automation:
+            return
+
+        # HomeAssistant is starting up
+        elif self.hass.state == CoreState.not_running:
+            @asyncio.coroutine
+            def async_enable_automation(event):
+                """Start automation on startup."""
                yield from self.async_enable()

+            self.hass.bus.async_listen_once(
+                EVENT_HOMEASSISTANT_START, async_enable_automation)
+
+        # HomeAssistant is running
+        else:
+            yield from self.async_enable()
+
    @asyncio.coroutine
    def async_turn_on(self, **kwargs) -> None:
        """Turn the entity on and update the state."""
-        if self._enabled:
+        if self.is_on:
            return

        yield from self.async_enable()
-        yield from self.async_update_ha_state()

    @asyncio.coroutine
    def async_turn_off(self, **kwargs) -> None:
        """Turn the entity off."""
-        if not self._enabled:
+        if not self.is_on:
            return

        self._async_detach_triggers()
        self._async_detach_triggers = None
-        self._enabled = False
        yield from self.async_update_ha_state()

    @asyncio.coroutine
@@ -318,12 +339,12 @@ class AutomationEntity(ToggleEntity):

        This method is a coroutine.
        """
-        if self._enabled:
+        if self.is_on:
            return

        self._async_detach_triggers = yield from self._async_attach_triggers(
            self.async_trigger)
-        self._enabled = True
+        yield from self.async_update_ha_state()


@asyncio.coroutine
@@ -342,7 +363,7 @@ def _async_process_config(hass, config, component):
                                                                  list_no)

            hidden = config_block[CONF_HIDE_ENTITY]
-            initial_state = config_block[CONF_INITIAL_STATE]
+            initial_state = config_block.get(CONF_INITIAL_STATE)

            action = _async_get_action(hass, config_block.get(CONF_ACTION, {}),
                                       name)
@@ -2,15 +2,15 @@
 Offer event listening automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#event-trigger
+at https://home-assistant.io/docs/automation/trigger/#event-trigger
 """
 import asyncio
 import logging

 import voluptuous as vol

-from homeassistant.core import callback
-from homeassistant.const import CONF_PLATFORM
+from homeassistant.core import callback, CoreState
+from homeassistant.const import CONF_PLATFORM, EVENT_HOMEASSISTANT_START
 from homeassistant.helpers import config_validation as cv

 CONF_EVENT_TYPE = "event_type"
@@ -31,6 +31,19 @@ def async_trigger(hass, config, action):
    event_type = config.get(CONF_EVENT_TYPE)
    event_data = config.get(CONF_EVENT_DATA)

+    if (event_type == EVENT_HOMEASSISTANT_START and
+            hass.state == CoreState.starting):
+        _LOGGER.warning('Deprecation: Automations should not listen to event '
+                        "'homeassistant_start'. Use platform 'homeassistant' "
+                        'instead. Feature will be removed in 0.45')
+        hass.async_run_job(action, {
+            'trigger': {
+                'platform': 'event',
+                'event': None,
+            },
+        })
+        return lambda: None
+
    @callback
    def handle_event(event):
        """Listen for events and calls the action when data matches."""
@@ -0,0 +1,55 @@
+"""
+Offer Home Assistant core automation rules.
+
+For more details about this automation rule, please refer to the documentation
+at https://home-assistant.io/components/automation/#homeassistant-trigger
+"""
+import asyncio
+import logging
+
+import voluptuous as vol
+
+from homeassistant.core import callback, CoreState
+from homeassistant.const import (
+    CONF_PLATFORM, CONF_EVENT, EVENT_HOMEASSISTANT_STOP)
+
+EVENT_START = 'start'
+EVENT_SHUTDOWN = 'shutdown'
+_LOGGER = logging.getLogger(__name__)
+
+TRIGGER_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): 'homeassistant',
+    vol.Required(CONF_EVENT): vol.Any(EVENT_START, EVENT_SHUTDOWN),
+})
+
+
+@asyncio.coroutine
+def async_trigger(hass, config, action):
+    """Listen for events based on configuration."""
+    event = config.get(CONF_EVENT)
+
+    if event == EVENT_SHUTDOWN:
+        @callback
+        def hass_shutdown(event):
+            """Called when Home Assistant is shutting down."""
+            hass.async_run_job(action, {
+                'trigger': {
+                    'platform': 'homeassistant',
+                    'event': event,
+                },
+            })
+
+        return hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP,
+                                          hass_shutdown)
+
+    # Automation are enabled while hass is starting up, fire right away
+    # Check state because a config reload shouldn't trigger it.
+    elif hass.state == CoreState.starting:
+        hass.async_run_job(action, {
+            'trigger': {
+                'platform': 'homeassistant',
+                'event': event,
+            },
+        })
+
+    return lambda: None
@@ -70,7 +70,7 @@ def async_trigger(hass, config, action):
        nonlocal held_less_than, held_more_than
        pressed_time = dt_util.utcnow()
        if held_more_than is None and held_less_than is None:
-            call_action()
+            hass.add_job(call_action)
        if held_more_than is not None and held_less_than is None:
            cancel_pressed_more_than = track_point_in_utc_time(
                hass,
@@ -88,7 +88,7 @@ def async_trigger(hass, config, action):
        held_time = dt_util.utcnow() - pressed_time
        if held_less_than is not None and held_time < held_less_than:
            if held_more_than is None or held_time > held_more_than:
-                call_action()
+                hass.add_job(call_action)

    hass.data['litejet_system'].on_switch_pressed(number, pressed)
    hass.data['litejet_system'].on_switch_released(number, released)
@@ -2,7 +2,7 @@
 Offer MQTT listening automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#mqtt-trigger
+at https://home-assistant.io/docs/automation/trigger/#mqtt-trigger
 """
 import asyncio
 import json
@@ -2,7 +2,7 @@
 Offer numeric state listening automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#numeric-state-trigger
+at https://home-assistant.io/docs/automation/trigger/#numeric-state-trigger
 """
 import asyncio
 import logging
@@ -2,7 +2,7 @@
 Offer state listening automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#state-trigger
+at https://home-assistant.io/docs/automation/trigger/#state-trigger
 """
 import asyncio
 import voluptuous as vol
@@ -2,7 +2,7 @@
 Offer sun based automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#sun-trigger
+at https://home-assistant.io/docs/automation/trigger/#sun-trigger
 """
 import asyncio
 from datetime import timedelta
@@ -2,7 +2,7 @@
 Offer template automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#template-trigger
+at https://home-assistant.io/docs/automation/trigger/#template-trigger
 """
 import asyncio
 import logging
@@ -2,7 +2,7 @@
 Offer time listening automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#time-trigger
+at https://home-assistant.io/docs/automation/trigger/#time-trigger
 """
 import asyncio
 import logging
@@ -2,7 +2,7 @@
 Offer zone automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#zone-trigger
+at https://home-assistant.io/docs/automation/trigger/#zone-trigger
 """
 import asyncio
 import voluptuous as vol
@@ -0,0 +1,123 @@
+"""
+Support for AlarmDecoder zone states- represented as binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.alarmdecoder/
+"""
+import asyncio
+import logging
+
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+from homeassistant.const import (STATE_ON, STATE_OFF, STATE_OPEN, STATE_CLOSED)
+from homeassistant.components.alarmdecoder import (ZONE_SCHEMA,
+                                                   CONF_ZONES,
+                                                   CONF_ZONE_NAME,
+                                                   CONF_ZONE_TYPE,
+                                                   SIGNAL_ZONE_FAULT,
+                                                   SIGNAL_ZONE_RESTORE)
+
+
+DEPENDENCIES = ['alarmdecoder']
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Setup AlarmDecoder binary sensor devices."""
+    configured_zones = discovery_info[CONF_ZONES]
+
+    devices = []
+
+    for zone_num in configured_zones:
+        device_config_data = ZONE_SCHEMA(configured_zones[zone_num])
+        zone_type = device_config_data[CONF_ZONE_TYPE]
+        zone_name = device_config_data[CONF_ZONE_NAME]
+        device = AlarmDecoderBinarySensor(hass,
+                                          zone_num,
+                                          zone_name,
+                                          zone_type)
+        devices.append(device)
+
+    async_add_devices(devices)
+
+    return True
+
+
+class AlarmDecoderBinarySensor(BinarySensorDevice):
+    """Representation of an AlarmDecoder binary sensor."""
+
+    def __init__(self, hass, zone_number, zone_name, zone_type):
+        """Initialize the binary_sensor."""
+        self._zone_number = zone_number
+        self._zone_type = zone_type
+        self._state = 0
+        self._name = zone_name
+        self._type = zone_type
+
+        _LOGGER.debug('AlarmDecoderBinarySensor: Setup up zone: ' + zone_name)
+
+    @asyncio.coroutine
+    def async_added_to_hass(self):
+        """Register callbacks."""
+        async_dispatcher_connect(
+            self.hass, SIGNAL_ZONE_FAULT, self._fault_callback)
+
+        async_dispatcher_connect(
+            self.hass, SIGNAL_ZONE_RESTORE, self._restore_callback)
+
+    @property
+    def state(self):
+        """Return the state of the binary sensor."""
+        if self._type == 'opening':
+            return STATE_OPEN if self.is_on else STATE_CLOSED
+
+        return STATE_ON if self.is_on else STATE_OFF
+
+    @property
+    def name(self):
+        """Return the name of the entity."""
+        return self._name
+
+    @property
+    def icon(self):
+        """Icon for device by its type."""
+        if "window" in self._name.lower():
+            return "mdi:window-open" if self.is_on else "mdi:window-closed"
+
+        if self._type == 'smoke':
+            return "mdi:fire"
+
+        return None
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    @property
+    def is_on(self):
+        """Return true if sensor is on."""
+        return self._state == 1
+
+    @property
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
+        return self._zone_type
+
+    @callback
+    def _fault_callback(self, zone):
+        """Update the zone's state, if needed."""
+        if zone is None or int(zone) == self._zone_number:
+            self._state = 1
+            self.hass.async_add_job(self.async_update_ha_state())
+
+    @callback
+    def _restore_callback(self, zone):
+        """Update the zone's state, if needed."""
+        if zone is None or int(zone) == self._zone_number:
+            self._state = 0
+            self.hass.async_add_job(self.async_update_ha_state())
@@ -11,7 +11,7 @@ DEPENDENCIES = ['blink']


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup the blink binary sensors."""
+    """Set up the blink binary sensors."""
    if discovery_info is None:
        return

@@ -1,4 +1,9 @@
-"""Contains functionality to use flic buttons as a binary sensor."""
+"""
+Support to use flic buttons as a binary sensor.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.flic/
+"""
 import logging
 import threading

@@ -11,39 +16,40 @@ from homeassistant.const import (
 from homeassistant.components.binary_sensor import (
    BinarySensorDevice, PLATFORM_SCHEMA)

-
 REQUIREMENTS = ['https://github.com/soldag/pyflic/archive/0.4.zip#pyflic==0.4']

 _LOGGER = logging.getLogger(__name__)

 DEFAULT_TIMEOUT = 3

-CLICK_TYPE_SINGLE = "single"
-CLICK_TYPE_DOUBLE = "double"
-CLICK_TYPE_HOLD = "hold"
+CLICK_TYPE_SINGLE = 'single'
+CLICK_TYPE_DOUBLE = 'double'
+CLICK_TYPE_HOLD = 'hold'
 CLICK_TYPES = [CLICK_TYPE_SINGLE, CLICK_TYPE_DOUBLE, CLICK_TYPE_HOLD]

-CONF_IGNORED_CLICK_TYPES = "ignored_click_types"
+CONF_IGNORED_CLICK_TYPES = 'ignored_click_types'

-EVENT_NAME = "flic_click"
-EVENT_DATA_NAME = "button_name"
-EVENT_DATA_ADDRESS = "button_address"
-EVENT_DATA_TYPE = "click_type"
-EVENT_DATA_QUEUED_TIME = "queued_time"
+DEFAULT_HOST = 'localhost'
+DEFAULT_PORT = 5551
+
+EVENT_NAME = 'flic_click'
+EVENT_DATA_NAME = 'button_name'
+EVENT_DATA_ADDRESS = 'button_address'
+EVENT_DATA_TYPE = 'click_type'
+EVENT_DATA_QUEUED_TIME = 'queued_time'

-# Validation of the user's configuration
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_HOST, default='localhost'): cv.string,
-    vol.Optional(CONF_PORT, default=5551): cv.port,
+    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
    vol.Optional(CONF_DISCOVERY, default=True): cv.boolean,
    vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
-    vol.Optional(CONF_IGNORED_CLICK_TYPES): vol.All(cv.ensure_list,
-                                                    [vol.In(CLICK_TYPES)])
+    vol.Optional(CONF_IGNORED_CLICK_TYPES):
+        vol.All(cv.ensure_list, [vol.In(CLICK_TYPES)])
 })


 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Setup the flic platform."""
+    """Set up the flic platform."""
    import pyflic

    # Initialize flic client responsible for
@@ -55,11 +61,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
    try:
        client = pyflic.FlicClient(host, port)
    except ConnectionRefusedError:
-        _LOGGER.error("Failed to connect to flic server.")
+        _LOGGER.error("Failed to connect to flic server")
        return

    def new_button_callback(address):
-        """Setup newly verified button as device in home assistant."""
+        """Set up newly verified button as device in Home Assistant."""
        setup_button(hass, config, add_entities, client, address)

    client.on_new_verified_button = new_button_callback
@@ -74,7 +80,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):

    def get_info_callback(items):
        """Add entities for already verified buttons."""
-        addresses = items["bd_addr_of_verified_buttons"] or []
+        addresses = items['bd_addr_of_verified_buttons'] or []
        for address in addresses:
            setup_button(hass, config, add_entities, client, address)

@@ -83,7 +89,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):


 def start_scanning(config, add_entities, client):
-    """Start a new flic client for scanning & connceting to new buttons."""
+    """Start a new flic client for scanning and connecting to new buttons."""
    import pyflic

    scan_wizard = pyflic.ScanWizard()
@@ -91,10 +97,10 @@ def start_scanning(config, add_entities, client):
    def scan_completed_callback(scan_wizard, result, address, name):
        """Restart scan wizard to constantly check for new buttons."""
        if result == pyflic.ScanWizardResult.WizardSuccess:
-            _LOGGER.info("Found new button (%s)", address)
+            _LOGGER.info("Found new button %s", address)
        elif result != pyflic.ScanWizardResult.WizardFailedTimeout:
-            _LOGGER.warning("Failed to connect to button (%s). Reason: %s",
-                            address, result)
+            _LOGGER.warning(
+                "Failed to connect to button %s. Reason: %s", address, result)

        # Restart scan wizard
        start_scanning(config, add_entities, client)
@@ -108,7 +114,7 @@ def setup_button(hass, config, add_entities, client, address):
    timeout = config.get(CONF_TIMEOUT)
    ignored_click_types = config.get(CONF_IGNORED_CLICK_TYPES)
    button = FlicButton(hass, client, address, timeout, ignored_click_types)
-    _LOGGER.info("Connected to button (%s)", address)
+    _LOGGER.info("Connected to button %s", address)

    add_entities([button])

@@ -161,7 +167,7 @@ class FlicButton(BinarySensorDevice):
    @property
    def name(self):
        """Return the name of the device."""
-        return "flic_%s" % self.address.replace(":", "")
+        return 'flic_{}'.format(self.address.replace(':', ''))

    @property
    def address(self):
@@ -181,21 +187,21 @@ class FlicButton(BinarySensorDevice):
    @property
    def device_state_attributes(self):
        """Return device specific state attributes."""
-        return {"address": self.address}
+        return {'address': self.address}

    def _queued_event_check(self, click_type, time_diff):
        """Generate a log message and returns true if timeout exceeded."""
        time_string = "{:d} {}".format(
-            time_diff, "second" if time_diff == 1 else "seconds")
+            time_diff, 'second' if time_diff == 1 else 'seconds')

        if time_diff > self._timeout:
            _LOGGER.warning(
-                "Queued %s dropped for %s. Time in queue was %s.",
+                "Queued %s dropped for %s. Time in queue was %s",
                click_type, self.address, time_string)
            return True
        else:
            _LOGGER.info(
-                "Queued %s allowed for %s. Time in queue was %s.",
+                "Queued %s allowed for %s. Time in queue was %s",
                click_type, self.address, time_string)
            return False

@@ -227,8 +233,8 @@ class FlicButton(BinarySensorDevice):
            EVENT_DATA_TYPE: hass_click_type
        })

-    def _connection_status_changed(self, channel,
-                                   connection_status, disconnect_reason):
+    def _connection_status_changed(
+            self, channel, connection_status, disconnect_reason):
        """Remove device, if button disconnects."""
        import pyflic

@@ -18,7 +18,7 @@ from homeassistant.const import (
    CONF_SSL, EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_START,
    ATTR_LAST_TRIP_TIME, CONF_CUSTOMIZE)

-REQUIREMENTS = ['pyhik==0.1.0']
+REQUIREMENTS = ['pyhik==0.1.2']
 _LOGGER = logging.getLogger(__name__)

 CONF_IGNORED = 'ignored'
@@ -33,7 +33,6 @@ ATTR_DELAY = 'delay'
 DEVICE_CLASS_MAP = {
    'Motion': 'motion',
    'Line Crossing': 'motion',
-    'IO Trigger': None,
    'Field Detection': 'motion',
    'Video Loss': None,
    'Tamper Detection': 'motion',
@@ -47,6 +46,7 @@ DEVICE_CLASS_MAP = {
    'Bad Video': None,
    'PIR Alarm': 'motion',
    'Face Detection': 'motion',
+    'Scene Change Detection': 'motion',
 }

 CUSTOMIZE_SCHEMA = vol.Schema({
@@ -91,24 +91,30 @@ def setup_platform(hass, config, add_entities, discovery_info=None):

    entities = []

-    for sensor in data.sensors:
-        # Build sensor name, then parse customize config.
-        sensor_name = sensor.replace(' ', '_')
+    for sensor, channel_list in data.sensors.items():
+        for channel in channel_list:
+            # Build sensor name, then parse customize config.
+            if data.type == 'NVR':
+                sensor_name = '{}_{}'.format(
+                    sensor.replace(' ', '_'), channel[1])
+            else:
+                sensor_name = sensor.replace(' ', '_')

-        custom = customize.get(sensor_name.lower(), {})
-        ignore = custom.get(CONF_IGNORED)
-        delay = custom.get(CONF_DELAY)
+            custom = customize.get(sensor_name.lower(), {})
+            ignore = custom.get(CONF_IGNORED)
+            delay = custom.get(CONF_DELAY)

-        _LOGGER.debug('Entity: %s - %s, Options - Ignore: %s, Delay: %s',
-                      data.name, sensor_name, ignore, delay)
-        if not ignore:
-            entities.append(HikvisionBinarySensor(hass, sensor, data, delay))
+            _LOGGER.debug('Entity: %s - %s, Options - Ignore: %s, Delay: %s',
+                          data.name, sensor_name, ignore, delay)
+            if not ignore:
+                entities.append(HikvisionBinarySensor(
+                    hass, sensor, channel[1], data, delay))

    add_entities(entities)


 class HikvisionData(object):
-    """Hikvision camera event stream object."""
+    """Hikvision device event stream object."""

    def __init__(self, hass, url, port, name, username, password):
        """Initialize the data oject."""
@@ -144,25 +150,40 @@ class HikvisionData(object):

    @property
    def cam_id(self):
-        """Return camera id."""
+        """Return device id."""
        return self.camdata.get_id

    @property
    def name(self):
-        """Return camera name."""
+        """Return device name."""
        return self._name

+    @property
+    def type(self):
+        """Return device type."""
+        return self.camdata.get_type
+
+    def get_attributes(self, sensor, channel):
+        """Return attribute list for sensor/channel."""
+        return self.camdata.fetch_attributes(sensor, channel)
+

 class HikvisionBinarySensor(BinarySensorDevice):
    """Representation of a Hikvision binary sensor."""

-    def __init__(self, hass, sensor, cam, delay):
+    def __init__(self, hass, sensor, channel, cam, delay):
        """Initialize the binary_sensor."""
        self._hass = hass
        self._cam = cam
-        self._name = self._cam.name + ' ' + sensor
-        self._id = self._cam.cam_id + '.' + sensor
        self._sensor = sensor
+        self._channel = channel
+
+        if self._cam.type == 'NVR':
+            self._name = '{} {} {}'.format(self._cam.name, sensor, channel)
+        else:
+            self._name = '{} {}'.format(self._cam.name, sensor)
+
+        self._id = '{}.{}.{}'.format(self._cam.cam_id, sensor, channel)

        if delay is None:
            self._delay = 0
@@ -176,11 +197,11 @@ class HikvisionBinarySensor(BinarySensorDevice):

    def _sensor_state(self):
        """Extract sensor state."""
-        return self._cam.sensors[self._sensor][0]
+        return self._cam.get_attributes(self._sensor, self._channel)[0]

    def _sensor_last_update(self):
        """Extract sensor last update time."""
-        return self._cam.sensors[self._sensor][3]
+        return self._cam.get_attributes(self._sensor, self._channel)[3]

    @property
    def name(self):
@@ -32,7 +32,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
            InsteonPLMBinarySensorDevice(hass, plm, address, name)
        )

-    hass.async_add_job(async_add_devices(device_list))
+    async_add_devices(device_list)


 class InsteonPLMBinarySensorDevice(BinarySensorDevice):
@@ -0,0 +1,130 @@
+"""
+Tracks the latency of a host by sending ICMP echo requests (ping).
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.ping/
+"""
+import logging
+import subprocess
+import re
+import sys
+from datetime import timedelta
+
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.const import CONF_NAME, CONF_HOST
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTR_ROUND_TRIP_TIME_AVG = 'round_trip_time_avg'
+ATTR_ROUND_TRIP_TIME_MAX = 'round_trip_time_max'
+ATTR_ROUND_TRIP_TIME_MDEV = 'round_trip_time_mdev'
+ATTR_ROUND_TRIP_TIME_MIN = 'round_trip_time_min'
+
+CONF_PING_COUNT = 'count'
+
+DEFAULT_NAME = 'Ping Binary sensor'
+DEFAULT_PING_COUNT = 5
+DEFAULT_SENSOR_CLASS = 'connectivity'
+
+SCAN_INTERVAL = timedelta(minutes=5)
+
+PING_MATCHER = re.compile(
+    r'(?P<min>\d+.\d+)\/(?P<avg>\d+.\d+)\/(?P<max>\d+.\d+)\/(?P<mdev>\d+.\d+)')
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_PING_COUNT, default=DEFAULT_PING_COUNT): cv.positive_int,
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the Ping Binary sensor."""
+    name = config.get(CONF_NAME)
+    host = config.get(CONF_HOST)
+    count = config.get(CONF_PING_COUNT)
+
+    add_devices([PingBinarySensor(name, PingData(host, count))], True)
+
+
+class PingBinarySensor(BinarySensorDevice):
+    """Representation of a Ping Binary sensor."""
+
+    def __init__(self, name, ping):
+        """Initialize the Ping Binary sensor."""
+        self._name = name
+        self.ping = ping
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def device_class(self):
+        """Return the class of this sensor."""
+        return DEFAULT_SENSOR_CLASS
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self.ping.available
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes of the ICMP checo request."""
+        if self.ping.data is not False:
+            return {
+                ATTR_ROUND_TRIP_TIME_AVG: self.ping.data['avg'],
+                ATTR_ROUND_TRIP_TIME_MAX: self.ping.data['max'],
+                ATTR_ROUND_TRIP_TIME_MDEV: self.ping.data['mdev'],
+                ATTR_ROUND_TRIP_TIME_MIN: self.ping.data['min'],
+            }
+
+    def update(self):
+        """Get the latest data."""
+        self.ping.update()
+
+
+class PingData(object):
+    """The Class for handling the data retrieval."""
+
+    def __init__(self, host, count):
+        """Initialize the data object."""
+        self._ip_address = host
+        self._count = count
+        self.data = {}
+        self.available = False
+
+        if sys.platform == 'win32':
+            self._ping_cmd = [
+                'ping', '-n', str(self._count), '-w 1000', self._ip_address]
+        else:
+            self._ping_cmd = [
+                'ping', '-n', '-q', '-c', str(self._count), '-W1',
+                self._ip_address]
+
+    def ping(self):
+        """Send ICMP echo request and return details if success."""
+        pinger = subprocess.Popen(
+            self._ping_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        try:
+            out = pinger.communicate()
+            match = PING_MATCHER.search(str(out).split('\n')[-1])
+            rtt_min, rtt_avg, rtt_max, rtt_mdev = match.groups()
+            return {
+                'min': rtt_min,
+                'avg': rtt_avg,
+                'max': rtt_max,
+                'mdev': rtt_mdev}
+        except (subprocess.CalledProcessError, AttributeError):
+            return False
+
+    def update(self):
+        """Retrieve the latest details from the host."""
+        self.data = self.ping()
+        self.available = bool(self.data)
@@ -0,0 +1,109 @@
+"""
+This component provides HA sensor support for Ring Door Bell/Chimes.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.ring/
+"""
+import logging
+from datetime import timedelta
+
+import voluptuous as vol
+import homeassistant.helpers.config_validation as cv
+
+from homeassistant.components.ring import (
+    CONF_ATTRIBUTION, DEFAULT_ENTITY_NAMESPACE)
+
+from homeassistant.const import (
+    ATTR_ATTRIBUTION, CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS)
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+
+DEPENDENCIES = ['ring']
+
+_LOGGER = logging.getLogger(__name__)
+
+SCAN_INTERVAL = timedelta(seconds=5)
+
+# Sensor types: Name, category, device_class
+SENSOR_TYPES = {
+    'ding': ['Ding', ['doorbell'], 'occupancy'],
+    'motion': ['Motion', ['doorbell'], 'motion'],
+}
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_ENTITY_NAMESPACE, default=DEFAULT_ENTITY_NAMESPACE):
+        cv.string,
+    vol.Required(CONF_MONITORED_CONDITIONS, default=[]):
+        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up a sensor for a Ring device."""
+    ring = hass.data.get('ring')
+
+    sensors = []
+    for sensor_type in config.get(CONF_MONITORED_CONDITIONS):
+        for device in ring.doorbells:
+            if 'doorbell' in SENSOR_TYPES[sensor_type][1]:
+                sensors.append(RingBinarySensor(hass,
+                                                device,
+                                                sensor_type))
+    add_devices(sensors, True)
+    return True
+
+
+class RingBinarySensor(BinarySensorDevice):
+    """A binary sensor implementation for Ring device."""
+
+    def __init__(self, hass, data, sensor_type):
+        """Initialize a sensor for Ring device."""
+        super(RingBinarySensor, self).__init__()
+        self._sensor_type = sensor_type
+        self._data = data
+        self._name = "{0} {1}".format(self._data.name,
+                                      SENSOR_TYPES.get(self._sensor_type)[0])
+        self._device_class = SENSOR_TYPES.get(self._sensor_type)[2]
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return True if the binary sensor is on."""
+        return self._state
+
+    @property
+    def device_class(self):
+        """Return the class of the binary sensor."""
+        return self._device_class
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        attrs = {}
+        attrs[ATTR_ATTRIBUTION] = CONF_ATTRIBUTION
+
+        attrs['device_id'] = self._data.id
+        attrs['firmware'] = self._data.firmware
+        attrs['timezone'] = self._data.timezone
+
+        if self._data.alert and self._data.alert_expires_at:
+            attrs['expires_at'] = self._data.alert_expires_at
+            attrs['state'] = self._data.alert.get('state')
+
+        return attrs
+
+    def update(self):
+        """Get the latest data and updates the state."""
+        self._data.check_alerts()
+
+        if self._data.alert:
+            self._state = (self._sensor_type ==
+                           self._data.alert.get('kind'))
+        else:
+            self._state = False
@@ -20,8 +20,8 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
    import pywemo.discovery as discovery

    if discovery_info is not None:
-        location = discovery_info[2]
-        mac = discovery_info[3]
+        location = discovery_info['ssdp_description']
+        mac = discovery_info['mac_address']
        device = discovery.device_from_description(location, mac)

        if device:
@@ -40,12 +40,14 @@ class WemoBinarySensor(BinarySensorDevice):
        wemo.SUBSCRIPTION_REGISTRY.register(self.wemo)
        wemo.SUBSCRIPTION_REGISTRY.on(self.wemo, None, self._update_callback)

-    def _update_callback(self, _device, _params):
-        """Called by the wemo device callback to update state."""
+    def _update_callback(self, _device, _type, _params):
+        """Called by the Wemo device callback to update state."""
        _LOGGER.info(
            'Subscription update for  %s',
            _device)
-        self.update()
+        updated = self.wemo.subscription_update(_type, _params)
+        self._update(force_update=(not updated))
+
        if not hasattr(self, 'hass'):
            return
        self.schedule_update_ha_state()
@@ -72,7 +74,11 @@ class WemoBinarySensor(BinarySensorDevice):

    def update(self):
        """Update WeMo state."""
+        self._update(force_update=True)
+
+    def _update(self, force_update=True):
        try:
-            self._state = self.wemo.get_state(True)
-        except AttributeError:
-            _LOGGER.warning('Could not update status for %s', self.name)
+            self._state = self.wemo.get_state(force_update)
+        except AttributeError as err:
+            _LOGGER.warning('Could not update status for %s (%s)',
+                            self.name, err)
@@ -1,4 +1,9 @@
-"""Sensor to indicate whether the current day is a workday."""
+"""
+Sensor to indicate whether the current day is a workday.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.workday/
+"""
 import asyncio
 import logging
 import datetime
@@ -6,8 +11,8 @@ import datetime
 import voluptuous as vol

 from homeassistant.components.sensor import PLATFORM_SCHEMA
-from homeassistant.const import (STATE_ON, STATE_OFF, STATE_UNKNOWN,
-                                 CONF_NAME, WEEKDAYS)
+from homeassistant.const import (
+    STATE_ON, STATE_OFF, STATE_UNKNOWN, CONF_NAME, WEEKDAYS)
 import homeassistant.util.dt as dt_util
 from homeassistant.helpers.entity import Entity
 import homeassistant.helpers.config_validation as cv
@@ -48,32 +53,22 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup the Workday sensor."""
+    """Set up the Workday sensor."""
    import holidays

-    # Get the Sensor name from the config
    sensor_name = config.get(CONF_NAME)
-
-    # Get the country code from the config
    country = config.get(CONF_COUNTRY)
-
-    # Get the province from the config
    province = config.get(CONF_PROVINCE)
-
-    # Get the list of workdays from the config
    workdays = config.get(CONF_WORKDAYS)
-
-    # Get the list of excludes from the config
    excludes = config.get(CONF_EXCLUDES)

-    # Instantiate the holidays module for the current year
    year = datetime.datetime.now().year
    obj_holidays = getattr(holidays, country)(years=year)

-    # Also apply the provience, if available for the configured country
    if province:
-        if province not in obj_holidays.PROVINCES:
-            _LOGGER.error('There is no province/state %s in country %s',
+        if province not in obj_holidays.PROVINCES and \
+                        province not in obj_holidays.STATES:
+            _LOGGER.error("There is no province/state %s in country %s",
                          province, country)
            return False
        else:
@@ -81,14 +76,12 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
            obj_holidays = getattr(holidays, country)(prov=province,
                                                      years=year)

-    # Output found public holidays via the debug channel
    _LOGGER.debug("Found the following holidays for your configuration:")
    for date, name in sorted(obj_holidays.items()):
        _LOGGER.debug("%s %s", date, name)

-    # Add ourselves as device
-    add_devices([IsWorkdaySensor(obj_holidays, workdays,
-                                 excludes, sensor_name)], True)
+    add_devices([IsWorkdaySensor(
+        obj_holidays, workdays, excludes, sensor_name)], True)


 def day_to_string(day):
@@ -122,7 +115,6 @@ class IsWorkdaySensor(Entity):

    def is_include(self, day, now):
        """Check if given day is in the includes list."""
-        # Check includes
        if day in self._workdays:
            return True
        elif 'holiday' in self._workdays and now in self._obj_holidays:
@@ -132,7 +124,6 @@ class IsWorkdaySensor(Entity):

    def is_exclude(self, day, now):
        """Check if given day is in the excludes list."""
-        # Check excludes
        if day in self._excludes:
            return True
        elif 'holiday' in self._excludes and now in self._obj_holidays:
@@ -5,17 +5,19 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/blink/
 """
 import logging
+
 import voluptuous as vol
+
 import homeassistant.helpers.config_validation as cv
-from homeassistant.const import (CONF_USERNAME,
-                                 CONF_PASSWORD,
-                                 ATTR_FRIENDLY_NAME,
-                                 ATTR_ARMED)
+from homeassistant.const import (
+    CONF_USERNAME, CONF_PASSWORD, ATTR_FRIENDLY_NAME, ATTR_ARMED)
 from homeassistant.helpers import discovery
+
+REQUIREMENTS = ['blinkpy==0.5.2']
+
 _LOGGER = logging.getLogger(__name__)

 DOMAIN = 'blink'
-REQUIREMENTS = ['blinkpy==0.5.2']

 CONFIG_SCHEMA = vol.Schema({
    DOMAIN: vol.Schema({
@@ -50,7 +52,7 @@ class BlinkSystem(object):


 def setup(hass, config):
-    """Setup Blink System."""
+    """Set up Blink System."""
    hass.data[DOMAIN] = BlinkSystem(config)
    discovery.load_platform(hass, 'camera', DOMAIN, {}, config)
    discovery.load_platform(hass, 'sensor', DOMAIN, {}, config)
@@ -77,11 +79,11 @@ def setup(hass, config):
        hass.data[DOMAIN].blink.arm = value
        hass.data[DOMAIN].blink.refresh()

-    hass.services.register(DOMAIN, 'snap_picture', snap_picture,
-                           schema=SNAP_PICTURE_SCHEMA)
-    hass.services.register(DOMAIN, 'arm_camera', arm_camera,
-                           schema=ARM_CAMERA_SCHEMA)
-    hass.services.register(DOMAIN, 'arm_system', arm_system,
-                           schema=ARM_SYSTEM_SCHEMA)
+    hass.services.register(
+        DOMAIN, 'snap_picture', snap_picture, schema=SNAP_PICTURE_SCHEMA)
+    hass.services.register(
+        DOMAIN, 'arm_camera', arm_camera, schema=ARM_CAMERA_SCHEMA)
+    hass.services.register(
+        DOMAIN, 'arm_system', arm_system, schema=ARM_SYSTEM_SCHEMA)

    return True
@@ -7,6 +7,7 @@ https://home-assistant.io/components/camera/
 """
 import asyncio
 import collections
+from contextlib import suppress
 from datetime import timedelta
 import logging
 import hashlib
@@ -58,7 +59,6 @@ def async_get_image(hass, entity_id, timeout=10):
        state.attributes.get(ATTR_ENTITY_PICTURE)
    )

-    response = None
    try:
        with async_timeout.timeout(timeout, loop=hass.loop):
            response = yield from websession.get(url)
@@ -70,13 +70,9 @@ def async_get_image(hass, entity_id, timeout=10):
            image = yield from response.read()
            return image

-    except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+    except (asyncio.TimeoutError, aiohttp.ClientError):
        raise HomeAssistantError("Can't connect to {0}".format(url))

-    finally:
-        if response is not None:
-            yield from response.release()
-

@asyncio.coroutine
 def async_setup(hass, config):
@@ -172,7 +168,7 @@ class Camera(Entity):
                if not img_bytes:
                    break

-                if img_bytes is not None and img_bytes != last_image:
+                if img_bytes and img_bytes != last_image:
                    write(img_bytes)

                    # Chrome seems to always ignore first picture,
@@ -185,8 +181,8 @@ class Camera(Entity):

                yield from asyncio.sleep(.5)

-        except (asyncio.CancelledError, ConnectionResetError):
-            _LOGGER.debug("Close stream by frontend.")
+        except asyncio.CancelledError:
+            _LOGGER.debug("Stream closed by frontend.")
            response = None

        finally:
@@ -268,16 +264,14 @@ class CameraImageView(CameraView):
    @asyncio.coroutine
    def handle(self, request, camera):
        """Serve camera image."""
-        try:
-            image = yield from camera.async_camera_image()
+        with suppress(asyncio.CancelledError, asyncio.TimeoutError):
+            with async_timeout.timeout(10, loop=request.app['hass'].loop):
+                image = yield from camera.async_camera_image()

-            if image is None:
-                return web.Response(status=500)
+            if image:
+                return web.Response(body=image)

-            return web.Response(body=image)
-
-        except asyncio.CancelledError:
-            _LOGGER.debug("Close stream by frontend.")
+        return web.Response(status=500)


 class CameraMjpegStream(CameraView):
@@ -16,9 +16,9 @@ from homeassistant.const import (
    CONF_HOST, CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_PORT)
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import (
-    async_get_clientsession, async_aiohttp_proxy_stream)
+    async_get_clientsession, async_aiohttp_proxy_web)

-REQUIREMENTS = ['amcrest==1.1.4']
+REQUIREMENTS = ['amcrest==1.1.9']

 _LOGGER = logging.getLogger(__name__)

@@ -125,7 +125,7 @@ class AmcrestCam(Camera):
        stream_coro = websession.get(
            streaming_url, auth=self._token, timeout=TIMEOUT)

-        yield from async_aiohttp_proxy_stream(self.hass, request, stream_coro)
+        yield from async_aiohttp_proxy_web(self.hass, request, stream_coro)

    @property
    def name(self):
@@ -8,14 +8,14 @@ import asyncio
 import logging

 import voluptuous as vol
-from aiohttp import web

+from homeassistant.const import CONF_NAME
 from homeassistant.components.camera import Camera, PLATFORM_SCHEMA
 from homeassistant.components.ffmpeg import (
    DATA_FFMPEG, CONF_INPUT, CONF_EXTRA_ARGUMENTS)
 import homeassistant.helpers.config_validation as cv
-from homeassistant.const import CONF_NAME
-
+from homeassistant.helpers.aiohttp_client import (
+    async_aiohttp_proxy_stream)
 DEPENDENCIES = ['ffmpeg']

 _LOGGER = logging.getLogger(__name__)
@@ -69,26 +69,10 @@ class FFmpegCamera(Camera):
        yield from stream.open_camera(
            self._input, extra_cmd=self._extra_arguments)

-        response = web.StreamResponse()
-        response.content_type = 'multipart/x-mixed-replace;boundary=ffserver'
-
-        yield from response.prepare(request)
-
-        try:
-            while True:
-                data = yield from stream.read(102400)
-                if not data:
-                    break
-                response.write(data)
-
-        except asyncio.CancelledError:
-            _LOGGER.debug("Close stream by frontend.")
-            response = None
-
-        finally:
-            yield from stream.close()
-            if response is not None:
-                yield from response.write_eof()
+        yield from async_aiohttp_proxy_stream(
+            self.hass, request, stream,
+            'multipart/x-mixed-replace;boundary=ffserver')
+        yield from stream.close()

    @property
    def name(self):
@@ -66,9 +66,13 @@ class FoscamCamera(Camera):
    def camera_image(self):
        """Return a still image reponse from the camera."""
        # Send the request to snap a picture and return raw jpg data
-        response = requests.get(self._snap_picture_url, timeout=10)
-
-        return response.content
+        # Handle exception if host is not reachable or url failed
+        try:
+            response = requests.get(self._snap_picture_url, timeout=10)
+        except requests.exceptions.ConnectionError:
+            return None
+        else:
+            return response.content

    @property
    def name(self):
@@ -107,7 +107,6 @@ class GenericCamera(Camera):
                None, fetch)
        # async
        else:
-            response = None
            try:
                websession = async_get_clientsession(self.hass)
                with async_timeout.timeout(10, loop=self.hass.loop):
@@ -117,14 +116,9 @@ class GenericCamera(Camera):
            except asyncio.TimeoutError:
                _LOGGER.error('Timeout getting camera image')
                return self._last_image
-            except (aiohttp.errors.ClientError,
-                    aiohttp.errors.DisconnectedError,
-                    aiohttp.errors.HttpProcessingError) as err:
+            except aiohttp.ClientError as err:
                _LOGGER.error('Error getting new camera image: %s', err)
                return self._last_image
-            finally:
-                if response is not None:
-                    yield from response.release()

        self._last_url = url
        return self._last_image
@@ -19,7 +19,7 @@ from homeassistant.const import (
    HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION)
 from homeassistant.components.camera import (PLATFORM_SCHEMA, Camera)
 from homeassistant.helpers.aiohttp_client import (
-    async_get_clientsession, async_aiohttp_proxy_stream)
+    async_get_clientsession, async_aiohttp_proxy_web)
 from homeassistant.helpers import config_validation as cv

 _LOGGER = logging.getLogger(__name__)
@@ -93,7 +93,6 @@ class MjpegCamera(Camera):
            return image

        websession = async_get_clientsession(self.hass)
-        response = None
        try:
            with async_timeout.timeout(10, loop=self.hass.loop):
                response = yield from websession.get(
@@ -105,14 +104,9 @@ class MjpegCamera(Camera):
        except asyncio.TimeoutError:
            _LOGGER.error('Timeout getting camera image')

-        except (aiohttp.errors.ClientError,
-                aiohttp.errors.ClientDisconnectedError) as err:
+        except aiohttp.ClientError as err:
            _LOGGER.error('Error getting new camera image: %s', err)

-        finally:
-            if response is not None:
-                yield from response.release()
-
    def camera_image(self):
        """Return a still image response from the camera."""
        if self._username and self._password:
@@ -140,7 +134,7 @@ class MjpegCamera(Camera):
        websession = async_get_clientsession(self.hass)
        stream_coro = websession.get(self._mjpeg_url, auth=self._auth)

-        yield from async_aiohttp_proxy_stream(self.hass, request, stream_coro)
+        yield from async_aiohttp_proxy_web(self.hass, request, stream_coro)

    @property
    def name(self):
@@ -0,0 +1,74 @@
+"""
+Camera that loads a picture from an MQTT topic.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.mqtt/
+"""
+
+import asyncio
+import logging
+
+import voluptuous as vol
+
+from homeassistant.core import callback
+import homeassistant.components.mqtt as mqtt
+from homeassistant.const import CONF_NAME
+from homeassistant.components.camera import Camera, PLATFORM_SCHEMA
+from homeassistant.helpers import config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_TOPIC = 'topic'
+
+DEFAULT_NAME = 'MQTT Camera'
+
+DEPENDENCIES = ['mqtt']
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_TOPIC): mqtt.valid_subscribe_topic,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string
+})
+
+
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Setup the Camera."""
+    topic = config[CONF_TOPIC]
+
+    async_add_devices([MqttCamera(config[CONF_NAME], topic)])
+
+
+class MqttCamera(Camera):
+    """MQTT camera."""
+
+    def __init__(self, name, topic):
+        """Initialize Local File Camera component."""
+        super().__init__()
+
+        self._name = name
+        self._topic = topic
+        self._qos = 0
+        self._last_image = None
+
+    @asyncio.coroutine
+    def async_camera_image(self):
+        """Return image response."""
+        return self._last_image
+
+    @property
+    def name(self):
+        """Return the name of this camera."""
+        return self._name
+
+    def async_added_to_hass(self):
+        """Subscribe mqtt events.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        @callback
+        def message_received(topic, payload, qos):
+            """A new MQTT message has been received."""
+            self._last_image = payload
+
+        return mqtt.async_subscribe(
+            self.hass, self._topic, message_received, self._qos, None)
@@ -0,0 +1,65 @@
+"""
+Camera that loads a picture from a local file.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.neato/
+"""
+import logging
+
+from datetime import timedelta
+from homeassistant.components.camera import Camera
+from homeassistant.components.neato import (
+    NEATO_MAP_DATA, NEATO_ROBOTS, NEATO_LOGIN)
+from homeassistant.util import Throttle
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['neato']
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Camera."""
+    dev = []
+    for robot in hass.data[NEATO_ROBOTS]:
+        if 'maps' in robot.traits:
+            dev.append(NeatoCleaningMap(hass, robot))
+    _LOGGER.debug('Adding robots for cleaning maps %s', dev)
+    add_devices(dev, True)
+
+
+class NeatoCleaningMap(Camera):
+    """Neato cleaning map for last clean."""
+
+    def __init__(self, hass, robot):
+        """Initialize Neato cleaning map."""
+        super().__init__()
+        self.robot = robot
+        self._robot_name = self.robot.name + ' Cleaning Map'
+        self._robot_serial = self.robot.serial
+        self.neato = hass.data[NEATO_LOGIN]
+        self._image_url = None
+        self._image = None
+
+    def camera_image(self):
+        """Return image response."""
+        self.update()
+        return self._image
+
+    @Throttle(timedelta(seconds=10))
+    def update(self):
+        """Check the contents of the map list."""
+        self.neato.update_robots()
+        image_url = None
+        map_data = self.hass.data[NEATO_MAP_DATA]
+        image_url = map_data[self._robot_serial]['maps'][0]['url']
+        if image_url == self._image_url:
+            _LOGGER.debug('The map image_url is the same as old')
+            return
+        image = self.neato.download_map(image_url)
+        self._image = image.read()
+        self._image_url = image_url
+
+    @property
+    def name(self):
+        """Return the name of this camera."""
+        return self._robot_name
@@ -19,7 +19,7 @@ from homeassistant.components.camera import (
    Camera, PLATFORM_SCHEMA)
 from homeassistant.helpers.aiohttp_client import (
    async_get_clientsession, async_create_clientsession,
-    async_aiohttp_proxy_stream)
+    async_aiohttp_proxy_web)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util.async import run_coroutine_threadsafe

@@ -74,7 +74,6 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
        'version': '1',
        'query': 'SYNO.'
    }
-    query_req = None
    try:
        with async_timeout.timeout(timeout, loop=hass.loop):
            query_req = yield from websession_init.get(
@@ -82,20 +81,18 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
                params=query_payload
            )

-        query_resp = yield from query_req.json()
+        # Skip content type check because Synology doesn't return JSON with
+        # right content type
+        query_resp = yield from query_req.json(content_type=None)
        auth_path = query_resp['data'][AUTH_API]['path']
        camera_api = query_resp['data'][CAMERA_API]['path']
        camera_path = query_resp['data'][CAMERA_API]['path']
        streaming_path = query_resp['data'][STREAMING_API]['path']

-    except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+    except (asyncio.TimeoutError, aiohttp.ClientError):
        _LOGGER.exception("Error on %s", syno_api_url)
        return False

-    finally:
-        if query_req is not None:
-            yield from query_req.release()
-
    # Authticate to NAS to get a session id
    syno_auth_url = SYNO_API_URL.format(
        config.get(CONF_URL), WEBAPI_PATH, auth_path)
@@ -128,13 +125,12 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
                syno_camera_url,
                params=camera_payload
            )
-    except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+    except (asyncio.TimeoutError, aiohttp.ClientError):
        _LOGGER.exception("Error on %s", syno_camera_url)
        return False

-    camera_resp = yield from camera_req.json()
+    camera_resp = yield from camera_req.json(content_type=None)
    cameras = camera_resp['data']['cameras']
-    yield from camera_req.release()

    # add cameras
    devices = []
@@ -172,24 +168,19 @@ def get_session_id(hass, websession, username, password, login_url, timeout):
        'session': 'SurveillanceStation',
        'format': 'sid'
    }
-    auth_req = None
    try:
        with async_timeout.timeout(timeout, loop=hass.loop):
            auth_req = yield from websession.get(
                login_url,
                params=auth_payload
            )
-        auth_resp = yield from auth_req.json()
+        auth_resp = yield from auth_req.json(content_type=None)
        return auth_resp['data']['sid']

-    except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+    except (asyncio.TimeoutError, aiohttp.ClientError):
        _LOGGER.exception("Error on %s", login_url)
        return False

-    finally:
-        if auth_req is not None:
-            yield from auth_req.release()
-

 class SynologyCamera(Camera):
    """An implementation of a Synology NAS based IP camera."""
@@ -235,12 +226,11 @@ class SynologyCamera(Camera):
                    image_url,
                    params=image_payload
                )
-        except (asyncio.TimeoutError, aiohttp.errors.ClientError):
-            _LOGGER.exception("Error on %s", image_url)
+        except (asyncio.TimeoutError, aiohttp.ClientError):
+            _LOGGER.error("Error fetching %s", image_url)
            return None

        image = yield from response.read()
-        yield from response.release()

        return image

@@ -260,7 +250,7 @@ class SynologyCamera(Camera):
        stream_coro = self._websession.get(
            streaming_url, params=streaming_payload)

-        yield from async_aiohttp_proxy_stream(self.hass, request, stream_coro)
+        yield from async_aiohttp_proxy_web(self.hass, request, stream_coro)

    @property
    def name(self):
@@ -101,11 +101,17 @@ class ZoneMinderCamera(MjpegCamera):
        status_response = zoneminder.get_state(
            'api/monitors/alarm/id:%i/command:status.json' % self._monitor_id
        )
+
        if not status_response:
            _LOGGER.warning('Could not get status for monitor %i',
                            self._monitor_id)
            return

+        if status_response['success'] is False:
+            _LOGGER.warning('Alarm status API call failed for monitor %i',
+                            self._monitor_id)
+            return
+
        self._is_recording = status_response['status'] == ZM_STATE_ALARM

    @property
@@ -692,18 +692,16 @@ class ClimateDevice(Entity):

    def _convert_for_display(self, temp):
        """Convert temperature into preferred units for display purposes."""
-        if (temp is None or not isinstance(temp, Number) or
-                self.temperature_unit == self.unit_of_measurement):
+        if temp is None or not isinstance(temp, Number):
            return temp
-
-        value = convert_temperature(temp, self.temperature_unit,
-                                    self.unit_of_measurement)
-
+        if self.temperature_unit != self.unit_of_measurement:
+            temp = convert_temperature(temp, self.temperature_unit,
+                                       self.unit_of_measurement)
        # Round in the units appropriate
        if self.precision == PRECISION_HALVES:
-            return round(value * 2) / 2.0
+            return round(temp * 2) / 2.0
        elif self.precision == PRECISION_TENTHS:
-            return round(value, 1)
+            return round(temp, 1)
        else:
            # PRECISION_WHOLE as a fall back
-            return round(value)
+            return round(temp)
@@ -16,11 +16,15 @@ _LOGGER = logging.getLogger(__name__)

 STATE_MANUAL = "manual"
 STATE_BOOST = "boost"
+STATE_COMFORT = "comfort"
+STATE_LOWERING = "lowering"

 HM_STATE_MAP = {
    "AUTO_MODE": STATE_AUTO,
    "MANU_MODE": STATE_MANUAL,
    "BOOST_MODE": STATE_BOOST,
+    "COMFORT_MODE": STATE_COMFORT,
+    "LOWERING_MODE": STATE_LOWERING
 }

 HM_TEMP_MAP = [
@@ -1,40 +1,40 @@
-"""tado component to create a climate device for each zone."""
+"""
+Tado component to create a climate device for each zone.

+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.tado/
+"""
 import logging

 from homeassistant.const import TEMP_CELSIUS
-
-from homeassistant.components.climate import (
-    ClimateDevice)
-from homeassistant.const import (
-    ATTR_TEMPERATURE)
-from homeassistant.components.tado import (
-    DATA_TADO)
-
-CONST_MODE_SMART_SCHEDULE = "SMART_SCHEDULE"  # Default mytado mode
-CONST_MODE_OFF = "OFF"  # Switch off heating in a zone
-
-# When we change the temperature setting, we need an overlay mode
-# wait until tado changes the mode automatic
-CONST_OVERLAY_TADO_MODE = "TADO_MODE"
-# the user has change the temperature or mode manually
-CONST_OVERLAY_MANUAL = "MANUAL"
-# the temperature will be reset after a timespan
-CONST_OVERLAY_TIMER = "TIMER"
-
-OPERATION_LIST = {
-    CONST_OVERLAY_MANUAL: "Manual",
-    CONST_OVERLAY_TIMER: "Timer",
-    CONST_OVERLAY_TADO_MODE: "Tado mode",
-    CONST_MODE_SMART_SCHEDULE: "Smart schedule",
-    CONST_MODE_OFF: "Off"}
+from homeassistant.components.climate import ClimateDevice
+from homeassistant.const import ATTR_TEMPERATURE
+from homeassistant.components.tado import DATA_TADO

 _LOGGER = logging.getLogger(__name__)

+CONST_MODE_SMART_SCHEDULE = 'SMART_SCHEDULE'  # Default mytado mode
+CONST_MODE_OFF = 'OFF'  # Switch off heating in a zone
+
+# When we change the temperature setting, we need an overlay mode
+# wait until tado changes the mode automatic
+CONST_OVERLAY_TADO_MODE = 'TADO_MODE'
+# the user has change the temperature or mode manually
+CONST_OVERLAY_MANUAL = 'MANUAL'
+# the temperature will be reset after a timespan
+CONST_OVERLAY_TIMER = 'TIMER'
+
+OPERATION_LIST = {
+    CONST_OVERLAY_MANUAL: 'Manual',
+    CONST_OVERLAY_TIMER: 'Timer',
+    CONST_OVERLAY_TADO_MODE: 'Tado mode',
+    CONST_MODE_SMART_SCHEDULE: 'Smart schedule',
+    CONST_MODE_OFF: 'Off',
+}
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup the climate platform."""
-    # get the PyTado object from the hub component
+    """Set up the Tado climate platform."""
    tado = hass.data[DATA_TADO]

    try:
@@ -45,10 +45,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):

    climate_devices = []
    for zone in zones:
-        climate_devices.append(create_climate_device(tado, hass,
-                                                     zone,
-                                                     zone['name'],
-                                                     zone['id']))
+        climate_devices.append(create_climate_device(
+            tado, hass, zone, zone['name'], zone['id']))

    if len(climate_devices) > 0:
        add_devices(climate_devices, True)
@@ -58,13 +56,13 @@ def setup_platform(hass, config, add_devices, discovery_info=None):


 def create_climate_device(tado, hass, zone, name, zone_id):
-    """Create a climate device."""
+    """Create a Tado climate device."""
    capabilities = tado.get_capabilities(zone_id)

    unit = TEMP_CELSIUS
-    min_temp = float(capabilities["temperatures"]["celsius"]["min"])
-    max_temp = float(capabilities["temperatures"]["celsius"]["max"])
-    ac_mode = capabilities["type"] != "HEATING"
+    min_temp = float(capabilities['temperatures']['celsius']['min'])
+    max_temp = float(capabilities['temperatures']['celsius']['max'])
+    ac_mode = capabilities['type'] != 'HEATING'

    data_id = 'zone {} {}'.format(name, zone_id)
    device = TadoClimate(tado,
@@ -74,10 +72,10 @@ def create_climate_device(tado, hass, zone, name, zone_id):
                         ac_mode)

    tado.add_sensor(data_id, {
-        "id": zone_id,
-        "zone": zone,
-        "name": name,
-        "climate": device
+        'id': zone_id,
+        'zone': zone,
+        'name': name,
+        'climate': device
    })

    return device
@@ -89,7 +87,7 @@ class TadoClimate(ClimateDevice):
    def __init__(self, store, zone_name, zone_id, data_id,
                 min_temp, max_temp, ac_mode,
                 tolerance=0.3):
-        """Initialization of TadoClimate device."""
+        """Initialization of Tado climate device."""
        self._store = store
        self._data_id = data_id

@@ -202,8 +200,7 @@ class TadoClimate(ClimateDevice):
        data = self._store.get_data(self._data_id)

        if data is None:
-            _LOGGER.debug('Recieved no data for zone %s',
-                          self.zone_name)
+            _LOGGER.debug("Recieved no data for zone %s", self.zone_name)
            return

        if 'sensorDataPoints' in data:
@@ -232,11 +229,11 @@ class TadoClimate(ClimateDevice):

        if 'tadoMode' in data:
            mode = data['tadoMode']
-            self._is_away = mode == "AWAY"
+            self._is_away = mode == 'AWAY'

        if 'setting' in data:
            power = data['setting']['power']
-            if power == "OFF":
+            if power == 'OFF':
                self._current_operation = CONST_MODE_OFF
                self._device_is_active = False
            else:
@@ -249,48 +246,47 @@ class TadoClimate(ClimateDevice):
            overlay = False
            termination = ""

-        #  if you set mode manualy to off, there will be an overlay
-        #  and a termination, but we want to see the mode "OFF"
+        # If you set mode manualy to off, there will be an overlay
+        # and a termination, but we want to see the mode "OFF"

        if overlay and self._device_is_active:
-            #  there is an overlay the device is on
+            # There is an overlay the device is on
            self._overlay_mode = termination
            self._current_operation = termination
        else:
-            #  there is no overlay, the mode will always be
-            #  "SMART_SCHEDULE"
+            # There is no overlay, the mode will always be
+            # "SMART_SCHEDULE"
            self._overlay_mode = CONST_MODE_SMART_SCHEDULE
            self._current_operation = CONST_MODE_SMART_SCHEDULE

    def _control_heating(self):
        """Send new target temperature to mytado."""
-        if not self._active and None not in (self._cur_temp,
-                                             self._target_temp):
+        if not self._active and None not in (
+                self._cur_temp, self._target_temp):
            self._active = True
-            _LOGGER.info('Obtained current and target temperature. '
-                         'tado thermostat active.')
+            _LOGGER.info("Obtained current and target temperature. "
+                         "Tado thermostat active")

        if not self._active or self._current_operation == self._overlay_mode:
            return

        if self._current_operation == CONST_MODE_SMART_SCHEDULE:
-            _LOGGER.info('Switching mytado.com to SCHEDULE (default) '
-                         'for zone %s', self.zone_name)
+            _LOGGER.info("Switching mytado.com to SCHEDULE (default) "
+                         "for zone %s", self.zone_name)
            self._store.reset_zone_overlay(self.zone_id)
            self._overlay_mode = self._current_operation
            return

        if self._current_operation == CONST_MODE_OFF:
-            _LOGGER.info('Switching mytado.com to OFF for zone %s',
+            _LOGGER.info("Switching mytado.com to OFF for zone %s",
                         self.zone_name)
            self._store.set_zone_overlay(self.zone_id, CONST_OVERLAY_MANUAL)
            self._overlay_mode = self._current_operation
            return

-        _LOGGER.info('Switching mytado.com to %s mode for zone %s',
+        _LOGGER.info("Switching mytado.com to %s mode for zone %s",
                     self._current_operation, self.zone_name)
-        self._store.set_zone_overlay(self.zone_id,
-                                     self._current_operation,
-                                     self._target_temp)
+        self._store.set_zone_overlay(
+            self.zone_id, self._current_operation, self._target_temp)

        self._overlay_mode = self._current_operation
@@ -19,7 +19,6 @@ DEPENDENCIES = ['wink']
 STATE_AUX = 'aux'
 STATE_ECO = 'eco'
 STATE_FAN = 'fan'
-SPEED_LOWEST = 'lowest'
 SPEED_LOW = 'low'
 SPEED_MEDIUM = 'medium'
 SPEED_HIGH = 'high'
@@ -400,7 +399,7 @@ class WinkAC(WinkDevice, ClimateDevice):
            op_list.append(STATE_COOL)
        if 'auto_eco' in modes:
            op_list.append(STATE_ECO)
-        if 'fan_eco' in modes:
+        if 'fan_only' in modes:
            op_list.append(STATE_FAN)
        return op_list

@@ -439,9 +438,7 @@ class WinkAC(WinkDevice, ClimateDevice):
    def current_fan_mode(self):
        """Return the current fan mode."""
        speed = self.wink.current_fan_speed()
-        if speed <= 0.3 and speed >= 0.0:
-            return SPEED_LOWEST
-        elif speed <= 0.5 and speed > 0.3:
+        if speed <= 0.4 and speed > 0.3:
            return SPEED_LOW
        elif speed <= 0.8 and speed > 0.5:
            return SPEED_MEDIUM
@@ -453,14 +450,12 @@ class WinkAC(WinkDevice, ClimateDevice):
    @property
    def fan_list(self):
        """List of available fan modes."""
-        return [SPEED_LOWEST, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]
+        return [SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]

    def set_fan_mode(self, mode):
        """Set fan speed."""
-        if mode == SPEED_LOWEST:
-            speed = 0.3
-        elif mode == SPEED_LOW:
-            speed = 0.5
+        if mode == SPEED_LOW:
+            speed = 0.4
        elif mode == SPEED_MEDIUM:
            speed = 0.8
        elif mode == SPEED_HIGH:
@@ -112,8 +112,9 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):
            _LOGGER.debug("Setpoint is 0, setting default to "
                          "current_temperature=%s",
                          self._current_temperature)
-            self._target_temperature = (
-                round((float(self._current_temperature)), 1))
+            if self._current_temperature is not None:
+                self._target_temperature = (
+                    round((float(self._current_temperature)), 1))
        else:
            self._target_temperature = round(
                (float(self.values.primary.data)), 1)
@@ -180,7 +180,7 @@ class Configurator(object):

        # field validation goes here?

-        callback(call.data.get(ATTR_FIELDS, {}))
+        self.hass.async_add_job(callback, call.data.get(ATTR_FIELDS, {}))

    def _generate_unique_id(self):
        """Generate a unique configurator ID."""
@@ -47,6 +47,7 @@ class VeraCover(VeraDevice, CoverDevice):
    def set_cover_position(self, position, **kwargs):
        """Move the cover to a specific position."""
        self.vera_device.set_level(position)
+        self.schedule_update_ha_state()

    @property
    def is_closed(self):
@@ -60,11 +61,14 @@ class VeraCover(VeraDevice, CoverDevice):
    def open_cover(self, **kwargs):
        """Open the cover."""
        self.vera_device.open()
+        self.schedule_update_ha_state()

    def close_cover(self, **kwargs):
        """Close the cover."""
        self.vera_device.close()
+        self.schedule_update_ha_state()

    def stop_cover(self, **kwargs):
        """Stop the cover."""
        self.vera_device.stop()
+        self.schedule_update_ha_state()
@@ -20,12 +20,13 @@ _LOGGER = logging.getLogger(__name__)
 SUPPORT_GARAGE = SUPPORT_OPEN | SUPPORT_CLOSE


-def get_device(values, **kwargs):
+def get_device(hass, values, node_config, **kwargs):
    """Create zwave entity device."""
+    invert_buttons = node_config.get(zwave.CONF_INVERT_OPENCLOSE_BUTTONS)
    if (values.primary.command_class ==
            zwave.const.COMMAND_CLASS_SWITCH_MULTILEVEL
            and values.primary.index == 0):
-        return ZwaveRollershutter(values)
+        return ZwaveRollershutter(hass, values, invert_buttons)
    elif (values.primary.command_class in [
            zwave.const.COMMAND_CLASS_SWITCH_BINARY,
            zwave.const.COMMAND_CLASS_BARRIER_OPERATOR]):
@@ -36,13 +37,15 @@ def get_device(values, **kwargs):
 class ZwaveRollershutter(zwave.ZWaveDeviceEntity, CoverDevice):
    """Representation of an Zwave roller shutter."""

-    def __init__(self, values):
+    def __init__(self, hass, values, invert_buttons):
        """Initialize the zwave rollershutter."""
        ZWaveDeviceEntity.__init__(self, values, DOMAIN)
        # pylint: disable=no-member
+        self._network = hass.data[zwave.ZWAVE_NETWORK]
        self._open_id = None
        self._close_id = None
        self._current_position = None
+        self._invert_buttons = invert_buttons

        self._workaround = workaround.get_device_mapping(values.primary)
        if self._workaround:
@@ -56,10 +59,9 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, CoverDevice):

        if self.values.open and self.values.close and \
                self._open_id is None and self._close_id is None:
-            if self._workaround == workaround.WORKAROUND_REVERSE_OPEN_CLOSE:
+            if self._invert_buttons:
                self._open_id = self.values.close.value_id
                self._close_id = self.values.open.value_id
-                self._workaround = None
            else:
                self._open_id = self.values.open.value_id
                self._close_id = self.values.close.value_id
@@ -89,11 +91,11 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, CoverDevice):

    def open_cover(self, **kwargs):
        """Move the roller shutter up."""
-        zwave.NETWORK.manager.pressButton(self._open_id)
+        self._network.manager.pressButton(self._open_id)

    def close_cover(self, **kwargs):
        """Move the roller shutter down."""
-        zwave.NETWORK.manager.pressButton(self._close_id)
+        self._network.manager.pressButton(self._close_id)

    def set_cover_position(self, position, **kwargs):
        """Move the roller shutter to a specific position."""
@@ -101,7 +103,7 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, CoverDevice):

    def stop_cover(self, **kwargs):
        """Stop the roller shutter."""
-        zwave.NETWORK.manager.releaseButton(self._open_id)
+        self._network.manager.releaseButton(self._open_id)


 class ZwaveGarageDoor(zwave.ZWaveDeviceEntity, CoverDevice):
@@ -159,13 +159,13 @@ def async_setup(hass, config):

    tasks2.append(group.Group.async_create_group(hass, 'living room', [
        lights[1], switches[0], 'input_select.living_room_preset',
-        'rollershutter.living_room_window', media_players[1],
+        'cover.living_room_window', media_players[1],
        'scene.romantic_lights']))
    tasks2.append(group.Group.async_create_group(hass, 'bedroom', [
        lights[0], switches[1], media_players[0],
        'input_slider.noise_allowance']))
    tasks2.append(group.Group.async_create_group(hass, 'kitchen', [
-        lights[2], 'rollershutter.kitchen_window', 'lock.kitchen_door']))
+        lights[2], 'cover.kitchen_window', 'lock.kitchen_door']))
    tasks2.append(group.Group.async_create_group(hass, 'doors', [
        'lock.front_door', 'lock.kitchen_door',
        'garage_door.right_garage_door', 'garage_door.left_garage_door']))
@@ -176,8 +176,8 @@ def async_setup(hass, config):
        'device_tracker.demo_paulus']))
    tasks2.append(group.Group.async_create_group(hass, 'downstairs', [
        'group.living_room', 'group.kitchen',
-        'scene.romantic_lights', 'rollershutter.kitchen_window',
-        'rollershutter.living_room_window', 'group.doors',
+        'scene.romantic_lights', 'cover.kitchen_window',
+        'cover.living_room_window', 'group.doors',
        'thermostat.ecobee',
    ], view=True))

@@ -553,7 +553,6 @@ class Device(Entity):
        # bytes like 00 get truncates to 0, API needs full bytes
        oui = '{:02x}:{:02x}:{:02x}'.format(*[int(b, 16) for b in oui_bytes])
        url = 'http://api.macvendors.com/' + oui
-        resp = None
        try:
            websession = async_get_clientsession(self.hass)

@@ -570,13 +569,9 @@ class Device(Entity):
            # in the 'known_devices.yaml' file which only happens
            # the first time the device is seen.
            return 'unknown'
-        except (asyncio.TimeoutError, aiohttp.errors.ClientError,
-                aiohttp.errors.ClientDisconnectedError):
+        except (asyncio.TimeoutError, aiohttp.ClientError):
            # same as above
            return 'unknown'
-        finally:
-            if resp is not None:
-                yield from resp.release()

    @asyncio.coroutine
    def async_added_to_hass(self):
@@ -4,19 +4,20 @@ Support for the Automatic platform.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.automatic/
 """
+import asyncio
 from datetime import timedelta
 import logging
-import re
-import requests

 import voluptuous as vol

 from homeassistant.components.device_tracker import (
    PLATFORM_SCHEMA, ATTR_ATTRIBUTES)
 from homeassistant.const import CONF_USERNAME, CONF_PASSWORD
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.event import track_utc_time_change
-from homeassistant.util import datetime as dt_util
+from homeassistant.helpers.event import async_track_time_interval
+
+REQUIREMENTS = ['aioautomatic==0.2.1']

 _LOGGER = logging.getLogger(__name__)

@@ -24,129 +25,103 @@ CONF_CLIENT_ID = 'client_id'
 CONF_SECRET = 'secret'
 CONF_DEVICES = 'devices'

-SCOPE = 'scope:location scope:vehicle:profile scope:user:profile scope:trip'
+DEFAULT_TIMEOUT = 5

-ATTR_ACCESS_TOKEN = 'access_token'
-ATTR_EXPIRES_IN = 'expires_in'
-ATTR_RESULTS = 'results'
-ATTR_VEHICLE = 'vehicle'
-ATTR_ENDED_AT = 'ended_at'
-ATTR_END_LOCATION = 'end_location'
-
-URL_AUTHORIZE = 'https://accounts.automatic.com/oauth/access_token/'
-URL_VEHICLES = 'https://api.automatic.com/vehicle/'
-URL_TRIPS = 'https://api.automatic.com/trip/'
-
-_VEHICLE_ID_REGEX = re.compile(
-    (URL_VEHICLES + '(.*)?[/]$').replace('/', r'\/'))
+SCOPE = ['location', 'vehicle:profile', 'trip']

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_CLIENT_ID): cv.string,
    vol.Required(CONF_SECRET): cv.string,
    vol.Required(CONF_USERNAME): cv.string,
    vol.Required(CONF_PASSWORD): cv.string,
-    vol.Optional(CONF_DEVICES): vol.All(cv.ensure_list, [cv.string])
+    vol.Optional(CONF_DEVICES, default=None): vol.All(
+        cv.ensure_list, [cv.string])
 })


-def setup_scanner(hass, config: dict, see, discovery_info=None):
+@asyncio.coroutine
+def async_setup_scanner(hass, config, async_see, discovery_info=None):
    """Validate the configuration and return an Automatic scanner."""
+    import aioautomatic
+
+    client = aioautomatic.Client(
+        client_id=config[CONF_CLIENT_ID],
+        client_secret=config[CONF_SECRET],
+        client_session=async_get_clientsession(hass),
+        request_kwargs={'timeout': DEFAULT_TIMEOUT})
    try:
-        AutomaticDeviceScanner(hass, config, see)
-    except requests.HTTPError as err:
+        session = yield from client.create_session_from_password(
+            SCOPE, config[CONF_USERNAME], config[CONF_PASSWORD])
+        data = AutomaticData(hass, session, config[CONF_DEVICES], async_see)
+    except aioautomatic.exceptions.AutomaticError as err:
        _LOGGER.error(str(err))
        return False

+    yield from data.update()
    return True


-class AutomaticDeviceScanner(object):
-    """A class representing an Automatic device."""
+class AutomaticData(object):
+    """A class representing an Automatic cloud service connection."""

-    def __init__(self, hass, config: dict, see) -> None:
+    def __init__(self, hass, session, devices, async_see):
        """Initialize the automatic device scanner."""
        self.hass = hass
-        self._devices = config.get(CONF_DEVICES, None)
-        self._access_token_payload = {
-            'username': config.get(CONF_USERNAME),
-            'password': config.get(CONF_PASSWORD),
-            'client_id': config.get(CONF_CLIENT_ID),
-            'client_secret': config.get(CONF_SECRET),
-            'grant_type': 'password',
-            'scope': SCOPE
-        }
-        self._headers = None
-        self._token_expires = dt_util.now()
-        self.last_results = {}
-        self.last_trips = {}
-        self.see = see
+        self.devices = devices
+        self.session = session
+        self.async_see = async_see

-        self._update_info()
+        async_track_time_interval(hass, self.update, timedelta(seconds=30))

-        track_utc_time_change(self.hass, self._update_info,
-                              second=range(0, 60, 30))
-
-    def _update_headers(self):
-        """Get the access token from automatic."""
-        if self._headers is None or self._token_expires <= dt_util.now():
-            resp = requests.post(
-                URL_AUTHORIZE,
-                data=self._access_token_payload)
-
-            resp.raise_for_status()
-
-            json = resp.json()
-
-            access_token = json[ATTR_ACCESS_TOKEN]
-            self._token_expires = dt_util.now() + timedelta(
-                seconds=json[ATTR_EXPIRES_IN])
-            self._headers = {
-                'Authorization': 'Bearer {}'.format(access_token)
-            }
-
-    def _update_info(self, now=None) -> None:
+    @asyncio.coroutine
+    def update(self, now=None):
        """Update the device info."""
+        import aioautomatic
+
        _LOGGER.debug('Updating devices %s', now)
-        self._update_headers()

-        response = requests.get(URL_VEHICLES, headers=self._headers)
+        try:
+            vehicles = yield from self.session.get_vehicles()
+        except aioautomatic.exceptions.AutomaticError as err:
+            _LOGGER.error(str(err))
+            return False

-        response.raise_for_status()
+        for vehicle in vehicles:
+            name = vehicle.display_name
+            if name is None:
+                name = ' '.join(filter(None, (
+                    str(vehicle.year), vehicle.make, vehicle.model)))

-        self.last_results = [item for item in response.json()[ATTR_RESULTS]
-                             if self._devices is None or item[
-                                 'display_name'] in self._devices]
+            if self.devices is not None and name not in self.devices:
+                continue

-        response = requests.get(URL_TRIPS, headers=self._headers)
+            self.hass.async_add_job(self.update_vehicle(vehicle, name))

-        if response.status_code == 200:
-            for trip in response.json()[ATTR_RESULTS]:
-                vehicle_id = _VEHICLE_ID_REGEX.match(
-                    trip[ATTR_VEHICLE]).group(1)
-                if vehicle_id not in self.last_trips:
-                    self.last_trips[vehicle_id] = trip
-                elif self.last_trips[vehicle_id][ATTR_ENDED_AT] < trip[
-                        ATTR_ENDED_AT]:
-                    self.last_trips[vehicle_id] = trip
+    @asyncio.coroutine
+    def update_vehicle(self, vehicle, name):
+        """Updated the specified vehicle's data."""
+        import aioautomatic

-        for vehicle in self.last_results:
-            dev_id = vehicle.get('id')
-            host_name = vehicle.get('display_name')
+        kwargs = {
+            'dev_id': vehicle.id,
+            'host_name': name,
+            'mac': vehicle.id,
+            ATTR_ATTRIBUTES: {
+                'fuel_level': vehicle.fuel_level_percent,
+                }
+        }

-            attrs = {
-                'fuel_level': vehicle.get('fuel_level_percent')
-            }
+        trips = []
+        try:
+            # Get the most recent trip for this vehicle
+            trips = yield from self.session.get_trips(
+                vehicle=vehicle.id, limit=1)
+        except aioautomatic.exceptions.AutomaticError as err:
+            _LOGGER.error(str(err))

-            kwargs = {
-                'dev_id': dev_id,
-                'host_name': host_name,
-                'mac': dev_id,
-                ATTR_ATTRIBUTES: attrs
-            }
+        if trips:
+            end_location = trips[0].end_location
+            kwargs['gps'] = (end_location.lat, end_location.lon)
+            kwargs['gps_accuracy'] = end_location.accuracy_m

-            if dev_id in self.last_trips:
-                end_location = self.last_trips[dev_id][ATTR_END_LOCATION]
-                kwargs['gps'] = (end_location['lat'], end_location['lon'])
-                kwargs['gps_accuracy'] = end_location['accuracy_m']
-
-            self.see(**kwargs)
+        yield from self.async_see(**kwargs)
@@ -18,23 +18,24 @@ from homeassistant.components.device_tracker import (  # NOQA
 _LOGGER = logging.getLogger(__name__)

 DEPENDENCIES = ['http']
+URL = '/api/locative'


 def setup_scanner(hass, config, see, discovery_info=None):
-    """Setup an endpoint for the Locative application."""
+    """Set up an endpoint for the Locative application."""
    hass.http.register_view(LocativeView(see))

    return True


 class LocativeView(HomeAssistantView):
-    """View to handle locative requests."""
+    """View to handle Locative requests."""

-    url = '/api/locative'
+    url = URL
    name = 'api:locative'

    def __init__(self, see):
-        """Initialize Locative url endpoints."""
+        """Initialize Locative URL endpoints."""
        self.see = see

    @asyncio.coroutine
@@ -51,7 +52,6 @@ class LocativeView(HomeAssistantView):
        return res

    @asyncio.coroutine
-    # pylint: disable=too-many-return-statements
    def _handle(self, hass, data):
        """Handle locative request."""
        if 'latitude' not in data or 'longitude' not in data:
@@ -0,0 +1,85 @@
+"""
+Support for GPS tracking MQTT enabled devices.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.mqtt_json/
+"""
+import asyncio
+import json
+import logging
+
+import voluptuous as vol
+
+import homeassistant.components.mqtt as mqtt
+from homeassistant.core import callback
+from homeassistant.components.mqtt import CONF_QOS
+from homeassistant.components.device_tracker import PLATFORM_SCHEMA
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import (
+    CONF_DEVICES, ATTR_GPS_ACCURACY, ATTR_LATITUDE,
+    ATTR_LONGITUDE, ATTR_BATTERY_LEVEL)
+
+DEPENDENCIES = ['mqtt']
+
+_LOGGER = logging.getLogger(__name__)
+
+GPS_JSON_PAYLOAD_SCHEMA = vol.Schema({
+    vol.Required(ATTR_LATITUDE): vol.Coerce(float),
+    vol.Required(ATTR_LONGITUDE): vol.Coerce(float),
+    vol.Optional(ATTR_GPS_ACCURACY, default=None): vol.Coerce(int),
+    vol.Optional(ATTR_BATTERY_LEVEL, default=None): vol.Coerce(str),
+}, extra=vol.ALLOW_EXTRA)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(mqtt.SCHEMA_BASE).extend({
+    vol.Required(CONF_DEVICES): {cv.string: mqtt.valid_subscribe_topic},
+})
+
+
+@asyncio.coroutine
+def async_setup_scanner(hass, config, async_see, discovery_info=None):
+    """Setup the MQTT tracker."""
+    devices = config[CONF_DEVICES]
+    qos = config[CONF_QOS]
+
+    dev_id_lookup = {}
+
+    @callback
+    def async_tracker_message_received(topic, payload, qos):
+        """MQTT message received."""
+        dev_id = dev_id_lookup[topic]
+
+        try:
+            data = GPS_JSON_PAYLOAD_SCHEMA(json.loads(payload))
+        except vol.MultipleInvalid:
+            _LOGGER.error('Skipping update for following data '
+                          'because of missing or malformatted data: %s',
+                          payload)
+            return
+        except ValueError:
+            _LOGGER.error('Error parsing JSON payload: %s', payload)
+            return
+
+        kwargs = _parse_see_args(dev_id, data)
+        hass.async_add_job(
+            async_see(**kwargs))
+
+    for dev_id, topic in devices.items():
+        dev_id_lookup[topic] = dev_id
+        yield from mqtt.async_subscribe(
+            hass, topic, async_tracker_message_received, qos)
+
+    return True
+
+
+def _parse_see_args(dev_id, data):
+    """Parse the payload location parameters, into the format see expects."""
+    kwargs = {
+        'gps': (data[ATTR_LATITUDE], data[ATTR_LONGITUDE]),
+        'dev_id': dev_id
+    }
+
+    if ATTR_GPS_ACCURACY in data:
+        kwargs[ATTR_GPS_ACCURACY] = data[ATTR_GPS_ACCURACY]
+    if ATTR_BATTERY_LEVEL in data:
+        kwargs['battery'] = data[ATTR_BATTERY_LEVEL]
+    return kwargs
@@ -16,41 +16,43 @@ _LOGGER = logging.getLogger(__name__)

 def setup_scanner(hass, config, see, discovery_info=None):
    """Setup the MySensors tracker."""
-    def mysensors_callback(gateway, node_id):
+    def mysensors_callback(gateway, msg):
        """Callback for mysensors platform."""
-        node = gateway.sensors[node_id]
+        node = gateway.sensors[msg.node_id]
        if node.sketch_name is None:
-            _LOGGER.info('No sketch_name: node %s', node_id)
+            _LOGGER.debug('No sketch_name: node %s', msg.node_id)
            return

        pres = gateway.const.Presentation
        set_req = gateway.const.SetReq

-        for child in node.children.values():
-            position = child.values.get(set_req.V_POSITION)
-            if child.type != pres.S_GPS or position is None:
-                continue
-            try:
-                latitude, longitude, _ = position.split(',')
-            except ValueError:
-                _LOGGER.error('Payload for V_POSITION %s is not of format '
-                              'latitude,longitude,altitude', position)
-                continue
-            name = '{} {} {}'.format(
-                node.sketch_name, node_id, child.id)
-            attr = {
-                mysensors.ATTR_CHILD_ID: child.id,
-                mysensors.ATTR_DESCRIPTION: child.description,
-                mysensors.ATTR_DEVICE: gateway.device,
-                mysensors.ATTR_NODE_ID: node_id,
-            }
-            see(
-                dev_id=slugify(name),
-                host_name=name,
-                gps=(latitude, longitude),
-                battery=node.battery_level,
-                attributes=attr
-            )
+        child = node.children.get(msg.child_id)
+        if child is None:
+            return
+        position = child.values.get(set_req.V_POSITION)
+        if child.type != pres.S_GPS or position is None:
+            return
+        try:
+            latitude, longitude, _ = position.split(',')
+        except ValueError:
+            _LOGGER.error('Payload for V_POSITION %s is not of format '
+                          'latitude,longitude,altitude', position)
+            return
+        name = '{} {} {}'.format(
+            node.sketch_name, msg.node_id, child.id)
+        attr = {
+            mysensors.ATTR_CHILD_ID: child.id,
+            mysensors.ATTR_DESCRIPTION: child.description,
+            mysensors.ATTR_DEVICE: gateway.device,
+            mysensors.ATTR_NODE_ID: msg.node_id,
+        }
+        see(
+            dev_id=slugify(name),
+            host_name=name,
+            gps=(latitude, longitude),
+            battery=node.battery_level,
+            attributes=attr
+        )

    gateways = hass.data.get(mysensors.MYSENSORS_GATEWAYS)

@@ -1,15 +1,8 @@
 """
-Tracks devices by sending a ICMP ping.
+Tracks devices by sending a ICMP echo request (ping).

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.ping/
-
-device_tracker:
-  - platform: ping
-    count: 2
-    hosts:
-      host_one: pc.local
-      host_two: 192.168.2.25
 """
 import logging
 import subprocess
@@ -18,14 +11,12 @@ from datetime import timedelta

 import voluptuous as vol

+import homeassistant.helpers.config_validation as cv
 from homeassistant.components.device_tracker import (
    PLATFORM_SCHEMA, DEFAULT_SCAN_INTERVAL, SOURCE_TYPE_ROUTER)
 from homeassistant.helpers.event import track_point_in_utc_time
 from homeassistant import util
 from homeassistant import const
-import homeassistant.helpers.config_validation as cv
-
-DEPENDENCIES = []

 _LOGGER = logging.getLogger(__name__)

@@ -37,7 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


-class Host:
+class Host(object):
    """Host object with ping detection."""

    def __init__(self, ip_address, dev_id, hass, config):
@@ -53,8 +44,10 @@ class Host:
                              self.ip_address]

    def ping(self):
-        """Send ICMP ping and return True if success."""
-        pinger = subprocess.Popen(self._ping_cmd, stdout=subprocess.PIPE)
+        """Send an ICMP echo request and return True if success."""
+        pinger = subprocess.Popen(self._ping_cmd,
+                                  stdout=subprocess.PIPE,
+                                  stderr=subprocess.DEVNULL)
        try:
            pinger.communicate()
            return pinger.returncode == 0
@@ -70,7 +63,7 @@ class Host:
                return True
            failed += 1

-        _LOGGER.debug("ping KO on ip=%s failed=%d", self.ip_address, failed)
+        _LOGGER.debug("No response from %s failed=%d", self.ip_address, failed)


 def setup_scanner(hass, config, see, discovery_info=None):
@@ -19,7 +19,7 @@ from homeassistant.util import Throttle

 _LOGGER = logging.getLogger(__name__)

-REQUIREMENTS = ['pysnmp==4.3.4']
+REQUIREMENTS = ['pysnmp==4.3.5']

 CONF_COMMUNITY = 'community'
 CONF_AUTHKEY = 'authkey'
@@ -125,7 +125,10 @@ class SnmpScanner(DeviceScanner):

        for resrow in restable:
            for _, val in resrow:
-                mac = binascii.hexlify(val.asOctets()).decode('utf-8')
+                try:
+                    mac = binascii.hexlify(val.asOctets()).decode('utf-8')
+                except AttributeError:
+                    continue
                _LOGGER.debug("Found MAC %s", mac)
                mac = ':'.join([mac[i:i+2] for i in range(0, len(mac), 2)])
                devices.append({'mac': mac})
@@ -105,8 +105,6 @@ class TadoDeviceScanner(DeviceScanner):
        _LOGGER.debug("Requesting Tado")

        last_results = []
-        response = None
-        tado_json = None

        try:
            with async_timeout.timeout(10, loop=self.hass.loop):
@@ -127,14 +125,10 @@ class TadoDeviceScanner(DeviceScanner):

                tado_json = yield from response.json()

-        except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+        except (asyncio.TimeoutError, aiohttp.ClientError):
            _LOGGER.error("Cannot load Tado data")
            return False

-        finally:
-            if response is not None:
-                yield from response.release()
-
        # Without a home_id, we fetched an URL where the mobile devices can be
        # found under the mobileDevices key.
        if 'mobileDevices' in tado_json:
@@ -101,7 +101,6 @@ class UPCDeviceScanner(DeviceScanner):
    @asyncio.coroutine
    def async_login(self):
        """Login into firmware and get first token."""
-        response = None
        try:
            # get first token
            with async_timeout.timeout(10, loop=self.hass.loop):
@@ -109,7 +108,8 @@ class UPCDeviceScanner(DeviceScanner):
                    "http://{}/common_page/login.html".format(self.host)
                )

-            yield from response.text()
+                yield from response.text()
+
            self.token = response.cookies['sessionToken'].value

            # login
@@ -119,18 +119,12 @@ class UPCDeviceScanner(DeviceScanner):
            })

            # successfull?
-            if data is not None:
-                return True
-            return False
+            return data is not None

-        except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+        except (asyncio.TimeoutError, aiohttp.ClientError):
            _LOGGER.error("Can not load login page from %s", self.host)
            return False

-        finally:
-            if response is not None:
-                yield from response.release()
-
    @asyncio.coroutine
    def _async_ws_function(self, function, additional_form=None):
        """Execute a command on UPC firmware webservice."""
@@ -142,8 +136,7 @@ class UPCDeviceScanner(DeviceScanner):
        if additional_form:
            form_data.update(additional_form)

-        redirects = True if function != CMD_DEVICES else False
-        response = None
+        redirects = function != CMD_DEVICES
        try:
            with async_timeout.timeout(10, loop=self.hass.loop):
                response = yield from self.websession.post(
@@ -163,10 +156,6 @@ class UPCDeviceScanner(DeviceScanner):
                self.token = response.cookies['sessionToken'].value
                return (yield from response.text())

-        except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+        except (asyncio.TimeoutError, aiohttp.ClientError):
            _LOGGER.error("Error on %s", function)
            self.token = None
-
-        finally:
-            if response is not None:
-                yield from response.release()
@@ -10,16 +10,18 @@ import asyncio
 import json
 from datetime import timedelta
 import logging
+import os

 import voluptuous as vol

+from homeassistant.core import callback
 from homeassistant.const import EVENT_HOMEASSISTANT_START
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.discovery import async_load_platform, async_discover
 import homeassistant.util.dt as dt_util

-REQUIREMENTS = ['netdisco==0.9.2']
+REQUIREMENTS = ['netdisco==1.0.0rc3']

 DOMAIN = 'discovery'

@@ -27,11 +29,15 @@ SCAN_INTERVAL = timedelta(seconds=300)
 SERVICE_NETGEAR = 'netgear_router'
 SERVICE_WEMO = 'belkin_wemo'
 SERVICE_HASS_IOS_APP = 'hass_ios'
+SERVICE_IKEA_TRADFRI = 'ikea_tradfri'
+SERVICE_HASSIO = 'hassio'

 SERVICE_HANDLERS = {
    SERVICE_HASS_IOS_APP: ('ios', None),
    SERVICE_NETGEAR: ('device_tracker', None),
    SERVICE_WEMO: ('wemo', None),
+    SERVICE_IKEA_TRADFRI: ('tradfri', None),
+    SERVICE_HASSIO: ('hassio', None),
    'philips_hue': ('light', 'hue'),
    'google_cast': ('media_player', 'cast'),
    'panasonic_viera': ('media_player', 'panasonic_viera'),
@@ -44,10 +50,10 @@ SERVICE_HANDLERS = {
    'denonavr': ('media_player', 'denonavr'),
    'samsung_tv': ('media_player', 'samsungtv'),
    'yeelight': ('light', 'yeelight'),
-    'flux_led': ('light', 'flux_led'),
    'apple_tv': ('media_player', 'apple_tv'),
    'frontier_silicon': ('media_player', 'frontier_silicon'),
    'openhome': ('media_player', 'openhome'),
+    'bose_soundtouch': ('media_player', 'soundtouch'),
 }

 CONF_IGNORE = 'ignore'
@@ -105,7 +111,7 @@ def async_setup(hass, config):
                hass, component, platform, info, config)

    @asyncio.coroutine
-    def scan_devices(_):
+    def scan_devices(now):
        """Scan for devices."""
        results = yield from hass.loop.run_in_executor(
            None, _discover, netdisco)
@@ -116,7 +122,16 @@ def async_setup(hass, config):
        async_track_point_in_utc_time(hass, scan_devices,
                                      dt_util.utcnow() + SCAN_INTERVAL)

-    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_START, scan_devices)
+    @callback
+    def schedule_first(event):
+        """Schedule the first discovery when Home Assistant starts up."""
+        async_track_point_in_utc_time(hass, scan_devices, dt_util.utcnow())
+
+        # discovery local services
+        if 'HASSIO' in os.environ:
+            hass.async_add_job(new_service_found(SERVICE_HASSIO, {}))
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_START, schedule_first)

    return True

@@ -153,7 +153,7 @@ def setup(hass, config):
        sw_path = "service_worker.js"

    hass.http.register_static_path("/service_worker.js",
-                                   os.path.join(STATIC_PATH, sw_path), 0)
+                                   os.path.join(STATIC_PATH, sw_path), False)
    hass.http.register_static_path("/robots.txt",
                                   os.path.join(STATIC_PATH, "robots.txt"))
    hass.http.register_static_path("/static", STATIC_PATH)
@@ -3,18 +3,20 @@
 FINGERPRINTS = {
    "compatibility.js": "83d9c77748dafa9db49ae77d7f3d8fb0",
    "core.js": "5d08475f03adb5969bd31855d5ca0cfd",
-    "frontend.html": "53c45b837a3bcae7cfb9ef4a5919844f",
-    "mdi.html": "4921d26f29dc148c3e8bd5bcd8ce5822",
+    "frontend.html": "1533f44c55927e814294de757cd7eada",
+    "mdi.html": "1cc8593d3684f7f6f3b3854403216f77",
    "micromarkdown-js.html": "93b5ec4016f0bba585521cf4d18dec1a",
-    "panels/ha-panel-config.html": "6dcb246cd356307a638f81c4f89bf9b3",
-    "panels/ha-panel-dev-event.html": "1f169700c2345785855b1d7919d12326",
+    "panels/ha-panel-config.html": "39f00f769faa63ee61f1fe6fc85d67f7",
+    "panels/ha-panel-dev-event.html": "2db9c218065ef0f61d8d08db8093cad2",
    "panels/ha-panel-dev-info.html": "61610e015a411cfc84edd2c4d489e71d",
-    "panels/ha-panel-dev-service.html": "0fe8e6acdccf2dc3d1ae657b2c7f2df0",
-    "panels/ha-panel-dev-state.html": "48d37db4a1d6708314ded1d624d0f4d4",
-    "panels/ha-panel-dev-template.html": "6f353392d68574fbc5af188bca44d0ae",
-    "panels/ha-panel-history.html": "bfd5f929d5aa9cefdd799ec37624efa1",
+    "panels/ha-panel-dev-service.html": "415552027cb083badeff5f16080410ed",
+    "panels/ha-panel-dev-state.html": "d70314913b8923d750932367b1099750",
+    "panels/ha-panel-dev-template.html": "567fbf86735e1b891e40c2f4060fec9b",
+    "panels/ha-panel-hassio.html": "1d954cfe5f47c4be3cf4f6f5db9a83b2",
+    "panels/ha-panel-history.html": "89062c48c76206cad1cec14ddbb1cbb1",
    "panels/ha-panel-iframe.html": "d920f0aa3c903680f2f8795e2255daab",
-    "panels/ha-panel-logbook.html": "a1fc2b5d739bedb9d87e4da4cd929a71",
-    "panels/ha-panel-map.html": "9aa065b1908089f3bb5af7fdf9485be5",
+    "panels/ha-panel-logbook.html": "6dd6a16f52117318b202e60f98400163",
+    "panels/ha-panel-map.html": "31c592c239636f91e07c7ac232a5ebc4",
+    "panels/ha-panel-zwave.html": "a81f82b48439da80286798558f414a2e",
    "websocket_test.html": "575de64b431fe11c3785bf96d7813450"
 }
--- a/Show More
+++ b/Show More