Skip to content

Support APS_Encryption transmit option #738

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
puddly merged 2 commits into from
Jul 28, 2026
Merged

Support APS_Encryption transmit option #738

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
cef6418
Honor the `APS_Encryption` transmit option
TheJulianJES Jul 28, 2026
6401d18
Drop the redundant APS encryption comment
TheJulianJES Jul 28, 2026
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
3 changes: 3 additions & 0 deletions bellows/zigbee/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,9 @@ async def send_packet(self, packet: zigpy.types.ZigbeePacket) -> None:
else:
aps_frame.options |= t.EmberApsOption.APS_OPTION_ENABLE_ROUTE_DISCOVERY

if zigpy.types.TransmitOptions.APS_Encryption in packet.tx_options:
aps_frame.options |= t.EmberApsOption.APS_OPTION_ENCRYPTION

Comment thread
TheJulianJES marked this conversation as resolved.
extended_timeout = packet.extended_timeout

# EmberZNet requires retrying to enable APS ACKs
Expand Down
17 changes: 17 additions & 0 deletions tests/test_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,23 @@ async def test_send_packet_unicast_force_route_discovery(app, packet):
)


async def test_send_packet_unicast_aps_encryption(app, packet):
await _test_send_packet_unicast(
app,
packet.replace(
tx_options=(
zigpy.types.TransmitOptions.ACK
| zigpy.types.TransmitOptions.APS_Encryption
)
),
options=(
t.EmberApsOption.APS_OPTION_ENABLE_ROUTE_DISCOVERY
| t.EmberApsOption.APS_OPTION_ENCRYPTION
| t.EmberApsOption.APS_OPTION_RETRY
),
)
Comment thread
TheJulianJES marked this conversation as resolved.


async def test_send_packet_unicast_unexpected_failure(app, packet):
with pytest.raises(zigpy.exceptions.DeliveryError):
await _test_send_packet_unicast(app, packet, status=t.EmberStatus.ERR_FATAL)
Expand Down
Loading