Refactor ZHA (#18629)

* refactor ZHA

* lint

* review request

* Exclude more zha modules from coverage
This commit is contained in:
David F. Mulcahey authored and Martin Hjelmare committed 2018-11-22 19:00:46 +01:00
1 parent cccc41c23e
commit 67aa76d295
12 files changed
+343 -284

No files matched your search

+28 -20
View File
@@ -5,7 +5,9 @@ For more details on this platform, please refer to the documentation
at https://home-assistant.io/components/light.zha/
"""
import logging
from homeassistant.components import light, zha
from homeassistant.components import light
from homeassistant.components.zha.entities import ZhaEntity
from homeassistant.components.zha import helpers
import homeassistant.util.color as color_util
_LOGGER = logging.getLogger(__name__)
@@ -23,13 +25,13 @@ UNSUPPORTED_ATTRIBUTE = 0x86
async def async_setup_platform(hass, config, async_add_entities,
discovery_info=None):
"""Set up the Zigbee Home Automation lights."""
discovery_info = zha.get_discovery_info(hass, discovery_info)
discovery_info = helpers.get_discovery_info(hass, discovery_info)
if discovery_info is None:
return
endpoint = discovery_info['endpoint']
if hasattr(endpoint, 'light_color'):
caps = await zha.safe_read(
caps = await helpers.safe_read(
endpoint.light_color, ['color_capabilities'])
discovery_info['color_capabilities'] = caps.get('color_capabilities')
if discovery_info['color_capabilities'] is None:
@@ -37,7 +39,7 @@ async def async_setup_platform(hass, config, async_add_entities,
# attribute. In this version XY support is mandatory, but we need
# to probe to determine if the device supports color temperature.
discovery_info['color_capabilities'] = CAPABILITIES_COLOR_XY
result = await zha.safe_read(
result = await helpers.safe_read(
endpoint.light_color, ['color_temperature'])
if result.get('color_temperature') is not UNSUPPORTED_ATTRIBUTE:
discovery_info['color_capabilities'] |= CAPABILITIES_COLOR_TEMP
@@ -45,7 +47,7 @@ async def async_setup_platform(hass, config, async_add_entities,
async_add_entities([Light(**discovery_info)], update_before_add=True)
class Light(zha.Entity, light.Light):
class Light(ZhaEntity, light.Light):
"""Representation of a ZHA or ZLL light."""
_domain = light.DOMAIN
@@ -181,31 +183,37 @@ class Light(zha.Entity, light.Light):
async def async_update(self):
"""Retrieve latest state."""
result = await zha.safe_read(self._endpoint.on_off, ['on_off'],
allow_cache=False,
only_cache=(not self._initialized))
result = await helpers.safe_read(self._endpoint.on_off, ['on_off'],
allow_cache=False,
only_cache=(not self._initialized))
self._state = result.get('on_off', self._state)
if self._supported_features & light.SUPPORT_BRIGHTNESS:
result = await zha.safe_read(self._endpoint.level,
['current_level'],
allow_cache=False,
only_cache=(not self._initialized))
result = await helpers.safe_read(self._endpoint.level,
['current_level'],
allow_cache=False,
only_cache=(
not self._initialized
))
self._brightness = result.get('current_level', self._brightness)
if self._supported_features & light.SUPPORT_COLOR_TEMP:
result = await zha.safe_read(self._endpoint.light_color,
['color_temperature'],
allow_cache=False,
only_cache=(not self._initialized))
result = await helpers.safe_read(self._endpoint.light_color,
['color_temperature'],
allow_cache=False,
only_cache=(
not self._initialized
))
self._color_temp = result.get('color_temperature',
self._color_temp)
if self._supported_features & light.SUPPORT_COLOR:
result = await zha.safe_read(self._endpoint.light_color,
['current_x', 'current_y'],
allow_cache=False,
only_cache=(not self._initialized))
result = await helpers.safe_read(self._endpoint.light_color,
['current_x', 'current_y'],
allow_cache=False,
only_cache=(
not self._initialized
))
if 'current_x' in result and 'current_y' in result:
xy_color = (round(result['current_x']/65535, 3),
round(result['current_y']/65535, 3))