diff --git a/homeassistant/components/binary_sensor/zwave.py b/homeassistant/components/binary_sensor/zwave.py index ac846cb8df2..14268e1c124 100644 --- a/homeassistant/components/binary_sensor/zwave.py +++ b/homeassistant/components/binary_sensor/zwave.py @@ -8,11 +8,7 @@ import logging import datetime import homeassistant.util.dt as dt_util from homeassistant.helpers.event import track_point_in_time - -from homeassistant.components.zwave import ( - ATTR_NODE_ID, ATTR_VALUE_ID, - COMMAND_CLASS_SENSOR_BINARY, NETWORK, - ZWaveDeviceEntity, get_config_value) +from homeassistant.components import zwave from homeassistant.components.binary_sensor import ( DOMAIN, BinarySensorDevice) @@ -36,11 +32,11 @@ DEVICE_MAPPINGS = { def setup_platform(hass, config, add_devices, discovery_info=None): """Setup the Z-Wave platform for sensors.""" - if discovery_info is None or NETWORK is None: + if discovery_info is None or zwave.NETWORK is None: return - node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]] - value = node.values[discovery_info[ATTR_VALUE_ID]] + node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]] + value = node.values[discovery_info[zwave.ATTR_VALUE_ID]] value.set_change_verified(False) # Make sure that we have values for the key before converting to int @@ -53,18 +49,19 @@ def setup_platform(hass, config, add_devices, discovery_info=None): if specific_sensor_key in DEVICE_MAPPINGS: if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_NO_OFF_EVENT: # Default the multiplier to 4 - re_arm_multiplier = (get_config_value(value.node, 9) or 4) + re_arm_multiplier = (zwave.get_config_value(value.node, + 9) or 4) add_devices([ ZWaveTriggerSensor(value, "motion", hass, re_arm_multiplier * 8) ]) return - if value.command_class == COMMAND_CLASS_SENSOR_BINARY: + if value.command_class == zwave.COMMAND_CLASS_SENSOR_BINARY: add_devices([ZWaveBinarySensor(value, None)]) -class ZWaveBinarySensor(BinarySensorDevice, ZWaveDeviceEntity): +class ZWaveBinarySensor(BinarySensorDevice, zwave.ZWaveDeviceEntity): """Representation of a binary sensor within Z-Wave.""" def __init__(self, value, sensor_class): @@ -74,7 +71,7 @@ class ZWaveBinarySensor(BinarySensorDevice, ZWaveDeviceEntity): from openzwave.network import ZWaveNetwork from pydispatch import dispatcher - ZWaveDeviceEntity.__init__(self, value, DOMAIN) + zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN) dispatcher.connect( self.value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED) diff --git a/homeassistant/components/light/zwave.py b/homeassistant/components/light/zwave.py index cab531c255d..c91a2ddd489 100644 --- a/homeassistant/components/light/zwave.py +++ b/homeassistant/components/light/zwave.py @@ -9,25 +9,23 @@ https://home-assistant.io/components/light.zwave/ from threading import Timer from homeassistant.components.light import ATTR_BRIGHTNESS, DOMAIN, Light -from homeassistant.components.zwave import ( - ATTR_NODE_ID, ATTR_VALUE_ID, COMMAND_CLASS_SWITCH_MULTILEVEL, GENRE_USER, - NETWORK, TYPE_BYTE, ZWaveDeviceEntity) +from homeassistant.components import zwave from homeassistant.const import STATE_OFF, STATE_ON def setup_platform(hass, config, add_devices, discovery_info=None): """Find and add Z-Wave lights.""" - if discovery_info is None or NETWORK is None: + if discovery_info is None or zwave.NETWORK is None: return - node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]] - value = node.values[discovery_info[ATTR_VALUE_ID]] + node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]] + value = node.values[discovery_info[zwave.ATTR_VALUE_ID]] - if value.command_class != COMMAND_CLASS_SWITCH_MULTILEVEL: + if value.command_class != zwave.COMMAND_CLASS_SWITCH_MULTILEVEL: return - if value.type != TYPE_BYTE: + if value.type != zwave.TYPE_BYTE: return - if value.genre != GENRE_USER: + if value.genre != zwave.GENRE_USER: return value.set_change_verified(False) @@ -42,7 +40,7 @@ def brightness_state(value): return 255, STATE_OFF -class ZwaveDimmer(ZWaveDeviceEntity, Light): +class ZwaveDimmer(zwave.ZWaveDeviceEntity, Light): """Representation of a Z-Wave dimmer.""" # pylint: disable=too-many-arguments @@ -51,7 +49,7 @@ class ZwaveDimmer(ZWaveDeviceEntity, Light): from openzwave.network import ZWaveNetwork from pydispatch import dispatcher - ZWaveDeviceEntity.__init__(self, value, DOMAIN) + zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN) self._brightness, self._state = brightness_state(value) diff --git a/homeassistant/components/sensor/zwave.py b/homeassistant/components/sensor/zwave.py index 370ac794221..a044e38c27d 100644 --- a/homeassistant/components/sensor/zwave.py +++ b/homeassistant/components/sensor/zwave.py @@ -7,10 +7,7 @@ at https://home-assistant.io/components/sensor.zwave/ # Because we do not compile openzwave on CI # pylint: disable=import-error from homeassistant.components.sensor import DOMAIN -from homeassistant.components.zwave import ( - ATTR_NODE_ID, ATTR_VALUE_ID, COMMAND_CLASS_ALARM, COMMAND_CLASS_METER, - COMMAND_CLASS_SENSOR_MULTILEVEL, NETWORK, - TYPE_DECIMAL, ZWaveDeviceEntity) +from homeassistant.components import zwave from homeassistant.const import (TEMP_CELCIUS, TEMP_FAHRENHEIT) from homeassistant.helpers.entity import Entity @@ -37,11 +34,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None): # platform: zwave # # `setup_platform` will be called without `discovery_info`. - if discovery_info is None or NETWORK is None: + if discovery_info is None or zwave.NETWORK is None: return - node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]] - value = node.values[discovery_info[ATTR_VALUE_ID]] + node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]] + value = node.values[discovery_info[zwave.ATTR_VALUE_ID]] value.set_change_verified(False) @@ -62,18 +59,18 @@ def setup_platform(hass, config, add_devices, discovery_info=None): return # Generic Device mappings - if value.command_class == COMMAND_CLASS_SENSOR_MULTILEVEL: + if value.command_class == zwave.COMMAND_CLASS_SENSOR_MULTILEVEL: add_devices([ZWaveMultilevelSensor(value)]) - elif (value.command_class == COMMAND_CLASS_METER and - value.type == TYPE_DECIMAL): + elif (value.command_class == zwave.COMMAND_CLASS_METER and + value.type == zwave.TYPE_DECIMAL): add_devices([ZWaveMultilevelSensor(value)]) - elif value.command_class == COMMAND_CLASS_ALARM: + elif value.command_class == zwave.COMMAND_CLASS_ALARM: add_devices([ZWaveAlarmSensor(value)]) -class ZWaveSensor(ZWaveDeviceEntity, Entity): +class ZWaveSensor(zwave.ZWaveDeviceEntity, Entity): """Representation of a Z-Wave sensor.""" def __init__(self, sensor_value): @@ -81,7 +78,7 @@ class ZWaveSensor(ZWaveDeviceEntity, Entity): from openzwave.network import ZWaveNetwork from pydispatch import dispatcher - ZWaveDeviceEntity.__init__(self, sensor_value, DOMAIN) + zwave.ZWaveDeviceEntity.__init__(self, sensor_value, DOMAIN) dispatcher.connect( self.value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED) diff --git a/homeassistant/components/switch/zwave.py b/homeassistant/components/switch/zwave.py index cd9c65a49b8..f59d830f4c0 100644 --- a/homeassistant/components/switch/zwave.py +++ b/homeassistant/components/switch/zwave.py @@ -7,32 +7,30 @@ https://home-assistant.io/components/switch.zwave/ # Because we do not compile openzwave on CI # pylint: disable=import-error from homeassistant.components.switch import DOMAIN, SwitchDevice -from homeassistant.components.zwave import ( - ATTR_NODE_ID, ATTR_VALUE_ID, COMMAND_CLASS_SWITCH_BINARY, GENRE_USER, - NETWORK, TYPE_BOOL, ZWaveDeviceEntity) +from homeassistant.components import zwave # pylint: disable=unused-argument def setup_platform(hass, config, add_devices, discovery_info=None): """Find and return Z-Wave switches.""" - if discovery_info is None or NETWORK is None: + if discovery_info is None or zwave.NETWORK is None: return - node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]] - value = node.values[discovery_info[ATTR_VALUE_ID]] + node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]] + value = node.values[discovery_info[zwave.ATTR_VALUE_ID]] - if value.command_class != COMMAND_CLASS_SWITCH_BINARY: + if value.command_class != zwave.COMMAND_CLASS_SWITCH_BINARY: return - if value.type != TYPE_BOOL: + if value.type != zwave.TYPE_BOOL: return - if value.genre != GENRE_USER: + if value.genre != zwave.GENRE_USER: return value.set_change_verified(False) add_devices([ZwaveSwitch(value)]) -class ZwaveSwitch(ZWaveDeviceEntity, SwitchDevice): +class ZwaveSwitch(zwave.ZWaveDeviceEntity, SwitchDevice): """Representation of a Z-Wave switch.""" def __init__(self, value): @@ -40,7 +38,7 @@ class ZwaveSwitch(ZWaveDeviceEntity, SwitchDevice): from openzwave.network import ZWaveNetwork from pydispatch import dispatcher - ZWaveDeviceEntity.__init__(self, value, DOMAIN) + zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN) self._state = value.data dispatcher.connect( diff --git a/homeassistant/components/thermostat/zwave.py b/homeassistant/components/thermostat/zwave.py index fe6ff05203d..bd17ae208f1 100644 --- a/homeassistant/components/thermostat/zwave.py +++ b/homeassistant/components/thermostat/zwave.py @@ -6,9 +6,7 @@ from homeassistant.components.thermostat import DOMAIN from homeassistant.components.thermostat import ( ThermostatDevice, STATE_IDLE) -from homeassistant.components.zwave import ( - ATTR_NODE_ID, ATTR_VALUE_ID, NETWORK, - ZWaveDeviceEntity) +from homeassistant.components import zwave from homeassistant.const import (TEMP_FAHRENHEIT, TEMP_CELCIUS) CONF_NAME = 'name' @@ -17,24 +15,24 @@ DEFAULT_NAME = 'ZWave Thermostat' def setup_platform(hass, config, add_devices, discovery_info=None): """Setup the ZWave thermostats.""" - if discovery_info is None or NETWORK is None: + if discovery_info is None or zwave.NETWORK is None: return - node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]] - value = node.values[discovery_info[ATTR_VALUE_ID]] + node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]] + value = node.values[discovery_info[zwave.ATTR_VALUE_ID]] value.set_change_verified(False) add_devices([ZWaveThermostat(value)]) # pylint: disable=too-many-arguments -class ZWaveThermostat(ZWaveDeviceEntity, ThermostatDevice): +class ZWaveThermostat(zwave.ZWaveDeviceEntity, ThermostatDevice): """Represents a HeatControl thermostat.""" def __init__(self, value): """Initialize the zwave thermostat.""" from openzwave.network import ZWaveNetwork from pydispatch import dispatcher - ZWaveDeviceEntity.__init__(self, value, DOMAIN) + zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN) self._node = value.node self._target_temperature = None self._current_temperature = None