From a183043d5dc19a6d4b5fd028e769672aad934313 Mon Sep 17 00:00:00 2001
From: "David F. Mulcahey" <david.mulcahey@icloud.com>
Date: Mon, 21 May 2018 00:56:41 -0400
Subject: [PATCH] Add IlluminanceMeasurementSensor to ZHA (#14563)

* add IlluminanceMeasurementSensor

* address review comment

* Fix whitespace error during merge
---
 homeassistant/components/sensor/zha.py | 19 ++++++++++++++++++-
 homeassistant/components/zha/const.py  |  1 +
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/zha.py b/homeassistant/components/sensor/zha.py
index abb4c651e78..72368bdb3ba 100644
--- a/homeassistant/components/sensor/zha.py
+++ b/homeassistant/components/sensor/zha.py
@@ -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']
@@ -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:
@@ -148,6 +151,20 @@ class PressureSensor(Sensor):
         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."""
 
diff --git a/homeassistant/components/zha/const.py b/homeassistant/components/zha/const.py
index 71f0ea17490..087b19c6693 100644
--- a/homeassistant/components/zha/const.py
+++ b/homeassistant/components/zha/const.py
@@ -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',