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

Clean up ZHA discovery logic (#23563)

Browse Source 
* use domain constants from HA

* cleanup endpoint processing in discovery

* Whitespace.
This commit is contained in:
David F. Mulcahey 2019-04-30 10:40:52 -04:00 committed by GitHub
parent 6a6a999833
commit d71424f285
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/components/zha/core/discovery.py
View File

@ -8,6 +8,8 @@ https://home-assistant.io/components/zha/
import logging import logging
from homeassistant import const as ha_const from homeassistant import const as ha_const
from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR
from homeassistant.components.sensor import DOMAIN as SENSOR
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.dispatcher import async_dispatcher_send
from .channels import ( from .channels import (
@ -58,15 +60,14 @@ def async_process_endpoint(
endpoint.device_type, None): endpoint.device_type, None):
profile_info = DEVICE_CLASS[endpoint.profile_id] profile_info = DEVICE_CLASS[endpoint.profile_id]
component = profile_info[endpoint.device_type] component = profile_info[endpoint.device_type]
if component and component in COMPONENT_CLUSTERS:
profile_clusters = COMPONENT_CLUSTERS[component]
if ha_const.CONF_TYPE in node_config: if ha_const.CONF_TYPE in node_config:
component = node_config[ha_const.CONF_TYPE] component = node_config[ha_const.CONF_TYPE]
if component and component in COMPONENT_CLUSTERS:
profile_clusters = COMPONENT_CLUSTERS[component]
if component and component in COMPONENTS: if component and component in COMPONENTS and \
component in COMPONENT_CLUSTERS:
profile_clusters = COMPONENT_CLUSTERS[component]
if profile_clusters:
profile_match = _async_handle_profile_match( profile_match = _async_handle_profile_match(
hass, endpoint, profile_clusters, zha_device, hass, endpoint, profile_clusters, zha_device,
component, device_key, is_new_join) component, device_key, is_new_join)
@ -142,7 +143,7 @@ def _async_handle_profile_match(hass, endpoint, profile_clusters, zha_device,
'component': component 'component': component
} }
if component == 'binary_sensor': if component == BINARY_SENSOR:
discovery_info.update({SENSOR_TYPE: UNKNOWN}) discovery_info.update({SENSOR_TYPE: UNKNOWN})
for cluster_id in profile_clusters: for cluster_id in profile_clusters:
if cluster_id in BINARY_SENSOR_TYPES: if cluster_id in BINARY_SENSOR_TYPES:
@ -242,11 +243,11 @@ def _async_handle_single_cluster_match(hass, zha_device, cluster, device_key,
'component': component 'component': component
} }
if component == 'sensor': if component == SENSOR:
discovery_info.update({ discovery_info.update({
SENSOR_TYPE: SENSOR_TYPES.get(cluster.cluster_id, GENERIC) SENSOR_TYPE: SENSOR_TYPES.get(cluster.cluster_id, GENERIC)
}) })
if component == 'binary_sensor': if component == BINARY_SENSOR:
discovery_info.update({ discovery_info.update({
SENSOR_TYPE: BINARY_SENSOR_TYPES.get(cluster.cluster_id, UNKNOWN) SENSOR_TYPE: BINARY_SENSOR_TYPES.get(cluster.cluster_id, UNKNOWN)
}) })