Merge all endpoints into one

Author: puddly

zigpy_znp/zigbee/application.py

@@ -12,24 +12,22 @@
 import zigpy.profiles
 import zigpy.zcl.foundation
 
-from zigpy.zdo.types import ZDOCmd, ZDOHeader, CLUSTERS as ZDO_CLUSTERS
-
 from zigpy.zcl import clusters
 from zigpy.types import (
     ExtendedPanId,
     deserialize as list_deserialize,
     Struct as ZigpyStruct,
 )
+from zigpy.zdo.types import ZDOCmd, ZDOHeader, CLUSTERS as ZDO_CLUSTERS
 from zigpy.exceptions import DeliveryError
 
-import zigpy_znp.config as conf
 import zigpy_znp.types as t
+import zigpy_znp.config as conf
 import zigpy_znp.commands as c
 
-from zigpy_znp.exceptions import InvalidCommandResponse
-
 from zigpy_znp.api import ZNP
 from zigpy_znp.znp.nib import parse_nib
+from zigpy_znp.exceptions import InvalidCommandResponse
 from zigpy_znp.types.nvids import NwkNvIds
 
 
@@ -148,7 +146,7 @@ def __init__(self, config: conf.ConfigType):
 
         self._znp = None
 
-        # It's easier to deal with this if it's never None
+        # It's simpler to work with Task objects if they're never actually None
         self._reconnect_task = asyncio.Future()
         self._reconnect_task.cancel()
 
@@ -194,6 +192,7 @@ def _receive_zdo_message(
         message = t.serialize_list([t.uint8_t(tsn)] + zdo_args)
 
         LOGGER.debug("Pretending we received a ZDO message: %s", message)
+
         self.handle_message(
             sender=sender,
             profile=zigpy.profiles.zha.PROFILE_ID,
@@ -317,7 +316,7 @@ async def _register_endpoint(
         endpoint,
         profile_id=zigpy.profiles.zha.PROFILE_ID,
         device_id=zigpy.profiles.zha.DeviceType.CONFIGURATION_TOOL,
-        device_version=0x00,
+        device_version=0b0000,
         latency_req=c.af.LatencyReq.NoLatencyReqs,
         input_clusters=[],
         output_clusters=[],
@@ -328,7 +327,7 @@ async def _register_endpoint(
                 ProfileId=profile_id,
                 DeviceId=device_id,
                 DeviceVersion=device_version,
-                LatencyReq=latency_req,
+                LatencyReq=latency_req,  # completely ignored by Z-Stack
                 InputClusters=input_clusters,
                 OutputClusters=output_clusters,
             ),
@@ -427,25 +426,18 @@ async def startup(self, auto_form=False):
                 c.AF.Delete.Req(Endpoint=endpoint), RspStatus=t.Status.SUCCESS
             )
 
+        # We really need only a single endpoint
         await self._register_endpoint(
             endpoint=1,
             profile_id=zigpy.profiles.zha.PROFILE_ID,
-            input_clusters=[clusters.general.Ota.cluster_id],
-        )
-
-        await self._register_endpoint(
-            endpoint=2,
             device_id=zigpy.profiles.zha.DeviceType.IAS_CONTROL,
+            input_clusters=[clusters.general.Ota.cluster_id],
             output_clusters=[
                 clusters.security.IasZone.cluster_id,
                 clusters.security.IasWd.cluster_id,
             ],
         )
 
-        await self._register_endpoint(
-            endpoint=100, profile_id=zigpy.profiles.zll.PROFILE_ID, device_id=0x0005
-        )
-
         nib = parse_nib(await self._znp.nvram_read(NwkNvIds.NIB))
         LOGGER.debug("Parsed NIB: %s", nib)
 
@@ -680,6 +672,11 @@ async def _send_request(
                 dst_addr, dst_ep, src_ep, cluster, sequence, options, radius, data
             )
 
+        # Zigpy just sets src == dst, which doesn't work for devices with many endpoints
+        # We use endpoint 1 for everything.
+        if dst_ep != ZDO_ENDPOINT:
+            src_ep = 1
+
         request = c.AF.DataRequestExt.Req(
             DstAddrModeAddress=dst_addr,
             DstEndpoint=dst_ep,