Add zhimi.fan.za3 support (#515)

rytilahti · Jun 2, 2019 · 0f8f608 · 0f8f608
1 parent b1cb9b3
commit 0f8f608
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/README.rst b/README.rst
@@ -23,7 +23,7 @@ Supported devices
 -  Xiaomi Philips Zhirui Smart LED Bulb E14 Candle Lamp (:class:`miio.philips_bulb`)
 -  Xiaomi Philips Zhirui Bedroom Smart Lamp (:class:`miio.philips_moonlight`)
 -  Xiaomi Universal IR Remote Controller (Chuangmi IR) (:class:`miio.chuangmi_ir`)
--  Xiaomi Mi Smart Pedestal Fan V2, V3, SA1, ZA1, ZA4 (:class:`miio.fan`)
+-  Xiaomi Mi Smart Pedestal Fan V2, V3, SA1, ZA1, ZA3, ZA4 (:class:`miio.fan`)
 -  Xiaomi Mi Air Humidifier (:class:`miio.airhumidifier`)
 -  Xiaomi Mi Water Purifier (Basic support: Turn on & off) (:class:`miio.waterpurifier`)
 -  Xiaomi PM2.5 Air Quality Monitor (:class:`miio.airqualitymonitor`)

diff --git a/miio/discovery.py b/miio/discovery.py
@@ -19,8 +19,8 @@
                             MODEL_CHUANGMI_PLUG_M1, MODEL_CHUANGMI_PLUG_M3,
                             MODEL_CHUANGMI_PLUG_HMI205, )
 
-from .fan import (MODEL_FAN_V2, MODEL_FAN_V3, MODEL_FAN_SA1, MODEL_FAN_ZA1, MODEL_FAN_ZA4,
-                  MODEL_FAN_P5, )
+from .fan import (MODEL_FAN_V2, MODEL_FAN_V3, MODEL_FAN_SA1, MODEL_FAN_ZA1, MODEL_FAN_ZA3,
+                  MODEL_FAN_ZA4, MODEL_FAN_P5, )
 from .powerstrip import (MODEL_POWER_STRIP_V1, MODEL_POWER_STRIP_V2, )
 
 _LOGGER = logging.getLogger(__name__)
@@ -83,6 +83,7 @@
     "zhimi-fan-v3": partial(Fan, model=MODEL_FAN_V3),
     "zhimi-fan-sa1": partial(Fan, model=MODEL_FAN_SA1),
     "zhimi-fan-za1": partial(Fan, model=MODEL_FAN_ZA1),
+    "zhimi-fan-za3": partial(Fan, model=MODEL_FAN_ZA3),
     "zhimi-fan-za4": partial(Fan, model=MODEL_FAN_ZA4),
     "dmaker-fan-p5": partial(Fan, model=MODEL_FAN_P5),
     "zhimi-airfresh-va2": AirFresh,

diff --git a/miio/fan.py b/miio/fan.py
@@ -13,6 +13,7 @@
 MODEL_FAN_V3 = 'zhimi.fan.v3'
 MODEL_FAN_SA1 = 'zhimi.fan.sa1'
 MODEL_FAN_ZA1 = 'zhimi.fan.za1'
+MODEL_FAN_ZA3 = 'zhimi.fan.za3'
 MODEL_FAN_ZA4 = 'zhimi.fan.za4'
 MODEL_FAN_P5 = 'dmaker.fan.p5'
 
@@ -56,6 +57,7 @@
     MODEL_FAN_V3: AVAILABLE_PROPERTIES_COMMON_V2_V3,
     MODEL_FAN_SA1: AVAILABLE_PROPERTIES_COMMON,
     MODEL_FAN_ZA1: AVAILABLE_PROPERTIES_COMMON,
+    MODEL_FAN_ZA3: AVAILABLE_PROPERTIES_COMMON,
     MODEL_FAN_ZA4: AVAILABLE_PROPERTIES_COMMON,
     MODEL_FAN_P5: AVAILABLE_PROPERTIES_P5,
 }
@@ -396,8 +398,8 @@ def status(self) -> FanStatus:
         # properties are divided into multiple requests
         _props_per_request = 15
 
-        # The SA1, ZA1 and ZA4 is limited to a single property per request
-        if self.model in [MODEL_FAN_SA1, MODEL_FAN_ZA1, MODEL_FAN_ZA4]:
+        # The SA1, ZA1, ZA3 and ZA4 is limited to a single property per request
+        if self.model in [MODEL_FAN_SA1, MODEL_FAN_ZA1, MODEL_FAN_ZA3, MODEL_FAN_ZA4]:
             _props_per_request = 1
 
         _props = properties.copy()
@@ -520,7 +522,7 @@ def set_led(self, led: bool):
     )
     def set_buzzer(self, buzzer: bool):
         """Set buzzer on/off."""
-        if self.model in [MODEL_FAN_SA1, MODEL_FAN_ZA1, MODEL_FAN_ZA4]:
+        if self.model in [MODEL_FAN_SA1, MODEL_FAN_ZA1, MODEL_FAN_ZA3, MODEL_FAN_ZA4]:
             if buzzer:
                 return self.send("set_buzzer", [2])
             else:
@@ -581,6 +583,13 @@ def __init__(self, ip: str = None, token: str = None, start_id: int = 0,
                          model=MODEL_FAN_ZA1)
 
 
+class FanZA3(Fan):
+    def __init__(self, ip: str = None, token: str = None, start_id: int = 0,
+                 debug: int = 0, lazy_discover: bool = True) -> None:
+        super().__init__(ip, token, start_id, debug, lazy_discover,
+                         model=MODEL_FAN_ZA3)
+
+
 class FanZA4(Fan):
     def __init__(self, ip: str = None, token: str = None, start_id: int = 0,
                  debug: int = 0, lazy_discover: bool = True) -> None: