From 3759aa9a1b452b2a0eef935ad379b7a85ac76a2d Mon Sep 17 00:00:00 2001 From: Li Shuzhen Date: Thu, 20 Mar 2025 18:02:25 +0800 Subject: [PATCH 1/5] fix: climate on/off feature initialization (#899) --- custom_components/xiaomi_home/climate.py | 78 +++++++++++-------- .../xiaomi_home/miot/specs/spec_modify.yaml | 40 ++++++++++ 2 files changed, 84 insertions(+), 34 deletions(-) diff --git a/custom_components/xiaomi_home/climate.py b/custom_components/xiaomi_home/climate.py index 63c01a7..f0b38b7 100644 --- a/custom_components/xiaomi_home/climate.py +++ b/custom_components/xiaomi_home/climate.py @@ -51,6 +51,7 @@ from typing import Any, Optional from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant +from homeassistant.const import UnitOfTemperature from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.components.climate import ( FAN_ON, FAN_OFF, SWING_OFF, SWING_BOTH, SWING_VERTICAL, SWING_HORIZONTAL, @@ -101,21 +102,19 @@ class FeatureOnOff(MIoTServiceEntity, ClimateEntity): self._prop_on = None super().__init__(miot_device=miot_device, entity_data=entity_data) - # properties - for prop in entity_data.props: - if prop.name == 'on': - 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' or - prop.service.name == 'electric-blanket'): - self._attr_supported_features |= ( - ClimateEntityFeature.TURN_ON) - self._attr_supported_features |= ( - ClimateEntityFeature.TURN_OFF) - self._prop_on = prop + + def _init_on_off(self, service_name: str, prop_name: str) -> None: + """Initialize the on_off feature.""" + for prop in self.entity_data.props: + if prop.name == prop_name and prop.service.name == service_name: + if prop.format_ != bool: + _LOGGER.error('wrong format %s %s, %s', service_name, + prop_name, self.entity_id) + continue + self._attr_supported_features |= ClimateEntityFeature.TURN_ON + self._attr_supported_features |= ClimateEntityFeature.TURN_OFF + self._prop_on = prop + break async def async_turn_on(self) -> None: """Turn on.""" @@ -134,6 +133,7 @@ class FeatureTargetTemperature(MIoTServiceEntity, ClimateEntity): entity_data: MIoTEntityData) -> None: """Initialize the feature class.""" self._prop_target_temp = None + self._attr_temperature_unit = None super().__init__(miot_device=miot_device, entity_data=entity_data) # properties @@ -151,6 +151,10 @@ class FeatureTargetTemperature(MIoTServiceEntity, ClimateEntity): self._attr_supported_features |= ( ClimateEntityFeature.TARGET_TEMPERATURE) self._prop_target_temp = prop + break + # temperature_unit is required by the climate entity + if not self._attr_temperature_unit: + self._attr_temperature_unit = UnitOfTemperature.CELSIUS async def async_set_temperature(self, **kwargs): """Set the target temperature.""" @@ -197,6 +201,7 @@ class FeaturePresetMode(MIoTServiceEntity, ClimateEntity): self._attr_supported_features |= ( ClimateEntityFeature.PRESET_MODE) self._prop_mode = prop + break async def async_set_preset_mode(self, preset_mode: str) -> None: """Set the preset mode.""" @@ -365,6 +370,7 @@ class FeatureTemperature(MIoTServiceEntity, ClimateEntity): for prop in entity_data.props: if prop.name == 'temperature': self._prop_env_temperature = prop + break @property def current_temperature(self) -> Optional[float]: @@ -387,6 +393,7 @@ class FeatureHumidity(MIoTServiceEntity, ClimateEntity): for prop in entity_data.props: if prop.name == 'relative-humidity': self._prop_env_humidity = prop + break @property def current_humidity(self) -> Optional[float]: @@ -418,6 +425,7 @@ class FeatureTargetHumidity(MIoTServiceEntity, ClimateEntity): self._attr_supported_features |= ( ClimateEntityFeature.TARGET_HUMIDITY) self._prop_target_humidity = prop + break async def async_set_humidity(self, humidity): """Set the target humidity.""" @@ -447,6 +455,8 @@ class Heater(FeatureOnOff, FeatureTargetTemperature, FeatureTemperature, self._attr_icon = 'mdi:radiator' # hvac modes self._attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF] + # on/off + self._init_on_off('heater', 'on') # preset modes self._init_preset_modes('heater', 'heat-level') @@ -482,10 +492,12 @@ class AirConditioner(FeatureOnOff, FeatureTargetTemperature, super().__init__(miot_device=miot_device, entity_data=entity_data) self._attr_icon = 'mdi:air-conditioner' + # on/off + self._init_on_off('air-conditioner', 'on') # hvac modes self._attr_hvac_modes = None for prop in entity_data.props: - if prop.name == 'mode': + if prop.name == 'mode' and prop.service.name == 'air-conditioner': if not prop.value_list: _LOGGER.error('invalid mode value_list, %s', self.entity_id) continue @@ -620,22 +632,17 @@ class PtcBathHeater(FeatureTargetTemperature, FeatureTemperature, self._attr_icon = 'mdi:hvac' # hvac modes for prop in entity_data.props: - if prop.name == 'mode': + if prop.name == 'mode' and prop.service.name == 'ptc-bath-heater': 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'}: - if (HVACMode.OFF - not in list(self._hvac_mode_map.values())): - self._hvac_mode_map[item.value] = HVACMode.OFF - elif (HVACMode.AUTO - not in list(self._hvac_mode_map.values())): - self._hvac_mode_map[item.value] = HVACMode.AUTO - self._attr_hvac_modes = list(self._hvac_mode_map.values()) - if HVACMode.OFF in self._attr_hvac_modes: - self._prop_mode = prop + self._hvac_mode_map[item.value] = HVACMode.OFF + break + if self._hvac_mode_map: + self._attr_hvac_modes = [HVACMode.AUTO, HVACMode.OFF] else: _LOGGER.error('no idle mode, %s', self.entity_id) # preset modes @@ -643,7 +650,7 @@ class PtcBathHeater(FeatureTargetTemperature, FeatureTemperature, async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: """Set the target hvac mode.""" - if self._prop_mode is None: + if self._prop_mode is None or hvac_mode != HVACMode.OFF: 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( @@ -656,13 +663,12 @@ class PtcBathHeater(FeatureTargetTemperature, FeatureTemperature, """The current hvac mode.""" if self._prop_mode is None: return None - mode_value = self.get_map_value( - map_=self._hvac_mode_map, - key=self.get_prop_value(prop=self._prop_mode)) - if mode_value == HVACMode.OFF or mode_value is None: - return mode_value - return HVACMode.AUTO if (HVACMode.AUTO - in self._attr_hvac_modes) else None + current_mode = self.get_prop_value(prop=self._prop_mode) + if current_mode is None: + return None + mode_value = self.get_map_value(map_=self._hvac_mode_map, + key=current_mode) + return HVACMode.OFF if mode_value == HVACMode.OFF else HVACMode.AUTO class Thermostat(FeatureOnOff, FeatureTargetTemperature, FeatureTemperature, @@ -677,6 +683,8 @@ class Thermostat(FeatureOnOff, FeatureTargetTemperature, FeatureTemperature, self._attr_icon = 'mdi:thermostat' # hvac modes self._attr_hvac_modes = [HVACMode.AUTO, HVACMode.OFF] + # on/off + self._init_on_off('thermostat', 'on') # preset modes self._init_preset_modes('thermostat', 'mode') @@ -705,6 +713,8 @@ class ElectricBlanket(FeatureOnOff, FeatureTargetTemperature, self._attr_icon = 'mdi:rug' # hvac modes self._attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF] + # on/off + self._init_on_off('electric-blanket', 'on') # preset modes self._init_preset_modes('electric-blanket', 'mode') diff --git a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml index bee4ddf..cea86fb 100644 --- a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml +++ b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml @@ -76,3 +76,43 @@ urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:2: urn:miot-spec-v2:d urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:3: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6 urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:4: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6 urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:5: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6 +urn:miot-spec-v2:device:airer:0000A00D:mrbond-m33a:1: + prop.2.3: + name: current-position-a + prop.2.11: + name: current-position-b +urn:miot-spec-v2:device:thermostat:0000A031:suittc-wk168:1: + prop.2.3: + value-list: + - value: 1 + description: one + - value: 2 + description: two + - value: 3 + description: three + - value: 4 + description: four + - value: 5 + description: five + - value: 6 + description: six + - value: 7 + description: seven + - value: 8 + description: eight + - value: 9 + description: nine + - value: 10 + description: ten + - value: 11 + description: eleven + - value: 12 + description: twelve + - value: 13 + description: thirteen + - value: 14 + description: fourteen + - value: 15 + description: fifteen + - value: 16 + description: sixteen From 372e635681652a6d8ea544fb31e325776f9d3bb1 Mon Sep 17 00:00:00 2001 From: Li Shuzhen Date: Fri, 21 Mar 2025 09:36:14 +0800 Subject: [PATCH 2/5] Fix specs (#910) * fix: chuangmi.plug.212a01 power consumption value * fix: yeelink.bhf_light.v10 mode description in English --- custom_components/xiaomi_home/miot/specs/multi_lang.json | 6 ++++++ custom_components/xiaomi_home/miot/specs/spec_modify.yaml | 5 +++++ custom_components/xiaomi_home/miot/specs/specv2entity.py | 6 ------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/custom_components/xiaomi_home/miot/specs/multi_lang.json b/custom_components/xiaomi_home/miot/specs/multi_lang.json index 7f16732..d66f9f3 100644 --- a/custom_components/xiaomi_home/miot/specs/multi_lang.json +++ b/custom_components/xiaomi_home/miot/specs/multi_lang.json @@ -168,5 +168,11 @@ "service:016:action:001": "中键确认", "service:017:action:001": "右键确认" } + }, + "urn:miot-spec-v2:device:bath-heater:0000A028:yeelink-v10": { + "en": { + "service:003:property:001:valuelist:000": "Idle", + "service:003:property:001:valuelist:001": "Dry" + } } } \ No newline at end of file diff --git a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml index cea86fb..fd35c03 100644 --- a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml +++ b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml @@ -116,3 +116,8 @@ urn:miot-spec-v2:device:thermostat:0000A031:suittc-wk168:1: description: fifteen - value: 16 description: sixteen +urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3: + prop.5.1: + expr: round(src_value*6/1000000, 3) +urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:1: urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3 +urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:2: urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3 diff --git a/custom_components/xiaomi_home/miot/specs/specv2entity.py b/custom_components/xiaomi_home/miot/specs/specv2entity.py index 12ce798..7adbcc6 100644 --- a/custom_components/xiaomi_home/miot/specs/specv2entity.py +++ b/custom_components/xiaomi_home/miot/specs/specv2entity.py @@ -560,12 +560,6 @@ SPEC_PROP_TRANS_MAP: dict = { 'entity': 'sensor', 'state_class': SensorStateClass.MEASUREMENT, 'unit_of_measurement': UnitOfPower.WATT - }, - 'total-battery': { - 'device_class': SensorDeviceClass.ENERGY, - 'entity': 'sensor', - 'state_class': SensorStateClass.TOTAL_INCREASING, - 'unit_of_measurement': UnitOfEnergy.KILO_WATT_HOUR } } } From a1aa1c024feafc80222adee97bbb8ac8447ad370 Mon Sep 17 00:00:00 2001 From: Li Shuzhen Date: Fri, 21 Mar 2025 09:53:39 +0800 Subject: [PATCH 3/5] docs: update changelog and version to v0.2.3 (#911) --- CHANGELOG.md | 8 ++++++++ custom_components/xiaomi_home/manifest.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d576a17..5976db3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,12 @@ # CHANGELOG +## v0.2.3 +### Changed +- Specify the service name and the property name during the climate entity's on/off feature initialization. [#899](https://github.com/XiaoMi/ha_xiaomi_home/pull/899) +- Remove the useless total-battery property from `SPEC_PROP_TRANS_MAP`. +### Fixed +- Fix the hvac mode setting error when changing the preset mode of the ptc-bath-heater. +- Fix the ambiguous descriptions of yeelink.bhf_light.v10 ptc-bath-heater mode value-list. +- Fix the power consumption value of chuangmi.plug.212a01. [#910](https://github.com/XiaoMi/ha_xiaomi_home/pull/910) ## v0.2.2 This version has modified the conversion rules of the climate entity, which will have effect on the devices with the ptc-bath-heater, the air-conditioner and the air-fresh service. After updating, you need to restart Home Assistant and check `xiaomi_home > CONFIGURE > diff --git a/custom_components/xiaomi_home/manifest.json b/custom_components/xiaomi_home/manifest.json index bce3901..1059f89 100644 --- a/custom_components/xiaomi_home/manifest.json +++ b/custom_components/xiaomi_home/manifest.json @@ -25,7 +25,7 @@ "cryptography", "psutil" ], - "version": "v0.2.2", + "version": "v0.2.3", "zeroconf": [ "_miot-central._tcp.local." ] From e174a73f527b4e5b948500ba6ee34120e7531dcd Mon Sep 17 00:00:00 2001 From: dw881114 <141791756+dw881114@users.noreply.github.com> Date: Mon, 24 Mar 2025 16:34:48 +0800 Subject: [PATCH 4/5] Update spec_modify.yaml (#921) --- .../xiaomi_home/miot/specs/spec_modify.yaml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml index fd35c03..5988d79 100644 --- a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml +++ b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml @@ -85,37 +85,37 @@ urn:miot-spec-v2:device:thermostat:0000A031:suittc-wk168:1: prop.2.3: value-list: - value: 1 - description: one + description: '1' - value: 2 - description: two + description: '2' - value: 3 - description: three + description: '3' - value: 4 - description: four + description: '4' - value: 5 - description: five + description: '5' - value: 6 - description: six + description: '6' - value: 7 - description: seven + description: '7' - value: 8 - description: eight + description: '8' - value: 9 - description: nine + description: '9' - value: 10 - description: ten + description: '10' - value: 11 - description: eleven + description: '11' - value: 12 - description: twelve + description: '12' - value: 13 - description: thirteen + description: '13' - value: 14 - description: fourteen + description: '14' - value: 15 - description: fifteen + description: '15' - value: 16 - description: sixteen + description: '16' urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3: prop.5.1: expr: round(src_value*6/1000000, 3) From 19ed04f2f584da72287588b91c818d5f1e22d401 Mon Sep 17 00:00:00 2001 From: whoami <46884440+Jimmo-o@users.noreply.github.com> Date: Tue, 25 Mar 2025 09:54:02 +0800 Subject: [PATCH 5/5] fix: correct unit,icon and translations for hhcc-v1 (#927) --- custom_components/xiaomi_home/miot/specs/multi_lang.json | 9 +++++++++ .../xiaomi_home/miot/specs/spec_modify.yaml | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/custom_components/xiaomi_home/miot/specs/multi_lang.json b/custom_components/xiaomi_home/miot/specs/multi_lang.json index d66f9f3..c9501ce 100644 --- a/custom_components/xiaomi_home/miot/specs/multi_lang.json +++ b/custom_components/xiaomi_home/miot/specs/multi_lang.json @@ -174,5 +174,14 @@ "service:003:property:001:valuelist:000": "Idle", "service:003:property:001:valuelist:001": "Dry" } + }, + "urn:miot-spec-v2:device:plant-monitor:0000A030:hhcc-v1": { + "en": { + "service:002:property:001": "Soil Moisture" + }, + "zh-Hans": { + "service:002:property:001": "土壤湿度", + "service:002:property:003": "光照强度" + } } } \ No newline at end of file diff --git a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml index 5988d79..f08d890 100644 --- a/custom_components/xiaomi_home/miot/specs/spec_modify.yaml +++ b/custom_components/xiaomi_home/miot/specs/spec_modify.yaml @@ -121,3 +121,11 @@ urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3: expr: round(src_value*6/1000000, 3) urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:1: urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3 urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:2: urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3 +urn:miot-spec-v2:device:plant-monitor:0000A030:hhcc-v1:1: + prop.2.1: + name: soil-moisture + icon: mdi:watering-can + prop.2.2: + name: soil-ec + icon: mdi:sprout-outline + unit: μS/cm