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

Xiaomi Mi Smart Pedestal Fan: Add SA1 (zimi.fan.sa1) support #354

Merged
merged 12 commits into from
Aug 11, 2018
Merged

Xiaomi Mi Smart Pedestal Fan: Add SA1 (zimi.fan.sa1) support #354

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
33f0a73
Add zimi.fan.sa1 support
syssi Jul 25, 2018
aa95ee7
Make hound happy
syssi Jul 25, 2018
c3c1258
Add tests
syssi Jul 26, 2018
4ed0aa6
Make specific fan classes available by miiocli
syssi Aug 3, 2018
7e9300f
Fix available properties, set_buzzer and set_oscillate
syssi Aug 9, 2018
d92f0f5
Limit the number of properties per request
syssi Aug 10, 2018
8384e7b
Make natural and direct level optional
syssi Aug 10, 2018
ab3a5d1
Fix CLI output
syssi Aug 11, 2018
9e18d3c
Fix another CLI issue
syssi Aug 11, 2018
b537e48
Fix copy&paste error
syssi Aug 11, 2018
e4d4255
Update README
syssi Aug 11, 2018
7f3317f
Add missing import
syssi Aug 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions miio/fan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

MODEL_FAN_V2 = 'zimi.fan.v2'
MODEL_FAN_V3 = 'zimi.fan.v3'
MODEL_FAN_SA1 = 'zimi.fan.sa1'

AVAILABLE_PROPERTIES_COMMON = [
'temp_dec',
Expand All @@ -35,6 +36,8 @@
AVAILABLE_PROPERTIES = {
MODEL_FAN_V2: ['led', 'bat_state'] + AVAILABLE_PROPERTIES_COMMON,
MODEL_FAN_V3: AVAILABLE_PROPERTIES_COMMON,
MODEL_FAN_SA1: ['led', 'angle', 'speed', 'poweroff_time', 'power', 'ac_power', 'angle_enable', 'speed_level',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (113 > 100 characters)

'natural_level', 'child_lock', 'buzzer', 'led_b', 'use_time'],
}


Expand Down Expand Up @@ -66,6 +69,11 @@ def __init__(self, data: Dict[str, Any]) -> None:
'child_lock': 'off', 'buzzer': 'on', 'led_b': 1, 'led': None,
'natural_enable': None, 'use_time': 0, 'bat_charge': 'complete',
'bat_state': None, 'button_pressed':'speed'}

Response of a Fan (zhimi.fan.sa1):
{'led': 0, 'angle': 120, 'speed': 277, 'poweroff_time': 0, 'power': 'on',
'ac_power': 'on', 'angle_enable': 'off', 'speed_level': 1, 'natural_level': 2,
'child_lock': 'off', 'buzzer': 0, 'led_b': 0, 'use_time': 2318}
"""
self.data = data

Expand All @@ -80,14 +88,18 @@ def is_on(self) -> bool:
return self.power == "on"

@property
def humidity(self) -> int:
def humidity(self) -> Optional[int]:
"""Current humidity."""
return self.data["humidity"]
if "humidity" in self.data and self.data["humidity"] is not None:
return self.data["humidity"]
return None

@property
def temperature(self) -> float:
def temperature(self) -> Optional[float]:
"""Current temperature, if available."""
return self.data["temp_dec"] / 10.0
if "temp_dec" in self.data and self.data["temp_dec"] is not None:
return self.data["temp_dec"] / 10.0
return None

@property
def led(self) -> Optional[bool]:
Expand Down Expand Up @@ -129,14 +141,15 @@ def oscillate(self) -> bool:
return self.data["angle_enable"] == "on"

@property
def battery(self) -> int:
def battery(self) -> Optional[int]:
"""Current battery level."""
return self.data["battery"]
if "battery" in self.data and self.data["battery"] is not None:
return self.data["battery"]

@property
def battery_charge(self) -> Optional[str]:
"""State of the battery charger, if available."""
if self.data["bat_charge"] is not None:
if "bat_charge" in self.data and self.data["bat_charge"] is not None:
return self.data["bat_charge"]
return None

Expand Down