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

add_request_dps moved into prepare_setup_entities, plus code cleaning

Browse Source
This commit is contained in:
rospogrigio
2020-09-19 15:59:02 +02:00
committed by rospogrigio
parent 6700e02c52
commit c266e0f904
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
custom_components/localtuya/pytuya/__init__.py
View File

@@ -250,8 +250,7 @@ class TuyaDevice(object):
# dps 1 must always be sent, otherwise it might fail in case no dps is found in the requested range
self.dps_to_request = {"1": None}
for dps in range(2, 11):
self.add_dps_to_request(dps)
self.add_dps_to_request(range(2, 11))
try:
data = self.status()
except Exception as e:
@@ -263,8 +262,7 @@ class TuyaDevice(object):
return detected_dps
self.dps_to_request = {"1": None}
for dps in range(11, 21):
self.add_dps_to_request(dps)
self.add_dps_to_request(range(11, 21))
try:
data = self.status()
except Exception as e:
@@ -273,8 +271,7 @@ class TuyaDevice(object):
detected_dps.update( data["dps"] )
self.dps_to_request = {"1": None}
for dps in range(21, 31):
self.add_dps_to_request(dps)
self.add_dps_to_request(range(21, 31))
try:
data = self.status()
except Exception as e:
@@ -283,8 +280,7 @@ class TuyaDevice(object):
detected_dps.update( data["dps"] )
self.dps_to_request = {"1": None}
for dps in range(100, 111):
self.add_dps_to_request(dps)
self.add_dps_to_request(range(100, 111))
try:
data = self.status()
except Exception as e:
@@ -296,7 +292,10 @@ class TuyaDevice(object):
return detected_dps
def add_dps_to_request(self, dps_index):
self.dps_to_request[str(dps_index)] = None
if isinstance(dps_index, int):
self.dps_to_request[str(dps_index)] = None
else:
self.dps_to_request.update({str(index): None for index in dps_index})
def generate_payload(self, command, data=None):
"""