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

Merge branch 'add-string/integer-and-preset' of https://github.com/tinglis1/localtuya into add-string/integer-and-preset

Browse Source
This commit is contained in:
Tim
2021-11-11 22:02:47 +10:30
parent e979a4b5cd 44ba8202ca
commit 994aac3224
4 changed files with 89 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,5 @@
{
"files.associations": {
"*.yaml": "home-assistant"
}
}

4
custom_components/localtuya/const.py
View File

@@ -40,9 +40,7 @@ CONF_FAN_ORDERED_LIST = "fan_speed_ordered_list"
CONF_FAN_DIRECTION = "fan_direction"
CONF_FAN_DIRECTION_FWD = "fan_direction_forward"
CONF_FAN_DIRECTION_REV = "fan_direction_reverse"
CONF_FAN_SPEED_DPS_TYPE = "fan_speed_dps_type"
CONF_FAN_PRESET_CONTROL = "fan_preset_control"
CONF_FAN_PRESET_LIST = "fan_preset_list"
# sensor
CONF_SCALING = "scaling"

191
custom_components/localtuya/fan.py
View File

@@ -1,42 +1,37 @@
"""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,
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_SPEED_CONTROL,
CONF_FAN_SPEED_MAX,
CONF_FAN_SPEED_MIN,
)
_LOGGER = logging.getLogger(__name__)
@@ -48,15 +43,11 @@ def flow_schema(dps):
vol.Optional(CONF_FAN_SPEED_CONTROL): vol.In(dps),
vol.Optional(CONF_FAN_OSCILLATING_CONTROL): vol.In(dps),
vol.Optional(CONF_FAN_DIRECTION): vol.In(dps),
vol.Optional(CONF_FAN_PRESET_CONTROL): vol.In(dps),
vol.Optional(CONF_FAN_DIRECTION_FWD, default="forward"): cv.string,
vol.Optional(CONF_FAN_DIRECTION_REV, default="reverse"): cv.string,
vol.Optional(CONF_FAN_SPEED_MIN, default=1): cv.positive_int,
vol.Optional(CONF_FAN_SPEED_MAX, default=9): cv.positive_int,
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"]),
vol.Optional(CONF_FAN_ORDERED_LIST, default="disabled"): cv.string,
}
@@ -76,22 +67,23 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
self._oscillating = None
self._direction = None
self._percentage = None
self._preset = None
self._speed_range = (
self._config.get(CONF_FAN_SPEED_MIN),
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_speed_dps_type = self._config.get(CONF_FAN_SPEED_DPS_TYPE)
if (self._ordered_speed_dps_type == "list"
and type(self._ordered_list) is list
and len(self._ordered_list) > 1):
_LOGGER.debug("Fan _use_ordered_list: %s", self._ordered_list)
self._ordered_list = self._config.get(CONF_FAN_ORDERED_LIST).split(",")
self._ordered_list_mode = None
if isinstance(self._ordered_list, list) and len(self._ordered_list) > 1:
self._use_ordered_list = True
_LOGGER.debug(
"Fan _use_ordered_list: %s > %s",
self._use_ordered_list,
self._ordered_list,
)
else:
_LOGGER.debug("Fan _use_ordered_list: Not a valid list")
self._use_ordered_list = False
_LOGGER.debug("Fan _use_ordered_list: %s", self._use_ordered_list)
@property
def oscillating(self):
@@ -113,12 +105,13 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
"""Return the current percentage."""
return self._percentage
async def async_turn_on(self, percentage: str = None, **kwargs) -> None:
async def async_turn_on(self, percentage: str = None,
preset_mode: str = None, **kwargs) -> None:
"""Turn on the entity."""
_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()
@@ -131,46 +124,42 @@ 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:
if percentage == 0:
return await self.async_turn_off()
elif not self.is_on:
await self.async_turn_on()
if self._ordered_speed_dps_type == "string":
await self._device.set_dp(
str(math.ceil(
percentage_to_ranged_value(self._speed_range, percentage)
)),
self._config.get(CONF_FAN_SPEED_CONTROL)
)
_LOGGER.debug("Fan async_set_percentage: %s > %s", percentage, percentage_to_ranged_value(self._speed_range, percentage))
elif self._ordered_speed_dps_type == "integer":
await self._device.set_dp(
int(math.ceil(
percentage_to_ranged_value(self._speed_range, percentage)
)),
self._config.get(CONF_FAN_SPEED_CONTROL)
)
_LOGGER.debug("Fan async_set_percentage: %s > %s", percentage, percentage_to_ranged_value(self._speed_range, percentage))
elif self._ordered_speed_dps_type == "list":
if self._use_ordered_list:
await self._device.set_dp(
str(
percentage_to_ordered_list_item(self._ordered_list, percentage)
),
self._config.get(CONF_FAN_SPEED_CONTROL)
)
_LOGGER.debug("Fan async_set_percentage: %s > %s", percentage, percentage_to_ordered_list_item(self._ordered_list, percentage))
),
self._config.get(CONF_FAN_SPEED_CONTROL),
)
_LOGGER.debug(
"Fan async_set_percentage: %s > %s",
percentage,
percentage_to_ordered_list_item(self._ordered_list, percentage),
)
else:
await self._device.set_dp(
str(
math.ceil(
percentage_to_ranged_value(self._speed_range, percentage)
)
),
self._config.get(CONF_FAN_SPEED_CONTROL),
)
_LOGGER.debug(
"Fan async_set_percentage: %s > %s",
percentage,
percentage_to_ranged_value(self._speed_range, percentage),
)
self.schedule_update_ha_state()
async def async_oscillate(self, oscillating: bool) -> None:
"""Set oscillation."""
_LOGGER.debug("Fan async_oscillate: %s", oscillating)
@@ -185,21 +174,10 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
if direction == DIRECTION_FORWARD:
value = self._config.get(CONF_FAN_DIRECTION_FWD)
if direction == DIRECTION_REVERSE:
value = self._config.get(CONF_FAN_DIRECTION_REV)
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:
"""Set the preset mode of the fan."""
_LOGGER.debug("Fan set preset: %s", preset_mode)
await self._device.set_dp(
preset_mode, self._config.get(CONF_FAN_PRESET_CONTROL)
)
await self._device.set_dp(value, self._config.get(CONF_FAN_DIRECTION))
self.schedule_update_ha_state()
@property
@@ -216,11 +194,8 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
if self.has_config(CONF_FAN_DIRECTION):
features |= SUPPORT_DIRECTION
if self.has_config(CONF_FAN_PRESET_CONTROL):
features |= SUPPORT_PRESET_MODE
return features
return features
@property
def speed_count(self) -> int:
"""Speed count for the fan."""
@@ -228,52 +203,48 @@ 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)
self._preset = current_preset
current_speed = self.dps_conf(CONF_FAN_SPEED_CONTROL)
if current_speed is not None:
if self._use_ordered_list:
_LOGGER.debug(
"Fan current_speed ordered_list_item_to_percentage: %s from %s",
current_speed,
self._ordered_list,
)
if current_speed is not None:
self._percentage = ordered_list_item_to_percentage(
self._ordered_list, current_speed
)
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
else:
_LOGGER.debug(
"Fan current_speed ranged_value_to_percentage: %s from %s",
current_speed,
self._speed_range,
)
if current_speed is not None:
self._percentage = ranged_value_to_percentage(
self._speed_range, int(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)
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)
_LOGGER.debug("Fan current_percentage: %s", self._percentage)
if self.has_config(CONF_FAN_OSCILLATING_CONTROL):
self._oscillating = self.dps_conf(CONF_FAN_OSCILLATING_CONTROL)
_LOGGER.debug("Fan current_oscillating : %s", self._oscillating)
if self.has_config(CONF_FAN_DIRECTION):
value = self.dps_conf(CONF_FAN_DIRECTION)
if value is not None:
if value == self._config.get(CONF_FAN_DIRECTION_FWD):
self._direction = DIRECTION_FORWARD
if value == self._config.get(CONF_FAN_DIRECTION_REV):
self._direction = DIRECTION_REVERSE
_LOGGER.debug("Fan current_direction : %s > %s", value, self._direction)
async_setup_entry = partial(async_setup_entry, DOMAIN, LocaltuyaFan, flow_schema)

10
custom_components/localtuya/translations/en.json
View File

@@ -77,10 +77,7 @@
"fan_speed_ordered_list": "Fan speed modes list (overrides speed min/max)",
"fan_direction":"fan direction dps",
"fan_direction_forward": "forward dps string",
"fan_direction_reverse": "reverse dps string",
"fan_speed_dps_type": "type of speed dps control. integer/string/list",
"fan_preset_control": "Fan preset dps. CAn be the same as speed",
"fan_preset_list": "FAn preset list. Comma separated"
"fan_direction_reverse": "reverse dps string"
}
}
}
@@ -135,10 +132,7 @@
"fan_speed_ordered_list": "Fan speed modes list (overrides speed min/max)",
"fan_direction":"fan direction dps",
"fan_direction_forward": "forward dps string",
"fan_direction_reverse": "reverse dps string",
"fan_speed_dps_type": "type of speed dps control. integer/string/list",
"fan_preset_control": "Fan preset dps. CAn be the same as speed",
"fan_preset_list": "FAn preset list. Comma separated"
"fan_direction_reverse": "reverse dps string"
}
},
"yaml_import": {