Merge branch 'pr/1969' into dev

Conflicts:
	homeassistant/components/zwave.py

homeassistant/components/lock/__init__.py

@@ -18,7 +18,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (
     ATTR_CODE, ATTR_CODE_FORMAT, ATTR_ENTITY_ID, STATE_LOCKED, STATE_UNLOCKED,
     STATE_UNKNOWN, SERVICE_LOCK, SERVICE_UNLOCK)
-from homeassistant.components import (group, verisure, wink)
+from homeassistant.components import (group, verisure, wink, zwave)
 
 DOMAIN = 'lock'
 SCAN_INTERVAL = 30
@@ -33,7 +33,8 @@ MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
 # Maps discovered services to their platforms
 DISCOVERY_PLATFORMS = {
     wink.DISCOVER_LOCKS: 'wink',
-    verisure.DISCOVER_LOCKS: 'verisure'
+    verisure.DISCOVER_LOCKS: 'verisure',
+    zwave.DISCOVER_LOCKS: 'zwave',
 }
 
 LOCK_SERVICE_SCHEMA = vol.Schema({

homeassistant/components/lock/zwave.py

@@ -0,0 +1,64 @@
+"""
+Zwave platform that handles simple door locks.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/lock.zwave/
+"""
+# Because we do not compile openzwave on CI
+# pylint: disable=import-error
+from homeassistant.components.lock import DOMAIN, LockDevice
+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 zwave.NETWORK is None:
+        return
+
+    node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]]
+    value = node.values[discovery_info[zwave.ATTR_VALUE_ID]]
+
+    if value.command_class != zwave.COMMAND_CLASS_DOOR_LOCK:
+        return
+    if value.type != zwave.TYPE_BOOL:
+        return
+    if value.genre != zwave.GENRE_USER:
+        return
+
+    value.set_change_verified(False)
+    add_devices([ZwaveLock(value)])
+
+
+class ZwaveLock(zwave.ZWaveDeviceEntity, LockDevice):
+    """Representation of a Z-Wave switch."""
+
+    def __init__(self, value):
+        """Initialize the Z-Wave switch device."""
+        from openzwave.network import ZWaveNetwork
+        from pydispatch import dispatcher
+
+        zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN)
+
+        self._state = value.data
+        dispatcher.connect(
+            self._value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED)
+
+    def _value_changed(self, value):
+        """Called when a value has changed on the network."""
+        if self._value.value_id == value.value_id:
+            self._state = value.data
+            self.update_ha_state()
+
+    @property
+    def is_locked(self):
+        """Return true if device is locked."""
+        return self._state
+
+    def lock(self, **kwargs):
+        """Lock the device."""
+        self._value.data = True
+
+    def unlock(self, **kwargs):
+        """Unlock the device."""
+        self._value.data = False

homeassistant/components/zwave.py

@@ -40,11 +40,12 @@ DISCOVER_LIGHTS = "zwave.light"
 DISCOVER_BINARY_SENSORS = 'zwave.binary_sensor'
 DISCOVER_THERMOSTATS = 'zwave.thermostat'
 DISCOVER_HVAC = 'zwave.hvac'
+DISCOVER_LOCKS = 'zwave.lock'
 
 EVENT_SCENE_ACTIVATED = "zwave.scene_activated"
 
 COMMAND_CLASS_SWITCH_MULTILEVEL = 38
-
+COMMAND_CLASS_DOOR_LOCK = 98
 COMMAND_CLASS_SWITCH_BINARY = 37
 COMMAND_CLASS_SENSOR_BINARY = 48
 COMMAND_CLASS_SENSOR_MULTILEVEL = 49
@@ -93,11 +94,19 @@ DISCOVERY_COMPONENTS = [
      [COMMAND_CLASS_THERMOSTAT_SETPOINT],
      TYPE_WHATEVER,
      GENRE_WHATEVER),
+<<<<<<< HEAD
     ('hvac',
      DISCOVER_HVAC,
      [COMMAND_CLASS_THERMOSTAT_FAN_MODE],
      TYPE_WHATEVER,
      GENRE_WHATEVER),
+=======
+    ('lock',
+     DISCOVER_LOCKS,
+     [COMMAND_CLASS_DOOR_LOCK],
+     TYPE_BOOL,
+     GENRE_USER),
+>>>>>>> pr/1969
 ]