Skip to content

use DataRequest instead of DataRequestExt if possible #174

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

Closed
dumpfheimer wants to merge 1 commit into from
Closed

use DataRequest instead of DataRequestExt if possible #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 24 additions & 11 deletions zigpy_znp/zigbee/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import zigpy_znp.config as conf
import zigpy_znp.commands as c
from zigpy_znp.api import ZNP
from zigpy_znp.types import AddrMode
from zigpy_znp.utils import combine_concurrent_calls
from zigpy_znp.exceptions import CommandNotRecognized, InvalidCommandResponse
from zigpy_znp.types.nvids import OsalNvIds
Expand Down Expand Up @@ -960,17 +961,29 @@ async def _send_request_raw(
src_ep = self._find_endpoint(dst_ep=dst_ep, profile=profile, cluster=cluster)

if relays is None:
request = c.AF.DataRequestExt.Req(
DstAddrModeAddress=dst_addr,
DstEndpoint=dst_ep,
DstPanId=0x0000,
SrcEndpoint=src_ep,
ClusterId=cluster,
TSN=sequence,
Options=options,
Radius=radius,
Data=data,
)
if dst_addr.mode == AddrMode.NWK and len(data) < 128:
request = c.AF.DataRequest.Req(
DstAddr=dst_addr.address,
DstEndpoint=dst_ep,
SrcEndpoint=src_ep,
ClusterId=cluster,
TSN=sequence,
Options=options,
Radius=radius,
Data=data,
)
else:
request = c.AF.DataRequestExt.Req(
DstAddrModeAddress=dst_addr,
DstEndpoint=dst_ep,
DstPanId=0x0000,
SrcEndpoint=src_ep,
ClusterId=cluster,
TSN=sequence,
Options=options,
Radius=radius,
Data=data,
)
else:
request = c.AF.DataRequestSrcRtg.Req(
DstAddr=dst_addr.address,
Expand Down