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

Merge branch 'stability_fixes' of github.com:rospogrigio/localtuya-homeassistant into stability_fixes

Browse Source
This commit is contained in:
rospogrigio
2023-02-06 10:28:42 +01:00
parent c909349cde a47e7f7c6b
commit 999d50ee4e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
custom_components/localtuya/common.py
View File

@@ -81,7 +81,6 @@ async def async_setup_entry(
] ]
if entities_to_setup: if entities_to_setup:
tuyainterface = hass.data[DOMAIN][TUYA_DEVICES][dev_id] tuyainterface = hass.data[DOMAIN][TUYA_DEVICES][dev_id]
dps_config_fields = list(get_dps_for_platform(flow_schema)) dps_config_fields = list(get_dps_for_platform(flow_schema))

10
custom_components/localtuya/config_flow.py
View File

@@ -269,7 +269,6 @@ async def validate_input(hass: core.HomeAssistant, data):
# if manual DPs are set, merge these. # if manual DPs are set, merge these.
_LOGGER.debug("Detected DPS: %s", detected_dps) _LOGGER.debug("Detected DPS: %s", detected_dps)
if CONF_MANUAL_DPS in data: if CONF_MANUAL_DPS in data:
manual_dps_list = [dps.strip() for dps in data[CONF_MANUAL_DPS].split(",")] manual_dps_list = [dps.strip() for dps in data[CONF_MANUAL_DPS].split(",")]
_LOGGER.debug( _LOGGER.debug(
"Manual DPS Setting: %s (%s)", data[CONF_MANUAL_DPS], manual_dps_list "Manual DPS Setting: %s (%s)", data[CONF_MANUAL_DPS], manual_dps_list
@@ -599,12 +598,15 @@ class LocalTuyaOptionsFlowHandler(config_entries.OptionsFlow):
if dev_id in cloud_devs: if dev_id in cloud_devs:
cloud_local_key = cloud_devs[dev_id].get(CONF_LOCAL_KEY) cloud_local_key = cloud_devs[dev_id].get(CONF_LOCAL_KEY)
if defaults[CONF_LOCAL_KEY] != cloud_local_key: if defaults[CONF_LOCAL_KEY] != cloud_local_key:
_LOGGER.info("New local_key detected: new %s vs old %s", _LOGGER.info(
"New local_key detected: new %s vs old %s",
cloud_local_key, cloud_local_key,
defaults[CONF_LOCAL_KEY] defaults[CONF_LOCAL_KEY],
) )
defaults[CONF_LOCAL_KEY] = cloud_devs[dev_id].get(CONF_LOCAL_KEY) defaults[CONF_LOCAL_KEY] = cloud_devs[dev_id].get(CONF_LOCAL_KEY)
placeholders = {"for_device": f" for device `{dev_id}`.\nNOTE: a new local_key has been retrieved using cloud API"} placeholders = {
"for_device": f" for device `{dev_id}`.\nNOTE: a new local_key has been retrieved using cloud API"
}
schema = schema_defaults(options_schema(self.entities), **defaults) schema = schema_defaults(options_schema(self.entities), **defaults)
else: else:
defaults[CONF_PROTOCOL_VERSION] = "3.3" defaults[CONF_PROTOCOL_VERSION] = "3.3"