Enable watchdog based on protocol version. (#77)

Author: Adminiuga

tests/test_application.py

@@ -182,12 +182,23 @@ async def test_form_network(app):
     assert app._api.device_state.call_count == 10
 
 
+@pytest.mark.parametrize(
+    "protocol_ver, watchdog_cc",
+    [
+        (0x0107, False,),
+        (0x0108, True, ),
+        (0x010B, True, ),
+    ],
+)
 @pytest.mark.asyncio
-async def test_startup(app, monkeypatch, version=0):
+async def test_startup(protocol_ver, watchdog_cc, app, monkeypatch, version=0):
 
     async def _version():
+        app._api._proto_ver = protocol_ver
         return version
 
+    app._reset_watchdog = mock.MagicMock(
+        side_effect=asyncio.coroutine(mock.MagicMock()))
     app.form_network = mock.MagicMock(
         side_effect=asyncio.coroutine(mock.MagicMock()))
     app._api._command = mock.MagicMock(
@@ -203,6 +214,7 @@ async def _version():
     monkeypatch.setattr(application.ConBeeDevice, 'new', new_mock)
     await app.startup(auto_form=False)
     assert app.form_network.call_count == 0
+    assert app._reset_watchdog.call_count == watchdog_cc
     await app.startup(auto_form=True)
     assert app.form_network.call_count == 1
 

zigpy_deconz/api.py

@@ -149,6 +149,11 @@ def __init__(self):
         self._proto_ver = None
         self._aps_data_ind_flags = 0x01
 
+    @property
+    def protocol_version(self):
+        """Protocol Version."""
+        return self._proto_ver
+
     def set_application(self, app):
         self._app = app
 
@@ -268,7 +273,8 @@ def _handle_write_parameter(self, data):
     async def version(self):
         self._proto_ver = await self[NetworkParameter.protocol_version]
         version = await self._command(Command.version)
-        if self._proto_ver >= MIN_PROTO_VERSION and (version[0] & 0x0000FF00) == 0x00000500:
+        if self.protocol_version >= MIN_PROTO_VERSION and \
+                (version[0] & 0x0000FF00) == 0x00000500:
             self._aps_data_ind_flags = 0x04
         return version[0]
 

zigpy_deconz/zigbee/application.py

@@ -16,6 +16,7 @@
 
 CHANGE_NETWORK_WAIT = 1
 SEND_CONFIRM_TIMEOUT = 60
+PROTO_VER_WATCHDOG = 0x0108
 
 
 class ControllerApplication(zigpy.application.ControllerApplication):
@@ -57,7 +58,7 @@ async def startup(self, auto_form=False):
         await self._api[NetworkParameter.nwk_update_id]
         self._api[NetworkParameter.aps_designed_coordinator] = 1
 
-        if self.version > 0x261f0500:
+        if self._api.protocol_version >= PROTO_VER_WATCHDOG:
             asyncio.ensure_future(self._reset_watchdog())
 
         if auto_form: