diff --git a/config/configuration.yaml.example b/config/configuration.yaml.example index c758833d336..49886682507 100644 --- a/config/configuration.yaml.example +++ b/config/configuration.yaml.example @@ -120,4 +120,22 @@ sensor: - type: 'memory_free' - type: 'processor_use' - type: 'process' - arg: 'octave-cli' \ No newline at end of file + arg: 'octave-cli' + +script: + # Turns on the bedroom lights and then the living room lights 1 minute later + wakeup: + alias: Wake Up + sequence: + # alias is optional + - alias: Bedroom lights on + execute_service: light.turn_on + service_data: + entity_id: group.bedroom + - delay: + # supports seconds, milliseconds, minutes, hours, etc. + minutes: 1 + - alias: Living room lights on + execute_service: light.turn_on + service_data: + entity_id: group.living_room diff --git a/homeassistant/__init__.py b/homeassistant/__init__.py index 354898c0319..0d41e7dd2e6 100644 --- a/homeassistant/__init__.py +++ b/homeassistant/__init__.py @@ -115,6 +115,7 @@ class HomeAssistant(object): action(now) self.bus.listen(EVENT_TIME_CHANGED, point_in_time_listener) + return point_in_time_listener # pylint: disable=too-many-arguments def track_time_change(self, action, @@ -154,6 +155,7 @@ class HomeAssistant(object): action(event.data[ATTR_NOW]) self.bus.listen(EVENT_TIME_CHANGED, time_listener) + return time_listener def stop(self): """ Stops Home Assistant and shuts down all threads. """ diff --git a/homeassistant/components/frontend/version.py b/homeassistant/components/frontend/version.py index f809049ea45..993fd80c040 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 = "08fb2ffccc72d7bfa0ad3478f2e8cfe7" +VERSION = "da527496648e2c85d7a5f8c261c18466" diff --git a/homeassistant/components/frontend/www_static/frontend.html b/homeassistant/components/frontend/www_static/frontend.html index b63964b7690..c8f20e327bd 100644 --- a/homeassistant/components/frontend/www_static/frontend.html +++ b/homeassistant/components/frontend/www_static/frontend.html @@ -1,10 +1,12 @@ -
- - -It looks like we have nothing to show you right now. It could be that we have not yet discovered all your devices but it is more likely that you have not configured Home Assistant yet.
Please see the Getting Started section on how to setup your devices. -
Fire an event on the event bus. -
+
Call a service from a component. -
+
{{stateObj.attributes.description}}
{{stateObj.attributes.errors}}