Add ZHA roller shadows as cover instead of switch

homeassistant/components/zha/core/const.py

@@ -86,6 +86,7 @@
 CHANNEL_ON_OFF = "on_off"
 CHANNEL_POWER_CONFIGURATION = "power"
 CHANNEL_PRESSURE = "pressure"
+CHANNEL_SHADE = "shade"
 CHANNEL_SMARTENERGY_METERING = "smartenergy_metering"
 CHANNEL_TEMPERATURE = "temperature"
 CHANNEL_THERMOSTAT = "thermostat"

homeassistant/components/zha/core/registries.py

@@ -102,6 +102,7 @@
         zigpy.profiles.zha.DeviceType.ON_OFF_BALLAST: SWITCH,
         zigpy.profiles.zha.DeviceType.ON_OFF_LIGHT: LIGHT,
         zigpy.profiles.zha.DeviceType.ON_OFF_PLUG_IN_UNIT: SWITCH,
+        zigpy.profiles.zha.DeviceType.SHADE: COVER,
         zigpy.profiles.zha.DeviceType.SMART_PLUG: SWITCH,
     },
     zigpy.profiles.zll.PROFILE_ID: {

homeassistant/components/zha/cover.py

@@ -1,29 +1,39 @@
 """Support for ZHA covers."""
-from datetime import timedelta
 import functools
 import logging
+from typing import List, Optional
 
 from zigpy.zcl.foundation import Status
 
-from homeassistant.components.cover import ATTR_POSITION, DOMAIN, CoverEntity
+from homeassistant.components.cover import (
+    ATTR_CURRENT_POSITION,
+    ATTR_POSITION,
+    DEVICE_CLASS_SHADE,
+    DOMAIN,
+    CoverEntity,
+)
 from homeassistant.const import STATE_CLOSED, STATE_CLOSING, STATE_OPEN, STATE_OPENING
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .core import discovery
 from .core.const import (
     CHANNEL_COVER,
+    CHANNEL_LEVEL,
+    CHANNEL_ON_OFF,
+    CHANNEL_SHADE,
     DATA_ZHA,
     DATA_ZHA_DISPATCHERS,
     SIGNAL_ADD_ENTITIES,
     SIGNAL_ATTR_UPDATED,
+    SIGNAL_SET_LEVEL,
 )
 from .core.registries import ZHA_ENTITIES
+from .core.typing import ChannelType, ZhaDeviceType
 from .entity import ZhaEntity
 
 _LOGGER = logging.getLogger(__name__)
 
-SCAN_INTERVAL = timedelta(minutes=60)
 STRICT_MATCH = functools.partial(ZHA_ENTITIES.strict_match, DOMAIN)
 
 
@@ -158,3 +168,113 @@ async def async_get_state(self, from_cache=True):
             else:
                 self._current_position = None
                 self._state = None
+
+
+@STRICT_MATCH(channel_names={CHANNEL_LEVEL, CHANNEL_ON_OFF, CHANNEL_SHADE})
+class Shade(ZhaEntity, CoverEntity):
+    """ZHA Shade."""
+
+    def __init__(
+        self,
+        unique_id: str,
+        zha_device: ZhaDeviceType,
+        channels: List[ChannelType],
+        **kwargs,
+    ):
+        """Initialize the ZHA light."""
+        super().__init__(unique_id, zha_device, channels, **kwargs)
+        self._on_off_channel = self.cluster_channels[CHANNEL_ON_OFF]
+        self._level_channel = self.cluster_channels[CHANNEL_LEVEL]
+        self._position = None
+        self._is_open = None
+
+    @property
+    def current_cover_position(self):
+        """Return current position of cover.
+
+        None is unknown, 0 is closed, 100 is fully open.
+        """
+        return self._position
+
+    @property
+    def device_class(self) -> Optional[str]:
+        """Return the class of this device, from component DEVICE_CLASSES."""
+        return DEVICE_CLASS_SHADE
+
+    @property
+    def is_closed(self) -> Optional[bool]:
+        """Return True if shade is closed."""
+        if self._is_open is None:
+            return None
+        return not self._is_open
+
+    async def async_added_to_hass(self):
+        """Run when about to be added to hass."""
+        await super().async_added_to_hass()
+        await self.async_accept_signal(
+            self._on_off_channel, SIGNAL_ATTR_UPDATED, self.async_set_open_closed
+        )
+        await self.async_accept_signal(
+            self._level_channel, SIGNAL_SET_LEVEL, self.async_set_level
+        )
+
+    @callback
+    def async_restore_last_state(self, last_state):
+        """Restore previous state."""
+        self._is_open = last_state.state == STATE_OPEN
+        if ATTR_CURRENT_POSITION in last_state.attributes:
+            self._position = last_state.attributes[ATTR_CURRENT_POSITION]
+
+    @callback
+    def async_set_open_closed(self, attr_id: int, attr_name: str, value: bool) -> None:
+        """Set open/closed state."""
+        self._is_open = bool(value)
+        self.async_write_ha_state()
+
+    @callback
+    def async_set_level(self, value: int) -> None:
+        """Set the reported position."""
+        value = max(0, min(255, value))
+        self._position = int(value * 100 / 255)
+        self.async_write_ha_state()
+
+    async def async_open_cover(self, **kwargs):
+        """Open the window cover."""
+        res = await self._on_off_channel.on()
+        if not isinstance(res, list) or res[1] != Status.SUCCESS:
+            self.debug("couldn't open cover: %s", res)
+            return
+
+        self._is_open = True
+        self.async_write_ha_state()
+
+    async def async_close_cover(self, **kwargs):
+        """Close the window cover."""
+        res = await self._on_off_channel.off()
+        if not isinstance(res, list) or res[1] != Status.SUCCESS:
+            self.debug("couldn't open cover: %s", res)
+            return
+
+        self._is_open = False
+        self.async_write_ha_state()
+
+    async def async_set_cover_position(self, **kwargs):
+        """Move the roller shutter to a specific position."""
+        new_pos = kwargs[ATTR_POSITION]
+        res = await self._level_channel.move_to_level_with_on_off(
+            new_pos * 255 / 100, 1
+        )
+
+        if not isinstance(res, list) or res[1] != Status.SUCCESS:
+            self.debug("couldn't set cover's position: %s", res)
+            return
+
+        self._position = new_pos
+        self.async_write_ha_state()
+
+    async def async_stop_cover(self, **kwargs) -> None:
+        """Stop the cover."""
+        res = await self._level_channel.stop()
+        if not isinstance(res, list) or res[1] != Status.SUCCESS:
+            self.debug("couldn't stop cover: %s", res)
+            return

homeassistant/components/zha/entity.py

@@ -28,7 +28,7 @@
     SIGNAL_REMOVE_GROUP,
 )
 from .core.helpers import LogMixin
-from .core.typing import CALLABLE_T, ChannelsType, ChannelType, ZhaDeviceType
+from .core.typing import CALLABLE_T, ChannelType, ZhaDeviceType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -150,7 +150,7 @@ def __init__(
         self,
         unique_id: str,
         zha_device: ZhaDeviceType,
-        channels: ChannelsType,
+        channels: List[ChannelType],
         **kwargs,
     ):
         """Init ZHA entity."""