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.

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

Ember: Add keys to adapter queue executors. #1121

Merged
merged 1 commit into from
Jul 18, 2024
Merged
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/adapter/ember/adapter/emberAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2343,7 +2343,7 @@ export class EmberAdapter extends Adapter {
}

return {neighbors};
});
}, networkAddress);
}

// queued, non-InterPAN
Expand Down Expand Up @@ -2399,7 +2399,7 @@ export class EmberAdapter extends Adapter {
}

return {table};
});
}, networkAddress);
}

// queued, non-InterPAN
Expand Down Expand Up @@ -2453,7 +2453,7 @@ export class EmberAdapter extends Adapter {
}

return {type, manufacturerCode: result.manufacturerCode};
});
}, networkAddress);
}

// queued, non-InterPAN
Expand Down Expand Up @@ -2483,7 +2483,7 @@ export class EmberAdapter extends Adapter {
);

return {endpoints: result.endpointList};
});
}, networkAddress);
}

// queued, non-InterPAN
Expand Down Expand Up @@ -2521,7 +2521,7 @@ export class EmberAdapter extends Adapter {
inputClusters: result.inClusterList,
outputClusters: result.outClusterList,
};
});
}, networkAddress);
}

// queued, non-InterPAN
Expand Down Expand Up @@ -2570,7 +2570,7 @@ export class EmberAdapter extends Adapter {
},
DEFAULT_ZDO_REQUEST_TIMEOUT,
);
});
}, destinationNetworkAddress);
} else if (typeof destinationAddressOrGroup === 'number' && type === 'group') {
// dest is group num, so type should always be group (multicast)
return this.queue.execute<void>(async () => {
Expand Down Expand Up @@ -2607,7 +2607,7 @@ export class EmberAdapter extends Adapter {
},
DEFAULT_ZDO_REQUEST_TIMEOUT,
);
});
}, destinationNetworkAddress);
}
}

Expand Down Expand Up @@ -2657,10 +2657,10 @@ export class EmberAdapter extends Adapter {
},
DEFAULT_ZDO_REQUEST_TIMEOUT,
);
});
}, destinationNetworkAddress);
} else if (typeof destinationAddressOrGroup === 'number' && type === 'group') {
// dest is group num, so type should always be group (multicast)
return new Promise<void>(async () => {
return this.queue.execute<void>(async () => {
this.checkInterpanLock();

const zdoPayload = BuffaloZdo.buildUnbindRequest(
Expand Down Expand Up @@ -2694,7 +2694,7 @@ export class EmberAdapter extends Adapter {
},
DEFAULT_ZDO_REQUEST_TIMEOUT,
);
});
}, destinationNetworkAddress);
}
}

Expand All @@ -2720,7 +2720,7 @@ export class EmberAdapter extends Adapter {
},
DEFAULT_ZDO_REQUEST_TIMEOUT,
);
});
}, networkAddress);
}

//---- ZCL
Expand Down Expand Up @@ -2819,7 +2819,7 @@ export class EmberAdapter extends Adapter {
}

return null;
});
}, networkAddress);
}

// queued, non-InterPAN
Expand Down