diff --git a/miio/fan_common.py b/miio/fan_common.py deleted file mode 100644 index 41af9446a..000000000 --- a/miio/fan_common.py +++ /dev/null @@ -1,17 +0,0 @@ -import enum - - -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" diff --git a/miio/integrations/dmaker/fan/fan.py b/miio/integrations/dmaker/fan/fan.py index 2f693abe5..9f6857e3d 100644 --- a/miio/integrations/dmaker/fan/fan.py +++ b/miio/integrations/dmaker/fan/fan.py @@ -1,10 +1,21 @@ +import enum from typing import Any, Dict, Optional import click from miio import Device, DeviceStatus from miio.click_common import EnumType, command, format_output -from miio.fan_common import MoveDirection, OperationMode + + +class MoveDirection(enum.Enum): + Left = "left" + Right = "right" + + +class OperationMode(enum.Enum): + Normal = "normal" + Nature = "nature" + MODEL_FAN_P5 = "dmaker.fan.p5" diff --git a/miio/integrations/dmaker/fan/fan_miot.py b/miio/integrations/dmaker/fan/fan_miot.py index bdc278f1d..72da0ed21 100644 --- a/miio/integrations/dmaker/fan/fan_miot.py +++ b/miio/integrations/dmaker/fan/fan_miot.py @@ -5,7 +5,17 @@ from miio import DeviceStatus, MiotDevice from miio.click_common import EnumType, command, format_output -from miio.fan_common import MoveDirection, OperationMode + + +class OperationMode(enum.Enum): + Normal = "normal" + Nature = "nature" + + +class MoveDirection(enum.Enum): + Left = "left" + Right = "right" + MODEL_FAN_P9 = "dmaker.fan.p9" MODEL_FAN_P10 = "dmaker.fan.p10" diff --git a/miio/integrations/dmaker/fan/test_fan.py b/miio/integrations/dmaker/fan/test_fan.py index 88ce541f2..fe0a2dc5e 100644 --- a/miio/integrations/dmaker/fan/test_fan.py +++ b/miio/integrations/dmaker/fan/test_fan.py @@ -2,10 +2,9 @@ import pytest -from miio.fan_common import OperationMode from miio.tests.dummies import DummyDevice -from .fan import MODEL_FAN_P5, FanP5, FanStatusP5 +from .fan import MODEL_FAN_P5, FanP5, FanStatusP5, OperationMode class DummyFanP5(DummyDevice, FanP5): diff --git a/miio/integrations/zhimi/fan/fan.py b/miio/integrations/zhimi/fan/fan.py index 08be1f4fc..5d43137b2 100644 --- a/miio/integrations/zhimi/fan/fan.py +++ b/miio/integrations/zhimi/fan/fan.py @@ -1,3 +1,4 @@ +import enum import logging from typing import Any, Dict, Optional @@ -6,7 +7,18 @@ from miio import Device, DeviceStatus from miio.click_common import EnumType, command, format_output from miio.devicestatus import sensor, setting -from miio.fan_common import LedBrightness, MoveDirection + + +class MoveDirection(enum.Enum): + Left = "left" + Right = "right" + + +class LedBrightness(enum.Enum): + Bright = 0 + Dim = 1 + Off = 2 + _LOGGER = logging.getLogger(__name__) diff --git a/miio/integrations/zhimi/fan/test_zhimi_miot.py b/miio/integrations/zhimi/fan/test_zhimi_miot.py index 805c8812f..1532032fd 100644 --- a/miio/integrations/zhimi/fan/test_zhimi_miot.py +++ b/miio/integrations/zhimi/fan/test_zhimi_miot.py @@ -2,11 +2,10 @@ import pytest -from miio.fan_common import OperationMode from miio.tests.dummies import DummyMiotDevice from . import FanZA5 -from .zhimi_miot import MODEL_FAN_ZA5, OperationModeFanZA5 +from .zhimi_miot import MODEL_FAN_ZA5, OperationMode, OperationModeFanZA5 class DummyFanZA5(DummyMiotDevice, FanZA5): diff --git a/miio/integrations/zhimi/fan/zhimi_miot.py b/miio/integrations/zhimi/fan/zhimi_miot.py index 4a476b50a..9a84eb47d 100644 --- a/miio/integrations/zhimi/fan/zhimi_miot.py +++ b/miio/integrations/zhimi/fan/zhimi_miot.py @@ -5,9 +5,19 @@ from miio import DeviceException, DeviceStatus, MiotDevice from miio.click_common import EnumType, command, format_output -from miio.fan_common import MoveDirection, OperationMode from miio.utils import deprecated + +class OperationMode(enum.Enum): + Normal = "normal" + Nature = "nature" + + +class MoveDirection(enum.Enum): + Left = "left" + Right = "right" + + MODEL_FAN_ZA5 = "zhimi.fan.za5" MIOT_MAPPING = {