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

Revert "add presets and integer/string option"

Browse Source 
This reverts commit ec223ba73d.
This commit is contained in:
Tim
2021-10-26 21:41:59 +10:30
parent 0f43923c2e
commit c8e660dfac
3 changed files with 34 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 = "fan_direction"
CONF_FAN_DIRECTION_FWD = "fan_direction_forward" CONF_FAN_DIRECTION_FWD = "fan_direction_forward"
CONF_FAN_DIRECTION_REV = "fan_direction_reverse" 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 # sensor
CONF_SCALING = "scaling" CONF_SCALING = "scaling"

111
custom_components/localtuya/fan.py
View File

@@ -24,8 +24,7 @@ from .const import (
CONF_FAN_DIRECTION_REV, CONF_FAN_DIRECTION_REV,
CONF_FAN_SPEED_MIN, CONF_FAN_SPEED_MIN,
CONF_FAN_SPEED_MAX, CONF_FAN_SPEED_MAX,
CONF_FAN_ORDERED_LIST, CONF_FAN_ORDERED_LIST
CONF_FAN_SPEED_DPS_TYPE
) )
from homeassistant.util.percentage import ( from homeassistant.util.percentage import (
@@ -45,15 +44,11 @@ def flow_schema(dps):
vol.Optional(CONF_FAN_SPEED_CONTROL): vol.In(dps), vol.Optional(CONF_FAN_SPEED_CONTROL): vol.In(dps),
vol.Optional(CONF_FAN_OSCILLATING_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_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_FWD, default="forward"): cv.string,
vol.Optional(CONF_FAN_DIRECTION_REV, default="reverse"): 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_MIN, default=1): cv.positive_int,
vol.Optional(CONF_FAN_SPEED_MAX, default=9): 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_ORDERED_LIST, default="disabled"): cv.string,
vol.Optional(CONF_FAN_PRESET_LIST): cv.string,
vol.Optional(CONF_FAN_SPEED_DPS_TYPE, default="string"): vol.In(
["string", "integer", "list"]),
} }
@@ -73,21 +68,21 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
self._oscillating = None self._oscillating = None
self._direction = None self._direction = None
self._percentage = None self._percentage = None
self._preset = None
self._speed_range = ( 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._config.get(CONF_FAN_SPEED_MAX),
) )
self._ordered_list = self._config.get(CONF_FAN_ORDERED_LIST).replace(" ","").split(",") self._ordered_list = self._config.get(CONF_FAN_ORDERED_LIST).split(",")
self._preset_list = self._config.get(CONF_FAN_PRESET_LIST).replace(" ","").split(",") self._ordered_list_mode = None
self._ordered_speed_dps_type = self._config.get(CONF_FAN_SPEED_DPS_TYPE)
if (type(self._ordered_list) is list and len(self._ordered_list) > 1):
if (self._ordered_speed_dps_type == "list" and type(self._ordered_list) is list self._use_ordered_list = True
and len(self._ordered_list) > 1): _LOGGER.debug("Fan _use_ordered_list: %s > %s", self._use_ordered_list, self._ordered_list)
_LOGGER.debug("Fan _use_ordered_list: %s", self._ordered_list)
else: 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 @property
def oscillating(self): def oscillating(self):
@@ -130,32 +125,13 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
_LOGGER.debug("Fan async_set_percentage: %s", percentage) _LOGGER.debug("Fan async_set_percentage: %s", percentage)
if percentage is not None: if percentage is not None:
if percentage == 0: if percentage == 0:
return await self.async_turn_off() return await self.async_turn_off()
elif not self.is_on: elif not self.is_on:
await self.async_turn_on() await self.async_turn_on()
if self._use_ordered_list:
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":
await self._device.set_dp( await self._device.set_dp(
str( str(
percentage_to_ordered_list_item(self._ordered_list, percentage) percentage_to_ordered_list_item(self._ordered_list, percentage)
@@ -164,23 +140,14 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
) )
_LOGGER.debug("Fan async_set_percentage: %s > %s", percentage, percentage_to_ordered_list_item(self._ordered_list, percentage)) _LOGGER.debug("Fan async_set_percentage: %s > %s", percentage, percentage_to_ordered_list_item(self._ordered_list, percentage))
# if self._use_ordered_list: else:
# await self._device.set_dp( await self._device.set_dp(
# str( str(math.ceil(
# percentage_to_ordered_list_item(self._ordered_list, percentage) percentage_to_ranged_value(self._speed_range, percentage)
# ), )),
# self._config.get(CONF_FAN_SPEED_CONTROL) 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)) _LOGGER.debug("Fan async_set_percentage: %s > %s", percentage, percentage_to_ranged_value(self._speed_range, 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() self.schedule_update_ha_state()
@@ -205,15 +172,7 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
await self._device.set_dp( await self._device.set_dp(
value, self._config.get(CONF_FAN_DIRECTION) value, self._config.get(CONF_FAN_DIRECTION)
) )
self.schedule_update_ha_state() 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)
)
self.schedule_update_ha_state()
@property @property
def supported_features(self) -> int: def supported_features(self) -> int:
@@ -229,9 +188,6 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
if self.has_config(CONF_FAN_DIRECTION): if self.has_config(CONF_FAN_DIRECTION):
features |= SUPPORT_DIRECTION features |= SUPPORT_DIRECTION
if self.has_config(CONF_FAN_PRESET_CONTROL):
features |= SUPPORT_PRESET_MODE
return features return features
@property @property
@@ -247,23 +203,18 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
self._is_on = self.dps(self._dp_id) self._is_on = self.dps(self._dp_id)
# check for speed and preset.
current_speed = self.dps_conf(CONF_FAN_SPEED_CONTROL) 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 in self._preset_list: if current_speed is not None:
_LOGGER.debug("Fan current_speed in preset list: %s from %s", current_speed, self._preset_list)
self._preset = current_speed
if 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) 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" : else:
_LOGGER.debug("Fan current_speed ranged_value_to_percentage: %s from %s", current_speed, self._speed_range) _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)) self._percentage = ranged_value_to_percentage(self._speed_range, int(current_speed))
_LOGGER.debug("Fan current_percentage: %s", self._percentage) _LOGGER.debug("Fan current_percentage: %s", self._percentage)
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)

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_speed_ordered_list": "Fan speed modes list (overrides speed min/max)",
"fan_direction":"fan direction dps", "fan_direction":"fan direction dps",
"fan_direction_forward": "forward dps string", "fan_direction_forward": "forward dps string",
"fan_direction_reverse": "reverse 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"
} }
} }
} }
@@ -135,10 +132,7 @@
"fan_speed_ordered_list": "Fan speed modes list (overrides speed min/max)", "fan_speed_ordered_list": "Fan speed modes list (overrides speed min/max)",
"fan_direction":"fan direction dps", "fan_direction":"fan direction dps",
"fan_direction_forward": "forward dps string", "fan_direction_forward": "forward dps string",
"fan_direction_reverse": "reverse 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"
} }
}, },
"yaml_import": { "yaml_import": {