chickliu/ha_xiaomi_home
1
0
Fork 0
mirror of https://github.com/XiaoMi/ha_xiaomi_home.git synced 2026-01-17 23:50:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: current position value range

Browse Source
This commit is contained in:
LiShuzhen 2025-02-08 16:29:14 +08:00
parent 3675860526
commit b802fdb2e4
1 changed files with 55 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
custom_components/xiaomi_home/cover.py
View File

@ -52,12 +52,9 @@ from typing import Optional
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.components.cover import ( from homeassistant.components.cover import (ATTR_POSITION, CoverEntity,
ATTR_POSITION, CoverEntityFeature,
CoverEntity, CoverDeviceClass)
CoverEntityFeature,
CoverDeviceClass
)
from .miot.miot_spec import MIoTSpecProperty from .miot.miot_spec import MIoTSpecProperty
from .miot.miot_device import MIoTDevice, MIoTEntityData, MIoTServiceEntity from .miot.miot_device import MIoTDevice, MIoTEntityData, MIoTServiceEntity
@ -66,11 +63,8 @@ from .miot.const import DOMAIN
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
async def async_setup_entry( async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry,
hass: HomeAssistant, async_add_entities: AddEntitiesCallback) -> None:
config_entry: ConfigEntry,
async_add_entities: AddEntitiesCallback
) -> None:
"""Set up a config entry.""" """Set up a config entry."""
device_list: list[MIoTDevice] = hass.data[DOMAIN]['devices'][ device_list: list[MIoTDevice] = hass.data[DOMAIN]['devices'][
config_entry.entry_id] config_entry.entry_id]
@ -86,8 +80,8 @@ async def async_setup_entry(
data.spec.device_class = CoverDeviceClass.SHUTTER data.spec.device_class = CoverDeviceClass.SHUTTER
elif data.spec.name == 'airer': elif data.spec.name == 'airer':
data.spec.device_class = CoverDeviceClass.BLIND data.spec.device_class = CoverDeviceClass.BLIND
new_entities.append( new_entities.append(Cover(miot_device=miot_device,
Cover(miot_device=miot_device, entity_data=data)) entity_data=data))
if new_entities: if new_entities:
async_add_entities(new_entities) async_add_entities(new_entities)
@ -101,19 +95,16 @@ class Cover(MIoTServiceEntity, CoverEntity):
_prop_motor_value_close: Optional[int] _prop_motor_value_close: Optional[int]
_prop_motor_value_pause: Optional[int] _prop_motor_value_pause: Optional[int]
_prop_status: Optional[MIoTSpecProperty] _prop_status: Optional[MIoTSpecProperty]
_prop_status_opening: Optional[int] _prop_status_opening: Optional[list[int]]
_prop_status_closing: Optional[int] _prop_status_closing: Optional[list[int]]
_prop_status_stop: Optional[int] _prop_status_stop: Optional[list[int]]
_prop_status_closed: Optional[int] _prop_status_closed: Optional[list[int]]
_prop_current_position: Optional[MIoTSpecProperty] _prop_current_position: Optional[MIoTSpecProperty]
_prop_target_position: Optional[MIoTSpecProperty] _prop_target_position: Optional[MIoTSpecProperty]
_prop_position_value_min: Optional[int]
_prop_position_value_max: Optional[int]
_prop_position_value_range: Optional[int] _prop_position_value_range: Optional[int]
def __init__( def __init__(self, miot_device: MIoTDevice,
self, miot_device: MIoTDevice, entity_data: MIoTEntityData entity_data: MIoTEntityData) -> None:
) -> None:
"""Initialize the Cover.""" """Initialize the Cover."""
super().__init__(miot_device=miot_device, entity_data=entity_data) super().__init__(miot_device=miot_device, entity_data=entity_data)
self._attr_device_class = entity_data.spec.device_class self._attr_device_class = entity_data.spec.device_class
@ -125,22 +116,20 @@ class Cover(MIoTServiceEntity, CoverEntity):
self._prop_motor_value_close = None self._prop_motor_value_close = None
self._prop_motor_value_pause = None self._prop_motor_value_pause = None
self._prop_status = None self._prop_status = None
self._prop_status_opening = None self._prop_status_opening = []
self._prop_status_closing = None self._prop_status_closing = []
self._prop_status_stop = None self._prop_status_stop = []
self._prop_status_closed = None self._prop_status_closed = []
self._prop_current_position = None self._prop_current_position = None
self._prop_target_position = None self._prop_target_position = None
self._prop_position_value_min = None
self._prop_position_value_max = None
self._prop_position_value_range = None self._prop_position_value_range = None
# properties # properties
for prop in entity_data.props: for prop in entity_data.props:
if prop.name == 'motor-control': if prop.name == 'motor-control':
if not prop.value_list: if not prop.value_list:
_LOGGER.error( _LOGGER.error('motor-control value_list is None, %s',
'motor-control value_list is None, %s', self.entity_id) self.entity_id)
continue continue
for item in prop.value_list.items: for item in prop.value_list.items:
if item.name in {'open', 'up'}: if item.name in {'open', 'up'}:
@ -158,20 +147,27 @@ class Cover(MIoTServiceEntity, CoverEntity):
self._prop_motor_control = prop self._prop_motor_control = prop
elif prop.name == 'status': elif prop.name == 'status':
if not prop.value_list: if not prop.value_list:
_LOGGER.error( _LOGGER.error('status value_list is None, %s',
'status value_list is None, %s', self.entity_id) self.entity_id)
continue continue
for item in prop.value_list.items: for item in prop.value_list.items:
if item.name in {'opening', 'open', 'up'}: if item.name in {'opening', 'open', 'up'}:
self._prop_status_opening = item.value self._prop_status_opening.append(item.value)
elif item.name in {'closing', 'close', 'down'}: elif item.name in {'closing', 'close', 'down'}:
self._prop_status_closing = item.value self._prop_status_closing.append(item.value)
elif item.name in {'stop', 'pause'}: elif item.name in {'stop', 'stopped', 'pause'}:
self._prop_status_stop = item.value self._prop_status_stop.append(item.value)
elif item.name in {'closed'}: elif item.name in {'closed'}:
self._prop_status_closed = item.value self._prop_status_closed.append(item.value)
self._prop_status = prop self._prop_status = prop
elif prop.name == 'current-position': elif prop.name == 'current-position':
if not prop.value_range:
_LOGGER.error(
'invalid current-position value_range format, %s',
self.entity_id)
continue
self._prop_position_value_range = (prop.value_range.max_ -
prop.value_range.min_)
self._prop_current_position = prop self._prop_current_position = prop
elif prop.name == 'target-position': elif prop.name == 'target-position':
if not prop.value_range: if not prop.value_range:
@ -179,37 +175,34 @@ class Cover(MIoTServiceEntity, CoverEntity):
'invalid target-position value_range format, %s', 'invalid target-position value_range format, %s',
self.entity_id) self.entity_id)
continue continue
self._prop_position_value_min = prop.value_range.min_ self._prop_position_value_range = (prop.value_range.max_ -
self._prop_position_value_max = prop.value_range.max_ prop.value_range.min_)
self._prop_position_value_range = (
self._prop_position_value_max -
self._prop_position_value_min)
self._attr_supported_features |= CoverEntityFeature.SET_POSITION self._attr_supported_features |= CoverEntityFeature.SET_POSITION
self._prop_target_position = prop self._prop_target_position = prop
async def async_open_cover(self, **kwargs) -> None: async def async_open_cover(self, **kwargs) -> None:
"""Open the cover.""" """Open the cover."""
await self.set_property_async( await self.set_property_async(self._prop_motor_control,
self._prop_motor_control, self._prop_motor_value_open) self._prop_motor_value_open)
async def async_close_cover(self, **kwargs) -> None: async def async_close_cover(self, **kwargs) -> None:
"""Close the cover.""" """Close the cover."""
await self.set_property_async( await self.set_property_async(self._prop_motor_control,
self._prop_motor_control, self._prop_motor_value_close) self._prop_motor_value_close)
async def async_stop_cover(self, **kwargs) -> None: async def async_stop_cover(self, **kwargs) -> None:
"""Stop the cover.""" """Stop the cover."""
await self.set_property_async( await self.set_property_async(self._prop_motor_control,
self._prop_motor_control, self._prop_motor_value_pause) self._prop_motor_value_pause)
async def async_set_cover_position(self, **kwargs) -> None: async def async_set_cover_position(self, **kwargs) -> None:
"""Set the position of the cover.""" """Set the position of the cover."""
pos = kwargs.get(ATTR_POSITION, None) pos = kwargs.get(ATTR_POSITION, None)
if pos is None: if pos is None:
return None return None
pos = round(pos*self._prop_position_value_range/100) pos = round(pos * self._prop_position_value_range / 100)
await self.set_property_async( await self.set_property_async(prop=self._prop_target_position,
prop=self._prop_target_position, value=pos) value=pos)
@property @property
def current_cover_position(self) -> Optional[int]: def current_cover_position(self) -> Optional[int]:
@ -225,16 +218,15 @@ class Cover(MIoTServiceEntity, CoverEntity):
is None) else self.get_prop_value( is None) else self.get_prop_value(
prop=self._prop_target_position) prop=self._prop_target_position)
pos = self.get_prop_value(prop=self._prop_current_position) pos = self.get_prop_value(prop=self._prop_current_position)
if pos is None or self._prop_position_value_range is None: return None if pos is None else round(pos * 100 /
return None self._prop_position_value_range)
return round(pos*100/self._prop_position_value_range)
@property @property
def is_opening(self) -> Optional[bool]: def is_opening(self) -> Optional[bool]:
"""Return if the cover is opening.""" """Return if the cover is opening."""
if self._prop_status and self._prop_status_opening is not None: if self._prop_status and self._prop_status_opening:
return self.get_prop_value( return (self.get_prop_value(prop=self._prop_status)
prop=self._prop_status) == self._prop_status_opening in self._prop_status_opening)
# The status is prior to the numerical relationship of the current # The status is prior to the numerical relationship of the current
# position and the target position when determining whether the cover # position and the target position when determining whether the cover
# is opening. # is opening.
@ -247,9 +239,9 @@ class Cover(MIoTServiceEntity, CoverEntity):
@property @property
def is_closing(self) -> Optional[bool]: def is_closing(self) -> Optional[bool]:
"""Return if the cover is closing.""" """Return if the cover is closing."""
if self._prop_status and self._prop_status_closing is not None: if self._prop_status and self._prop_status_closing:
return self.get_prop_value( return (self.get_prop_value(prop=self._prop_status)
prop=self._prop_status) == self._prop_status_closing in self._prop_status_closing)
# The status is prior to the numerical relationship of the current # The status is prior to the numerical relationship of the current
# position and the target position when determining whether the cover # position and the target position when determining whether the cover
# is closing. # is closing.
@ -266,7 +258,7 @@ class Cover(MIoTServiceEntity, CoverEntity):
return self.current_cover_position == 0 return self.current_cover_position == 0
# The current position is prior to the status when determining # The current position is prior to the status when determining
# whether the cover is closed. # whether the cover is closed.
if self._prop_status and self._prop_status_closed is not None: if self._prop_status and self._prop_status_closed:
return (self.get_prop_value( return (self.get_prop_value(prop=self._prop_status)
prop=self._prop_status) == self._prop_status_closed) in self._prop_status_closed)
return None return None