zcc-helper 3.3.1.dev2__tar.gz → 3.4.dev1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/PKG-INFO +1 -1
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/constants.py +1 -1
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/controller.py +8 -4
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/protocol.py +4 -2
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc_helper.egg-info/PKG-INFO +1 -1
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/LICENSE.txt +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/README.md +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/setup.cfg +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/setup.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/__init__.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/__main__.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/description.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/device.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/discovery.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/errors.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/manufacture_info.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/socket.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/trace.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc/watchdog.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc.py +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc_helper.egg-info/SOURCES.txt +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc_helper.egg-info/dependency_links.txt +0 -0
- {zcc_helper-3.3.1.dev2 → zcc_helper-3.4.dev1}/zcc_helper.egg-info/top_level.txt +0 -0
|
@@ -313,9 +313,13 @@ class ControlPoint:
|
|
|
313
313
|
"""Get initial control point data from controller."""
|
|
314
314
|
|
|
315
315
|
self.manufacture_info_ready = self.loop.create_future()
|
|
316
|
+
self.manufacture_info_received = 0
|
|
316
317
|
self.properties_ready = self.loop.create_future()
|
|
318
|
+
self.properties_received = 0
|
|
317
319
|
self.actions_ready = self.loop.create_future()
|
|
320
|
+
self.actions_received = 0
|
|
318
321
|
self.states_ready = self.loop.create_future()
|
|
322
|
+
self.states_received = 0
|
|
319
323
|
|
|
320
324
|
self.logger.debug("Getting manufacture_info")
|
|
321
325
|
await self.socket.sendall(
|
|
@@ -332,7 +336,7 @@ class ControlPoint:
|
|
|
332
336
|
"ZCC connection failed - didn't receive manufacture_info."
|
|
333
337
|
) from error
|
|
334
338
|
|
|
335
|
-
await asyncio.sleep(ControlPointProtocol.
|
|
339
|
+
await asyncio.sleep(ControlPointProtocol.STEP_TIMEOUT)
|
|
336
340
|
|
|
337
341
|
self.logger.debug("Getting initial device properties")
|
|
338
342
|
await self.socket.sendall(
|
|
@@ -348,7 +352,7 @@ class ControlPoint:
|
|
|
348
352
|
"ZCC connection failed - didn't receive any properties."
|
|
349
353
|
) from error
|
|
350
354
|
|
|
351
|
-
await asyncio.sleep(ControlPointProtocol.
|
|
355
|
+
await asyncio.sleep(ControlPointProtocol.STEP_TIMEOUT)
|
|
352
356
|
|
|
353
357
|
self.logger.debug("Getting initial device actions")
|
|
354
358
|
await self.socket.sendall(
|
|
@@ -364,7 +368,7 @@ class ControlPoint:
|
|
|
364
368
|
"ZCC connection failed - didn't receive any actions."
|
|
365
369
|
) from error
|
|
366
370
|
|
|
367
|
-
await asyncio.sleep(ControlPointProtocol.
|
|
371
|
+
await asyncio.sleep(ControlPointProtocol.STEP_TIMEOUT)
|
|
368
372
|
|
|
369
373
|
self.logger.debug("Getting initial device states")
|
|
370
374
|
await self.socket.sendall(
|
|
@@ -380,7 +384,7 @@ class ControlPoint:
|
|
|
380
384
|
"ZCC connection failed - didn't receive any states."
|
|
381
385
|
) from error
|
|
382
386
|
|
|
383
|
-
await asyncio.sleep(ControlPointProtocol.
|
|
387
|
+
await asyncio.sleep(ControlPointProtocol.STEP_TIMEOUT)
|
|
384
388
|
|
|
385
389
|
for key in self.devices.keys():
|
|
386
390
|
identifier_msb = self.devices[key].identifier.split("_")[0]
|
|
@@ -23,9 +23,11 @@ class ControlPointProtocol:
|
|
|
23
23
|
CONTROLPOINT_STATES_EVENTS = "controlpoint_states_events"
|
|
24
24
|
ZCC_STATUS = "zcc_status"
|
|
25
25
|
|
|
26
|
-
SUBSCRIBE_TIMEOUT =
|
|
26
|
+
SUBSCRIBE_TIMEOUT = 2
|
|
27
27
|
GATEWAY_PROPERTIES = "gateway_properties"
|
|
28
|
-
|
|
28
|
+
GATEWAY_PROPERTIES_TIMEOUT = 10
|
|
29
|
+
|
|
30
|
+
STEP_TIMEOUT = 0
|
|
29
31
|
|
|
30
32
|
RETRY_TIMEOUT = 90
|
|
31
33
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|