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

Don't use zigpy profiles for ZHA entities (#22844)

Browse source 
* don't use zigpy profiles
* use sets as they're the correct structure to use
This commit is contained in:
David F. Mulcahey 2019-04-29 19:31:27 -04:00 • committed by Alexei Chetroi
parent 8d775caaac
commit 2aee31ec6a
2 changed files with 73 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
homeassistant/components/zha/core/discovery.py
View file

@ -45,7 +45,7 @@ def async_process_endpoint(
return return
component = None component = None
profile_clusters = ([], []) profile_clusters = []
device_key = "{}-{}".format(device.ieee, endpoint_id) device_key = "{}-{}".format(device.ieee, endpoint_id)
node_config = {} node_config = {}
if CONF_DEVICE_CONFIG in config: if CONF_DEVICE_CONFIG in config:
@ -54,15 +54,16 @@ def async_process_endpoint(
) )
if endpoint.profile_id in zigpy.profiles.PROFILES: if endpoint.profile_id in zigpy.profiles.PROFILES:
profile = zigpy.profiles.PROFILES[endpoint.profile_id]
if DEVICE_CLASS.get(endpoint.profile_id, {}).get( if DEVICE_CLASS.get(endpoint.profile_id, {}).get(
endpoint.device_type, None): endpoint.device_type, None):
profile_clusters = profile.CLUSTERS[endpoint.device_type]
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] profile_clusters = COMPONENT_CLUSTERS[component]
if component and component in COMPONENTS: if component and component in COMPONENTS:
@ -118,10 +119,10 @@ def _async_handle_profile_match(hass, endpoint, profile_clusters, zha_device,
component, device_key, is_new_join): component, device_key, is_new_join):
"""Dispatch a profile match to the appropriate HA component.""" """Dispatch a profile match to the appropriate HA component."""
in_clusters = [endpoint.in_clusters[c] in_clusters = [endpoint.in_clusters[c]
for c in profile_clusters[0] for c in profile_clusters
if c in endpoint.in_clusters] if c in endpoint.in_clusters]
out_clusters = [endpoint.out_clusters[c] out_clusters = [endpoint.out_clusters[c]
for c in profile_clusters[1] for c in profile_clusters
if c in endpoint.out_clusters] if c in endpoint.out_clusters]
channels = [] channels = []
@ -143,10 +144,7 @@ def _async_handle_profile_match(hass, endpoint, profile_clusters, zha_device,
if component == 'binary_sensor': if component == 'binary_sensor':
discovery_info.update({SENSOR_TYPE: UNKNOWN}) discovery_info.update({SENSOR_TYPE: UNKNOWN})
cluster_ids = [] for cluster_id in profile_clusters:
cluster_ids.extend(profile_clusters[0])
cluster_ids.extend(profile_clusters[1])
for cluster_id in cluster_ids:
if cluster_id in BINARY_SENSOR_TYPES: if cluster_id in BINARY_SENSOR_TYPES:
discovery_info.update({ discovery_info.update({
SENSOR_TYPE: BINARY_SENSOR_TYPES.get( SENSOR_TYPE: BINARY_SENSOR_TYPES.get(
@ -174,7 +172,7 @@ def _async_handle_single_cluster_matches(hass, endpoint, zha_device,
is_new_join, is_new_join,
)) ))
if cluster.cluster_id not in profile_clusters[0]: if cluster.cluster_id not in profile_clusters:
cluster_match_results.append(_async_handle_single_cluster_match( cluster_match_results.append(_async_handle_single_cluster_match(
hass, hass,
zha_device, zha_device,
@ -185,7 +183,7 @@ def _async_handle_single_cluster_matches(hass, endpoint, zha_device,
)) ))
for cluster in endpoint.out_clusters.values(): for cluster in endpoint.out_clusters.values():
if cluster.cluster_id not in profile_clusters[1]: if cluster.cluster_id not in profile_clusters:
cluster_match_results.append(_async_handle_single_cluster_match( cluster_match_results.append(_async_handle_single_cluster_match(
hass, hass,
zha_device, zha_device,

110
homeassistant/components/zha/core/registries.py
View file

@ -5,6 +5,12 @@ For more details about this component, please refer to the documentation at
https://home-assistant.io/components/zha/ https://home-assistant.io/components/zha/
""" """
from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR
from homeassistant.components.fan import DOMAIN as FAN
from homeassistant.components.light import DOMAIN as LIGHT
from homeassistant.components.sensor import DOMAIN as SENSOR
from homeassistant.components.switch import DOMAIN as SWITCH
from .const import ( from .const import (
HUMIDITY, HUMIDITY,
TEMPERATURE, ILLUMINANCE, PRESSURE, METERING, ELECTRICAL_MEASUREMENT, TEMPERATURE, ILLUMINANCE, PRESSURE, METERING, ELECTRICAL_MEASUREMENT,
@ -25,10 +31,17 @@ RADIO_TYPES = {}
BINARY_SENSOR_TYPES = {} BINARY_SENSOR_TYPES = {}
CLUSTER_REPORT_CONFIGS = {} CLUSTER_REPORT_CONFIGS = {}
CUSTOM_CLUSTER_MAPPINGS = {} CUSTOM_CLUSTER_MAPPINGS = {}
COMPONENT_CLUSTERS = {}
EVENT_RELAY_CLUSTERS = [] EVENT_RELAY_CLUSTERS = []
NO_SENSOR_CLUSTERS = [] NO_SENSOR_CLUSTERS = []
BINDABLE_CLUSTERS = [] BINDABLE_CLUSTERS = []
BINARY_SENSOR_CLUSTERS = set()
LIGHT_CLUSTERS = set()
SWITCH_CLUSTERS = set()
COMPONENT_CLUSTERS = {
BINARY_SENSOR: BINARY_SENSOR_CLUSTERS,
LIGHT: LIGHT_CLUSTERS,
SWITCH: SWITCH_CLUSTERS
}
def establish_device_mappings(): def establish_device_mappings():
@ -38,7 +51,7 @@ def establish_device_mappings():
in a function. in a function.
""" """
from zigpy import zcl from zigpy import zcl
from zigpy.profiles import PROFILES, zha, zll from zigpy.profiles import zha, zll
if zha.PROFILE_ID not in DEVICE_CLASS: if zha.PROFILE_ID not in DEVICE_CLASS:
DEVICE_CLASS[zha.PROFILE_ID] = {} DEVICE_CLASS[zha.PROFILE_ID] = {}
@ -97,53 +110,53 @@ def establish_device_mappings():
BINDABLE_CLUSTERS.append(zcl.clusters.lighting.Color.cluster_id) BINDABLE_CLUSTERS.append(zcl.clusters.lighting.Color.cluster_id)
DEVICE_CLASS[zha.PROFILE_ID].update({ DEVICE_CLASS[zha.PROFILE_ID].update({
zha.DeviceType.ON_OFF_SWITCH: 'binary_sensor', zha.DeviceType.ON_OFF_SWITCH: BINARY_SENSOR,
zha.DeviceType.LEVEL_CONTROL_SWITCH: 'binary_sensor', zha.DeviceType.LEVEL_CONTROL_SWITCH: BINARY_SENSOR,
zha.DeviceType.REMOTE_CONTROL: 'binary_sensor', zha.DeviceType.REMOTE_CONTROL: BINARY_SENSOR,
zha.DeviceType.SMART_PLUG: 'switch', zha.DeviceType.SMART_PLUG: SWITCH,
zha.DeviceType.LEVEL_CONTROLLABLE_OUTPUT: 'light', zha.DeviceType.LEVEL_CONTROLLABLE_OUTPUT: LIGHT,
zha.DeviceType.ON_OFF_LIGHT: 'light', zha.DeviceType.ON_OFF_LIGHT: LIGHT,
zha.DeviceType.DIMMABLE_LIGHT: 'light', zha.DeviceType.DIMMABLE_LIGHT: LIGHT,
zha.DeviceType.COLOR_DIMMABLE_LIGHT: 'light', zha.DeviceType.COLOR_DIMMABLE_LIGHT: LIGHT,
zha.DeviceType.ON_OFF_LIGHT_SWITCH: 'binary_sensor', zha.DeviceType.ON_OFF_LIGHT_SWITCH: BINARY_SENSOR,
zha.DeviceType.DIMMER_SWITCH: 'binary_sensor', zha.DeviceType.DIMMER_SWITCH: BINARY_SENSOR,
zha.DeviceType.COLOR_DIMMER_SWITCH: 'binary_sensor', zha.DeviceType.COLOR_DIMMER_SWITCH: BINARY_SENSOR,
}) })
DEVICE_CLASS[zll.PROFILE_ID].update({ DEVICE_CLASS[zll.PROFILE_ID].update({
zll.DeviceType.ON_OFF_LIGHT: 'light', zll.DeviceType.ON_OFF_LIGHT: LIGHT,
zll.DeviceType.ON_OFF_PLUGIN_UNIT: 'switch', zll.DeviceType.ON_OFF_PLUGIN_UNIT: SWITCH,
zll.DeviceType.DIMMABLE_LIGHT: 'light', zll.DeviceType.DIMMABLE_LIGHT: LIGHT,
zll.DeviceType.DIMMABLE_PLUGIN_UNIT: 'light', zll.DeviceType.DIMMABLE_PLUGIN_UNIT: LIGHT,
zll.DeviceType.COLOR_LIGHT: 'light', zll.DeviceType.COLOR_LIGHT: LIGHT,
zll.DeviceType.EXTENDED_COLOR_LIGHT: 'light', zll.DeviceType.EXTENDED_COLOR_LIGHT: LIGHT,
zll.DeviceType.COLOR_TEMPERATURE_LIGHT: 'light', zll.DeviceType.COLOR_TEMPERATURE_LIGHT: LIGHT,
zll.DeviceType.COLOR_CONTROLLER: 'binary_sensor', zll.DeviceType.COLOR_CONTROLLER: BINARY_SENSOR,
zll.DeviceType.COLOR_SCENE_CONTROLLER: 'binary_sensor', zll.DeviceType.COLOR_SCENE_CONTROLLER: BINARY_SENSOR,
zll.DeviceType.CONTROLLER: 'binary_sensor', zll.DeviceType.CONTROLLER: BINARY_SENSOR,
zll.DeviceType.SCENE_CONTROLLER: 'binary_sensor', zll.DeviceType.SCENE_CONTROLLER: BINARY_SENSOR,
zll.DeviceType.ON_OFF_SENSOR: 'binary_sensor', zll.DeviceType.ON_OFF_SENSOR: BINARY_SENSOR,
}) })
SINGLE_INPUT_CLUSTER_DEVICE_CLASS.update({ SINGLE_INPUT_CLUSTER_DEVICE_CLASS.update({
zcl.clusters.general.OnOff: 'switch', zcl.clusters.general.OnOff: SWITCH,
zcl.clusters.measurement.RelativeHumidity: 'sensor', zcl.clusters.measurement.RelativeHumidity: SENSOR,
# this works for now but if we hit conflicts we can break it out to # this works for now but if we hit conflicts we can break it out to
# a different dict that is keyed by manufacturer # a different dict that is keyed by manufacturer
SMARTTHINGS_HUMIDITY_CLUSTER: 'sensor', SMARTTHINGS_HUMIDITY_CLUSTER: SENSOR,
zcl.clusters.measurement.TemperatureMeasurement: 'sensor', zcl.clusters.measurement.TemperatureMeasurement: SENSOR,
zcl.clusters.measurement.PressureMeasurement: 'sensor', zcl.clusters.measurement.PressureMeasurement: SENSOR,
zcl.clusters.measurement.IlluminanceMeasurement: 'sensor', zcl.clusters.measurement.IlluminanceMeasurement: SENSOR,
zcl.clusters.smartenergy.Metering: 'sensor', zcl.clusters.smartenergy.Metering: SENSOR,
zcl.clusters.homeautomation.ElectricalMeasurement: 'sensor', zcl.clusters.homeautomation.ElectricalMeasurement: SENSOR,
zcl.clusters.security.IasZone: 'binary_sensor', zcl.clusters.security.IasZone: BINARY_SENSOR,
zcl.clusters.measurement.OccupancySensing: 'binary_sensor', zcl.clusters.measurement.OccupancySensing: BINARY_SENSOR,
zcl.clusters.hvac.Fan: 'fan', zcl.clusters.hvac.Fan: FAN,
SMARTTHINGS_ACCELERATION_CLUSTER: 'binary_sensor', SMARTTHINGS_ACCELERATION_CLUSTER: BINARY_SENSOR,
}) })
SINGLE_OUTPUT_CLUSTER_DEVICE_CLASS.update({ SINGLE_OUTPUT_CLUSTER_DEVICE_CLASS.update({
zcl.clusters.general.OnOff: 'binary_sensor', zcl.clusters.general.OnOff: BINARY_SENSOR,
}) })
SENSOR_TYPES.update({ SENSOR_TYPES.update({
@ -269,12 +282,15 @@ def establish_device_mappings():
}], }],
}) })
# A map of hass components to all Zigbee clusters it could use BINARY_SENSOR_CLUSTERS.add(zcl.clusters.general.OnOff.cluster_id)
for profile_id, classes in DEVICE_CLASS.items(): BINARY_SENSOR_CLUSTERS.add(zcl.clusters.general.LevelControl.cluster_id)
profile = PROFILES[profile_id] BINARY_SENSOR_CLUSTERS.add(zcl.clusters.security.IasZone.cluster_id)
for device_type, component in classes.items(): BINARY_SENSOR_CLUSTERS.add(
if component not in COMPONENT_CLUSTERS: zcl.clusters.measurement.OccupancySensing.cluster_id)
COMPONENT_CLUSTERS[component] = (set(), set()) BINARY_SENSOR_CLUSTERS.add(SMARTTHINGS_ACCELERATION_CLUSTER)
clusters = profile.CLUSTERS[device_type]
COMPONENT_CLUSTERS[component][0].update(clusters[0]) LIGHT_CLUSTERS.add(zcl.clusters.general.OnOff.cluster_id)
COMPONENT_CLUSTERS[component][1].update(clusters[1]) LIGHT_CLUSTERS.add(zcl.clusters.general.LevelControl.cluster_id)
LIGHT_CLUSTERS.add(zcl.clusters.lighting.Color.cluster_id)
SWITCH_CLUSTERS.add(zcl.clusters.general.OnOff.cluster_id)