Skip to content

Add device class to ZHA sensors #24373

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
balloob merged 1 commit into from
Jun 8, 2019
Merged

Add device class to ZHA sensors #24373

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
27 changes: 24 additions & 3 deletions homeassistant/components/zha/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
import logging

from homeassistant.core import callback
from homeassistant.components.sensor import DOMAIN
from homeassistant.components.sensor import (
DOMAIN, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE,
DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_PRESSURE, DEVICE_CLASS_POWER
)
from homeassistant.const import (
TEMP_CELSIUS, POWER_WATT, ATTR_UNIT_OF_MEASUREMENT
)
Expand All @@ -11,13 +14,12 @@
DATA_ZHA, DATA_ZHA_DISPATCHERS, ZHA_DISCOVERY_NEW, HUMIDITY, TEMPERATURE,
ILLUMINANCE, PRESSURE, METERING, ELECTRICAL_MEASUREMENT,
GENERIC, SENSOR_TYPE, ATTRIBUTE_CHANNEL, ELECTRICAL_MEASUREMENT_CHANNEL,
SIGNAL_ATTR_UPDATED, SIGNAL_STATE_ATTR)
SIGNAL_ATTR_UPDATED, SIGNAL_STATE_ATTR, UNKNOWN)
from .entity import ZhaEntity

PARALLEL_UPDATES = 5
_LOGGER = logging.getLogger(__name__)


# Formatter functions
def pass_through_formatter(value):
"""No op update function."""
Expand Down Expand Up @@ -91,6 +93,16 @@ def pressure_formatter(value):
ELECTRICAL_MEASUREMENT: False
}

DEVICE_CLASS_REGISTRY = {
UNKNOWN: None,
HUMIDITY: DEVICE_CLASS_HUMIDITY,
TEMPERATURE: DEVICE_CLASS_TEMPERATURE,
PRESSURE: DEVICE_CLASS_PRESSURE,
ILLUMINANCE: DEVICE_CLASS_ILLUMINANCE,
METERING: DEVICE_CLASS_POWER,
ELECTRICAL_MEASUREMENT: DEVICE_CLASS_POWER
}


async def async_setup_platform(hass, config, async_add_entities,
discovery_info=None):
Expand Down Expand Up @@ -155,6 +167,10 @@ def __init__(self, unique_id, zha_device, channels, **kwargs):
self._channel = self.cluster_channels.get(
CHANNEL_REGISTRY.get(self._sensor_type, ATTRIBUTE_CHANNEL)
)
self._device_class = DEVICE_CLASS_REGISTRY.get(
self._sensor_type,
None
)

async def async_added_to_hass(self):
"""Run when about to be added to hass."""
Expand All @@ -165,6 +181,11 @@ async def async_added_to_hass(self):
self._channel, SIGNAL_STATE_ATTR,
self.async_update_state_attribute)

@property
def device_class(self) -> str:
"""Return device class from component DEVICE_CLASSES."""
return self._device_class

@property
def unit_of_measurement(self):
"""Return the unit of measurement of this entity."""
Expand Down