evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update tuya cover, fix Up/down position (#59858)

Browse source
This commit is contained in:
Tuen Lee 2021-12-03 10:23:15 +01:00 • committed by GitHub
parent 67f9118cbf
commit 85293d8073
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
homeassistant/components/tuya/cover.py
View file

@ -36,7 +36,7 @@ class TuyaCoverEntityDescription(CoverEntityDescription):
current_state: DPCode | None = None current_state: DPCode | None = None
current_state_inverse: bool = False current_state_inverse: bool = False
current_position: DPCode | None = None current_position: DPCode | tuple[DPCode, ...] | None = None
set_position: DPCode | None = None set_position: DPCode | None = None
@ -49,7 +49,7 @@ COVERS: dict[str, tuple[TuyaCoverEntityDescription, ...]] = {
key=DPCode.CONTROL, key=DPCode.CONTROL,
name="Curtain", name="Curtain",
current_state=DPCode.SITUATION_SET, current_state=DPCode.SITUATION_SET,
current_position=DPCode.PERCENT_STATE, current_position=(DPCode.PERCENT_CONTROL, DPCode.PERCENT_STATE),
set_position=DPCode.PERCENT_CONTROL, set_position=DPCode.PERCENT_CONTROL,
device_class=CoverDeviceClass.CURTAIN, device_class=CoverDeviceClass.CURTAIN,
), ),
@ -173,6 +173,7 @@ class TuyaCoverEntity(TuyaEntity, CoverEntity):
_set_position_type: IntegerTypeData | None = None _set_position_type: IntegerTypeData | None = None
_tilt_dpcode: DPCode | None = None _tilt_dpcode: DPCode | None = None
_tilt_type: IntegerTypeData | None = None _tilt_type: IntegerTypeData | None = None
_position_dpcode: DPCode | None = None
entity_description: TuyaCoverEntityDescription entity_description: TuyaCoverEntityDescription
def __init__( def __init__(
@ -235,21 +236,34 @@ class TuyaCoverEntity(TuyaEntity, CoverEntity):
device.status_range[tilt_dpcode].values device.status_range[tilt_dpcode].values
) )
# Determine current_position DPCodes
if (
self.entity_description.current_position is None
and self.entity_description.set_position is not None
):
self._position_dpcode = self.entity_description.set_position
elif isinstance(self.entity_description.current_position, DPCode):
self._position_dpcode = self.entity_description.current_position
elif isinstance(self.entity_description.current_position, tuple):
self._position_dpcode = next(
(
dpcode
for dpcode in self.entity_description.current_position
if self.device.status.get(dpcode) is not None
),
None,
)
@property @property
def current_cover_position(self) -> int | None: def current_cover_position(self) -> int | None:
"""Return cover current position.""" """Return cover current position."""
if self._current_position_type is None: if self._current_position_type is None:
return None return None
if not ( if not self._position_dpcode:
dpcode := (
self.entity_description.current_position
or self.entity_description.set_position
)
):
return None return None
if (position := self.device.status.get(dpcode)) is None: if (position := self.device.status.get(self._position_dpcode)) is None:
return None return None
return round( return round(
@ -296,14 +310,40 @@ class TuyaCoverEntity(TuyaEntity, CoverEntity):
value: bool | str = True value: bool | str = True
if self.device.function[self.entity_description.key].type == "Enum": if self.device.function[self.entity_description.key].type == "Enum":
value = "open" value = "open"
self._send_command([{"code": self.entity_description.key, "value": value}])
commands: list[dict[str, str | int]] = [
{"code": self.entity_description.key, "value": value}
]
if (self.entity_description.set_position) is not None:
commands.append(
{
"code": self.entity_description.set_position,
"value": 0,
}
)
self._send_command(commands)
def close_cover(self, **kwargs: Any) -> None: def close_cover(self, **kwargs: Any) -> None:
"""Close cover.""" """Close cover."""
value: bool | str = True value: bool | str = True
if self.device.function[self.entity_description.key].type == "Enum": if self.device.function[self.entity_description.key].type == "Enum":
value = "close" value = "close"
self._send_command([{"code": self.entity_description.key, "value": value}])
commands: list[dict[str, str | int]] = [
{"code": self.entity_description.key, "value": value}
]
if (self.entity_description.set_position) is not None:
commands.append(
{
"code": self.entity_description.set_position,
"value": 100,
}
)
self._send_command(commands)
def set_cover_position(self, **kwargs: Any) -> None: def set_cover_position(self, **kwargs: Any) -> None:
"""Move the cover to a specific position.""" """Move the cover to a specific position."""