Merge pull request #3715 from home-assistant/dev

0.30
Version bump to 0.30.0
2016-10-08 09:58:08 -07:00 · 2016-10-08 09:57:51 -07:00 · 2016-10-08 18:56:36 +02:00 · 2016-10-08 09:23:45 -07:00 · 2016-10-07 18:08:33 -07:00 · 2016-10-07 17:30:59 -07:00
705 changed files with 40391 additions and 10882 deletions
@@ -4,6 +4,7 @@ source = homeassistant
 omit =
    homeassistant/__main__.py
    homeassistant/scripts/*.py
+    homeassistant/helpers/typing.py

    # omit pieces of code that rely on external devices being present
    homeassistant/components/apcupsd.py
@@ -15,6 +16,9 @@ omit =
    homeassistant/components/bloomsky.py
    homeassistant/components/*/bloomsky.py

+    homeassistant/components/digital_ocean.py
+    homeassistant/components/*/digital_ocean.py
+
    homeassistant/components/dweet.py
    homeassistant/components/*/dweet.py

@@ -45,6 +49,9 @@ omit =
    homeassistant/components/qwikswitch.py
    homeassistant/components/*/qwikswitch.py

+    homeassistant/components/rfxtrx.py
+    homeassistant/components/*/rfxtrx.py
+
    homeassistant/components/rpi_gpio.py
    homeassistant/components/*/rpi_gpio.py

@@ -76,7 +83,7 @@ omit =
    homeassistant/components/zigbee.py
    homeassistant/components/*/zigbee.py

-    homeassistant/components/zwave.py
+    homeassistant/components/zwave/*
    homeassistant/components/*/zwave.py

    homeassistant/components/enocean.py
@@ -88,10 +95,14 @@ omit =
    homeassistant/components/homematic.py
    homeassistant/components/*/homematic.py

+    homeassistant/components/pilight.py
+    homeassistant/components/*/pilight.py
+
    homeassistant/components/knx.py
-    homeassistant/components/switch/knx.py
-    homeassistant/components/binary_sensor/knx.py
-    homeassistant/components/thermostat/knx.py
+    homeassistant/components/*/knx.py
+
+    homeassistant/components/ffmpeg.py
+    homeassistant/components/*/ffmpeg.py

    homeassistant/components/alarm_control_panel/alarmdotcom.py
    homeassistant/components/alarm_control_panel/nx584.py
@@ -101,13 +112,23 @@ omit =
    homeassistant/components/browser.py
    homeassistant/components/camera/bloomsky.py
    homeassistant/components/camera/foscam.py
-    homeassistant/components/camera/generic.py
    homeassistant/components/camera/mjpeg.py
    homeassistant/components/camera/rpi_camera.py
+    homeassistant/components/climate/eq3btsmart.py
+    homeassistant/components/climate/heatmiser.py
+    homeassistant/components/climate/homematic.py
+    homeassistant/components/climate/knx.py
+    homeassistant/components/climate/proliphix.py
+    homeassistant/components/climate/radiotherm.py
+    homeassistant/components/cover/homematic.py
+    homeassistant/components/cover/rpi_gpio.py
+    homeassistant/components/cover/scsgate.py
+    homeassistant/components/cover/wink.py
    homeassistant/components/device_tracker/actiontec.py
    homeassistant/components/device_tracker/aruba.py
    homeassistant/components/device_tracker/asuswrt.py
    homeassistant/components/device_tracker/bluetooth_tracker.py
+    homeassistant/components/device_tracker/bluetooth_le_tracker.py
    homeassistant/components/device_tracker/bt_home_hub_5.py
    homeassistant/components/device_tracker/ddwrt.py
    homeassistant/components/device_tracker/fritz.py
@@ -120,15 +141,19 @@ omit =
    homeassistant/components/device_tracker/tomato.py
    homeassistant/components/device_tracker/tplink.py
    homeassistant/components/device_tracker/ubus.py
+    homeassistant/components/device_tracker/volvooncall.py
    homeassistant/components/discovery.py
    homeassistant/components/downloader.py
+    homeassistant/components/fan/mqtt.py
    homeassistant/components/feedreader.py
-    homeassistant/components/garage_door/wink.py
+    homeassistant/components/foursquare.py
    homeassistant/components/garage_door/rpi_gpio.py
+    homeassistant/components/garage_door/wink.py
    homeassistant/components/hdmi_cec.py
    homeassistant/components/ifttt.py
    homeassistant/components/joaoapps_join.py
    homeassistant/components/keyboard.py
+    homeassistant/components/keyboard_remote.py
    homeassistant/components/light/blinksticklight.py
    homeassistant/components/light/flux_led.py
    homeassistant/components/light/hue.py
@@ -167,8 +192,11 @@ omit =
    homeassistant/components/notify/aws_sqs.py
    homeassistant/components/notify/free_mobile.py
    homeassistant/components/notify/gntp.py
+    homeassistant/components/notify/group.py
    homeassistant/components/notify/instapush.py
    homeassistant/components/notify/joaoapps_join.py
+    homeassistant/components/notify/kodi.py
+    homeassistant/components/notify/llamalab_automate.py
    homeassistant/components/notify/message_bird.py
    homeassistant/components/notify/nma.py
    homeassistant/components/notify/pushbullet.py
@@ -176,6 +204,7 @@ omit =
    homeassistant/components/notify/pushover.py
    homeassistant/components/notify/rest.py
    homeassistant/components/notify/sendgrid.py
+    homeassistant/components/notify/simplepush.py
    homeassistant/components/notify/slack.py
    homeassistant/components/notify/smtp.py
    homeassistant/components/notify/syslog.py
@@ -183,32 +212,49 @@ omit =
    homeassistant/components/notify/twilio_sms.py
    homeassistant/components/notify/twitter.py
    homeassistant/components/notify/xmpp.py
+    homeassistant/components/nuimo_controller.py
+    homeassistant/components/openalpr.py
    homeassistant/components/scene/hunterdouglas_powerview.py
    homeassistant/components/sensor/arest.py
    homeassistant/components/sensor/bitcoin.py
+    homeassistant/components/sensor/bom.py
+    homeassistant/components/sensor/coinmarketcap.py
    homeassistant/components/sensor/cpuspeed.py
+    homeassistant/components/sensor/darksky.py
    homeassistant/components/sensor/deutsche_bahn.py
    homeassistant/components/sensor/dht.py
    homeassistant/components/sensor/dte_energy_bridge.py
    homeassistant/components/sensor/efergy.py
    homeassistant/components/sensor/eliqonline.py
+    homeassistant/components/sensor/emoncms.py
+    homeassistant/components/sensor/fastdotcom.py
    homeassistant/components/sensor/fitbit.py
    homeassistant/components/sensor/fixer.py
-    homeassistant/components/sensor/forecast.py
+    homeassistant/components/sensor/fritzbox_callmonitor.py
    homeassistant/components/sensor/glances.py
    homeassistant/components/sensor/google_travel_time.py
+    homeassistant/components/sensor/gpsd.py
    homeassistant/components/sensor/gtfs.py
+    homeassistant/components/sensor/hp_ilo.py
    homeassistant/components/sensor/imap.py
+    homeassistant/components/sensor/imap_email_content.py
    homeassistant/components/sensor/lastfm.py
+    homeassistant/components/sensor/linux_battery.py
    homeassistant/components/sensor/loopenergy.py
+    homeassistant/components/sensor/mhz19.py
+    homeassistant/components/sensor/miflora.py
+    homeassistant/components/sensor/mqtt_room.py
    homeassistant/components/sensor/neurio_energy.py
    homeassistant/components/sensor/nzbget.py
+    homeassistant/components/sensor/ohmconnect.py
    homeassistant/components/sensor/onewire.py
-    homeassistant/components/sensor/openweathermap.py
    homeassistant/components/sensor/openexchangerates.py
+    homeassistant/components/sensor/openweathermap.py
+    homeassistant/components/sensor/pi_hole.py
    homeassistant/components/sensor/plex.py
    homeassistant/components/sensor/rest.py
    homeassistant/components/sensor/sabnzbd.py
+    homeassistant/components/sensor/serial_pm.py
    homeassistant/components/sensor/snmp.py
    homeassistant/components/sensor/speedtest.py
    homeassistant/components/sensor/steam_online.py
@@ -216,15 +262,20 @@ omit =
    homeassistant/components/sensor/swiss_hydrological_data.py
    homeassistant/components/sensor/swiss_public_transport.py
    homeassistant/components/sensor/systemmonitor.py
+    homeassistant/components/sensor/ted5000.py
    homeassistant/components/sensor/temper.py
    homeassistant/components/sensor/time_date.py
    homeassistant/components/sensor/torque.py
    homeassistant/components/sensor/transmission.py
    homeassistant/components/sensor/twitch.py
    homeassistant/components/sensor/uber.py
+    homeassistant/components/sensor/vasttrafik.py
    homeassistant/components/sensor/worldclock.py
+    homeassistant/components/sensor/xbox_live.py
+    homeassistant/components/sensor/yahoo_finance.py
    homeassistant/components/sensor/yweather.py
    homeassistant/components/switch/acer_projector.py
+    homeassistant/components/switch/anel_pwrctrl.py
    homeassistant/components/switch/arest.py
    homeassistant/components/switch/dlink.py
    homeassistant/components/switch/edimax.py
