Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 18 additions & 1 deletion homeassistant/components/sensor/zha.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
def make_sensor(discovery_info):
"""Create ZHA sensors factory."""
from zigpy.zcl.clusters.measurement import (
RelativeHumidity, TemperatureMeasurement, PressureMeasurement
RelativeHumidity, TemperatureMeasurement, PressureMeasurement,
IlluminanceMeasurement
)
from zigpy.zcl.clusters.smartenergy import Metering
in_clusters = discovery_info['in_clusters']
Expand All @@ -42,6 +43,8 @@ def make_sensor(discovery_info):
sensor = TemperatureSensor(**discovery_info)
elif PressureMeasurement.cluster_id in in_clusters:
sensor = PressureSensor(**discovery_info)
elif IlluminanceMeasurement.cluster_id in in_clusters:
sensor = IlluminanceMeasurementSensor(**discovery_info)
elif Metering.cluster_id in in_clusters:
sensor = MeteringSensor(**discovery_info)
else:
Expand Down Expand Up @@ -148,6 +151,20 @@ def state(self):
return round(float(self._state))


class IlluminanceMeasurementSensor(Sensor):
"""ZHA lux sensor."""

@property
def unit_of_measurement(self):
"""Return the unit of measurement of this entity."""
return 'lx'

@property
def state(self):
"""Return the state of the entity."""
return self._state


class MeteringSensor(Sensor):
"""ZHA Metering sensor."""

Expand Down
1 change: 1 addition & 0 deletions homeassistant/components/zha/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def populate_data():
zcl.clusters.measurement.RelativeHumidity: 'sensor',
zcl.clusters.measurement.TemperatureMeasurement: 'sensor',
zcl.clusters.measurement.PressureMeasurement: 'sensor',
zcl.clusters.measurement.IlluminanceMeasurement: 'sensor',
zcl.clusters.smartenergy.Metering: 'sensor',
zcl.clusters.security.IasZone: 'binary_sensor',
zcl.clusters.hvac.Fan: 'fan',
Expand Down