Skip to content

Drop ZHA sensor for Analog/Multistate input clusters #36696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmulcahey merged 1 commit into from
Jun 12, 2020
Merged

Drop ZHA sensor for Analog/Multistate input clusters #36696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion homeassistant/components/zha/core/channels/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import logging
from typing import Any, Dict, List, Optional, Tuple, Union

import zigpy.zcl.clusters.closures

from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_send

Expand Down Expand Up @@ -280,9 +282,10 @@ def add_all_channels(self) -> None:
# incorrectly.
if (
hasattr(cluster, "ep_attribute")
and cluster_id == zigpy.zcl.clusters.closures.DoorLock.cluster_id
and cluster.ep_attribute == "multistate_input"
):
channel_class = base.ZigbeeChannel
channel_class = general.MultistateInput
# end of ugly hack
channel = channel_class(cluster, self)
if channel.name == const.CHANNEL_POWER_CONFIGURATION:
Expand Down
21 changes: 0 additions & 21 deletions homeassistant/components/zha/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@

from .core import discovery
from .core.const import (
CHANNEL_ANALOG_INPUT,
CHANNEL_ELECTRICAL_MEASUREMENT,
CHANNEL_HUMIDITY,
CHANNEL_ILLUMINANCE,
CHANNEL_MULTISTATE_INPUT,
CHANNEL_POWER_CONFIGURATION,
CHANNEL_PRESSURE,
CHANNEL_SMARTENERGY_METERING,
Expand Down Expand Up @@ -153,13 +151,6 @@ def formatter(self, value):
return round(float(value * self._multiplier) / self._divisor)


@STRICT_MATCH(channel_names=CHANNEL_ANALOG_INPUT)
class AnalogInput(Sensor):
"""Sensor that displays analog input values."""

SENSOR_ATTR = "present_value"


@STRICT_MATCH(channel_names=CHANNEL_POWER_CONFIGURATION)
class Battery(Sensor):
"""Battery sensor of power configuration cluster."""
Expand Down Expand Up @@ -220,18 +211,6 @@ def formatter(self, value) -> int:
return round(value)


@STRICT_MATCH(channel_names=CHANNEL_MULTISTATE_INPUT)
class Text(Sensor):
"""Sensor that displays string values."""

_device_class = None
_unit = None

def formatter(self, value) -> str:
"""Return string value."""
return value


@STRICT_MATCH(generic_ids=CHANNEL_ST_HUMIDITY_CLUSTER)
@STRICT_MATCH(channel_names=CHANNEL_HUMIDITY)
class Humidity(Sensor):
Expand Down
122 changes: 5 additions & 117 deletions tests/components/zha/zha_devices_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,8 +1372,6 @@
},
},
"entities": [
"sensor.lumi_lumi_plug_maus01_77665544_analog_input",
"sensor.lumi_lumi_plug_maus01_77665544_analog_input_2",
"sensor.lumi_lumi_plug_maus01_77665544_electrical_measurement",
"switch.lumi_lumi_plug_maus01_77665544_on_off",
],
Expand All @@ -1388,16 +1386,6 @@
"entity_class": "ElectricalMeasurement",
"entity_id": "sensor.lumi_lumi_plug_maus01_77665544_electrical_measurement",
},
("sensor", "00:11:22:33:44:55:66:77-2-12"): {
"channels": ["analog_input"],
"entity_class": "AnalogInput",
"entity_id": "sensor.lumi_lumi_plug_maus01_77665544_analog_input",
},
("sensor", "00:11:22:33:44:55:66:77-3-12"): {
"channels": ["analog_input"],
"entity_class": "AnalogInput",
"entity_id": "sensor.lumi_lumi_plug_maus01_77665544_analog_input_2",
},
},
"event_channels": ["1:0x0019"],
"manufacturer": "LUMI",
Expand Down Expand Up @@ -1426,7 +1414,6 @@
"entities": [
"light.lumi_lumi_relay_c2acn01_77665544_on_off",
"light.lumi_lumi_relay_c2acn01_77665544_on_off_2",
"sensor.lumi_lumi_relay_c2acn01_77665544_analog_input",
"sensor.lumi_lumi_relay_c2acn01_77665544_electrical_measurement",
],
"entity_map": {
Expand All @@ -1435,11 +1422,6 @@
"entity_class": "Light",
"entity_id": "light.lumi_lumi_relay_c2acn01_77665544_on_off",
},
("sensor", "00:11:22:33:44:55:66:77-1-12"): {
"channels": ["analog_input"],
"entity_class": "AnalogInput",
"entity_id": "sensor.lumi_lumi_relay_c2acn01_77665544_analog_input",
},
("sensor", "00:11:22:33:44:55:66:77-1-2820"): {
"channels": ["electrical_measurement"],
"entity_class": "ElectricalMeasurement",
Expand Down Expand Up @@ -1482,33 +1464,13 @@
"profile_id": 260,
},
},
"entities": [
"sensor.lumi_lumi_remote_b186acn01_77665544_multistate_input",
"sensor.lumi_lumi_remote_b186acn01_77665544_multistate_input_2",
"sensor.lumi_lumi_remote_b186acn01_77665544_multistate_input_3",
"sensor.lumi_lumi_remote_b186acn01_77665544_power",
],
"entities": ["sensor.lumi_lumi_remote_b186acn01_77665544_power"],
"entity_map": {
("sensor", "00:11:22:33:44:55:66:77-1-1"): {
"channels": ["power"],
"entity_class": "Battery",
"entity_id": "sensor.lumi_lumi_remote_b186acn01_77665544_power",
},
("sensor", "00:11:22:33:44:55:66:77-1-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_remote_b186acn01_77665544_multistate_input_2",
},
("sensor", "00:11:22:33:44:55:66:77-2-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_remote_b186acn01_77665544_multistate_input_3",
},
("sensor", "00:11:22:33:44:55:66:77-3-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_remote_b186acn01_77665544_multistate_input",
},
},
"event_channels": ["1:0x0005", "1:0x0019", "2:0x0005", "3:0x0005"],
"manufacturer": "LUMI",
Expand Down Expand Up @@ -1541,33 +1503,13 @@
"profile_id": 260,
},
},
"entities": [
"sensor.lumi_lumi_remote_b286acn01_77665544_multistate_input",
"sensor.lumi_lumi_remote_b286acn01_77665544_multistate_input_2",
"sensor.lumi_lumi_remote_b286acn01_77665544_multistate_input_3",
"sensor.lumi_lumi_remote_b286acn01_77665544_power",
],
"entities": ["sensor.lumi_lumi_remote_b286acn01_77665544_power"],
"entity_map": {
("sensor", "00:11:22:33:44:55:66:77-1-1"): {
"channels": ["power"],
"entity_class": "Battery",
"entity_id": "sensor.lumi_lumi_remote_b286acn01_77665544_power",
},
("sensor", "00:11:22:33:44:55:66:77-1-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_remote_b286acn01_77665544_multistate_input_3",
},
("sensor", "00:11:22:33:44:55:66:77-2-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_remote_b286acn01_77665544_multistate_input_2",
},
("sensor", "00:11:22:33:44:55:66:77-3-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_remote_b286acn01_77665544_multistate_input",
},
},
"event_channels": ["1:0x0005", "1:0x0019", "2:0x0005", "3:0x0005"],
"manufacturer": "LUMI",
Expand Down Expand Up @@ -1897,33 +1839,13 @@
"profile_id": 260,
},
},
"entities": [
"sensor.lumi_lumi_sensor_86sw1_77665544_multistate_input",
"sensor.lumi_lumi_sensor_86sw1_77665544_multistate_input_2",
"sensor.lumi_lumi_sensor_86sw1_77665544_multistate_input_3",
"sensor.lumi_lumi_sensor_86sw1_77665544_power",
],
"entities": ["sensor.lumi_lumi_sensor_86sw1_77665544_power"],
"entity_map": {
("sensor", "00:11:22:33:44:55:66:77-1-1"): {
"channels": ["power"],
"entity_class": "Battery",
"entity_id": "sensor.lumi_lumi_sensor_86sw1_77665544_power",
},
("sensor", "00:11:22:33:44:55:66:77-1-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_sensor_86sw1_77665544_multistate_input_3",
},
("sensor", "00:11:22:33:44:55:66:77-2-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_sensor_86sw1_77665544_multistate_input_2",
},
("sensor", "00:11:22:33:44:55:66:77-3-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_sensor_86sw1_77665544_multistate_input",
},
},
"event_channels": ["1:0x0005", "1:0x0019", "2:0x0005", "3:0x0005"],
"manufacturer": "LUMI",
Expand Down Expand Up @@ -1956,27 +1878,13 @@
"profile_id": 260,
},
},
"entities": [
"sensor.lumi_lumi_sensor_cube_aqgl01_77665544_analog_input",
"sensor.lumi_lumi_sensor_cube_aqgl01_77665544_multistate_input",
"sensor.lumi_lumi_sensor_cube_aqgl01_77665544_power",
],
"entities": ["sensor.lumi_lumi_sensor_cube_aqgl01_77665544_power"],
"entity_map": {
("sensor", "00:11:22:33:44:55:66:77-1-1"): {
"channels": ["power"],
"entity_class": "Battery",
"entity_id": "sensor.lumi_lumi_sensor_cube_aqgl01_77665544_power",
},
("sensor", "00:11:22:33:44:55:66:77-2-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_sensor_cube_aqgl01_77665544_multistate_input",
},
("sensor", "00:11:22:33:44:55:66:77-3-12"): {
"channels": ["analog_input"],
"entity_class": "AnalogInput",
"entity_id": "sensor.lumi_lumi_sensor_cube_aqgl01_77665544_analog_input",
},
},
"event_channels": ["1:0x0005", "1:0x0019", "2:0x0005", "3:0x0005"],
"manufacturer": "LUMI",
Expand Down Expand Up @@ -2161,8 +2069,6 @@
},
"entities": [
"binary_sensor.lumi_lumi_sensor_smoke_77665544_ias_zone",
"sensor.lumi_lumi_sensor_smoke_77665544_analog_input",
"sensor.lumi_lumi_sensor_smoke_77665544_multistate_input",
"sensor.lumi_lumi_sensor_smoke_77665544_power",
],
"entity_map": {
Expand All @@ -2171,16 +2077,6 @@
"entity_class": "Battery",
"entity_id": "sensor.lumi_lumi_sensor_smoke_77665544_power",
},
("sensor", "00:11:22:33:44:55:66:77-1-12"): {
"channels": ["analog_input"],
"entity_class": "AnalogInput",
"entity_id": "sensor.lumi_lumi_sensor_smoke_77665544_analog_input",
},
("sensor", "00:11:22:33:44:55:66:77-1-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_sensor_smoke_77665544_multistate_input",
},
("binary_sensor", "00:11:22:33:44:55:66:77-1-1280"): {
"channels": ["ias_zone"],
"entity_class": "IASZone",
Expand Down Expand Up @@ -2254,21 +2150,13 @@
"profile_id": 260,
}
},
"entities": [
"sensor.lumi_lumi_sensor_switch_aq3_77665544_multistate_input",
"sensor.lumi_lumi_sensor_switch_aq3_77665544_power",
],
"entities": ["sensor.lumi_lumi_sensor_switch_aq3_77665544_power"],
"entity_map": {
("sensor", "00:11:22:33:44:55:66:77-1-1"): {
"channels": ["power"],
"entity_class": "Battery",
"entity_id": "sensor.lumi_lumi_sensor_switch_aq3_77665544_power",
},
("sensor", "00:11:22:33:44:55:66:77-1-18"): {
"channels": ["multistate_input"],
"entity_class": "Text",
"entity_id": "sensor.lumi_lumi_sensor_switch_aq3_77665544_multistate_input",
},
},
"event_channels": ["1:0x0006"],
"manufacturer": "LUMI",
Expand Down