evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use constants (#3148)

Browse source
This commit is contained in:
Fabian Affolter 2016-09-03 00:09:14 +02:00 • committed by GitHub
parent b5ae005acc
commit 6ae4e5cb6c
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
homeassistant/components/switch/orvibo.py
View file

@ -8,34 +8,32 @@ import logging
import voluptuous as vol import voluptuous as vol
from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
from homeassistant.const import (
CONF_HOST, CONF_NAME, CONF_SWITCHES, CONF_MAC, CONF_DISCOVERY)
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
REQUIREMENTS = ['orvibo==1.1.1'] REQUIREMENTS = ['orvibo==1.1.1']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
CONF_SWITCHES = 'switches'
CONF_HOST = 'host'
CONF_NAME = 'name'
CONF_MAC = 'mac'
CONF_DISCOVERY = 'discovery'
DEFAULT_NAME = 'Orvibo S20 Switch' DEFAULT_NAME = 'Orvibo S20 Switch'
DEFAULT_DISCOVERY = True DEFAULT_DISCOVERY = True
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_DISCOVERY, default=DEFAULT_DISCOVERY): cv.boolean,
vol.Required(CONF_SWITCHES, default=[]): vol.Required(CONF_SWITCHES, default=[]):
vol.All(cv.ensure_list, [{ vol.All(cv.ensure_list, [{
vol.Required(CONF_HOST): cv.string, vol.Required(CONF_HOST): cv.string,
vol.Optional(CONF_MAC): cv.string, vol.Optional(CONF_MAC): cv.string,
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string
}]) }]),
vol.Optional(CONF_DISCOVERY, default=DEFAULT_DISCOVERY): cv.boolean,
}) })
# pylint: disable=unused-argument # pylint: disable=unused-argument
def setup_platform(hass, config, add_devices_callback, discovery_info=None): def setup_platform(hass, config, add_devices_callback, discovery_info=None):
"""Find and return S20 switches.""" """Setup S20 switches."""
from orvibo.s20 import discover, S20, S20Exception from orvibo.s20 import discover, S20, S20Exception
switch_data = {} switch_data = {}
@ -51,7 +49,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
for host, data in switch_data.items(): for host, data in switch_data.items():
try: try:
switches.append(S20Switch(data.get(CONF_NAME, DEFAULT_NAME), switches.append(S20Switch(data.get(CONF_NAME),
S20(host, mac=data.get(CONF_MAC)))) S20(host, mac=data.get(CONF_MAC))))
_LOGGER.info("Initialized S20 at %s", host) _LOGGER.info("Initialized S20 at %s", host)
except S20Exception: except S20Exception:

2
homeassistant/const.py
View file

@ -41,6 +41,7 @@ CONF_CUSTOMIZE = 'customize'
CONF_DEVICE = 'device' CONF_DEVICE = 'device'
CONF_DEVICES = 'devices' CONF_DEVICES = 'devices'
CONF_DISARM_AFTER_TRIGGER = 'disarm_after_trigger' CONF_DISARM_AFTER_TRIGGER = 'disarm_after_trigger'
CONF_DISCOVERY = 'discovery'
CONF_DISPLAY_OPTIONS = 'display_options' CONF_DISPLAY_OPTIONS = 'display_options'
CONF_ELEVATION = 'elevation' CONF_ELEVATION = 'elevation'
CONF_ENTITY_ID = 'entity_id' CONF_ENTITY_ID = 'entity_id'
@ -55,6 +56,7 @@ CONF_ICON = 'icon'
CONF_ID = 'id' CONF_ID = 'id'
CONF_LATITUDE = 'latitude' CONF_LATITUDE = 'latitude'
CONF_LONGITUDE = 'longitude' CONF_LONGITUDE = 'longitude'
CONF_MAC = 'mac'
CONF_METHOD = 'method' CONF_METHOD = 'method'
CONF_MONITORED_CONDITIONS = 'monitored_conditions' CONF_MONITORED_CONDITIONS = 'monitored_conditions'
CONF_MONITORED_VARIABLES = 'monitored_variables' CONF_MONITORED_VARIABLES = 'monitored_variables'