fix: Ember: ignore endpoint for Touchlink matching (#1306)

Koenkk · Jan 20, 2025 · 57c94c5 · 57c94c5
1 parent 2923236
commit 57c94c5
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/adapter/ember/adapter/oneWaitress.ts b/src/adapter/ember/adapter/oneWaitress.ts
@@ -156,11 +156,11 @@ export class EmberOneWaitress {
 
             // no target in touchlink, also no APS sequence, but use the ZCL one instead
             if (
-                (waiter.matcher.apsFrame.profileId === TOUCHLINK_PROFILE_ID || payload.address === waiter.matcher.target) &&
-                (!waiter.matcher.zclSequence || payload.header.transactionSequenceNumber === waiter.matcher.zclSequence) &&
-                (!waiter.matcher.commandIdentifier || payload.header.commandIdentifier === waiter.matcher.commandIdentifier) &&
-                payload.clusterID === waiter.matcher.apsFrame.clusterId &&
-                payload.endpoint === waiter.matcher.apsFrame.destinationEndpoint
+                (waiter.matcher.apsFrame.profileId === TOUCHLINK_PROFILE_ID ||
+                    (payload.address === waiter.matcher.target && payload.endpoint === waiter.matcher.apsFrame.destinationEndpoint)) &&
+                (waiter.matcher.zclSequence === undefined || payload.header.transactionSequenceNumber === waiter.matcher.zclSequence) &&
+                (waiter.matcher.commandIdentifier === undefined || payload.header.commandIdentifier === waiter.matcher.commandIdentifier) &&
+                payload.clusterID === waiter.matcher.apsFrame.clusterId
             ) {
                 clearTimeout(waiter.timer);