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

fix: fan level with value-list & fan reverse #689

Merged
merged 4 commits into from
Jan 24, 2025
+15 −9
Merged

fix: fan level with value-list & fan reverse #689

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8650b2
fix: fan level with value-list
SusanPhevos Jan 22, 2025
517542a
feat: update wind-reverse logic
topsworld Jan 22, 2025
035edcd
feat: use macro define for fan entity
topsworld Jan 22, 2025
1867614
fix: fix fan async_set_direction error
topsworld Jan 22, 2025
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
24 changes: 15 additions & 9 deletions custom_components/xiaomi_home/fan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.components.fan import FanEntity, FanEntityFeature
from homeassistant.components.fan import (
FanEntity,
FanEntityFeature,
DIRECTION_FORWARD,
DIRECTION_REVERSE
)
from homeassistant.util.percentage import (
percentage_to_ranged_value,
ranged_value_to_percentage,
Expand Down Expand Up @@ -172,8 +177,9 @@ def __init__(
self._prop_wind_reverse_reverse = True
elif prop.value_list:
for item in prop.value_list.items:
if item.name in {'foreward'}:
topsworld marked this conversation as resolved.
Show resolved Hide resolved
if item.name in {'foreward', 'forward'}:
self._prop_wind_reverse_forward = item.value
elif item.name in {'reversal', 'reverse'}:
self._prop_wind_reverse_reverse = item.value
if (
self._prop_wind_reverse_forward is None
Expand Down Expand Up @@ -202,9 +208,9 @@ async def async_turn_on(
if self._speed_names:
await self.set_property_async(
prop=self._prop_fan_level,
value=self.get_map_value(
value=self.get_map_key(
map_=self._speed_name_map,
key=percentage_to_ordered_list_item(
value=percentage_to_ordered_list_item(
self._speed_names, percentage)))
else:
await self.set_property_async(
Expand Down Expand Up @@ -233,9 +239,9 @@ async def async_set_percentage(self, percentage: int) -> None:
if self._speed_names:
await self.set_property_async(
prop=self._prop_fan_level,
value=self.get_map_value(
value=self.get_map_key(
map_=self._speed_name_map,
key=percentage_to_ordered_list_item(
value=percentage_to_ordered_list_item(
self._speed_names, percentage)))
else:
await self.set_property_async(
Expand Down Expand Up @@ -264,7 +270,7 @@ async def async_set_direction(self, direction: str) -> None:
prop=self._prop_wind_reverse,
value=(
self._prop_wind_reverse_reverse
if self.current_direction == 'reverse'
if direction == DIRECTION_REVERSE
else self._prop_wind_reverse_forward))

async def async_oscillate(self, oscillating: bool) -> None:
Expand Down Expand Up @@ -293,9 +299,9 @@ def current_direction(self) -> Optional[str]:
"""Return the current direction of the fan."""
if not self._prop_wind_reverse:
return None
return 'reverse' if self.get_prop_value(
return DIRECTION_REVERSE if self.get_prop_value(
prop=self._prop_wind_reverse
) == self._prop_wind_reverse_reverse else 'forward'
) == self._prop_wind_reverse_reverse else DIRECTION_FORWARD

@property
def percentage(self) -> Optional[int]:
Expand Down
Loading