williamp/localtuya-modded
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update fan.py

Browse Source
This commit is contained in:
Tim
2021-08-18 11:24:52 +09:30
committed by GitHub
parent 761a5f133a
commit 4eb1806eb4
1 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
custom_components/localtuya/fan.py
View File

@@ -79,8 +79,8 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
@property @property
def current_direction(self): def current_direction(self):
"""Return the current direction of the fan.""" """Return the current direction of the fan."""
direction = self.service.value(CharacteristicsTypes.ROTATION_DIRECTION) return self._direction
return TUYA_DIRECTION_TO_HA[direction]
@property @property
def is_on(self): def is_on(self):
@@ -123,7 +123,7 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
if not self.is_on: if not self.is_on:
await self.async_turn_on() await self.async_turn_on()
if percentage is not None if percentage is not None:
await self._device.set_dp( await self._device.set_dp(
math.ceil( math.ceil(
percentage_to_ranged_value(self._speed_range, percentage) percentage_to_ranged_value(self._speed_range, percentage)
@@ -131,22 +131,6 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
self._config.get(CONF_FAN_SPEED_CONTROL) self._config.get(CONF_FAN_SPEED_CONTROL)
) )
# async def async_set_speed(self, speed: str) -> None:
# """Set the speed of the fan."""
# mapping = {
# SPEED_LOW: self._config.get(CONF_FAN_SPEED_LOW),
# SPEED_MEDIUM: self._config.get(CONF_FAN_SPEED_MEDIUM),
# SPEED_HIGH: self._config.get(CONF_FAN_SPEED_HIGH),
# }
# if speed == SPEED_OFF:
# await self._device.set_dp(False, self._dp_id)
# else:
# await self._device.set_dp(
# mapping.get(speed), self._config.get(CONF_FAN_SPEED_CONTROL)
# )
# self.schedule_update_ha_state()
async def async_oscillate(self, oscillating: bool) -> None: async def async_oscillate(self, oscillating: bool) -> None:
"""Set oscillation.""" """Set oscillation."""
@@ -157,9 +141,10 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
async def async_set_direction(self, direction): async def async_set_direction(self, direction):
"""Set the direction of the fan.""" """Set the direction of the fan."""
await self.async_put_characteristics( await self._device.set_dp(
{CharacteristicsTypes.ROTATION_DIRECTION: DIRECTION_TO_TUYA[direction]} DIRECTION_TO_TUYA[direction], self._config.get(CONF_FAN_DIRECTION)
) )
self.schedule_update_ha_state()
@property @property
def supported_features(self) -> int: def supported_features(self) -> int:
@@ -181,7 +166,7 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
def speed_count(self) -> int: def speed_count(self) -> int:
"""Speed count for the fan.""" """Speed count for the fan."""
return self.has_config(CONF_FAN_SPEED_COUNT) return self.has_config(CONF_FAN_SPEED_COUNT)
)
def status_updated(self): def status_updated(self):
"""Get state of Tuya fan.""" """Get state of Tuya fan."""
@@ -201,26 +186,13 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
) )
self._percentage = None self._percentage = None
# mappings = {
# self._config.get(CONF_FAN_SPEED_LOW): SPEED_LOW,
# self._config.get(CONF_FAN_SPEED_MEDIUM): SPEED_MEDIUM,
# self._config.get(CONF_FAN_SPEED_HIGH): SPEED_HIGH,
# }
# if self.has_config(CONF_FAN_SPEED_CONTROL):
# self._speed = mappings.get(self.dps_conf(CONF_FAN_SPEED_CONTROL))
# if self.speed is None:
# self.warning(
# "%s/%s: Ignoring unknown fan controller state: %s",
# self.name,
# self.entity_id,
# self.dps_conf(CONF_FAN_SPEED_CONTROL),
# )
# self._speed = None
if self.has_config(CONF_FAN_OSCILLATING_CONTROL): if self.has_config(CONF_FAN_OSCILLATING_CONTROL):
self._oscillating = self.dps_conf(CONF_FAN_OSCILLATING_CONTROL) self._oscillating = self.dps_conf(CONF_FAN_OSCILLATING_CONTROL)
if self.has_config(CONF_FAN_DIRECTION):
self._oscillating = TUYA_DIRECTION_TO_HA[
self.dps_conf(CONF_FAN_OSCILLATING_CONTROL)
]
async_setup_entry = partial(async_setup_entry, DOMAIN, LocaltuyaFan, flow_schema) async_setup_entry = partial(async_setup_entry, DOMAIN, LocaltuyaFan, flow_schema)