CHANGELOG.md

@@ -1,20 +1,4 @@
 # 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/binary_sensor.py

@@ -89,8 +89,4 @@ class BinarySensor(MIoTPropertyEntity, BinarySensorEntity):
     @property
     def is_on(self) -> bool:
         """On/Off state. True if the binary sensor is on, False otherwise."""
-        if self.spec.name == 'contact-state':
-            return self._value is False
-        elif self.spec.name == 'occupancy-status':
-            return bool(self._value)
         return self._value is True

custom_components/xiaomi_home/climate.py

@@ -230,7 +230,6 @@ class FeatureFanMode(MIoTServiceEntity, ClimateEntity):
         self._prop_fan_on = None
         self._prop_fan_level = None
         self._fan_mode_map = None
-        self._attr_fan_modes = None
 
         super().__init__(miot_device=miot_device, entity_data=entity_data)
         # properties

custom_components/xiaomi_home/manifest.json

@@ -25,7 +25,7 @@
         "cryptography",
         "psutil"
     ],
-    "version": "v0.2.4",
+    "version": "v0.2.3",
     "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_info('unknown event msg, %s', payload)
+                self.log_error('unknown event msg, %s', payload)
                 return
             if 'arguments' not in msg:
                 self.log_info('wrong event msg, %s', payload)

custom_components/xiaomi_home/miot/specs/multi_lang.json

@@ -174,14 +174,5 @@
             "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": "光照强度"
-        }
     }
 }

custom_components/xiaomi_home/miot/specs/spec_modify.yaml

@@ -14,21 +14,12 @@ urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:1:
     - notify
 urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:2: urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:1
 urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:3: urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:1
-urn:miot-spec-v2:device:gateway:0000A019:lumi-mcn001:1:  # lumi.gateway.mcn001
-  prop.2.1:  # access-mode
-    access:
-    - read
-    - notify
-  prop.2.2:  # ip-address
-    icon: mdi:ip
-  prop.2.3:  # wifi-ssid
-    access:
-    - read
-    - notify
-  prop.2.5:  # access-mode
-    access:
-    - read
-    - notify
+urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:1:
+  prop.5.1:
+    name: power-consumption
+    expr: round(src_value/1000, 3)
+urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:2: 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:1
 urn:miot-spec-v2:device:outlet:0000A002:cuco-cp1md:1:
   prop.2.2:
     name: power-consumption
@@ -42,23 +33,6 @@ urn:miot-spec-v2:device:outlet:0000A002:zimi-zncz01:2:0000C816:
   prop.3.1:
     name: electric-power
     expr: round(src_value/100, 2)
-urn:miot-spec-v2:device:outlet:0000A002:qmi-psv3:1:0000C816:  # qmi.plug.psv3
-  prop.3.3:  # voltage
-    unit: mV
-  prop.3.4:  # electric-current
-    unit: mA
-urn:miot-spec-v2:device:motion-sensor:0000A014:lumi-acn001:1:  # lumi.motion.acn001
-  prop.3.2:  # voltage
-    access:
-    - read
-    - notify
-    unit: mV
-urn:miot-spec-v2:device:occupancy-sensor:0000A0BF:izq-24:2:0000C824:  # izq.sensor_occupy.24
-  prop.2.6:  # distance
-    unit: cm
-urn:miot-spec-v2:device:occupancy-sensor:0000A0BF:linp-hb01:2:0000C824:  # linp.sensor_occupy.hb01
-  prop.3.3:  # body-distance
-    unit: m
 urn:miot-spec-v2:device:router:0000A036:xiaomi-rd08:1:
   prop.2.1:
     name: download-speed
@@ -111,74 +85,39 @@ urn:miot-spec-v2:device:thermostat:0000A031:suittc-wk168:1:
   prop.2.3:
     value-list:
     - value: 1
-      description: '1'
+      description: one
     - value: 2
-      description: '2'
+      description: two
     - value: 3
-      description: '3'
+      description: three
     - value: 4
-      description: '4'
+      description: four
     - value: 5
-      description: '5'
+      description: five
     - value: 6
-      description: '6'
+      description: six
     - value: 7
-      description: '7'
+      description: seven
     - value: 8
-      description: '8'
+      description: eight
     - value: 9
-      description: '9'
+      description: nine
     - value: 10
-      description: '10'
+      description: ten
     - value: 11
-      description: '11'
+      description: eleven
     - value: 12
-      description: '12'
+      description: twelve
     - value: 13
-      description: '13'
+      description: thirteen
     - value: 14
-      description: '14'
+      description: fourteen
     - value: 15
-      description: '15'
+      description: fifteen
     - value: 16
-      description: '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
-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
-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:water-purifier:0000A013:yunmi-s20:1:  # yunmi.waterpuri.s20
-  prop.4.1:  # tds-in
-    unit: ppm
-  prop.4.2:  # tds-out
-    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

@@ -48,7 +48,6 @@ Conversion rules of MIoT-Spec-V2 instance to Home Assistant entity.
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.components.sensor import SensorStateClass
 from homeassistant.components.event import EventDeviceClass
-from homeassistant.components.binary_sensor import BinarySensorDeviceClass
 
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
@@ -455,28 +454,12 @@ SPEC_PROP_TRANS_MAP: dict = {
             'format': {'int', 'float'},
             'access': {'read'}
         },
-        'binary_sensor': {
-            'format': {'bool', 'int'},
-            'access': {'read'}
-        },
         'switch': {
             'format': {'bool'},
             'access': {'read', 'write'}
         }
     },
     'properties': {
-        'submersion-state': {
-            'device_class': BinarySensorDeviceClass.MOISTURE,
-            'entity': 'binary_sensor'
-        },
-        'contact-state': {
-            'device_class': BinarySensorDeviceClass.DOOR,
-            'entity': 'binary_sensor'
-        },
-        'occupancy-status': {
-            'device_class': BinarySensorDeviceClass.OCCUPANCY,
-            'entity': 'binary_sensor',
-        },
         'temperature': {
             'device_class': SensorDeviceClass.TEMPERATURE,
             'entity': 'sensor',
@@ -523,11 +506,7 @@ SPEC_PROP_TRANS_MAP: dict = {
             'entity': 'sensor',
             'state_class': SensorStateClass.MEASUREMENT
         },
-        'voc-density': {
-            'device_class': SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-            'entity': 'sensor',
-            'state_class': SensorStateClass.MEASUREMENT
-        },
+        'voc-density': 'tvoc-density',
         '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} and spec.expr is None:
+            if spec.format_ in {int, float}:
                 self._attr_suggested_display_precision = spec.precision
             # Set state_class
             if spec.state_class: