custom_components/xiaomi_home/climate.py

@@ -51,7 +51,6 @@ 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,
@@ -111,10 +110,11 @@ class FeatureOnOff(MIoTServiceEntity, ClimateEntity):
                     _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 |= (
-                self._attr_supported_features |= ClimateEntityFeature.TURN_OFF
+                    ClimateEntityFeature.TURN_ON)
+                self._attr_supported_features |= (
+                    ClimateEntityFeature.TURN_OFF)
                 self._prop_on = prop
-                break
 
     async def async_turn_on(self) -> None:
         """Turn on."""
@@ -133,7 +133,6 @@ 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,10 +150,6 @@ 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."""
@@ -201,7 +196,6 @@ 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."""
@@ -370,7 +364,6 @@ 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]:
@@ -393,7 +386,6 @@ 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]:
@@ -425,7 +417,6 @@ 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."""
@@ -639,10 +630,15 @@ class PtcBathHeater(FeatureTargetTemperature, FeatureTemperature,
                 self._hvac_mode_map = {}
                 for item in prop.value_list.items:
                     if item.name in {'off', 'idle'}:
-                        self._hvac_mode_map[item.value] = HVACMode.OFF
+                        if (HVACMode.OFF
-                        break
+                                not in list(self._hvac_mode_map.values())):
-                if self._hvac_mode_map:
+                            self._hvac_mode_map[item.value] = HVACMode.OFF
-                    self._attr_hvac_modes = [HVACMode.AUTO, 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
                 else:
                     _LOGGER.error('no idle mode, %s', self.entity_id)
         # preset modes
@@ -650,7 +646,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 or hvac_mode != HVACMode.OFF:
+        if self._prop_mode is None:
             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(
@@ -663,12 +659,13 @@ class PtcBathHeater(FeatureTargetTemperature, FeatureTemperature,
         """The current hvac mode."""
         if self._prop_mode is None:
             return None
-        current_mode = self.get_prop_value(prop=self._prop_mode)
+        mode_value = self.get_map_value(
-        if current_mode is None:
+            map_=self._hvac_mode_map,
-            return None
+            key=self.get_prop_value(prop=self._prop_mode))
-        mode_value = self.get_map_value(map_=self._hvac_mode_map,
+        if mode_value == HVACMode.OFF or mode_value is None:
-                                        key=current_mode)
+            return mode_value
-        return HVACMode.OFF if mode_value == HVACMode.OFF else HVACMode.AUTO
+        return HVACMode.AUTO if (HVACMode.AUTO
+                                 in self._attr_hvac_modes) else None
 
 
 class Thermostat(FeatureOnOff, FeatureTargetTemperature, FeatureTemperature,