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

Cover uppercase and new commands (#81)

Browse Source 
* Introduced uppercase detection for cover commands
* Added FZ_ZZ as open_close available commands for covers
* Added FZ_ZZ in the YAML config example
* Introduced invert_position Option for cover
* Cover slider inverted properly
* Fixed wrong sample YAML config for cover
* Fixed postlund's remark
This commit is contained in:
rospogrigio
2020-10-21 10:23:00 +02:00
committed by GitHub
parent 3bc16739d9
commit 032fceac2e
6 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
custom_components/localtuya/__init__.py
View File

@@ -20,11 +20,12 @@ localtuya:
- platform: cover
friendly_name: Device Cover
id: 2
open_close_stop_cmds: # Optional, default: "on_off_stop"
commands_set: # Optional, default: "on_off_stop"
["on_off_stop","open_close_stop","fz_zz_stop","1_2_3"]
positioning_mode: ["none","position","fake"] # Optional, default: "none"
currpos_dp: 3 # Optional, required only for "position" mode
setpos_dp: 4 # Optional, required only for "position" mode
position_inverted: [True,False] # Optional, default: False
span_time: 25 # Full movement time: Optional, required only for "fake" mode
- platform: fan

1
custom_components/localtuya/const.py
View File

@@ -22,6 +22,7 @@ CONF_COMMANDS_SET = "commands_set"
CONF_POSITIONING_MODE = "positioning_mode"
CONF_CURRENT_POSITION_DP = "current_position_dp"
CONF_SET_POSITION_DP = "set_position_dp"
CONF_POSITION_INVERTED = "position_inverted"
CONF_SPAN_TIME = "span_time"
# sensor

30
custom_components/localtuya/cover.py
View File

@@ -20,6 +20,7 @@ from .const import (
CONF_CURRENT_POSITION_DP,
CONF_SET_POSITION_DP,
CONF_POSITIONING_MODE,
CONF_POSITION_INVERTED,
CONF_SPAN_TIME,
)
from .common import LocalTuyaEntity, async_setup_entry
@@ -50,6 +51,7 @@ def flow_schema(dps):
),
vol.Optional(CONF_CURRENT_POSITION_DP): vol.In(dps),
vol.Optional(CONF_SET_POSITION_DP): vol.In(dps),
vol.Optional(CONF_POSITION_INVERTED, default=False): bool,
vol.Optional(CONF_SPAN_TIME, default=DEFAULT_SPAN_TIME): vol.All(
vol.Coerce(float), vol.Range(min=1.0, max=300.0)
),
@@ -70,12 +72,12 @@ class LocaltuyaCover(LocalTuyaEntity, CoverEntity):
super().__init__(device, config_entry, switchid, **kwargs)
self._state = None
self._current_cover_position = None
command_set = DEFAULT_COMMANDS_SET
commands_set = DEFAULT_COMMANDS_SET
if self.has_config(CONF_COMMANDS_SET):
command_set = self._config[CONF_COMMANDS_SET]
self._open_cmd = command_set.split("_")[0]
self._close_cmd = command_set.split("_")[1]
self._stop_cmd = command_set.split("_")[2]
commands_set = self._config[CONF_COMMANDS_SET]
self._open_cmd = commands_set.split("_")[0]
self._close_cmd = commands_set.split("_")[1]
self._stop_cmd = commands_set.split("_")[2]
print("Initialized cover [{}]".format(self.name))
@property
@@ -108,6 +110,7 @@ class LocaltuyaCover(LocalTuyaEntity, CoverEntity):
"""Return if the cover is open or not."""
if self._config[CONF_POSITIONING_MODE] != COVER_MODE_POSITION:
return None
return self._current_cover_position == 100
@property
@@ -115,6 +118,7 @@ class LocaltuyaCover(LocalTuyaEntity, CoverEntity):
"""Return if the cover is closed or not."""
if self._config[CONF_POSITIONING_MODE] != COVER_MODE_POSITION:
return None
return self._current_cover_position == 0
async def async_set_cover_position(self, **kwargs):
@@ -139,6 +143,9 @@ class LocaltuyaCover(LocalTuyaEntity, CoverEntity):
elif self._config[CONF_POSITIONING_MODE] == COVER_MODE_POSITION:
converted_position = int(kwargs[ATTR_POSITION])
if self._config[CONF_POSITION_INVERTED]:
converted_position = 100 - converted_position
if 0 <= converted_position <= 100 and self.has_config(CONF_SET_POSITION_DP):
await self._device.set_dp(
converted_position, self._config[CONF_SET_POSITION_DP]
@@ -162,10 +169,17 @@ class LocaltuyaCover(LocalTuyaEntity, CoverEntity):
def status_updated(self):
"""Device status was updated."""
self._state = self.dps(self._dp_id)
if self._state.isupper():
self._open_cmd = self._open_cmd.upper()
self._close_cmd = self._close_cmd.upper()
self._stop_cmd = self._stop_cmd.upper()
if self.has_config(CONF_CURRENT_POSITION_DP):
self._current_cover_position = self.dps(
self._config[CONF_CURRENT_POSITION_DP]
)
curr_pos = self.dps_conf(CONF_CURRENT_POSITION_DP)
if self._config[CONF_POSITION_INVERTED]:
self._current_cover_position = 100 - curr_pos
else:
self._current_cover_position = curr_pos
else:
self._current_cover_position = 50

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

@@ -50,6 +50,7 @@
"positioning_mode": "Positioning mode",
"current_position_dp": "Current Position (when Position mode is *position*)",
"set_position_dp": "Set Position (when Position Mode is *position*)",
"position_inverted": "Invert 0-100 position (when Position Mode is *position*)",
"span_time": "Full opening time, in secs. (when Position Mode is fake*)",
"unit_of_measurement": "Unit of Measurement",
"device_class": "Device Class",
@@ -89,6 +90,7 @@
"positioning_mode": "Positioning mode",
"current_position_dp": "Current Position (for *position* mode only)",
"set_position_dp": "Set Position (for *position* mode only)",
"position_inverted": "Invert 0-100 position (when Position Mode is *position*)",
"span_time": "Full opening time, in secs. (for *fake* mode only)",
"unit_of_measurement": "Unit of Measurement",
"device_class": "Device Class",