Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add more supported devices to their corresponding classes #1237

Merged
merged 6 commits into from
Dec 13, 2021
Merged

Add more supported devices to their corresponding classes #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a45820d
airhumidifier_miot: Fix typo in model name
rytilahti Dec 12, 2021
6f76a11
airpurifier{_miot}: add missing model information based on feedback &…
rytilahti Dec 12, 2021
4353703
philips_bulb: add philips.light.candle{1,2}, adjust supported models
rytilahti Dec 13, 2021
5b602e5
roborock: add roborock.vacuum.m1s
rytilahti Dec 13, 2021
bb2dd37
viomivacuum: add viomi.vacuum.v8 that should be compatible
rytilahti Dec 13, 2021
36b0665
philips_bulb: as most known devices seem to support cct, let's defaul…
rytilahti Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion miio/airhumidifier_miot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def clean_mode(self) -> bool:
return self.data["clean_mode"]


SMARTMI_EVAPORATIVE_HUMIDIFIER_2 = "zhimi.humidfier.ca4"
SMARTMI_EVAPORATIVE_HUMIDIFIER_2 = "zhimi.humidifier.ca4"

SUPPORTED_MODELS = [SMARTMI_EVAPORATIVE_HUMIDIFIER_2]

Expand Down
9 changes: 9 additions & 0 deletions miio/airpurifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,20 @@


SUPPORTED_MODELS = [
"zhimi.airpurifier.v1",
"zhimi.airpurifier.v2",
"zhimi.airpurifier.v3",
"zhimi.airpurifier.v5",
"zhimi.airpurifier.v6",
"zhimi.airpurifier.v7",
"zhimi.airpurifier.m1",
"zhimi.airpurifier.m2",
"zhimi.airpurifier.ma1",
"zhimi.airpurifier.ma2",
"zhimi.airpurifier.sa1",
"zhimi.airpurifier.sa2",
"zhimi.airpurifier.mc1",
"zhimi.airpurifier.mc2",
]


Expand Down
8 changes: 8 additions & 0 deletions miio/airpurifier_miot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
from .exceptions import DeviceException
from .miot_device import DeviceStatus, MiotDevice

SUPPORTED_MODELS = [
"zhimi.airpurifier.ma4", # airpurifier 3
"zhimi.airpurifier.mb3", # airpurifier 3h
"zhimi.airpurifier.va1", # airpurifier proh
]

_LOGGER = logging.getLogger(__name__)
_MAPPING = {
# Air Purifier (siid=2)
Expand Down Expand Up @@ -364,6 +370,7 @@ class AirPurifierMiot(BasicAirPurifierMiot):
"""Main class representing the air purifier which uses MIoT protocol."""

mapping = _MAPPING
_supported_models = SUPPORTED_MODELS

@command(
default_output=format_output(
Expand Down Expand Up @@ -460,6 +467,7 @@ class AirPurifierMB4(BasicAirPurifierMiot):
"""Main class representing the air purifier which uses MIoT protocol."""

mapping = _MODEL_AIRPURIFIER_MB4
_supported_models = ["zhimi.airpurifier.mb4"] # airpurifier 3c

@command(
default_output=format_output(
Expand Down
2 changes: 2 additions & 0 deletions miio/integrations/vacuum/roborock/vacuum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ class CarpetCleaningMode(enum.Enum):
ROCKROBO_S7 = "roborock.vacuum.a15"
ROCKROBO_S6_MAXV = "roborock.vacuum.a10"
ROCKROBO_E2 = "roborock.vacuum.e2"
ROCKROBO_1S = "roborock.vacuum.m1s"

SUPPORTED_MODELS = [
ROCKROBO_V1,
Expand All @@ -146,6 +147,7 @@ class CarpetCleaningMode(enum.Enum):
ROCKROBO_S7,
ROCKROBO_S6_MAXV,
ROCKROBO_E2,
ROCKROBO_1S,
]


Expand Down
2 changes: 1 addition & 1 deletion miio/integrations/vacuum/viomi/viomivacuum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

_LOGGER = logging.getLogger(__name__)

SUPPORTED_MODELS = ["viomi.vacuum.v7"]
SUPPORTED_MODELS = ["viomi.vacuum.v7", "viomi.vacuum.v8"]

ERROR_CODES = {
0: "Sleeping and not charging",
Expand Down
11 changes: 8 additions & 3 deletions miio/philips_bulb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
MODEL_PHILIPS_LIGHT_BULB = "philips.light.bulb"
MODEL_PHILIPS_LIGHT_HBULB = "philips.light.hbulb"
MODEL_PHILIPS_ZHIRUI_DOWNLIGHT = "philips.light.downlight"
MODEL_PHILIPS_CANDLE = "philips.light.candle"
MODEL_PHILIPS_CANDLE2 = "philips.light.candle2"

AVAILABLE_PROPERTIES_COMMON = ["power", "dv"]
AVAILABLE_PROPERTIES_COLORTEMP = AVAILABLE_PROPERTIES_COMMON + ["bright", "cct", "snm"]
Expand All @@ -21,6 +23,8 @@
MODEL_PHILIPS_LIGHT_HBULB: AVAILABLE_PROPERTIES_COMMON + ["bri"],
MODEL_PHILIPS_LIGHT_BULB: AVAILABLE_PROPERTIES_COLORTEMP,
MODEL_PHILIPS_ZHIRUI_DOWNLIGHT: AVAILABLE_PROPERTIES_COLORTEMP,
MODEL_PHILIPS_CANDLE: AVAILABLE_PROPERTIES_COLORTEMP,
MODEL_PHILIPS_CANDLE2: AVAILABLE_PROPERTIES_COLORTEMP,
}


Expand Down Expand Up @@ -71,7 +75,7 @@ def delay_off_countdown(self) -> int:
class PhilipsWhiteBulb(Device):
"""Main class representing Xiaomi Philips White LED Ball Lamp."""

_supported_models = list(AVAILABLE_PROPERTIES.keys())
_supported_models = [MODEL_PHILIPS_LIGHT_HBULB]

@command(
default_output=format_output(
Expand All @@ -87,7 +91,7 @@ def status(self) -> PhilipsBulbStatus:
"""Retrieve properties."""

properties = AVAILABLE_PROPERTIES.get(
self.model, AVAILABLE_PROPERTIES[MODEL_PHILIPS_LIGHT_HBULB]
self.model, AVAILABLE_PROPERTIES[MODEL_PHILIPS_LIGHT_BULB]
)
values = self.get_properties(properties)

Expand Down Expand Up @@ -130,8 +134,9 @@ def delay_off(self, seconds: int):


class PhilipsBulb(PhilipsWhiteBulb):
"""Support for philips bulbs that support color temperature and scenes."""

_supported_models = [MODEL_PHILIPS_ZHIRUI_DOWNLIGHT]
_supported_models = list(AVAILABLE_PROPERTIES.keys())

@command(
click.argument("level", type=int),
Expand Down