custom_components/xiaomi_home/climate.py

@@ -295,37 +295,39 @@ class AirConditioner(MIoTServiceEntity, ClimateEntity):
     async def async_set_swing_mode(self, swing_mode):
         """Set new target swing operation."""
         if swing_mode == SWING_BOTH:
-            await self.set_property_async(
+            if await self.set_property_async(
-                prop=self._prop_horizontal_swing, value=True,
+                    prop=self._prop_horizontal_swing, value=True, update=False):
-                write_ha_state=False)
+                self.set_prop_value(self._prop_horizontal_swing, value=True)
-            await self.set_property_async(
+            if await self.set_property_async(
-                prop=self._prop_vertical_swing, value=True)
+                    prop=self._prop_vertical_swing, value=True, update=False):
+                self.set_prop_value(self._prop_vertical_swing, value=True)
         elif swing_mode == SWING_HORIZONTAL:
-            await self.set_property_async(
+            if await self.set_property_async(
-                prop=self._prop_horizontal_swing, value=True)
+                    prop=self._prop_horizontal_swing, value=True, update=False):
+                self.set_prop_value(self._prop_horizontal_swing, value=True)
         elif swing_mode == SWING_VERTICAL:
-            await self.set_property_async(
+            if await self.set_property_async(
-                prop=self._prop_vertical_swing, value=True)
+                    prop=self._prop_vertical_swing, value=True, update=False):
+                self.set_prop_value(self._prop_vertical_swing, value=True)
         elif swing_mode == SWING_ON:
-            await self.set_property_async(
+            if await self.set_property_async(
-                prop=self._prop_fan_on, value=True)
+                    prop=self._prop_fan_on, value=True, update=False):
+                self.set_prop_value(self._prop_fan_on, value=True)
         elif swing_mode == SWING_OFF:
-            if self._prop_fan_on:
+            if self._prop_fan_on and await self.set_property_async(
-                await self.set_property_async(
+                    prop=self._prop_fan_on, value=False, update=False):
-                    prop=self._prop_fan_on, value=False,
+                self.set_prop_value(self._prop_fan_on, value=False)
-                    write_ha_state=False)
+            if self._prop_horizontal_swing and await self.set_property_async(
-            if self._prop_horizontal_swing:
-                await self.set_property_async(
                     prop=self._prop_horizontal_swing, value=False,
-                    write_ha_state=False)
+                    update=False):
-            if self._prop_vertical_swing:
+                self.set_prop_value(self._prop_horizontal_swing, value=False)
-                await self.set_property_async(
+            if self._prop_vertical_swing and await self.set_property_async(
-                    prop=self._prop_vertical_swing, value=False,
+                    prop=self._prop_vertical_swing, value=False, update=False):
-                    write_ha_state=False)
+                self.set_prop_value(self._prop_vertical_swing, value=False)
-            self.async_write_ha_state()
         else:
             raise RuntimeError(
                 f'unknown swing_mode, {swing_mode}, {self.entity_id}')
+        self.async_write_ha_state()
 
     async def async_set_fan_mode(self, fan_mode):
         """Set new target fan mode."""
@@ -366,9 +368,9 @@ class AirConditioner(MIoTServiceEntity, ClimateEntity):
         """Return the hvac mode. e.g., heat, cool mode."""
         if self.get_prop_value(prop=self._prop_on) is False:
             return HVACMode.OFF
-        return self.get_map_value(
+        return self.get_map_key(
             map_=self._hvac_mode_map,
-            key=self.get_prop_value(prop=self._prop_mode))
+            value=self.get_prop_value(prop=self._prop_mode))
 
     @property
     def fan_mode(self) -> Optional[str]:
