Simplify endpoints

Author: puddly

tests/test_application.py

@@ -181,7 +181,7 @@ def application(znp_server):
         ],
     )
 
-    active_eps = [100, 13, 12, 11, 8, 1]
+    active_eps = [100, 2, 1]
 
     znp_server.reply_to(
         request=c.ZDO.ActiveEpReq.Req(DstAddr=0x0000, NWKAddrOfInterest=0x0000),
@@ -359,7 +359,7 @@ async def test_application_startup_endpoints(application):
 
     await app.startup(auto_form=False)
 
-    assert len(endpoints) == 6
+    assert len(endpoints) == 3
 
 
 @pytest_mark_asyncio_timeout(seconds=5)

zigpy_znp/zigbee/application.py

@@ -405,17 +405,19 @@ async def startup(self, auto_form=False):
                 c.AF.Delete.Req(Endpoint=endpoint), RspStatus=t.Status.SUCCESS
             )
 
-        # Register our endpoints
-        await self._register_endpoint(endpoint=1)
         await self._register_endpoint(
-            endpoint=8,
-            device_id=zigpy.profiles.zha.DeviceType.IAS_CONTROL,
-            output_clusters=[clusters.security.IasZone.cluster_id],
+            endpoint=1,
+            profile_id=zigpy.profiles.zha.PROFILE_ID,
+            input_clusters=[clusters.general.Ota.cluster_id],
         )
-        await self._register_endpoint(endpoint=11)
-        await self._register_endpoint(endpoint=12)
+
         await self._register_endpoint(
-            endpoint=13, input_clusters=[clusters.general.Ota.cluster_id]
+            endpoint=2,
+            device_id=zigpy.profiles.zha.DeviceType.IAS_CONTROL,
+            output_clusters=[
+                clusters.security.IasZone.cluster_id,
+                clusters.security.IasWd.cluster_id,
+            ],
         )
 
         await self._register_endpoint(
@@ -540,7 +542,7 @@ async def form_network(self):
             reset=False,
         )
 
-        # We want to receive all ZDO callbacks to proxy them back go zipgy
+        # We want to receive all ZDO callbacks to proxy them back to zipgy
         await self._znp.nvram_write(NwkNvIds.ZDO_DIRECT_CB, t.Bool(True))
 
         # Reset now so that the changes take effect