@@ -0,0 +1,2 @@
+.tox
+.git
@@ -15,7 +15,7 @@
 If user exposed functionality or configuration variables are added/changed:
  - [ ] Documentation added/updated in [home-assistant.io](https://github.com/home-assistant/home-assistant.io)

-If code communicates with devices, web services, or a:
+If the code communicates with devices, web services, or third-party tools:
  - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**
  - [ ] New dependencies have been added to the `REQUIREMENTS` variable ([example][ex-requir]).
  - [ ] New dependencies are only imported inside functions that use them ([example][ex-import]).
@@ -7,7 +7,9 @@ config/custom_components/*
 !config/custom_components/example.py
 !config/custom_components/hello_world.py
 !config/custom_components/mqtt_example.py
-!config/custom_components/react_panel
+!config/panels
+config/panels/*
+!config/panels/react.html

 tests/testing_config/deps
 tests/testing_config/home-assistant.log
@@ -52,7 +54,8 @@ develop-eggs
 lib
 lib64

-# Installer logs
+# Logs
+*.log
 pip-log.txt

 # Unit test / coverage reports
@@ -91,3 +94,12 @@ ctags.tmp
 virtualization/vagrant/setup_done
 virtualization/vagrant/.vagrant
 virtualization/vagrant/config
+
+# Visual Studio Code
+.vscode
+
+# Built docs
+docs/build
+
+# Windows Explorer
+desktop.ini
@@ -1,4 +1,4 @@
-FROM python:3.4
+FROM python:3.5
 MAINTAINER Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>

 VOLUME /config
@@ -10,7 +10,7 @@ RUN pip3 install --no-cache-dir colorlog cython

 # For the nmap tracker, bluetooth tracker, Z-Wave
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends nmap net-tools cython3 libudev-dev sudo libglib2.0-dev && \
+    apt-get install -y --no-install-recommends nmap net-tools cython3 libudev-dev sudo libglib2.0-dev bluetooth libbluetooth-dev && \
    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

 COPY script/build_python_openzwave script/build_python_openzwave
@@ -21,7 +21,7 @@ RUN script/build_python_openzwave && \
 COPY requirements_all.txt requirements_all.txt
 # certifi breaks Debian based installs
 RUN pip3 install --no-cache-dir -r requirements_all.txt && pip3 uninstall -y certifi && \
-    pip3 install mysqlclient psycopg2
+    pip3 install mysqlclient psycopg2 uvloop

 # Copy source
 COPY . .
@@ -10,8 +10,8 @@ homeassistant:
  # Impacts weather/sunrise data
  elevation: 665

-  # C for Celsius, F for Fahrenheit
-  temperature_unit: C
+  # '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
@@ -1,30 +0,0 @@
-"""
-Custom panel example showing TodoMVC using React.
-
-Will add a panel to control lights and switches using React. Allows configuring
-the title via configuration.yaml:
-
-react_panel:
-  title: 'home'
-
-"""
-import os
-
-from homeassistant.components.frontend import register_panel
-
-DOMAIN = 'react_panel'
-DEPENDENCIES = ['frontend']
-
-PANEL_PATH = os.path.join(os.path.dirname(__file__), 'panel.html')
-
-
-def setup(hass, config):
-    """Initialize custom panel."""
-    title = config.get(DOMAIN, {}).get('title')
-
-    config = None if title is None else {'title': title}
-
-    register_panel(hass, 'react', PANEL_PATH,
-                   title='TodoMVC', icon='mdi:checkbox-marked-outline',
-                   config=config)
-    return True
@@ -1,3 +1,20 @@
+<!--
+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>

@@ -0,0 +1,230 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: help
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  livehtml   to make standalone HTML files via sphinx-autobuild"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  applehelp  to make an Apple Help Book"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  epub3      to make an epub3"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+	@echo "  dummy      to check syntax errors of document sources"
+
+.PHONY: clean
+clean:
+	rm -rf $(BUILDDIR)/*
+
+.PHONY: html
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+.PHONY: livehtml
+livehtml:
+	sphinx-autobuild -z ../homeassistant/ --port 0 -B -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+
+.PHONY: dirhtml
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+.PHONY: singlehtml
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+.PHONY: pickle
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+.PHONY: json
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+.PHONY: htmlhelp
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+.PHONY: qthelp
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Home-Assistant.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Home-Assistant.qhc"
+
+.PHONY: applehelp
+applehelp:
+	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+	@echo
+	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+	@echo "N.B. You won't be able to view it unless you put it in" \
+	      "~/Library/Documentation/Help or install it in your application" \
+	      "bundle."
+
+.PHONY: devhelp
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Home-Assistant"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Home-Assistant"
+	@echo "# devhelp"
+
+.PHONY: epub
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+.PHONY: epub3
+epub3:
+	$(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3
+	@echo
+	@echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3."
+
+.PHONY: latex
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+.PHONY: latexpdf
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: latexpdfja
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: text
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+.PHONY: man
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+.PHONY: texinfo
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+.PHONY: info
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+.PHONY: gettext
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+.PHONY: changes
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+.PHONY: linkcheck
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+.PHONY: doctest
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+.PHONY: coverage
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+.PHONY: xml
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+.PHONY: pseudoxml
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+
+.PHONY: dummy
+dummy:
+	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
+	@echo
+	@echo "Build finished. Dummy builder generates no files."
@@ -0,0 +1,281 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
+set I18NSPHINXOPTS=%SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  epub3      to make an epub3
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	echo.  coverage   to run coverage check of the documentation if enabled
+	echo.  dummy      to check syntax errors of document sources
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+REM Check if sphinx-build is available and fallback to Python version if any
+%SPHINXBUILD% 1>NUL 2>NUL
+if errorlevel 9009 goto sphinx_python
+goto sphinx_ok
+
+:sphinx_python
+
+set SPHINXBUILD=python -m sphinx.__init__
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+:sphinx_ok
+
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\Home-Assistant.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\Home-Assistant.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "epub3" (
+	%SPHINXBUILD% -b epub3 %ALLSPHINXOPTS% %BUILDDIR%/epub3
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub3 file is in %BUILDDIR%/epub3.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "coverage" (
+	%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of coverage in the sources finished, look at the ^
+results in %BUILDDIR%/coverage/python.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+if "%1" == "dummy" (
+	%SPHINXBUILD% -b dummy %ALLSPHINXOPTS% %BUILDDIR%/dummy
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. Dummy builder generates no files.
+	goto end
+)
+
+:end
@@ -0,0 +1,45 @@
+"""
+Sphinx extension to add ReadTheDocs-style "Edit on GitHub" links to the
+sidebar.
+
+Loosely based on https://github.com/astropy/astropy/pull/347
+"""
+
+import os
+import warnings
+
+
+__licence__ = 'BSD (3 clause)'
+
+
+def get_github_url(app, view, path):
+    github_fmt = 'https://github.com/{}/{}/{}/{}{}'
+    return (
+        github_fmt.format(app.config.edit_on_github_project, view,
+                          app.config.edit_on_github_branch,
+                          app.config.edit_on_github_src_path, path))
+
+
+def html_page_context(app, pagename, templatename, context, doctree):
+    if templatename != 'page.html':
+        return
+
+    if not app.config.edit_on_github_project:
+        warnings.warn("edit_on_github_project not specified")
+        return
+    if not doctree:
+        warnings.warn("doctree is None")
+        return
+    path = os.path.relpath(doctree.get('source'), app.builder.srcdir)
+    show_url = get_github_url(app, 'blob', path)
+    edit_url = get_github_url(app, 'edit', path)
+
+    context['show_on_github_url'] = show_url
+    context['edit_on_github_url'] = edit_url
+
+
+def setup(app):
+    app.add_config_value('edit_on_github_project', '', True)
+    app.add_config_value('edit_on_github_branch', 'master', True)
+    app.add_config_value('edit_on_github_src_path', '', True)  # 'eg' "docs/"
+    app.connect('html-page-context', html_page_context)
@@ -0,0 +1,8 @@
+<ul>
+    <li><a href="https://community.home-assistant.io">📌 Community Forums</a></li>
+    <li><a href="https://github.com/home-assistant/home-assistant">🚀 GitHub</a></li>
+    <li><a href="https://home-assistant.io/">🏡 Homepage</a></li>
+    <li><a href="https://gitter.im/home-assistant/home-assistant">💬 Gitter</a></li>
+    <li><a href="https://pypi.python.org/pypi/homeassistant">💾 Download Releases</a></li>
+</ul>
+<hr>
@@ -0,0 +1,13 @@
+{%- if show_source and has_source and sourcename %}
+  <h3>{{ _('This Page') }}</h3>
+  <ul class="this-page-menu">
+  {%- if show_on_github_url %}
+    <li><a href="{{ show_on_github_url }}"
+           rel="nofollow">{{ _('Show on GitHub') }}</a></li>
+  {%- endif %}
+  {%- if edit_on_github_url %}
+    <li><a href="{{ edit_on_github_url }}"
+           rel="nofollow">{{ _('Edit on GitHub') }}</a></li>
+  {%- endif %}
+  </ul>
+{%- endif %}
@@ -0,0 +1,7 @@
+.. _bootstrap_module:
+
+:mod:`homeassistant.bootstrap`
+-------------------------
+
+.. automodule:: homeassistant.bootstrap
+    :members:
@@ -0,0 +1,18 @@
+.. _core_module:
+
+:mod:`homeassistant.core`
+-------------------------
+
+.. automodule:: homeassistant.core
+
+.. autoclass:: Config
+    :members:
+
+.. autoclass:: EventBus
+    :members:
+
+.. autoclass:: StateMachine
+    :members:
+
+.. autoclass:: ServiceRegistry
+    :members:
@@ -0,0 +1,10 @@
+.. _components_device_tracker_module:
+
+:mod:`homeassistant.components.device_tracker`
+----------------------------------------------
+
+.. automodule:: homeassistant.components.device_tracker
+    :members:
+
+.. autoclass:: Device
+    :members:
@@ -0,0 +1,12 @@
+.. _helpers_entity_module:
+
+:mod:`homeassistant.helpers.entity`
+-----------------------------------
+
+.. automodule:: homeassistant.helpers.entity
+
+.. autoclass:: Entity
+    :members:
+
+.. autoclass:: ToggleEntity
+    :members:
@@ -0,0 +1,20 @@
+.. _helpers_event_module:
+
+:mod:`homeassistant.helpers.event`
+----------------------------------
+
+.. automodule:: homeassistant.helpers.event
+
+.. autofunction:: track_state_change
+
+.. autofunction:: track_point_in_time
+
+.. autofunction:: track_point_in_utc_time
+
+.. autofunction:: track_sunrise
+
+.. autofunction:: track_sunset
+
+.. autofunction:: track_utc_time_change
+
+.. autofunction:: track_time_change
@@ -0,0 +1,118 @@
+homeassistant.helpers package
+=============================
+
+Submodules
+----------
+
+homeassistant.helpers.condition module
+--------------------------------------
+
+.. automodule:: homeassistant.helpers.condition
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.config_validation module
+----------------------------------------------
+
+.. automodule:: homeassistant.helpers.config_validation
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.discovery module
+--------------------------------------
+
+.. automodule:: homeassistant.helpers.discovery
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.entity module
+-----------------------------------
+
+.. automodule:: homeassistant.helpers.entity
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.entity_component module
+---------------------------------------------
+
+.. automodule:: homeassistant.helpers.entity_component
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.event module
+----------------------------------
+
+.. automodule:: homeassistant.helpers.event
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.event_decorators module
+---------------------------------------------
+
+.. automodule:: homeassistant.helpers.event_decorators
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.location module
+-------------------------------------
+
+.. automodule:: homeassistant.helpers.location
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.script module
+-----------------------------------
+
+.. automodule:: homeassistant.helpers.script
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.service module
+------------------------------------
+
+.. automodule:: homeassistant.helpers.service
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.state module
+----------------------------------
+
+.. automodule:: homeassistant.helpers.state
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.template module
+-------------------------------------
+
+.. automodule:: homeassistant.helpers.template
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.typing module
+-----------------------------------
+
+.. automodule:: homeassistant.helpers.typing
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: homeassistant.helpers
+    :members:
+    :undoc-members:
+    :show-inheritance:
@@ -0,0 +1,78 @@
+homeassistant package
+=====================
+
+Subpackages
+-----------
+
+.. toctree::
+
+    helpers
+    util
+
+Submodules
+----------
+
+bootstrap module
+------------------------------
+
+.. automodule:: homeassistant.bootstrap
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+config module
+---------------------------
+
+.. automodule:: homeassistant.config
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+const module
+--------------------------
+
+.. automodule:: homeassistant.const
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+core module
+-------------------------
+
+.. automodule:: homeassistant.core
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+exceptions module
+-------------------------------
+
+.. automodule:: homeassistant.exceptions
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+loader module
+---------------------------
+
+.. automodule:: homeassistant.loader
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+remote module
+---------------------------
+
+.. automodule:: homeassistant.remote
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: homeassistant
+    :members:
+    :undoc-members:
+    :show-inheritance:
@@ -0,0 +1,78 @@
+homeassistant.util package
+==========================
+
+Submodules
+----------
+
+homeassistant.util.color module
+-------------------------------
+
+.. automodule:: homeassistant.util.color
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.util.distance module
+----------------------------------
+
+.. automodule:: homeassistant.util.distance
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.util.dt module
+----------------------------
+
+.. automodule:: homeassistant.util.dt
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.util.location module
+----------------------------------
+
+.. automodule:: homeassistant.util.location
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.util.package module
+---------------------------------
+
+.. automodule:: homeassistant.util.package
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.util.temperature module
+-------------------------------------
+
+.. automodule:: homeassistant.util.temperature
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.util.unit_system module
+-------------------------------------
+
+.. automodule:: homeassistant.util.unit_system
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.util.yaml module
+------------------------------
+
+.. automodule:: homeassistant.util.yaml
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: homeassistant.util
+    :members:
+    :undoc-members:
+    :show-inheritance:
@@ -0,0 +1,419 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Home-Assistant documentation build configuration file, created by
+# sphinx-quickstart on Sun Aug 28 13:13:10 2016.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+import sys
+import os
+from os.path import relpath
+import inspect
+from homeassistant.const import (__version__, __short_version__, PROJECT_NAME,
+                                 PROJECT_LONG_DESCRIPTION,
+                                 PROJECT_COPYRIGHT, PROJECT_AUTHOR,
+                                 PROJECT_GITHUB_USERNAME,
+                                 PROJECT_GITHUB_REPOSITORY,
+                                 GITHUB_PATH, GITHUB_URL)
+
+
+sys.path.insert(0, os.path.abspath('_ext'))
+sys.path.insert(0, os.path.abspath('../homeassistant'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.linkcode',
+    'sphinx_autodoc_annotation',
+    'edit_on_github'
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#
+# source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = PROJECT_NAME
+copyright = PROJECT_COPYRIGHT
+author = PROJECT_AUTHOR
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = __short_version__
+# The full version, including alpha/beta/rc tags.
+release = __version__
+
+code_branch = 'dev' if 'dev' in __version__ else 'master'
+
+# Edit on Github config
+edit_on_github_project = GITHUB_PATH
+edit_on_github_branch = code_branch
+edit_on_github_src_path = 'docs/source/'
+
+
+def linkcode_resolve(domain, info):
+    """
+    Determine the URL corresponding to Python object
+    """
+    if domain != 'py':
+        return None
+    modname = info['module']
+    fullname = info['fullname']
+    submod = sys.modules.get(modname)
+    if submod is None:
+        return None
+    obj = submod
+    for part in fullname.split('.'):
+        try:
+            obj = getattr(obj, part)
+        except:
+            return None
+    try:
+        fn = inspect.getsourcefile(obj)
+    except:
+        fn = None
+    if not fn:
+        return None
+    try:
+        source, lineno = inspect.findsource(obj)
+    except:
+        lineno = None
+    if lineno:
+        linespec = "#L%d" % (lineno + 1)
+    else:
+        linespec = ""
+    fn = relpath(fn, start='../')
+
+    return '{}/blob/{}/{}{}'.format(GITHUB_URL, code_branch, fn, linespec)
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#
+# today = ''
+#
+# Else, today_fmt is used as the format for a strftime call.
+#
+# today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#
+# default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#
+# add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#
+# add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#
+# show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+# modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+# keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+html_theme_options = {
+    'logo': 'logo.png',
+    'logo_name': PROJECT_NAME,
+    'description': PROJECT_LONG_DESCRIPTION,
+    'github_user': PROJECT_GITHUB_USERNAME,
+    'github_repo': PROJECT_GITHUB_REPOSITORY,
+    'github_type': 'star',
+    'github_banner': True,
+    'travis_button': True,
+    'touch_icon': 'logo-apple.png',
+    # 'fixed_sidebar': True, # Re-enable when we have more content
+}
+
+# Add any paths that contain custom themes here, relative to this directory.
+# html_theme_path = []
+
+# The name for this set of Sphinx documents.
+# "<project> v<release> documentation" by default.
+#
+# html_title = 'Home-Assistant v0.27.0'
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#
+# html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#
+# html_logo = '_static/logo.png'
+
+# The name of an image file (relative to this directory) to use as a favicon of
+# the docs.
+# This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#
+html_favicon = '_static/favicon.ico'
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#
+# html_extra_path = []
+
+# If not None, a 'Last updated on:' timestamp is inserted at every page
+# bottom, using the given strftime format.
+# The empty string is equivalent to '%b %d, %Y'.
+#
+html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#
+html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#
+html_sidebars = {
+    '**': [
+        'about.html',
+        'links.html',
+        'searchbox.html',
+        'sourcelink.html',
+        'navigation.html',
+        'relations.html'
+    ]
+}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#
+# html_additional_pages = {}
+
+# If false, no module index is generated.
+#
+# html_domain_indices = True
+
+# If false, no index is generated.
+#
+# html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#
+# html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#
+# html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#
+# html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#
+# html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#
+# html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+# html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh'
+#
+# html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# 'ja' uses this config value.
+# 'zh' user can custom change `jieba` dictionary path.
+#
+# html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#
+# html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Home-Assistantdoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+     # The paper size ('letterpaper' or 'a4paper').
+     #
+     # 'papersize': 'letterpaper',
+
+     # The font size ('10pt', '11pt' or '12pt').
+     #
+     # 'pointsize': '10pt',
+
+     # Additional stuff for the LaTeX preamble.
+     #
+     # 'preamble': '',
+
+     # Latex figure (float) alignment
+     #
+     # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'home-assistant.tex', 'Home Assistant Documentation',
+     'Home Assistant Team', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#
+# latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#
+# latex_use_parts = False
+
+# If true, show page references after internal links.
+#
+# latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#
+# latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#
+# latex_appendices = []
+
+# It false, will not define \strong, \code, 	itleref, \crossref ... but only
+# \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added
+# packages.
+#
+# latex_keep_old_macro_names = True
+
+# If false, no module index is generated.
+#
+# latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'home-assistant', 'Home Assistant Documentation',
+     [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#
+# man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'Home-Assistant', 'Home Assistant Documentation',
+     author, 'Home Assistant', 'Open-source home automation platform.',
+     'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#
+# texinfo_appendices = []
+
+# If false, no module index is generated.
+#
+# texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#
+# texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#
+# texinfo_no_detailmenu = False
@@ -0,0 +1,22 @@
+================================
+Home Assistant API Documentation
+================================
+
+Public API documentation for `Home Assistant developers`_.
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+
+   api/*
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
+.. _Home Assistant developers: https://home-assistant.io/developers/
@@ -419,8 +419,9 @@ definitions:
        description: Longitude of Home Assistant server
      location_name:
        type: string
-      temperature_unit:
+      unit_system:
        type: string
+        description: The system for measurement units
      time_zone:
        type: string
      version:
@@ -16,16 +16,57 @@ from homeassistant.const import (
    REQUIRED_PYTHON_VER,
    RESTART_EXIT_CODE,
 )
+from homeassistant.util.async import run_callback_threadsafe
+
+
+def monkey_patch_asyncio():
+    """Replace weakref.WeakSet to address Python 3 bug.
+
+    Under heavy threading operations that schedule calls into
+    the asyncio event loop, Task objects are created. Due to
+    a bug in Python, GC may have an issue when switching between
+    the threads and objects with __del__ (which various components
+    in HASS have).
+
+    This monkey-patch removes the weakref.Weakset, and replaces it
+    with an object that ignores the only call utilizing it (the
+    Task.__init__ which calls _all_tasks.add(self)). It also removes
+    the __del__ which could trigger the future objects __del__ at
+    unpredictable times.
+
+    The side-effect of this manipulation of the Task is that
+    Task.all_tasks() is no longer accurate, and there will be no
+    warning emitted if a Task is GC'd while in use.
+
+    On Python 3.6, after the bug is fixed, this monkey-patch can be
+    disabled.
+
+    See https://bugs.python.org/issue26617 for details of the Python
+    bug.
+    """
+    # pylint: disable=no-self-use, too-few-public-methods, protected-access
+    # pylint: disable=bare-except
+    import asyncio.tasks
+
+    class IgnoreCalls:
+        """Ignore add calls."""
+
+        def add(self, other):
+            """No-op add."""
+            return
+
+    asyncio.tasks.Task._all_tasks = IgnoreCalls()
+    try:
+        del asyncio.tasks.Task.__del__
+    except:
+        pass


 def validate_python() -> None:
    """Validate we're running the right Python version."""
-    major, minor = sys.version_info[:2]
-    req_major, req_minor = REQUIRED_PYTHON_VER
-
-    if major < req_major or (major == req_major and minor < req_minor):
-        print("Home Assistant requires at least Python {}.{}".format(
-            req_major, req_minor))
+    if sys.version_info[:3] < REQUIRED_PYTHON_VER:
+        print("Home Assistant requires at least Python {}.{}.{}".format(
+            *REQUIRED_PYTHON_VER))
        sys.exit(1)


@@ -256,12 +297,14 @@ def setup_and_run_hass(config_dir: str,
                import webbrowser
                webbrowser.open(hass.config.api.base_url)

-        hass.bus.listen_once(EVENT_HOMEASSISTANT_START, open_browser)
+        run_callback_threadsafe(
+            hass.loop,
+            hass.bus.async_listen_once,
+            EVENT_HOMEASSISTANT_START, open_browser
+        )

    hass.start()
-    exit_code = int(hass.block_till_stopped())
-
-    return exit_code
+    return hass.exit_code


 def try_to_restart() -> None:
@@ -274,7 +317,7 @@ def try_to_restart() -> None:
    # thread left (which is us). Nothing we really do with it, but it might be
    # useful when debugging shutdown/restart issues.
    try:
-        nthreads = sum(thread.isAlive() and not thread.isDaemon()
+        nthreads = sum(thread.is_alive() and not thread.daemon
                       for thread in threading.enumerate())
        if nthreads > 1:
            sys.stderr.write(
@@ -308,6 +351,8 @@ def try_to_restart() -> None:

 def main() -> int:
    """Start Home Assistant."""
+    monkey_patch_asyncio()
+
    validate_python()

    args = get_arguments()
@@ -11,14 +11,15 @@ from types import ModuleType
 from typing import Any, Optional, Dict

 import voluptuous as vol
+from voluptuous.humanize import humanize_error

 import homeassistant.components as core_components
-from homeassistant.components import group, persistent_notification
+from homeassistant.components import persistent_notification
 import homeassistant.config as conf_util
 import homeassistant.core as core
-import homeassistant.helpers.config_validation as cv
 import homeassistant.loader as loader
 import homeassistant.util.package as pkg_util
+from homeassistant.util.yaml import clear_secret_cache
 from homeassistant.const import EVENT_COMPONENT_LOADED, PLATFORM_FORMAT
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
@@ -89,67 +90,12 @@ def _setup_component(hass: core.HomeAssistant, domain: str, config) -> bool:
                          domain, domain)
            return False

+        config = prepare_setup_component(hass, config, domain)
+
+        if config is None:
+            return False
+
        component = loader.get_component(domain)
-        missing_deps = [dep for dep in getattr(component, 'DEPENDENCIES', [])
-                        if dep not in hass.config.components]
-
-        if missing_deps:
-            _LOGGER.error(
-                'Not initializing %s because not all dependencies loaded: %s',
-                domain, ", ".join(missing_deps))
-            return False
-
-        if hasattr(component, 'CONFIG_SCHEMA'):
-            try:
-                config = component.CONFIG_SCHEMA(config)
-            except vol.MultipleInvalid as ex:
-                cv.log_exception(_LOGGER, ex, domain, config)
-                return False
-
-        elif hasattr(component, 'PLATFORM_SCHEMA'):
-            platforms = []
-            for p_name, p_config in config_per_platform(config, domain):
-                # Validate component specific platform schema
-                try:
-                    p_validated = component.PLATFORM_SCHEMA(p_config)
-                except vol.MultipleInvalid as ex:
-                    cv.log_exception(_LOGGER, ex, domain, p_config)
-                    return False
-
-                # Not all platform components follow same pattern for platforms
-                # So if p_name is None we are not going to validate platform
-                # (the automation component is one of them)
-                if p_name is None:
-                    platforms.append(p_validated)
-                    continue
-
-                platform = prepare_setup_platform(hass, config, domain,
-                                                  p_name)
-
-                if platform is None:
-                    return False
-
-                # Validate platform specific schema
-                if hasattr(platform, 'PLATFORM_SCHEMA'):
-                    try:
-                        p_validated = platform.PLATFORM_SCHEMA(p_validated)
-                    except vol.MultipleInvalid as ex:
-                        cv.log_exception(_LOGGER, ex, '{}.{}'
-                                         .format(domain, p_name), p_validated)
-                        return False
-
-                platforms.append(p_validated)
-
-            # Create a copy of the configuration with all config for current
-            # component removed and add validated config back in.
-            filter_keys = extract_domain_configs(config, domain)
-            config = {key: value for key, value in config.items()
-                      if key not in filter_keys}
-            config[domain] = platforms
-
-        if not _handle_requirements(hass, component, domain):
-            return False
-
        _CURRENT_SETUP.append(domain)

        try:
@@ -172,15 +118,85 @@ def _setup_component(hass: core.HomeAssistant, domain: str, config) -> bool:

        # Assumption: if a component does not depend on groups
        # it communicates with devices
-        if group.DOMAIN not in getattr(component, 'DEPENDENCIES', []):
+        if 'group' not in getattr(component, 'DEPENDENCIES', []) and \
+           hass.pool.worker_count <= 10:
            hass.pool.add_worker()

        hass.bus.fire(
-            EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: component.DOMAIN})
+            EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: component.DOMAIN}
+        )

        return True


+def prepare_setup_component(hass: core.HomeAssistant, config: dict,
+                            domain: str):
+    """Prepare setup of a component and return processed config."""
+    # pylint: disable=too-many-return-statements
+    component = loader.get_component(domain)
+    missing_deps = [dep for dep in getattr(component, 'DEPENDENCIES', [])
+                    if dep not in hass.config.components]
+
+    if missing_deps:
+        _LOGGER.error(
+            'Not initializing %s because not all dependencies loaded: %s',
+            domain, ", ".join(missing_deps))
+        return None
+
+    if hasattr(component, 'CONFIG_SCHEMA'):
+        try:
+            config = component.CONFIG_SCHEMA(config)
+        except vol.Invalid as ex:
+            log_exception(ex, domain, config)
+            return None
+
+    elif hasattr(component, 'PLATFORM_SCHEMA'):
+        platforms = []
+        for p_name, p_config in config_per_platform(config, domain):
+            # Validate component specific platform schema
+            try:
+                p_validated = component.PLATFORM_SCHEMA(p_config)
+            except vol.Invalid as ex:
+                log_exception(ex, domain, config)
+                return None
+
+            # Not all platform components follow same pattern for platforms
+            # So if p_name is None we are not going to validate platform
+            # (the automation component is one of them)
+            if p_name is None:
+                platforms.append(p_validated)
+                continue
+
+            platform = prepare_setup_platform(hass, config, domain,
+                                              p_name)
+
+            if platform is None:
+                return None
+
+            # Validate platform specific schema
+            if hasattr(platform, 'PLATFORM_SCHEMA'):
+                try:
+                    p_validated = platform.PLATFORM_SCHEMA(p_validated)
+                except vol.Invalid as ex:
+                    log_exception(ex, '{}.{}'.format(domain, p_name),
+                                  p_validated)
+                    return None
+
+            platforms.append(p_validated)
+
+        # Create a copy of the configuration with all config for current
+        # component removed and add validated config back in.
+        filter_keys = extract_domain_configs(config, domain)
+        config = {key: value for key, value in config.items()
+                  if key not in filter_keys}
+        config[domain] = platforms
+
+    if not _handle_requirements(hass, component, domain):
+        return None
+
+    return config
+
+
 def prepare_setup_platform(hass: core.HomeAssistant, config, domain: str,
                           platform_name: str) -> Optional[ModuleType]:
    """Load a platform and makes sure dependencies are setup."""
@@ -232,14 +248,14 @@ def from_config_dict(config: Dict[str, Any],
        if config_dir is not None:
            config_dir = os.path.abspath(config_dir)
            hass.config.config_dir = config_dir
-            _mount_local_lib_path(config_dir)
+            mount_local_lib_path(config_dir)

    core_config = config.get(core.DOMAIN, {})

    try:
        conf_util.process_ha_core_config(hass, core_config)
    except vol.Invalid as ex:
-        cv.log_exception(_LOGGER, ex, 'homeassistant', core_config)
+        log_exception(ex, 'homeassistant', core_config)
        return None

    conf_util.process_ha_config_upgrade(hass)
@@ -264,23 +280,29 @@ def from_config_dict(config: Dict[str, Any],
    components = set(key.split(' ')[0] for key in config.keys()
                     if key != core.DOMAIN)

-    if not core_components.setup(hass, config):
-        _LOGGER.error('Home Assistant core failed to initialize. '
-                      'Further initialization aborted.')
-        return hass
+    # Setup in a thread to avoid blocking
+    def component_setup():
+        """Set up a component."""
+        if not core_components.setup(hass, config):
+            _LOGGER.error('Home Assistant core failed to initialize. '
+                          'Further initialization aborted.')
+            return hass

-    persistent_notification.setup(hass, config)
+        persistent_notification.setup(hass, config)

-    _LOGGER.info('Home Assistant core initialized')
+        _LOGGER.info('Home Assistant core initialized')

-    # Give event decorators access to HASS
-    event_decorators.HASS = hass
-    service.HASS = hass
+        # Give event decorators access to HASS
+        event_decorators.HASS = hass
+        service.HASS = hass

-    # Setup the components
-    for domain in loader.load_order_components(components):
-        _setup_component(hass, domain, config)
+        # Setup the components
+        for domain in loader.load_order_components(components):
+            _setup_component(hass, domain, config)

+    hass.loop.run_until_complete(
+        hass.loop.run_in_executor(None, component_setup)
+    )
    return hass


@@ -300,7 +322,7 @@ def from_config_file(config_path: str,
    # Set config dir to directory holding config file
    config_dir = os.path.abspath(os.path.dirname(config_path))
    hass.config.config_dir = config_dir
-    _mount_local_lib_path(config_dir)
+    mount_local_lib_path(config_dir)

    enable_logging(hass, verbose, log_rotate_days)

@@ -308,6 +330,8 @@ def from_config_file(config_path: str,
        config_dict = conf_util.load_yaml_config_file(config_path)
    except HomeAssistantError:
        return None
+    finally:
+        clear_secret_cache()

    return from_config_dict(config_dict, hass, enable_log=False,
                            skip_pip=skip_pip)
@@ -371,6 +395,31 @@ def _ensure_loader_prepared(hass: core.HomeAssistant) -> None:
        loader.prepare(hass)


-def _mount_local_lib_path(config_dir: str) -> None:
+def log_exception(ex, domain, config):
+    """Generate log exception for config validation."""
+    message = 'Invalid config for [{}]: '.format(domain)
+
+    if 'extra keys not allowed' in ex.error_message:
+        message += '[{}] is an invalid option for [{}]. Check: {}->{}.'\
+                   .format(ex.path[-1], domain, domain,
+                           '->'.join('%s' % m for m in ex.path))
+    else:
+        message += '{}.'.format(humanize_error(config, ex))
+
+    if hasattr(config, '__line__'):
+        message += " (See {}:{})".format(
+            config.__config_file__, config.__line__ or '?')
+
+    if domain != 'homeassistant':
+        message += (' Please check the docs at '
+                    'https://home-assistant.io/components/{}/'.format(domain))
+
+    _LOGGER.error(message)
+
+
+def mount_local_lib_path(config_dir: str) -> str:
    """Add local library to Python Path."""
-    sys.path.insert(0, os.path.join(config_dir, 'deps'))
+    deps_dir = os.path.join(config_dir, 'deps')
+    if deps_dir not in sys.path:
+        sys.path.insert(0, os.path.join(config_dir, 'deps'))
+    return deps_dir
@@ -11,7 +11,6 @@ import itertools as it
 import logging

 import homeassistant.core as ha
-from homeassistant.helpers.entity import split_entity_id
 from homeassistant.helpers.service import extract_entity_ids
 from homeassistant.loader import get_component
 from homeassistant.const import (
@@ -35,7 +34,7 @@ def is_on(hass, entity_id=None):
        entity_ids = hass.states.entity_ids()

    for entity_id in entity_ids:
-        domain = split_entity_id(entity_id)[0]
+        domain = ha.split_entity_id(entity_id)[0]

        module = get_component(domain)

@@ -95,7 +94,7 @@ def setup(hass, config):

        # Group entity_ids by domain. groupby requires sorted data.
        by_domain = it.groupby(sorted(entity_ids),
-                               lambda item: split_entity_id(item)[0])
+                               lambda item: ha.split_entity_id(item)[0])

        for domain, ent_ids in by_domain:
            # We want to block for all calls and only return when all calls
@@ -20,6 +20,7 @@ from homeassistant.helpers.entity_component import EntityComponent

 DOMAIN = 'alarm_control_panel'
 SCAN_INTERVAL = 30
+ATTR_CHANGED_BY = 'changed_by'

 ENTITY_ID_FORMAT = DOMAIN + '.{}'

@@ -124,6 +125,11 @@ class AlarmControlPanel(Entity):
        """Regex for code format or None if no code is required."""
        return None

+    @property
+    def changed_by(self):
+        """Last change triggered by."""
+        return None
+
    def alarm_disarm(self, code=None):
        """Send disarm command."""
        raise NotImplementedError()
@@ -145,5 +151,6 @@ class AlarmControlPanel(Entity):
        """Return the state attributes."""
        state_attr = {
            ATTR_CODE_FORMAT: self.code_format,
+            ATTR_CHANGED_BY: self.changed_by
        }
        return state_attr
@@ -6,34 +6,40 @@ https://home-assistant.io/components/alarm_control_panel.alarmdotcom/
 """
 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)
-
-_LOGGER = logging.getLogger(__name__)
-
+    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN, CONF_CODE,
+    CONF_NAME)
+import homeassistant.helpers.config_validation as cv

 REQUIREMENTS = ['https://github.com/Xorso/pyalarmdotcom'
                '/archive/0.1.1.zip'
                '#pyalarmdotcom==0.1.1']
+
+_LOGGER = logging.getLogger(__name__)
+
 DEFAULT_NAME = 'Alarm.com'

+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Optional(CONF_CODE): cv.positive_int,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+

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

-    if username is None or password is None:
-        _LOGGER.error('Must specify username and password!')
-        return False
-
-    add_devices([AlarmDotCom(hass,
-                             config.get('name', DEFAULT_NAME),
-                             config.get('code'),
-                             username,
-                             password)])
+    add_devices([AlarmDotCom(hass, name, code, username, password)])


 # pylint: disable=too-many-arguments, too-many-instance-attributes
@@ -80,7 +86,7 @@ class AlarmDotCom(alarm.AlarmControlPanel):

    def alarm_disarm(self, code=None):
        """Send disarm command."""
-        if not self._validate_code(code, 'arming home'):
+        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
@@ -10,5 +10,5 @@ import homeassistant.components.alarm_control_panel.manual as manual
 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Demo alarm control panel platform."""
    add_devices([
-        manual.ManualAlarm(hass, 'Alarm', '1234', 5, 10),
+        manual.ManualAlarm(hass, 'Alarm', '1234', 5, 10, False),
    ])
@@ -10,6 +10,7 @@ from homeassistant.components.envisalink import (EVL_CONTROLLER,
                                                 EnvisalinkDevice,
                                                 PARTITION_SCHEMA,
                                                 CONF_CODE,
+                                                 CONF_PANIC,
                                                 CONF_PARTITIONNAME,
                                                 SIGNAL_PARTITION_UPDATE,
                                                 SIGNAL_KEYPAD_UPDATE)
@@ -26,6 +27,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
    """Perform the setup for Envisalink alarm panels."""
    _configured_partitions = discovery_info['partitions']
    _code = discovery_info[CONF_CODE]
+    _panic_type = discovery_info[CONF_PANIC]
    for part_num in _configured_partitions:
        _device_config_data = PARTITION_SCHEMA(
            _configured_partitions[part_num])
@@ -33,6 +35,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
            part_num,
            _device_config_data[CONF_PARTITIONNAME],
            _code,
+            _panic_type,
            EVL_CONTROLLER.alarm_state['partition'][part_num],
            EVL_CONTROLLER)
        add_devices_callback([_device])
@@ -44,11 +47,13 @@ class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
    """Represents the Envisalink-based alarm panel."""

    # pylint: disable=too-many-arguments
-    def __init__(self, partition_number, alarm_name, code, info, controller):
+    def __init__(self, partition_number, alarm_name,
+                 code, panic_type, info, controller):
        """Initialize the alarm panel."""
        from pydispatch import dispatcher
        self._partition_number = partition_number
        self._code = code
+        self._panic_type = panic_type
        _LOGGER.debug('Setting up alarm: ' + alarm_name)
        EnvisalinkDevice.__init__(self, alarm_name, info, controller)
        dispatcher.connect(self._update_callback,
@@ -61,7 +66,7 @@ class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
    def _update_callback(self, partition):
        """Update HA state, if needed."""
        if partition is None or int(partition) == self._partition_number:
-            self.update_ha_state()
+            self.hass.async_add_job(self.update_ha_state)

    @property
    def code_format(self):
@@ -101,5 +106,6 @@ class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
                                              self._partition_number)

    def alarm_trigger(self, code=None):
-        """Alarm trigger command. Not possible for us."""
-        raise NotImplementedError()
+        """Alarm trigger command. Will be used to trigger a panic alarm."""
+        if self._code:
+            EVL_CONTROLLER.panic_alarm(self._panic_type)
@@ -7,28 +7,46 @@ https://home-assistant.io/components/alarm_control_panel.manual/
 import datetime
 import logging

+import voluptuous as vol
+
 import homeassistant.components.alarm_control_panel as alarm
 import homeassistant.util.dt as dt_util
 from homeassistant.const import (
    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
-    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED)
+    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, CONF_PLATFORM, CONF_NAME,
+    CONF_CODE, CONF_PENDING_TIME, CONF_TRIGGER_TIME, CONF_DISARM_AFTER_TRIGGER)
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import track_point_in_time

-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_ALARM_NAME = 'HA Alarm'
 DEFAULT_PENDING_TIME = 60
 DEFAULT_TRIGGER_TIME = 120
+DEFAULT_DISARM_AFTER_TRIGGER = False
+
+PLATFORM_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): 'manual',
+    vol.Optional(CONF_NAME, default=DEFAULT_ALARM_NAME): cv.string,
+    vol.Optional(CONF_CODE): cv.string,
+    vol.Optional(CONF_PENDING_TIME, default=DEFAULT_PENDING_TIME):
+        vol.All(vol.Coerce(int), vol.Range(min=0)),
+    vol.Optional(CONF_TRIGGER_TIME, default=DEFAULT_TRIGGER_TIME):
+        vol.All(vol.Coerce(int), vol.Range(min=1)),
+    vol.Optional(CONF_DISARM_AFTER_TRIGGER,
+                 default=DEFAULT_DISARM_AFTER_TRIGGER): cv.boolean,
+})
+
+_LOGGER = logging.getLogger(__name__)


 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the manual alarm platform."""
    add_devices([ManualAlarm(
        hass,
-        config.get('name', DEFAULT_ALARM_NAME),
-        config.get('code'),
-        config.get('pending_time', DEFAULT_PENDING_TIME),
-        config.get('trigger_time', DEFAULT_TRIGGER_TIME),
+        config[CONF_NAME],
+        config.get(CONF_CODE),
+        config.get(CONF_PENDING_TIME, DEFAULT_PENDING_TIME),
+        config.get(CONF_TRIGGER_TIME, DEFAULT_TRIGGER_TIME),
+        config.get(CONF_DISARM_AFTER_TRIGGER, DEFAULT_DISARM_AFTER_TRIGGER)
        )])


@@ -40,10 +58,12 @@ class ManualAlarm(alarm.AlarmControlPanel):

    When armed, will be pending for 'pending_time', after that armed.
    When triggered, will be pending for 'trigger_time'. After that will be
-    triggered for 'trigger_time', after that we return to disarmed.
+    triggered for 'trigger_time', after that we return to the previous state
+    or disarm if `disarm_after_trigger` is true.
    """

-    def __init__(self, hass, name, code, pending_time, trigger_time):
+    def __init__(self, hass, name, code, pending_time,
+                 trigger_time, disarm_after_trigger):
        """Initalize the manual alarm panel."""
        self._state = STATE_ALARM_DISARMED
        self._hass = hass
@@ -51,6 +71,8 @@ class ManualAlarm(alarm.AlarmControlPanel):
        self._code = str(code) if code else None
        self._pending_time = datetime.timedelta(seconds=pending_time)
        self._trigger_time = datetime.timedelta(seconds=trigger_time)
+        self._disarm_after_trigger = disarm_after_trigger
+        self._pre_trigger_state = self._state
        self._state_ts = None

    @property
@@ -77,7 +99,10 @@ class ManualAlarm(alarm.AlarmControlPanel):
                return STATE_ALARM_PENDING
            elif (self._state_ts + self._pending_time +
                  self._trigger_time) < dt_util.utcnow():
-                return STATE_ALARM_DISARMED
+                if self._disarm_after_trigger:
+                    return STATE_ALARM_DISARMED
+                else:
+                    return self._pre_trigger_state

        return self._state

@@ -125,6 +150,7 @@ class ManualAlarm(alarm.AlarmControlPanel):

    def alarm_trigger(self, code=None):
        """Send alarm trigger command. No code needed."""
+        self._pre_trigger_state = self._state
        self._state = STATE_ALARM_TRIGGERED
        self._state_ts = dt_util.utcnow()
        self.update_ha_state()
@@ -13,33 +13,31 @@ import homeassistant.components.mqtt as mqtt
 from homeassistant.const import (
    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN,
-    CONF_NAME)
+    CONF_NAME, CONF_CODE)
 from homeassistant.components.mqtt import (
    CONF_STATE_TOPIC, CONF_COMMAND_TOPIC, CONF_QOS)
 import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

-DEPENDENCIES = ['mqtt']
-
 CONF_PAYLOAD_DISARM = 'payload_disarm'
 CONF_PAYLOAD_ARM_HOME = 'payload_arm_home'
 CONF_PAYLOAD_ARM_AWAY = 'payload_arm_away'
-CONF_CODE = 'code'

-DEFAULT_NAME = "MQTT Alarm"
-DEFAULT_DISARM = "DISARM"
-DEFAULT_ARM_HOME = "ARM_HOME"
-DEFAULT_ARM_AWAY = "ARM_AWAY"
+DEFAULT_ARM_AWAY = 'ARM_AWAY'
+DEFAULT_ARM_HOME = 'ARM_HOME'
+DEFAULT_DISARM = 'DISARM'
+DEFAULT_NAME = 'MQTT Alarm'
+DEPENDENCIES = ['mqtt']

 PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Required(CONF_STATE_TOPIC): mqtt.valid_subscribe_topic,
    vol.Required(CONF_COMMAND_TOPIC): mqtt.valid_publish_topic,
-    vol.Optional(CONF_PAYLOAD_DISARM, default=DEFAULT_DISARM): cv.string,
-    vol.Optional(CONF_PAYLOAD_ARM_HOME, default=DEFAULT_ARM_HOME): cv.string,
-    vol.Optional(CONF_PAYLOAD_ARM_AWAY, default=DEFAULT_ARM_AWAY): cv.string,
+    vol.Required(CONF_STATE_TOPIC): mqtt.valid_subscribe_topic,
    vol.Optional(CONF_CODE): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_PAYLOAD_ARM_AWAY, default=DEFAULT_ARM_AWAY): cv.string,
+    vol.Optional(CONF_PAYLOAD_ARM_HOME, default=DEFAULT_ARM_HOME): cv.string,
+    vol.Optional(CONF_PAYLOAD_DISARM, default=DEFAULT_DISARM): cv.string,
 })


@@ -47,20 +45,20 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the MQTT platform."""
    add_devices([MqttAlarm(
        hass,
-        config[CONF_NAME],
-        config[CONF_STATE_TOPIC],
-        config[CONF_COMMAND_TOPIC],
-        config[CONF_QOS],
-        config[CONF_PAYLOAD_DISARM],
-        config[CONF_PAYLOAD_ARM_HOME],
-        config[CONF_PAYLOAD_ARM_AWAY],
+        config.get(CONF_NAME),
+        config.get(CONF_STATE_TOPIC),
+        config.get(CONF_COMMAND_TOPIC),
+        config.get(CONF_QOS),
+        config.get(CONF_PAYLOAD_DISARM),
+        config.get(CONF_PAYLOAD_ARM_HOME),
+        config.get(CONF_PAYLOAD_ARM_AWAY),
        config.get(CONF_CODE))])


 # pylint: disable=too-many-arguments, too-many-instance-attributes
 # pylint: disable=abstract-method
 class MqttAlarm(alarm.AlarmControlPanel):
-    """Represent a MQTT alarm status."""
+    """Representation of a MQTT alarm status."""

    def __init__(self, hass, name, state_topic, command_topic, qos,
                 payload_disarm, payload_arm_home, payload_arm_away, code):
@@ -7,22 +7,40 @@ https://home-assistant.io/components/alarm_control_panel.nx584/
 import logging

 import requests
+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 (
    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
-    STATE_UNKNOWN)
+    STATE_UNKNOWN, CONF_NAME, CONF_HOST, CONF_PORT)
+import homeassistant.helpers.config_validation as cv

 REQUIREMENTS = ['pynx584==0.2']
+
 _LOGGER = logging.getLogger(__name__)

+DEFAULT_HOST = 'localhost'
+DEFAULT_NAME = 'NX584'
+DEFAULT_PORT = 5007
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup nx584 platform."""
-    host = config.get('host', 'localhost:5007')
+    name = config.get(CONF_NAME)
+    host = config.get(CONF_HOST)
+    port = config.get(CONF_PORT)
+
+    url = 'http://{}:{}'.format(host, port)

    try:
-        add_devices([NX584Alarm(hass, host, config.get('name', 'NX584'))])
+        add_devices([NX584Alarm(hass, url, name)])
    except requests.exceptions.ConnectionError as ex:
        _LOGGER.error('Unable to connect to NX584: %s', str(ex))
        return False
@@ -31,13 +49,13 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 class NX584Alarm(alarm.AlarmControlPanel):
    """Represents the NX584-based alarm panel."""

-    def __init__(self, hass, host, name):
+    def __init__(self, hass, url, name):
        """Initalize the nx584 alarm panel."""
        from nx584 import client
        self._hass = hass
-        self._host = host
        self._name = name
-        self._alarm = client.Client('http://%s' % host)
+        self._url = url
+        self._alarm = client.Client(self._url)
        # Do an initial list operation so that we will try to actually
        # talk to the API and trigger a requests exception for setup_platform()
        # to catch
@@ -66,7 +84,7 @@ class NX584Alarm(alarm.AlarmControlPanel):
            zones = self._alarm.list_zones()
        except requests.exceptions.ConnectionError as ex:
            _LOGGER.error('Unable to connect to %(host)s: %(reason)s',
-                          dict(host=self._host, reason=ex))
+                          dict(host=self._url, reason=ex))
            return STATE_UNKNOWN
        except IndexError:
            _LOGGER.error('nx584 reports no partitions')
@@ -0,0 +1,43 @@
+alarm_disarm:
+  description: Send the alarm the command for disarm
+
+  fields:
+    entity_id:
+      description: Name of alarm control panel to disarm
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to disarm the alarm control panel with
+      example: 1234
+
+alarm_arm_home:
+  description: Send the alarm the command for arm home
+
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm home
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to arm home the alarm control panel with
+      example: 1234
+
+alarm_arm_away:
+  description: Send the alarm the command for arm away
+
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm away
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to arm away the alarm control panel with
+      example: 1234
+
+alarm_trigger:
+  description: Send the alarm the command for trigger
+
+  fields:
+    entity_id:
+      description: Name of alarm control panel to trigger
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to trigger the alarm control panel with
+      example: 1234
@@ -6,32 +6,39 @@ https://home-assistant.io/components/alarm_control_panel.simplisafe/
 """
 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_UNKNOWN,
+    CONF_PASSWORD, CONF_USERNAME, STATE_UNKNOWN, CONF_CODE, CONF_NAME,
    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY)
+import homeassistant.helpers.config_validation as cv

-_LOGGER = logging.getLogger(__name__)
 REQUIREMENTS = ['https://github.com/w1ll1am23/simplisafe-python/archive/'
                '586fede0e85fd69e56e516aaa8e97eb644ca8866.zip#'
                'simplisafe-python==0.0.1']

+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'SimpliSafe'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Optional(CONF_CODE): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Set up the SimpliSafe platform."""
+    name = config.get(CONF_NAME)
+    code = config.get(CONF_CODE)
    username = config.get(CONF_USERNAME)
    password = config.get(CONF_PASSWORD)

-    if username is None or password is None:
-        _LOGGER.error('Must specify username and password!')
-        return False
-
-    add_devices([SimpliSafeAlarm(
-        config.get('name', "SimpliSafe"),
-        username,
-        password,
-        config.get('code'))])
+    add_devices([SimpliSafeAlarm(name, username, password, code)])


 # pylint: disable=abstract-method
@@ -8,7 +8,7 @@ import logging

 import homeassistant.components.alarm_control_panel as alarm
 from homeassistant.components.verisure import HUB as hub
-
+from homeassistant.components.verisure import (CONF_ALARM, CONF_CODE_DIGITS)
 from homeassistant.const import (
    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
    STATE_UNKNOWN)
@@ -19,7 +19,7 @@ _LOGGER = logging.getLogger(__name__)
 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Verisure platform."""
    alarms = []
-    if int(hub.config.get('alarm', '1')):
+    if int(hub.config.get(CONF_ALARM, 1)):
        hub.update_alarms()
        alarms.extend([
            VerisureAlarm(value.id)
@@ -36,7 +36,8 @@ class VerisureAlarm(alarm.AlarmControlPanel):
        """Initalize the Verisure alarm panel."""
        self._id = device_id
        self._state = STATE_UNKNOWN
-        self._digits = int(hub.config.get('code_digits', '4'))
+        self._digits = hub.config.get(CONF_CODE_DIGITS)
+        self._changed_by = None

    @property
    def name(self):
@@ -58,6 +59,11 @@ class VerisureAlarm(alarm.AlarmControlPanel):
        """The code format as regex."""
        return '^\\d{%s}$' % self._digits

+    @property
+    def changed_by(self):
+        """Last change triggered by."""
+        return self._changed_by
+
    def update(self):
        """Update alarm status."""
        hub.update_alarms()
@@ -72,6 +78,7 @@ class VerisureAlarm(alarm.AlarmControlPanel):
            _LOGGER.error(
                'Unknown alarm state %s',
                hub.alarm_status[self._id].status)
+        self._changed_by = hub.alarm_status[self._id].name

    def alarm_disarm(self, code=None):
        """Send disarm command."""
@@ -4,24 +4,66 @@ Support for Alexa skill service end point.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/alexa/
 """
+import copy
 import enum
 import logging

-from homeassistant.const import HTTP_BAD_REQUEST
-from homeassistant.helpers import template, script
-from homeassistant.components.http import HomeAssistantView
+import voluptuous as vol

-DOMAIN = 'alexa'
-DEPENDENCIES = ['http']
+from homeassistant.const import HTTP_BAD_REQUEST
+from homeassistant.helpers import template, script, config_validation as cv
+from homeassistant.components.http import HomeAssistantView

 _LOGGER = logging.getLogger(__name__)

 API_ENDPOINT = '/api/alexa'

-CONF_INTENTS = 'intents'
-CONF_CARD = 'card'
-CONF_SPEECH = 'speech'
 CONF_ACTION = 'action'
+CONF_CARD = 'card'
+CONF_INTENTS = 'intents'
+CONF_SPEECH = 'speech'
+
+CONF_TYPE = 'type'
+CONF_TITLE = 'title'
+CONF_CONTENT = 'content'
+CONF_TEXT = 'text'
+
+DOMAIN = 'alexa'
+DEPENDENCIES = ['http']
+
+
+class SpeechType(enum.Enum):
+    """The Alexa speech types."""
+
+    plaintext = "PlainText"
+    ssml = "SSML"
+
+
+class CardType(enum.Enum):
+    """The Alexa card types."""
+
+    simple = "Simple"
+    link_account = "LinkAccount"
+
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: {
+        CONF_INTENTS: {
+            cv.string: {
+                vol.Optional(CONF_ACTION): cv.SCRIPT_SCHEMA,
+                vol.Optional(CONF_CARD): {
+                    vol.Required(CONF_TYPE): cv.enum(CardType),
+                    vol.Required(CONF_TITLE): cv.template,
+                    vol.Required(CONF_CONTENT): cv.template,
+                },
+                vol.Optional(CONF_SPEECH): {
+                    vol.Required(CONF_TYPE): cv.enum(SpeechType),
+                    vol.Required(CONF_TEXT): cv.template,
+                }
+            }
+        }
+    }
+}, extra=vol.ALLOW_EXTRA)


 def setup(hass, config):
@@ -42,6 +84,9 @@ class AlexaView(HomeAssistantView):
        """Initialize Alexa view."""
        super().__init__(hass)

+        intents = copy.deepcopy(intents)
+        template.attach(hass, intents)
+
        for name, intent in intents.items():
            if CONF_ACTION in intent:
                intent[CONF_ACTION] = script.Script(
@@ -101,29 +146,15 @@ class AlexaView(HomeAssistantView):

        # pylint: disable=unsubscriptable-object
        if speech is not None:
-            response.add_speech(SpeechType[speech['type']], speech['text'])
+            response.add_speech(speech[CONF_TYPE], speech[CONF_TEXT])

        if card is not None:
-            response.add_card(CardType[card['type']], card['title'],
-                              card['content'])
+            response.add_card(card[CONF_TYPE], card[CONF_TITLE],
+                              card[CONF_CONTENT])

        return self.json(response)


-class SpeechType(enum.Enum):
-    """The Alexa speech types."""
-
-    plaintext = "PlainText"
-    ssml = "SSML"
-
-
-class CardType(enum.Enum):
-    """The Alexa card types."""
-
-    simple = "Simple"
-    link_account = "LinkAccount"
-
-
 class AlexaResponse(object):
    """Help generating the response for Alexa."""

@@ -153,8 +184,8 @@ class AlexaResponse(object):
            self.card = card
            return

-        card["title"] = self._render(title),
-        card["content"] = self._render(content)
+        card["title"] = title.render(self.variables)
+        card["content"] = content.render(self.variables)
        self.card = card

    def add_speech(self, speech_type, text):
@@ -163,9 +194,12 @@ class AlexaResponse(object):

        key = 'ssml' if speech_type == SpeechType.ssml else 'text'

+        if isinstance(text, template.Template):
+            text = text.render(self.variables)
+
        self.speech = {
            'type': speech_type.value,
-            key: self._render(text)
+            key: text
        }

    def add_reprompt(self, speech_type, text):
@@ -176,7 +210,7 @@ class AlexaResponse(object):

        self.reprompt = {
            'type': speech_type.value,
-            key: self._render(text)
+            key: text.render(self.variables)
        }

    def as_dict(self):
@@ -201,7 +235,3 @@ class AlexaResponse(object):
            'sessionAttributes': self.session_attributes,
            'response': response,
        }
-
-    def _render(self, template_string):
-        """Render a response, adding data from intent if available."""
-        return template.render(self.hass, template_string, self.variables)
@@ -7,35 +7,43 @@ https://home-assistant.io/components/apcupsd/
 import logging
 from datetime import timedelta

+import voluptuous as vol
+
+from homeassistant.const import (CONF_HOST, CONF_PORT)
+import homeassistant.helpers.config_validation as cv
 from homeassistant.util import Throttle

-DOMAIN = "apcupsd"
-REQUIREMENTS = ("apcaccess==0.0.4",)
+REQUIREMENTS = ['apcaccess==0.0.4']

-CONF_HOST = "host"
-CONF_PORT = "port"
-CONF_TYPE = "type"
+_LOGGER = logging.getLogger(__name__)

-DEFAULT_HOST = "localhost"
+CONF_TYPE = 'type'
+
+DATA = None
+DEFAULT_HOST = 'localhost'
 DEFAULT_PORT = 3551
+DOMAIN = 'apcupsd'

-KEY_STATUS = "STATUS"
-
-VALUE_ONLINE = "ONLINE"
+KEY_STATUS = 'STATUS'

 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)

-DATA = None
+VALUE_ONLINE = 'ONLINE'

-_LOGGER = logging.getLogger(__name__)
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
+        vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+    }),
+}, extra=vol.ALLOW_EXTRA)


 def setup(hass, config):
    """Use config values to set up a function enabling status retrieval."""
    global DATA
-
-    host = config[DOMAIN].get(CONF_HOST, DEFAULT_HOST)
-    port = config[DOMAIN].get(CONF_PORT, DEFAULT_PORT)
+    conf = config[DOMAIN]
+    host = conf.get(CONF_HOST)
+    port = conf.get(CONF_PORT)

    DATA = APCUPSdData(host, port)

@@ -4,6 +4,7 @@ Rest API for Home Assistant.
 For more details about the RESTful API, please refer to the documentation at
 https://home-assistant.io/developers/api/
 """
+import asyncio
 import json
 import logging
 import queue
@@ -79,6 +80,7 @@ class APIEventStream(HomeAssistantView):
        if restrict:
            restrict = restrict.split(',') + [EVENT_HOMEASSISTANT_STOP]

+        @asyncio.coroutine
        def forward_events(event):
            """Forward events to the open request."""
            if event.event_type == EVENT_TIME_CHANGED:
@@ -98,31 +100,32 @@ class APIEventStream(HomeAssistantView):

        def stream():
            """Stream events to response."""
-            self.hass.bus.listen(MATCH_ALL, forward_events)
+            unsub_stream = self.hass.bus.listen(MATCH_ALL, forward_events)

-            _LOGGER.debug('STREAM %s ATTACHED', id(stop_obj))
+            try:
+                _LOGGER.debug('STREAM %s ATTACHED', id(stop_obj))

-            # Fire off one message right away to have browsers fire open event
-            to_write.put(STREAM_PING_PAYLOAD)
+                # Fire off one message so browsers fire open event right away
+                to_write.put(STREAM_PING_PAYLOAD)

-            while True:
-                try:
-                    payload = to_write.get(timeout=STREAM_PING_INTERVAL)
+                while True:
+                    try:
+                        payload = to_write.get(timeout=STREAM_PING_INTERVAL)

-                    if payload is stop_obj:
+                        if payload is stop_obj:
+                            break
+
+                        msg = "data: {}\n\n".format(payload)
+                        _LOGGER.debug('STREAM %s WRITING %s', id(stop_obj),
+                                      msg.strip())
+                        yield msg.encode("UTF-8")
+                    except queue.Empty:
+                        to_write.put(STREAM_PING_PAYLOAD)
+                    except GeneratorExit:
                        break
-
-                    msg = "data: {}\n\n".format(payload)
-                    _LOGGER.debug('STREAM %s WRITING %s', id(stop_obj),
-                                  msg.strip())
-                    yield msg.encode("UTF-8")
-                except queue.Empty:
-                    to_write.put(STREAM_PING_PAYLOAD)
-                except GeneratorExit:
-                    break
-
-            _LOGGER.debug('STREAM %s RESPONSE CLOSED', id(stop_obj))
-            self.hass.bus.remove_listener(MATCH_ALL, forward_events)
+            finally:
+                _LOGGER.debug('STREAM %s RESPONSE CLOSED', id(stop_obj))
+                unsub_stream()

        return self.Response(stream(), mimetype='text/event-stream')

@@ -375,8 +378,8 @@ class APITemplateView(HomeAssistantView):
    def post(self, request):
        """Render a template."""
        try:
-            return template.render(self.hass, request.json['template'],
-                                   request.json.get('variables'))
+            tpl = template.Template(request.json['template'], self.hass)
+            return tpl.render(request.json.get('variables'))
        except TemplateError as ex:
            return self.json_message('Error rendering template: {}'.format(ex),
                                     HTTP_BAD_REQUEST)
@@ -6,27 +6,34 @@ https://home-assistant.io/components/arduino/
 """
 import logging

+import voluptuous as vol
+
 from homeassistant.const import (
    EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
-from homeassistant.helpers import validate_config
+from homeassistant.const import CONF_PORT
+import homeassistant.helpers.config_validation as cv
+
+REQUIREMENTS = ['PyMata==2.13']

-DOMAIN = "arduino"
-REQUIREMENTS = ['PyMata==2.12']
-BOARD = None
 _LOGGER = logging.getLogger(__name__)

+BOARD = None
+
+DOMAIN = 'arduino'
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_PORT): cv.string,
+    }),
+}, extra=vol.ALLOW_EXTRA)
+

 def setup(hass, config):
    """Setup the Arduino component."""
-    if not validate_config(config,
-                           {DOMAIN: ['port']},
-                           _LOGGER):
-        return False
-
    import serial
    global BOARD
    try:
-        BOARD = ArduinoBoard(config[DOMAIN]['port'])
+        BOARD = ArduinoBoard(config[DOMAIN][CONF_PORT])
    except (serial.serialutil.SerialException, FileNotFoundError):
        _LOGGER.exception("Your port is not accessible.")
        return False
@@ -4,56 +4,68 @@ Allow to setup simple automation rules via the config file.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/automation/
 """
+import asyncio
+from functools import partial
 import logging
+import os

 import voluptuous as vol

 from homeassistant.bootstrap import prepare_setup_platform
-from homeassistant.const import ATTR_ENTITY_ID, CONF_PLATFORM
+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)
 from homeassistant.components import logbook
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import extract_domain_configs, script, condition
+from homeassistant.helpers.entity import ToggleEntity
+from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.loader import get_platform
+from homeassistant.util.dt import utcnow
 import homeassistant.helpers.config_validation as cv
+from homeassistant.util.async import run_coroutine_threadsafe

 DOMAIN = 'automation'
+ENTITY_ID_FORMAT = DOMAIN + '.{}'

 DEPENDENCIES = ['group']

+GROUP_NAME_ALL_AUTOMATIONS = 'all automations'
+
 CONF_ALIAS = 'alias'
+CONF_HIDE_ENTITY = 'hide_entity'

 CONF_CONDITION = 'condition'
 CONF_ACTION = 'action'
 CONF_TRIGGER = 'trigger'
 CONF_CONDITION_TYPE = 'condition_type'
+CONF_INITIAL_STATE = 'initial_state'

 CONDITION_USE_TRIGGER_VALUES = 'use_trigger_values'
 CONDITION_TYPE_AND = 'and'
 CONDITION_TYPE_OR = 'or'

 DEFAULT_CONDITION_TYPE = CONDITION_TYPE_AND
+DEFAULT_HIDE_ENTITY = False
+DEFAULT_INITIAL_STATE = True

-METHOD_TRIGGER = 'trigger'
-METHOD_IF_ACTION = 'if_action'
+ATTR_LAST_TRIGGERED = 'last_triggered'
+ATTR_VARIABLES = 'variables'
+SERVICE_TRIGGER = 'trigger'
+SERVICE_RELOAD = 'reload'

 _LOGGER = logging.getLogger(__name__)


-def _platform_validator(method, schema):
-    """Generate platform validator for different steps."""
-    def validator(config):
-        """Validate it is a valid  platform."""
-        platform = get_platform(DOMAIN, config[CONF_PLATFORM])
+def _platform_validator(config):
+    """Validate it is a valid  platform."""
+    platform = get_platform(DOMAIN, config[CONF_PLATFORM])

-        if not hasattr(platform, method):
-            raise vol.Invalid('invalid method platform')
+    if not hasattr(platform, 'TRIGGER_SCHEMA'):
+        return config

-        if not hasattr(platform, schema):
-            return config
-
-        return getattr(platform, schema)(config)
-
-    return validator
+    return getattr(platform, 'TRIGGER_SCHEMA')(config)

 _TRIGGER_SCHEMA = vol.All(
    cv.ensure_list,
@@ -62,160 +74,347 @@ _TRIGGER_SCHEMA = vol.All(
            vol.Schema({
                vol.Required(CONF_PLATFORM): cv.platform_validator(DOMAIN)
            }, extra=vol.ALLOW_EXTRA),
-            _platform_validator(METHOD_TRIGGER, 'TRIGGER_SCHEMA')
+            _platform_validator
        ),
    ]
 )

-_CONDITION_SCHEMA = vol.Any(
-    CONDITION_USE_TRIGGER_VALUES,
-    vol.All(
-        cv.ensure_list,
-        [
-            vol.All(
-                vol.Schema({
-                    CONF_PLATFORM: str,
-                    CONF_CONDITION: str,
-                }, extra=vol.ALLOW_EXTRA),
-                cv.has_at_least_one_key(CONF_PLATFORM, CONF_CONDITION),
-            ),
-        ]
-    )
-)
+_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_HIDE_ENTITY, default=DEFAULT_HIDE_ENTITY): cv.boolean,
    vol.Required(CONF_TRIGGER): _TRIGGER_SCHEMA,
-    vol.Required(CONF_CONDITION_TYPE, default=DEFAULT_CONDITION_TYPE):
-        vol.All(vol.Lower, vol.Any(CONDITION_TYPE_AND, CONDITION_TYPE_OR)),
-    CONF_CONDITION: _CONDITION_SCHEMA,
+    vol.Optional(CONF_CONDITION): _CONDITION_SCHEMA,
    vol.Required(CONF_ACTION): cv.SCRIPT_SCHEMA,
 })

+SERVICE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+})
+
+TRIGGER_SERVICE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_VARIABLES, default={}): dict,
+})
+
+RELOAD_SERVICE_SCHEMA = vol.Schema({})
+
+
+def is_on(hass, entity_id=None):
+    """
+    Return true if specified automation entity_id is on.
+
+    Check all automation if no entity_id specified.
+    """
+    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)
+
+
+def turn_on(hass, entity_id=None):
+    """Turn on specified automation or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
+
+
+def turn_off(hass, entity_id=None):
+    """Turn off specified automation or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
+
+
+def toggle(hass, entity_id=None):
+    """Toggle specified automation or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
+
+
+def trigger(hass, entity_id=None):
+    """Trigger specified automation or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TRIGGER, data)
+
+
+def reload(hass):
+    """Reload the automation from config."""
+    hass.services.call(DOMAIN, SERVICE_RELOAD)
+

 def setup(hass, config):
    """Setup the automation."""
-    success = False
+    component = EntityComponent(_LOGGER, DOMAIN, hass,
+                                group_name=GROUP_NAME_ALL_AUTOMATIONS)
+
+    success = run_coroutine_threadsafe(
+        _async_process_config(hass, config, component), hass.loop).result()
+
+    if not success:
+        return False
+
+    descriptions = conf_util.load_yaml_config_file(
+        os.path.join(os.path.dirname(__file__), 'services.yaml'))
+
+    @asyncio.coroutine
+    def trigger_service_handler(service_call):
+        """Handle automation triggers."""
+        for entity in component.extract_from_service(service_call):
+            hass.loop.create_task(entity.async_trigger(
+                service_call.data.get(ATTR_VARIABLES), True))
+
+    @asyncio.coroutine
+    def turn_onoff_service_handler(service_call):
+        """Handle automation turn on/off service calls."""
+        method = 'async_{}'.format(service_call.service)
+        for entity in component.extract_from_service(service_call):
+            hass.loop.create_task(getattr(entity, method)())
+
+    @asyncio.coroutine
+    def toggle_service_handler(service_call):
+        """Handle automation toggle service calls."""
+        for entity in component.extract_from_service(service_call):
+            if entity.is_on:
+                hass.loop.create_task(entity.async_turn_off())
+            else:
+                hass.loop.create_task(entity.async_turn_on())
+
+    @asyncio.coroutine
+    def reload_service_handler(service_call):
+        """Remove all automations and load new ones from config."""
+        conf = yield from hass.loop.run_in_executor(
+            None, component.prepare_reload)
+        if conf is None:
+            return
+        hass.loop.create_task(_async_process_config(hass, conf, component))
+
+    hass.services.register(DOMAIN, SERVICE_TRIGGER, trigger_service_handler,
+                           descriptions.get(SERVICE_TRIGGER),
+                           schema=TRIGGER_SERVICE_SCHEMA)
+
+    hass.services.register(DOMAIN, SERVICE_RELOAD, reload_service_handler,
+                           descriptions.get(SERVICE_RELOAD),
+                           schema=RELOAD_SERVICE_SCHEMA)
+
+    hass.services.register(DOMAIN, SERVICE_TOGGLE, toggle_service_handler,
+                           descriptions.get(SERVICE_TOGGLE),
+                           schema=SERVICE_SCHEMA)
+
+    for service in (SERVICE_TURN_ON, SERVICE_TURN_OFF):
+        hass.services.register(DOMAIN, service, turn_onoff_service_handler,
+                               descriptions.get(service),
+                               schema=SERVICE_SCHEMA)
+
+    return True
+
+
+class AutomationEntity(ToggleEntity):
+    """Entity to show status of entity."""
+
+    # pylint: disable=abstract-method
+    # pylint: disable=too-many-arguments, too-many-instance-attributes
+    def __init__(self, name, async_attach_triggers, cond_func, async_action,
+                 hidden):
+        """Initialize an automation entity."""
+        self._name = name
+        self._async_attach_triggers = async_attach_triggers
+        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
+
+    @property
+    def name(self):
+        """Name of the automation."""
+        return self._name
+
+    @property
+    def should_poll(self):
+        """No polling needed for automation entities."""
+        return False
+
+    @property
+    def state_attributes(self):
+        """Return the entity state attributes."""
+        return {
+            ATTR_LAST_TRIGGERED: self._last_triggered
+        }
+
+    @property
+    def hidden(self) -> bool:
+        """Return True if the automation entity should be hidden from UIs."""
+        return self._hidden
+
+    @property
+    def is_on(self) -> bool:
+        """Return True if entity is on."""
+        return self._enabled
+
+    @asyncio.coroutine
+    def async_turn_on(self, **kwargs) -> None:
+        """Turn the entity on and update the state."""
+        if self._enabled:
+            return
+
+        yield from self.async_enable()
+        self.hass.loop.create_task(self.async_update_ha_state())
+
+    @asyncio.coroutine
+    def async_turn_off(self, **kwargs) -> None:
+        """Turn the entity off."""
+        if not self._enabled:
+            return
+
+        self._async_detach_triggers()
+        self._async_detach_triggers = None
+        self._enabled = False
+        self.hass.loop.create_task(self.async_update_ha_state())
+
+    @asyncio.coroutine
+    def async_trigger(self, variables, skip_condition=False):
+        """Trigger automation.
+
+        This method is a coroutine.
+        """
+        if skip_condition or self._cond_func(variables):
+            yield from self._async_action(variables)
+            self._last_triggered = utcnow()
+            self.hass.loop.create_task(self.async_update_ha_state())
+
+    def remove(self):
+        """Remove automation from HASS."""
+        run_coroutine_threadsafe(self.async_turn_off(),
+                                 self.hass.loop).result()
+        super().remove()
+
+    @asyncio.coroutine
+    def async_enable(self):
+        """Enable this automation entity.
+
+        This method is a coroutine.
+        """
+        if self._enabled:
+            return
+
+        self._async_detach_triggers = yield from self._async_attach_triggers(
+            self.async_trigger)
+        self._enabled = True
+
+
+@asyncio.coroutine
+def _async_process_config(hass, config, component):
+    """Process config and add automations.
+
+    This method is a coroutine.
+    """
+    entities = []
+    tasks = []
+
    for config_key in extract_domain_configs(config, DOMAIN):
        conf = config[config_key]

        for list_no, config_block in enumerate(conf):
-            name = config_block.get(CONF_ALIAS, "{}, {}".format(config_key,
-                                                                list_no))
-            success = (_setup_automation(hass, config_block, name, config) or
-                       success)
+            name = config_block.get(CONF_ALIAS) or "{} {}".format(config_key,
+                                                                  list_no)

-    return success
+            hidden = config_block[CONF_HIDE_ENTITY]
+
+            action = _async_get_action(hass, config_block.get(CONF_ACTION, {}),
+                                       name)
+
+            if CONF_CONDITION in config_block:
+                cond_func = _async_process_if(hass, config, config_block)
+
+                if cond_func is None:
+                    continue
+            else:
+                def cond_func(variables):
+                    """Condition will always pass."""
+                    return True
+
+            async_attach_triggers = partial(
+                _async_process_trigger, hass, config,
+                config_block.get(CONF_TRIGGER, []), name)
+            entity = AutomationEntity(name, async_attach_triggers, cond_func,
+                                      action, hidden)
+            if config_block[CONF_INITIAL_STATE]:
+                tasks.append(hass.loop.create_task(entity.async_enable()))
+            entities.append(entity)
+
+    yield from asyncio.gather(*tasks, loop=hass.loop)
+    yield from hass.loop.run_in_executor(
+        None, component.add_entities, entities)
+
+    return len(entities) > 0


-def _setup_automation(hass, config_block, name, config):
-    """Setup one instance of automation."""
-    action = _get_action(hass, config_block.get(CONF_ACTION, {}), name)
-
-    if CONF_CONDITION in config_block:
-        action = _process_if(hass, config, config_block, action)
-
-        if action is None:
-            return False
-
-    _process_trigger(hass, config, config_block.get(CONF_TRIGGER, []), name,
-                     action)
-    return True
-
-
-def _get_action(hass, config, name):
+def _async_get_action(hass, config, name):
    """Return an action based on a configuration."""
    script_obj = script.Script(hass, config, name)

+    @asyncio.coroutine
    def action(variables=None):
        """Action to be executed."""
        _LOGGER.info('Executing %s', name)
-        logbook.log_entry(hass, name, 'has been triggered', DOMAIN)
-        script_obj.run(variables)
+        logbook.async_log_entry(hass, name, 'has been triggered', DOMAIN)
+        hass.loop.create_task(script_obj.async_run(variables))

    return action


-def _process_if(hass, config, p_config, action):
+def _async_process_if(hass, config, p_config):
    """Process if checks."""
-    cond_type = p_config.get(CONF_CONDITION_TYPE,
-                             DEFAULT_CONDITION_TYPE).lower()
-
-    # Deprecated since 0.19 - 5/5/2016
-    if cond_type != DEFAULT_CONDITION_TYPE:
-        _LOGGER.warning('Using condition_type: "or" is deprecated. Please use '
-                        '"condition: or" instead.')
-
    if_configs = p_config.get(CONF_CONDITION)
-    use_trigger = if_configs == CONDITION_USE_TRIGGER_VALUES
-
-    if use_trigger:
-        if_configs = p_config[CONF_TRIGGER]

    checks = []
    for if_config in if_configs:
-        # Deprecated except for used by use_trigger_values
-        # since 0.19 - 5/5/2016
-        if CONF_PLATFORM in if_config:
-            if not use_trigger:
-                _LOGGER.warning("Please switch your condition configuration "
-                                "to use 'condition' instead of 'platform'.")
-            if_config = dict(if_config)
-            if_config[CONF_CONDITION] = if_config.pop(CONF_PLATFORM)
-
-            # To support use_trigger_values with state trigger accepting
-            # multiple entity_ids to monitor.
-            if_entity_id = if_config.get(ATTR_ENTITY_ID)
-            if isinstance(if_entity_id, list) and len(if_entity_id) == 1:
-                if_config[ATTR_ENTITY_ID] = if_entity_id[0]
-
        try:
-            checks.append(condition.from_config(if_config))
+            checks.append(condition.async_from_config(if_config, False))
        except HomeAssistantError as ex:
-            # Invalid conditions are allowed if we base it on trigger
-            if use_trigger:
-                _LOGGER.warning('Ignoring invalid condition: %s', ex)
-            else:
-                _LOGGER.warning('Invalid condition: %s', ex)
-                return None
+            _LOGGER.warning('Invalid condition: %s', ex)
+            return None

-    if cond_type == CONDITION_TYPE_AND:
-        def if_action(variables=None):
-            """AND all conditions."""
-            if all(check(hass, variables) for check in checks):
-                action(variables)
-    else:
-        def if_action(variables=None):
-            """OR all conditions."""
-            if any(check(hass, variables) for check in checks):
-                action(variables)
+    def if_action(variables=None):
+        """AND all conditions."""
+        return all(check(hass, variables) for check in checks)

    return if_action


-def _process_trigger(hass, config, trigger_configs, name, action):
-    """Setup the triggers."""
+@asyncio.coroutine
+def _async_process_trigger(hass, config, trigger_configs, name, action):
+    """Setup the triggers.
+
+    This method is a coroutine.
+    """
+    removes = []
+
    for conf in trigger_configs:
-        platform = _resolve_platform(METHOD_TRIGGER, hass, config,
-                                     conf.get(CONF_PLATFORM))
+        platform = yield from hass.loop.run_in_executor(
+            None, prepare_setup_platform, hass, config, DOMAIN,
+            conf.get(CONF_PLATFORM))
+
        if platform is None:
+            return None
+
+        remove = platform.async_trigger(hass, conf, action)
+
+        if not remove:
+            _LOGGER.error("Error setting up trigger %s", name)
            continue

-        if platform.trigger(hass, conf, action):
-            _LOGGER.info("Initialized rule %s", name)
-        else:
-            _LOGGER.error("Error setting up rule %s", name)
+        _LOGGER.info("Initialized trigger %s", name)
+        removes.append(remove)

-
-def _resolve_platform(method, hass, config, platform):
-    """Find the automation platform."""
-    if platform is None:
-        return None
-    platform = prepare_setup_platform(hass, config, DOMAIN, platform)
-
-    if platform is None or not hasattr(platform, method):
-        _LOGGER.error("Unknown automation platform specified for %s: %s",
-                      method, platform)
+    if not removes:
        return None

-    return platform
+    def remove_triggers():
+        """Remove attached triggers."""
+        for remove in removes:
+            remove()
+
+    return remove_triggers
@@ -8,6 +8,7 @@ import logging

 import voluptuous as vol

+from homeassistant.core import callback
 from homeassistant.const import CONF_PLATFORM
 from homeassistant.helpers import config_validation as cv

@@ -23,21 +24,21 @@ TRIGGER_SCHEMA = vol.Schema({
 })


-def trigger(hass, config, action):
+def async_trigger(hass, config, action):
    """Listen for events based on configuration."""
    event_type = config.get(CONF_EVENT_TYPE)
    event_data = config.get(CONF_EVENT_DATA)

+    @callback
    def handle_event(event):
        """Listen for events and calls the action when data matches."""
        if not event_data or all(val == event.data.get(key) for key, val
                                 in event_data.items()):
-            action({
+            hass.async_run_job(action, {
                'trigger': {
                    'platform': 'event',
                    'event': event,
                },
            })

-    hass.bus.listen(event_type, handle_event)
-    return True
+    return hass.bus.async_listen(event_type, handle_event)
@@ -6,14 +6,14 @@ at https://home-assistant.io/components/automation/#mqtt-trigger
 """
 import voluptuous as vol

+from homeassistant.core import callback
 import homeassistant.components.mqtt as mqtt
-from homeassistant.const import CONF_PLATFORM
+from homeassistant.const import (CONF_PLATFORM, CONF_PAYLOAD)
 import homeassistant.helpers.config_validation as cv

 DEPENDENCIES = ['mqtt']

 CONF_TOPIC = 'topic'
-CONF_PAYLOAD = 'payload'

 TRIGGER_SCHEMA = vol.Schema({
    vol.Required(CONF_PLATFORM): mqtt.DOMAIN,
@@ -22,15 +22,16 @@ TRIGGER_SCHEMA = vol.Schema({
 })


-def trigger(hass, config, action):
+def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
-    topic = config[CONF_TOPIC]
+    topic = config.get(CONF_TOPIC)
    payload = config.get(CONF_PAYLOAD)

+    @callback
    def mqtt_automation_listener(msg_topic, msg_payload, qos):
        """Listen for MQTT messages."""
        if payload is None or payload == msg_payload:
-            action({
+            hass.async_run_job(action, {
                'trigger': {
                    'platform': 'mqtt',
                    'topic': msg_topic,
@@ -39,6 +40,4 @@ def trigger(hass, config, action):
                }
            })

-    mqtt.subscribe(hass, topic, mqtt_automation_listener)
-
-    return True
+    return mqtt.async_subscribe(hass, topic, mqtt_automation_listener)
@@ -8,10 +8,11 @@ import logging

 import voluptuous as vol

+from homeassistant.core import callback
 from homeassistant.const import (
    CONF_VALUE_TEMPLATE, CONF_PLATFORM, CONF_ENTITY_ID,
    CONF_BELOW, CONF_ABOVE)
-from homeassistant.helpers.event import track_state_change
+from homeassistant.helpers.event import async_track_state_change
 from homeassistant.helpers import condition, config_validation as cv

 TRIGGER_SCHEMA = vol.All(vol.Schema({
@@ -25,14 +26,16 @@ TRIGGER_SCHEMA = vol.All(vol.Schema({
 _LOGGER = logging.getLogger(__name__)


-def trigger(hass, config, action):
+def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    entity_id = config.get(CONF_ENTITY_ID)
    below = config.get(CONF_BELOW)
    above = config.get(CONF_ABOVE)
    value_template = config.get(CONF_VALUE_TEMPLATE)
+    if value_template is not None:
+        value_template.hass = hass

-    # pylint: disable=unused-argument
+    @callback
    def state_automation_listener(entity, from_s, to_s):
        """Listen for state changes and calls action."""
        if to_s is None:
@@ -48,22 +51,19 @@ def trigger(hass, config, action):
        }

        # If new one doesn't match, nothing to do
-        if not condition.numeric_state(
+        if not condition.async_numeric_state(
                hass, to_s, below, above, value_template, variables):
            return

        # Only match if old didn't exist or existed but didn't match
        # Written as: skip if old one did exist and matched
-        if from_s is not None and condition.numeric_state(
+        if from_s is not None and condition.async_numeric_state(
                hass, from_s, below, above, value_template, variables):
            return

        variables['trigger']['from_state'] = from_s
        variables['trigger']['to_state'] = to_s

-        action(variables)
+        hass.async_run_job(action, variables)

-    track_state_change(
-        hass, entity_id, state_automation_listener)
-
-    return True
+    return async_track_state_change(hass, entity_id, state_automation_listener)
@@ -0,0 +1,34 @@
+turn_on:
+  description: Enable an automation.
+
+  fields:
+    entity_id:
+      description: Name of the automation to turn on.
+      example: 'automation.notify_home'
+
+turn_off:
+  description: Disable an automation.
+
+  fields:
+    entity_id:
+      description: Name of the automation to turn off.
+      example: 'automation.notify_home'
+
+toggle:
+  description: Toggle an automation.
+
+  fields:
+    entity_id:
+      description: Name of the automation to toggle on/off.
+      example: 'automation.notify_home'
+
+trigger:
+  description: Trigger the action of an automation.
+
+  fields:
+    entity_id:
+      description: Name of the automation to trigger.
+      example: 'automation.notify_home'
+
+reload:
+  description: Reload the automation configuration.
@@ -6,10 +6,11 @@ at https://home-assistant.io/components/automation/#state-trigger
 """
 import voluptuous as vol

+from homeassistant.core import callback
 import homeassistant.util.dt as dt_util
-from homeassistant.const import (
-    EVENT_STATE_CHANGED, EVENT_TIME_CHANGED, MATCH_ALL, CONF_PLATFORM)
-from homeassistant.helpers.event import track_state_change, track_point_in_time
+from homeassistant.const import MATCH_ALL, CONF_PLATFORM
+from homeassistant.helpers.event import (
+    async_track_state_change, async_track_point_in_utc_time)
 import homeassistant.helpers.config_validation as cv

 CONF_ENTITY_ID = "entity_id"
@@ -33,18 +34,23 @@ TRIGGER_SCHEMA = vol.All(
 )


-def trigger(hass, config, action):
+def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    entity_id = config.get(CONF_ENTITY_ID)
    from_state = config.get(CONF_FROM, MATCH_ALL)
    to_state = config.get(CONF_TO) or config.get(CONF_STATE) or MATCH_ALL
    time_delta = config.get(CONF_FOR)
+    async_remove_state_for_cancel = None
+    async_remove_state_for_listener = None

+    @callback
    def state_automation_listener(entity, from_s, to_s):
        """Listen for state changes and calls action."""
+        nonlocal async_remove_state_for_cancel, async_remove_state_for_listener
+
        def call_action():
            """Call action with right context."""
-            action({
+            hass.async_run_job(action, {
                'trigger': {
                    'platform': 'state',
                    'entity_id': entity,
@@ -58,28 +64,37 @@ def trigger(hass, config, action):
            call_action()
            return

+        @callback
        def state_for_listener(now):
            """Fire on state changes after a delay and calls action."""
-            hass.bus.remove_listener(
-                EVENT_STATE_CHANGED, attached_state_for_cancel)
+            async_remove_state_for_cancel()
            call_action()

+        @callback
        def state_for_cancel_listener(entity, inner_from_s, inner_to_s):
            """Fire on changes and cancel for listener if changed."""
            if inner_to_s.state == to_s.state:
                return
-            hass.bus.remove_listener(EVENT_TIME_CHANGED,
-                                     attached_state_for_listener)
-            hass.bus.remove_listener(EVENT_STATE_CHANGED,
-                                     attached_state_for_cancel)
+            async_remove_state_for_listener()
+            async_remove_state_for_cancel()

-        attached_state_for_listener = track_point_in_time(
+        async_remove_state_for_listener = async_track_point_in_utc_time(
            hass, state_for_listener, dt_util.utcnow() + time_delta)

-        attached_state_for_cancel = track_state_change(
+        async_remove_state_for_cancel = async_track_state_change(
            hass, entity, state_for_cancel_listener)

-    track_state_change(
+    unsub = async_track_state_change(
        hass, entity_id, state_automation_listener, from_state, to_state)

-    return True
+    def async_remove():
+        """Remove state listeners async."""
+        unsub()
+        # pylint: disable=not-callable
+        if async_remove_state_for_cancel is not None:
+            async_remove_state_for_cancel()
+
+        if async_remove_state_for_listener is not None:
+            async_remove_state_for_listener()
+
+    return async_remove
@@ -9,9 +9,10 @@ import logging

 import voluptuous as vol

+from homeassistant.core import callback
 from homeassistant.const import (
    CONF_EVENT, CONF_OFFSET, CONF_PLATFORM, SUN_EVENT_SUNRISE)
-from homeassistant.helpers.event import track_sunrise, track_sunset
+from homeassistant.helpers.event import async_track_sunrise, async_track_sunset
 import homeassistant.helpers.config_validation as cv

 DEPENDENCIES = ['sun']
@@ -25,14 +26,15 @@ TRIGGER_SCHEMA = vol.Schema({
 })


-def trigger(hass, config, action):
+def async_trigger(hass, config, action):
    """Listen for events based on configuration."""
    event = config.get(CONF_EVENT)
    offset = config.get(CONF_OFFSET)

+    @callback
    def call_action():
        """Call action with right context."""
-        action({
+        hass.async_run_job(action, {
            'trigger': {
                'platform': 'sun',
                'event': event,
@@ -42,8 +44,6 @@ def trigger(hass, config, action):

    # Do something to call action
    if event == SUN_EVENT_SUNRISE:
-        track_sunrise(hass, call_action, offset)
+        return async_track_sunrise(hass, call_action, offset)
    else:
-        track_sunset(hass, call_action, offset)
-
-    return True
+        return async_track_sunset(hass, call_action, offset)
@@ -8,10 +8,10 @@ import logging

 import voluptuous as vol

-from homeassistant.const import (
-    CONF_VALUE_TEMPLATE, CONF_PLATFORM, MATCH_ALL)
+from homeassistant.core import callback
+from homeassistant.const import CONF_VALUE_TEMPLATE, CONF_PLATFORM
 from homeassistant.helpers import condition
-from homeassistant.helpers.event import track_state_change
+from homeassistant.helpers.event import async_track_state_change
 import homeassistant.helpers.config_validation as cv


@@ -23,22 +23,24 @@ TRIGGER_SCHEMA = IF_ACTION_SCHEMA = vol.Schema({
 })


-def trigger(hass, config, action):
+def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    value_template = config.get(CONF_VALUE_TEMPLATE)
+    value_template.hass = hass

    # Local variable to keep track of if the action has already been triggered
    already_triggered = False

+    @callback
    def state_changed_listener(entity_id, from_s, to_s):
        """Listen for state changes and calls action."""
        nonlocal already_triggered
-        template_result = condition.template(hass, value_template)
+        template_result = condition.async_template(hass, value_template)

        # Check to see if template returns true
        if template_result and not already_triggered:
            already_triggered = True
-            action({
+            hass.async_run_job(action, {
                'trigger': {
                    'platform': 'template',
                    'entity_id': entity_id,
@@ -49,5 +51,5 @@ def trigger(hass, config, action):
        elif not template_result:
            already_triggered = False

-    track_state_change(hass, MATCH_ALL, state_changed_listener)
-    return True
+    return async_track_state_change(hass, value_template.extract_entities(),
+                                    state_changed_listener)
@@ -8,9 +8,10 @@ import logging

 import voluptuous as vol

+from homeassistant.core import callback
 from homeassistant.const import CONF_AFTER, CONF_PLATFORM
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.event import track_time_change
+from homeassistant.helpers.event import async_track_time_change

 CONF_HOURS = "hours"
 CONF_MINUTES = "minutes"
@@ -28,7 +29,7 @@ TRIGGER_SCHEMA = vol.All(vol.Schema({
                            CONF_SECONDS, CONF_AFTER))


-def trigger(hass, config, action):
+def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    if CONF_AFTER in config:
        after = config.get(CONF_AFTER)
@@ -38,16 +39,15 @@ def trigger(hass, config, action):
        minutes = config.get(CONF_MINUTES)
        seconds = config.get(CONF_SECONDS)

+    @callback
    def time_automation_listener(now):
        """Listen for time changes and calls action."""
-        action({
+        hass.async_run_job(action, {
            'trigger': {
                'platform': 'time',
                'now': now,
            },
        })

-    track_time_change(hass, time_automation_listener,
-                      hour=hours, minute=minutes, second=seconds)
-
-    return True
+    return async_track_time_change(hass, time_automation_listener,
+                                   hour=hours, minute=minutes, second=seconds)
@@ -6,9 +6,10 @@ at https://home-assistant.io/components/automation/#zone-trigger
 """
 import voluptuous as vol

+from homeassistant.core import callback
 from homeassistant.const import (
    CONF_EVENT, CONF_ENTITY_ID, CONF_ZONE, MATCH_ALL, CONF_PLATFORM)
-from homeassistant.helpers.event import track_state_change
+from homeassistant.helpers.event import async_track_state_change
 from homeassistant.helpers import (
    condition, config_validation as cv, location)

@@ -25,12 +26,13 @@ TRIGGER_SCHEMA = vol.Schema({
 })


-def trigger(hass, config, action):
+def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    entity_id = config.get(CONF_ENTITY_ID)
    zone_entity_id = config.get(CONF_ZONE)
    event = config.get(CONF_EVENT)

+    @callback
    def zone_automation_listener(entity, from_s, to_s):
        """Listen for state changes and calls action."""
        if from_s and not location.has_location(from_s) or \
@@ -47,7 +49,7 @@ def trigger(hass, config, action):
        # pylint: disable=too-many-boolean-expressions
        if event == EVENT_ENTER and not from_match and to_match or \
           event == EVENT_LEAVE and from_match and not to_match:
-            action({
+            hass.async_run_job(action, {
                'trigger': {
                    'platform': 'zone',
                    'entity_id': entity,
@@ -58,7 +60,5 @@ def trigger(hass, config, action):
                },
            })

-    track_state_change(
-        hass, entity_id, zone_automation_listener, MATCH_ALL, MATCH_ALL)
-
-    return True
+    return async_track_state_change(hass, entity_id, zone_automation_listener,
+                                    MATCH_ALL, MATCH_ALL)
@@ -6,6 +6,8 @@ https://home-assistant.io/components/binary_sensor/
 """
 import logging

+import voluptuous as vol
+
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.entity import Entity
 from homeassistant.const import (STATE_ON, STATE_OFF)
@@ -25,6 +27,7 @@ SENSOR_CLASSES = [
    'moisture',      # Specifically a wetness sensor
    'motion',        # Motion sensor
    'moving',        # On means moving, Off means stopped
+    'occupancy',     # On means occupied, Off means not occupied
    'opening',       # Door, window, etc.
    'power',         # Power, over-current, etc
    'safety',        # Generic on=unsafe, off=safe
@@ -33,6 +36,8 @@ SENSOR_CLASSES = [
    'vibration',     # On means vibration detected, Off means no vibration
 ]

+SENSOR_CLASSES_SCHEMA = vol.All(vol.Lower, vol.In(SENSOR_CLASSES))
+

 def setup(hass, config):
    """Track states and offer events for binary sensors."""
@@ -4,23 +4,32 @@ Support for tracking the online status of a UPS.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.apcupsd/
 """
-from homeassistant.components import apcupsd
-from homeassistant.components.binary_sensor import BinarySensorDevice
+import voluptuous as vol

+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.const import CONF_NAME
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components import apcupsd
+
+DEFAULT_NAME = 'UPS Online Status'
 DEPENDENCIES = [apcupsd.DOMAIN]
-DEFAULT_NAME = "UPS Online Status"
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})


 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Instantiate an OnlineStatus binary sensor entity."""
+    """Setup an Online Status binary sensor."""
    add_entities((OnlineStatus(config, apcupsd.DATA),))


 class OnlineStatus(BinarySensorDevice):
-    """Represent UPS online status."""
+    """Representation of an UPS online status."""

    def __init__(self, config, data):
-        """Initialize the APCUPSd device."""
+        """Initialize the APCUPSd binary device."""
        self._config = config
        self._data = data
        self._state = None
@@ -29,7 +38,7 @@ class OnlineStatus(BinarySensorDevice):
    @property
    def name(self):
        """Return the name of the UPS online status sensor."""
-        return self._config.get("name", DEFAULT_NAME)
+        return self._config.get(CONF_NAME)

    @property
    def is_on(self):
@@ -1,5 +1,5 @@
 """
-Support for exposed aREST RESTful API of a device.
+Support for an exposed aREST RESTful API of a device.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.arest/
@@ -8,34 +8,32 @@ import logging
 from datetime import timedelta

 import requests
+import voluptuous as vol

-from homeassistant.components.binary_sensor import (BinarySensorDevice,
-                                                    SENSOR_CLASSES)
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA, SENSOR_CLASSES_SCHEMA)
+from homeassistant.const import (
+    CONF_RESOURCE, CONF_PIN, CONF_NAME, CONF_SENSOR_CLASS)
 from homeassistant.util import Throttle
+import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

-# Return cached results if last scan was less then this time ago
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=30)

-CONF_RESOURCE = 'resource'
-CONF_PIN = 'pin'
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_RESOURCE): cv.url,
+    vol.Optional(CONF_NAME): cv.string,
+    vol.Required(CONF_PIN): cv.string,
+    vol.Optional(CONF_SENSOR_CLASS): SENSOR_CLASSES_SCHEMA,
+})


 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the aREST binary sensor."""
    resource = config.get(CONF_RESOURCE)
    pin = config.get(CONF_PIN)
-
-    sensor_class = config.get('sensor_class')
-    if sensor_class not in SENSOR_CLASSES:
-        _LOGGER.warning('Unknown sensor class: %s', sensor_class)
-        sensor_class = None
-
-    if None in (resource, pin):
-        _LOGGER.error('Not all required config keys present: %s',
-                      ', '.join((CONF_RESOURCE, CONF_PIN)))
-        return False
+    sensor_class = config.get(CONF_SENSOR_CLASS)

    try:
        response = requests.get(resource, timeout=10).json()
@@ -52,11 +50,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    arest = ArestData(resource, pin)

    add_devices([ArestBinarySensor(
-        arest,
-        resource,
-        config.get('name', response['name']),
-        sensor_class,
-        pin)])
+        arest, resource, config.get(CONF_NAME, response[CONF_NAME]),
+        sensor_class, pin)])


 # pylint: disable=too-many-instance-attributes, too-many-arguments
@@ -6,32 +6,39 @@ https://home-assistant.io/components/binary_sensor.bloomsky/
 """
 import logging

-from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.loader import get_component
+import voluptuous as vol

-DEPENDENCIES = ["bloomsky"]
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.const import CONF_MONITORED_CONDITIONS
+from homeassistant.loader import get_component
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['bloomsky']

 # These are the available sensors mapped to binary_sensor class
 SENSOR_TYPES = {
-    "Rain": "moisture",
-    "Night": None,
+    'Rain': 'moisture',
+    'Night': None,
 }

+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_MONITORED_CONDITIONS, default=SENSOR_TYPES):
+        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the available BloomSky weather binary sensors."""
-    logger = logging.getLogger(__name__)
    bloomsky = get_component('bloomsky')
-    sensors = config.get('monitored_conditions', SENSOR_TYPES)
+    # Default needed in case of discovery
+    sensors = config.get(CONF_MONITORED_CONDITIONS, SENSOR_TYPES)

    for device in bloomsky.BLOOMSKY.devices.values():
        for variable in sensors:
-            if variable in SENSOR_TYPES:
-                add_devices([BloomSkySensor(bloomsky.BLOOMSKY,
-                                            device,
-                                            variable)])
-            else:
-                logger.error("Cannot find definition for device: %s", variable)
+            add_devices([BloomSkySensor(bloomsky.BLOOMSKY, device, variable)])


 class BloomSkySensor(BinarySensorDevice):
@@ -40,10 +47,10 @@ class BloomSkySensor(BinarySensorDevice):
    def __init__(self, bs, device, sensor_name):
        """Initialize a BloomSky binary sensor."""
        self._bloomsky = bs
-        self._device_id = device["DeviceID"]
+        self._device_id = device['DeviceID']
        self._sensor_name = sensor_name
-        self._name = "{} {}".format(device["DeviceName"], sensor_name)
-        self._unique_id = "bloomsky_binary_sensor {}".format(self._name)
+        self._name = '{} {}'.format(device['DeviceName'], sensor_name)
+        self._unique_id = 'bloomsky_binary_sensor {}'.format(self._name)
        self.update()

    @property
@@ -71,4 +78,4 @@ class BloomSkySensor(BinarySensorDevice):
        self._bloomsky.refresh_devices()

        self._state = \
-            self._bloomsky.devices[self._device_id]["Data"][self._sensor_name]
+            self._bloomsky.devices[self._device_id]['Data'][self._sensor_name]
@@ -7,46 +7,50 @@ https://home-assistant.io/components/binary_sensor.command_line/
 import logging
 from datetime import timedelta

-from homeassistant.components.binary_sensor import (BinarySensorDevice,
-                                                    SENSOR_CLASSES)
+import voluptuous as vol
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, SENSOR_CLASSES_SCHEMA, PLATFORM_SCHEMA)
 from homeassistant.components.sensor.command_line import CommandSensorData
-from homeassistant.const import CONF_VALUE_TEMPLATE
-from homeassistant.helpers import template
+from homeassistant.const import (
+    CONF_PAYLOAD_OFF, CONF_PAYLOAD_ON, CONF_NAME, CONF_VALUE_TEMPLATE,
+    CONF_SENSOR_CLASS, CONF_COMMAND)
+import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

-DEFAULT_NAME = "Binary Command Sensor"
-DEFAULT_SENSOR_CLASS = None
+DEFAULT_NAME = 'Binary Command Sensor'
 DEFAULT_PAYLOAD_ON = 'ON'
 DEFAULT_PAYLOAD_OFF = 'OFF'

-# Return cached results if last scan was less then this time ago
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)

+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_COMMAND): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
+    vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
+    vol.Optional(CONF_SENSOR_CLASS): SENSOR_CLASSES_SCHEMA,
+    vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+})
+

 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup the Command Sensor."""
-    if config.get('command') is None:
-        _LOGGER.error('Missing required variable: "command"')
-        return False
-
-    sensor_class = config.get('sensor_class')
-    if sensor_class not in SENSOR_CLASSES:
-        _LOGGER.warning('Unknown sensor class: %s', sensor_class)
-        sensor_class = DEFAULT_SENSOR_CLASS
-
-    data = CommandSensorData(config.get('command'))
+    """Setup the Command line Binary Sensor."""
+    name = config.get(CONF_NAME)
+    command = config.get(CONF_COMMAND)
+    payload_off = config.get(CONF_PAYLOAD_OFF)
+    payload_on = config.get(CONF_PAYLOAD_ON)
+    sensor_class = config.get(CONF_SENSOR_CLASS)
+    value_template = config.get(CONF_VALUE_TEMPLATE)
+    if value_template is not None:
+        value_template.hass = hass
+    data = CommandSensorData(command)

    add_devices([CommandBinarySensor(
-        hass,
-        data,
-        config.get('name', DEFAULT_NAME),
-        sensor_class,
-        config.get('payload_on', DEFAULT_PAYLOAD_ON),
-        config.get('payload_off', DEFAULT_PAYLOAD_OFF),
-        config.get(CONF_VALUE_TEMPLATE)
-    )])
+        hass, data, name, sensor_class, payload_on, payload_off,
+        value_template)])


 # pylint: disable=too-many-arguments, too-many-instance-attributes
@@ -87,8 +91,8 @@ class CommandBinarySensor(BinarySensorDevice):
        value = self.data.value

        if self._value_template is not None:
-            value = template.render_with_possible_json_value(
-                self._hass, self._value_template, value, False)
+            value = self._value_template.render_with_possible_json_value(
+                value, False)
        if value == self._payload_on:
            self._state = True
        elif value == self._payload_off:
@@ -0,0 +1,91 @@
+"""
+Support for monitoring the state of Digital Ocean droplets.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.digital_ocean/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.components.digital_ocean import (
+    CONF_DROPLETS, ATTR_CREATED_AT, ATTR_DROPLET_ID, ATTR_DROPLET_NAME,
+    ATTR_FEATURES, ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, ATTR_MEMORY,
+    ATTR_REGION, ATTR_VCPUS)
+from homeassistant.loader import get_component
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'Droplet'
+DEFAULT_SENSOR_CLASS = 'motion'
+DEPENDENCIES = ['digital_ocean']
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_DROPLETS): vol.All(cv.ensure_list, [cv.string]),
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Digital Ocean droplet sensor."""
+    digital_ocean = get_component('digital_ocean')
+    droplets = config.get(CONF_DROPLETS)
+
+    dev = []
+    for droplet in droplets:
+        droplet_id = digital_ocean.DIGITAL_OCEAN.get_droplet_id(droplet)
+        dev.append(DigitalOceanBinarySensor(
+            digital_ocean.DIGITAL_OCEAN, droplet_id))
+
+    add_devices(dev)
+
+
+class DigitalOceanBinarySensor(BinarySensorDevice):
+    """Representation of a Digital Ocean droplet sensor."""
+
+    def __init__(self, do, droplet_id):
+        """Initialize a new Digital Ocean sensor."""
+        self._digital_ocean = do
+        self._droplet_id = droplet_id
+        self._state = None
+        self.update()
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self.data.name
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self.data.status == 'active'
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor."""
+        return DEFAULT_SENSOR_CLASS
+
+    @property
+    def state_attributes(self):
+        """Return the state attributes of the Digital Ocean droplet."""
+        return {
+            ATTR_CREATED_AT: self.data.created_at,
+            ATTR_DROPLET_ID: self.data.id,
+            ATTR_DROPLET_NAME: self.data.name,
+            ATTR_FEATURES: self.data.features,
+            ATTR_IPV4_ADDRESS: self.data.ip_address,
+            ATTR_IPV6_ADDRESS: self.data.ip_v6_address,
+            ATTR_MEMORY: self.data.memory,
+            ATTR_REGION: self.data.region['name'],
+            ATTR_VCPUS: self.data.vcpus,
+        }
+
+    def update(self):
+        """Update state of sensor."""
+        self._digital_ocean.update()
+
+        for droplet in self._digital_ocean.data:
+            if droplet.id == self._droplet_id:
+                self.data = droplet
@@ -0,0 +1,72 @@
+"""
+Support for Ecobee sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.ecobee/
+"""
+from homeassistant.components import ecobee
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+DEPENDENCIES = ['ecobee']
+
+ECOBEE_CONFIG_FILE = 'ecobee.conf'
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Ecobee sensors."""
+    if discovery_info is None:
+        return
+    data = ecobee.NETWORK
+    dev = list()
+    for index in range(len(data.ecobee.thermostats)):
+        for sensor in data.ecobee.get_remote_sensors(index):
+            for item in sensor['capability']:
+                if item['type'] != 'occupancy':
+                    continue
+
+                dev.append(EcobeeBinarySensor(sensor['name'], index))
+
+    add_devices(dev)
+
+
+class EcobeeBinarySensor(BinarySensorDevice):
+    """Representation of an Ecobee sensor."""
+
+    def __init__(self, sensor_name, sensor_index):
+        """Initialize the sensor."""
+        self._name = sensor_name + ' Occupancy'
+        self.sensor_name = sensor_name
+        self.index = sensor_index
+        self._state = None
+        self._sensor_class = 'occupancy'
+        self.update()
+
+    @property
+    def name(self):
+        """Return the name of the Ecobee sensor."""
+        return self._name.rstrip()
+
+    @property
+    def is_on(self):
+        """Return the status of the sensor."""
+        return self._state == 'true'
+
+    @property
+    def unique_id(self):
+        """Return the unique ID of this sensor."""
+        return "binary_sensor_ecobee_{}_{}".format(self._name, self.index)
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return self._sensor_class
+
+    def update(self):
+        """Get the latest state of the sensor."""
+        data = ecobee.NETWORK
+        data.update()
+        for sensor in data.ecobee.get_remote_sensors(self.index):
+            for item in sensor['capability']:
+                if (item['type'] == 'occupancy' and
+                        self.sensor_name == sensor['name']):
+                    self._state = item['value']
@@ -4,27 +4,41 @@ Support for EnOcean binary sensors.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.enocean/
 """
+import logging

-from homeassistant.components.binary_sensor import BinarySensorDevice
+import voluptuous as vol
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA, SENSOR_CLASSES_SCHEMA)
 from homeassistant.components import enocean
-from homeassistant.const import CONF_NAME
+from homeassistant.const import (CONF_NAME, CONF_ID, CONF_SENSOR_CLASS)
+import homeassistant.helpers.config_validation as cv

-DEPENDENCIES = ["enocean"]
+_LOGGER = logging.getLogger(__name__)

-CONF_ID = "id"
+DEPENDENCIES = ['enocean']
+DEFAULT_NAME = 'EnOcean binary sensor'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_ID): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_SENSOR_CLASS, default=None): SENSOR_CLASSES_SCHEMA,
+})


 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Binary Sensor platform fo EnOcean."""
-    dev_id = config.get(CONF_ID, None)
-    devname = config.get(CONF_NAME, "EnOcean binary sensor")
-    add_devices([EnOceanBinarySensor(dev_id, devname)])
+    dev_id = config.get(CONF_ID)
+    devname = config.get(CONF_NAME)
+    sensor_class = config.get(CONF_SENSOR_CLASS)
+
+    add_devices([EnOceanBinarySensor(dev_id, devname, sensor_class)])


 class EnOceanBinarySensor(enocean.EnOceanDevice, BinarySensorDevice):
    """Representation of EnOcean binary sensors such as wall switches."""

-    def __init__(self, dev_id, devname):
+    def __init__(self, dev_id, devname, sensor_class):
        """Initialize the EnOcean binary sensor."""
        enocean.EnOceanDevice.__init__(self)
        self.stype = "listener"
@@ -32,12 +46,18 @@ class EnOceanBinarySensor(enocean.EnOceanDevice, BinarySensorDevice):
        self.which = -1
        self.onoff = -1
        self.devname = devname
+        self._sensor_class = sensor_class

    @property
    def name(self):
        """The default name for the binary sensor."""
        return self.devname

+    @property
+    def sensor_class(self):
+        """Return the class of this sensor."""
+        return self._sensor_class
+
    def value_changed(self, value, value2):
        """Fire an event with the data that have changed.

@@ -68,4 +68,4 @@ class EnvisalinkBinarySensor(EnvisalinkDevice, BinarySensorDevice):
    def _update_callback(self, zone):
        """Update the zone's state, if needed."""
        if zone is None or int(zone) == self._zone_number:
-            self.update_ha_state()
+            self.hass.async_add_job(self.update_ha_state)
@@ -0,0 +1,224 @@
+"""
+Provides a binary sensor which is a collection of ffmpeg tools.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.ffmpeg/
+"""
+import logging
+from os import path
+
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA, DOMAIN)
+from homeassistant.components.ffmpeg import (
+    get_binary, run_test, CONF_INPUT, CONF_OUTPUT, CONF_EXTRA_ARGUMENTS)
+from homeassistant.config import load_yaml_config_file
+from homeassistant.const import (EVENT_HOMEASSISTANT_STOP, CONF_NAME,
+                                 ATTR_ENTITY_ID)
+
+DEPENDENCIES = ['ffmpeg']
+
+_LOGGER = logging.getLogger(__name__)
+
+SERVICE_RESTART = 'ffmpeg_restart'
+
+FFMPEG_SENSOR_NOISE = 'noise'
+FFMPEG_SENSOR_MOTION = 'motion'
+
+MAP_FFMPEG_BIN = [
+    FFMPEG_SENSOR_NOISE,
+    FFMPEG_SENSOR_MOTION
+]
+
+CONF_TOOL = 'tool'
+CONF_PEAK = 'peak'
+CONF_DURATION = 'duration'
+CONF_RESET = 'reset'
+CONF_CHANGES = 'changes'
+CONF_REPEAT = 'repeat'
+CONF_REPEAT_TIME = 'repeat_time'
+
+DEFAULT_NAME = 'FFmpeg'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_TOOL): vol.In(MAP_FFMPEG_BIN),
+    vol.Required(CONF_INPUT): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_EXTRA_ARGUMENTS): cv.string,
+    vol.Optional(CONF_OUTPUT): cv.string,
+    vol.Optional(CONF_PEAK, default=-30): vol.Coerce(int),
+    vol.Optional(CONF_DURATION, default=1):
+        vol.All(vol.Coerce(int), vol.Range(min=1)),
+    vol.Optional(CONF_RESET, default=10):
+        vol.All(vol.Coerce(int), vol.Range(min=1)),
+    vol.Optional(CONF_CHANGES, default=10):
+        vol.All(vol.Coerce(float), vol.Range(min=0, max=99)),
+    vol.Optional(CONF_REPEAT, default=0):
+        vol.All(vol.Coerce(int), vol.Range(min=0)),
+    vol.Optional(CONF_REPEAT_TIME, default=0):
+        vol.All(vol.Coerce(int), vol.Range(min=0)),
+})
+
+SERVICE_RESTART_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+})
+
+
+def restart(hass, entity_id=None):
+    """Restart a ffmpeg process on entity."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_RESTART, data)
+
+
+# list of all ffmpeg sensors
+DEVICES = []
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Create the binary sensor."""
+    from haffmpeg import SensorNoise, SensorMotion
+
+    # check source
+    if not run_test(config.get(CONF_INPUT)):
+        return
+
+    # generate sensor object
+    if config.get(CONF_TOOL) == FFMPEG_SENSOR_NOISE:
+        entity = FFmpegNoise(SensorNoise, config)
+    else:
+        entity = FFmpegMotion(SensorMotion, config)
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, entity.shutdown_ffmpeg)
+
+    # add to system
+    add_entities([entity])
+    DEVICES.append(entity)
+
+    # exists service?
+    if hass.services.has_service(DOMAIN, SERVICE_RESTART):
+        return
+
+    descriptions = load_yaml_config_file(
+        path.join(path.dirname(__file__), 'services.yaml'))
+
+    # register service
+    def _service_handle_restart(service):
+        """Handle service binary_sensor.ffmpeg_restart."""
+        entity_ids = service.data.get('entity_id')
+
+        if entity_ids:
+            _devices = [device for device in DEVICES
+                        if device.entity_id in entity_ids]
+        else:
+            _devices = DEVICES
+
+        for device in _devices:
+            device.restart_ffmpeg()
+
+    hass.services.register(DOMAIN, SERVICE_RESTART,
+                           _service_handle_restart,
+                           descriptions.get(SERVICE_RESTART),
+                           schema=SERVICE_RESTART_SCHEMA)
+
+
+class FFmpegBinarySensor(BinarySensorDevice):
+    """A binary sensor which use ffmpeg for noise detection."""
+
+    def __init__(self, ffobj, config):
+        """Constructor for binary sensor noise detection."""
+        self._state = False
+        self._config = config
+        self._name = config.get(CONF_NAME)
+        self._ffmpeg = ffobj(get_binary(), self._callback)
+
+        self._start_ffmpeg(config)
+
+    def _callback(self, state):
+        """HA-FFmpeg callback for noise detection."""
+        self._state = state
+        self.update_ha_state()
+
+    def _start_ffmpeg(self, config):
+        """Start a FFmpeg instance."""
+        raise NotImplementedError
+
+    def shutdown_ffmpeg(self, event):
+        """For STOP event to shutdown ffmpeg."""
+        self._ffmpeg.close()
+
+    def restart_ffmpeg(self):
+        """Restart ffmpeg with new config."""
+        self._ffmpeg.close()
+        self._start_ffmpeg(self._config)
+
+    @property
+    def is_on(self):
+        """True if the binary sensor is on."""
+        return self._state
+
+    @property
+    def should_poll(self):
+        """Return True if entity has to be polled for state."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the entity."""
+        return self._name
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return self._ffmpeg.is_running
+
+
+class FFmpegNoise(FFmpegBinarySensor):
+    """A binary sensor which use ffmpeg for noise detection."""
+
+    def _start_ffmpeg(self, config):
+        """Start a FFmpeg instance."""
+        # init config
+        self._ffmpeg.set_options(
+            time_duration=config.get(CONF_DURATION),
+            time_reset=config.get(CONF_RESET),
+            peak=config.get(CONF_PEAK),
+        )
+
+        # run
+        self._ffmpeg.open_sensor(
+            input_source=config.get(CONF_INPUT),
+            output_dest=config.get(CONF_OUTPUT),
+            extra_cmd=config.get(CONF_EXTRA_ARGUMENTS),
+        )
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return "sound"
+
+
+class FFmpegMotion(FFmpegBinarySensor):
+    """A binary sensor which use ffmpeg for noise detection."""
+
+    def _start_ffmpeg(self, config):
+        """Start a FFmpeg instance."""
+        # init config
+        self._ffmpeg.set_options(
+            time_reset=config.get(CONF_RESET),
+            time_repeat=config.get(CONF_REPEAT_TIME),
+            repeat=config.get(CONF_REPEAT),
+            changes=config.get(CONF_CHANGES),
+        )
+
+        # run
+        self._ffmpeg.open_sensor(
+            input_source=config.get(CONF_INPUT),
+            extra_cmd=config.get(CONF_EXTRA_ARGUMENTS),
+        )
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return "motion"
@@ -16,11 +16,14 @@ DEPENDENCIES = ['homematic']
 SENSOR_TYPES_CLASS = {
    "Remote": None,
    "ShutterContact": "opening",
+    "IPShutterContact": "opening",
    "Smoke": "smoke",
    "SmokeV2": "smoke",
    "Motion": "motion",
    "MotionV2": "motion",
-    "RemoteMotion": None
+    "RemoteMotion": None,
+    "WeatherSensor": None,
+    "TiltSensor": None,
 }


@@ -29,9 +32,11 @@ def setup_platform(hass, config, add_callback_devices, discovery_info=None):
    if discovery_info is None:
        return

-    return homematic.setup_hmdevice_discovery_helper(HMBinarySensor,
-                                                     discovery_info,
-                                                     add_callback_devices)
+    return homematic.setup_hmdevice_discovery_helper(
+        HMBinarySensor,
+        discovery_info,
+        add_callback_devices
+    )


 class HMBinarySensor(homematic.HMDevice, BinarySensorDevice):
@@ -55,44 +60,8 @@ class HMBinarySensor(homematic.HMDevice, BinarySensorDevice):
            return "motion"
        return SENSOR_TYPES_CLASS.get(self._hmdevice.__class__.__name__, None)

-    def _check_hm_to_ha_object(self):
-        """Check if possible to use the HM Object as this HA type."""
-        from pyhomematic.devicetypes.sensors import HMBinarySensor\
-            as pyHMBinarySensor
-
-        # Check compatibility from HMDevice
-        if not super()._check_hm_to_ha_object():
-            return False
-
-        # check if the Homematic device correct for this HA device
-        if not isinstance(self._hmdevice, pyHMBinarySensor):
-            _LOGGER.critical("This %s can't be use as binary", self._name)
-            return False
-
-        # if exists user value?
-        if self._state and self._state not in self._hmdevice.BINARYNODE:
-            _LOGGER.critical("This %s have no binary with %s", self._name,
-                             self._state)
-            return False
-
-        # only check and give a warning to the user
-        if self._state is None and len(self._hmdevice.BINARYNODE) > 1:
-            _LOGGER.critical("%s have multiple binary params. It use all "
-                             "binary nodes as one. Possible param values: %s",
-                             self._name, str(self._hmdevice.BINARYNODE))
-            return False
-
-        return True
-
    def _init_data_struct(self):
        """Generate a data struct (self._data) from the Homematic metadata."""
-        super()._init_data_struct()
-
-        # object have 1 binary
-        if self._state is None and len(self._hmdevice.BINARYNODE) == 1:
-            for value in self._hmdevice.BINARYNODE:
-                self._state = value
-
        # add state to data struct
        if self._state:
            _LOGGER.debug("%s init datastruct with main node '%s'", self._name,
@@ -0,0 +1,71 @@
+"""
+Support for ISY994 binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.isy994/
+"""
+import logging
+from typing import Callable  # noqa
+
+from homeassistant.components.binary_sensor import BinarySensorDevice, DOMAIN
+import homeassistant.components.isy994 as isy
+from homeassistant.const import STATE_ON, STATE_OFF
+from homeassistant.helpers.typing import ConfigType
+
+
+_LOGGER = logging.getLogger(__name__)
+
+VALUE_TO_STATE = {
+    False: STATE_OFF,
+    True: STATE_ON,
+}
+
+UOM = ['2', '78']
+STATES = [STATE_OFF, STATE_ON, 'true', 'false']
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config: ConfigType,
+                   add_devices: Callable[[list], None], discovery_info=None):
+    """Setup the ISY994 binary sensor platform."""
+    if isy.ISY is None or not isy.ISY.connected:
+        _LOGGER.error('A connection has not been made to the ISY controller.')
+        return False
+
+    devices = []
+
+    for node in isy.filter_nodes(isy.SENSOR_NODES, units=UOM,
+                                 states=STATES):
+        devices.append(ISYBinarySensorDevice(node))
+
+    for program in isy.PROGRAMS.get(DOMAIN, []):
+        try:
+            status = program[isy.KEY_STATUS]
+        except (KeyError, AssertionError):
+            pass
+        else:
+            devices.append(ISYBinarySensorProgram(program.name, status))
+
+    add_devices(devices)
+
+
+class ISYBinarySensorDevice(isy.ISYDevice, BinarySensorDevice):
+    """Representation of an ISY994 binary sensor device."""
+
+    def __init__(self, node) -> None:
+        """Initialize the ISY994 binary sensor device."""
+        isy.ISYDevice.__init__(self, node)
+
+    @property
+    def is_on(self) -> bool:
+        """Get whether the ISY994 binary sensor device is on."""
+        return bool(self.value)
+
+
+class ISYBinarySensorProgram(ISYBinarySensorDevice):
+    """Representation of an ISY994 binary sensor program."""
+
+    def __init__(self, name, node) -> None:
+        """Initialize the ISY994 binary sensor program."""
+        ISYBinarySensorDevice.__init__(self, node)
+        self._name = name
@@ -5,17 +5,14 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.knx/
 """
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.components.knx import (
-    KNXConfig, KNXGroupAddress)
+from homeassistant.components.knx import (KNXConfig, KNXGroupAddress)

-DEPENDENCIES = ["knx"]
+DEPENDENCIES = ['knx']


-def setup_platform(hass, config, add_entities, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the KNX binary sensor platform."""
-    add_entities([
-        KNXSwitch(hass, KNXConfig(config))
-    ])
+    add_devices([KNXSwitch(hass, KNXConfig(config))])


 class KNXSwitch(KNXGroupAddress, BinarySensorDevice):
@@ -0,0 +1,61 @@
+"""
+Support for Modbus Coil sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.modbus/
+"""
+import logging
+import voluptuous as vol
+
+import homeassistant.components.modbus as modbus
+from homeassistant.const import CONF_NAME
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.helpers import config_validation as cv
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+
+_LOGGER = logging.getLogger(__name__)
+DEPENDENCIES = ['modbus']
+
+CONF_COIL = "coil"
+CONF_COILS = "coils"
+CONF_SLAVE = "slave"
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_COILS): [{
+        vol.Required(CONF_COIL): cv.positive_int,
+        vol.Required(CONF_NAME): cv.string,
+        vol.Optional(CONF_SLAVE): cv.positive_int
+    }]
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup Modbus binary sensors."""
+    sensors = []
+    for coil in config.get(CONF_COILS):
+        sensors.append(ModbusCoilSensor(
+            coil.get(CONF_NAME),
+            coil.get(CONF_SLAVE),
+            coil.get(CONF_COIL)))
+    add_devices(sensors)
+
+
+class ModbusCoilSensor(BinarySensorDevice):
+    """Modbus coil sensor."""
+
+    def __init__(self, name, slave, coil):
+        """Initialize the modbus coil sensor."""
+        self._name = name
+        self._slave = int(slave) if slave else None
+        self._coil = int(coil)
+        self._value = None
+
+    @property
+    def is_on(self):
+        """Return the state of the sensor."""
+        return self._value
+
+    def update(self):
+        """Update the state of the sensor."""
+        result = modbus.HUB.read_coils(self._slave, self._coil, 1)
+        self._value = result.bits[0]
@@ -9,46 +9,45 @@ import logging
 import voluptuous as vol

 import homeassistant.components.mqtt as mqtt
-from homeassistant.components.binary_sensor import (BinarySensorDevice,
-                                                    SENSOR_CLASSES)
-from homeassistant.const import CONF_NAME, CONF_VALUE_TEMPLATE
-from homeassistant.components.mqtt import CONF_STATE_TOPIC, CONF_QOS
-from homeassistant.helpers import template
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, SENSOR_CLASSES)
+from homeassistant.const import (
+    CONF_NAME, CONF_VALUE_TEMPLATE, CONF_PAYLOAD_ON, CONF_PAYLOAD_OFF,
+    CONF_SENSOR_CLASS)
+from homeassistant.components.mqtt import (CONF_STATE_TOPIC, CONF_QOS)
 import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

-DEPENDENCIES = ['mqtt']
-
-CONF_SENSOR_CLASS = 'sensor_class'
-CONF_PAYLOAD_ON = 'payload_on'
-CONF_PAYLOAD_OFF = 'payload_off'
-
 DEFAULT_NAME = 'MQTT Binary sensor'
-DEFAULT_PAYLOAD_ON = 'ON'
 DEFAULT_PAYLOAD_OFF = 'OFF'
+DEFAULT_PAYLOAD_ON = 'ON'
+DEPENDENCIES = ['mqtt']

 PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
+    vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
    vol.Optional(CONF_SENSOR_CLASS, default=None):
        vol.Any(vol.In(SENSOR_CLASSES), vol.SetTo(None)),
-    vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
-    vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
 })


 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Add MQTT binary sensor."""
+    """Setup the MQTT binary sensor."""
+    value_template = config.get(CONF_VALUE_TEMPLATE)
+    if value_template is not None:
+        value_template.hass = hass
    add_devices([MqttBinarySensor(
        hass,
-        config[CONF_NAME],
-        config[CONF_STATE_TOPIC],
-        config[CONF_SENSOR_CLASS],
-        config[CONF_QOS],
-        config[CONF_PAYLOAD_ON],
-        config[CONF_PAYLOAD_OFF],
-        config.get(CONF_VALUE_TEMPLATE)
+        config.get(CONF_NAME),
+        config.get(CONF_STATE_TOPIC),
+        config.get(CONF_SENSOR_CLASS),
+        config.get(CONF_QOS),
+        config.get(CONF_PAYLOAD_ON),
+        config.get(CONF_PAYLOAD_OFF),
+        value_template
    )])


@@ -71,8 +70,8 @@ class MqttBinarySensor(BinarySensorDevice):
        def message_received(topic, payload, qos):
            """A new MQTT message has been received."""
            if value_template is not None:
-                payload = template.render_with_possible_json_value(
-                    hass, value_template, payload)
+                payload = value_template.render_with_possible_json_value(
+                    payload)
            if payload == self._payload_on:
                self._state = True
                self.update_ha_state()
@@ -32,7 +32,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
            pres.S_MOTION: [set_req.V_TRIPPED],
            pres.S_SMOKE: [set_req.V_TRIPPED],
        }
-        if float(gateway.version) >= 1.5:
+        if float(gateway.protocol_version) >= 1.5:
            map_sv_types.update({
                pres.S_SPRINKLER: [set_req.V_TRIPPED],
                pres.S_WATER_LEAK: [set_req.V_TRIPPED],
@@ -66,7 +66,7 @@ class MySensorsBinarySensor(
            pres.S_MOTION: 'motion',
            pres.S_SMOKE: 'smoke',
        }
-        if float(self.gateway.version) >= 1.5:
+        if float(self.gateway.protocol_version) >= 1.5:
            class_map.update({
                pres.S_SPRINKLER: 'sprinkler',
                pres.S_WATER_LEAK: 'leak',
@@ -6,12 +6,12 @@ https://home-assistant.io/components/binary_sensor.nest/
 """
 import voluptuous as vol

-import homeassistant.components.nest as nest
-from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
 from homeassistant.components.sensor.nest import NestSensor
-from homeassistant.const import (
-    CONF_PLATFORM, CONF_SCAN_INTERVAL, CONF_MONITORED_CONDITIONS
-)
+from homeassistant.const import (CONF_SCAN_INTERVAL, CONF_MONITORED_CONDITIONS)
+import homeassistant.components.nest as nest
+import homeassistant.helpers.config_validation as cv

 DEPENDENCIES = ['nest']
 BINARY_TYPES = ['fan',
@@ -25,11 +25,11 @@ BINARY_TYPES = ['fan',
                'hvac_emer_heat_state',
                'online']

-PLATFORM_SCHEMA = vol.Schema({
-    vol.Required(CONF_PLATFORM): nest.DOMAIN,
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_SCAN_INTERVAL):
        vol.All(vol.Coerce(int), vol.Range(min=1)),
-    vol.Required(CONF_MONITORED_CONDITIONS): [vol.In(BINARY_TYPES)],
+    vol.Required(CONF_MONITORED_CONDITIONS):
+        vol.All(cv.ensure_list, [vol.In(BINARY_TYPES)]),
 })


@@ -1,41 +1,56 @@
 """
-Support for exposing nx584 elements as sensors.
+Support for exposing NX584 elements as sensors.

 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/sensor.nx584/
+https://home-assistant.io/components/binary_sensor.nx584/
 """
 import logging
 import threading
 import time

 import requests
+import voluptuous as vol

 from homeassistant.components.binary_sensor import (
-    SENSOR_CLASSES, BinarySensorDevice)
+    SENSOR_CLASSES, BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.const import (CONF_HOST, CONF_PORT)
+import homeassistant.helpers.config_validation as cv

 REQUIREMENTS = ['pynx584==0.2']
+
 _LOGGER = logging.getLogger(__name__)

+CONF_EXCLUDE_ZONES = 'exclude_zones'
+CONF_ZONE_TYPES = 'zone_types'
+
+DEFAULT_HOST = 'localhost'
+DEFAULT_PORT = '5007'
+DEFAULT_SSL = False
+
+ZONE_TYPES_SCHEMA = vol.Schema({
+    cv.positive_int: vol.In(SENSOR_CLASSES),
+})
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_EXCLUDE_ZONES, default=[]):
+        vol.All(cv.ensure_list, [cv.positive_int]),
+    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+    vol.Optional(CONF_ZONE_TYPES, default={}): ZONE_TYPES_SCHEMA,
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup nx584 binary sensor platform."""
+    """Setup the NX584 binary sensor platform."""
    from nx584 import client as nx584_client

-    host = config.get('host', 'localhost:5007')
-    exclude = config.get('exclude_zones', [])
-    zone_types = config.get('zone_types', {})
-
-    if not all(isinstance(zone, int) for zone in exclude):
-        _LOGGER.error('Invalid excluded zone specified (use zone number)')
-        return False
-
-    if not all(isinstance(zone, int) and ztype in SENSOR_CLASSES
-               for zone, ztype in zone_types.items()):
-        _LOGGER.error('Invalid zone_types entry')
-        return False
+    host = config.get(CONF_HOST)
+    port = config.get(CONF_PORT)
+    exclude = config.get(CONF_EXCLUDE_ZONES)
+    zone_types = config.get(CONF_ZONE_TYPES)

    try:
-        client = nx584_client.Client('http://%s' % host)
+        client = nx584_client.Client('http://{}:{}'.format(host, port))
        zones = client.list_zones()
    except requests.exceptions.ConnectionError as ex:
        _LOGGER.error('Unable to connect to NX584: %s', str(ex))
@@ -43,7 +58,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):

    version = [int(v) for v in client.get_version().split('.')]
    if version < [1, 1]:
-        _LOGGER.error('NX584 is too old to use for sensors (>=0.2 required)')
+        _LOGGER.error("NX584 is too old to use for sensors (>=0.2 required)")
        return False

    zone_sensors = {
@@ -57,13 +72,12 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
        watcher = NX584Watcher(client, zone_sensors)
        watcher.start()
    else:
-        _LOGGER.warning('No zones found on NX584')
-
+        _LOGGER.warning("No zones found on NX584")
    return True


 class NX584ZoneSensor(BinarySensorDevice):
-    """Represents a NX584 zone as a sensor."""
+    """Representation of a NX584 zone as a sensor."""

    def __init__(self, zone, zone_type):
        """Initialize the nx594 binary sensor."""
@@ -96,7 +110,7 @@ class NX584Watcher(threading.Thread):
    """Event listener thread to process NX584 events."""

    def __init__(self, client, zone_sensors):
-        """Initialize nx584 watcher thread."""
+        """Initialize NX584 watcher thread."""
        super(NX584Watcher, self).__init__()
        self.daemon = True
        self._client = client
@@ -130,5 +144,5 @@ class NX584Watcher(threading.Thread):
            try:
                self._run()
            except requests.exceptions.ConnectionError:
-                _LOGGER.error('Failed to reach NX584 server')
+                _LOGGER.error("Failed to reach NX584 server")
                time.sleep(10)
@@ -5,45 +5,56 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.octoprint/
 """
 import logging
+
 import requests
+import voluptuous as vol

-from homeassistant.const import CONF_NAME, STATE_ON, STATE_OFF
-from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.const import (
+    CONF_NAME, STATE_ON, STATE_OFF, CONF_MONITORED_CONDITIONS)
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
 from homeassistant.loader import get_component
+import homeassistant.helpers.config_validation as cv

-DEPENDENCIES = ["octoprint"]
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['octoprint']
+
+DEFAULT_NAME = 'OctoPrint'

 SENSOR_TYPES = {
    # API Endpoint, Group, Key, unit
-    "Printing": ["printer", "state", "printing", None],
-    "Printing Error": ["printer", "state", "error", None]
+    'Printing': ['printer', 'state', 'printing', None],
+    'Printing Error': ['printer', 'state', 'error', None]
 }

-_LOGGER = logging.getLogger(__name__)
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_MONITORED_CONDITIONS, default=SENSOR_TYPES):
+        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})


 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the available OctoPrint binary sensors."""
    octoprint = get_component('octoprint')
-    name = config.get(CONF_NAME, "OctoPrint")
-    monitored_conditions = config.get("monitored_conditions",
+    name = config.get(CONF_NAME)
+    monitored_conditions = config.get(CONF_MONITORED_CONDITIONS,
                                      SENSOR_TYPES.keys())

    devices = []
    for octo_type in monitored_conditions:
-        if octo_type in SENSOR_TYPES:
-            new_sensor = OctoPrintBinarySensor(octoprint.OCTOPRINT,
-                                               octo_type,
-                                               SENSOR_TYPES[octo_type][2],
-                                               name,
-                                               SENSOR_TYPES[octo_type][3],
-                                               SENSOR_TYPES[octo_type][0],
-                                               SENSOR_TYPES[octo_type][1],
-                                               "flags")
-            devices.append(new_sensor)
-        else:
-            _LOGGER.error("Unknown OctoPrint sensor type: %s", octo_type)
+        new_sensor = OctoPrintBinarySensor(octoprint.OCTOPRINT,
+                                           octo_type,
+                                           SENSOR_TYPES[octo_type][2],
+                                           name,
+                                           SENSOR_TYPES[octo_type][3],
+                                           SENSOR_TYPES[octo_type][0],
+                                           SENSOR_TYPES[octo_type][1],
+                                           'flags')
+        devices.append(new_sensor)
    add_devices(devices)


@@ -52,14 +63,14 @@ class OctoPrintBinarySensor(BinarySensorDevice):
    """Representation an OctoPrint binary sensor."""

    # pylint: disable=too-many-arguments
-    def __init__(self, api, condition, sensor_type, sensor_name,
-                 unit, endpoint, group, tool=None):
+    def __init__(self, api, condition, sensor_type, sensor_name, unit,
+                 endpoint, group, tool=None):
        """Initialize a new OctoPrint sensor."""
        self.sensor_name = sensor_name
        if tool is None:
-            self._name = sensor_name + ' ' + condition
+            self._name = '{} {}'.format(sensor_name, condition)
        else:
-            self._name = sensor_name + ' ' + condition
+            self._name = '{} {}'.format(sensor_name, condition)
        self.sensor_type = sensor_type
        self.api = api
        self._state = False
@@ -5,33 +5,68 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.rest/
 """
 import logging
+import json

-from homeassistant.components.binary_sensor import (BinarySensorDevice,
-                                                    SENSOR_CLASSES)
+import voluptuous as vol
+from requests.auth import HTTPBasicAuth, HTTPDigestAuth
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, SENSOR_CLASSES_SCHEMA, PLATFORM_SCHEMA)
 from homeassistant.components.sensor.rest import RestData
-from homeassistant.const import CONF_VALUE_TEMPLATE
-from homeassistant.helpers import template
+from homeassistant.const import (
+    CONF_PAYLOAD, CONF_NAME, CONF_VALUE_TEMPLATE, CONF_METHOD, CONF_RESOURCE,
+    CONF_SENSOR_CLASS, CONF_VERIFY_SSL, CONF_USERNAME, CONF_PASSWORD,
+    CONF_HEADERS, CONF_AUTHENTICATION, HTTP_BASIC_AUTHENTICATION,
+    HTTP_DIGEST_AUTHENTICATION)
+import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

-DEFAULT_NAME = 'REST Binary Sensor'
 DEFAULT_METHOD = 'GET'
+DEFAULT_NAME = 'REST Binary Sensor'
+DEFAULT_VERIFY_SSL = True
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_RESOURCE): cv.url,
+    vol.Optional(CONF_AUTHENTICATION):
+        vol.In([HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION]),
+    vol.Optional(CONF_HEADERS): cv.string,
+    vol.Optional(CONF_METHOD, default=DEFAULT_METHOD): vol.In(['POST', 'GET']),
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_PASSWORD): cv.string,
+    vol.Optional(CONF_PAYLOAD): cv.string,
+    vol.Optional(CONF_SENSOR_CLASS): SENSOR_CLASSES_SCHEMA,
+    vol.Optional(CONF_USERNAME): cv.string,
+    vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+    vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
+})


-# pylint: disable=unused-variable
+# pylint: disable=unused-variable, too-many-locals
 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the REST binary sensor."""
-    resource = config.get('resource', None)
-    method = config.get('method', DEFAULT_METHOD)
-    payload = config.get('payload', None)
-    verify_ssl = config.get('verify_ssl', True)
+    name = config.get(CONF_NAME)
+    resource = config.get(CONF_RESOURCE)
+    method = config.get(CONF_METHOD)
+    payload = config.get(CONF_PAYLOAD)
+    verify_ssl = config.get(CONF_VERIFY_SSL)
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+    headers = json.loads(config.get(CONF_HEADERS, '{}'))
+    sensor_class = config.get(CONF_SENSOR_CLASS)
+    value_template = config.get(CONF_VALUE_TEMPLATE)
+    if value_template is not None:
+        value_template.hass = hass

-    sensor_class = config.get('sensor_class')
-    if sensor_class not in SENSOR_CLASSES:
-        _LOGGER.warning('Unknown sensor class: %s', sensor_class)
-        sensor_class = None
+    if username and password:
+        if config.get(CONF_AUTHENTICATION) == HTTP_DIGEST_AUTHENTICATION:
+            auth = HTTPDigestAuth(username, password)
+        else:
+            auth = HTTPBasicAuth(username, password)
+    else:
+        auth = None

-    rest = RestData(method, resource, payload, verify_ssl)
+    rest = RestData(method, resource, auth, headers, payload, verify_ssl)
    rest.update()

    if rest.data is None:
@@ -39,11 +74,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
        return False

    add_devices([RestBinarySensor(
-        hass,
-        rest,
-        config.get('name', DEFAULT_NAME),
-        sensor_class,
-        config.get(CONF_VALUE_TEMPLATE))])
+        hass, rest, name, sensor_class, value_template)])


 # pylint: disable=too-many-arguments
@@ -78,8 +109,8 @@ class RestBinarySensor(BinarySensorDevice):
            return False

        if self._value_template is not None:
-            response = template.render_with_possible_json_value(
-                self._hass, self._value_template, self.rest.data, False)
+            response = self._value_template.render_with_possible_json_value(
+                self.rest.data, False)

        try:
            return bool(int(response))
@@ -6,16 +6,37 @@ https://home-assistant.io/components/binary_sensor.rpi_gpio/
 """
 import logging

-import homeassistant.components.rpi_gpio as rpi_gpio
-from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.const import DEVICE_DEFAULT_NAME
+import voluptuous as vol
+
+import homeassistant.components.rpi_gpio as rpi_gpio
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.const import DEVICE_DEFAULT_NAME
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_BOUNCETIME = 'bouncetime'
+CONF_INVERT_LOGIC = 'invert_logic'
+CONF_PORTS = 'ports'
+CONF_PULL_MODE = 'pull_mode'

-DEFAULT_PULL_MODE = "UP"
 DEFAULT_BOUNCETIME = 50
 DEFAULT_INVERT_LOGIC = False
+DEFAULT_PULL_MODE = 'UP'

 DEPENDENCIES = ['rpi_gpio']
-_LOGGER = logging.getLogger(__name__)
+
+_SENSORS_SCHEMA = vol.Schema({
+    cv.positive_int: cv.string,
+})
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_PORTS): _SENSORS_SCHEMA,
+    vol.Optional(CONF_BOUNCETIME, default=DEFAULT_BOUNCETIME): cv.positive_int,
+    vol.Optional(CONF_INVERT_LOGIC, default=DEFAULT_INVERT_LOGIC): cv.boolean,
+    vol.Optional(CONF_PULL_MODE, default=DEFAULT_PULL_MODE): cv.string,
+})


 # pylint: disable=unused-argument
@@ -0,0 +1,9 @@
+# Describes the format for available binary_sensor services
+
+ffmpeg_restart:
+  description: Send a restart command to a ffmpeg based sensor (party mode).
+
+  fields:
+    entity_id:
+      description: Name(s) of entites that will restart. Platform dependent.
+      example: 'binary_sensor.ffmpeg_noise'
@@ -0,0 +1,53 @@
+"""
+Support for SleepIQ sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.sleepiq/
+"""
+from homeassistant.components import sleepiq
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+DEPENDENCIES = ['sleepiq']
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the SleepIQ sensors."""
+    if discovery_info is None:
+        return
+
+    data = sleepiq.DATA
+    data.update()
+
+    dev = list()
+    for bed_id, _ in data.beds.items():
+        for side in sleepiq.SIDES:
+            dev.append(IsInBedBinarySensor(data, bed_id, side))
+    add_devices(dev)
+
+
+# pylint: disable=too-many-instance-attributes
+class IsInBedBinarySensor(sleepiq.SleepIQSensor, BinarySensorDevice):
+    """Implementation of a SleepIQ presence sensor."""
+
+    def __init__(self, sleepiq_data, bed_id, side):
+        """Initialize the sensor."""
+        sleepiq.SleepIQSensor.__init__(self, sleepiq_data, bed_id, side)
+        self.type = sleepiq.IS_IN_BED
+        self._state = None
+        self._name = sleepiq.SENSOR_TYPES[self.type]
+        self.update()
+
+    @property
+    def is_on(self):
+        """Return the status of the sensor."""
+        return self._state is True
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor."""
+        return "occupancy"
+
+    def update(self):
+        """Get the latest data from SleepIQ and updates the states."""
+        sleepiq.SleepIQSensor.update(self)
+        self._state = self.side.is_in_bed
@@ -4,56 +4,50 @@ Support for exposing a templated binary sensor.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.template/
 """
+import asyncio
 import logging

-from homeassistant.components.binary_sensor import (BinarySensorDevice,
-                                                    ENTITY_ID_FORMAT,
-                                                    SENSOR_CLASSES)
-from homeassistant.const import (ATTR_FRIENDLY_NAME, CONF_VALUE_TEMPLATE,
-                                 ATTR_ENTITY_ID, MATCH_ALL)
+import voluptuous as vol
+
+from homeassistant.core import callback
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, ENTITY_ID_FORMAT, PLATFORM_SCHEMA,
+    SENSOR_CLASSES_SCHEMA)
+from homeassistant.const import (
+    ATTR_FRIENDLY_NAME, ATTR_ENTITY_ID, CONF_VALUE_TEMPLATE,
+    CONF_SENSOR_CLASS, CONF_SENSORS)
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers.entity import generate_entity_id
-from homeassistant.helpers import template
 from homeassistant.helpers.event import track_state_change
-from homeassistant.util import slugify
+import homeassistant.helpers.config_validation as cv

-CONF_SENSORS = 'sensors'
 _LOGGER = logging.getLogger(__name__)

+SENSOR_SCHEMA = vol.Schema({
+    vol.Required(CONF_VALUE_TEMPLATE): cv.template,
+    vol.Optional(ATTR_FRIENDLY_NAME): cv.string,
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(CONF_SENSOR_CLASS, default=None): SENSOR_CLASSES_SCHEMA
+})
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_SENSORS): vol.Schema({cv.slug: SENSOR_SCHEMA}),
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup template binary sensors."""
    sensors = []
-    if config.get(CONF_SENSORS) is None:
-        _LOGGER.error('Missing configuration data for binary_sensor platform')
-        return False

    for device, device_config in config[CONF_SENSORS].items():
-
-        if device != slugify(device):
-            _LOGGER.error('Found invalid key for binary_sensor.template: %s. '
-                          'Use %s instead', device, slugify(device))
-            continue
-
-        if not isinstance(device_config, dict):
-            _LOGGER.error('Missing configuration data for binary_sensor %s',
-                          device)
-            continue
-
+        value_template = device_config[CONF_VALUE_TEMPLATE]
+        entity_ids = (device_config.get(ATTR_ENTITY_ID) or
+                      value_template.extract_entities())
        friendly_name = device_config.get(ATTR_FRIENDLY_NAME, device)
-        sensor_class = device_config.get('sensor_class')
-        value_template = device_config.get(CONF_VALUE_TEMPLATE)
+        sensor_class = device_config.get(CONF_SENSOR_CLASS)

-        if sensor_class not in SENSOR_CLASSES:
-            _LOGGER.error('Sensor class is not valid')
-            continue
-
-        if value_template is None:
-            _LOGGER.error(
-                'Missing %s for sensor %s', CONF_VALUE_TEMPLATE, device)
-            continue
-
-        entity_ids = device_config.get(ATTR_ENTITY_ID, MATCH_ALL)
+        if value_template is not None:
+            value_template.hass = hass

        sensors.append(
            BinarySensorTemplate(
@@ -89,12 +83,12 @@ class BinarySensorTemplate(BinarySensorDevice):

        self.update()

+        @callback
        def template_bsensor_state_listener(entity, old_state, new_state):
            """Called when the target device changes state."""
-            self.update_ha_state(True)
+            hass.loop.create_task(self.async_update_ha_state(True))

-        track_state_change(hass, entity_ids,
-                           template_bsensor_state_listener)
+        track_state_change(hass, entity_ids, template_bsensor_state_listener)

    @property
    def name(self):
@@ -116,11 +110,11 @@ class BinarySensorTemplate(BinarySensorDevice):
        """No polling needed."""
        return False

-    def update(self):
+    @asyncio.coroutine
+    def async_update(self):
        """Get the latest data and update the state."""
        try:
-            self._state = template.render(self.hass,
-                                          self._template).lower() == 'true'
+            self._state = self._template.async_render().lower() == 'true'
        except TemplateError as ex:
            if ex.args and ex.args[0].startswith(
                    "UndefinedError: 'None' has no attribute"):
@@ -0,0 +1,145 @@
+"""
+A sensor that monitors trands in other components.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.trend/
+"""
+import logging
+import voluptuous as vol
+import homeassistant.helpers.config_validation as cv
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice,
+    ENTITY_ID_FORMAT,
+    PLATFORM_SCHEMA,
+    SENSOR_CLASSES_SCHEMA)
+from homeassistant.const import (
+    ATTR_FRIENDLY_NAME,
+    ATTR_ENTITY_ID,
+    CONF_SENSOR_CLASS,
+    STATE_UNKNOWN,)
+from homeassistant.helpers.entity import generate_entity_id
+from homeassistant.helpers.event import track_state_change
+
+_LOGGER = logging.getLogger(__name__)
+CONF_SENSORS = 'sensors'
+CONF_ATTRIBUTE = 'attribute'
+CONF_INVERT = 'invert'
+
+SENSOR_SCHEMA = vol.Schema({
+    vol.Required(ATTR_ENTITY_ID): cv.entity_id,
+    vol.Optional(CONF_ATTRIBUTE): cv.string,
+    vol.Optional(ATTR_FRIENDLY_NAME): cv.string,
+    vol.Optional(CONF_INVERT, default=False): cv.boolean,
+    vol.Optional(CONF_SENSOR_CLASS, default=None): SENSOR_CLASSES_SCHEMA
+
+})
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_SENSORS): vol.Schema({cv.slug: SENSOR_SCHEMA}),
+})
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the trend sensors."""
+    sensors = []
+
+    for device, device_config in config[CONF_SENSORS].items():
+        entity_id = device_config[ATTR_ENTITY_ID]
+        attribute = device_config.get(CONF_ATTRIBUTE)
+        friendly_name = device_config.get(ATTR_FRIENDLY_NAME, device)
+        sensor_class = device_config[CONF_SENSOR_CLASS]
+        invert = device_config[CONF_INVERT]
+
+        sensors.append(
+            SensorTrend(
+                hass,
+                device,
+                friendly_name,
+                entity_id,
+                attribute,
+                sensor_class,
+                invert)
+            )
+    if not sensors:
+        _LOGGER.error("No sensors added")
+        return False
+    add_devices(sensors)
+    return True
+
+
+class SensorTrend(BinarySensorDevice):
+    """Representation of a trend Sensor."""
+
+    # pylint: disable=too-many-arguments, too-many-instance-attributes
+    def __init__(self, hass, device_id, friendly_name,
+                 target_entity, attribute, sensor_class, invert):
+        """Initialize the sensor."""
+        self._hass = hass
+        self.entity_id = generate_entity_id(ENTITY_ID_FORMAT, device_id,
+                                            hass=hass)
+        self._name = friendly_name
+        self._target_entity = target_entity
+        self._attribute = attribute
+        self._sensor_class = sensor_class
+        self._invert = invert
+        self._state = None
+        self.from_state = None
+        self.to_state = None
+
+        self.update()
+
+        def trend_sensor_state_listener(entity, old_state, new_state):
+            """Called when the target device changes state."""
+            self.from_state = old_state
+            self.to_state = new_state
+            self.update_ha_state(True)
+
+        track_state_change(hass, target_entity,
+                           trend_sensor_state_listener)
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return true if sensor is on."""
+        return self._state
+
+    @property
+    def sensor_class(self):
+        """Return the sensor class of the sensor."""
+        return self._sensor_class
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    def update(self):
+        """Get the latest data and update the states."""
+        if self.from_state is None or self.to_state is None:
+            return
+        if (self.from_state.state == STATE_UNKNOWN or
+                self.to_state.state == STATE_UNKNOWN):
+            return
+        try:
+            if self._attribute:
+                from_value = float(
+                    self.from_state.attributes.get(self._attribute))
+                to_value = float(
+                    self.to_state.attributes.get(self._attribute))
+            else:
+                from_value = float(self.from_state.state)
+                to_value = float(self.to_state.state)
+
+            self._state = to_value > from_value
+            if self._invert:
+                self._state = not self._state
+
+        except (ValueError, TypeError) as ex:
+            self._state = None
+            _LOGGER.error(ex)
@@ -1,19 +1,17 @@
 """
-Support for Wink sensors.
+Support for Wink binary sensors.

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

 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.sensor.wink import WinkDevice
-from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.helpers.entity import Entity
 from homeassistant.loader import get_component

-REQUIREMENTS = ['python-wink==0.7.11', 'pubnub==3.8.2']
+DEPENDENCIES = ['wink']

 # These are the available sensors mapped to binary_sensor class
 SENSOR_TYPES = {
@@ -21,7 +19,11 @@ SENSOR_TYPES = {
    "brightness": "light",
    "vibration": "vibration",
    "loudness": "sound",
-    "liquid_detected": "moisture"
+    "liquid_detected": "moisture",
+    "motion": "motion",
+    "presence": "occupancy",
+    "co_detected": "gas",
+    "smoke_detected": "smoke"
 }


@@ -29,17 +31,6 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Wink binary sensor platform."""
    import pywink

-    if discovery_info is None:
-        token = config.get(CONF_ACCESS_TOKEN)
-
-        if token is None:
-            logging.getLogger(__name__).error(
-                "Missing wink access_token. "
-                "Get one at https://winkbearertoken.appspot.com/")
-            return
-
-        pywink.set_bearer_token(token)
-
    for sensor in pywink.get_sensors():
        if sensor.capability() in SENSOR_TYPES:
            add_devices([WinkBinarySensorDevice(sensor)])
@@ -47,6 +38,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    for key in pywink.get_keys():
        add_devices([WinkBinarySensorDevice(key)])

+    for sensor in pywink.get_smoke_and_co_detectors():
+        add_devices([WinkBinarySensorDevice(sensor)])
+

 class WinkBinarySensorDevice(WinkDevice, BinarySensorDevice, Entity):
    """Representation of a Wink binary sensor."""
@@ -70,15 +64,25 @@ class WinkBinarySensorDevice(WinkDevice, BinarySensorDevice, Entity):
    def is_on(self):
        """Return true if the binary sensor is on."""
        if self.capability == "loudness":
-            return self.wink.loudness_boolean()
+            state = self.wink.loudness_boolean()
        elif self.capability == "vibration":
-            return self.wink.vibration_boolean()
+            state = self.wink.vibration_boolean()
        elif self.capability == "brightness":
-            return self.wink.brightness_boolean()
+            state = self.wink.brightness_boolean()
        elif self.capability == "liquid_detected":
-            return self.wink.liquid_boolean()
+            state = self.wink.liquid_boolean()
+        elif self.capability == "motion":
+            state = self.wink.motion_boolean()
+        elif self.capability == "presence":
+            state = self.wink.presence_boolean()
+        elif self.capability == "co_detected":
+            state = self.wink.co_detected_boolean()
+        elif self.capability == "smoke_detected":
+            state = self.wink.smoke_detected_boolean()
        else:
-            return self.wink.state()
+            state = self.wink.state()
+
+        return state

    @property
    def sensor_class(self):
@@ -4,18 +4,27 @@ Contains functionality to use a ZigBee device as a binary sensor.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.zigbee/
 """
+import voluptuous as vol
+
 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.zigbee import (
-    ZigBeeDigitalIn, ZigBeeDigitalInConfig)
+    ZigBeeDigitalIn, ZigBeeDigitalInConfig, PLATFORM_SCHEMA)

-DEPENDENCIES = ["zigbee"]
+CONF_ON_STATE = 'on_state'
+
+DEFAULT_ON_STATE = 'high'
+DEPENDENCIES = ['zigbee']
+
+STATES = ['high', 'low']
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_ON_STATE): vol.In(STATES),
+})


-def setup_platform(hass, config, add_entities, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the ZigBee binary sensor platform."""
-    add_entities([
-        ZigBeeBinarySensor(hass, ZigBeeDigitalInConfig(config))
-    ])
+    add_devices([ZigBeeBinarySensor(hass, ZigBeeDigitalInConfig(config))])


 class ZigBeeBinarySensor(ZigBeeDigitalIn, BinarySensorDevice):
@@ -36,8 +36,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    if discovery_info is None or zwave.NETWORK is None:
        return

-    node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]]
-    value = node.values[discovery_info[zwave.ATTR_VALUE_ID]]
+    node = zwave.NETWORK.nodes[discovery_info[zwave.const.ATTR_NODE_ID]]
+    value = node.values[discovery_info[zwave.const.ATTR_VALUE_ID]]
    value.set_change_verified(False)

    # Make sure that we have values for the key before converting to int
@@ -58,7 +58,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                ])
                return

-    if value.command_class == zwave.COMMAND_CLASS_SENSOR_BINARY:
+    if value.command_class == zwave.const.COMMAND_CLASS_SENSOR_BINARY:
        add_devices([ZWaveBinarySensor(value, None)])


@@ -8,30 +8,34 @@ import logging
 from datetime import timedelta

 import requests
+import voluptuous as vol

 from homeassistant.const import CONF_API_KEY
-from homeassistant.helpers import validate_config, discovery
+from homeassistant.helpers import discovery
 from homeassistant.util import Throttle
-
-DOMAIN = "bloomsky"
-BLOOMSKY = None
+import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

+BLOOMSKY = None
+BLOOMSKY_TYPE = ['camera', 'binary_sensor', 'sensor']
+
+DOMAIN = 'bloomsky'
+
 # The BloomSky only updates every 5-8 minutes as per the API spec so there's
 # no point in polling the API more frequently
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=300)

+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_API_KEY): cv.string,
+    }),
+}, extra=vol.ALLOW_EXTRA)
+

 # pylint: disable=unused-argument,too-few-public-methods
 def setup(hass, config):
    """Setup BloomSky component."""
-    if not validate_config(
-            config,
-            {DOMAIN: [CONF_API_KEY]},
-            _LOGGER):
-        return False
-
    api_key = config[DOMAIN][CONF_API_KEY]

    global BLOOMSKY
@@ -40,7 +44,7 @@ def setup(hass, config):
    except RuntimeError:
        return False

-    for component in 'camera', 'binary_sensor', 'sensor':
+    for component in BLOOMSKY_TYPE:
        discovery.load_platform(hass, component, DOMAIN, {}, config)

    return True
@@ -50,19 +54,19 @@ class BloomSky(object):
    """Handle all communication with the BloomSky API."""

    # API documentation at http://weatherlution.com/bloomsky-api/
-    API_URL = "https://api.bloomsky.com/api/skydata"
+    API_URL = 'https://api.bloomsky.com/api/skydata'

    def __init__(self, api_key):
        """Initialize the BookSky."""
        self._api_key = api_key
        self.devices = {}
-        _LOGGER.debug("Initial bloomsky device load...")
+        _LOGGER.debug("Initial BloomSky device load...")
        self.refresh_devices()

    @Throttle(MIN_TIME_BETWEEN_UPDATES)
    def refresh_devices(self):
-        """Use the API to retreive a list of devices."""
-        _LOGGER.debug("Fetching bloomsky update")
+        """Use the API to retrieve a list of devices."""
+        _LOGGER.debug("Fetching BloomSky update")
        response = requests.get(self.API_URL,
                                headers={"Authorization": self._api_key},
                                timeout=10)
@@ -73,5 +77,5 @@ class BloomSky(object):
            return
        # Create dictionary keyed off of the device unique id
        self.devices.update({
-            device["DeviceID"]: device for device in response.json()
+            device['DeviceID']: device for device in response.json()
        })
@@ -11,15 +11,15 @@ import requests
 from homeassistant.components.camera import Camera
 from homeassistant.loader import get_component

-DEPENDENCIES = ["bloomsky"]
+DEPENDENCIES = ['bloomsky']


 # pylint: disable=unused-argument
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup access to BloomSky cameras."""
    bloomsky = get_component('bloomsky')
    for device in bloomsky.BLOOMSKY.devices.values():
-        add_devices_callback([BloomSkyCamera(bloomsky.BLOOMSKY, device)])
+        add_devices([BloomSkyCamera(bloomsky.BLOOMSKY, device)])


 class BloomSkyCamera(Camera):
@@ -28,8 +28,8 @@ class BloomSkyCamera(Camera):
    def __init__(self, bs, device):
        """Setup for access to the BloomSky camera images."""
        super(BloomSkyCamera, self).__init__()
-        self._name = device["DeviceName"]
-        self._id = device["DeviceID"]
+        self._name = device['DeviceName']
+        self._id = device['DeviceID']
        self._bloomsky = bs
        self._url = ""
        self._last_url = ""
@@ -42,7 +42,7 @@ class BloomSkyCamera(Camera):
    def camera_image(self):
        """Update the camera's image if it has changed."""
        try:
-            self._url = self._bloomsky.devices[self._id]["Data"]["ImageURL"]
+            self._url = self._bloomsky.devices[self._id]['Data']['ImageURL']
            self._bloomsky.refresh_devices()
            # If the URL hasn't changed then the image hasn't changed.
            if self._url != self._last_url:
@@ -0,0 +1,70 @@
+"""
+Support for Cameras with FFmpeg as decoder.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.ffmpeg/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.camera import (Camera, PLATFORM_SCHEMA)
+from homeassistant.components.ffmpeg import (
+    run_test, get_binary, CONF_INPUT, CONF_EXTRA_ARGUMENTS)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import CONF_NAME
+
+DEPENDENCIES = ['ffmpeg']
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'FFmpeg'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_INPUT): cv.string,
+    vol.Optional(CONF_EXTRA_ARGUMENTS): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup a FFmpeg Camera."""
+    if not run_test(config.get(CONF_INPUT)):
+        return
+    add_devices([FFmpegCamera(config)])
+
+
+class FFmpegCamera(Camera):
+    """An implementation of an FFmpeg camera."""
+
+    def __init__(self, config):
+        """Initialize a FFmpeg camera."""
+        super().__init__()
+        self._name = config.get(CONF_NAME)
+        self._input = config.get(CONF_INPUT)
+        self._extra_arguments = config.get(CONF_EXTRA_ARGUMENTS)
+
+    def camera_image(self):
+        """Return a still image response from the camera."""
+        from haffmpeg import ImageSingle, IMAGE_JPEG
+        ffmpeg = ImageSingle(get_binary())
+
+        return ffmpeg.get_image(self._input, output_format=IMAGE_JPEG,
+                                extra_cmd=self._extra_arguments)
+
+    def mjpeg_stream(self, response):
+        """Generate an HTTP MJPEG stream from the camera."""
+        from haffmpeg import CameraMjpeg
+
+        stream = CameraMjpeg(get_binary())
+        stream.open_camera(self._input, extra_cmd=self._extra_arguments)
+        return response(
+            stream,
+            mimetype='multipart/x-mixed-replace;boundary=ffserver',
+            direct_passthrough=True
+        )
+
+    @property
+    def name(self):
+        """Return the name of this camera."""
+        return self._name
@@ -7,21 +7,33 @@ https://home-assistant.io/components/camera.foscam/
 import logging

 import requests
+import voluptuous as vol

-from homeassistant.components.camera import DOMAIN, Camera
-from homeassistant.helpers import validate_config
+from homeassistant.components.camera import (Camera, PLATFORM_SCHEMA)
+from homeassistant.const import (
+    CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_PORT)
+from homeassistant.helpers import config_validation as cv

 _LOGGER = logging.getLogger(__name__)

+CONF_IP = 'ip'
+
+DEFAULT_NAME = 'Foscam Camera'
+DEFAULT_PORT = 88
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_IP): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+})
+

 # pylint: disable=unused-argument
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup a Foscam IP Camera."""
-    if not validate_config({DOMAIN: config},
-                           {DOMAIN: ['username', 'password', 'ip']}, _LOGGER):
-        return None
-
-    add_devices_callback([FoscamCamera(config)])
+    add_devices([FoscamCamera(config)])


 # pylint: disable=too-many-instance-attributes
@@ -32,16 +44,16 @@ class FoscamCamera(Camera):
        """Initialize a Foscam camera."""
        super(FoscamCamera, self).__init__()

-        ip_address = device_info.get('ip')
-        port = device_info.get('port', 88)
+        ip_address = device_info.get(CONF_IP)
+        port = device_info.get(CONF_PORT)

-        self._base_url = 'http://' + ip_address + ':' + str(port) + '/'
-        self._username = device_info.get('username')
-        self._password = device_info.get('password')
+        self._base_url = 'http://{}:{}/'.format(ip_address, port)
+        self._username = device_info.get(CONF_USERNAME)
+        self._password = device_info.get(CONF_PASSWORD)
        self._snap_picture_url = self._base_url \
            + 'cgi-bin/CGIProxy.fcgi?cmd=snapPicture2&usr=' \
            + self._username + '&pwd=' + self._password
-        self._name = device_info.get('name', 'Foscam Camera')
+        self._name = device_info.get(CONF_NAME)

        _LOGGER.info('Using the following URL for %s: %s',
                     self._name, self._snap_picture_url)
@@ -7,55 +7,90 @@ https://home-assistant.io/components/camera.generic/
 import logging

 import requests
-from requests.auth import HTTPBasicAuth
+from requests.auth import HTTPBasicAuth, HTTPDigestAuth
+import voluptuous as vol

-from homeassistant.components.camera import DOMAIN, Camera
-from homeassistant.helpers import validate_config
+from homeassistant.const import (
+    CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_AUTHENTICATION,
+    HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION)
+from homeassistant.exceptions import TemplateError
+from homeassistant.components.camera import (PLATFORM_SCHEMA, Camera)
+from homeassistant.helpers import config_validation as cv

 _LOGGER = logging.getLogger(__name__)

+CONF_LIMIT_REFETCH_TO_URL_CHANGE = 'limit_refetch_to_url_change'
+CONF_STILL_IMAGE_URL = 'still_image_url'
+
+DEFAULT_NAME = 'Generic Camera'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_STILL_IMAGE_URL): cv.template,
+    vol.Optional(CONF_AUTHENTICATION, default=HTTP_BASIC_AUTHENTICATION):
+        vol.In([HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION]),
+    vol.Optional(CONF_LIMIT_REFETCH_TO_URL_CHANGE, default=False): cv.boolean,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_PASSWORD): cv.string,
+    vol.Optional(CONF_USERNAME): cv.string,
+})
+

 # pylint: disable=unused-argument
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup a generic IP Camera."""
-    if not validate_config({DOMAIN: config}, {DOMAIN: ['still_image_url']},
-                           _LOGGER):
-        return None
-
-    add_devices_callback([GenericCamera(config)])
+    add_devices([GenericCamera(hass, config)])


 # pylint: disable=too-many-instance-attributes
 class GenericCamera(Camera):
    """A generic implementation of an IP camera."""

-    def __init__(self, device_info):
+    def __init__(self, hass, device_info):
        """Initialize a generic camera."""
        super().__init__()
-        self._name = device_info.get('name', 'Generic Camera')
-        self._username = device_info.get('username')
-        self._password = device_info.get('password')
-        self._still_image_url = device_info['still_image_url']
+        self.hass = hass
+        self._name = device_info.get(CONF_NAME)
+        self._still_image_url = device_info[CONF_STILL_IMAGE_URL]
+        self._still_image_url.hass = hass
+        self._limit_refetch = device_info[CONF_LIMIT_REFETCH_TO_URL_CHANGE]
+
+        username = device_info.get(CONF_USERNAME)
+        password = device_info.get(CONF_PASSWORD)
+
+        if username and password:
+            if device_info[CONF_AUTHENTICATION] == HTTP_DIGEST_AUTHENTICATION:
+                self._auth = HTTPDigestAuth(username, password)
+            else:
+                self._auth = HTTPBasicAuth(username, password)
+        else:
+            self._auth = None
+
+        self._last_url = None
+        self._last_image = None

    def camera_image(self):
        """Return a still image response from the camera."""
-        if self._username and self._password:
-            try:
-                response = requests.get(
-                    self._still_image_url,
-                    auth=HTTPBasicAuth(self._username, self._password),
-                    timeout=10)
-            except requests.exceptions.RequestException as error:
-                _LOGGER.error('Error getting camera image: %s', error)
-                return None
-        else:
-            try:
-                response = requests.get(self._still_image_url, timeout=10)
-            except requests.exceptions.RequestException as error:
-                _LOGGER.error('Error getting camera image: %s', error)
-                return None
+        try:
+            url = self._still_image_url.render()
+        except TemplateError as err:
+            _LOGGER.error('Error parsing template %s: %s',
+                          self._still_image_url, err)
+            return self._last_image

-        return response.content
+        if url == self._last_url and self._limit_refetch:
+            return self._last_image
+
+        kwargs = {'timeout': 10, 'auth': self._auth}
+
+        try:
+            response = requests.get(url, **kwargs)
+        except requests.exceptions.RequestException as error:
+            _LOGGER.error('Error getting camera image: %s', error)
+            return None
+
+        self._last_url = url
+        self._last_image = response.content
+        return self._last_image

    @property
    def name(self):
@@ -1,50 +1,55 @@
-"""Camera that loads a picture from a local file."""
+"""
+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.local_file/
+"""
 import logging
 import os

-from homeassistant.components.camera import Camera
+import voluptuous as vol
+
+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_FILE_PATH = 'file_path'
+
+DEFAULT_NAME = 'Local File'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_FILE_PATH): cv.isfile,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Camera."""
-    # check for missing required configuration variable
-    if config.get("file_path") is None:
-        _LOGGER.error("Missing required variable: file_path")
-        return False
-
-    setup_config = (
-        {
-            "name": config.get("name", "Local File"),
-            "file_path": config.get("file_path")
-        }
-    )
+    file_path = config[CONF_FILE_PATH]

    # check filepath given is readable
-    if not os.access(setup_config["file_path"], os.R_OK):
+    if not os.access(file_path, os.R_OK):
        _LOGGER.error("file path is not readable")
        return False

-    add_devices([
-        LocalFile(setup_config)
-    ])
+    add_devices([LocalFile(config[CONF_NAME], file_path)])


 class LocalFile(Camera):
    """Local camera."""

-    def __init__(self, device_info):
+    def __init__(self, name, file_path):
        """Initialize Local File Camera component."""
        super().__init__()

-        self._name = device_info["name"]
-        self._config = device_info
+        self._name = name
+        self._file_path = file_path

    def camera_image(self):
        """Return image response."""
-        with open(self._config["file_path"], 'rb') as file:
+        with open(self._file_path, 'rb') as file:
            return file.read()

    @property
@@ -8,24 +8,48 @@ import logging
 from contextlib import closing

 import requests
-from requests.auth import HTTPBasicAuth
+from requests.auth import HTTPBasicAuth, HTTPDigestAuth
+import voluptuous as vol

-from homeassistant.components.camera import DOMAIN, Camera
-from homeassistant.helpers import validate_config
-
-CONTENT_TYPE_HEADER = 'Content-Type'
+from homeassistant.const import (
+    CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_AUTHENTICATION,
+    HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION)
+from homeassistant.components.camera import (PLATFORM_SCHEMA, Camera)
+from homeassistant.helpers import config_validation as cv

 _LOGGER = logging.getLogger(__name__)

+CONF_MJPEG_URL = 'mjpeg_url'
+CONTENT_TYPE_HEADER = 'Content-Type'
+
+DEFAULT_NAME = 'Mjpeg Camera'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_MJPEG_URL): cv.url,
+    vol.Optional(CONF_AUTHENTICATION, default=HTTP_BASIC_AUTHENTICATION):
+        vol.In([HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION]),
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_PASSWORD): cv.string,
+    vol.Optional(CONF_USERNAME): cv.string,
+})
+

 # pylint: disable=unused-argument
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup a MJPEG IP Camera."""
-    if not validate_config({DOMAIN: config}, {DOMAIN: ['mjpeg_url']},
-                           _LOGGER):
-        return None
+    add_devices([MjpegCamera(config)])

-    add_devices_callback([MjpegCamera(config)])
+
+def extract_image_from_mjpeg(stream):
+    """Take in a MJPEG stream object, return the jpg from it."""
+    data = b''
+    for chunk in stream:
+        data += chunk
+        jpg_start = data.find(b'\xff\xd8')
+        jpg_end = data.find(b'\xff\xd9')
+        if jpg_start != -1 and jpg_end != -1:
+            jpg = data[jpg_start:jpg_end + 2]
+            return jpg


 # pylint: disable=too-many-instance-attributes
@@ -35,36 +59,29 @@ class MjpegCamera(Camera):
    def __init__(self, device_info):
        """Initialize a MJPEG camera."""
        super().__init__()
-        self._name = device_info.get('name', 'Mjpeg Camera')
-        self._username = device_info.get('username')
-        self._password = device_info.get('password')
-        self._mjpeg_url = device_info['mjpeg_url']
+        self._name = device_info.get(CONF_NAME)
+        self._authentication = device_info.get(CONF_AUTHENTICATION)
+        self._username = device_info.get(CONF_USERNAME)
+        self._password = device_info.get(CONF_PASSWORD)
+        self._mjpeg_url = device_info[CONF_MJPEG_URL]

    def camera_stream(self):
        """Return a MJPEG stream image response directly from the camera."""
        if self._username and self._password:
+            if self._authentication == HTTP_DIGEST_AUTHENTICATION:
+                auth = HTTPDigestAuth(self._username, self._password)
+            else:
+                auth = HTTPBasicAuth(self._username, self._password)
            return requests.get(self._mjpeg_url,
-                                auth=HTTPBasicAuth(self._username,
-                                                   self._password),
+                                auth=auth,
                                stream=True, timeout=10)
        else:
            return requests.get(self._mjpeg_url, stream=True, timeout=10)

    def camera_image(self):
        """Return a still image response from the camera."""
-        def process_response(response):
-            """Take in a response object, return the jpg from it."""
-            data = b''
-            for chunk in response.iter_content(1024):
-                data += chunk
-                jpg_start = data.find(b'\xff\xd8')
-                jpg_end = data.find(b'\xff\xd9')
-                if jpg_start != -1 and jpg_end != -1:
-                    jpg = data[jpg_start:jpg_end + 2]
-                    return jpg
-
        with closing(self.camera_stream()) as response:
-            return process_response(response)
+            return extract_image_from_mjpeg(response.iter_content(1024))

    def mjpeg_stream(self, response):
        """Generate an HTTP MJPEG stream from the camera."""
@@ -6,41 +6,54 @@ https://home-assistant.io/components/camera.netatmo/
 """
 import logging
 from datetime import timedelta
+
 import requests
+import voluptuous as vol
+
 from homeassistant.util import Throttle
-
-from homeassistant.components.camera import Camera
+from homeassistant.components.camera import (Camera, PLATFORM_SCHEMA)
 from homeassistant.loader import get_component
+from homeassistant.helpers import config_validation as cv

-DEPENDENCIES = ["netatmo"]
+DEPENDENCIES = ['netatmo']

 _LOGGER = logging.getLogger(__name__)

 CONF_HOME = 'home'
-ATTR_CAMERAS = 'cameras'
+CONF_CAMERAS = 'cameras'

 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=10)

+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_HOME): cv.string,
+    vol.Optional(CONF_CAMERAS, default=[]):
+        vol.All(cv.ensure_list, [cv.string]),
+})
+

 # pylint: disable=unused-argument
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup access to Netatmo Welcome cameras."""
    netatmo = get_component('netatmo')
-    home = config.get(CONF_HOME, None)
-    data = WelcomeData(netatmo.NETATMO_AUTH, home)
+    home = config.get(CONF_HOME)
+    import lnetatmo
+    try:
+        data = WelcomeData(netatmo.NETATMO_AUTH, home)
+    except lnetatmo.NoDevice:
+        return None

    for camera_name in data.get_camera_names():
-        if ATTR_CAMERAS in config:
-            if camera_name not in config[ATTR_CAMERAS]:
+        if config[CONF_CAMERAS] != []:
+            if camera_name not in config[CONF_CAMERAS]:
                continue
-        add_devices_callback([WelcomeCamera(data, camera_name, home)])
+        add_devices([WelcomeCamera(data, camera_name, home)])


 class WelcomeCamera(Camera):
    """Representation of the images published from Welcome camera."""

    def __init__(self, data, camera_name, home):
-        """Setup for access to the BloomSky camera images."""
+        """Setup for access to the Netatmo camera images."""
        super(WelcomeCamera, self).__init__()
        self._data = data
        self._camera_name = camera_name
@@ -9,41 +9,77 @@ import subprocess
 import logging
 import shutil

-from homeassistant.components.camera import Camera
+import voluptuous as vol
+
+from homeassistant.components.camera import (Camera, PLATFORM_SCHEMA)
+from homeassistant.const import (CONF_NAME, CONF_FILE_PATH)
+from homeassistant.helpers import config_validation as cv

 _LOGGER = logging.getLogger(__name__)

+CONF_HORIZONTAL_FLIP = 'horizontal_flip'
+CONF_IMAGE_HEIGHT = 'image_height'
+CONF_IMAGE_QUALITY = 'image_quality'
+CONF_IMAGE_ROTATION = 'image_rotation'
+CONF_IMAGE_WIDTH = 'image_width'
+CONF_TIMELAPSE = 'timelapse'
+CONF_VERTICAL_FLIP = 'vertical_flip'
+
+DEFAULT_HORIZONTAL_FLIP = 0
+DEFAULT_IMAGE_HEIGHT = 480
+DEFAULT_IMAGE_QUALITIY = 7
+DEFAULT_IMAGE_ROTATION = 0
+DEFAULT_IMAGE_WIDTH = 640
+DEFAULT_NAME = 'Raspberry Pi Camera'
+DEFAULT_TIMELAPSE = 1000
+DEFAULT_VERTICAL_FLIP = 0
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_FILE_PATH): cv.isfile,
+    vol.Optional(CONF_HORIZONTAL_FLIP, default=DEFAULT_HORIZONTAL_FLIP):
+        vol.All(vol.Coerce(int), vol.Range(min=0, max=1)),
+    vol.Optional(CONF_IMAGE_HEIGHT, default=DEFAULT_HORIZONTAL_FLIP):
+        vol.Coerce(int),
+    vol.Optional(CONF_IMAGE_QUALITY, default=DEFAULT_IMAGE_QUALITIY):
+        vol.All(vol.Coerce(int), vol.Range(min=0, max=100)),
+    vol.Optional(CONF_IMAGE_ROTATION, default=DEFAULT_IMAGE_ROTATION):
+        vol.All(vol.Coerce(int), vol.Range(min=0, max=359)),
+    vol.Optional(CONF_IMAGE_WIDTH, default=DEFAULT_IMAGE_WIDTH):
+        vol.Coerce(int),
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_TIMELAPSE, default=1000): vol.Coerce(int),
+    vol.Optional(CONF_VERTICAL_FLIP, default=DEFAULT_VERTICAL_FLIP):
+        vol.All(vol.Coerce(int), vol.Range(min=0, max=1)),
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Raspberry Camera."""
    if shutil.which("raspistill") is None:
-        _LOGGER.error("Error: raspistill not found")
+        _LOGGER.error("'raspistill' was not found")
        return False

    setup_config = (
        {
-            "name": config.get("name", "Raspberry Pi Camera"),
-            "image_width": int(config.get("image_width", "640")),
-            "image_height": int(config.get("image_height", "480")),
-            "image_quality": int(config.get("image_quality", "7")),
-            "image_rotation": int(config.get("image_rotation", "0")),
-            "timelapse": int(config.get("timelapse", "2000")),
-            "horizontal_flip": int(config.get("horizontal_flip", "0")),
-            "vertical_flip": int(config.get("vertical_flip", "0")),
-            "file_path": config.get("file_path",
-                                    os.path.join(os.path.dirname(__file__),
-                                                 'image.jpg'))
+            CONF_NAME: config.get(CONF_NAME),
+            CONF_IMAGE_WIDTH: config.get(CONF_IMAGE_WIDTH),
+            CONF_IMAGE_HEIGHT: config.get(CONF_IMAGE_HEIGHT),
+            CONF_IMAGE_QUALITY: config.get(CONF_IMAGE_QUALITY),
+            CONF_IMAGE_ROTATION: config.get(CONF_IMAGE_ROTATION),
+            CONF_TIMELAPSE: config.get(CONF_TIMELAPSE),
+            CONF_HORIZONTAL_FLIP: config.get(CONF_HORIZONTAL_FLIP),
+            CONF_VERTICAL_FLIP: config.get(CONF_VERTICAL_FLIP),
+            CONF_FILE_PATH: config.get(CONF_FILE_PATH,
+                                       os.path.join(os.path.dirname(__file__),
+                                                    'image.jpg'))
        }
    )

-    # check filepath given is writable
-    if not os.access(setup_config["file_path"], os.W_OK):
-        _LOGGER.error("Error: file path is not writable")
+    if not os.access(setup_config[CONF_FILE_PATH], os.W_OK):
+        _LOGGER.error("File path is not writable")
        return False

-    add_devices([
-        RaspberryCamera(setup_config)
-    ])
+    add_devices([RaspberryCamera(setup_config)])


 class RaspberryCamera(Camera):
@@ -53,26 +89,26 @@ class RaspberryCamera(Camera):
        """Initialize Raspberry Pi camera component."""
        super().__init__()

-        self._name = device_info["name"]
+        self._name = device_info[CONF_NAME]
        self._config = device_info

-        # kill if there's raspistill instance
+        # Kill if there's raspistill instance
        subprocess.Popen(['killall', 'raspistill'],
                         stdout=subprocess.DEVNULL,
                         stderr=subprocess.STDOUT)

        cmd_args = [
-            'raspistill', '--nopreview', '-o', str(device_info["file_path"]),
-            '-t', '0', '-w', str(device_info["image_width"]),
-            '-h', str(device_info["image_height"]),
-            '-tl', str(device_info["timelapse"]),
-            '-q', str(device_info["image_quality"]),
-            '-rot', str(device_info["image_rotation"])
+            'raspistill', '--nopreview', '-o', device_info[CONF_FILE_PATH],
+            '-t', '0', '-w', str(device_info[CONF_IMAGE_WIDTH]),
+            '-h', str(device_info[CONF_IMAGE_HEIGHT]),
+            '-tl', str(device_info[CONF_TIMELAPSE]),
+            '-q', str(device_info[CONF_IMAGE_QUALITY]),
+            '-rot', str(device_info[CONF_IMAGE_ROTATION])
        ]
-        if device_info["horizontal_flip"]:
+        if device_info[CONF_HORIZONTAL_FLIP]:
            cmd_args.append("-hf")

-        if device_info["vertical_flip"]:
+        if device_info[CONF_VERTICAL_FLIP]:
            cmd_args.append("-vf")

        subprocess.Popen(cmd_args,
@@ -81,7 +117,7 @@ class RaspberryCamera(Camera):

    def camera_image(self):
        """Return raspstill image response."""
-        with open(self._config["file_path"], 'rb') as file:
+        with open(self._config[CONF_FILE_PATH], 'rb') as file:
            return file.read()

    @property
@@ -8,28 +8,33 @@ import logging
 import socket

 import requests
+import voluptuous as vol

-from homeassistant.components.camera import DOMAIN, Camera
-from homeassistant.helpers import validate_config
+from homeassistant.const import CONF_PORT
+from homeassistant.components.camera import Camera, PLATFORM_SCHEMA
+import homeassistant.helpers.config_validation as cv

 REQUIREMENTS = ['uvcclient==0.9.0']

 _LOGGER = logging.getLogger(__name__)

+CONF_NVR = 'nvr'
+CONF_KEY = 'key'
+
+DEFAULT_PORT = 7080
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_NVR): cv.string,
+    vol.Required(CONF_KEY): cv.string,
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Discover cameras on a Unifi NVR."""
-    if not validate_config({DOMAIN: config}, {DOMAIN: ['nvr', 'key']},
-                           _LOGGER):
-        return None
-
-    addr = config.get('nvr')
-    key = config.get('key')
-    try:
-        port = int(config.get('port', 7080))
-    except ValueError:
-        _LOGGER.error('Invalid port number provided')
-        return False
+    addr = config[CONF_NVR]
+    key = config[CONF_KEY]
+    port = config[CONF_PORT]

    from uvcclient import nvr
    nvrconn = nvr.UVCRemote(addr, port, key)
@@ -0,0 +1,568 @@
+"""
+Provides functionality to interact with climate devices.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/climate/
+"""
+import logging
+import os
+from numbers import Number
+import voluptuous as vol
+
+from homeassistant.helpers.entity_component import EntityComponent
+
+from homeassistant.config import load_yaml_config_file
+from homeassistant.util.temperature import convert as convert_temperature
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import (
+    ATTR_ENTITY_ID, ATTR_TEMPERATURE, STATE_ON, STATE_OFF, STATE_UNKNOWN,
+    TEMP_CELSIUS)
+
+DOMAIN = "climate"
+
+ENTITY_ID_FORMAT = DOMAIN + ".{}"
+SCAN_INTERVAL = 60
+
+SERVICE_SET_AWAY_MODE = "set_away_mode"
+SERVICE_SET_AUX_HEAT = "set_aux_heat"
+SERVICE_SET_TEMPERATURE = "set_temperature"
+SERVICE_SET_FAN_MODE = "set_fan_mode"
+SERVICE_SET_OPERATION_MODE = "set_operation_mode"
+SERVICE_SET_SWING_MODE = "set_swing_mode"
+SERVICE_SET_HUMIDITY = "set_humidity"
+
+STATE_HEAT = "heat"
+STATE_COOL = "cool"
+STATE_IDLE = "idle"
+STATE_AUTO = "auto"
+STATE_DRY = "dry"
+STATE_FAN_ONLY = "fan_only"
+
+ATTR_CURRENT_TEMPERATURE = "current_temperature"
+ATTR_MAX_TEMP = "max_temp"
+ATTR_MIN_TEMP = "min_temp"
+ATTR_TARGET_TEMP_HIGH = "target_temp_high"
+ATTR_TARGET_TEMP_LOW = "target_temp_low"
+ATTR_AWAY_MODE = "away_mode"
+ATTR_AUX_HEAT = "aux_heat"
+ATTR_FAN_MODE = "fan_mode"
+ATTR_FAN_LIST = "fan_list"
+ATTR_CURRENT_HUMIDITY = "current_humidity"
+ATTR_HUMIDITY = "humidity"
+ATTR_MAX_HUMIDITY = "max_humidity"
+ATTR_MIN_HUMIDITY = "min_humidity"
+ATTR_OPERATION_MODE = "operation_mode"
+ATTR_OPERATION_LIST = "operation_list"
+ATTR_SWING_MODE = "swing_mode"
+ATTR_SWING_LIST = "swing_list"
+
+CONVERTIBLE_ATTRIBUTE = [
+    ATTR_TEMPERATURE,
+    ATTR_TARGET_TEMP_LOW,
+    ATTR_TARGET_TEMP_HIGH,
+]
+
+_LOGGER = logging.getLogger(__name__)
+
+SET_AWAY_MODE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_AWAY_MODE): cv.boolean,
+})
+SET_AUX_HEAT_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_AUX_HEAT): cv.boolean,
+})
+SET_TEMPERATURE_SCHEMA = vol.Schema({
+    vol.Exclusive(ATTR_TEMPERATURE, 'temperature'): vol.Coerce(float),
+    vol.Inclusive(ATTR_TARGET_TEMP_HIGH, 'temperature'): vol.Coerce(float),
+    vol.Inclusive(ATTR_TARGET_TEMP_LOW, 'temperature'): vol.Coerce(float),
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_OPERATION_MODE): cv.string,
+})
+SET_FAN_MODE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_FAN_MODE): cv.string,
+})
+SET_OPERATION_MODE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_OPERATION_MODE): cv.string,
+})
+SET_HUMIDITY_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_HUMIDITY): vol.Coerce(float),
+})
+SET_SWING_MODE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_SWING_MODE): cv.string,
+})
+
+
+def set_away_mode(hass, away_mode, entity_id=None):
+    """Turn all or specified climate devices away mode on."""
+    data = {
+        ATTR_AWAY_MODE: away_mode
+    }
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_AWAY_MODE, data)
+
+
+def set_aux_heat(hass, aux_heat, entity_id=None):
+    """Turn all or specified climate devices auxillary heater on."""
+    data = {
+        ATTR_AUX_HEAT: aux_heat
+    }
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_AUX_HEAT, data)
+
+
+# pylint: disable=too-many-arguments
+def set_temperature(hass, temperature=None, entity_id=None,
+                    target_temp_high=None, target_temp_low=None,
+                    operation_mode=None):
+    """Set new target temperature."""
+    kwargs = {
+        key: value for key, value in [
+            (ATTR_TEMPERATURE, temperature),
+            (ATTR_TARGET_TEMP_HIGH, target_temp_high),
+            (ATTR_TARGET_TEMP_LOW, target_temp_low),
+            (ATTR_ENTITY_ID, entity_id),
+            (ATTR_OPERATION_MODE, operation_mode)
+        ] if value is not None
+    }
+    _LOGGER.debug("set_temperature start data=%s", kwargs)
+    hass.services.call(DOMAIN, SERVICE_SET_TEMPERATURE, kwargs)
+
+
+def set_humidity(hass, humidity, entity_id=None):
+    """Set new target humidity."""
+    data = {ATTR_HUMIDITY: humidity}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_HUMIDITY, data)
+
+
+def set_fan_mode(hass, fan, entity_id=None):
+    """Set all or specified climate devices fan mode on."""
+    data = {ATTR_FAN_MODE: fan}
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_FAN_MODE, data)
+
+
+def set_operation_mode(hass, operation_mode, entity_id=None):
+    """Set new target operation mode."""
+    data = {ATTR_OPERATION_MODE: operation_mode}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_OPERATION_MODE, data)
+
+
+def set_swing_mode(hass, swing_mode, entity_id=None):
+    """Set new target swing mode."""
+    data = {ATTR_SWING_MODE: swing_mode}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_SWING_MODE, data)
+
+
+# pylint: disable=too-many-branches
+def setup(hass, config):
+    """Setup climate devices."""
+    component = EntityComponent(_LOGGER, DOMAIN, hass, SCAN_INTERVAL)
+    component.setup(config)
+
+    descriptions = load_yaml_config_file(
+        os.path.join(os.path.dirname(__file__), 'services.yaml'))
+
+    def away_mode_set_service(service):
+        """Set away mode on target climate devices."""
+        target_climate = component.extract_from_service(service)
+
+        away_mode = service.data.get(ATTR_AWAY_MODE)
+
+        if away_mode is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_AWAY_MODE, ATTR_AWAY_MODE)
+            return
+
+        for climate in target_climate:
+            if away_mode:
+                climate.turn_away_mode_on()
+            else:
+                climate.turn_away_mode_off()
+
+            if climate.should_poll:
+                climate.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_AWAY_MODE, away_mode_set_service,
+        descriptions.get(SERVICE_SET_AWAY_MODE),
+        schema=SET_AWAY_MODE_SCHEMA)
+
+    def aux_heat_set_service(service):
+        """Set auxillary heater on target climate devices."""
+        target_climate = component.extract_from_service(service)
+
+        aux_heat = service.data.get(ATTR_AUX_HEAT)
+
+        if aux_heat is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_AUX_HEAT, ATTR_AUX_HEAT)
+            return
+
+        for climate in target_climate:
+            if aux_heat:
+                climate.turn_aux_heat_on()
+            else:
+                climate.turn_aux_heat_off()
+
+            if climate.should_poll:
+                climate.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_AUX_HEAT, aux_heat_set_service,
+        descriptions.get(SERVICE_SET_AUX_HEAT),
+        schema=SET_AUX_HEAT_SCHEMA)
+
+    def temperature_set_service(service):
+        """Set temperature on the target climate devices."""
+        target_climate = component.extract_from_service(service)
+
+        for climate in target_climate:
+            kwargs = {}
+            for value, temp in service.data.items():
+                if value in CONVERTIBLE_ATTRIBUTE:
+                    kwargs[value] = convert_temperature(
+                        temp,
+                        hass.config.units.temperature_unit,
+                        climate.unit_of_measurement
+                    )
+                else:
+                    kwargs[value] = temp
+
+            climate.set_temperature(**kwargs)
+            if climate.should_poll:
+                climate.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_TEMPERATURE, temperature_set_service,
+        descriptions.get(SERVICE_SET_TEMPERATURE),
+        schema=SET_TEMPERATURE_SCHEMA)
+
+    def humidity_set_service(service):
+        """Set humidity on the target climate devices."""
+        target_climate = component.extract_from_service(service)
+
+        humidity = service.data.get(ATTR_HUMIDITY)
+
+        if humidity is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_HUMIDITY, ATTR_HUMIDITY)
+            return
+
+        for climate in target_climate:
+            climate.set_humidity(humidity)
+
+            if climate.should_poll:
+                climate.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_HUMIDITY, humidity_set_service,
+        descriptions.get(SERVICE_SET_HUMIDITY),
+        schema=SET_HUMIDITY_SCHEMA)
+
+    def fan_mode_set_service(service):
+        """Set fan mode on target climate devices."""
+        target_climate = component.extract_from_service(service)
+
+        fan = service.data.get(ATTR_FAN_MODE)
+
+        if fan is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_FAN_MODE, ATTR_FAN_MODE)
+            return
+
+        for climate in target_climate:
+            climate.set_fan_mode(fan)
+
+            if climate.should_poll:
+                climate.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_FAN_MODE, fan_mode_set_service,
+        descriptions.get(SERVICE_SET_FAN_MODE),
+        schema=SET_FAN_MODE_SCHEMA)
+
+    def operation_set_service(service):
+        """Set operating mode on the target climate devices."""
+        target_climate = component.extract_from_service(service)
+
+        operation_mode = service.data.get(ATTR_OPERATION_MODE)
+
+        if operation_mode is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_OPERATION_MODE, ATTR_OPERATION_MODE)
+            return
+
+        for climate in target_climate:
+            climate.set_operation_mode(operation_mode)
+
+            if climate.should_poll:
+                climate.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_OPERATION_MODE, operation_set_service,
+        descriptions.get(SERVICE_SET_OPERATION_MODE),
+        schema=SET_OPERATION_MODE_SCHEMA)
+
+    def swing_set_service(service):
+        """Set swing mode on the target climate devices."""
+        target_climate = component.extract_from_service(service)
+
+        swing_mode = service.data.get(ATTR_SWING_MODE)
+
+        if swing_mode is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_SWING_MODE, ATTR_SWING_MODE)
+            return
+
+        for climate in target_climate:
+            climate.set_swing_mode(swing_mode)
+
+            if climate.should_poll:
+                climate.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_SWING_MODE, swing_set_service,
+        descriptions.get(SERVICE_SET_SWING_MODE),
+        schema=SET_SWING_MODE_SCHEMA)
+    return True
+
+
+class ClimateDevice(Entity):
+    """Representation of a climate device."""
+
+    # pylint: disable=too-many-public-methods,no-self-use
+    @property
+    def state(self):
+        """Return the current state."""
+        return self.current_operation or STATE_UNKNOWN
+
+    @property
+    def state_attributes(self):
+        """Return the optional state attributes."""
+        data = {
+            ATTR_CURRENT_TEMPERATURE:
+            self._convert_for_display(self.current_temperature),
+            ATTR_MIN_TEMP: self._convert_for_display(self.min_temp),
+            ATTR_MAX_TEMP: self._convert_for_display(self.max_temp),
+            ATTR_TEMPERATURE:
+            self._convert_for_display(self.target_temperature),
+        }
+        target_temp_high = self.target_temperature_high
+        if target_temp_high is not None:
+            data[ATTR_TARGET_TEMP_HIGH] = self._convert_for_display(
+                self.target_temperature_high)
+            data[ATTR_TARGET_TEMP_LOW] = self._convert_for_display(
+                self.target_temperature_low)
+
+        humidity = self.target_humidity
+        if humidity is not None:
+            data[ATTR_HUMIDITY] = humidity
+            data[ATTR_CURRENT_HUMIDITY] = self.current_humidity
+            data[ATTR_MIN_HUMIDITY] = self.min_humidity
+            data[ATTR_MAX_HUMIDITY] = self.max_humidity
+
+        fan_mode = self.current_fan_mode
+        if fan_mode is not None:
+            data[ATTR_FAN_MODE] = fan_mode
+            data[ATTR_FAN_LIST] = self.fan_list
+
+        operation_mode = self.current_operation
+        if operation_mode is not None:
+            data[ATTR_OPERATION_MODE] = operation_mode
+            data[ATTR_OPERATION_LIST] = self.operation_list
+
+        swing_mode = self.current_swing_mode
+        if swing_mode is not None:
+            data[ATTR_SWING_MODE] = swing_mode
+            data[ATTR_SWING_LIST] = self.swing_list
+
+        is_away = self.is_away_mode_on
+        if is_away is not None:
+            data[ATTR_AWAY_MODE] = STATE_ON if is_away else STATE_OFF
+
+        is_aux_heat = self.is_aux_heat_on
+        if is_aux_heat is not None:
+            data[ATTR_AUX_HEAT] = STATE_ON if is_aux_heat else STATE_OFF
+
+        return data
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        raise NotImplementedError
+
+    @property
+    def current_humidity(self):
+        """Return the current humidity."""
+        return None
+
+    @property
+    def target_humidity(self):
+        """Return the humidity we try to reach."""
+        return None
+
+    @property
+    def current_operation(self):
+        """Return current operation ie. heat, cool, idle."""
+        return None
+
+    @property
+    def operation_list(self):
+        """List of available operation modes."""
+        return None
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return None
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return None
+
+    @property
+    def target_temperature_high(self):
+        """Return the highbound target temperature we try to reach."""
+        return None
+
+    @property
+    def target_temperature_low(self):
+        """Return the lowbound target temperature we try to reach."""
+        return None
+
+    @property
+    def is_away_mode_on(self):
+        """Return true if away mode is on."""
+        return None
+
+    @property
+    def is_aux_heat_on(self):
+        """Return true if aux heater."""
+        return None
+
+    @property
+    def current_fan_mode(self):
+        """Return the fan setting."""
+        return None
+
+    @property
+    def fan_list(self):
+        """List of available fan modes."""
+        return None
+
+    @property
+    def current_swing_mode(self):
+        """Return the fan setting."""
+        return None
+
+    @property
+    def swing_list(self):
+        """List of available swing modes."""
+        return None
+
+    def set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        raise NotImplementedError()
+
+    def set_humidity(self, humidity):
+        """Set new target humidity."""
+        raise NotImplementedError()
+
+    def set_fan_mode(self, fan):
+        """Set new target fan mode."""
+        raise NotImplementedError()
+
+    def set_operation_mode(self, operation_mode):
+        """Set new target operation mode."""
+        raise NotImplementedError()
+
+    def set_swing_mode(self, swing_mode):
+        """Set new target swing operation."""
+        raise NotImplementedError()
+
+    def turn_away_mode_on(self):
+        """Turn away mode on."""
+        raise NotImplementedError()
+
+    def turn_away_mode_off(self):
+        """Turn away mode off."""
+        raise NotImplementedError()
+
+    def turn_aux_heat_on(self):
+        """Turn auxillary heater on."""
+        raise NotImplementedError()
+
+    def turn_aux_heat_off(self):
+        """Turn auxillary heater off."""
+        raise NotImplementedError()
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature."""
+        return convert_temperature(7, TEMP_CELSIUS, self.unit_of_measurement)
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature."""
+        return convert_temperature(35, TEMP_CELSIUS, self.unit_of_measurement)
+
+    @property
+    def min_humidity(self):
+        """Return the minimum humidity."""
+        return 30
+
+    @property
+    def max_humidity(self):
+        """Return the maximum humidity."""
+        return 99
+
+    def _convert_for_display(self, temp):
+        """Convert temperature into preferred units for display purposes."""
+        if temp is None or not isinstance(temp, Number):
+            return temp
+
+        value = convert_temperature(temp, self.unit_of_measurement,
+                                    self.hass.config.units.temperature_unit)
+
+        if self.hass.config.units.temperature_unit is TEMP_CELSIUS:
+            decimal_count = 1
+        else:
+            # Users of fahrenheit generally expect integer units.
+            decimal_count = 0
+
+        return round(value, decimal_count)
@@ -0,0 +1,184 @@
+"""
+Demo platform that offers a fake climate device.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/demo/
+"""
+from homeassistant.components.climate import (
+    ClimateDevice, ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW)
+from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Demo climate devices."""
+    add_devices([
+        DemoClimate("HeatPump", 68, TEMP_FAHRENHEIT, None, 77, "Auto Low",
+                    None, None, "Auto", "heat", None, None, None),
+        DemoClimate("Hvac", 21, TEMP_CELSIUS, True, 22, "On High",
+                    67, 54, "Off", "cool", False, None, None),
+        DemoClimate("Ecobee", None, TEMP_CELSIUS, None, 23, "Auto Low",
+                    None, None, "Auto", "auto", None, 24, 21)
+    ])
+
+
+# pylint: disable=too-many-arguments, too-many-public-methods
+class DemoClimate(ClimateDevice):
+    """Representation of a demo climate device."""
+
+    # pylint: disable=too-many-instance-attributes
+    def __init__(self, name, target_temperature, unit_of_measurement,
+                 away, current_temperature, current_fan_mode,
+                 target_humidity, current_humidity, current_swing_mode,
+                 current_operation, aux, target_temp_high, target_temp_low):
+        """Initialize the climate device."""
+        self._name = name
+        self._target_temperature = target_temperature
+        self._target_humidity = target_humidity
+        self._unit_of_measurement = unit_of_measurement
+        self._away = away
+        self._current_temperature = current_temperature
+        self._current_humidity = current_humidity
+        self._current_fan_mode = current_fan_mode
+        self._current_operation = current_operation
+        self._aux = aux
+        self._current_swing_mode = current_swing_mode
+        self._fan_list = ["On Low", "On High", "Auto Low", "Auto High", "Off"]
+        self._operation_list = ["heat", "cool", "auto", "off"]
+        self._swing_list = ["Auto", "1", "2", "3", "Off"]
+        self._target_temperature_high = target_temp_high
+        self._target_temperature_low = target_temp_low
+
+    @property
+    def should_poll(self):
+        """Polling not needed for a demo climate device."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the climate device."""
+        return self._name
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return self._unit_of_measurement
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self._current_temperature
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self._target_temperature
+
+    @property
+    def target_temperature_high(self):
+        """Return the highbound target temperature we try to reach."""
+        return self._target_temperature_high
+
+    @property
+    def target_temperature_low(self):
+        """Return the lowbound target temperature we try to reach."""
+        return self._target_temperature_low
+
+    @property
+    def current_humidity(self):
+        """Return the current humidity."""
+        return self._current_humidity
+
+    @property
+    def target_humidity(self):
+        """Return the humidity we try to reach."""
+        return self._target_humidity
+
+    @property
+    def current_operation(self):
+        """Return current operation ie. heat, cool, idle."""
+        return self._current_operation
+
+    @property
+    def operation_list(self):
+        """List of available operation modes."""
+        return self._operation_list
+
+    @property
+    def is_away_mode_on(self):
+        """Return if away mode is on."""
+        return self._away
+
+    @property
+    def is_aux_heat_on(self):
+        """Return true if away mode is on."""
+        return self._aux
+
+    @property
+    def current_fan_mode(self):
+        """Return the fan setting."""
+        return self._current_fan_mode
+
+    @property
+    def fan_list(self):
+        """List of available fan modes."""
+        return self._fan_list
+
+    def set_temperature(self, **kwargs):
+        """Set new target temperatures."""
+        if kwargs.get(ATTR_TEMPERATURE) is not None:
+            self._target_temperature = kwargs.get(ATTR_TEMPERATURE)
+        if kwargs.get(ATTR_TARGET_TEMP_HIGH) is not None and \
+           kwargs.get(ATTR_TARGET_TEMP_LOW) is not None:
+            self._target_temperature_high = kwargs.get(ATTR_TARGET_TEMP_HIGH)
+            self._target_temperature_low = kwargs.get(ATTR_TARGET_TEMP_LOW)
+        self.update_ha_state()
+
+    def set_humidity(self, humidity):
+        """Set new target temperature."""
+        self._target_humidity = humidity
+        self.update_ha_state()
+
+    def set_swing_mode(self, swing_mode):
+        """Set new target temperature."""
+        self._current_swing_mode = swing_mode
+        self.update_ha_state()
+
+    def set_fan_mode(self, fan):
+        """Set new target temperature."""
+        self._current_fan_mode = fan
+        self.update_ha_state()
+
+    def set_operation_mode(self, operation_mode):
+        """Set new target temperature."""
+        self._current_operation = operation_mode
+        self.update_ha_state()
+
+    @property
+    def current_swing_mode(self):
+        """Return the swing setting."""
+        return self._current_swing_mode
+
+    @property
+    def swing_list(self):
+        """List of available swing modes."""
+        return self._swing_list
+
+    def turn_away_mode_on(self):
+        """Turn away mode on."""
+        self._away = True
+        self.update_ha_state()
+
+    def turn_away_mode_off(self):
+        """Turn away mode off."""
+        self._away = False
+        self.update_ha_state()
+
+    def turn_aux_heat_on(self):
+        """Turn away auxillary heater on."""
+        self._aux = True
+        self.update_ha_state()
+
+    def turn_aux_heat_off(self):
+        """Turn auxillary heater off."""
+        self._aux = False
+        self.update_ha_state()
@@ -0,0 +1,271 @@
+"""
+Platform for Ecobee Thermostats.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.ecobee/
+"""
+import logging
+from os import path
+
+import voluptuous as vol
+
+from homeassistant.components import ecobee
+from homeassistant.components.climate import (
+    DOMAIN, STATE_COOL, STATE_HEAT, STATE_IDLE, ClimateDevice,
+    ATTR_TARGET_TEMP_LOW, ATTR_TARGET_TEMP_HIGH)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, STATE_OFF, STATE_ON, TEMP_FAHRENHEIT, TEMP_CELSIUS)
+from homeassistant.config import load_yaml_config_file
+import homeassistant.helpers.config_validation as cv
+
+_CONFIGURING = {}
+_LOGGER = logging.getLogger(__name__)
+
+ATTR_FAN_MIN_ON_TIME = 'fan_min_on_time'
+
+DEPENDENCIES = ['ecobee']
+
+SERVICE_SET_FAN_MIN_ON_TIME = 'ecobee_set_fan_min_on_time'
+
+SET_FAN_MIN_ON_TIME_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_FAN_MIN_ON_TIME): vol.Coerce(int),
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Ecobee Thermostat Platform."""
+    if discovery_info is None:
+        return
+    data = ecobee.NETWORK
+    hold_temp = discovery_info['hold_temp']
+    _LOGGER.info(
+        "Loading ecobee thermostat component with hold_temp set to %s",
+        hold_temp)
+    devices = [Thermostat(data, index, hold_temp)
+               for index in range(len(data.ecobee.thermostats))]
+    add_devices(devices)
+
+    def fan_min_on_time_set_service(service):
+        """Set the minimum fan on time on the target thermostats."""
+        entity_id = service.data.get('entity_id')
+
+        if entity_id:
+            target_thermostats = [device for device in devices
+                                  if device.entity_id == entity_id]
+        else:
+            target_thermostats = devices
+
+        fan_min_on_time = service.data[ATTR_FAN_MIN_ON_TIME]
+
+        for thermostat in target_thermostats:
+            thermostat.set_fan_min_on_time(str(fan_min_on_time))
+
+            thermostat.update_ha_state(True)
+
+    descriptions = load_yaml_config_file(
+        path.join(path.dirname(__file__), 'services.yaml'))
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_FAN_MIN_ON_TIME, fan_min_on_time_set_service,
+        descriptions.get(SERVICE_SET_FAN_MIN_ON_TIME),
+        schema=SET_FAN_MIN_ON_TIME_SCHEMA)
+
+
+# pylint: disable=too-many-public-methods, abstract-method
+class Thermostat(ClimateDevice):
+    """A thermostat class for Ecobee."""
+
+    def __init__(self, data, thermostat_index, hold_temp):
+        """Initialize the thermostat."""
+        self.data = data
+        self.thermostat_index = thermostat_index
+        self.thermostat = self.data.ecobee.get_thermostat(
+            self.thermostat_index)
+        self._name = self.thermostat['name']
+        self.hold_temp = hold_temp
+        self._operation_list = ['auto', 'auxHeatOnly', 'cool',
+                                'heat', 'off']
+        self.update_without_throttle = False
+
+    def update(self):
+        """Get the latest state from the thermostat."""
+        if self.update_without_throttle:
+            self.data.update(no_throttle=True)
+            self.update_without_throttle = False
+        else:
+            self.data.update()
+
+        self.thermostat = self.data.ecobee.get_thermostat(
+            self.thermostat_index)
+
+    @property
+    def name(self):
+        """Return the name of the Ecobee Thermostat."""
+        return self.thermostat['name']
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        if self.thermostat['settings']['useCelsius']:
+            return TEMP_CELSIUS
+        else:
+            return TEMP_FAHRENHEIT
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self.thermostat['runtime']['actualTemperature'] / 10
+
+    @property
+    def target_temperature_low(self):
+        """Return the lower bound temperature we try to reach."""
+        return int(self.thermostat['runtime']['desiredHeat'] / 10)
+
+    @property
+    def target_temperature_high(self):
+        """Return the upper bound temperature we try to reach."""
+        return int(self.thermostat['runtime']['desiredCool'] / 10)
+
+    @property
+    def desired_fan_mode(self):
+        """Return the desired fan mode of operation."""
+        return self.thermostat['runtime']['desiredFanMode']
+
+    @property
+    def fan(self):
+        """Return the current fan state."""
+        if 'fan' in self.thermostat['equipmentStatus']:
+            return STATE_ON
+        else:
+            return STATE_OFF
+
+    @property
+    def current_operation(self):
+        """Return current operation."""
+        if self.operation_mode == 'auxHeatOnly' or \
+           self.operation_mode == 'heatPump':
+            return STATE_HEAT
+        else:
+            return self.operation_mode
+
+    @property
+    def operation_list(self):
+        """Return the operation modes list."""
+        return self._operation_list
+
+    @property
+    def operation_mode(self):
+        """Return current operation ie. heat, cool, idle."""
+        return self.thermostat['settings']['hvacMode']
+
+    @property
+    def mode(self):
+        """Return current mode ie. home, away, sleep."""
+        return self.thermostat['program']['currentClimateRef']
+
+    @property
+    def fan_min_on_time(self):
+        """Return current fan minimum on time."""
+        return self.thermostat['settings']['fanMinOnTime']
+
+    @property
+    def device_state_attributes(self):
+        """Return device specific state attributes."""
+        # Move these to Thermostat Device and make them global
+        status = self.thermostat['equipmentStatus']
+        operation = None
+        if status == '':
+            operation = STATE_IDLE
+        elif 'Cool' in status:
+            operation = STATE_COOL
+        elif 'auxHeat' in status:
+            operation = STATE_HEAT
+        elif 'heatPump' in status:
+            operation = STATE_HEAT
+        else:
+            operation = status
+        return {
+            "actual_humidity": self.thermostat['runtime']['actualHumidity'],
+            "fan": self.fan,
+            "mode": self.mode,
+            "operation": operation,
+            "fan_min_on_time": self.fan_min_on_time
+        }
+
+    @property
+    def is_away_mode_on(self):
+        """Return true if away mode is on."""
+        mode = self.mode
+        events = self.thermostat['events']
+        for event in events:
+            if event['running']:
+                mode = event['holdClimateRef']
+                break
+        return 'away' in mode
+
+    def turn_away_mode_on(self):
+        """Turn away on."""
+        if self.hold_temp:
+            self.data.ecobee.set_climate_hold(self.thermostat_index,
+                                              "away", "indefinite")
+        else:
+            self.data.ecobee.set_climate_hold(self.thermostat_index, "away")
+        self.update_without_throttle = True
+
+    def turn_away_mode_off(self):
+        """Turn away off."""
+        self.data.ecobee.resume_program(self.thermostat_index)
+        self.update_without_throttle = True
+
+    def set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        if kwargs.get(ATTR_TARGET_TEMP_LOW) is not None and \
+           kwargs.get(ATTR_TARGET_TEMP_HIGH) is not None:
+            high_temp = int(kwargs.get(ATTR_TARGET_TEMP_LOW))
+            low_temp = int(kwargs.get(ATTR_TARGET_TEMP_HIGH))
+
+        if self.hold_temp:
+            self.data.ecobee.set_hold_temp(self.thermostat_index, low_temp,
+                                           high_temp, "indefinite")
+            _LOGGER.debug("Setting ecobee hold_temp to: low=%s, is=%s, "
+                          "high=%s, is=%s", low_temp, isinstance(
+                              low_temp, (int, float)), high_temp,
+                          isinstance(high_temp, (int, float)))
+        else:
+            self.data.ecobee.set_hold_temp(self.thermostat_index, low_temp,
+                                           high_temp)
+            _LOGGER.debug("Setting ecobee temp to: low=%s, is=%s, "
+                          "high=%s, is=%s", low_temp, isinstance(
+                              low_temp, (int, float)), high_temp,
+                          isinstance(high_temp, (int, float)))
+        self.update_without_throttle = True
+
+    def set_operation_mode(self, operation_mode):
+        """Set HVAC mode (auto, auxHeatOnly, cool, heat, off)."""
+        self.data.ecobee.set_hvac_mode(self.thermostat_index, operation_mode)
+        self.update_without_throttle = True
+
+    def set_fan_min_on_time(self, fan_min_on_time):
+        """Set the minimum fan on time."""
+        self.data.ecobee.set_fan_min_on_time(self.thermostat_index,
+                                             fan_min_on_time)
+        self.update_without_throttle = True
+
+    # Home and Sleep mode aren't used in UI yet:
+
+    # def turn_home_mode_on(self):
+    #     """ Turns home mode on. """
+    #     self.data.ecobee.set_climate_hold(self.thermostat_index, "home")
+
+    # def turn_home_mode_off(self):
+    #     """ Turns home mode off. """
+    #     self.data.ecobee.resume_program(self.thermostat_index)
+
+    # def turn_sleep_mode_on(self):
+    #     """ Turns sleep mode on. """
+    #     self.data.ecobee.set_climate_hold(self.thermostat_index, "sleep")
+
+    # def turn_sleep_mode_off(self):
+    #     """ Turns sleep mode off. """
+    #     self.data.ecobee.resume_program(self.thermostat_index)
@@ -0,0 +1,90 @@
+"""
+Support for eq3 Bluetooth Smart thermostats.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.eq3btsmart/
+"""
+import logging
+
+from homeassistant.components.climate import ClimateDevice
+from homeassistant.const import TEMP_CELSIUS, CONF_DEVICES, ATTR_TEMPERATURE
+from homeassistant.util.temperature import convert
+
+REQUIREMENTS = ['bluepy_devices==0.2.0']
+
+CONF_MAC = 'mac'
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the eq3 BLE thermostats."""
+    devices = []
+
+    for name, device_cfg in config[CONF_DEVICES].items():
+        mac = device_cfg[CONF_MAC]
+        devices.append(EQ3BTSmartThermostat(mac, name))
+
+    add_devices(devices)
+
+
+# pylint: disable=too-many-instance-attributes, import-error, abstract-method
+class EQ3BTSmartThermostat(ClimateDevice):
+    """Representation of a EQ3 Bluetooth Smart thermostat."""
+
+    def __init__(self, _mac, _name):
+        """Initialize the thermostat."""
+        from bluepy_devices.devices import eq3btsmart
+
+        self._name = _name
+
+        self._thermostat = eq3btsmart.EQ3BTSmartThermostat(_mac)
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement that is used."""
+        return TEMP_CELSIUS
+
+    @property
+    def current_temperature(self):
+        """Can not report temperature, so return target_temperature."""
+        return self.target_temperature
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self._thermostat.target_temperature
+
+    def set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        temperature = kwargs.get(ATTR_TEMPERATURE)
+        if temperature is None:
+            return
+        self._thermostat.target_temperature = temperature
+
+    @property
+    def device_state_attributes(self):
+        """Return the device specific state attributes."""
+        return {"mode": self._thermostat.mode,
+                "mode_readable": self._thermostat.mode_readable}
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature."""
+        return convert(self._thermostat.min_temp, TEMP_CELSIUS,
+                       self.unit_of_measurement)
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature."""
+        return convert(self._thermostat.max_temp, TEMP_CELSIUS,
+                       self.unit_of_measurement)
+
+    def update(self):
+        """Update the data from the thermostat."""
+        self._thermostat.update()
@@ -0,0 +1,220 @@
+"""
+Adds support for generic thermostat units.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.generic_thermostat/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components import switch
+from homeassistant.components.climate import (
+    STATE_HEAT, STATE_COOL, STATE_IDLE, ClimateDevice, PLATFORM_SCHEMA)
+from homeassistant.const import (
+    ATTR_UNIT_OF_MEASUREMENT, STATE_ON, STATE_OFF, ATTR_TEMPERATURE)
+from homeassistant.helpers import condition
+from homeassistant.helpers.event import track_state_change
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['switch', 'sensor']
+
+TOL_TEMP = 0.3
+
+CONF_NAME = 'name'
+DEFAULT_NAME = 'Generic Thermostat'
+CONF_HEATER = 'heater'
+CONF_SENSOR = 'target_sensor'
+CONF_MIN_TEMP = 'min_temp'
+CONF_MAX_TEMP = 'max_temp'
+CONF_TARGET_TEMP = 'target_temp'
+CONF_AC_MODE = 'ac_mode'
+CONF_MIN_DUR = 'min_cycle_duration'
+
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HEATER): cv.entity_id,
+    vol.Required(CONF_SENSOR): cv.entity_id,
+    vol.Optional(CONF_AC_MODE): cv.boolean,
+    vol.Optional(CONF_MAX_TEMP): vol.Coerce(float),
+    vol.Optional(CONF_MIN_DUR): vol.All(cv.time_period, cv.positive_timedelta),
+    vol.Optional(CONF_MIN_TEMP): vol.Coerce(float),
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_TARGET_TEMP): vol.Coerce(float),
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the generic thermostat."""
+    name = config.get(CONF_NAME)
+    heater_entity_id = config.get(CONF_HEATER)
+    sensor_entity_id = config.get(CONF_SENSOR)
+    min_temp = config.get(CONF_MIN_TEMP)
+    max_temp = config.get(CONF_MAX_TEMP)
+    target_temp = config.get(CONF_TARGET_TEMP)
+    ac_mode = config.get(CONF_AC_MODE)
+    min_cycle_duration = config.get(CONF_MIN_DUR)
+
+    add_devices([GenericThermostat(
+        hass, name, heater_entity_id, sensor_entity_id, min_temp, max_temp,
+        target_temp, ac_mode, min_cycle_duration)])
+
+
+# pylint: disable=too-many-instance-attributes, abstract-method
+class GenericThermostat(ClimateDevice):
+    """Representation of a GenericThermostat device."""
+
+    # pylint: disable=too-many-arguments
+    def __init__(self, hass, name, heater_entity_id, sensor_entity_id,
+                 min_temp, max_temp, target_temp, ac_mode, min_cycle_duration):
+        """Initialize the thermostat."""
+        self.hass = hass
+        self._name = name
+        self.heater_entity_id = heater_entity_id
+        self.ac_mode = ac_mode
+        self.min_cycle_duration = min_cycle_duration
+
+        self._active = False
+        self._cur_temp = None
+        self._min_temp = min_temp
+        self._max_temp = max_temp
+        self._target_temp = target_temp
+        self._unit = hass.config.units.temperature_unit
+
+        track_state_change(hass, sensor_entity_id, self._sensor_changed)
+
+        sensor_state = hass.states.get(sensor_entity_id)
+        if sensor_state:
+            self._update_temp(sensor_state)
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the thermostat."""
+        return self._name
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return self._unit
+
+    @property
+    def current_temperature(self):
+        """Return the sensor temperature."""
+        return self._cur_temp
+
+    @property
+    def current_operation(self):
+        """Return current operation ie. heat, cool, idle."""
+        if self.ac_mode:
+            cooling = self._active and self._is_device_active
+            return STATE_COOL if cooling else STATE_IDLE
+        else:
+            heating = self._active and self._is_device_active
+            return STATE_HEAT if heating else STATE_IDLE
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self._target_temp
+
+    def set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        temperature = kwargs.get(ATTR_TEMPERATURE)
+        if temperature is None:
+            return
+        self._target_temp = temperature
+        self._control_heating()
+        self.update_ha_state()
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature."""
+        # pylint: disable=no-member
+        if self._min_temp:
+            return self._min_temp
+        else:
+            # get default temp from super class
+            return ClimateDevice.min_temp.fget(self)
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature."""
+        # pylint: disable=no-member
+        if self._min_temp:
+            return self._max_temp
+        else:
+            # Get default temp from super class
+            return ClimateDevice.max_temp.fget(self)
+
+    def _sensor_changed(self, entity_id, old_state, new_state):
+        """Called when temperature changes."""
+        if new_state is None:
+            return
+
+        self._update_temp(new_state)
+        self._control_heating()
+        self.update_ha_state()
+
+    def _update_temp(self, state):
+        """Update thermostat with latest state from sensor."""
+        unit = state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+
+        try:
+            self._cur_temp = self.hass.config.units.temperature(
+                float(state.state), unit)
+        except ValueError as ex:
+            _LOGGER.error('Unable to update from sensor: %s', ex)
+
+    def _control_heating(self):
+        """Check if we need to turn heating on or off."""
+        if not self._active and None not in (self._cur_temp,
+                                             self._target_temp):
+            self._active = True
+            _LOGGER.info('Obtained current and target temperature. '
+                         'Generic thermostat active.')
+
+        if not self._active:
+            return
+
+        if self.min_cycle_duration:
+            if self._is_device_active:
+                current_state = STATE_ON
+            else:
+                current_state = STATE_OFF
+            long_enough = condition.state(self.hass, self.heater_entity_id,
+                                          current_state,
+                                          self.min_cycle_duration)
+            if not long_enough:
+                return
+
+        if self.ac_mode:
+            too_hot = self._cur_temp - self._target_temp > TOL_TEMP
+            is_cooling = self._is_device_active
+            if too_hot and not is_cooling:
+                _LOGGER.info('Turning on AC %s', self.heater_entity_id)
+                switch.turn_on(self.hass, self.heater_entity_id)
+            elif not too_hot and is_cooling:
+                _LOGGER.info('Turning off AC %s', self.heater_entity_id)
+                switch.turn_off(self.hass, self.heater_entity_id)
+        else:
+            too_cold = self._target_temp - self._cur_temp > TOL_TEMP
+            is_heating = self._is_device_active
+
+            if too_cold and not is_heating:
+                _LOGGER.info('Turning on heater %s', self.heater_entity_id)
+                switch.turn_on(self.hass, self.heater_entity_id)
+            elif not too_cold and is_heating:
+                _LOGGER.info('Turning off heater %s', self.heater_entity_id)
+                switch.turn_off(self.hass, self.heater_entity_id)
+
+    @property
+    def _is_device_active(self):
+        """If the toggleable device is currently active."""
+        return switch.is_on(self.hass, self.heater_entity_id)
@@ -0,0 +1,116 @@
+"""
+Support for the PRT Heatmiser themostats using the V3 protocol.
+
+See https://github.com/andylockran/heatmiserV3 for more info on the
+heatmiserV3 module dependency.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.heatmiser/
+"""
+import logging
+
+from homeassistant.components.climate import ClimateDevice
+from homeassistant.const import TEMP_CELSIUS, ATTR_TEMPERATURE
+
+CONF_IPADDRESS = 'ipaddress'
+CONF_PORT = 'port'
+CONF_TSTATS = 'tstats'
+
+REQUIREMENTS = ["heatmiserV3==0.9.1"]
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the heatmiser thermostat."""
+    from heatmiserV3 import heatmiser, connection
+
+    ipaddress = str(config[CONF_IPADDRESS])
+    port = str(config[CONF_PORT])
+
+    if ipaddress is None or port is None:
+        _LOGGER.error("Missing required configuration items %s or %s",
+                      CONF_IPADDRESS, CONF_PORT)
+        return False
+
+    serport = connection.connection(ipaddress, port)
+    serport.open()
+
+    tstats = []
+    if CONF_TSTATS in config:
+        tstats = config[CONF_TSTATS]
+
+    if tstats is None:
+        _LOGGER.error("No thermostats configured.")
+        return False
+
+    for tstat in tstats:
+        add_devices([
+            HeatmiserV3Thermostat(
+                heatmiser,
+                tstat.get("id"),
+                tstat.get("name"),
+                serport)
+            ])
+    return
+
+
+class HeatmiserV3Thermostat(ClimateDevice):
+    """Representation of a HeatmiserV3 thermostat."""
+
+    # pylint: disable=too-many-instance-attributes, abstract-method
+    def __init__(self, heatmiser, device, name, serport):
+        """Initialize the thermostat."""
+        self.heatmiser = heatmiser
+        self.device = device
+        self.serport = serport
+        self._current_temperature = None
+        self._name = name
+        self._id = device
+        self.dcb = None
+        self.update()
+        self._target_temperature = int(self.dcb.get("roomset"))
+
+    @property
+    def name(self):
+        """Return the name of the thermostat, if any."""
+        return self._name
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement which this thermostat uses."""
+        return TEMP_CELSIUS
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        if self.dcb is not None:
+            low = self.dcb.get("floortemplow ")
+            high = self.dcb.get("floortemphigh")
+            temp = (high*256 + low)/10.0
+            self._current_temperature = temp
+        else:
+            self._current_temperature = None
+        return self._current_temperature
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self._target_temperature
+
+    def set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        temperature = kwargs.get(ATTR_TEMPERATURE)
+        if temperature is None:
+            return
+        self.heatmiser.hmSendAddress(
+            self._id,
+            18,
+            temperature,
+            1,
+            self.serport)
+        self._target_temperature = temperature
+
+    def update(self):
+        """Get the latest data."""
+        self.dcb = self.heatmiser.hmReadAddress(self._id, 'prt', self.serport)
@@ -0,0 +1,133 @@
+"""
+Support for Homematic thermostats.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.homematic/
+"""
+import logging
+import homeassistant.components.homematic as homematic
+from homeassistant.components.climate import ClimateDevice, STATE_AUTO
+from homeassistant.util.temperature import convert
+from homeassistant.const import TEMP_CELSIUS, STATE_UNKNOWN, ATTR_TEMPERATURE
+
+DEPENDENCIES = ['homematic']
+
+STATE_MANUAL = "manual"
+STATE_BOOST = "boost"
+
+HM_STATE_MAP = {
+    "AUTO_MODE": STATE_AUTO,
+    "MANU_MODE": STATE_MANUAL,
+    "BOOST_MODE": STATE_BOOST,
+}
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_callback_devices, discovery_info=None):
+    """Setup the Homematic thermostat platform."""
+    if discovery_info is None:
+        return
+
+    return homematic.setup_hmdevice_discovery_helper(
+        HMThermostat,
+        discovery_info,
+        add_callback_devices
+    )
+
+
+# pylint: disable=abstract-method
+class HMThermostat(homematic.HMDevice, ClimateDevice):
+    """Representation of a Homematic thermostat."""
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement that is used."""
+        return TEMP_CELSIUS
+
+    @property
+    def current_operation(self):
+        """Return current operation ie. heat, cool, idle."""
+        if not self.available:
+            return None
+
+        # read state and search
+        for mode, state in HM_STATE_MAP.items():
+            code = getattr(self._hmdevice, mode, 0)
+            if self._data.get('CONTROL_MODE') == code:
+                return state
+
+    @property
+    def operation_list(self):
+        """List of available operation modes."""
+        if not self.available:
+            return None
+        op_list = []
+
+        # generate list
+        for mode in self._hmdevice.ACTIONNODE:
+            if mode in HM_STATE_MAP:
+                op_list.append(HM_STATE_MAP.get(mode))
+
+        return op_list
+
+    @property
+    def current_humidity(self):
+        """Return the current humidity."""
+        if not self.available:
+            return None
+        return self._data.get('ACTUAL_HUMIDITY', None)
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        if not self.available:
+            return None
+        return self._data.get('ACTUAL_TEMPERATURE', None)
+
+    @property
+    def target_temperature(self):
+        """Return the target temperature."""
+        if not self.available:
+            return None
+        return self._data.get('SET_TEMPERATURE', None)
+
+    def set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        temperature = kwargs.get(ATTR_TEMPERATURE)
+        if not self.available:
+            return None
+        if temperature is None:
+            return
+
+        if self.current_operation == STATE_AUTO:
+            return self._hmdevice.actionNodeData('MANU_MODE', temperature)
+        self._hmdevice.set_temperature(temperature)
+
+    def set_operation_mode(self, operation_mode):
+        """Set new target operation mode."""
+        for mode, state in HM_STATE_MAP.items():
+            if state == operation_mode:
+                code = getattr(self._hmdevice, mode, 0)
+                self._hmdevice.MODE = code
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature - 4.5 means off."""
+        return convert(4.5, TEMP_CELSIUS, self.unit_of_measurement)
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature - 30.5 means on."""
+        return convert(30.5, TEMP_CELSIUS, self.unit_of_measurement)
+
+    def _init_data_struct(self):
+        """Generate a data dict (self._data) from the Homematic metadata."""
+        # Add state to data dict
+        self._data.update({"CONTROL_MODE": STATE_UNKNOWN,
+                           "SET_TEMPERATURE": STATE_UNKNOWN,
+                           "ACTUAL_TEMPERATURE": STATE_UNKNOWN})
+
+        # support humidity
+        if 'ACTUAL_HUMIDITY' in self._hmdevice.SENSORNODE:
+            self._data.update({'ACTUAL_HUMIDITY': STATE_UNKNOWN})
--- a/Show More
+++ b/Show More