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

Zwave: add power_consumption attribute (#6067)

Browse source 
* Zwave: Pull power consumption value into attribute.

* Zwave: Add power_consumption attribute.

* fix condition

* Update __init__.py

* Update

* Simplify class condition

* Handle empty class_id
This commit is contained in:
Andrey 2017-02-19 02:51:13 +02:00 • committed by Paulus Schoutsen
parent 003815c91a
commit beb8b4b11f
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
homeassistant/components/zwave/__init__.py
View file

@ -43,6 +43,8 @@ CONF_DEVICE_CONFIG = 'device_config'
CONF_DEVICE_CONFIG_GLOB = 'device_config_glob'
CONF_DEVICE_CONFIG_DOMAIN = 'device_config_domain'
ATTR_POWER = 'power_consumption'
DEFAULT_CONF_AUTOHEAL = True
DEFAULT_CONF_USB_STICK_PATH = '/zwaveusbstick'
DEFAULT_POLLING_INTERVAL = 60000
@ -704,6 +706,12 @@ class ZWaveDeviceEntity(Entity):
self.wakeup_interval = self.get_value(
class_id=const.COMMAND_CLASS_WAKE_UP,
member='data')
power_value = self.get_value(
class_id=[const.COMMAND_CLASS_SENSOR_MULTILEVEL,
const.COMMAND_CLASS_METER],
label=['Power'])
self.power_consumption = round(
power_value.data, power_value.precision) if power_value else None
def _value_handler(self, method=None, class_id=None, index=None,
label=None, data=None, member=None, **kwargs):
@ -712,16 +720,20 @@ class ZWaveDeviceEntity(Entity):
May only be used inside callback.
"""
if class_id is not None:
kwargs[CLASS_ID] = class_id
values = []
if class_id is None:
values.extend(self._value.node.get_values(**kwargs).values())
else:
if not isinstance(class_id, list):
class_id = [class_id]
for cid in class_id:
values.extend(self._value.node.get_values(
class_id=cid, **kwargs).values())
_LOGGER.debug('method=%s, class_id=%s, index=%s, label=%s, data=%s,'
' member=%s, kwargs=%s',
method, class_id, index, label, data, member, kwargs)
values = self._value.node.get_values(**kwargs).values()
_LOGGER.debug('values=%s', values)
results = None
if not values:
return None
for value in values:
if index is not None and value.index != index:
continue
@ -798,4 +810,7 @@ class ZWaveDeviceEntity(Entity):
if self.wakeup_interval is not None:
attrs[ATTR_WAKEUP] = self.wakeup_interval
if self.power_consumption is not None:
attrs[ATTR_POWER] = self.power_consumption
return attrs