images/ha_xiaomi_home
2
0
Fork 0
mirror of https://github.com/XiaoMi/ha_xiaomi_home.git synced 2025-04-01 23:35:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fan level with value-list & fan reverse (#689)
Some checks failed
Tests / check-rule-format (push) Has been cancelled
Details
Validate / validate-hassfest (push) Has been cancelled
Details
Validate / validate-hacs (push) Has been cancelled
Details
Validate / validate-lint (push) Has been cancelled
Details
Validate / validate-setup (push) Has been cancelled
Details

Browse Source 
* fix: fan level with value-list

* feat: update wind-reverse logic

* feat: use macro define for fan entity

* fix: fix fan async_set_direction error

---------

Co-authored-by: topsworld <sworldtop@gmail.com>
This commit is contained in:
Li Shuzhen 2025-01-24 10:43:49 +08:00 committed by GitHub
parent 2e60962e94
commit 57422ddf0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
custom_components/xiaomi_home/fan.py
View File

@ -52,7 +52,12 @@ import logging
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback 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 ( from homeassistant.util.percentage import (
percentage_to_ranged_value, percentage_to_ranged_value,
ranged_value_to_percentage, ranged_value_to_percentage,
@ -172,8 +177,9 @@ class Fan(MIoTServiceEntity, FanEntity):
self._prop_wind_reverse_reverse = True self._prop_wind_reverse_reverse = True
elif prop.value_list: elif prop.value_list:
for item in prop.value_list.items: for item in prop.value_list.items:
if item.name in {'foreward'}: if item.name in {'foreward', 'forward'}:
self._prop_wind_reverse_forward = item.value self._prop_wind_reverse_forward = item.value
elif item.name in {'reversal', 'reverse'}:
self._prop_wind_reverse_reverse = item.value self._prop_wind_reverse_reverse = item.value
if ( if (
self._prop_wind_reverse_forward is None self._prop_wind_reverse_forward is None
@ -202,9 +208,9 @@ class Fan(MIoTServiceEntity, FanEntity):
if self._speed_names: if self._speed_names:
await self.set_property_async( await self.set_property_async(
prop=self._prop_fan_level, prop=self._prop_fan_level,
value=self.get_map_value( value=self.get_map_key(
map_=self._speed_name_map, map_=self._speed_name_map,
key=percentage_to_ordered_list_item( value=percentage_to_ordered_list_item(
self._speed_names, percentage))) self._speed_names, percentage)))
else: else:
await self.set_property_async( await self.set_property_async(
@ -233,9 +239,9 @@ class Fan(MIoTServiceEntity, FanEntity):
if self._speed_names: if self._speed_names:
await self.set_property_async( await self.set_property_async(
prop=self._prop_fan_level, prop=self._prop_fan_level,
value=self.get_map_value( value=self.get_map_key(
map_=self._speed_name_map, map_=self._speed_name_map,
key=percentage_to_ordered_list_item( value=percentage_to_ordered_list_item(
self._speed_names, percentage))) self._speed_names, percentage)))
else: else:
await self.set_property_async( await self.set_property_async(
@ -264,7 +270,7 @@ class Fan(MIoTServiceEntity, FanEntity):
prop=self._prop_wind_reverse, prop=self._prop_wind_reverse,
value=( value=(
self._prop_wind_reverse_reverse self._prop_wind_reverse_reverse
if self.current_direction == 'reverse' if direction == DIRECTION_REVERSE
else self._prop_wind_reverse_forward)) else self._prop_wind_reverse_forward))
async def async_oscillate(self, oscillating: bool) -> None: async def async_oscillate(self, oscillating: bool) -> None:
@ -293,9 +299,9 @@ class Fan(MIoTServiceEntity, FanEntity):
"""Return the current direction of the fan.""" """Return the current direction of the fan."""
if not self._prop_wind_reverse: if not self._prop_wind_reverse:
return None return None
return 'reverse' if self.get_prop_value( return DIRECTION_REVERSE if self.get_prop_value(
prop=self._prop_wind_reverse prop=self._prop_wind_reverse
) == self._prop_wind_reverse_reverse else 'forward' ) == self._prop_wind_reverse_reverse else DIRECTION_FORWARD
@property @property
def percentage(self) -> Optional[int]: def percentage(self) -> Optional[int]: