deCONZ device automations

homeassistant/components/automation/__init__.py

@@ -6,6 +6,9 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation.exceptions import (
+    InvalidDeviceAutomationConfig,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_NAME,
@@ -467,7 +470,10 @@ async def _async_process_trigger(hass, config, trigger_configs, name, action):
     for conf in trigger_configs:
         platform = importlib.import_module(".{}".format(conf[CONF_PLATFORM]), __name__)
 
-        remove = await platform.async_trigger(hass, conf, action, info)
+        try:
+            remove = await platform.async_trigger(hass, conf, action, info)
+        except InvalidDeviceAutomationConfig:
+            remove = False
 
         if not remove:
             _LOGGER.error("Error setting up trigger %s", name)

homeassistant/components/deconz/.translations/en.json

@@ -58,5 +58,34 @@
                 "description": "Configure visibility of deCONZ device types"
             }
         }
+    },
+    "device_automation": {
+        "trigger_type": {
+            "remote_button_short_press": "\"{subtype}\" button pressed",
+            "remote_button_short_release": "\"{subtype}\" button released",
+            "remote_button_long_press": "\"{subtype}\" button continuously pressed",
+            "remote_button_long_release": "\"{subtype}\" button released after long press",
+            "remote_button_double_press": "\"{subtype}\" button double clicked",
+            "remote_button_triple_press": "\"{subtype}\" button triple clicked",
+            "remote_button_quadruple_press": "\"{subtype}\" button quadruple clicked",
+            "remote_button_quintuple_press": "\"{subtype}\" button quintuple clicked",
+            "remote_button_rotated": "Button rotated \"{subtype}\"",
+            "remote_gyro_activated": "Device shaken"
+        },
+        "trigger_subtype": {
+            "turn_on": "Turn on",
+            "turn_off": "Turn off",
+            "dim_up": "Dim up",
+            "dim_down": "Dim down",
+            "left": "Left",
+            "right": "Right",
+            "open": "Open",
+            "close": "Close",
+            "both_buttons": "Both buttons",
+            "button_1": "First button",
+            "button_2": "Second button",
+            "button_3": "Third button",
+            "button_4": "Fourth button"
+        }
     }
 }

homeassistant/components/deconz/deconz_device.py

@@ -7,15 +7,56 @@
 from .const import DOMAIN as DECONZ_DOMAIN
 
 
-class DeconzDevice(Entity):
-    """Representation of a deCONZ device."""
+class DeconzBase:
+    """Common base for deconz entities and events."""
 
     def __init__(self, device, gateway):
         """Set up device and add update callback to get data from websocket."""
         self._device = device
         self.gateway = gateway
         self.listeners = []
 
+    @property
+    def unique_id(self):
+        """Return a unique identifier for this device."""
+        return self._device.uniqueid
+
+    @property
+    def serial(self):
+        """Return a serial number for this device."""
+        if self.unique_id is None or self.unique_id.count(":") != 7:
+            return None
+
+        return self.unique_id.split("-", 1)[0]
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        if self.serial is None:
+            return None
+
+        bridgeid = self.gateway.api.config.bridgeid
+
+        return {
+            "connections": {(CONNECTION_ZIGBEE, self.serial)},
+            "identifiers": {(DECONZ_DOMAIN, self.serial)},
+            "manufacturer": self._device.manufacturer,
+            "model": self._device.modelid,
+            "name": self._device.name,
+            "sw_version": self._device.swversion,
+            "via_device": (DECONZ_DOMAIN, bridgeid),
+        }
+
+
+class DeconzDevice(DeconzBase, Entity):
+    """Representation of a deCONZ device."""
+
+    def __init__(self, device, gateway):
+        """Set up device and add update callback to get data from websocket."""
+        super().__init__(device, gateway)
+
+        self.unsub_dispatcher = None
+
     @property
     def entity_registry_enabled_default(self):
         """Return if the entity should be enabled when first added to the entity registry."""
@@ -54,41 +95,17 @@ def async_update_callback(self, force_update=False):
         """Update the device's state."""
         self.async_schedule_update_ha_state()
 
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._device.name
-
-    @property
-    def unique_id(self):
-        """Return a unique identifier for this device."""
-        return self._device.uniqueid
-
     @property
     def available(self):
         """Return True if device is available."""
         return self.gateway.available and self._device.reachable
 
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._device.name
+
     @property
     def should_poll(self):
         """No polling needed."""
         return False
-
-    @property
-    def device_info(self):
-        """Return a device description for device registry."""
-        if self._device.uniqueid is None or self._device.uniqueid.count(":") != 7:
-            return None
-
-        serial = self._device.uniqueid.split("-", 1)[0]
-        bridgeid = self.gateway.api.config.bridgeid
-
-        return {
-            "connections": {(CONNECTION_ZIGBEE, serial)},
-            "identifiers": {(DECONZ_DOMAIN, serial)},
-            "manufacturer": self._device.manufacturer,
-            "model": self._device.modelid,
-            "name": self._device.name,
-            "sw_version": self._device.swversion,
-            "via_device": (DECONZ_DOMAIN, bridgeid),
-        }

homeassistant/components/deconz/deconz_event.py

@@ -0,0 +1,56 @@
+"""Representation of a deCONZ remote."""
+from homeassistant.const import CONF_EVENT, CONF_ID
+from homeassistant.core import callback
+from homeassistant.util import slugify
+
+from .const import _LOGGER
+from .deconz_device import DeconzBase
+
+CONF_DECONZ_EVENT = "deconz_event"
+CONF_UNIQUE_ID = "unique_id"
+
+
+class DeconzEvent(DeconzBase):
+    """When you want signals instead of entities.
+
+    Stateless sensors such as remotes are expected to generate an event
+    instead of a sensor entity in hass.
+    """
+
+    def __init__(self, device, gateway):
+        """Register callback that will be used for signals."""
+        super().__init__(device, gateway)
+
+        self._device.register_async_callback(self.async_update_callback)
+
+        self.device_id = None
+        self.event_id = slugify(self._device.name)
+        _LOGGER.debug("deCONZ event created: %s", self.event_id)
+
+    @callback
+    def async_will_remove_from_hass(self) -> None:
+        """Disconnect event object when removed."""
+        self._device.remove_callback(self.async_update_callback)
+        self._device = None
+
+    @callback
+    def async_update_callback(self, force_update=False):
+        """Fire the event if reason is that state is updated."""
+        if "state" in self._device.changed_keys:
+            data = {
+                CONF_ID: self.event_id,
+                CONF_UNIQUE_ID: self.serial,
+                CONF_EVENT: self._device.state,
+            }
+            self.gateway.hass.bus.async_fire(CONF_DECONZ_EVENT, data)
+
+    async def async_update_device_registry(self):
+        """Update device registry."""
+        device_registry = (
+            await self.gateway.hass.helpers.device_registry.async_get_registry()
+        )
+
+        entry = device_registry.async_get_or_create(
+            config_entry_id=self.gateway.config_entry.entry_id, **self.device_info
+        )
+        self.device_id = entry.id