Add support for dmaker.fan.p9 and dmaker.fan.p10 (rytilahti#819)

* Add support for dmaker.fan.p9 and dmaker.fan.p10

* fix format issue

* add new supported fan to README

* move fan miot implementation to fan_miot.py

* move FanP9 and FanP10 to fan_miot.py

* add FanMiot to discovery.py

README.rst

@@ -105,7 +105,7 @@ Supported devices
 -  Xiaomi Philips Zhirui Smart LED Bulb E14 Candle Lamp
 -  Xiaomi Philips Zhirui Bedroom Smart Lamp
 -  Xiaomi Universal IR Remote Controller (Chuangmi IR)
--  Xiaomi Mi Smart Pedestal Fan V2, V3, SA1, ZA1, ZA3, ZA4, P5
+-  Xiaomi Mi Smart Pedestal Fan V2, V3, SA1, ZA1, ZA3, ZA4, P5, P9, P10
 -  Xiaomi Mi Air Humidifier V1, CA1, CA4, CB1, MJJSQ, JSQ001
 -  Xiaomi Mi Water Purifier (Basic support: Turn on & off)
 -  Xiaomi PM2.5 Air Quality Monitor V1, B1, S1

docs/api/miio.airconditioningcompanionMCN.rst

@@ -0,0 +1,7 @@
+miio.airconditioningcompanionMCN module
+=======================================
+
+.. automodule:: miio.airconditioningcompanionMCN
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/api/miio.fan_common.rst

@@ -0,0 +1,7 @@
+miio.fan\_common module
+=======================
+
+.. automodule:: miio.fan_common
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/api/miio.fan_miot.rst

@@ -0,0 +1,7 @@
+miio.fan\_miot module
+=====================
+
+.. automodule:: miio.fan_miot
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/api/miio.rst

@@ -35,6 +35,8 @@ Submodules
    miio.exceptions
    miio.extract_tokens
    miio.fan
+   miio.fan_common
+   miio.fan_miot
    miio.gateway
    miio.heater
    miio.miioprotocol

miio/__init__.py

@@ -30,6 +30,7 @@
 from miio.device import Device
 from miio.exceptions import DeviceError, DeviceException
 from miio.fan import Fan, FanP5, FanSA1, FanV2, FanZA1, FanZA4
+from miio.fan_miot import FanMiot, FanP9, FanP10
 from miio.gateway import Gateway
 from miio.gosund_plug import GosundPlug
 from miio.heater import Heater

miio/discovery.py

@@ -26,6 +26,7 @@
     Cooker,
     Device,
     Fan,
+    FanMiot,
     Heater,
     PhilipsBulb,
     PhilipsEyecare,
@@ -78,6 +79,7 @@
     MODEL_FAN_ZA3,
     MODEL_FAN_ZA4,
 )
+from .fan_miot import MODEL_FAN_P9, MODEL_FAN_P10
 from .heater import MODEL_HEATER_MA1, MODEL_HEATER_ZA1
 from .powerstrip import MODEL_POWER_STRIP_V1, MODEL_POWER_STRIP_V2
 from .toiletlid import MODEL_TOILETLID_V1
@@ -161,6 +163,8 @@
     "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),
+    "dmaker-fan-p9": partial(FanMiot, model=MODEL_FAN_P9),
+    "dmaker-fan-p10": partial(FanMiot, model=MODEL_FAN_P10),
     "tinymu-toiletlid-v1": partial(Toiletlid, model=MODEL_TOILETLID_V1),
     "zhimi-airfresh-va2": partial(AirFresh, model=MODEL_AIRFRESH_VA2),
     "zhimi-airfresh-va4": partial(AirFresh, model=MODEL_AIRFRESH_VA4),

miio/fan.py

@@ -1,12 +1,11 @@
-import enum
 import logging
 from typing import Any, Dict, Optional
 
 import click
 
 from .click_common import EnumType, command, format_output
 from .device import Device
-from .exceptions import DeviceException
+from .fan_common import FanException, LedBrightness, MoveDirection, OperationMode
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -64,26 +63,6 @@
 }
 
 
-class FanException(DeviceException):
-    pass
-
-
-class OperationMode(enum.Enum):
-    Normal = "normal"
-    Nature = "nature"
-
-
-class LedBrightness(enum.Enum):
-    Bright = 0
-    Dim = 1
-    Off = 2
-
-
-class MoveDirection(enum.Enum):
-    Left = "left"
-    Right = "right"
-
-
 class FanStatus:
     """Container for status reports from the Xiaomi Mi Smart Pedestal Fan."""
 

miio/fan_common.py

@@ -0,0 +1,23 @@
+import enum
+
+from .exceptions import DeviceException
+
+
+class FanException(DeviceException):
+    pass
+
+
+class OperationMode(enum.Enum):
+    Normal = "normal"
+    Nature = "nature"
+
+
+class LedBrightness(enum.Enum):
+    Bright = 0
+    Dim = 1
+    Off = 2
+
+
+class MoveDirection(enum.Enum):
+    Left = "left"
+    Right = "right"