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

Fan controller updates (#155)

Browse Source 
* Fan controller updates.

This updates the fan controller to be more dynamic on which dp's it uses.

Fan speeds can 1,2,3,4 or low,medium,mid,high,auto.  Fans with more
than 3 speeds is not supported by Home Assistant.

Variable speed fans are not supported at this time.

* rename set_dps -> set_dp

* change to use self._dp_id instead of a fixed dp

Co-authored-by: Thomas Davis <tdavis@nersc.gov>
Co-authored-by: Pierre Ståhl <pierre.staahl@gmail.com>
This commit is contained in:
ThomasADavis
2020-11-15 22:10:02 -08:00
committed by GitHub
parent e137d598f0
commit 3e52811aac
3 changed files with 179 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
custom_components/localtuya/const.py
View File

@@ -29,6 +29,13 @@ CONF_SET_POSITION_DP = "set_position_dp"
CONF_POSITION_INVERTED = "position_inverted"
CONF_SPAN_TIME = "span_time"
# fan
CONF_FAN_SPEED_CONTROL = "fan_speed_control"
CONF_FAN_OSCILLATING_CONTROL = "fan_oscillating_control"
CONF_FAN_SPEED_LOW = "fan_speed_low"
CONF_FAN_SPEED_MEDIUM = "fan_speed_medium"
CONF_FAN_SPEED_HIGH = "fan_speed_high"
# sensor
CONF_SCALING = "scaling"

100
custom_components/localtuya/fan.py
View File

@@ -2,17 +2,28 @@
import logging
from functools import partial
import voluptuous as vol
from homeassistant.components.fan import (
FanEntity,
DOMAIN,
SPEED_HIGH,
SPEED_OFF,
SPEED_LOW,
SPEED_MEDIUM,
SPEED_OFF,
SUPPORT_OSCILLATE,
SPEED_HIGH,
SUPPORT_SET_SPEED,
FanEntity,
SUPPORT_OSCILLATE,
)
from .const import (
CONF_FAN_SPEED_CONTROL,
CONF_FAN_OSCILLATING_CONTROL,
CONF_FAN_SPEED_LOW,
CONF_FAN_SPEED_MEDIUM,
CONF_FAN_SPEED_HIGH,
)
from .common import LocalTuyaEntity, async_setup_entry
_LOGGER = logging.getLogger(__name__)
@@ -20,7 +31,19 @@ _LOGGER = logging.getLogger(__name__)
def flow_schema(dps):
"""Return schema used in config flow."""
return {}
return {
vol.Optional(CONF_FAN_SPEED_CONTROL): vol.In(dps),
vol.Optional(CONF_FAN_OSCILLATING_CONTROL): vol.In(dps),
vol.Optional(CONF_FAN_SPEED_LOW, default=SPEED_LOW): vol.In(
[SPEED_LOW, "1", "2"]
),
vol.Optional(CONF_FAN_SPEED_MEDIUM, default=SPEED_MEDIUM): vol.In(
[SPEED_MEDIUM, "mid", "2", "3"]
),
vol.Optional(CONF_FAN_SPEED_HIGH, default=SPEED_HIGH): vol.In(
[SPEED_HIGH, "auto", "3", "4"]
),
}
class LocaltuyaFan(LocalTuyaEntity, FanEntity):
@@ -61,7 +84,7 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
async def async_turn_on(self, speed: str = None, **kwargs) -> None:
"""Turn on the entity."""
await self._device.set_dp(True, "1")
await self._device.set_dp(True, self._dp_id)
if speed is not None:
await self.async_set_speed(speed)
else:
@@ -69,43 +92,68 @@ class LocaltuyaFan(LocalTuyaEntity, FanEntity):
async def async_turn_off(self, **kwargs) -> None:
"""Turn off the entity."""
await self._device.set_dp(False, "1")
await self._device.set_dp(False, self._dp_id)
self.schedule_update_ha_state()
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, "1")
elif speed == SPEED_LOW:
await self._device.set_dp("1", "2")
elif speed == SPEED_MEDIUM:
await self._device.set_dp("2", "2")
elif speed == SPEED_HIGH:
await self._device.set_dp("3", "2")
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:
"""Set oscillation."""
await self._device.set_dp(oscillating, "8")
await self._device.set_dp(
oscillating, self._config.get(CONF_FAN_OSCILLATING_CONTROL)
)
self.schedule_update_ha_state()
@property
def supported_features(self) -> int:
"""Flag supported features."""
return SUPPORT_SET_SPEED | SUPPORT_OSCILLATE
supports = 0
if self.has_config(CONF_FAN_OSCILLATING_CONTROL):
supports |= SUPPORT_OSCILLATE
if self.has_config(CONF_FAN_SPEED_CONTROL):
supports |= SUPPORT_SET_SPEED
return supports
def status_updated(self):
"""Get state of Tuya fan."""
self._is_on = self._status["dps"]["1"]
if not self._status["dps"]["1"]:
self._speed = SPEED_OFF
elif self._status["dps"]["2"] == "1":
self._speed = SPEED_LOW
elif self._status["dps"]["2"] == "2":
self._speed = SPEED_MEDIUM
elif self._status["dps"]["2"] == "3":
self._speed = SPEED_HIGH
self._oscillating = self._status["dps"]["8"]
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,
}
self._is_on = self.dps(self._dps_id)
if self.has_config(CONF_FAN_SPEED_CONTROL):
self._speed = mappings.get(self.dps_conf(CONF_FAN_SPEED_CONTROL))
if self.speed is None:
_LOGGER.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):
self._oscillating = self.dps_conf(CONF_FAN_OSCILLATING_CONTROL)
async_setup_entry = partial(async_setup_entry, DOMAIN, LocaltuyaFan, flow_schema)

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

@@ -63,7 +63,12 @@
"color": "Color",
"color_mode": "Color Mode",
"color_temp_min_kelvin": "Minimum Color Temperature in K",
"color_temp_max_kelvin": "Maximum Color Temperature in K"
"color_temp_max_kelvin": "Maximum Color Temperature in K",
"fan_speed_control": "Fan Speed Control",
"fan_oscillating_control": "Fan Oscillating Control",
"fan_speed_low": "Fan Low Speed Setting",
"fan_speed_medium": "Fan Medium Speed Setting",
"fan_speed_high": "Fan High Speed Setting"
}
}
}
@@ -107,7 +112,12 @@
"color": "Color",
"color_mode": "Color Mode",
"color_temp_min_kelvin": "Minimum Color Temperature in K",
"color_temp_max_kelvin": "Maximum Color Temperature in K"
"color_temp_max_kelvin": "Maximum Color Temperature in K",
"fan_speed_control": "Fan Speed Control",
"fan_oscillating_control": "Fan Oscillating Control",
"fan_speed_low": "Fan Low Speed Setting",
"fan_speed_medium": "Fan Medium Speed Setting",
"fan_speed_high": "Fan High Speed Setting"
}
},
"yaml_import": {