@@ -386,10 +388,12 @@ class AirConditioner(MIoTServiceEntity, ClimateEntity):
 
         Requires ClimateEntityFeature.SWING_MODE.
         """
-        horizontal = (
+        horizontal: bool = (
-            self.get_prop_value(prop=self._prop_horizontal_swing))
+            self.get_prop_value(prop=self._prop_horizontal_swing)
-        vertical = (
+            if self._prop_horizontal_swing else None)
-            self.get_prop_value(prop=self._prop_vertical_swing))
+        vertical: bool = (
+            self.get_prop_value(prop=self._prop_vertical_swing)
+            if self._prop_vertical_swing else None)
         if horizontal and vertical:
             return SWING_BOTH
         if horizontal:
@@ -445,11 +449,7 @@ 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 (
+        if 'D' in v_ac_state and len(self._attr_swing_modes) == 2:
-            '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
@@ -464,10 +464,10 @@ class AirConditioner(MIoTServiceEntity, ClimateEntity):
                 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)
+        self._value_ac_state.update(v_ac_state)
-            _LOGGER.debug(
+        _LOGGER.debug(
-                'ac_state update, %s', self._value_ac_state)
+            'ac_state update, %s', self._value_ac_state)
 
 
 class Heater(MIoTServiceEntity, ClimateEntity):

custom_components/xiaomi_home/cover.py

@@ -200,7 +200,7 @@ class Cover(MIoTServiceEntity, CoverEntity):
         if pos is None:
             return None
         pos = round(pos*self._prop_position_value_range/100)
-        await self.set_property_async(
+        return await self.set_property_async(
             prop=self._prop_target_position, value=pos)
 
     @property

custom_components/xiaomi_home/fan.py

@@ -303,7 +303,7 @@ class Fan(MIoTServiceEntity, FanEntity):
         fan_level = self.get_prop_value(prop=self._prop_fan_level)
         if fan_level is None:
             return None
-        if self._speed_names and self._speed_name_map:
+        if self._speed_names:
             return ordered_list_item_to_percentage(
                 self._speed_names, self._speed_name_map[fan_level])
         else:

custom_components/xiaomi_home/light.py

@@ -96,7 +96,7 @@ class Light(MIoTServiceEntity, LightEntity):
     """Light entities for Xiaomi Home."""
     # pylint: disable=unused-argument
     _VALUE_RANGE_MODE_COUNT_MAX = 30
-    _prop_on: Optional[MIoTSpecProperty]
+    _prop_on: MIoTSpecProperty
     _prop_brightness: Optional[MIoTSpecProperty]
     _prop_color_temp: Optional[MIoTSpecProperty]
     _prop_color: Optional[MIoTSpecProperty]
@@ -250,25 +250,23 @@ class Light(MIoTServiceEntity, LightEntity):
 
         Shall set attributes in kwargs if applicable.
         """
+        result: bool = False
         # on
         # Dirty logic for lumi.gateway.mgl03 indicator light
-        if self._prop_on:
+        value_on = True if self._prop_on.format_ == bool else 1
-            value_on = True if self._prop_on.format_ == bool else 1
+        result = await self.set_property_async(
-            await self.set_property_async(
+            prop=self._prop_on, value=value_on)
-                prop=self._prop_on, value=value_on)
         # brightness
         if ATTR_BRIGHTNESS in kwargs:
             brightness = brightness_to_value(
                 self._brightness_scale, kwargs[ATTR_BRIGHTNESS])
-            await self.set_property_async(
+            result = await self.set_property_async(
-                prop=self._prop_brightness, value=brightness,
+                prop=self._prop_brightness, value=brightness)
-                write_ha_state=False)
         # color-temperature
         if ATTR_COLOR_TEMP_KELVIN in kwargs:
-            await self.set_property_async(
+            result = await self.set_property_async(
                 prop=self._prop_color_temp,
-                value=kwargs[ATTR_COLOR_TEMP_KELVIN],
+                value=kwargs[ATTR_COLOR_TEMP_KELVIN])
-                write_ha_state=False)
             self._attr_color_mode = ColorMode.COLOR_TEMP
         # rgb color
         if ATTR_RGB_COLOR in kwargs:
@@ -276,23 +274,19 @@ class Light(MIoTServiceEntity, LightEntity):
             g = kwargs[ATTR_RGB_COLOR][1]
             b = kwargs[ATTR_RGB_COLOR][2]
             rgb = (r << 16) | (g << 8) | b
-            await self.set_property_async(
+            result = await self.set_property_async(
-                prop=self._prop_color, value=rgb,
+                prop=self._prop_color, value=rgb)
-                write_ha_state=False)
             self._attr_color_mode = ColorMode.RGB
         # mode
         if ATTR_EFFECT in kwargs:
