WIP Use NWK and IEEE addressing mode for ConBee I (#74)

* Support nwk and ieee addressing mode.
For protocol versions 0x010B and newer use NWK and IEEE addressing mode
when retrieving APS data from Conbee I controller.

* Update tests.

Author: Adminiuga

tests/test_api.py

@@ -350,3 +350,29 @@ async def test_write_parameter(api):
     assert unk_param not in list(deconz_api.NetworkParameter)
     with pytest.raises(KeyError):
         await api.write_parameter(unk_param, 0x55aa)
+
+
+@pytest.mark.parametrize(
+    "protocol_ver, firmware_version, flags",
+    [
+        (0x010A, 0x123405dd, 0x01),
+        (0x010B, 0x123405dd, 0x04),
+        (0x010A, 0x123407dd, 0x01),
+        (0x010B, 0x123407dd, 0x01),
+    ],
+)
+@pytest.mark.asyncio
+async def test_version(protocol_ver, firmware_version, flags, api):
+    api.read_parameter = mock.MagicMock()
+    api.read_parameter.side_effect = asyncio.coroutine(
+        mock.MagicMock(return_value=protocol_ver))
+    api._command = mock.MagicMock()
+    api._command.side_effect = asyncio.coroutine(
+        mock.MagicMock(return_value=[firmware_version]))
+    r = await api.version()
+    assert r == firmware_version
+    assert api._aps_data_ind_flags == flags
+
+
+def test_handle_version(api):
+    api._handle_version([mock.sentinel.version])

tests/test_application.py

@@ -46,6 +46,15 @@ def addr_nwk(nwk):
     return addr
 
 
+@pytest.fixture
+def addr_nwk_and_ieee(nwk, ieee):
+    addr = t.DeconzAddress()
+    addr.address_mode = t.ADDRESS_MODE.NWK_AND_IEEE
+    addr.address = nwk
+    addr.ieee = ieee
+    return addr
+
+
 def _test_rx(app, addr_ieee, addr_nwk, device, data):
     app.get_device = mock.MagicMock(return_value=device)
     app.devices = (EUI64(addr_ieee.address), )
@@ -96,6 +105,23 @@ def test_rx_ieee(app, addr_ieee, addr_nwk):
     )
 
 
+def test_rx_nwk_ieee(app, addr_ieee, addr_nwk_and_ieee):
+    device = mock.MagicMock()
+    app.handle_message = mock.MagicMock()
+    _test_rx(app, addr_ieee, addr_nwk_and_ieee, device, mock.sentinel.args)
+    assert app.handle_message.call_count == 1
+    assert app.handle_message.call_args == (
+        (
+            device,
+            mock.sentinel.profile_id,
+            mock.sentinel.cluster_id,
+            mock.sentinel.src_ep,
+            mock.sentinel.dst_ep,
+            mock.sentinel.args,
+        ),
+    )
+
+
 def test_rx_wrong_addr_mode(app, addr_ieee, addr_nwk, caplog):
     device = mock.MagicMock()
     app.handle_message = mock.MagicMock()
@@ -160,7 +186,7 @@ async def test_form_network(app):
 async def test_startup(app, monkeypatch, version=0):
 
     async def _version():
-        return [version]
+        return version
 
     app.form_network = mock.MagicMock(
         side_effect=asyncio.coroutine(mock.MagicMock()))

zigpy_deconz/api.py

@@ -11,6 +11,7 @@
 
 COMMAND_TIMEOUT = 2
 DECONZ_BAUDRATE = 38400
+MIN_PROTO_VERSION = 0x010B
 
 
 class Command(t.uint8_t, enum.Enum):
@@ -145,6 +146,8 @@ def __init__(self):
         self.network_state = NetworkState.OFFLINE
         self._data_indication = False
         self._data_confirm = False
+        self._proto_ver = None
+        self._aps_data_ind_flags = 0x01
 
     def set_application(self, app):
         self._app = app
@@ -262,8 +265,12 @@ def _handle_write_parameter(self, data):
             return
         LOGGER.debug("Write parameter %s: SUCCESS", param.name)
 
-    def version(self):
-        return self._command(Command.version)
+    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:
+            self._aps_data_ind_flags = 0x04
+        return version[0]
 
     def _handle_version(self, data):
         LOGGER.debug("Version response: %x", data[0])
@@ -274,7 +281,7 @@ def _handle_device_state_changed(self, data):
 
     async def _aps_data_indication(self):
         try:
-            r = await self._command(Command.aps_data_indication, 1, 1)
+            r = await self._command(Command.aps_data_indication, 1, self._aps_data_ind_flags)
             LOGGER.debug(("'aps_data_indication' response from %s, ep: %s, "
                           "profile: 0x%04x, cluster_id: 0x%04x, data: %s"),
                          r[4], r[5], r[6], r[7], binascii.hexlify(r[8]))

zigpy_deconz/zigbee/application.py

@@ -41,8 +41,7 @@ async def shutdown(self):
 
     async def startup(self, auto_form=False):
         """Perform a complete application startup"""
-        r = await self._api.version()
-        self.version = r[0]
+        self.version = await self._api.version()
         await self._api.device_state()
         ieee = await self._api[NetworkParameter.mac_address]
         self._ieee = zigpy.types.EUI64(ieee)
@@ -163,7 +162,9 @@ def handle_rx(self, src_addr, src_ep, dst_ep, profile_id, cluster_id, data, lqi,
             self.handle_join(nwk, ieee, 0)
 
         try:
-            if src_addr.address_mode == t.ADDRESS_MODE.NWK.value:
+            if src_addr.address_mode == t.ADDRESS_MODE.NWK_AND_IEEE:
+                device = self.get_device(ieee=src_addr.ieee)
+            elif src_addr.address_mode == t.ADDRESS_MODE.NWK.value:
                 device = self.get_device(nwk=src_addr.address)
             elif src_addr.address_mode == t.ADDRESS_MODE.IEEE.value:
                 device = self.get_device(ieee=src_addr.address)