From 26479361a7c1aa63c4ff13d39ee25ac812bc66e8 Mon Sep 17 00:00:00 2001 From: DamKas <48238600+DamKast@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:26:54 +0100 Subject: [PATCH] use ext pan id when forming network --- zigpy_zboss/commands/nwk_mgmt.py | 4 ++-- zigpy_zboss/zigbee/application.py | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/zigpy_zboss/commands/nwk_mgmt.py b/zigpy_zboss/commands/nwk_mgmt.py index 8d18ec8..0a47824 100644 --- a/zigpy_zboss/commands/nwk_mgmt.py +++ b/zigpy_zboss/commands/nwk_mgmt.py @@ -84,9 +84,9 @@ class NWK(t.CommandsBase): "distributed network" ), t.Param( - "IEEEAddr", + "ExtPanId", t.EUI64, - "The ieee address of the device" + "The network extended PAN ID." ), ) ), diff --git a/zigpy_zboss/zigbee/application.py b/zigpy_zboss/zigbee/application.py index ec2c0cb..2f88871 100644 --- a/zigpy_zboss/zigbee/application.py +++ b/zigpy_zboss/zigbee/application.py @@ -144,12 +144,6 @@ async def write_network_info(self, *, network_info, node_info): IEEE=node_info.ieee ) ) - else: - # Get the default device IEEE set by ZBOSS - res = await self._api.request( - c.NcpConfig.GetLocalIEEE.Req( - TSN=self.get_sequence(), MacInterfaceNum=0)) - node_info.ieee = res.IEEE await self._api.request( request=c.NcpConfig.SetZigbeeRole.Req( @@ -283,7 +277,7 @@ async def _form_network(self, network_info, node_info): ScanDuration=0x05, DistributedNetFlag=0x00, DistributedNetAddr=t.NWK(0x0000), - IEEEAddr=node_info.ieee + ExtPanId=network_info.extended_pan_id ) )