👕 improve for washer

Author: al-one

custom_components/xiaomi_miot/__init__.py

@@ -712,7 +712,7 @@ def update(self):
 
     @property
     def state(self):
-        return STATE_ON if self._state else STATE_OFF
+        return STATE_ON if self.is_on else STATE_OFF
 
     @property
     def is_on(self):

custom_components/xiaomi_miot/fan.py

@@ -175,8 +175,13 @@ def oscillate(self, oscillating: bool):
 
 class FanSubEntity(ToggleSubEntity, FanEntity):
 
-    def update(self):
-        super().update()
+    def turn_on(self, speed=None, **kwargs):
+        ret = False
+        if not self.is_on:
+            ret = self.call_parent('turn_on', **kwargs)
+        if speed:
+            ret = self.set_speed(speed)
+        return ret
 
     @property
     def speed(self):
@@ -203,8 +208,39 @@ def __init__(self, parent, miot_property: MiotProperty, option=None):
         self._supported_features = SUPPORT_SET_SPEED
 
     @property
-    def state(self):
-        return self._parent.state
+    def icon(self):
+        if self._miot_property.name in ['mode']:
+            return 'mdi:menu'
+        if self._miot_property.name in ['spin_speed']:
+            return 'mdi:speedometer'
+        if self._miot_property.name in ['target_temperature']:
+            return 'mdi:coolant-temperature'
+        if self._miot_property.name in ['target_water_level']:
+            return 'mdi:water-plus'
+        if self._miot_property.name in ['drying_level']:
+            return 'mdi:tumble-dryer'
+        return super().icon
+
+    @property
+    def is_on(self):
+        if not self._parent.is_on:
+            return False
+        sta = self._state_attrs.get(self._attr)
+        if self._miot_property.name in ['spin_speed']:
+            return sta != self._miot_property.list_search('no spin')
+        if self._miot_property.name in ['target_temperature']:
+            return sta != self._miot_property.list_search('cold')
+        if self._miot_property.name in ['drying_level']:
+            return sta != self._miot_property.list_search('none')
+        return True
+
+    def turn_on(self, speed=None, **kwargs):
+        ret = False
+        if not self._parent.is_on:
+            ret = self.call_parent('turn_on', **kwargs)
+        if speed:
+            ret = self.set_speed(speed)
+        return ret
 
     @property
     def speed(self):

custom_components/xiaomi_miot/switch.py

@@ -21,6 +21,7 @@
 from .core.miot_spec import (
     MiotSpec,
     MiotService,
+    MiotProperty,
 )
 from .fan import MiotWasherSubEntity
 
@@ -81,6 +82,12 @@ def device_class(self):
             return DEVICE_CLASS_OUTLET
         return DEVICE_CLASS_SWITCH
 
+    @property
+    def icon(self):
+        if self._miot_service.name in ['washer']:
+            return 'mdi:washing-machine'
+        return super().icon
+
     async def async_update(self):
         await super().async_update()
         if self._available:
@@ -103,3 +110,41 @@ async def async_update(self):
 class SwitchSubEntity(ToggleSubEntity, SwitchEntity):
     def update(self):
         super().update()
+
+
+class MiotWasherActionSubEntity(SwitchSubEntity):
+    def __init__(self, parent, miot_property: MiotProperty, option=None):
+        super().__init__(parent, miot_property.full_name, option)
+        self._miot_property = miot_property
+        self._miot_service = miot_property.service
+        self._values_on = miot_property.list_search('Busy', 'Delay')
+        self._values_off = miot_property.list_search('Off', 'Idle', 'Pause', 'Fault')
+
+    def update(self):
+        super().update()
+        if self._available:
+            sta = self._state_attrs.get(self._attr)
+            self._state = sta not in self._values_off
+
+    def turn_on(self, **kwargs):
+        val = self._values_on[0] if self._values_on else None
+        return self.miot_action('start_wash', val)
+
+    def turn_off(self, **kwargs):
+        val = self._values_off[0] if self._values_off else None
+        return self.miot_action('pause', val)
+
+    def miot_action(self, act, sta=None):
+        ret = False
+        act = self._miot_service.get_action(act)
+        if act:
+            ret = self.call_parent('miot_action', self._miot_service.iid, act.iid)
+            if ret and sta is not None:
+                self.update_attrs({
+                    self._attr: sta,
+                })
+        return ret
+
+    @property
+    def icon(self):
+        return 'mdi:play-box'