From 1bd0a2804569e2e0131303613d16bc2a0093555a Mon Sep 17 00:00:00 2001 From: rospogrigio Date: Wed, 30 Sep 2020 23:55:34 +0200 Subject: [PATCH] Cover Curr and Set Pos DPS now are chosen in a drop-down menu --- custom_components/localtuya/config_flow.py | 2 +- custom_components/localtuya/cover.py | 4 ++-- custom_components/localtuya/translations/en.json | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/custom_components/localtuya/config_flow.py b/custom_components/localtuya/config_flow.py index 9fddaeb..a6816b9 100644 --- a/custom_components/localtuya/config_flow.py +++ b/custom_components/localtuya/config_flow.py @@ -39,9 +39,9 @@ CUSTOM_DEVICE = "..." BASIC_INFO_SCHEMA = vol.Schema( { vol.Required(CONF_FRIENDLY_NAME): str, + vol.Required(CONF_LOCAL_KEY): str, vol.Required(CONF_HOST): str, vol.Required(CONF_DEVICE_ID): str, - vol.Required(CONF_LOCAL_KEY): str, vol.Required(CONF_PROTOCOL_VERSION, default="3.3"): vol.In(["3.1", "3.3"]), } ) diff --git a/custom_components/localtuya/cover.py b/custom_components/localtuya/cover.py index bc58915..c42fd7a 100644 --- a/custom_components/localtuya/cover.py +++ b/custom_components/localtuya/cover.py @@ -44,11 +44,11 @@ def flow_schema(dps): vol.Optional(CONF_OPEN_CMD, default=DEFAULT_OPEN_CMD): str, vol.Optional(CONF_CLOSE_CMD, default=DEFAULT_CLOSE_CMD): str, vol.Optional(CONF_STOP_CMD, default=DEFAULT_STOP_CMD): str, - vol.Optional(CONF_CURRPOS): int, - vol.Optional(CONF_SETPOS): int, vol.Optional(CONF_POSITIONING_MODE, default=DEFAULT_POSITIONING_MODE): vol.In( [CONF_MODE_NONE, CONF_MODE_YES, CONF_MODE_FAKE] ), + vol.Optional(CONF_CURRPOS): vol.In(dps), + vol.Optional(CONF_SETPOS): vol.In(dps), vol.Optional(CONF_SPAN_TIME, default=DEFAULT_SPAN_TIME): float, } diff --git a/custom_components/localtuya/translations/en.json b/custom_components/localtuya/translations/en.json index c9a98ea..32be633 100644 --- a/custom_components/localtuya/translations/en.json +++ b/custom_components/localtuya/translations/en.json @@ -50,8 +50,8 @@ "close_cmd": "Close Command", "stop_cmd": "Stop Command", "positioning_mode": "Positioning mode", - "currpos_dps": "Current Position dps (Optional, required only if Positioning Mode is 'yes')", - "setpos_dps": "Set Position dps (Optional, required only if Positioning Mode is 'yes')", + "currpos_dps": "Current Position dps (Required only if Positioning Mode is 'yes')", + "setpos_dps": "Set Position dps (Required only if Positioning Mode is 'yes')", "span_time": "Time for full opening, in secs. (Optional, required only if Positioning Mode is 'fake')", "unit_of_measurement": "Unit of Measurement", "device_class": "Device Class", @@ -87,8 +87,8 @@ "close_cmd": "Close Command", "stop_cmd": "Stop Command", "positioning_mode": "Positioning mode", - "currpos_dps": "Current Position dps (Optional, required only if Positioning Mode is 'yes')", - "setpos_dps": "Set Position dps (Optional, required only if Positioning Mode is 'yes')", + "currpos_dps": "Current Position dps (Required only if Positioning Mode is 'yes')", + "setpos_dps": "Set Position dps (Required only if Positioning Mode is 'yes')", "span_time": "Time for full opening, in secs. (Optional, required only if Positioning Mode is 'fake')", "unit_of_measurement": "Unit of Measurement", "device_class": "Device Class",