Skip to content
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

Fix #272 Binding: Add missing check on user selected destination endpoint #276

Merged
merged 2 commits into from
Dec 25, 2024
Merged

Fix #272 Binding: Add missing check on user selected destination endpoint #276

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
3112960
Update stats
mdeweerd Dec 21, 2024
d32e245
Fix #272 Add missing check on user endpoint id
mdeweerd Dec 25, 2024
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 STATS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Badges showing number of downloads per version

- ![badge latest](https://img.shields.io/github/downloads/mdeweerd/zha-toolkit/latest/total.svg)
- ![badge v1.1.21](https://img.shields.io/github/downloads/mdeweerd/zha-toolkit/v1.1.21/total.svg)
- ![badge v1.1.20](https://img.shields.io/github/downloads/mdeweerd/zha-toolkit/v1.1.20/total.svg)
- ![badge v1.1.19](https://img.shields.io/github/downloads/mdeweerd/zha-toolkit/v1.1.19/total.svg)
- ![badge v1.1.18](https://img.shields.io/github/downloads/mdeweerd/zha-toolkit/v1.1.18/total.svg)
- ![badge v1.1.17](https://img.shields.io/github/downloads/mdeweerd/zha-toolkit/v1.1.17/total.svg)
- ![badge v1.1.16](https://img.shields.io/github/downloads/mdeweerd/zha-toolkit/v1.1.16/total.svg)
Expand Down
14 changes: 11 additions & 3 deletions custom_components/zha_toolkit/binds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,15 @@ async def bind_ieee(

for src_ep in src_endpoints:
LOGGER.debug(
"0x%04x: binding %s/EP:%s, out-cluster 0x%04X to %s/EP:%s",
"0x%04x: binding %s/EP:%s, out-cluster 0x%04X to %s/EP:%s"
" (%r)",
src_dev.nwk,
str(src_dev.ieee),
src_ep,
src_out_cluster,
str(dst_dev.ieee),
dst_epid,
dst_addr,
)
res = await u.retry_wrapper(
zdo.request,
Expand Down Expand Up @@ -365,7 +367,11 @@ async def bind_ieee(
for ep_id, ep in dst_dev.endpoints.items():
if ep_id == 0:
continue
if isCoordinatorTarget or (src_in_cluster in ep.out_clusters):
if (
isCoordinatorTarget
or (src_in_cluster in ep.out_clusters)
and (u_dst_epid is None or u_dst_epid == ep_id)
):
dst_epid = ep_id
break
if not dst_epid:
Expand All @@ -374,13 +380,15 @@ async def bind_ieee(

for src_ep in src_endpoints:
LOGGER.debug(
"0x%04X: binding %s/EP:%s, in-cluster: 0x%04X to %s/EP:%s",
"0x%04X: binding %s/EP:%s, in-cluster: 0x%04X to %s/EP:%s"
" (%r)",
src_dev.nwk,
str(src_dev.ieee),
src_ep,
src_in_cluster,
str(dst_dev.ieee),
dst_epid,
dst_addr,
)
if src_ep not in results:
results[src_ep] = {}
Expand Down
Loading