Add basic support for native Hue sensors

homeassistant/components/hue/binary_sensor.py

@@ -0,0 +1,27 @@
+"""Hue binary sensor entities."""
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.hue.sensor_base import (
+    GenericZLLSensor, async_setup_entry as shared_async_setup_entry)
+
+
+PRESENCE_NAME_FORMAT = "{} presence"
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Defer binary sensor setup to the shared sensor module."""
+    await shared_async_setup_entry(
+        hass, config_entry, async_add_entities, binary=True)
+
+
+class HuePresence(GenericZLLSensor, BinarySensorDevice):
+    """The presence sensor entity for a Hue motion sensor device."""
+
+    device_class = 'presence'
+
+    async def _async_update_ha_state(self, *args, **kwargs):
+        await self.async_update_ha_state(self, *args, **kwargs)
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self.sensor.presence

homeassistant/components/hue/bridge.py

@@ -69,6 +69,10 @@ async def async_setup(self, tries=0):
 
         hass.async_create_task(hass.config_entries.async_forward_entry_setup(
             self.config_entry, 'light'))
+        hass.async_create_task(hass.config_entries.async_forward_entry_setup(
+            self.config_entry, 'binary_sensor'))
+        hass.async_create_task(hass.config_entries.async_forward_entry_setup(
+            self.config_entry, 'sensor'))
 
         hass.services.async_register(
             DOMAIN, SERVICE_HUE_SCENE, self.hue_activate_scene,
@@ -94,8 +98,16 @@ async def async_reset(self):
 
         # If setup was successful, we set api variable, forwarded entry and
         # register service
-        return await self.hass.config_entries.async_forward_entry_unload(
-            self.config_entry, 'light')
+        results = await asyncio.gather(
+            self.hass.config_entries.async_forward_entry_unload(
+                self.config_entry, 'light'),
+            self.hass.config_entries.async_forward_entry_unload(
+                self.config_entry, 'binary_sensor'),
+            self.hass.config_entries.async_forward_entry_unload(
+                self.config_entry, 'sensor')
+            )
+        # None and True are OK
+        return False not in results
 
     async def hue_activate_scene(self, call, updated=False):
         """Service to call directly into bridge to set scenes."""

homeassistant/components/hue/sensor.py

@@ -0,0 +1,57 @@
+"""Hue sensor entities."""
+from homeassistant.const import (
+    DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS)
+from homeassistant.helpers.entity import Entity
+from homeassistant.components.hue.sensor_base import (
+    GenericZLLSensor, async_setup_entry as shared_async_setup_entry)
+
+
+LIGHT_LEVEL_NAME_FORMAT = "{} light level"
+TEMPERATURE_NAME_FORMAT = "{} temperature"
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Defer sensor setup to the shared sensor module."""
+    await shared_async_setup_entry(
+        hass, config_entry, async_add_entities, binary=False)
+
+
+class GenericHueGaugeSensorEntity(GenericZLLSensor, Entity):
+    """Parent class for all 'gauge' Hue device sensors."""
+
+    async def _async_update_ha_state(self, *args, **kwargs):
+        await self.async_update_ha_state(self, *args, **kwargs)
+
+
+class HueLightLevel(GenericHueGaugeSensorEntity):
+    """The light level sensor entity for a Hue motion sensor device."""
+
+    device_class = DEVICE_CLASS_ILLUMINANCE
+    unit_of_measurement = "Lux"
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self.sensor.lightlevel
+
+    @property
+    def device_state_attributes(self):
+        """Return the device state attributes."""
+        attributes = super().device_state_attributes
+        attributes.update({
+            "threshold_dark": self.sensor.tholddark,
+            "threshold_offset": self.sensor.tholdoffset,
+        })
+        return attributes
+
+
+class HueTemperature(GenericHueGaugeSensorEntity):
+    """The temperature sensor entity for a Hue motion sensor device."""
+
+    device_class = DEVICE_CLASS_TEMPERATURE
+    unit_of_measurement = TEMP_CELSIUS
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self.sensor.temperature / 100