From 57422ddf0da49a609a931a175ccc428ac12e3a04 Mon Sep 17 00:00:00 2001 From: Li Shuzhen Date: Fri, 24 Jan 2025 10:43:49 +0800 Subject: [PATCH 01/10] fix: fan level with value-list & fan reverse (#689) * fix: fan level with value-list * feat: update wind-reverse logic * feat: use macro define for fan entity * fix: fix fan async_set_direction error --------- Co-authored-by: topsworld --- custom_components/xiaomi_home/fan.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/custom_components/xiaomi_home/fan.py b/custom_components/xiaomi_home/fan.py index 92a41f4..0f64aa8 100644 --- a/custom_components/xiaomi_home/fan.py +++ b/custom_components/xiaomi_home/fan.py @@ -52,7 +52,12 @@ import logging from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback -from homeassistant.components.fan import FanEntity, FanEntityFeature +from homeassistant.components.fan import ( + FanEntity, + FanEntityFeature, + DIRECTION_FORWARD, + DIRECTION_REVERSE +) from homeassistant.util.percentage import ( percentage_to_ranged_value, ranged_value_to_percentage, @@ -172,8 +177,9 @@ class Fan(MIoTServiceEntity, FanEntity): self._prop_wind_reverse_reverse = True elif prop.value_list: for item in prop.value_list.items: - if item.name in {'foreward'}: + if item.name in {'foreward', 'forward'}: self._prop_wind_reverse_forward = item.value + elif item.name in {'reversal', 'reverse'}: self._prop_wind_reverse_reverse = item.value if ( self._prop_wind_reverse_forward is None @@ -202,9 +208,9 @@ class Fan(MIoTServiceEntity, FanEntity): if self._speed_names: await self.set_property_async( prop=self._prop_fan_level, - value=self.get_map_value( + value=self.get_map_key( map_=self._speed_name_map, - key=percentage_to_ordered_list_item( + value=percentage_to_ordered_list_item( self._speed_names, percentage))) else: await self.set_property_async( @@ -233,9 +239,9 @@ class Fan(MIoTServiceEntity, FanEntity): if self._speed_names: await self.set_property_async( prop=self._prop_fan_level, - value=self.get_map_value( + value=self.get_map_key( map_=self._speed_name_map, - key=percentage_to_ordered_list_item( + value=percentage_to_ordered_list_item( self._speed_names, percentage))) else: await self.set_property_async( @@ -264,7 +270,7 @@ class Fan(MIoTServiceEntity, FanEntity): prop=self._prop_wind_reverse, value=( self._prop_wind_reverse_reverse - if self.current_direction == 'reverse' + if direction == DIRECTION_REVERSE else self._prop_wind_reverse_forward)) async def async_oscillate(self, oscillating: bool) -> None: @@ -293,9 +299,9 @@ class Fan(MIoTServiceEntity, FanEntity): """Return the current direction of the fan.""" if not self._prop_wind_reverse: return None - return 'reverse' if self.get_prop_value( + return DIRECTION_REVERSE if self.get_prop_value( prop=self._prop_wind_reverse - ) == self._prop_wind_reverse_reverse else 'forward' + ) == self._prop_wind_reverse_reverse else DIRECTION_FORWARD @property def percentage(self) -> Optional[int]: From 20b0004746d14884f061d6d52171b614c7e57449 Mon Sep 17 00:00:00 2001 From: Li Shuzhen Date: Wed, 19 Feb 2025 09:21:46 +0800 Subject: [PATCH 02/10] refactor: refactor climate.py (#614) * feat: add thermostat as climate entity * feat: add bath-heater as climate entity * refactor: climate entity * fix: thermostat on/off * fix: get the current fan mode * perf: get fan level * fix: fix climate hvac_mode * fix: misuse of getting key or value from dict[int, any] * style: add comments * style: format the file based on google style * fix: initialize _attr_hvac_modes * feat: add heat and defog mode of ptc bath heater --------- Co-authored-by: topsworld --- custom_components/xiaomi_home/climate.py | 980 ++++++++++-------- .../xiaomi_home/miot/specs/specv2entity.py | 49 + 2 files changed, 601 insertions(+), 428 deletions(-) diff --git a/custom_components/xiaomi_home/climate.py b/custom_components/xiaomi_home/climate.py index 88140ab..5fb75a7 100644 --- a/custom_components/xiaomi_home/climate.py +++ b/custom_components/xiaomi_home/climate.py @@ -53,16 +53,8 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.components.climate import ( - SWING_ON, - SWING_OFF, - SWING_BOTH, - SWING_VERTICAL, - SWING_HORIZONTAL, - ATTR_TEMPERATURE, - HVACMode, - ClimateEntity, - ClimateEntityFeature -) + FAN_ON, FAN_OFF, SWING_OFF, SWING_BOTH, SWING_VERTICAL, SWING_HORIZONTAL, + ATTR_TEMPERATURE, HVACMode, ClimateEntity, ClimateEntityFeature) from .miot.const import DOMAIN from .miot.miot_device import MIoTDevice, MIoTServiceEntity, MIoTEntityData @@ -71,11 +63,8 @@ from .miot.miot_spec import MIoTSpecProperty _LOGGER = logging.getLogger(__name__) -async def async_setup_entry( - hass: HomeAssistant, - config_entry: ConfigEntry, - async_add_entities: AddEntitiesCallback, -) -> None: +async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, + async_add_entities: AddEntitiesCallback) -> None: """Set up a config entry.""" device_list: list[MIoTDevice] = hass.data[DOMAIN]['devices'][ config_entry.entry_id] @@ -88,77 +77,407 @@ async def async_setup_entry( for data in miot_device.entity_list.get('heater', []): new_entities.append( Heater(miot_device=miot_device, entity_data=data)) + for data in miot_device.entity_list.get('bath-heater', []): + new_entities.append( + PtcBathHeater(miot_device=miot_device, entity_data=data)) + for data in miot_device.entity_list.get('thermostat', []): + new_entities.append( + Thermostat(miot_device=miot_device, entity_data=data)) if new_entities: async_add_entities(new_entities) -class AirConditioner(MIoTServiceEntity, ClimateEntity): - """Air conditioner entities for Xiaomi Home.""" - # service: air-conditioner +class FeatureOnOff(MIoTServiceEntity, ClimateEntity): + """TURN_ON and TURN_OFF feature of the climate entity.""" _prop_on: Optional[MIoTSpecProperty] - _prop_mode: Optional[MIoTSpecProperty] - _prop_target_temp: Optional[MIoTSpecProperty] - _prop_target_humi: Optional[MIoTSpecProperty] - # service: fan-control - _prop_fan_on: Optional[MIoTSpecProperty] - _prop_fan_level: Optional[MIoTSpecProperty] - _prop_horizontal_swing: Optional[MIoTSpecProperty] - _prop_vertical_swing: Optional[MIoTSpecProperty] - # service: environment - _prop_env_temp: Optional[MIoTSpecProperty] - _prop_env_humi: Optional[MIoTSpecProperty] - # service: air-condition-outlet-matching - _prop_ac_state: Optional[MIoTSpecProperty] - _value_ac_state: Optional[dict[str, int]] - - _hvac_mode_map: Optional[dict[int, HVACMode]] - _fan_mode_map: Optional[dict[int, str]] - - def __init__( - self, miot_device: MIoTDevice, entity_data: MIoTEntityData - ) -> None: - """Initialize the Air conditioner.""" - super().__init__(miot_device=miot_device, entity_data=entity_data) - self._attr_icon = 'mdi:air-conditioner' - self._attr_supported_features = ClimateEntityFeature(0) - self._attr_swing_mode = None - self._attr_swing_modes = [] + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the feature class.""" self._prop_on = None - self._prop_mode = None - self._prop_target_temp = None - self._prop_target_humi = None - self._prop_fan_on = None - self._prop_fan_level = None - self._prop_horizontal_swing = None - self._prop_vertical_swing = None - self._prop_env_temp = None - self._prop_env_humi = None - self._prop_ac_state = None - self._value_ac_state = None - self._hvac_mode_map = None - self._fan_mode_map = None + super().__init__(miot_device=miot_device, entity_data=entity_data) # properties for prop in entity_data.props: if prop.name == 'on': - if prop.service.name == 'air-conditioner': + if ( + # The "on" property of the "fan-control" service is not + # the on/off feature of the entity. + prop.service.name == 'air-conditioner' or + prop.service.name == 'heater' or + prop.service.name == 'thermostat'): self._attr_supported_features |= ( ClimateEntityFeature.TURN_ON) self._attr_supported_features |= ( ClimateEntityFeature.TURN_OFF) self._prop_on = prop - elif prop.service.name == 'fan-control': - self._attr_swing_modes.append(SWING_ON) - self._prop_fan_on = prop - else: + + async def async_turn_on(self) -> None: + """Turn on.""" + await self.set_property_async(prop=self._prop_on, value=True) + + async def async_turn_off(self) -> None: + """Turn off.""" + await self.set_property_async(prop=self._prop_on, value=False) + + +class FeatureTargetTemperature(MIoTServiceEntity, ClimateEntity): + """TARGET_TEMPERATURE feature of the climate entity.""" + _prop_target_temp: Optional[MIoTSpecProperty] + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the feature class.""" + self._prop_target_temp = None + + super().__init__(miot_device=miot_device, entity_data=entity_data) + # properties + for prop in entity_data.props: + if prop.name == 'target-temperature': + if not prop.value_range: _LOGGER.error( - 'unknown on property, %s', self.entity_id) - elif prop.name == 'mode': + 'invalid target-temperature value_range format, %s', + self.entity_id) + continue + self._attr_min_temp = prop.value_range.min_ + self._attr_max_temp = prop.value_range.max_ + self._attr_target_temperature_step = prop.value_range.step + self._attr_temperature_unit = prop.external_unit + self._attr_supported_features |= ( + ClimateEntityFeature.TARGET_TEMPERATURE) + self._prop_target_temp = prop + + async def async_set_temperature(self, **kwargs): + """Set the target temperature.""" + if ATTR_TEMPERATURE in kwargs: + temp = kwargs[ATTR_TEMPERATURE] + if temp > self._attr_max_temp: + temp = self._attr_max_temp + elif temp < self._attr_min_temp: + temp = self._attr_min_temp + + await self.set_property_async(prop=self._prop_target_temp, + value=temp) + + @property + def target_temperature(self) -> Optional[float]: + """The current target temperature.""" + return (self.get_prop_value( + prop=self._prop_target_temp) if self._prop_target_temp else None) + + +class FeaturePresetMode(MIoTServiceEntity, ClimateEntity): + """PRESET_MODE feature of the climate entity.""" + _prop_mode: Optional[MIoTSpecProperty] + _mode_map: Optional[dict[int, str]] + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the feature class.""" + self._prop_mode = None + self._mode_map = None + + super().__init__(miot_device=miot_device, entity_data=entity_data) + # properties + for prop in entity_data.props: + if prop.name == 'heat-level' and prop.service.name == 'heater': if not prop.value_list: + _LOGGER.error('invalid heater heat-level value_list, %s', + self.entity_id) + continue + self._mode_map = prop.value_list.to_map() + self._attr_preset_modes = prop.value_list.descriptions + self._attr_supported_features |= ( + ClimateEntityFeature.PRESET_MODE) + self._prop_mode = prop + + async def async_set_preset_mode(self, preset_mode: str) -> None: + """Set the preset mode.""" + await self.set_property_async(self._prop_mode, + value=self.get_map_key( + map_=self._mode_map, + value=preset_mode)) + + @property + def preset_mode(self) -> Optional[str]: + """The current preset mode.""" + return (self.get_map_value( + map_=self._mode_map, key=self.get_prop_value( + prop=self._prop_mode)) if self._prop_mode else None) + + +class FeatureFanMode(MIoTServiceEntity, ClimateEntity): + """FAN_MODE feature of the climate entity.""" + _prop_fan_on: Optional[MIoTSpecProperty] + _prop_fan_level: Optional[MIoTSpecProperty] + _fan_mode_map: Optional[dict[int, str]] + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the feature class.""" + self._prop_fan_on = None + self._prop_fan_level = None + self._fan_mode_map = None + + super().__init__(miot_device=miot_device, entity_data=entity_data) + # properties + for prop in entity_data.props: + if prop.name == 'fan-level' and prop.service.name == 'fan-control': + if not prop.value_list: + _LOGGER.error('invalid fan-level value_list, %s', + self.entity_id) + continue + self._fan_mode_map = prop.value_list.to_map() + self._attr_fan_modes = prop.value_list.descriptions + self._attr_supported_features |= ClimateEntityFeature.FAN_MODE + self._prop_fan_level = prop + elif prop.name == 'on' and prop.service.name == 'fan-control': + self._prop_fan_on = prop + self._attr_supported_features |= ClimateEntityFeature.FAN_MODE + + if self._prop_fan_on: + if self._attr_fan_modes is None: + self._attr_fan_modes = [FAN_ON, FAN_OFF] + else: + self._attr_fan_modes.append(FAN_OFF) + + async def async_set_fan_mode(self, fan_mode): + """Set the target fan mode.""" + if fan_mode == FAN_OFF: + await self.set_property_async(prop=self._prop_fan_on, value=False) + return + if fan_mode == FAN_ON: + await self.set_property_async(prop=self._prop_fan_on, value=True) + return + mode_value = self.get_map_key(map_=self._fan_mode_map, value=fan_mode) + if mode_value is None or not await self.set_property_async( + prop=self._prop_fan_level, value=mode_value): + raise RuntimeError(f'set climate prop.fan_mode failed, {fan_mode}, ' + f'{self.entity_id}') + + @property + def fan_mode(self) -> Optional[str]: + """The current fan mode.""" + if self._prop_fan_level is None and self._prop_fan_on is None: + return None + if self._prop_fan_level is None and self._prop_fan_on: + return (FAN_ON if self.get_prop_value( + prop=self._prop_fan_on) else FAN_OFF) + return self.get_map_value( + map_=self._fan_mode_map, + key=self.get_prop_value(prop=self._prop_fan_level)) + + +class FeatureSwingMode(MIoTServiceEntity, ClimateEntity): + """SWING_MODE feature of the climate entity.""" + _prop_horizontal_swing: Optional[MIoTSpecProperty] + _prop_vertical_swing: Optional[MIoTSpecProperty] + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the feature class.""" + self._prop_horizontal_swing = None + self._prop_vertical_swing = None + + super().__init__(miot_device=miot_device, entity_data=entity_data) + # properties + swing_modes = [] + for prop in entity_data.props: + if prop.name == 'horizontal-swing': + swing_modes.append(SWING_HORIZONTAL) + self._prop_horizontal_swing = prop + elif prop.name == 'vertical-swing': + swing_modes.append(SWING_VERTICAL) + self._prop_vertical_swing = prop + # swing modes + if SWING_HORIZONTAL in swing_modes and SWING_VERTICAL in swing_modes: + swing_modes.append(SWING_BOTH) + if swing_modes: + swing_modes.insert(0, SWING_OFF) + self._attr_supported_features |= ClimateEntityFeature.SWING_MODE + self._attr_swing_modes = swing_modes + + async def async_set_swing_mode(self, swing_mode): + """Set the target swing operation.""" + if swing_mode == SWING_BOTH: + await self.set_property_async(prop=self._prop_horizontal_swing, + value=True) + await self.set_property_async(prop=self._prop_vertical_swing, + value=True) + elif swing_mode == SWING_HORIZONTAL: + await self.set_property_async(prop=self._prop_horizontal_swing, + value=True) + elif swing_mode == SWING_VERTICAL: + await self.set_property_async(prop=self._prop_vertical_swing, + value=True) + elif swing_mode == SWING_OFF: + if self._prop_horizontal_swing: + await self.set_property_async(prop=self._prop_horizontal_swing, + value=False) + if self._prop_vertical_swing: + await self.set_property_async(prop=self._prop_vertical_swing, + value=False) + else: + raise RuntimeError( + f'unknown swing_mode, {swing_mode}, {self.entity_id}') + + @property + def swing_mode(self) -> Optional[str]: + """The current swing mode of the fan.""" + if (self._prop_horizontal_swing is None and + self._prop_vertical_swing is None): + return None + horizontal: bool = (self.get_prop_value( + prop=self._prop_horizontal_swing) + if self._prop_horizontal_swing else False) + vertical: bool = (self.get_prop_value(prop=self._prop_vertical_swing) + if self._prop_vertical_swing else False) + if horizontal and vertical: + return SWING_BOTH + elif horizontal: + return SWING_HORIZONTAL + elif vertical: + return SWING_VERTICAL + else: + return SWING_OFF + + +class FeatureTemperature(MIoTServiceEntity, ClimateEntity): + """Temperature of the climate entity.""" + _prop_env_temperature: Optional[MIoTSpecProperty] + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the feature class.""" + self._prop_env_temperature = None + + super().__init__(miot_device=miot_device, entity_data=entity_data) + # properties + for prop in entity_data.props: + if prop.name == 'temperature': + self._prop_env_temperature = prop + + @property + def current_temperature(self) -> Optional[float]: + """The current environment temperature.""" + return (self.get_prop_value(prop=self._prop_env_temperature) + if self._prop_env_temperature else None) + + +class FeatureHumidity(MIoTServiceEntity, ClimateEntity): + """Humidity of the climate entity.""" + _prop_env_humidity: Optional[MIoTSpecProperty] + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the feature class.""" + self._prop_env_humidity = None + + super().__init__(miot_device=miot_device, entity_data=entity_data) + # properties + for prop in entity_data.props: + if prop.name == 'relative-humidity': + self._prop_env_humidity = prop + + @property + def current_humidity(self) -> Optional[float]: + """The current environment humidity.""" + return (self.get_prop_value( + prop=self._prop_env_humidity) if self._prop_env_humidity else None) + + +class FeatureTargetHumidity(MIoTServiceEntity, ClimateEntity): + """TARGET_HUMIDITY feature of the climate entity.""" + _prop_target_humidity: Optional[MIoTSpecProperty] + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the feature class.""" + self._prop_target_humidity = None + + super().__init__(miot_device=miot_device, entity_data=entity_data) + # properties + for prop in entity_data.props: + if prop.name == 'target-humidity': + if not prop.value_range: _LOGGER.error( - 'invalid mode value_list, %s', self.entity_id) + 'invalid target-humidity value_range format, %s', + self.entity_id) + continue + self._attr_min_humidity = prop.value_range.min_ + self._attr_max_humidity = prop.value_range.max_ + self._attr_supported_features |= ( + ClimateEntityFeature.TARGET_HUMIDITY) + self._prop_target_humidity = prop + + async def async_set_humidity(self, humidity): + """Set the target humidity.""" + if humidity > self._attr_max_humidity: + humidity = self._attr_max_humidity + elif humidity < self._attr_min_humidity: + humidity = self._attr_min_humidity + await self.set_property_async(prop=self._prop_target_humidity, + value=humidity) + + @property + def target_humidity(self) -> Optional[int]: + """The current target humidity.""" + return (self.get_prop_value(prop=self._prop_target_humidity) + if self._prop_target_humidity else None) + + +class Heater(FeatureOnOff, FeatureTargetTemperature, FeatureTemperature, + FeatureHumidity, FeaturePresetMode): + """Heater""" + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the heater.""" + super().__init__(miot_device=miot_device, entity_data=entity_data) + + self._attr_icon = 'mdi:radiator' + # hvac modes + self._attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF] + + async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: + """Set the target hvac mode.""" + await self.set_property_async( + prop=self._prop_on, + value=False if hvac_mode == HVACMode.OFF else True) + + @property + def hvac_mode(self) -> Optional[HVACMode]: + """The current hvac mode.""" + return (HVACMode.HEAT if self.get_prop_value( + prop=self._prop_on) else HVACMode.OFF) + + +class AirConditioner(FeatureOnOff, FeatureTargetTemperature, + FeatureTargetHumidity, FeatureTemperature, FeatureHumidity, + FeatureFanMode, FeatureSwingMode): + """Air conditioner""" + _prop_mode: Optional[MIoTSpecProperty] + _hvac_mode_map: Optional[dict[int, HVACMode]] + _prop_ac_state: Optional[MIoTSpecProperty] + _value_ac_state: Optional[dict[str, int]] + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the air conditioner.""" + self._prop_mode = None + self._hvac_mode_map = None + self._prop_ac_state = None + self._value_ac_state = None + + super().__init__(miot_device=miot_device, entity_data=entity_data) + self._attr_icon = 'mdi:air-conditioner' + # hvac modes + self._attr_hvac_modes = None + for prop in entity_data.props: + if prop.name == 'mode': + if not prop.value_list: + _LOGGER.error('invalid mode value_list, %s', self.entity_id) continue self._hvac_mode_map = {} for item in prop.value_list.items: @@ -176,239 +495,54 @@ class AirConditioner(MIoTServiceEntity, ClimateEntity): self._hvac_mode_map[item.value] = HVACMode.FAN_ONLY self._attr_hvac_modes = list(self._hvac_mode_map.values()) self._prop_mode = prop - elif prop.name == 'target-temperature': - if not prop.value_range: - _LOGGER.error( - 'invalid target-temperature value_range format, %s', - self.entity_id) - continue - self._attr_min_temp = prop.value_range.min_ - self._attr_max_temp = prop.value_range.max_ - self._attr_target_temperature_step = prop.value_range.step - self._attr_temperature_unit = prop.external_unit - self._attr_supported_features |= ( - ClimateEntityFeature.TARGET_TEMPERATURE) - self._prop_target_temp = prop - elif prop.name == 'target-humidity': - if not prop.value_range: - _LOGGER.error( - 'invalid target-humidity value_range format, %s', - self.entity_id) - continue - self._attr_min_humidity = prop.value_range.min_ - self._attr_max_humidity = prop.value_range.max_ - self._attr_supported_features |= ( - ClimateEntityFeature.TARGET_HUMIDITY) - self._prop_target_humi = prop - elif prop.name == 'fan-level': - if not prop.value_list: - _LOGGER.error( - 'invalid fan-level value_list, %s', self.entity_id) - continue - self._fan_mode_map = prop.value_list.to_map() - self._attr_fan_modes = list(self._fan_mode_map.values()) - self._attr_supported_features |= ClimateEntityFeature.FAN_MODE - self._prop_fan_level = prop - elif prop.name == 'horizontal-swing': - self._attr_swing_modes.append(SWING_HORIZONTAL) - self._prop_horizontal_swing = prop - elif prop.name == 'vertical-swing': - self._attr_swing_modes.append(SWING_VERTICAL) - self._prop_vertical_swing = prop - elif prop.name == 'temperature': - self._prop_env_temp = prop - elif prop.name == 'relative-humidity': - self._prop_env_humi = prop - elif prop.name == 'ac-state': self._prop_ac_state = prop self._value_ac_state = {} - self.sub_prop_changed( - prop=prop, handler=self.__ac_state_changed) + self.sub_prop_changed(prop=prop, + handler=self.__ac_state_changed) - # hvac modes - if HVACMode.OFF not in self._attr_hvac_modes: + if self._attr_hvac_modes is None: + self._attr_hvac_modes = [HVACMode.OFF] + elif HVACMode.OFF not in self._attr_hvac_modes: self._attr_hvac_modes.append(HVACMode.OFF) - # swing modes - if ( - SWING_HORIZONTAL in self._attr_swing_modes - and SWING_VERTICAL in self._attr_swing_modes - ): - self._attr_swing_modes.append(SWING_BOTH) - if self._attr_swing_modes: - self._attr_swing_modes.insert(0, SWING_OFF) - self._attr_supported_features |= ClimateEntityFeature.SWING_MODE - - async def async_turn_on(self) -> None: - """Turn the entity on.""" - await self.set_property_async(prop=self._prop_on, value=True) - - async def async_turn_off(self) -> None: - """Turn the entity off.""" - await self.set_property_async(prop=self._prop_on, value=False) async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: - """Set new target hvac mode.""" - # set air-conditioner off + """Set the target hvac mode.""" + # set the device off if hvac_mode == HVACMode.OFF: - if not await self.set_property_async( - prop=self._prop_on, value=False): - raise RuntimeError( - f'set climate prop.on failed, {hvac_mode}, ' - f'{self.entity_id}') + if not await self.set_property_async(prop=self._prop_on, + value=False): + raise RuntimeError(f'set climate prop.on failed, {hvac_mode}, ' + f'{self.entity_id}') return - # set air-conditioner on + # set the device on if self.get_prop_value(prop=self._prop_on) is False: - await self.set_property_async( - prop=self._prop_on, value=True, write_ha_state=False) + await self.set_property_async(prop=self._prop_on, + value=True, + write_ha_state=False) # set mode - mode_value = self.get_map_key( - map_=self._hvac_mode_map, value=hvac_mode) - if ( - not mode_value or - not await self.set_property_async( - prop=self._prop_mode, value=mode_value) - ): + if self._prop_mode is None: + return + mode_value = self.get_map_key(map_=self._hvac_mode_map, value=hvac_mode) + if mode_value is None or not await self.set_property_async( + prop=self._prop_mode, value=mode_value): raise RuntimeError( f'set climate prop.mode failed, {hvac_mode}, {self.entity_id}') - async def async_set_temperature(self, **kwargs): - """Set new target temperature.""" - if ATTR_TEMPERATURE in kwargs: - temp = kwargs[ATTR_TEMPERATURE] - if temp > self.max_temp: - temp = self.max_temp - elif temp < self.min_temp: - temp = self.min_temp - - await self.set_property_async( - prop=self._prop_target_temp, value=temp) - - async def async_set_humidity(self, humidity): - """Set new target humidity.""" - if humidity > self.max_humidity: - humidity = self.max_humidity - elif humidity < self.min_humidity: - humidity = self.min_humidity - await self.set_property_async( - prop=self._prop_target_humi, value=humidity) - - async def async_set_swing_mode(self, swing_mode): - """Set new target swing operation.""" - if swing_mode == SWING_BOTH: - await self.set_property_async( - prop=self._prop_horizontal_swing, value=True, - write_ha_state=False) - await self.set_property_async( - prop=self._prop_vertical_swing, value=True) - elif swing_mode == SWING_HORIZONTAL: - await self.set_property_async( - prop=self._prop_horizontal_swing, value=True) - elif swing_mode == SWING_VERTICAL: - await self.set_property_async( - prop=self._prop_vertical_swing, value=True) - elif swing_mode == SWING_ON: - await self.set_property_async( - prop=self._prop_fan_on, value=True) - elif swing_mode == SWING_OFF: - if self._prop_fan_on: - await self.set_property_async( - prop=self._prop_fan_on, value=False, - write_ha_state=False) - if self._prop_horizontal_swing: - await self.set_property_async( - prop=self._prop_horizontal_swing, value=False, - write_ha_state=False) - if self._prop_vertical_swing: - await self.set_property_async( - prop=self._prop_vertical_swing, value=False, - write_ha_state=False) - self.async_write_ha_state() - else: - raise RuntimeError( - f'unknown swing_mode, {swing_mode}, {self.entity_id}') - - async def async_set_fan_mode(self, fan_mode): - """Set new target fan mode.""" - mode_value = self.get_map_key( - map_=self._fan_mode_map, value=fan_mode) - if mode_value is None or not await self.set_property_async( - prop=self._prop_fan_level, value=mode_value): - raise RuntimeError( - f'set climate prop.fan_mode failed, {fan_mode}, ' - f'{self.entity_id}') - - @property - def target_temperature(self) -> Optional[float]: - """Return the target temperature.""" - return self.get_prop_value( - prop=self._prop_target_temp) if self._prop_target_temp else None - - @property - def target_humidity(self) -> Optional[int]: - """Return the target humidity.""" - return self.get_prop_value( - prop=self._prop_target_humi) if self._prop_target_humi else None - - @property - def current_temperature(self) -> Optional[float]: - """Return the current temperature.""" - return self.get_prop_value( - prop=self._prop_env_temp) if self._prop_env_temp else None - - @property - def current_humidity(self) -> Optional[int]: - """Return the current humidity.""" - return self.get_prop_value( - prop=self._prop_env_humi) if self._prop_env_humi else None - @property def hvac_mode(self) -> Optional[HVACMode]: - """Return the hvac mode. e.g., heat, cool mode.""" + """The current hvac mode.""" if self.get_prop_value(prop=self._prop_on) is False: return HVACMode.OFF - return self.get_map_value( - map_=self._hvac_mode_map, - key=self.get_prop_value(prop=self._prop_mode)) - - @property - def fan_mode(self) -> Optional[str]: - """Return the fan mode. - - Requires ClimateEntityFeature.FAN_MODE. - """ - return self.get_map_value( - map_=self._fan_mode_map, - key=self.get_prop_value(prop=self._prop_fan_level)) - - @property - def swing_mode(self) -> Optional[str]: - """Return the swing mode. - - Requires ClimateEntityFeature.SWING_MODE. - """ - horizontal = ( - self.get_prop_value(prop=self._prop_horizontal_swing)) - vertical = ( - self.get_prop_value(prop=self._prop_vertical_swing)) - if horizontal and vertical: - return SWING_BOTH - if horizontal: - return SWING_HORIZONTAL - if vertical: - return SWING_VERTICAL - if self._prop_fan_on: - if self.get_prop_value(prop=self._prop_fan_on): - return SWING_ON - else: - return SWING_OFF - return None + return (self.get_map_value(map_=self._hvac_mode_map, + key=self.get_prop_value( + prop=self._prop_mode)) + if self._prop_mode else None) def __ac_state_changed(self, prop: MIoTSpecProperty, value: Any) -> None: del prop if not isinstance(value, str): - _LOGGER.error( - 'ac_status value format error, %s', value) + _LOGGER.error('ac_status value format error, %s', value) return v_ac_state = {} v_split = value.split('_') @@ -422,8 +556,7 @@ class AirConditioner(MIoTServiceEntity, ClimateEntity): _LOGGER.error('ac_status value error, %s', item) # P: status. 0: on, 1: off if 'P' in v_ac_state and self._prop_on: - self.set_prop_value(prop=self._prop_on, - value=v_ac_state['P'] == 0) + self.set_prop_value(prop=self._prop_on, value=v_ac_state['P'] == 0) # M: model. 0: cool, 1: heat, 2: auto, 3: fan, 4: dry if 'M' in v_ac_state and self._prop_mode: mode: Optional[HVACMode] = { @@ -431,12 +564,12 @@ class AirConditioner(MIoTServiceEntity, ClimateEntity): 1: HVACMode.HEAT, 2: HVACMode.AUTO, 3: HVACMode.FAN_ONLY, - 4: HVACMode.DRY + 4: HVACMode.DRY, }.get(v_ac_state['M'], None) if mode: - self.set_prop_value( - prop=self._prop_mode, value=self.get_map_key( - map_=self._hvac_mode_map, value=mode)) + self.set_prop_value(prop=self._prop_mode, + value=self.get_map_key( + map_=self._hvac_mode_map, value=mode)) # T: target temperature if 'T' in v_ac_state and self._prop_target_temp: self.set_prop_value(prop=self._prop_target_temp, @@ -446,162 +579,153 @@ class AirConditioner(MIoTServiceEntity, ClimateEntity): self.set_prop_value(prop=self._prop_fan_level, value=v_ac_state['S']) # D: swing mode. 0: on, 1: off - if ( - 'D' in v_ac_state - and self._attr_swing_modes - and len(self._attr_swing_modes) == 2 - ): - if ( - SWING_HORIZONTAL in self._attr_swing_modes - and self._prop_horizontal_swing - ): - self.set_prop_value( - prop=self._prop_horizontal_swing, - value=v_ac_state['D'] == 0) - elif ( - SWING_VERTICAL in self._attr_swing_modes - and self._prop_vertical_swing - ): - self.set_prop_value( - prop=self._prop_vertical_swing, - value=v_ac_state['D'] == 0) - if self._value_ac_state: - self._value_ac_state.update(v_ac_state) - _LOGGER.debug( - 'ac_state update, %s', self._value_ac_state) + if ('D' in v_ac_state and self._attr_swing_modes and + len(self._attr_swing_modes) == 2): + if (SWING_HORIZONTAL in self._attr_swing_modes and + self._prop_horizontal_swing): + self.set_prop_value(prop=self._prop_horizontal_swing, + value=v_ac_state['D'] == 0) + elif (SWING_VERTICAL in self._attr_swing_modes and + self._prop_vertical_swing): + self.set_prop_value(prop=self._prop_vertical_swing, + value=v_ac_state['D'] == 0) + + self._value_ac_state.update(v_ac_state) + _LOGGER.debug('ac_state update, %s', self._value_ac_state) -class Heater(MIoTServiceEntity, ClimateEntity): - """Heater entities for Xiaomi Home.""" - # service: heater - _prop_on: Optional[MIoTSpecProperty] +class PtcBathHeater(FeatureTargetTemperature, FeatureTemperature, + FeatureFanMode, FeatureSwingMode): + """Ptc bath heater""" _prop_mode: Optional[MIoTSpecProperty] - _prop_target_temp: Optional[MIoTSpecProperty] - _prop_heat_level: Optional[MIoTSpecProperty] - # service: environment - _prop_env_temp: Optional[MIoTSpecProperty] - _prop_env_humi: Optional[MIoTSpecProperty] + _hvac_mode_map: Optional[dict[int, HVACMode]] - _heat_level_map: Optional[dict[int, str]] - - def __init__( - self, miot_device: MIoTDevice, entity_data: MIoTEntityData - ) -> None: - """Initialize the Heater.""" - super().__init__(miot_device=miot_device, entity_data=entity_data) - self._attr_icon = 'mdi:air-conditioner' - self._attr_supported_features = ClimateEntityFeature(0) - self._attr_preset_modes = [] - - self._prop_on = None + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the ptc bath heater.""" self._prop_mode = None - self._prop_target_temp = None - self._prop_heat_level = None - self._prop_env_temp = None - self._prop_env_humi = None - self._heat_level_map = None - - # properties - for prop in entity_data.props: - if prop.name == 'on': - self._attr_supported_features |= ( - ClimateEntityFeature.TURN_ON) - self._attr_supported_features |= ( - ClimateEntityFeature.TURN_OFF) - self._prop_on = prop - elif prop.name == 'target-temperature': - if not prop.value_range: - _LOGGER.error( - 'invalid target-temperature value_range format, %s', - self.entity_id) - continue - self._attr_min_temp = prop.value_range.min_ - self._attr_max_temp = prop.value_range.max_ - self._attr_target_temperature_step = prop.value_range.step - self._attr_temperature_unit = prop.external_unit - self._attr_supported_features |= ( - ClimateEntityFeature.TARGET_TEMPERATURE) - self._prop_target_temp = prop - elif prop.name == 'heat-level': - if not prop.value_list: - _LOGGER.error( - 'invalid heat-level value_list, %s', self.entity_id) - continue - self._heat_level_map = prop.value_list.to_map() - self._attr_preset_modes = list(self._heat_level_map.values()) - self._attr_supported_features |= ( - ClimateEntityFeature.PRESET_MODE) - self._prop_heat_level = prop - elif prop.name == 'temperature': - self._prop_env_temp = prop - elif prop.name == 'relative-humidity': - self._prop_env_humi = prop + self._hvac_mode_map = None + super().__init__(miot_device=miot_device, entity_data=entity_data) + self._attr_icon = 'mdi:hvac' # hvac modes - self._attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF] - - async def async_turn_on(self) -> None: - """Turn the entity on.""" - await self.set_property_async(prop=self._prop_on, value=True) - - async def async_turn_off(self) -> None: - """Turn the entity off.""" - await self.set_property_async(prop=self._prop_on, value=False) + for prop in entity_data.props: + if prop.name == 'mode': + if not prop.value_list: + _LOGGER.error('invalid mode value_list, %s', self.entity_id) + continue + self._hvac_mode_map = {} + for item in prop.value_list.items: + if item.name in {'off', 'idle' + } and (HVACMode.OFF not in list( + self._hvac_mode_map.values())): + self._hvac_mode_map[item.value] = HVACMode.OFF + elif item.name in {'auto'}: + self._hvac_mode_map[item.value] = HVACMode.AUTO + elif item.name in {'ventilate'}: + self._hvac_mode_map[item.value] = HVACMode.COOL + elif item.name in {'heat', 'quick_heat' + } and (HVACMode.HEAT not in list( + self._hvac_mode_map.values())): + self._hvac_mode_map[item.value] = HVACMode.HEAT + elif item.name in {'defog'}: + self._hvac_mode_map[item.value] = HVACMode.HEAT_COOL + elif item.name in {'dry'}: + self._hvac_mode_map[item.value] = HVACMode.DRY + elif item.name in {'fan'}: + self._hvac_mode_map[item.value] = HVACMode.FAN_ONLY + self._attr_hvac_modes = list(self._hvac_mode_map.values()) + self._prop_mode = prop async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: - """Set new target hvac mode.""" - await self.set_property_async( - prop=self._prop_on, value=False - if hvac_mode == HVACMode.OFF else True) - - async def async_set_temperature(self, **kwargs): - """Set new target temperature.""" - if ATTR_TEMPERATURE in kwargs: - temp = kwargs[ATTR_TEMPERATURE] - if temp > self.max_temp: - temp = self.max_temp - elif temp < self.min_temp: - temp = self.min_temp - - await self.set_property_async( - prop=self._prop_target_temp, value=temp) - - async def async_set_preset_mode(self, preset_mode: str) -> None: - """Set the preset mode.""" - await self.set_property_async( - self._prop_heat_level, - value=self.get_map_key( - map_=self._heat_level_map, value=preset_mode)) - - @property - def target_temperature(self) -> Optional[float]: - """Return the target temperature.""" - return self.get_prop_value( - prop=self._prop_target_temp) if self._prop_target_temp else None - - @property - def current_temperature(self) -> Optional[float]: - """Return the current temperature.""" - return self.get_prop_value( - prop=self._prop_env_temp) if self._prop_env_temp else None - - @property - def current_humidity(self) -> Optional[int]: - """Return the current humidity.""" - return self.get_prop_value( - prop=self._prop_env_humi) if self._prop_env_humi else None + """Set the target hvac mode.""" + if self._prop_mode is None: + return + mode_value = self.get_map_key(map_=self._hvac_mode_map, value=hvac_mode) + if mode_value is None or not await self.set_property_async( + prop=self._prop_mode, value=mode_value): + raise RuntimeError( + f'set climate prop.mode failed, {hvac_mode}, {self.entity_id}') @property def hvac_mode(self) -> Optional[HVACMode]: - """Return the hvac mode.""" - return ( - HVACMode.HEAT if self.get_prop_value(prop=self._prop_on) - else HVACMode.OFF) + """The current hvac mode.""" + return (self.get_map_value(map_=self._hvac_mode_map, + key=self.get_prop_value( + prop=self._prop_mode)) + if self._prop_mode else None) + + +class Thermostat(FeatureOnOff, FeatureTargetTemperature, FeatureTemperature, + FeatureHumidity, FeatureFanMode): + """Thermostat""" + _prop_mode: Optional[MIoTSpecProperty] + _hvac_mode_map: Optional[dict[int, HVACMode]] + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the thermostat.""" + self._prop_mode = None + self._hvac_mode_map = None + + super().__init__(miot_device=miot_device, entity_data=entity_data) + self._attr_icon = 'mdi:thermostat' + # hvac modes + self._attr_hvac_modes = None + for prop in entity_data.props: + if prop.name == 'mode': + if not prop.value_list: + _LOGGER.error('invalid mode value_list, %s', self.entity_id) + continue + self._hvac_mode_map = {} + for item in prop.value_list.items: + if item.name in {'off', 'idle'}: + self._hvac_mode_map[item.value] = HVACMode.OFF + elif item.name in {'auto'}: + self._hvac_mode_map[item.value] = HVACMode.AUTO + elif item.name in {'cool'}: + self._hvac_mode_map[item.value] = HVACMode.COOL + elif item.name in {'heat'}: + self._hvac_mode_map[item.value] = HVACMode.HEAT + elif item.name in {'dry'}: + self._hvac_mode_map[item.value] = HVACMode.DRY + elif item.name in {'fan'}: + self._hvac_mode_map[item.value] = HVACMode.FAN_ONLY + self._attr_hvac_modes = list(self._hvac_mode_map.values()) + self._prop_mode = prop + + if self._attr_hvac_modes is None: + self._attr_hvac_modes = [HVACMode.OFF, HVACMode.AUTO] + elif HVACMode.OFF not in self._attr_hvac_modes: + self._attr_hvac_modes.insert(0, HVACMode.OFF) + + async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: + """Set the target hvac mode.""" + # set the device off + if hvac_mode == HVACMode.OFF: + if not await self.set_property_async(prop=self._prop_on, + value=False): + raise RuntimeError(f'set climate prop.on failed, {hvac_mode}, ' + f'{self.entity_id}') + return + # set the device on + elif self.get_prop_value(prop=self._prop_on) is False: + await self.set_property_async(prop=self._prop_on, value=True) + # set mode + if self._prop_mode is None: + return + mode_value = self.get_map_key(map_=self._hvac_mode_map, value=hvac_mode) + if mode_value is None or not await self.set_property_async( + prop=self._prop_mode, value=mode_value): + raise RuntimeError( + f'set climate prop.mode failed, {hvac_mode}, {self.entity_id}') @property - def preset_mode(self) -> Optional[str]: - return ( - self.get_map_value( - map_=self._heat_level_map, - key=self.get_prop_value(prop=self._prop_heat_level)) - if self._prop_heat_level else None) + def hvac_mode(self) -> Optional[HVACMode]: + """The current hvac mode.""" + if self.get_prop_value(prop=self._prop_on) is False: + return HVACMode.OFF + return (self.get_map_value(map_=self._hvac_mode_map, + key=self.get_prop_value( + prop=self._prop_mode)) + if self._prop_mode else None) diff --git a/custom_components/xiaomi_home/miot/specs/specv2entity.py b/custom_components/xiaomi_home/miot/specs/specv2entity.py index 0061f79..9dc6a9b 100644 --- a/custom_components/xiaomi_home/miot/specs/specv2entity.py +++ b/custom_components/xiaomi_home/miot/specs/specv2entity.py @@ -224,6 +224,31 @@ SPEC_DEVICE_TRANS_MAP: dict = { 'entity': 'air-conditioner' }, 'air-condition-outlet': 'air-conditioner', + 'thermostat': { + 'required': { + 'thermostat': { + 'required': { + 'properties': { + 'on': {'read', 'write'} + } + }, + 'optional': { + 'properties': { + 'target-temperature', 'mode', 'fan-level', + 'temperature'} + }, + } + }, + 'optional': { + 'environment': { + 'required': {}, + 'optional': { + 'properties': {'temperature', 'relative-humidity'} + } + }, + }, + 'entity': 'thermostat' + }, 'heater': { 'required': { 'heater': { @@ -246,6 +271,30 @@ SPEC_DEVICE_TRANS_MAP: dict = { }, }, 'entity': 'heater' + }, + 'bath-heater': { + 'required': { + 'ptc-bath-heater': { + 'required': {}, + 'optional': { + 'properties': { + 'target-temperature', 'heat-level', + 'temperature', 'mode' + } + }, + } + }, + 'optional': { + 'fan-control': { + 'required': {}, + 'optional': { + 'properties': { + 'on', 'fan-level', 'horizontal-swing', 'vertical-swing' + } + }, + } + }, + 'entity': 'bath-heater', } } From 0ce94f73167a28b13524dccbb16addcde60f79ce Mon Sep 17 00:00:00 2001 From: Li Shuzhen Date: Tue, 25 Feb 2025 08:55:06 +0800 Subject: [PATCH 03/10] feat: add device with motor-control service as cover entity (#688) --- custom_components/xiaomi_home/cover.py | 160 ++++++++++-------- .../xiaomi_home/miot/miot_spec.py | 11 ++ .../xiaomi_home/miot/specs/spec_modify.yaml | 7 + .../xiaomi_home/miot/specs/specv2entity.py | 4 +- 4 files changed, 115 insertions(+), 67 deletions(-) diff --git a/custom_components/xiaomi_home/cover.py b/custom_components/xiaomi_home/cover.py index f2ebaeb..dcc512f 100644 --- a/custom_components/xiaomi_home/cover.py +++ b/custom_components/xiaomi_home/cover.py @@ -52,25 +52,19 @@ from typing import Optional from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback -from homeassistant.components.cover import ( - ATTR_POSITION, - CoverEntity, - CoverEntityFeature, - CoverDeviceClass -) +from homeassistant.components.cover import (ATTR_POSITION, CoverEntity, + CoverEntityFeature, + CoverDeviceClass) 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 _LOGGER = logging.getLogger(__name__) -async def async_setup_entry( - hass: HomeAssistant, - config_entry: ConfigEntry, - async_add_entities: AddEntitiesCallback, -) -> None: +async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, + async_add_entities: AddEntitiesCallback) -> None: """Set up a config entry.""" device_list: list[MIoTDevice] = hass.data[DOMAIN]['devices'][ config_entry.entry_id] @@ -82,8 +76,12 @@ async def async_setup_entry( data.spec.device_class = CoverDeviceClass.CURTAIN elif data.spec.name == 'window-opener': data.spec.device_class = CoverDeviceClass.WINDOW - new_entities.append( - Cover(miot_device=miot_device, entity_data=data)) + elif data.spec.name == 'motor-controller': + data.spec.device_class = CoverDeviceClass.SHUTTER + elif data.spec.name == 'airer': + data.spec.device_class = CoverDeviceClass.BLIND + new_entities.append(Cover(miot_device=miot_device, + entity_data=data)) if new_entities: async_add_entities(new_entities) @@ -97,18 +95,16 @@ class Cover(MIoTServiceEntity, CoverEntity): _prop_motor_value_close: Optional[int] _prop_motor_value_pause: Optional[int] _prop_status: Optional[MIoTSpecProperty] - _prop_status_opening: Optional[int] - _prop_status_closing: Optional[int] - _prop_status_stop: Optional[int] + _prop_status_opening: Optional[list[int]] + _prop_status_closing: Optional[list[int]] + _prop_status_stop: Optional[list[int]] + _prop_status_closed: Optional[list[int]] _prop_current_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] - def __init__( - self, miot_device: MIoTDevice, entity_data: MIoTEntityData - ) -> None: + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: """Initialize the Cover.""" super().__init__(miot_device=miot_device, entity_data=entity_data) self._attr_device_class = entity_data.spec.device_class @@ -120,50 +116,58 @@ class Cover(MIoTServiceEntity, CoverEntity): self._prop_motor_value_close = None self._prop_motor_value_pause = None self._prop_status = None - self._prop_status_opening = None - self._prop_status_closing = None - self._prop_status_stop = None + self._prop_status_opening = [] + self._prop_status_closing = [] + self._prop_status_stop = [] + self._prop_status_closed = [] self._prop_current_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 # properties for prop in entity_data.props: if prop.name == 'motor-control': if not prop.value_list: - _LOGGER.error( - 'motor-control value_list is None, %s', self.entity_id) + _LOGGER.error('motor-control value_list is None, %s', + self.entity_id) continue for item in prop.value_list.items: - if item.name in {'open'}: + if item.name in {'open', 'up'}: self._attr_supported_features |= ( CoverEntityFeature.OPEN) self._prop_motor_value_open = item.value - elif item.name in {'close'}: + elif item.name in {'close', 'down'}: self._attr_supported_features |= ( CoverEntityFeature.CLOSE) self._prop_motor_value_close = item.value - elif item.name in {'pause'}: + elif item.name in {'pause', 'stop'}: self._attr_supported_features |= ( CoverEntityFeature.STOP) self._prop_motor_value_pause = item.value self._prop_motor_control = prop elif prop.name == 'status': if not prop.value_list: - _LOGGER.error( - 'status value_list is None, %s', self.entity_id) + _LOGGER.error('status value_list is None, %s', + self.entity_id) continue for item in prop.value_list.items: - if item.name in {'opening', 'open'}: - self._prop_status_opening = item.value - elif item.name in {'closing', 'close'}: - self._prop_status_closing = item.value - elif item.name in {'stop', 'pause'}: - self._prop_status_stop = item.value + if item.name in {'opening', 'open', 'up'}: + self._prop_status_opening.append(item.value) + elif item.name in {'closing', 'close', 'down'}: + self._prop_status_closing.append(item.value) + elif item.name in {'stop', 'stopped', 'pause'}: + self._prop_status_stop.append(item.value) + elif item.name in {'closed'}: + self._prop_status_closed.append(item.value) self._prop_status = prop 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 elif prop.name == 'target-position': if not prop.value_range: @@ -171,37 +175,34 @@ class Cover(MIoTServiceEntity, CoverEntity): 'invalid target-position value_range format, %s', self.entity_id) continue - self._prop_position_value_min = prop.value_range.min_ - self._prop_position_value_max = prop.value_range.max_ - self._prop_position_value_range = ( - self._prop_position_value_max - - self._prop_position_value_min) + self._prop_position_value_range = (prop.value_range.max_ - + prop.value_range.min_) self._attr_supported_features |= CoverEntityFeature.SET_POSITION self._prop_target_position = prop async def async_open_cover(self, **kwargs) -> None: """Open the cover.""" - await self.set_property_async( - self._prop_motor_control, self._prop_motor_value_open) + await self.set_property_async(self._prop_motor_control, + self._prop_motor_value_open) async def async_close_cover(self, **kwargs) -> None: """Close the cover.""" - await self.set_property_async( - self._prop_motor_control, self._prop_motor_value_close) + await self.set_property_async(self._prop_motor_control, + self._prop_motor_value_close) async def async_stop_cover(self, **kwargs) -> None: """Stop the cover.""" - await self.set_property_async( - self._prop_motor_control, self._prop_motor_value_pause) + await self.set_property_async(self._prop_motor_control, + self._prop_motor_value_pause) async def async_set_cover_position(self, **kwargs) -> None: """Set the position of the cover.""" pos = kwargs.get(ATTR_POSITION, None) if pos is None: return None - pos = round(pos*self._prop_position_value_range/100) - await self.set_property_async( - prop=self._prop_target_position, value=pos) + pos = round(pos * self._prop_position_value_range / 100) + await self.set_property_async(prop=self._prop_target_position, + value=pos) @property def current_cover_position(self) -> Optional[int]: @@ -209,28 +210,55 @@ class Cover(MIoTServiceEntity, CoverEntity): 0: the cover is closed, 100: the cover is fully opened, None: unknown. """ + if self._prop_current_position is None: + # Assume that the current position is the same as the target + # position when the current position is not defined in the device's + # MIoT-Spec-V2. + return None if (self._prop_target_position + is None) else self.get_prop_value( + prop=self._prop_target_position) pos = self.get_prop_value(prop=self._prop_current_position) - if pos is None: - return None - return round(pos*100/self._prop_position_value_range) + return None if pos is None else round(pos * 100 / + self._prop_position_value_range) @property def is_opening(self) -> Optional[bool]: """Return if the cover is opening.""" - if self._prop_status is None: - return None - return self.get_prop_value( - prop=self._prop_status) == self._prop_status_opening + if self._prop_status and self._prop_status_opening: + return (self.get_prop_value(prop=self._prop_status) + in self._prop_status_opening) + # The status is prior to the numerical relationship of the current + # position and the target position when determining whether the cover + # is opening. + if (self._prop_target_position and + self.current_cover_position is not None): + return (self.current_cover_position + < self.get_prop_value(prop=self._prop_target_position)) + return None @property def is_closing(self) -> Optional[bool]: """Return if the cover is closing.""" - if self._prop_status is None: - return None - return self.get_prop_value( - prop=self._prop_status) == self._prop_status_closing + if self._prop_status and self._prop_status_closing: + return (self.get_prop_value(prop=self._prop_status) + in self._prop_status_closing) + # The status is prior to the numerical relationship of the current + # position and the target position when determining whether the cover + # is closing. + if (self._prop_target_position and + self.current_cover_position is not None): + return (self.current_cover_position + > self.get_prop_value(prop=self._prop_target_position)) + return None @property def is_closed(self) -> Optional[bool]: """Return if the cover is closed.""" - return self.get_prop_value(prop=self._prop_current_position) == 0 + if self.current_cover_position is not None: + return self.current_cover_position == 0 + # The current position is prior to the status when determining + # whether the cover is closed. + if self._prop_status and self._prop_status_closed: + return (self.get_prop_value(prop=self._prop_status) + in self._prop_status_closed) + return None diff --git a/custom_components/xiaomi_home/miot/miot_spec.py b/custom_components/xiaomi_home/miot/miot_spec.py index eaede61..d4ec8f5 100644 --- a/custom_components/xiaomi_home/miot/miot_spec.py +++ b/custom_components/xiaomi_home/miot/miot_spec.py @@ -1198,6 +1198,13 @@ class _SpecModify: return None return access + def get_prop_value_range(self, siid: int, piid: int) -> Optional[list]: + value_range = self.__get_prop_item(siid=siid, piid=piid, + key='value-range') + if not isinstance(value_range, list): + return None + return value_range + def __get_prop_item(self, siid: int, piid: int, key: str) -> Optional[str]: if not self._selected: return None @@ -1474,6 +1481,10 @@ class MIoTSpecParser: siid=service['iid'], piid=property_['iid']) if custom_access: spec_prop.access = custom_access + custom_range = self._spec_modify.get_prop_value_range( + siid=service['iid'], piid=property_['iid']) + if custom_range: + spec_prop.value_range = custom_range # Parse service event for event in service.get('events', []): if ( diff --git a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml index 0a0950d..131ef59 100644 --- a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml +++ b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml @@ -42,3 +42,10 @@ urn:miot-spec-v2:device:router:0000A036:xiaomi-rd08:1: name: upload-speed icon: mdi:upload unit: B/s +urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:1: + prop.2.3: + value-range: + - 0 + - 1 + - 1 +urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:2: urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:1 diff --git a/custom_components/xiaomi_home/miot/specs/specv2entity.py b/custom_components/xiaomi_home/miot/specs/specv2entity.py index 9dc6a9b..bcd016c 100644 --- a/custom_components/xiaomi_home/miot/specs/specv2entity.py +++ b/custom_components/xiaomi_home/miot/specs/specv2entity.py @@ -373,7 +373,9 @@ SPEC_SERVICE_TRANS_MAP: dict = { }, 'entity': 'cover' }, - 'window-opener': 'curtain' + 'window-opener': 'curtain', + 'motor-controller': 'curtain', + 'airer': 'curtain' } """SPEC_PROP_TRANS_MAP From 48554ec0f7602761f7717e2ef6cbac1f3ea88089 Mon Sep 17 00:00:00 2001 From: Necroneco Date: Tue, 25 Feb 2025 08:58:23 +0800 Subject: [PATCH 04/10] feat: add support for electric blanket (#781) --- custom_components/xiaomi_home/climate.py | 48 ++++++++++++++++--- .../xiaomi_home/miot/specs/specv2entity.py | 19 +++++++- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/custom_components/xiaomi_home/climate.py b/custom_components/xiaomi_home/climate.py index 5fb75a7..42897d7 100644 --- a/custom_components/xiaomi_home/climate.py +++ b/custom_components/xiaomi_home/climate.py @@ -83,6 +83,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, for data in miot_device.entity_list.get('thermostat', []): new_entities.append( Thermostat(miot_device=miot_device, entity_data=data)) + for data in miot_device.entity_list.get('electric-blanket', []): + new_entities.append( + ElectricBlanket(miot_device=miot_device, entity_data=data)) if new_entities: async_add_entities(new_entities) @@ -106,7 +109,8 @@ class FeatureOnOff(MIoTServiceEntity, ClimateEntity): # the on/off feature of the entity. prop.service.name == 'air-conditioner' or prop.service.name == 'heater' or - prop.service.name == 'thermostat'): + prop.service.name == 'thermostat' or + prop.service.name == 'electric-blanket'): self._attr_supported_features |= ( ClimateEntityFeature.TURN_ON) self._attr_supported_features |= ( @@ -179,12 +183,14 @@ class FeaturePresetMode(MIoTServiceEntity, ClimateEntity): self._mode_map = None super().__init__(miot_device=miot_device, entity_data=entity_data) - # properties - for prop in entity_data.props: - if prop.name == 'heat-level' and prop.service.name == 'heater': + + def _init_preset_modes(self, service_name: str, prop_name: str) -> None: + """Initialize the preset modes.""" + for prop in self.entity_data.props: + if prop.name == prop_name and prop.service.name == service_name: if not prop.value_list: - _LOGGER.error('invalid heater heat-level value_list, %s', - self.entity_id) + _LOGGER.error('invalid %s %s value_list, %s',service_name, + prop_name, self.entity_id) continue self._mode_map = prop.value_list.to_map() self._attr_preset_modes = prop.value_list.descriptions @@ -439,6 +445,8 @@ class Heater(FeatureOnOff, FeatureTargetTemperature, FeatureTemperature, self._attr_icon = 'mdi:radiator' # hvac modes self._attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF] + # preset modes + self._init_preset_modes('heater', 'heat-level') async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: """Set the target hvac mode.""" @@ -729,3 +737,31 @@ class Thermostat(FeatureOnOff, FeatureTargetTemperature, FeatureTemperature, key=self.get_prop_value( prop=self._prop_mode)) if self._prop_mode else None) + + +class ElectricBlanket(FeatureOnOff, FeatureTargetTemperature, + FeatureTemperature, FeaturePresetMode): + """Electric blanket""" + + def __init__(self, miot_device: MIoTDevice, + entity_data: MIoTEntityData) -> None: + """Initialize the electric blanket.""" + super().__init__(miot_device=miot_device, entity_data=entity_data) + + self._attr_icon = 'mdi:rug' + # hvac modes + self._attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF] + # preset modes + self._init_preset_modes('electric-blanket', 'mode') + + async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: + """Set the target hvac mode.""" + await self.set_property_async( + prop=self._prop_on, + value=False if hvac_mode == HVACMode.OFF else True) + + @property + def hvac_mode(self) -> Optional[HVACMode]: + """The current hvac mode.""" + return (HVACMode.HEAT if self.get_prop_value( + prop=self._prop_on) else HVACMode.OFF) diff --git a/custom_components/xiaomi_home/miot/specs/specv2entity.py b/custom_components/xiaomi_home/miot/specs/specv2entity.py index bcd016c..82b2844 100644 --- a/custom_components/xiaomi_home/miot/specs/specv2entity.py +++ b/custom_components/xiaomi_home/miot/specs/specv2entity.py @@ -295,7 +295,24 @@ SPEC_DEVICE_TRANS_MAP: dict = { } }, 'entity': 'bath-heater', - } + }, + 'electric-blanket': { + 'required': { + 'electric-blanket': { + 'required': { + 'properties': { + 'on': {'read', 'write'}, + 'target-temperature': {'read', 'write'} + } + }, + 'optional': { + 'properties': {'mode', 'temperature'} + }, + } + }, + 'optional': {}, + 'entity': 'electric-blanket' + }, } """SPEC_SERVICE_TRANS_MAP From 52485d8c7a4ee9e42779f5a075c007ae6ad7a3c4 Mon Sep 17 00:00:00 2001 From: XaoflySho Date: Tue, 25 Feb 2025 09:04:20 +0800 Subject: [PATCH 05/10] Update README_ZH.md (#747) --- doc/README_zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README_zh.md b/doc/README_zh.md index 438771f..b31930e 100644 --- a/doc/README_zh.md +++ b/doc/README_zh.md @@ -376,7 +376,7 @@ siid、piid、eiid、aiid、value 均为十进制三位整数。 } ``` -> 在 Home Assistant 中修改了 `custom_components/xiaomi_home/translations/` 路径下的 `specv2entity.py`、`spec_filter.json`、`multi_lang.json` 文件的内容，需要在集成配置中更新实体转换规则才能生效。方法：[设置 > 设备与服务 > 已配置 > Xiaomi Home](https://my.home-assistant.io/redirect/integration/?domain=xiaomi_home) > 配置 > 更新实体转换规则 +> 在 Home Assistant 中修改了 `custom_components/xiaomi_home/miot/specs` 路径下的 `specv2entity.py`、`spec_filter.json`、`multi_lang.json` 文件的内容，需要在集成配置中更新实体转换规则才能生效。方法：[设置 > 设备与服务 > 已配置 > Xiaomi Home](https://my.home-assistant.io/redirect/integration/?domain=xiaomi_home) > 配置 > 更新实体转换规则 ## 文档 From 6f058bf392e1797f1bd514d1c52361735073aa2b Mon Sep 17 00:00:00 2001 From: Necroneco Date: Fri, 28 Feb 2025 16:43:41 +0800 Subject: [PATCH 06/10] fix: fix sensor display precision (#708) --- custom_components/xiaomi_home/miot/miot_spec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_components/xiaomi_home/miot/miot_spec.py b/custom_components/xiaomi_home/miot/miot_spec.py index d4ec8f5..859453b 100644 --- a/custom_components/xiaomi_home/miot/miot_spec.py +++ b/custom_components/xiaomi_home/miot/miot_spec.py @@ -540,7 +540,7 @@ class MIoTSpecProperty(_MIoTSpecBase): self.unit = unit self.value_range = value_range self.value_list = value_list - self.precision = precision or 1 + self.precision = precision if precision is not None else 1 self.expr = expr self.spec_id = hash( From 417af787c4a7640ccb06f7a53199f43a5e422fa0 Mon Sep 17 00:00:00 2001 From: Necroneco Date: Fri, 28 Feb 2025 16:45:17 +0800 Subject: [PATCH 07/10] fix: some `event:motion-detected` does not contain `'arguments'` (#712) --- custom_components/xiaomi_home/miot/miot_mips.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/custom_components/xiaomi_home/miot/miot_mips.py b/custom_components/xiaomi_home/miot/miot_mips.py index 2187488..962eaad 100644 --- a/custom_components/xiaomi_home/miot/miot_mips.py +++ b/custom_components/xiaomi_home/miot/miot_mips.py @@ -1213,10 +1213,12 @@ class MipsLocalClient(_MipsClient): or 'did' not in msg or 'siid' not in msg or 'eiid' not in msg - or 'arguments' not in msg + # or 'arguments' not in msg ): # self.log_error(f'on_event_msg, recv unknown msg, {payload}') return + if 'arguments' not in msg: + msg['arguments'] = [] if handler: self.log_debug('local, on event_occurred, %s', payload) handler(msg, ctx) From 672e5b3f5d4f61a526bbbbea192d2e10f050ebcb Mon Sep 17 00:00:00 2001 From: Li Shuzhen Date: Fri, 28 Feb 2025 17:39:31 +0800 Subject: [PATCH 08/10] docs: update changelog and version to v0.2.0 (#783) --- CHANGELOG.md | 27 ++++++++++++++++++--- custom_components/xiaomi_home/manifest.json | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 899e3b8..bbdc01b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # CHANGELOG +## v0.2.0 +This version has modified some default units of sensors. After updating, it may cause Home Assistant to pop up some compatibility warnings. You can re-add the integration to resolve it. + +这个版本修改了一些传感器默认单位，更新后会导致 Home Assistant 弹出一些兼容性提示，您可以重新添加集成解决。 + +### Added +- Add prop trans rule for surge-power. [#595](https://github.com/XiaoMi/ha_xiaomi_home/pull/595) +- Support modify spec and value conversion. [#663](https://github.com/XiaoMi/ha_xiaomi_home/pull/663) +- Support the electric blanket. [#781](https://github.com/XiaoMi/ha_xiaomi_home/pull/781) +- Add device with motor-control service as cover entity. [#688](https://github.com/XiaoMi/ha_xiaomi_home/pull/688) +### Changed +- Update README file. [#681](https://github.com/XiaoMi/ha_xiaomi_home/pull/681) [#747](https://github.com/XiaoMi/ha_xiaomi_home/pull/747) +- Update CONTRIBUTING.md. [#681](https://github.com/XiaoMi/ha_xiaomi_home/pull/681) +- Refactor climate.py. [#614](https://github.com/XiaoMi/ha_xiaomi_home/pull/614) +### Fixed +- Fix variable name or comment errors & fix test_lan error. [#678](https://github.com/XiaoMi/ha_xiaomi_home/pull/678) [#690](https://github.com/XiaoMi/ha_xiaomi_home/pull/690) +- Fix water heater error & some type error. [#684](https://github.com/XiaoMi/ha_xiaomi_home/pull/684) +- Fix fan level with value-list & fan reverse [#689](https://github.com/XiaoMi/ha_xiaomi_home/pull/689) +- Fix sensor display precision [#708](https://github.com/XiaoMi/ha_xiaomi_home/pull/708) +- Fix event:motion-detected without arguments [#712](https://github.com/XiaoMi/ha_xiaomi_home/pull/712) + ## v0.1.5b2 ### Added - Support binary sensors to be displayed as text sensor entities and binary sensor entities. [#592](https://github.com/XiaoMi/ha_xiaomi_home/pull/592) @@ -91,10 +112,10 @@ This version will cause some Xiaomi routers that do not support access (#564) to ### Changed ### Fixed - Fix humidifier trans rule. https://github.com/XiaoMi/ha_xiaomi_home/issues/59 -- Fix get homeinfo error. https://github.com/XiaoMi/ha_xiaomi_home/issues/22 +- Fix get homeinfo error. https://github.com/XiaoMi/ha_xiaomi_home/issues/22 - Fix air-conditioner switch on. https://github.com/XiaoMi/ha_xiaomi_home/issues/37 https://github.com/XiaoMi/ha_xiaomi_home/issues/16 -- Fix invalid cover status. https://github.com/XiaoMi/ha_xiaomi_home/issues/11 https://github.com/XiaoMi/ha_xiaomi_home/issues/85 -- Water heater entity add STATE_OFF. https://github.com/XiaoMi/ha_xiaomi_home/issues/105 https://github.com/XiaoMi/ha_xiaomi_home/issues/17 +- Fix invalid cover status. https://github.com/XiaoMi/ha_xiaomi_home/issues/11 https://github.com/XiaoMi/ha_xiaomi_home/issues/85 +- Water heater entity add STATE_OFF. https://github.com/XiaoMi/ha_xiaomi_home/issues/105 https://github.com/XiaoMi/ha_xiaomi_home/issues/17 ## v0.1.0 ### Added diff --git a/custom_components/xiaomi_home/manifest.json b/custom_components/xiaomi_home/manifest.json index ca5d71e..9ddd8dd 100644 --- a/custom_components/xiaomi_home/manifest.json +++ b/custom_components/xiaomi_home/manifest.json @@ -25,7 +25,7 @@ "cryptography", "psutil" ], - "version": "v0.1.5b2", + "version": "v0.2.0", "zeroconf": [ "_miot-central._tcp.local." ] From 5adcb7ce00953d55ccd94f33ea7833619884f9ce Mon Sep 17 00:00:00 2001 From: Li Shuzhen Date: Wed, 5 Mar 2025 15:31:02 +0800 Subject: [PATCH 09/10] fix: wind-reverse format type (#810) --- custom_components/xiaomi_home/fan.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom_components/xiaomi_home/fan.py b/custom_components/xiaomi_home/fan.py index 0f64aa8..1d15c9b 100644 --- a/custom_components/xiaomi_home/fan.py +++ b/custom_components/xiaomi_home/fan.py @@ -172,7 +172,7 @@ class Fan(MIoTServiceEntity, FanEntity): self._attr_supported_features |= FanEntityFeature.OSCILLATE self._prop_horizontal_swing = prop elif prop.name == 'wind-reverse': - if prop.format_ == 'bool': + if prop.format_ == bool: self._prop_wind_reverse_forward = False self._prop_wind_reverse_reverse = True elif prop.value_list: @@ -186,7 +186,7 @@ class Fan(MIoTServiceEntity, FanEntity): or self._prop_wind_reverse_reverse is None ): # NOTICE: Value may be 0 or False - _LOGGER.info( + _LOGGER.error( 'invalid wind-reverse, %s', self.entity_id) continue self._attr_supported_features |= FanEntityFeature.DIRECTION From 79016076486e5a38adf65a5d162e5bc03c94585d Mon Sep 17 00:00:00 2001 From: Li Shuzhen Date: Wed, 5 Mar 2025 15:31:18 +0800 Subject: [PATCH 10/10] fix: fan-level without value-list but with value-range (#808) --- custom_components/xiaomi_home/miot/miot_spec.py | 11 +++++++++++ .../xiaomi_home/miot/specs/spec_modify.yaml | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/custom_components/xiaomi_home/miot/miot_spec.py b/custom_components/xiaomi_home/miot/miot_spec.py index 859453b..ebf1759 100644 --- a/custom_components/xiaomi_home/miot/miot_spec.py +++ b/custom_components/xiaomi_home/miot/miot_spec.py @@ -1205,6 +1205,13 @@ class _SpecModify: return None return value_range + def get_prop_value_list(self, siid: int, piid: int) -> Optional[list]: + value_list = self.__get_prop_item(siid=siid, piid=piid, + key='value-list') + if not isinstance(value_list, list): + return None + return value_list + def __get_prop_item(self, siid: int, piid: int, key: str) -> Optional[str]: if not self._selected: return None @@ -1485,6 +1492,10 @@ class MIoTSpecParser: siid=service['iid'], piid=property_['iid']) if custom_range: spec_prop.value_range = custom_range + custom_list = self._spec_modify.get_prop_value_list( + siid=service['iid'], piid=property_['iid']) + if custom_list: + spec_prop.value_list = custom_list # Parse service event for event in service.get('events', []): if ( diff --git a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml index 131ef59..58ba8ef 100644 --- a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml +++ b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml @@ -49,3 +49,12 @@ urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:1: - 1 - 1 urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:2: urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:1 +urn:miot-spec-v2:device:bath-heater:0000A028:opple-acmoto:1: + prop.5.2: + value-list: + - value: 1 + description: low + - value: 128 + description: medium + - value: 255 + description: high