Merge branch 'dev'

This commit is contained in:
Paulus Schoutsen 2015-06-13 09:52:25 -07:00
commit 187da3a743
6 changed files with 340 additions and 275 deletions

View file

@ -8,6 +8,22 @@ Example component to target an entity_id to:
- turn it off if all lights are turned off
- turn it off if all people leave the house
- offer a service to turn it on for 10 seconds
Configuration:
To use the Example custom component you will need to add the following to
your config/configuration.yaml
example:
target: TARGET_ENTITY
Variable:
target
*Required
TARGET_ENTITY should be one of your devices that can be turned on and off,
ie a light or a switch. Example value could be light.Ceiling or switch.AC
(if you have these devices with those names).
"""
import time
import logging
@ -31,6 +47,7 @@ CONF_TARGET = 'target'
# Name of the service that we expose
SERVICE_FLASH = 'flash'
# Shortcut for the logger
_LOGGER = logging.getLogger(__name__)

View file

@ -3,6 +3,14 @@ custom_components.hello_world
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Implements the bare minimum that a component should implement.
Configuration:
To use the hello_word component you will need to add the following to your
config/configuration.yaml
hello_world:
"""
# The domain of your component. Should be equal to the name of your component

View file

@ -1,2 +1,2 @@
""" DO NOT MODIFY. Auto-generated by build_frontend script """
VERSION = "ddf42f54c15daf472d4c8641fab8d418"
VERSION = "db1ec3e116565340804da0e590058d60"

File diff suppressed because it is too large Load diff

View file

@ -38,9 +38,7 @@
},
listeners: {
// listening for click instead of tap as a work around
// https://github.com/PolymerElements/iron-overlay-behavior/issues/14
'click': 'cardTapped',
'tap': 'cardTapped',
},
cardTapped: function() {

View file

@ -97,5 +97,5 @@ def setup(hass, config):
hass.bus.listen_once(EVENT_HOMEASSISTANT_START, start_modbus)
# Tells the bootstrapper that the component was succesfully initialized
# Tells the bootstrapper that the component was successfully initialized
return True