diff --git a/homeassistant/components/alarm_control_panel/__init__.py b/homeassistant/components/alarm_control_panel/__init__.py index 8755d65e26e..49eb5eafba7 100644 --- a/homeassistant/components/alarm_control_panel/__init__.py +++ b/homeassistant/components/alarm_control_panel/__init__.py @@ -4,12 +4,15 @@ homeassistant.components.alarm_control_panel Component to interface with a alarm control panel. """ import logging -from homeassistant.helpers.entity import Entity -from homeassistant.helpers.entity_component import EntityComponent +import os + from homeassistant.components import verisure from homeassistant.const import ( ATTR_ENTITY_ID, SERVICE_ALARM_DISARM, SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_ARM_AWAY) +from homeassistant.config import load_yaml_config_file +from homeassistant.helpers.entity import Entity +from homeassistant.helpers.entity_component import EntityComponent DOMAIN = 'alarm_control_panel' DEPENDENCIES = [] @@ -59,8 +62,12 @@ def setup(hass, config): for alarm in target_alarms: getattr(alarm, method)(code) + descriptions = load_yaml_config_file( + os.path.join(os.path.dirname(__file__), 'services.yaml')) + for service in SERVICE_TO_METHOD: - hass.services.register(DOMAIN, service, alarm_service_handler) + hass.services.register(DOMAIN, service, alarm_service_handler, + descriptions.get(service)) return True diff --git a/homeassistant/components/alarm_control_panel/services.yaml b/homeassistant/components/alarm_control_panel/services.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/homeassistant/components/demo.py b/homeassistant/components/demo.py index f0ce2259dc4..f22135ec5bc 100644 --- a/homeassistant/components/demo.py +++ b/homeassistant/components/demo.py @@ -60,7 +60,7 @@ def setup(hass, config): {'camera': { 'platform': 'generic', 'name': 'IP Camera', - 'still_image_url': 'http://194.218.96.92/jpg/image.jpg', + 'still_image_url': 'http://home-assistant.io/demo/webcam.jpg', }}) # Setup scripts diff --git a/homeassistant/components/device_tracker/__init__.py b/homeassistant/components/device_tracker/__init__.py index 27e9417ab5b..d716422b38c 100644 --- a/homeassistant/components/device_tracker/__init__.py +++ b/homeassistant/components/device_tracker/__init__.py @@ -175,7 +175,10 @@ def setup(hass, config): ATTR_GPS, ATTR_GPS_ACCURACY, ATTR_BATTERY)} tracker.see(**args) - hass.services.register(DOMAIN, SERVICE_SEE, see_service) + descriptions = load_yaml_config_file( + os.path.join(os.path.dirname(__file__), 'services.yaml')) + hass.services.register(DOMAIN, SERVICE_SEE, see_service, + descriptions.get(SERVICE_SEE)) return True diff --git a/homeassistant/components/device_tracker/services.yaml b/homeassistant/components/device_tracker/services.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/homeassistant/components/frontend/version.py b/homeassistant/components/frontend/version.py index 721eeaf78b7..b6cebfbb296 100644 --- a/homeassistant/components/frontend/version.py +++ b/homeassistant/components/frontend/version.py @@ -1,2 +1,2 @@ """ DO NOT MODIFY. Auto-generated by build_frontend script """ -VERSION = "5ba745608f6271b781fc41c1e8f8deb0" +VERSION = "1dae3a2fb4ea4ff853d0d0c647f0ac51" diff --git a/homeassistant/components/frontend/www_static/frontend.html b/homeassistant/components/frontend/www_static/frontend.html index d7c8ed1a8cc..656c9e44797 100644 --- a/homeassistant/components/frontend/www_static/frontend.html +++ b/homeassistant/components/frontend/www_static/frontend.html @@ -5733,14 +5733,19 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN a { color: var(--accent-color); - }[[domain.domain]]/[[service]][[domain]]/[[service]]Call ServiceCall a service from a component.Call ServiceAvailable services:Call ServiceCall a service from a component.Call Service[[description]]Available services:UpdateView on GitHubUpdated On:[[stateObj.attributes.date]]Release Notes:[[stateObj.attributes.message]]Remote SHA:[[stateObj.attributes.remote_sha]]Local SHA:[[stateObj.attributes.local_sha]]DisarmArm HomeArm AwayUpdateView on GitHubUpdated On:[[stateObj.attributes.date]]Release Notes:[[stateObj.attributes.message]]Remote SHA:[[stateObj.attributes.remote_sha]]Local SHA:[[stateObj.attributes.local_sha]]DisarmArm HomeArm Away
Call a service from a component.