Skip to content

Use ZDO converter for Mgmt_NWK_Update_req #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 24, 2021
Merged

Use ZDO converter for Mgmt_NWK_Update_req #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b88b582
Implement ZDO converter for `Mgmt_NWK_Update_req`
puddly Nov 17, 2021
5039182
Switch energy scan command to use zigpy methods
puddly Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions zigpy_znp/tools/energy_scan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
import itertools
from collections import deque, defaultdict

import zigpy.zdo.types as zdo_t

import zigpy_znp.types as t
import zigpy_znp.commands as c
from zigpy_znp.tools.common import setup_parser
from zigpy_znp.zigbee.application import ControllerApplication

Expand Down Expand Up @@ -34,20 +35,17 @@ async def perform_energy_scan(radio_path, num_scans=None):
if num_scans is not None and i > num_scans:
break

rsp = await app._znp.request_callback_rsp(
request=c.ZDO.MgmtNWKUpdateReq.Req(
Dst=0x0000,
DstAddrMode=t.AddrMode.NWK,
Channels=t.Channels.ALL_CHANNELS,
ScanDuration=0x02, # exponent
rsp = await app.get_device(nwk=0x0000).zdo.Mgmt_NWK_Update_req(
zdo_t.NwkUpdate(
ScanChannels=t.Channels.ALL_CHANNELS,
ScanDuration=0x02,
ScanCount=1,
NwkManagerAddr=0x0000,
),
RspStatus=t.Status.SUCCESS,
callback=c.ZDO.MgmtNWKUpdateNotify.Callback(partial=True, Src=0x0000),
)
)

for channel, energy in zip(rsp.ScannedChannels, rsp.EnergyValues):
_, scanned_channels, _, _, energy_values = rsp

for channel, energy in zip(scanned_channels, energy_values):
energies = channel_energies[channel]
energies.append(energy)

Expand Down
30 changes: 30 additions & 0 deletions zigpy_znp/zigbee/zdo_converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,36 @@
(lambda addr: c.ZDO.MgmtLeaveRsp.Callback(partial=True, Src=addr.address)),
(lambda rsp: (ZDOCmd.Mgmt_Leave_rsp, {"Status": rsp.Status})),
),
ZDOCmd.Mgmt_NWK_Update_req: (
(
lambda addr, NwkUpdate: c.ZDO.MgmtNWKUpdateReq.Req(
Dst=addr.address,
DstAddrMode=addr.mode,
Channels=NwkUpdate.ScanChannels,
ScanDuration=NwkUpdate.ScanDuration,
ScanCount=NwkUpdate.ScanCount,
# XXX: nwkUpdateId is hard-coded to `_NIB.nwkUpdateId + 1`
NwkManagerAddr=NwkUpdate.nwkManagerAddr or 0x0000,
)
),
(
lambda addr: c.ZDO.MgmtNWKUpdateNotify.Callback(
partial=True, Src=addr.address
)
),
(
lambda rsp: (
ZDOCmd.Mgmt_NWK_Update_rsp,
{
"Status": rsp.Status,
"ScannedChannels": rsp.ScannedChannels,
"TotalTransmissions": rsp.TotalTransmissions,
"TransmissionFailures": rsp.TransmissionFailures,
"EnergyValues": rsp.EnergyValues,
},
)
),
),
ZDOCmd.Bind_req: (
(
lambda addr, SrcAddress, SrcEndpoint, ClusterID, DstAddress: (
Expand Down