From 972afc5ceae2057aa85f81e924ebb18a593fce46 Mon Sep 17 00:00:00 2001 From: Poltorak Serguei Date: Sun, 20 Mar 2022 16:50:16 +0300 Subject: [PATCH] Add Cover to Z-Wave.Me integration (#68233) * Cover integration * isort fix * Update homeassistant/components/zwave_me/cover.py Co-authored-by: Martin Hjelmare * Update cover.py * Update cover.py * Apply suggestions from code review Co-authored-by: Martin Hjelmare * coveragerc for cover * Fix position range * Clean up Co-authored-by: Dmitry Vlasov Co-authored-by: Martin Hjelmare --- .coveragerc | 1 + homeassistant/components/zwave_me/const.py | 2 + homeassistant/components/zwave_me/cover.py | 72 +++++++++++++++++++ .../components/zwave_me/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 6 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 homeassistant/components/zwave_me/cover.py diff --git a/.coveragerc b/.coveragerc index 47400426202..e5619ac4d67 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1469,6 +1469,7 @@ omit = homeassistant/components/zwave_me/__init__.py homeassistant/components/zwave_me/binary_sensor.py homeassistant/components/zwave_me/button.py + homeassistant/components/zwave_me/cover.py homeassistant/components/zwave_me/climate.py homeassistant/components/zwave_me/helpers.py homeassistant/components/zwave_me/light.py diff --git a/homeassistant/components/zwave_me/const.py b/homeassistant/components/zwave_me/const.py index 87d740f1ece..cbb096c91f3 100644 --- a/homeassistant/components/zwave_me/const.py +++ b/homeassistant/components/zwave_me/const.py @@ -12,6 +12,7 @@ class ZWaveMePlatform(StrEnum): BINARY_SENSOR = "sensorBinary" BUTTON = "toggleButton" CLIMATE = "thermostat" + COVER = "motor" LOCK = "doorlock" NUMBER = "switchMultilevel" SWITCH = "switchBinary" @@ -25,6 +26,7 @@ PLATFORMS = [ Platform.BINARY_SENSOR, Platform.BUTTON, Platform.CLIMATE, + Platform.COVER, Platform.LIGHT, Platform.LOCK, Platform.NUMBER, diff --git a/homeassistant/components/zwave_me/cover.py b/homeassistant/components/zwave_me/cover.py new file mode 100644 index 00000000000..0425a99b568 --- /dev/null +++ b/homeassistant/components/zwave_me/cover.py @@ -0,0 +1,72 @@ +"""Representation of a cover.""" +from __future__ import annotations + +from typing import Any + +from homeassistant.components.cover import ( + ATTR_POSITION, + SUPPORT_CLOSE, + SUPPORT_OPEN, + SUPPORT_SET_POSITION, + CoverEntity, +) +from homeassistant.core import callback +from homeassistant.helpers.dispatcher import async_dispatcher_connect + +from . import ZWaveMeEntity +from .const import DOMAIN, ZWaveMePlatform + +DEVICE_NAME = ZWaveMePlatform.COVER + + +async def async_setup_entry(hass, config_entry, async_add_entities): + """Set up the cover platform.""" + + @callback + def add_new_device(new_device): + controller = hass.data[DOMAIN][config_entry.entry_id] + cover = ZWaveMeCover(controller, new_device) + + async_add_entities( + [ + cover, + ] + ) + + config_entry.async_on_unload( + async_dispatcher_connect( + hass, f"ZWAVE_ME_NEW_{DEVICE_NAME.upper()}", add_new_device + ) + ) + + +class ZWaveMeCover(ZWaveMeEntity, CoverEntity): + """Representation of a ZWaveMe Multilevel Cover.""" + + def close_cover(self, **kwargs): + """Close cover.""" + self.controller.zwave_api.send_command(self.device.id, "exact?level=0") + + def open_cover(self, **kwargs): + """Open cover.""" + self.controller.zwave_api.send_command(self.device.id, "exact?level=99") + + def set_cover_position(self, **kwargs: Any) -> None: + """Update the current value.""" + value = kwargs[ATTR_POSITION] + self.controller.zwave_api.send_command( + self.device.id, f"exact?level={str(min(value, 99))}" + ) + + @property + def current_cover_position(self) -> int | None: + """Return current position of cover. + + None is unknown, 0 is closed, 100 is fully open. + """ + return self.device.level + + @property + def supported_features(self) -> int: + """Return the supported features.""" + return SUPPORT_OPEN | SUPPORT_CLOSE | SUPPORT_SET_POSITION diff --git a/homeassistant/components/zwave_me/manifest.json b/homeassistant/components/zwave_me/manifest.json index 2e6efd9576b..ed994594ff0 100644 --- a/homeassistant/components/zwave_me/manifest.json +++ b/homeassistant/components/zwave_me/manifest.json @@ -4,7 +4,7 @@ "documentation": "https://www.home-assistant.io/integrations/zwave_me", "iot_class": "local_push", "requirements": [ - "zwave_me_ws==0.2.2", + "zwave_me_ws==0.2.3", "url-normalize==1.4.1" ], "after_dependencies": ["zeroconf"], diff --git a/requirements_all.txt b/requirements_all.txt index 2ce5287b8b8..7334c6ba64c 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2497,4 +2497,4 @@ zm-py==0.5.2 zwave-js-server-python==0.35.2 # homeassistant.components.zwave_me -zwave_me_ws==0.2.2 +zwave_me_ws==0.2.3 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 4f165fe65f7..243e201638f 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1599,4 +1599,4 @@ zigpy==0.43.0 zwave-js-server-python==0.35.2 # homeassistant.components.zwave_me -zwave_me_ws==0.2.2 +zwave_me_ws==0.2.3