-            await self.set_property_async(
+            result = await self.set_property_async(
                 prop=self._prop_mode,
                 value=self.get_map_key(
-                    map_=self._mode_map, value=kwargs[ATTR_EFFECT]),
+                    map_=self._mode_map, value=kwargs[ATTR_EFFECT]))
-                write_ha_state=False)
+        return result
-        self.async_write_ha_state()
 
     async def async_turn_off(self, **kwargs) -> None:
         """Turn the light off."""
-        if not self._prop_on:
-            return
         # Dirty logic for lumi.gateway.mgl03 indicator light
         value_on = False if self._prop_on.format_ == bool else 0
-        await self.set_property_async(prop=self._prop_on, value=value_on)
+        return await self.set_property_async(prop=self._prop_on, value=value_on)

custom_components/xiaomi_home/miot/miot_device.py

@@ -903,14 +903,14 @@ class MIoTServiceEntity(Entity):
                     siid=event.service.iid, eiid=event.iid, sub_id=sub_id)
 
     def get_map_value(
-        self, map_: Optional[dict[int, Any]], key: int
+        self, map_: dict[int, Any], key: int
     ) -> Any:
         if map_ is None:
             return None
         return map_.get(key, None)
 
     def get_map_key(
-        self, map_: Optional[dict[int, Any]], value: Any
+        self, map_: dict[int, Any], value: Any
     ) -> Optional[int]:
         if map_ is None:
             return None
@@ -919,7 +919,7 @@ class MIoTServiceEntity(Entity):
                 return key
         return None
 
-    def get_prop_value(self, prop: Optional[MIoTSpecProperty]) -> Any:
+    def get_prop_value(self, prop: MIoTSpecProperty) -> Any:
         if not prop:
             _LOGGER.error(
                 'get_prop_value error, property is None, %s, %s',
@@ -927,9 +927,7 @@ class MIoTServiceEntity(Entity):
             return None
         return self._prop_value_map.get(prop, None)
 
-    def set_prop_value(
+    def set_prop_value(self, prop: MIoTSpecProperty, value: Any) -> None:
-        self, prop: Optional[MIoTSpecProperty], value: Any
-    ) -> None:
         if not prop:
             _LOGGER.error(
                 'set_prop_value error, property is None, %s, %s',
@@ -938,14 +936,13 @@ class MIoTServiceEntity(Entity):
         self._prop_value_map[prop] = value
 
     async def set_property_async(
-        self, prop: Optional[MIoTSpecProperty], value: Any,
+        self, prop: MIoTSpecProperty, value: Any, update: bool = True
-        update_value: bool = True, write_ha_state: bool = True
     ) -> bool:
+        value = prop.value_format(value)
         if not prop:
             raise RuntimeError(
                 f'set property failed, property is None, '
                 f'{self.entity_id}, {self.name}')
-        value = prop.value_format(value)
         if prop not in self.entity_data.props:
             raise RuntimeError(
                 f'set property failed, unknown property, '
@@ -961,9 +958,8 @@ class MIoTServiceEntity(Entity):
         except MIoTClientError as e:
             raise RuntimeError(
                 f'{e}, {self.entity_id}, {self.name}, {prop.name}') from e
-        if update_value:
+        if update:
             self._prop_value_map[prop] = value
-        if write_ha_state:
             self.async_write_ha_state()
         return True
 

custom_components/xiaomi_home/water_heater.py

@@ -183,7 +183,7 @@ class WaterHeater(MIoTServiceEntity, WaterHeaterEntity):
             return
         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)
+                prop=self._prop_on, value=True, update=False)
         await self.set_property_async(
             prop=self._prop_mode,
             value=self.get_map_key(
@@ -197,8 +197,6 @@ class WaterHeater(MIoTServiceEntity, WaterHeaterEntity):
     @property
     def target_temperature(self) -> Optional[float]:
         """Return the target temperature."""
-        if not self._prop_target_temp:
-            return None
         return self.get_prop_value(prop=self._prop_target_temp)
 
     @property