Merge 506bd9f52e into 7c97b85f02

CHANGELOG.md

@@ -1,13 +1,4 @@
 # CHANGELOG
-## v0.4.2
-### Changed
-- Set the battery service's start-charge action as the fallback action to support RETURN_HOME feature of the vacuum entity. [#1344](https://github.com/XiaoMi/ha_xiaomi_home/pull/1344)
-### Fixed
-- Correct the property value format after expression calculation. [#1366](https://github.com/XiaoMi/ha_xiaomi_home/pull/1366)
-- Fix the MIoT-Spec-V2 of fix: xiaomi.fan.p70 and fix: xiaomi.fan.p76 fan level, xiaomi.airc.rr0r00 and xiaomi.airc.h43h00 humidity-range, and zhimi.humidifier.ca4 water level. [#1367](https://github.com/XiaoMi/ha_xiaomi_home/pull/1367)
-- Ignore the unsupported model hmpace.motion.v6nfc.
-- Delete all unsupported MIoT-Spec-V2 instances of narwa.vacuum.001 and narwa.vacuum.ax11. [#1355](https://github.com/XiaoMi/ha_xiaomi_home/pull/1355)
-
 ## v0.4.1
 ### Changed
 - The setting option "Cover closed position" in CONFIGURE is changed to "Cover dead zone width". [#1301](https://github.com/XiaoMi/ha_xiaomi_home/pull/1301)

custom_components/xiaomi_home/manifest.json

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

custom_components/xiaomi_home/miot/const.py

@@ -89,7 +89,6 @@ SUPPORTED_PLATFORMS: list = [
 
 UNSUPPORTED_MODELS: list = [
     'chuangmi.ir.v2',
-    'hmpace.motion.v6nfc',
     'xiaomi.router.rd03'
 ]
 

custom_components/xiaomi_home/miot/miot_device.py

@@ -1113,8 +1113,6 @@ class MIoTServiceEntity(Entity):
             ):
                 continue
             value: Any = prop.value_format(params['value'])
-            value = prop.eval_expr(value)
-            value = prop.value_format(value)
             self._prop_value_map[prop] = value
             if prop in self._prop_changed_subs:
                 self._prop_changed_subs[prop](prop, value)
@@ -1286,9 +1284,8 @@ class MIoTPropertyEntity(Entity):
 
     def __on_value_changed(self, params: dict, ctx: Any) -> None:
         _LOGGER.debug('property changed, %s', params)
-        value: Any = self.spec.value_format(params['value'])
-        value = self.spec.eval_expr(value)
-        self._value = self.spec.value_format(value)
+        self._value = self.spec.value_format(params['value'])
+        self._value = self.spec.eval_expr(self._value)
         if not self._pending_write_ha_state_timer:
             self.async_write_ha_state()
 

custom_components/xiaomi_home/miot/miot_mips.py

@@ -513,7 +513,6 @@ class _MipsClient(ABC):
         """
         self.__thread_check()
         if not self._mqtt or not self._mqtt.is_connected():
-            self.log_error(f'mips sub when not connected, {topic}')
             return
         try:
             if topic not in self._mips_sub_pending_map:
@@ -532,7 +531,6 @@ class _MipsClient(ABC):
         """
         self.__thread_check()
         if not self._mqtt or not self._mqtt.is_connected():
-            self.log_debug(f'mips unsub when not connected, {topic}')
             return
         try:
             result, mid = self._mqtt.unsubscribe(topic=topic)
@@ -641,7 +639,6 @@ class _MipsClient(ABC):
             _LOGGER.error('__on_connect, but mqtt is None')
             return
         if not self._mqtt.is_connected():
-            _LOGGER.error('__on_connect, but mqtt is disconnected')
             return
         self.log_info(f'mips connect, {flags}, {rc}, {props}')
         self.__reset_reconnect_time()

custom_components/xiaomi_home/miot/specs/spec_filter.yaml

@@ -48,9 +48,3 @@ urn:miot-spec-v2:device:thermostat:0000A031:tofan-wk01:
   services:
   - '2'
   - '4'
-urn:miot-spec-v2:device:vacuum:0000A006:narwa-001:
-  services:
-  - '*'
-urn:miot-spec-v2:device:vacuum:0000A006:narwa-ax11:
-  services:
-  - '*'

custom_components/xiaomi_home/miot/specs/spec_modify.yaml

@@ -22,10 +22,6 @@ urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-c35:2: urn:miot-spec-v2:
 urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-h40h00:1:
   prop.10.6:
     unit: none
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-h43h00:1:
-  prop.10.6:
-    unit: none
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-h43h00:2: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-h43h00:1
 urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m16:1:
   prop.10.6:
     unit: none
@@ -45,12 +41,6 @@ urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-mt0:1:
   prop.10.6:
     unit: none
 urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-mt0:2: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-mt0:1
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-rr0r00:1:
-  prop.10.6:
-    unit: none
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-rr0r00:2: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-rr0r00:1
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-rr0r00:3: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-rr0r00:1
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-rr0r00:4: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-rr0r00:1
 urn:miot-spec-v2:device:air-monitor:0000A008:cgllc-cgd1st:1:
   prop.3.7:
     value-range:
@@ -140,12 +130,6 @@ urn:miot-spec-v2:device:fan:0000A005:xiaomi-p51:1:
 urn:miot-spec-v2:device:fan:0000A005:xiaomi-p69:1:0000D062:
   prop.2.4:
     name: fan-level-a
-urn:miot-spec-v2:device:fan:0000A005:xiaomi-p70:1:0000D062:
-  prop.2.4:
-    name: fan-level-a
-urn:miot-spec-v2:device:fan:0000A005:xiaomi-p76:1:0000D062:
-  prop.2.4:
-    name: fan-level-a
 urn:miot-spec-v2:device:fan:0000A005:zhimi-sa1:3:
   prop.2.2:
     name: fan-level-a
@@ -191,10 +175,6 @@ urn:miot-spec-v2:device:hood:0000A01B:cykj-jyj22:2: urn:miot-spec-v2:device:hood
 urn:miot-spec-v2:device:hood:0000A01B:cykj-jyj22:3:
   prop.3.1:
     name: on-ventilation
-urn:miot-spec-v2:device:humidifier:0000A00E:zhimi-ca4:2:
-  prop.2.7:
-    unit: percentage
-    expr: round(src_value*0.83)
 urn:miot-spec-v2:device:kettle:0000A009:yunmi-r3:1:
   prop.3.1:
     unit: ppm

custom_components/xiaomi_home/miot/specs/specv2entity.py

@@ -170,11 +170,6 @@ SPEC_DEVICE_TRANS_MAP: dict = {
                     'properties': {
                         'battery-level': {'read'}
                     }
-                },
-                'optional': {
-                    'actions': {
-                        'start-charge'
-                    }
                 }
             }
         },

custom_components/xiaomi_home/vacuum.py

@@ -203,16 +203,6 @@ class Vacuum(MIoTServiceEntity, StateVacuumEntity):
                 self._attr_supported_features |= VacuumEntityFeature.LOCATE
                 self._action_identify = action
 
-        # Use start-charge from battery service as fallback
-        # if stop-and-gocharge is not available
-        if self._action_stop_and_gocharge is None:
-            for action in entity_data.actions:
-                if action.name == 'start-charge':
-                    self._attr_supported_features |= (
-                        VacuumEntityFeature.RETURN_HOME)
-                    self._action_stop_and_gocharge = action
-                    break
-
     async def async_start(self) -> None:
         """Start or resume the cleaning task."""
         if self._prop_status is not None: