jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-14 00:37:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

deCONZ - new sensor attribute 'on' and new sensor GenericFlag (#15247)

Browse Source 
* New sensor attribute 'on'
* New sensor GenericFlag
This commit is contained in:
Robert Svensson 2018-07-02 23:14:38 +02:00 committed by GitHub
parent 120111ceee
commit bedd2d7e41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/components/binary_sensor/deconz.py
View File

@ -5,9 +5,9 @@ For more details about this component, please refer to the documentation at
https://home-assistant.io/components/binary_sensor.deconz/ https://home-assistant.io/components/binary_sensor.deconz/
""" """
from homeassistant.components.binary_sensor import BinarySensorDevice from homeassistant.components.binary_sensor import BinarySensorDevice
from homeassistant.components.deconz import ( from homeassistant.components.deconz.const import (
CONF_ALLOW_CLIP_SENSOR, DOMAIN as DATA_DECONZ, DATA_DECONZ_ID, ATTR_DARK, ATTR_ON, CONF_ALLOW_CLIP_SENSOR, DOMAIN as DATA_DECONZ,
DATA_DECONZ_UNSUB) DATA_DECONZ_ID, DATA_DECONZ_UNSUB)
from homeassistant.const import ATTR_BATTERY_LEVEL from homeassistant.const import ATTR_BATTERY_LEVEL
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.dispatcher import async_dispatcher_connect
@ -62,7 +62,8 @@ class DeconzBinarySensor(BinarySensorDevice):
""" """
if reason['state'] or \ if reason['state'] or \
'reachable' in reason['attr'] or \ 'reachable' in reason['attr'] or \
'battery' in reason['attr']: 'battery' in reason['attr'] or \
'on' in reason['attr']:
self.async_schedule_update_ha_state() self.async_schedule_update_ha_state()
@property @property
@ -107,6 +108,8 @@ class DeconzBinarySensor(BinarySensorDevice):
attr = {} attr = {}
if self._sensor.battery: if self._sensor.battery:
attr[ATTR_BATTERY_LEVEL] = self._sensor.battery attr[ATTR_BATTERY_LEVEL] = self._sensor.battery
if self._sensor.on is not None:
attr[ATTR_ON] = self._sensor.on
if self._sensor.type in PRESENCE and self._sensor.dark is not None: if self._sensor.type in PRESENCE and self._sensor.dark is not None:
attr['dark'] = self._sensor.dark attr[ATTR_DARK] = self._sensor.dark
return attr return attr

2
homeassistant/components/deconz/__init__.py
View File

@ -22,7 +22,7 @@ from .const import (
CONF_ALLOW_CLIP_SENSOR, CONFIG_FILE, DATA_DECONZ_EVENT, CONF_ALLOW_CLIP_SENSOR, CONFIG_FILE, DATA_DECONZ_EVENT,
DATA_DECONZ_ID, DATA_DECONZ_UNSUB, DOMAIN, _LOGGER) DATA_DECONZ_ID, DATA_DECONZ_UNSUB, DOMAIN, _LOGGER)
REQUIREMENTS = ['pydeconz==39'] REQUIREMENTS = ['pydeconz==42']
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema({ DOMAIN: vol.Schema({

3
homeassistant/components/deconz/const.py
View File

@ -11,3 +11,6 @@ DATA_DECONZ_UNSUB = 'deconz_dispatchers'
CONF_ALLOW_CLIP_SENSOR = 'allow_clip_sensor' CONF_ALLOW_CLIP_SENSOR = 'allow_clip_sensor'
CONF_ALLOW_DECONZ_GROUPS = 'allow_deconz_groups' CONF_ALLOW_DECONZ_GROUPS = 'allow_deconz_groups'
ATTR_DARK = 'dark'
ATTR_ON = 'on'

13
homeassistant/components/sensor/deconz.py
View File

@ -4,9 +4,9 @@ Support for deCONZ sensor.
For more details about this component, please refer to the documentation at For more details about this component, please refer to the documentation at
https://home-assistant.io/components/sensor.deconz/ https://home-assistant.io/components/sensor.deconz/
""" """
from homeassistant.components.deconz import ( from homeassistant.components.deconz.const import (
CONF_ALLOW_CLIP_SENSOR, DOMAIN as DATA_DECONZ, DATA_DECONZ_ID, ATTR_DARK, ATTR_ON, CONF_ALLOW_CLIP_SENSOR, DOMAIN as DATA_DECONZ,
DATA_DECONZ_UNSUB) DATA_DECONZ_ID, DATA_DECONZ_UNSUB)
from homeassistant.const import ( from homeassistant.const import (
ATTR_BATTERY_LEVEL, ATTR_VOLTAGE, DEVICE_CLASS_BATTERY) ATTR_BATTERY_LEVEL, ATTR_VOLTAGE, DEVICE_CLASS_BATTERY)
from homeassistant.core import callback from homeassistant.core import callback
@ -72,7 +72,8 @@ class DeconzSensor(Entity):
""" """
if reason['state'] or \ if reason['state'] or \
'reachable' in reason['attr'] or \ 'reachable' in reason['attr'] or \
'battery' in reason['attr']: 'battery' in reason['attr'] or \
'on' in reason['attr']:
self.async_schedule_update_ha_state() self.async_schedule_update_ha_state()
@property @property
@ -122,8 +123,10 @@ class DeconzSensor(Entity):
attr = {} attr = {}
if self._sensor.battery: if self._sensor.battery:
attr[ATTR_BATTERY_LEVEL] = self._sensor.battery attr[ATTR_BATTERY_LEVEL] = self._sensor.battery
if self._sensor.on is not None:
attr[ATTR_ON] = self._sensor.on
if self._sensor.type in LIGHTLEVEL and self._sensor.dark is not None: if self._sensor.type in LIGHTLEVEL and self._sensor.dark is not None:
attr['dark'] = self._sensor.dark attr[ATTR_DARK] = self._sensor.dark
if self.unit_of_measurement == 'Watts': if self.unit_of_measurement == 'Watts':
attr[ATTR_CURRENT] = self._sensor.current attr[ATTR_CURRENT] = self._sensor.current
attr[ATTR_VOLTAGE] = self._sensor.voltage attr[ATTR_VOLTAGE] = self._sensor.voltage

2
requirements_all.txt
View File

@ -783,7 +783,7 @@ pycsspeechtts==1.0.2
pydaikin==0.4 pydaikin==0.4
# homeassistant.components.deconz # homeassistant.components.deconz
pydeconz==39 pydeconz==42
# homeassistant.components.zwave # homeassistant.components.zwave
pydispatcher==2.0.5 pydispatcher==2.0.5

2
requirements_test_all.txt
View File

@ -133,7 +133,7 @@ py-canary==0.5.0
pyblackbird==0.5 pyblackbird==0.5
# homeassistant.components.deconz # homeassistant.components.deconz
pydeconz==39 pydeconz==42
# homeassistant.components.zwave # homeassistant.components.zwave
pydispatcher==2.0.5 pydispatcher==2.0.5