images/ha_xiaomi_home
2
0
Fork 0
mirror of https://github.com/XiaoMi/ha_xiaomi_home.git synced 2025-05-03 23:05:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: the humidifier property (#1035)
Some checks failed
Tests / check-rule-format (push) Has been cancelled
Details
Validate / validate-hassfest (push) Has been cancelled
Details
Validate / validate-hacs (push) Has been cancelled
Details
Validate / validate-lint (push) Has been cancelled
Details
Validate / validate-setup (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Li Shuzhen 2025-04-28 09:35:47 +08:00 committed by GitHub
parent b4ece958ac
commit b0204ad9b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
custom_components/xiaomi_home/humidifier.py
View File

@ -52,23 +52,22 @@ from typing import Any, 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.humidifier import ( from homeassistant.components.humidifier import (HumidifierEntity,
HumidifierEntity, HumidifierDeviceClass,
HumidifierDeviceClass, HumidifierEntityFeature,
HumidifierEntityFeature HumidifierAction)
)
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
from .miot.const import DOMAIN 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, hass: HomeAssistant,
config_entry: ConfigEntry, config_entry: ConfigEntry,
async_add_entities: AddEntitiesCallback, async_add_entities: AddEntitiesCallback,
) -> None: ) -> 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'][
@ -82,8 +81,8 @@ async def async_setup_entry(
Humidifier(miot_device=miot_device, entity_data=data)) Humidifier(miot_device=miot_device, entity_data=data))
for data in miot_device.entity_list.get('dehumidifier', []): for data in miot_device.entity_list.get('dehumidifier', []):
data.device_class = HumidifierDeviceClass.DEHUMIDIFIER data.device_class = HumidifierDeviceClass.DEHUMIDIFIER
new_entities.append(Humidifier( new_entities.append(
miot_device=miot_device, entity_data=data)) Humidifier(miot_device=miot_device, entity_data=data))
if new_entities: if new_entities:
async_add_entities(new_entities) async_add_entities(new_entities)
@ -99,9 +98,8 @@ class Humidifier(MIoTServiceEntity, HumidifierEntity):
_mode_map: dict[Any, Any] _mode_map: dict[Any, Any]
def __init__( def __init__(self, miot_device: MIoTDevice,
self, miot_device: MIoTDevice, entity_data: MIoTEntityData entity_data: MIoTEntityData) -> None:
) -> None:
"""Initialize the Humidifier.""" """Initialize the Humidifier."""
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.device_class self._attr_device_class = entity_data.device_class
@ -130,12 +128,10 @@ class Humidifier(MIoTServiceEntity, HumidifierEntity):
# mode # mode
elif prop.name == 'mode': elif prop.name == 'mode':
if not prop.value_list: if not prop.value_list:
_LOGGER.error( _LOGGER.error('mode value_list is None, %s', self.entity_id)
'mode value_list is None, %s', self.entity_id)
continue continue
self._mode_map = prop.value_list.to_map() self._mode_map = prop.value_list.to_map()
self._attr_available_modes = list( self._attr_available_modes = list(self._mode_map.values())
self._mode_map.values())
self._attr_supported_features |= HumidifierEntityFeature.MODES self._attr_supported_features |= HumidifierEntityFeature.MODES
self._prop_mode = prop self._prop_mode = prop
# relative-humidity # relative-humidity
@ -152,33 +148,45 @@ class Humidifier(MIoTServiceEntity, HumidifierEntity):
async def async_set_humidity(self, humidity: int) -> None: async def async_set_humidity(self, humidity: int) -> None:
"""Set new target humidity.""" """Set new target humidity."""
await self.set_property_async( if self._prop_target_humidity is None:
prop=self._prop_target_humidity, value=humidity) return
await self.set_property_async(prop=self._prop_target_humidity,
value=humidity)
async def async_set_mode(self, mode: str) -> None: async def async_set_mode(self, mode: str) -> None:
"""Set new target preset mode.""" """Set new target preset mode."""
await self.set_property_async( await self.set_property_async(prop=self._prop_mode,
prop=self._prop_mode, value=self.get_map_key(
value=self.get_map_key(map_=self._mode_map, value=mode)) map_=self._mode_map, value=mode))
@property @property
def is_on(self) -> Optional[bool]: def is_on(self) -> Optional[bool]:
"""Return if the humidifier is on.""" """Return if the humidifier is on."""
return self.get_prop_value(prop=self._prop_on) return self.get_prop_value(prop=self._prop_on)
@property
def action(self) -> Optional[HumidifierAction]:
"""Return the current status of the device."""
if not self.is_on:
return HumidifierAction.OFF
if self._attr_device_class == HumidifierDeviceClass.HUMIDIFIER:
return HumidifierAction.HUMIDIFYING
return HumidifierAction.DRYING
@property @property
def current_humidity(self) -> Optional[int]: def current_humidity(self) -> Optional[int]:
"""Return the current humidity.""" """Return the current humidity."""
return self.get_prop_value(prop=self._prop_humidity) return (self.get_prop_value(
prop=self._prop_humidity) if self._prop_humidity else None)
@property @property
def target_humidity(self) -> Optional[int]: def target_humidity(self) -> Optional[int]:
"""Return the target humidity.""" """Return the target humidity."""
return self.get_prop_value(prop=self._prop_target_humidity) return (self.get_prop_value(prop=self._prop_target_humidity)
if self._prop_target_humidity else None)
@property @property
def mode(self) -> Optional[str]: def mode(self) -> Optional[str]:
"""Return the current preset mode.""" """Return the current preset mode."""
return self.get_map_value( return self.get_map_value(map_=self._mode_map,
map_=self._mode_map, key=self.get_prop_value(prop=self._prop_mode))
key=self.get_prop_value(prop=self._prop_mode))