diff --git a/homeassistant/components/xbee/__init__.py b/homeassistant/components/xbee/__init__.py index e6175a4dccf..6373cfa7535 100644 --- a/homeassistant/components/xbee/__init__.py +++ b/homeassistant/components/xbee/__init__.py @@ -21,9 +21,9 @@ from homeassistant.helpers import config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect, dispatcher_send from homeassistant.helpers.entity import Entity -_LOGGER = logging.getLogger(__name__) +from .const import DOMAIN -DOMAIN = "xbee" +_LOGGER = logging.getLogger(__name__) SIGNAL_XBEE_FRAME_RECEIVED = "xbee_frame_received" @@ -59,7 +59,6 @@ PLATFORM_SCHEMA = vol.Schema( def setup(hass, config): """Set up the connection to the XBee Zigbee device.""" - usb_device = config[DOMAIN].get(CONF_DEVICE, DEFAULT_DEVICE) baud = int(config[DOMAIN].get(CONF_BAUD, DEFAULT_BAUD)) try: diff --git a/homeassistant/components/xbee/binary_sensor.py b/homeassistant/components/xbee/binary_sensor.py index 47c7515ddc7..01095822d1f 100644 --- a/homeassistant/components/xbee/binary_sensor.py +++ b/homeassistant/components/xbee/binary_sensor.py @@ -3,12 +3,8 @@ import voluptuous as vol from homeassistant.components.binary_sensor import BinarySensorEntity -from . import DOMAIN, PLATFORM_SCHEMA, XBeeDigitalIn, XBeeDigitalInConfig - -CONF_ON_STATE = "on_state" - -DEFAULT_ON_STATE = "high" -STATES = ["high", "low"] +from . import PLATFORM_SCHEMA, XBeeDigitalIn, XBeeDigitalInConfig +from .const import CONF_ON_STATE, DOMAIN, STATES PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({vol.Optional(CONF_ON_STATE): vol.In(STATES)}) diff --git a/homeassistant/components/xbee/const.py b/homeassistant/components/xbee/const.py new file mode 100644 index 00000000000..a77e71e92f5 --- /dev/null +++ b/homeassistant/components/xbee/const.py @@ -0,0 +1,5 @@ +"""Constants for the xbee integration.""" +CONF_ON_STATE = "on_state" +DEFAULT_ON_STATE = "high" +DOMAIN = "xbee" +STATES = ["high", "low"] diff --git a/homeassistant/components/xbee/light.py b/homeassistant/components/xbee/light.py index 76ed8120166..859feee495b 100644 --- a/homeassistant/components/xbee/light.py +++ b/homeassistant/components/xbee/light.py @@ -3,12 +3,8 @@ import voluptuous as vol from homeassistant.components.light import LightEntity -from . import DOMAIN, PLATFORM_SCHEMA, XBeeDigitalOut, XBeeDigitalOutConfig - -CONF_ON_STATE = "on_state" - -DEFAULT_ON_STATE = "high" -STATES = ["high", "low"] +from . import PLATFORM_SCHEMA, XBeeDigitalOut, XBeeDigitalOutConfig +from .const import CONF_ON_STATE, DEFAULT_ON_STATE, DOMAIN, STATES PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( {vol.Optional(CONF_ON_STATE, default=DEFAULT_ON_STATE): vol.In(STATES)} diff --git a/homeassistant/components/xbee/sensor.py b/homeassistant/components/xbee/sensor.py index 4a392691032..4d9f9ca518b 100644 --- a/homeassistant/components/xbee/sensor.py +++ b/homeassistant/components/xbee/sensor.py @@ -5,14 +5,13 @@ import logging import voluptuous as vol from xbee_helper.exceptions import ZigBeeException, ZigBeeTxFailure -from homeassistant.const import TEMP_CELSIUS +from homeassistant.const import CONF_TYPE, TEMP_CELSIUS from homeassistant.helpers.entity import Entity from . import DOMAIN, PLATFORM_SCHEMA, XBeeAnalogIn, XBeeAnalogInConfig, XBeeConfig _LOGGER = logging.getLogger(__name__) -CONF_TYPE = "type" CONF_MAX_VOLTS = "max_volts" DEFAULT_VOLTS = 1.2 diff --git a/homeassistant/components/xbee/switch.py b/homeassistant/components/xbee/switch.py index cdb0d2677c5..b97d9f315d5 100644 --- a/homeassistant/components/xbee/switch.py +++ b/homeassistant/components/xbee/switch.py @@ -3,13 +3,8 @@ import voluptuous as vol from homeassistant.components.switch import SwitchEntity -from . import DOMAIN, PLATFORM_SCHEMA, XBeeDigitalOut, XBeeDigitalOutConfig - -CONF_ON_STATE = "on_state" - -DEFAULT_ON_STATE = "high" - -STATES = ["high", "low"] +from . import PLATFORM_SCHEMA, XBeeDigitalOut, XBeeDigitalOutConfig +from .const import CONF_ON_STATE, DOMAIN, STATES PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({vol.Optional(CONF_ON_STATE): vol.In(STATES)})