Merge db30e4d275 into 7d9250914c

* fix: cuco.plug.cp2 voltage and power value ratio

* fix: cgllc.airmonitor.s1 unit ppb

* fix: roswan.waterpuri.lte01 tds unit

* fix: lumi.relay.c2acn01 power consumption unit

* fix: xiaomi.bhf_light.s1 fan level of ventilation

* fix: error log

CHANGELOG.md

@@ -1,4 +1,20 @@
 # CHANGELOG
+## v0.2.4
+### Added
+- Convert the submersion-state, the contact-state and the occupancy-status property to the binary_sensor entity. [#905](https://github.com/XiaoMi/ha_xiaomi_home/pull/905)
+
+### Changed
+- suittc.airrtc.wk168 mode descriptions are set to strings of numbers from 1 to 16. [#921](https://github.com/XiaoMi/ha_xiaomi_home/pull/921)
+- Do not set _attr_suggested_display_precision when the spec.expr is set in spec_modify.yaml [#929](https://github.com/XiaoMi/ha_xiaomi_home/pull/929)
+- Set "unknown event msg" log to info level.
+### Fixed
+- hhcc.plantmonitor.v1 soil moisture and soil ec icon and unit. [#927](https://github.com/XiaoMi/ha_xiaomi_home/pull/27)
+- cuco.plug.cp2 voltage and power value ratio.
+- cgllc.airmonitor.s1 unit ppb.
+- roswan.waterpuri.lte01 tds unit.
+- lumi.relay.c2acn01 power consumption unit
+- xiaomi.bhf_light.s1 fan level of ventilation.
+
 ## 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)

custom_components/xiaomi_home/manifest.json

@@ -25,7 +25,7 @@
         "cryptography",
         "psutil"
     ],
-    "version": "v0.2.3",
+    "version": "v0.2.4",
     "zeroconf": [
         "_miot-central._tcp.local."
     ]

custom_components/xiaomi_home/miot/miot_mips.py

@@ -1215,7 +1215,7 @@ class MipsLocalClient(_MipsClient):
                 or 'eiid' not in msg
                 # or 'arguments' not in msg
             ):
-                self.log_error('unknown event msg, %s', payload)
+                self.log_info('unknown event msg, %s', payload)
                 return
             if 'arguments' not in msg:
                 self.log_info('wrong event msg, %s', payload)

custom_components/xiaomi_home/miot/miot_spec.py

@@ -213,6 +213,12 @@ class MIoTSpecValueList:
                 return item.description
         return None
 
+    def get_name_by_value(self, value: Any) -> Optional[str]:
+        for item in self.items:
+            if item.value == value:
+                return item.name
+        return None
+
     def dump(self) -> list:
         return [item.dump() for item in self.items]
 

custom_components/xiaomi_home/miot/specs/spec_modify.yaml

@@ -121,11 +121,33 @@ 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:outlet:0000A002:cuco-cp2:2:
+  prop.2.3:
+    expr: round(src_value/10, 1)
+  prop.2.4:
+    unit: mA
+  prop.3.2:
+    expr: round(src_value/10, 1)
+urn:miot-spec-v2:device:outlet:0000A002:cuco-cp2:1: urn:miot-spec-v2:device:outlet:0000A002:cuco-cp2:2
 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
+  prop.2.1:
+    name: soil-moisture
+    icon: mdi:watering-can
+  prop.2.2:
+    name: soil-ec
+    icon: mdi:sprout-outline
+    unit: μS/cm
+urn:miot-spec-v2:device:air-monitor:0000A008:cgllc-s1:1:
+  prop.2.5:
+    name: voc-density
+urn:miot-spec-v2:device:water-purifier:0000A013:roswan-lte01:1:0000D05A:
+  prop.4.1:
+    unit: ppm
+  prop.4.2:
+    unit: ppm
+urn:miot-spec-v2:device:relay:0000A03D:lumi-c2acn01:1:
+  prop.4.1:
+    unit: kWh
+urn:miot-spec-v2:device:bath-heater:0000A028:xiaomi-s1:1:
+  prop.4.4:
+    name: fan-level-ventilation

custom_components/xiaomi_home/miot/specs/specv2entity.py

@@ -523,7 +523,11 @@ SPEC_PROP_TRANS_MAP: dict = {
             'entity': 'sensor',
             'state_class': SensorStateClass.MEASUREMENT
         },
-        'voc-density': 'tvoc-density',
+        'voc-density': {
+            'device_class': SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
+            'entity': 'sensor',
+            'state_class': SensorStateClass.MEASUREMENT
+        },
         'battery-level': {
             'device_class': SensorDeviceClass.BATTERY,
             'entity': 'sensor',

custom_components/xiaomi_home/sensor.py

@@ -110,7 +110,7 @@ class Sensor(MIoTPropertyEntity, SensorEntity):
                 self._attr_native_unit_of_measurement = list(
                     unit_sets)[0] if unit_sets else None
             # Set suggested precision
-            if spec.format_ in {int, float}:
+            if spec.format_ in {int, float} and spec.expr is None:
                 self._attr_suggested_display_precision = spec.precision
             # Set state_class
             if spec.state_class:

custom_components/xiaomi_home/vacuum.py

@@ -54,7 +54,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.components.vacuum import (
     StateVacuumEntity,
-    VacuumEntityFeature
+    VacuumEntityFeature,
+    VacuumActivity
 )
 
 from .miot.const import DOMAIN
@@ -191,10 +192,47 @@ class Vacuum(MIoTServiceEntity, StateVacuumEntity):
 
     @property
     def state(self) -> Optional[str]:
-        """Return the current state of the vacuum cleaner."""
+        """Return the current state of the vacuum cleaner.
+
+        To fix the HA warning below:
+            Detected that custom integration 'xiaomi_home' is setting state
+            directly.Entity XXX(<class 'custom_components.xiaomi_home.vacuum
+            .Vacuum'>)should implement the 'activity' property and return
+            its state using the VacuumActivity enum.This will stop working in
+            Home Assistant 2026.1.
+
+        Refer to
+        https://developers.home-assistant.io/blog/2024/12/08/new-vacuum-state-property
+
+        There are only 6 states in VacuumActivity enum. To be compatible with
+        more constants, try get matching VacuumActivity enum first, return state
+        string as before if there is no match. In Home Assistant 2026.1, every
+        state should map to a VacuumActivity enum.
+        """
+        if (activity := self.activity) is not None:
+            return activity
         return self.get_map_value(
             map_=self._status_map,
-            key=self.get_prop_value(prop=self._prop_status))
+            key=self.get_prop_value(prop=self._prop_status)
+        )
+
+    @property
+    def activity(self) -> VacuumActivity | None:
+        """Return the current vacuum activity."""
+        state_trans_map = {
+            'Sleep': VacuumActivity.IDLE,
+            'Idle': VacuumActivity.IDLE,
+            'Paused': VacuumActivity.PAUSED,
+            'Go Charging': VacuumActivity.RETURNING,
+            'Charging': VacuumActivity.DOCKED,
+            'Sweeping': VacuumActivity.CLEANING,
+            'Sweeping and Mopping': VacuumActivity.CLEANING,
+            'Mopping': VacuumActivity.CLEANING,
+            'Error': VacuumActivity.ERROR,
+        }
+        prop_value = self.get_prop_value(prop=self._prop_status)
+        state_name = self._prop_status.value_list.get_name_by_value(prop_value)
+        return state_trans_map.get(state_name)
 
     @property
     def battery_level(self) -> Optional[int]: