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

fix tox errors

Browse Source
This commit is contained in:
Tim
2021-11-11 22:56:34 +10:30
committed by GitHub Actions
parent e8aa5ac9a8
commit d600cba89c
1 changed files with 109 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
custom_components/localtuya/fan.py
View File

@@ -1,46 +1,46 @@
"""Platform to locally control Tuya-based fan devices."""
import logging
from functools import partial
import math
from functools import partial
import homeassistant.helpers.config_validation as cv
import voluptuous as vol
from homeassistant.components.fan import (
DOMAIN,
DIRECTION_FORWARD,
DIRECTION_REVERSE,
DOMAIN,
SUPPORT_DIRECTION,
SUPPORT_OSCILLATE,
SUPPORT_SET_SPEED,
SUPPORT_PRESET_MODE,
SUPPORT_SET_SPEED,
FanEntity,
)
from .common import LocalTuyaEntity, async_setup_entry
from .const import (
CONF_FAN_OSCILLATING_CONTROL,
CONF_FAN_SPEED_CONTROL,
CONF_FAN_PRESET_CONTROL,
CONF_FAN_DIRECTION,
CONF_FAN_DIRECTION_FWD,
CONF_FAN_DIRECTION_REV,
CONF_FAN_SPEED_MIN,
CONF_FAN_SPEED_MAX,
CONF_FAN_ORDERED_LIST,
CONF_FAN_SPEED_DPS_TYPE,
CONF_FAN_PRESET_LIST
)
from homeassistant.util.percentage import (
int_states_in_range,
ordered_list_item_to_percentage,
percentage_to_ordered_list_item,
percentage_to_ranged_value,
ranged_value_to_percentage,
int_states_in_range
)
from .common import LocalTuyaEntity, async_setup_entry
from .const import (
CONF_FAN_DIRECTION,
CONF_FAN_DIRECTION_FWD,
CONF_FAN_DIRECTION_REV,
CONF_FAN_ORDERED_LIST,
CONF_FAN_OSCILLATING_CONTROL,
CONF_FAN_PRESET_CONTROL,
CONF_FAN_PRESET_LIST,
CONF_FAN_SPEED_CONTROL,
CONF_FAN_SPEED_DPS_TYPE,
CONF_FAN_SPEED_MAX,
CONF_FAN_SPEED_MIN,
)
_LOGGER = logging.getLogger(__name__)
def flow_schema(dps):
"""Return schema used in config flow."""
return {
@@ -55,9 +55,11 @@ def flow_schema(dps):
vol.Optional(CONF_FAN_ORDERED_LIST): cv.string,
vol.Optional(CONF_FAN_PRESET_LIST): cv.string,
vol.Optional(CONF_FAN_SPEED_DPS_TYPE, default="string"): vol.In(
["string", "integer", "list"]),
["string", "integer", "list"]
),
}
class LocaltuyaFan(LocalTuyaEntity, FanEntity):
"""Representation of a Tuya fan."""
@@ -79,13 +81,19 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
self._config.get(CONF_FAN_SPEED_MIN),
self._config.get(CONF_FAN_SPEED_MAX),
)
self._ordered_list = self._config.get(CONF_FAN_ORDERED_LIST).replace(" ","").split(",")
self._preset_list = self._config.get(CONF_FAN_PRESET_LIST).replace(" ","").split(",")
self._ordered_list = (
self._config.get(CONF_FAN_ORDERED_LIST).replace(" ", "").split(",")
)
self._preset_list = (
self._config.get(CONF_FAN_PRESET_LIST).replace(" ", "").split(",")
)
self._ordered_speed_dps_type = self._config.get(CONF_FAN_SPEED_DPS_TYPE)
if (self._ordered_speed_dps_type == "list"
and isinstance(self._ordered_list, list)
and len(self._ordered_list) > 1):
if (
self._ordered_speed_dps_type == "list"
and isinstance(self._ordered_list, list)
and len(self._ordered_list) > 1
):
_LOGGER.debug("Fan _use_ordered_list: %s", self._ordered_list)
else:
_LOGGER.debug("Fan _use_ordered_list: Not a valid list")
@@ -115,7 +123,7 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
_LOGGER.debug("Fan async_turn_on")
await self._device.set_dp(True, self._dp_id)
if percentage is not None:
await self.async_set_percentage(speed)
await self.async_set_percentage(percentage)
else:
self.schedule_update_ha_state()
@@ -128,7 +136,6 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
async def async_set_percentage(self, percentage):
"""Set the speed of the fan."""
_LOGGER.debug("Fan async_set_percentage: %s", percentage)
if percentage is not None:
@@ -139,33 +146,40 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
await self.async_turn_on()
if self._ordered_speed_dps_type == "string":
send_speed = str(math.ceil(
percentage_to_ranged_value(self._speed_range, percentage)))
send_speed = str(
math.ceil(percentage_to_ranged_value(self._speed_range, percentage))
)
await self._device.set_dp(
send_speed, self._config.get(CONF_FAN_SPEED_CONTROL))
_LOGGER.debug("Fan async_set_percentage: %s > %s",
percentage, send_speed)
send_speed, self._config.get(CONF_FAN_SPEED_CONTROL)
)
_LOGGER.debug(
"Fan async_set_percentage: %s > %s", percentage, send_speed
)
elif self._ordered_speed_dps_type == "integer":
send_speed = int(math.ceil(
percentage_to_ranged_value(self._speed_range, percentage)))
send_speed = int(
math.ceil(percentage_to_ranged_value(self._speed_range, percentage))
)
await self._device.set_dp(
send_speed, self._config.get(CONF_FAN_SPEED_CONTROL))
_LOGGER.debug("Fan async_set_percentage: %s > %s",
percentage, send_speed)
send_speed, self._config.get(CONF_FAN_SPEED_CONTROL)
)
_LOGGER.debug(
"Fan async_set_percentage: %s > %s", percentage, send_speed
)
elif self._ordered_speed_dps_type == "list":
send_speed = str(
percentage_to_ordered_list_item(self._ordered_list, percentage)
)
percentage_to_ordered_list_item(self._ordered_list, percentage)
)
await self._device.set_dp(
send_speed, self._config.get(CONF_FAN_SPEED_CONTROL))
_LOGGER.debug("Fan async_set_percentage: %s > %s",
percentage, send_speed)
send_speed, self._config.get(CONF_FAN_SPEED_CONTROL)
)
_LOGGER.debug(
"Fan async_set_percentage: %s > %s", percentage, send_speed
)
self.schedule_update_ha_state()
async def async_oscillate(self, oscillating: bool) -> None:
"""Set oscillation."""
_LOGGER.debug("Fan async_oscillate: %s", oscillating)
@@ -184,9 +198,7 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
if direction == DIRECTION_REVERSE:
value = self._config.get(CONF_FAN_DIRECTION_REV)
await self._device.set_dp(
value, self._config.get(CONF_FAN_DIRECTION)
)
await self._device.set_dp(value, self._config.get(CONF_FAN_DIRECTION))
self.schedule_update_ha_state()
async def async_set_preset_mode(self, preset_mode: str) -> None:
@@ -223,38 +235,57 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
_LOGGER.debug("Fan speed_count: %s", speed_count)
return speed_count
def status_updated(self):
"""Get state of Tuya fan."""
self._is_on = self.dps(self._dp_id)
if self.has_config(CONF_FAN_PRESET_CONTROL):
current_preset = self.dps_conf(CONF_FAN_PRESET_CONTROL)
if current_preset is not None and current_preset in self._preset_list:
_LOGGER.debug("Fan current_preset in preset list: %s from %s",
current_preset, self._preset_list)
_LOGGER.debug(
"Fan current_preset in preset list: %s from %s",
current_preset,
self._preset_list,
)
self._preset = current_preset
current_speed = self.dps_conf(CONF_FAN_SPEED_CONTROL)
if current_speed is not None:
if (self.has_config(CONF_FAN_PRESET_CONTROL)
and (CONF_FAN_SPEED_CONTROL == CONF_FAN_PRESET_CONTROL)
and (current_speed in self._preset_list)):
_LOGGER.debug("Fan current_speed in preset list: %s from %s",
current_speed, self._preset_list)
if (
self.has_config(CONF_FAN_PRESET_CONTROL)
and (CONF_FAN_SPEED_CONTROL == CONF_FAN_PRESET_CONTROL)
and (current_speed in self._preset_list)
):
_LOGGER.debug(
"Fan current_speed in preset list: %s from %s",
current_speed,
self._preset_list,
)
self._preset = current_speed
elif self._ordered_speed_dps_type == "list":
_LOGGER.debug("Fan current_speed ordered_list_item_to_percentage: %s from %s",
current_speed, self._ordered_list)
self._percentage = ordered_list_item_to_percentage(self._ordered_list, current_speed)
_LOGGER.debug(
"Fan current_speed ordered_list_item_to_percentage: %s from %s",
current_speed,
self._ordered_list,
)
self._percentage = ordered_list_item_to_percentage(
self._ordered_list, current_speed
)
elif self._ordered_speed_dps_type == "string" or self._ordered_speed_dps_type == "integer" :
_LOGGER.debug("Fan current_speed ranged_value_to_percentage: %s from %s",
current_speed, self._speed_range)
self._percentage = ranged_value_to_percentage(self._speed_range, int(current_speed))
elif (
self._ordered_speed_dps_type == "string"
or self._ordered_speed_dps_type == "integer"
):
_LOGGER.debug(
"Fan current_speed ranged_value_to_percentage: %s from %s",
current_speed,
self._speed_range,
)
self._percentage = ranged_value_to_percentage(
self._speed_range, int(current_speed)
)
_LOGGER.debug("Fan current_percentage: %s", self._percentage)
_LOGGER.debug("Fan current_preset: %s", self._preset)