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

Fixed the z-wave trigger sensor workaround

Browse source
This commit is contained in:
Stefan Jonasson 2016-02-24 22:44:49 +01:00
parent 04b48e0683
commit db06d5a03d
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
homeassistant/components/binary_sensor/zwave.py
View file

@ -55,7 +55,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
]) ])
elif value.command_class == COMMAND_CLASS_SENSOR_BINARY: elif value.command_class == COMMAND_CLASS_SENSOR_BINARY:
add_devices([ZWaveBinarySensor(value, "opening")]) add_devices([ZWaveBinarySensor(value, None)])
class ZWaveBinarySensor(BinarySensorDevice, ZWaveDeviceEntity): class ZWaveBinarySensor(BinarySensorDevice, ZWaveDeviceEntity):
@ -102,32 +102,30 @@ class ZWaveTriggerSensor(ZWaveBinarySensor):
def __init__(self, sensor_value, sensor_class, hass, re_arm_sec=60): def __init__(self, sensor_value, sensor_class, hass, re_arm_sec=60):
super(ZWaveTriggerSensor, self).__init__(sensor_value, sensor_class) super(ZWaveTriggerSensor, self).__init__(sensor_value, sensor_class)
self._hass = hass self._hass = hass
self.invalidate_after = dt_util.utcnow()
self.re_arm_sec = re_arm_sec self.re_arm_sec = re_arm_sec
self.invalidate_after = dt_util.utcnow() + datetime.timedelta(
seconds=self.re_arm_sec)
# If it's active make sure that we set the timeout tracker
if sensor_value.data:
track_point_in_time(
self._hass, self.update_ha_state,
self.invalidate_after)
def value_changed(self, value): def value_changed(self, value):
"""Called when a value has changed on the network.""" """Called when a value has changed on the network."""
if self._value.value_id == value.value_id: if self._value.value_id == value.value_id:
self.update_ha_state() self.update_ha_state()
if value.data: if value.data:
# only allow this value to be true for 60 secs # only allow this value to be true for re_arm secs
self.invalidate_after = dt_util.utcnow() + datetime.timedelta( self.invalidate_after = dt_util.utcnow() + datetime.timedelta(
seconds=self.re_arm_sec) seconds=self.re_arm_sec)
track_point_in_time( track_point_in_time(
self._hass, self.update_ha_state, self._hass, self.update_ha_state,
self.invalidate_after) self.invalidate_after)
@property
def state(self):
"""Returns the state of the sensor."""
if not self._value.data or \
(self.invalidate_after is not None and
self.invalidate_after <= dt_util.utcnow()):
return False
return True
@property @property
def is_on(self): def is_on(self):
"""Return True if the binary sensor is on.""" """Return True if movement has happened within the rearm time."""
return self.state return self._value.data and \
(self.invalidate_after is None or
self.invalidate_after > dt_util.utcnow())