zigbee-herdsman 0.42.0 → 0.42.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.release-please-manifest.json +1 -1
- package/CHANGELOG.md +16 -0
- package/dist/adapter/adapter.d.ts +4 -4
- package/dist/adapter/adapter.d.ts.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.d.ts +4 -4
- package/dist/adapter/deconz/adapter/deconzAdapter.d.ts.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.js +48 -64
- package/dist/adapter/deconz/adapter/deconzAdapter.js.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.d.ts +4 -4
- package/dist/adapter/ember/adapter/emberAdapter.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.js +42 -50
- package/dist/adapter/ember/adapter/emberAdapter.js.map +1 -1
- package/dist/adapter/ember/adapter/oneWaitress.d.ts +2 -2
- package/dist/adapter/ember/adapter/oneWaitress.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/oneWaitress.js +5 -3
- package/dist/adapter/ember/adapter/oneWaitress.js.map +1 -1
- package/dist/adapter/ember/uart/ash.d.ts +8 -2
- package/dist/adapter/ember/uart/ash.d.ts.map +1 -1
- package/dist/adapter/ember/uart/ash.js +63 -22
- package/dist/adapter/ember/uart/ash.js.map +1 -1
- package/dist/adapter/ember/uart/consts.d.ts +1 -1
- package/dist/adapter/ember/uart/consts.js +1 -1
- package/dist/adapter/ember/uart/parser.d.ts.map +1 -1
- package/dist/adapter/ember/uart/parser.js +4 -3
- package/dist/adapter/ember/uart/parser.js.map +1 -1
- package/dist/adapter/ember/uart/writer.d.ts.map +1 -1
- package/dist/adapter/ember/uart/writer.js +4 -3
- package/dist/adapter/ember/uart/writer.js.map +1 -1
- package/dist/adapter/events.d.ts +5 -14
- package/dist/adapter/events.d.ts.map +1 -1
- package/dist/adapter/events.js +1 -2
- package/dist/adapter/events.js.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts +3 -3
- package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.js +37 -47
- package/dist/adapter/ezsp/adapter/ezspAdapter.js.map +1 -1
- package/dist/adapter/ezsp/driver/driver.js +37 -37
- package/dist/adapter/ezsp/driver/driver.js.map +1 -1
- package/dist/adapter/ezsp/driver/ezsp.js +25 -25
- package/dist/adapter/ezsp/driver/ezsp.js.map +1 -1
- package/dist/adapter/ezsp/driver/multicast.js +5 -5
- package/dist/adapter/ezsp/driver/multicast.js.map +1 -1
- package/dist/adapter/ezsp/driver/uart.js +11 -11
- package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts +3 -3
- package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/zStackAdapter.js +31 -44
- package/dist/adapter/z-stack/adapter/zStackAdapter.js.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.d.ts +4 -5
- package/dist/adapter/zigate/adapter/zigateAdapter.d.ts.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.js +21 -38
- package/dist/adapter/zigate/adapter/zigateAdapter.js.map +1 -1
- package/dist/adapter/zigate/driver/zigate.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/zigate.js +1 -9
- package/dist/adapter/zigate/driver/zigate.js.map +1 -1
- package/dist/controller/controller.d.ts +1 -2
- package/dist/controller/controller.d.ts.map +1 -1
- package/dist/controller/controller.js +53 -56
- package/dist/controller/controller.js.map +1 -1
- package/dist/controller/greenPower.d.ts +2 -1
- package/dist/controller/greenPower.d.ts.map +1 -1
- package/dist/controller/greenPower.js +30 -30
- package/dist/controller/greenPower.js.map +1 -1
- package/dist/controller/helpers/request.js +2 -2
- package/dist/controller/helpers/request.js.map +1 -1
- package/dist/controller/helpers/requestQueue.js +12 -12
- package/dist/controller/helpers/requestQueue.js.map +1 -1
- package/dist/controller/helpers/zclFrameConverter.js +5 -5
- package/dist/controller/model/device.d.ts +1 -1
- package/dist/controller/model/device.d.ts.map +1 -1
- package/dist/controller/model/device.js +21 -22
- package/dist/controller/model/device.js.map +1 -1
- package/dist/controller/model/endpoint.d.ts +1 -2
- package/dist/controller/model/endpoint.d.ts.map +1 -1
- package/dist/controller/model/endpoint.js +17 -14
- package/dist/controller/model/endpoint.js.map +1 -1
- package/dist/zcl/index.js +3 -1
- package/dist/zcl/index.js.map +1 -1
- package/dist/zcl/zclFrame.d.ts +7 -11
- package/dist/zcl/zclFrame.d.ts.map +1 -1
- package/dist/zcl/zclFrame.js +36 -91
- package/dist/zcl/zclFrame.js.map +1 -1
- package/dist/zcl/zclHeader.d.ts +14 -5
- package/dist/zcl/zclHeader.d.ts.map +1 -1
- package/dist/zcl/zclHeader.js +72 -0
- package/dist/zcl/zclHeader.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emberAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/ember/adapter/emberAdapter.ts"],"names":[],"mappings":";AAMA,OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AACtC,OAAO,EAAC,MAAM,EAAuB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"emberAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/ember/adapter/emberAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -380,32 +380,19 @@ class EmberAdapter extends __1.Adapter {
|
|
|
380
380
|
* @param messageContents
|
|
381
381
|
*/
|
|
382
382
|
async onIncomingMessage(type, apsFrame, lastHopLqi, sender, messageContents) {
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
catch (error) {
|
|
397
|
-
const payload = {
|
|
398
|
-
clusterID: apsFrame.clusterId,
|
|
399
|
-
address: sender,
|
|
400
|
-
data: messageContents,
|
|
401
|
-
endpoint: apsFrame.sourceEndpoint,
|
|
402
|
-
linkquality: lastHopLqi,
|
|
403
|
-
groupID: apsFrame.groupId,
|
|
404
|
-
wasBroadcast: ((type === enums_2.EmberIncomingMessageType.BROADCAST) || (type === enums_2.EmberIncomingMessageType.BROADCAST_LOOPBACK)),
|
|
405
|
-
destinationEndpoint: apsFrame.destinationEndpoint,
|
|
406
|
-
};
|
|
407
|
-
this.emit(events_1.Events.rawData, payload);
|
|
408
|
-
}
|
|
383
|
+
const payload = {
|
|
384
|
+
clusterID: apsFrame.clusterId,
|
|
385
|
+
header: zcl_1.ZclHeader.fromBuffer(messageContents),
|
|
386
|
+
address: sender,
|
|
387
|
+
data: messageContents,
|
|
388
|
+
endpoint: apsFrame.sourceEndpoint,
|
|
389
|
+
linkquality: lastHopLqi,
|
|
390
|
+
groupID: apsFrame.groupId,
|
|
391
|
+
wasBroadcast: ((type === enums_2.EmberIncomingMessageType.BROADCAST) || (type === enums_2.EmberIncomingMessageType.BROADCAST_LOOPBACK)),
|
|
392
|
+
destinationEndpoint: apsFrame.destinationEndpoint,
|
|
393
|
+
};
|
|
394
|
+
this.oneWaitress.resolveZCL(payload);
|
|
395
|
+
this.emit(events_1.Events.zclPayload, payload);
|
|
409
396
|
}
|
|
410
397
|
/**
|
|
411
398
|
* Emitted from @see Ezsp.ezspMacFilterMatchMessageHandler when the message is a valid InterPAN touchlink message.
|
|
@@ -418,7 +405,9 @@ class EmberAdapter extends __1.Adapter {
|
|
|
418
405
|
*/
|
|
419
406
|
async onTouchlinkMessage(sourcePanId, sourceAddress, groupId, lastHopLqi, messageContents) {
|
|
420
407
|
const payload = {
|
|
421
|
-
|
|
408
|
+
clusterID: cluster_1.default.touchlink.ID,
|
|
409
|
+
data: messageContents,
|
|
410
|
+
header: zcl_1.ZclHeader.fromBuffer(messageContents),
|
|
422
411
|
address: sourceAddress,
|
|
423
412
|
endpoint: 1, // arbitrary since not sent over-the-air
|
|
424
413
|
linkquality: lastHopLqi,
|
|
@@ -427,7 +416,7 @@ class EmberAdapter extends __1.Adapter {
|
|
|
427
416
|
destinationEndpoint: endpoints_1.FIXED_ENDPOINTS[0].endpoint,
|
|
428
417
|
};
|
|
429
418
|
this.oneWaitress.resolveZCL(payload);
|
|
430
|
-
this.emit(events_1.Events.
|
|
419
|
+
this.emit(events_1.Events.zclPayload, payload);
|
|
431
420
|
}
|
|
432
421
|
/**
|
|
433
422
|
* Emitted from @see Ezsp.ezspGpepIncomingMessageHandler
|
|
@@ -453,19 +442,20 @@ class EmberAdapter extends __1.Adapter {
|
|
|
453
442
|
gpdHeader.writeUInt32LE(frameCounter, 9); // frameCounter
|
|
454
443
|
gpdHeader.writeUInt8(gpdCommandId, 13); // commandID
|
|
455
444
|
gpdHeader.writeUInt8(gpdCommandPayload.length, 14); // payloadSize
|
|
456
|
-
const
|
|
445
|
+
const data = Buffer.concat([gpdHeader, gpdCommandPayload]);
|
|
457
446
|
const payload = {
|
|
458
|
-
|
|
447
|
+
header: zcl_1.ZclHeader.fromBuffer(data),
|
|
448
|
+
data,
|
|
449
|
+
clusterID: cluster_1.default.greenPower.ID,
|
|
459
450
|
address: sourceId,
|
|
460
451
|
endpoint: consts_2.GP_ENDPOINT,
|
|
461
452
|
linkquality: gpdLink,
|
|
462
453
|
groupID: this.greenPowerGroup,
|
|
463
|
-
|
|
464
|
-
wasBroadcast: (gpFrame.Payload.gppNwkAddr != null) ? false : true,
|
|
454
|
+
wasBroadcast: true,
|
|
465
455
|
destinationEndpoint: consts_2.GP_ENDPOINT,
|
|
466
456
|
};
|
|
467
457
|
this.oneWaitress.resolveZCL(payload);
|
|
468
|
-
this.emit(events_1.Events.
|
|
458
|
+
this.emit(events_1.Events.zclPayload, payload);
|
|
469
459
|
}
|
|
470
460
|
catch (err) {
|
|
471
461
|
logger_1.logger.error(`<~x~ [GP] Failed creating ZCL payload. Skipping. ${err}`, NS);
|
|
@@ -523,8 +513,10 @@ class EmberAdapter extends __1.Adapter {
|
|
|
523
513
|
await new Promise((resolve, reject) => {
|
|
524
514
|
this.requestQueue.enqueue(async () => {
|
|
525
515
|
// listed as per EmberCounterType
|
|
526
|
-
const
|
|
527
|
-
logger_1.logger.info(`[NCP COUNTERS] ${
|
|
516
|
+
const ncpCounters = (await this.ezsp.ezspReadAndClearCounters());
|
|
517
|
+
logger_1.logger.info(`[NCP COUNTERS] ${ncpCounters.join(',')}`, NS);
|
|
518
|
+
const ashCounters = this.ezsp.ash.readAndClearCounters();
|
|
519
|
+
logger_1.logger.info(`[ASH COUNTERS] ${ashCounters.join(',')}`, NS);
|
|
528
520
|
resolve();
|
|
529
521
|
return enums_2.EmberStatus.SUCCESS;
|
|
530
522
|
}, reject);
|
|
@@ -2661,17 +2653,17 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2661
2653
|
async sendZclFrameToEndpoint(ieeeAddr, networkAddress, endpoint, zclFrame, timeout, disableResponse, disableRecovery, sourceEndpoint) {
|
|
2662
2654
|
const sourceEndpointInfo = typeof sourceEndpoint === 'number' ?
|
|
2663
2655
|
endpoints_1.FIXED_ENDPOINTS.find((epi) => (epi.endpoint === sourceEndpoint)) : endpoints_1.FIXED_ENDPOINTS[0];
|
|
2664
|
-
const command = zclFrame.
|
|
2656
|
+
const command = zclFrame.command;
|
|
2665
2657
|
let commandResponseId = null;
|
|
2666
2658
|
if (command.hasOwnProperty('response') && disableResponse === false) {
|
|
2667
2659
|
commandResponseId = command.response;
|
|
2668
2660
|
}
|
|
2669
|
-
else if (!zclFrame.
|
|
2661
|
+
else if (!zclFrame.header.frameControl.disableDefaultResponse) {
|
|
2670
2662
|
commandResponseId = zcl_1.Foundation.defaultRsp.ID;
|
|
2671
2663
|
}
|
|
2672
2664
|
const apsFrame = {
|
|
2673
2665
|
profileId: sourceEndpointInfo.profileId,
|
|
2674
|
-
clusterId: zclFrame.
|
|
2666
|
+
clusterId: zclFrame.cluster.ID,
|
|
2675
2667
|
sourceEndpoint: sourceEndpointInfo.endpoint,
|
|
2676
2668
|
destinationEndpoint: (typeof endpoint === 'number') ? endpoint : endpoints_1.FIXED_ENDPOINTS[0].endpoint,
|
|
2677
2669
|
options: DEFAULT_APS_OPTIONS,
|
|
@@ -2692,7 +2684,7 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2692
2684
|
return enums_2.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
|
|
2693
2685
|
}
|
|
2694
2686
|
}
|
|
2695
|
-
logger_1.logger.debug(`~~~> [ZCL to=${networkAddress} apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.
|
|
2687
|
+
logger_1.logger.debug(`~~~> [ZCL to=${networkAddress} apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
|
|
2696
2688
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
2697
2689
|
const [status, messageTag] = (await this.ezsp.send(enums_2.EmberOutgoingMessageType.DIRECT, networkAddress, apsFrame, data, 0, // alias
|
|
2698
2690
|
0));
|
|
@@ -2705,7 +2697,7 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2705
2697
|
const result = (await this.oneWaitress.startWaitingFor({
|
|
2706
2698
|
target: networkAddress,
|
|
2707
2699
|
apsFrame,
|
|
2708
|
-
zclSequence: zclFrame.
|
|
2700
|
+
zclSequence: zclFrame.header.transactionSequenceNumber,
|
|
2709
2701
|
commandIdentifier: commandResponseId,
|
|
2710
2702
|
}, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT));
|
|
2711
2703
|
resolve(result);
|
|
@@ -2723,7 +2715,7 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2723
2715
|
endpoints_1.FIXED_ENDPOINTS.find((epi) => (epi.endpoint === sourceEndpoint)) : endpoints_1.FIXED_ENDPOINTS[0];
|
|
2724
2716
|
const apsFrame = {
|
|
2725
2717
|
profileId: sourceEndpointInfo.profileId,
|
|
2726
|
-
clusterId: zclFrame.
|
|
2718
|
+
clusterId: zclFrame.cluster.ID,
|
|
2727
2719
|
sourceEndpoint: sourceEndpointInfo.endpoint,
|
|
2728
2720
|
destinationEndpoint: endpoints_1.FIXED_ENDPOINTS[0].endpoint,
|
|
2729
2721
|
options: DEFAULT_APS_OPTIONS,
|
|
@@ -2740,7 +2732,7 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2740
2732
|
return enums_2.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
|
|
2741
2733
|
}
|
|
2742
2734
|
}
|
|
2743
|
-
logger_1.logger.debug(`~~~> [ZCL GROUP apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.
|
|
2735
|
+
logger_1.logger.debug(`~~~> [ZCL GROUP apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
|
|
2744
2736
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
2745
2737
|
const [status, messageTag] = (await this.ezsp.send(enums_2.EmberOutgoingMessageType.MULTICAST, apsFrame.groupId, // not used for MC
|
|
2746
2738
|
apsFrame, data, 0, // alias
|
|
@@ -2761,7 +2753,7 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2761
2753
|
endpoints_1.FIXED_ENDPOINTS.find((epi) => (epi.endpoint === sourceEndpoint)) : endpoints_1.FIXED_ENDPOINTS[0];
|
|
2762
2754
|
const apsFrame = {
|
|
2763
2755
|
profileId: sourceEndpointInfo.profileId,
|
|
2764
|
-
clusterId: zclFrame.
|
|
2756
|
+
clusterId: zclFrame.cluster.ID,
|
|
2765
2757
|
sourceEndpoint: sourceEndpointInfo.endpoint,
|
|
2766
2758
|
destinationEndpoint: (typeof endpoint === 'number') ? endpoint : endpoints_1.FIXED_ENDPOINTS[0].endpoint,
|
|
2767
2759
|
options: DEFAULT_APS_OPTIONS,
|
|
@@ -2778,7 +2770,7 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2778
2770
|
return enums_2.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
|
|
2779
2771
|
}
|
|
2780
2772
|
}
|
|
2781
|
-
logger_1.logger.debug(`~~~> [ZCL BROADCAST apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.
|
|
2773
|
+
logger_1.logger.debug(`~~~> [ZCL BROADCAST apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
|
|
2782
2774
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
2783
2775
|
const [status, messageTag] = (await this.ezsp.send(enums_2.EmberOutgoingMessageType.BROADCAST, consts_2.EMBER_RX_ON_WHEN_IDLE_BROADCAST_ADDRESS, apsFrame, data, 0, // alias
|
|
2784
2776
|
0));
|
|
@@ -2831,9 +2823,9 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2831
2823
|
msgBuffalo.writeIeeeAddr(sourceEui64); // sourceAddress
|
|
2832
2824
|
msgBuffalo.writeUInt16(consts_2.STUB_NWK_FRAME_CONTROL); // nwkFrameControl
|
|
2833
2825
|
msgBuffalo.writeUInt8((enums_2.EmberInterpanMessageType.UNICAST | consts_2.INTERPAN_APS_FRAME_TYPE)); // apsFrameControl
|
|
2834
|
-
msgBuffalo.writeUInt16(zclFrame.
|
|
2826
|
+
msgBuffalo.writeUInt16(zclFrame.cluster.ID);
|
|
2835
2827
|
msgBuffalo.writeUInt16(consts_2.TOUCHLINK_PROFILE_ID);
|
|
2836
|
-
logger_1.logger.debug(`~~~> [ZCL TOUCHLINK to=${ieeeAddress} header=${JSON.stringify(zclFrame.
|
|
2828
|
+
logger_1.logger.debug(`~~~> [ZCL TOUCHLINK to=${ieeeAddress} header=${JSON.stringify(zclFrame.header)}]`, NS);
|
|
2837
2829
|
const status = (await this.ezsp.ezspSendRawMessage(Buffer.concat([msgBuffalo.getWritten(), zclFrame.toBuffer()])));
|
|
2838
2830
|
if (status !== enums_2.EmberStatus.SUCCESS) {
|
|
2839
2831
|
logger_1.logger.error(`~x~> [ZCL TOUCHLINK to=${ieeeAddress}] Failed to send with status=${enums_2.EmberStatus[status]}.`, NS);
|
|
@@ -2847,14 +2839,14 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2847
2839
|
}
|
|
2848
2840
|
// queued
|
|
2849
2841
|
async sendZclFrameInterPANBroadcast(zclFrame, timeout) {
|
|
2850
|
-
const command = zclFrame.
|
|
2842
|
+
const command = zclFrame.command;
|
|
2851
2843
|
if (!command.hasOwnProperty('response')) {
|
|
2852
2844
|
throw new Error(`Command '${command.name}' has no response, cannot wait for response.`);
|
|
2853
2845
|
}
|
|
2854
2846
|
// just for waitress
|
|
2855
2847
|
const apsFrame = {
|
|
2856
2848
|
profileId: consts_2.TOUCHLINK_PROFILE_ID,
|
|
2857
|
-
clusterId: zclFrame.
|
|
2849
|
+
clusterId: zclFrame.cluster.ID,
|
|
2858
2850
|
sourceEndpoint: 0,
|
|
2859
2851
|
destinationEndpoint: 0,
|
|
2860
2852
|
options: enums_2.EmberApsOption.NONE,
|
|
@@ -2878,7 +2870,7 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2878
2870
|
msgBuffalo.writeUInt16(apsFrame.clusterId);
|
|
2879
2871
|
msgBuffalo.writeUInt16(apsFrame.profileId);
|
|
2880
2872
|
const data = Buffer.concat([msgBuffalo.getWritten(), zclFrame.toBuffer()]);
|
|
2881
|
-
logger_1.logger.debug(`~~~> [ZCL TOUCHLINK BROADCAST header=${JSON.stringify(zclFrame.
|
|
2873
|
+
logger_1.logger.debug(`~~~> [ZCL TOUCHLINK BROADCAST header=${JSON.stringify(zclFrame.header)}]`, NS);
|
|
2882
2874
|
const status = (await this.ezsp.ezspSendRawMessage(data));
|
|
2883
2875
|
if (status !== enums_2.EmberStatus.SUCCESS) {
|
|
2884
2876
|
logger_1.logger.error(`~x~> [ZCL TOUCHLINK BROADCAST] Failed to send with status=${enums_2.EmberStatus[status]}.`, NS);
|
|
@@ -2888,7 +2880,7 @@ class EmberAdapter extends __1.Adapter {
|
|
|
2888
2880
|
const result = (await this.oneWaitress.startWaitingFor({
|
|
2889
2881
|
target: null,
|
|
2890
2882
|
apsFrame: apsFrame,
|
|
2891
|
-
zclSequence: zclFrame.
|
|
2883
|
+
zclSequence: zclFrame.header.transactionSequenceNumber,
|
|
2892
2884
|
commandIdentifier: command.response,
|
|
2893
2885
|
}, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT * 2)); // XXX: touchlink timeout?
|
|
2894
2886
|
resolve(result);
|