0.14.0 Release

Author: Adminiuga

README.md

@@ -25,9 +25,9 @@ zigpy works with separate radio libraries which can each interface with multiple
 
 These are XBee Zigbee based radios that have been tested with the [zigpy-xbee](https://github.com/zigpy/zigpy-xbee) library for zigpy
 
-- Digi XBee Series 2C (S2C) modules
-- Digi XBee Series 2 (S2) modules. Note: These will need to be manually flashed with the Zigbee Coordinator API firmware via XCTU.
-- Digi XBee Series 3 (xbee3-24) modules
+- [Digi XBee Series 3 (xbee3-24)](https://www.digi.com/products/embedded-systems/digi-xbee/rf-modules/2-4-ghz-rf-modules/xbee3-zigbee-3) and [Digi XBee Series S2C](https://www.digi.com/products/embedded-systems/digi-xbee/rf-modules/2-4-ghz-rf-modules/xbee-zigbee) modules
+  - Note! While not a must, [it is recommend to upgrade XBee Series 3 and S2C to newest firmware firmware using XCTU](https://www.digi.com/resources/documentation/Digidocs/90002002/Default.htm#Tasks/t_load_zb_firmware.htm)
+- [Digi XBee Series 2 (S2)](https://www.digi.com/support/productdetail?pid=3430) modules (Note! This first have to be [flashed with Zigbee Coordinator API firmware](https://www.digi.com/support/productdetail?pid=3430))
 
 # Port configuration
 

tests/test_application.py

@@ -404,15 +404,20 @@ async def _test_request(
     expect_reply=True,
     send_success=True,
     send_timeout=False,
-    is_end_device=None,
+    is_end_device=True,
+    node_desc=True,
     **kwargs
 ):
     seq = 123
     nwk = 0x2345
     ieee = t.EUI64(b"\x01\x02\x03\x04\x05\x06\x07\x08")
     dev = app.add_device(ieee, nwk)
-    dev.node_desc = mock.MagicMock()
-    dev.node_desc.is_end_device = is_end_device
+
+    if node_desc:
+        dev.node_desc = mock.MagicMock()
+        dev.node_desc.is_end_device = is_end_device
+    else:
+        dev.node_desc = None
 
     def _mock_command(
         cmdname, ieee, nwk, src_ep, dst_ep, cluster, profile, radius, options, data
@@ -445,6 +450,12 @@ async def test_request_with_reply(app):
     assert r[0] == 0
 
 
+@pytest.mark.asyncio
+async def test_request_without_node_desc(app):
+    r = await _test_request(app, expect_reply=True, send_success=True, node_desc=False)
+    assert r[0] == 0
+
+
 @pytest.mark.asyncio
 async def test_request_send_timeout(app):
     r = await _test_request(app, send_timeout=True)
@@ -466,8 +477,7 @@ async def test_request_extended_timeout(app):
     assert app._api._command.call_args[0][8] & 0x40 == 0x00
     app._api._command.reset_mock()
 
-    is_end_device = None
-    r = await _test_request(app, True, True, is_end_device=is_end_device)
+    r = await _test_request(app, True, True, node_desc=False)
     assert r[0] == xbee_t.TXStatus.SUCCESS
     assert app._api._command.call_count == 1
     assert app._api._command.call_args[0][8] & 0x40 == 0x40
@@ -502,7 +512,7 @@ def test_remote_at_cmd(app, device):
     assert app._api._remote_at_command.call_count == 1
     assert app._api._remote_at_command.call_args[0][0] is dev.ieee
     assert app._api._remote_at_command.call_args[0][1] == s.nwk
-    assert app._api._remote_at_command.call_args[0][2] == 0x22
+    assert app._api._remote_at_command.call_args[0][2] == 0x12
     assert app._api._remote_at_command.call_args[0][3] == s.cmd
     assert app._api._remote_at_command.call_args[0][4] == s.data
 

zigpy_xbee/__init__.py

@@ -1,5 +1,5 @@
 MAJOR_VERSION = 0
-MINOR_VERSION = 13
+MINOR_VERSION = 14
 PATCH_VERSION = "0"
 __short_version__ = "{}.{}".format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = "{}.{}".format(__short_version__, PATCH_VERSION)

zigpy_xbee/zigbee/application.py

@@ -108,8 +108,8 @@ async def startup(self, auto_form=False):
         dev = zigpy.device.Device(self, self.ieee, self.nwk)
         dev.status = zigpy.device.Status.ENDPOINTS_INIT
         dev.add_endpoint(XBEE_ENDPOINT_ID)
-        self.listener_event("raw_device_initialized", dev)
         xbee_dev = XBeeCoordinator(self, self.ieee, self.nwk, dev)
+        self.listener_event("raw_device_initialized", xbee_dev)
         self.devices[dev.ieee] = xbee_dev
 
     async def force_remove(self, dev):
@@ -222,7 +222,9 @@ async def request(
         LOGGER.debug("Zigbee request tsn #%s: %s", sequence, binascii.hexlify(data))
 
         tx_opts = 0x00
-        if expect_reply and device.node_desc.is_end_device in (True, None):
+        if expect_reply and (
+            device.node_desc is None or device.node_desc.is_end_device
+        ):
             tx_opts |= 0x40
         send_req = self._api.tx_explicit(
             device.ieee,
@@ -254,7 +256,7 @@ def remote_at_command(
         if apply_changes:
             options |= 0x02
         if encryption:
-            options |= 0x20
+            options |= 0x10
         dev = self.get_device(nwk=nwk)
         return self._api._remote_at_command(dev.ieee, nwk, options, cmd_name, *args)
 
@@ -381,7 +383,7 @@ class XBeeGroupResponse(zigpy.quirks.CustomCluster, Groups):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.node_desc = NodeDescriptor(
-            0x01, 0x40, 0x8E, 0x101E, 0x52, 0x00FF, 0x2C00, 0x00FF, 0x00
+            0x00, 0x40, 0x8E, 0x101E, 0x52, 0x00FF, 0x2C00, 0x00FF, 0x00
         )
 
     replacement = {