zigbee-herdsman 0.49.2 → 0.50.0

package/dist/adapter/ember/adapter/emberAdapter.js

@@ -36,13 +36,15 @@ const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
 const utils_1 = require("../../../utils");
 const __1 = require("../..");
 const Zcl = __importStar(require("../../../zspec/zcl"));
+const enums_1 = require("../../../zspec/enums");
+const ZSpec = __importStar(require("../../../zspec/consts"));
 const events_1 = require("../../events");
 const math_1 = require("../utils/math");
 const ezsp_1 = require("../ezsp/ezsp");
 const consts_1 = require("../ezsp/consts");
-const enums_1 = require("../ezsp/enums");
+const enums_2 = require("../ezsp/enums");
 const buffalo_1 = require("../ezsp/buffalo");
-const enums_2 = require("../enums");
+const enums_3 = require("../enums");
 const zdo_1 = require("../zdo");
 const consts_2 = require("../consts");
 const requestQueue_1 = require("./requestQueue");
@@ -143,7 +145,7 @@ const DEFAULT_STACK_CONFIG = {
  *
  * Removing `ENABLE_ROUTE_DISCOVERY` leads to devices that won't reconnect/go offline, and various other issues. Keeping it for now.
  */
-const DEFAULT_APS_OPTIONS = (enums_2.EmberApsOption.RETRY | enums_2.EmberApsOption.ENABLE_ROUTE_DISCOVERY | enums_2.EmberApsOption.ENABLE_ADDRESS_DISCOVERY);
+const DEFAULT_APS_OPTIONS = (enums_3.EmberApsOption.RETRY | enums_3.EmberApsOption.ENABLE_ROUTE_DISCOVERY | enums_3.EmberApsOption.ENABLE_ADDRESS_DISCOVERY);
 /**
  * Enabling this allows to immediately reject requests that won't be able to get to their destination.
  * However, it causes more NCP calls, notably to get the source route overhead.
@@ -196,6 +198,7 @@ class EmberAdapter extends __1.Adapter {
      * NOTE: Do not use directly, use getter functions for it that check if valid or need retrieval from NCP.
      */
     networkCache;
+    multicastTable;
     constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
         super(networkOptions, serialPortOptions, backupPath, adapterOptions);
         this.stackConfig = this.loadStackConfig();
@@ -206,7 +209,7 @@ class EmberAdapter extends __1.Adapter {
         this.zdoRequestBuffalo = new buffalo_1.EzspBuffalo(Buffer.alloc(consts_1.EZSP_MAX_FRAME_LENGTH));
         this.ezsp = new ezsp_1.Ezsp(delay, serialPortOptions);
         this.ezsp.on(ezsp_1.EzspEvents.STACK_STATUS, this.onStackStatus.bind(this));
-        this.ezsp.on(ezsp_1.EzspEvents.MESSAGE_SENT_DELIVERY_FAILED, this.onMessageSentDeliveryFailed.bind(this));
+        this.ezsp.on(ezsp_1.EzspEvents.MESSAGE_SENT, this.onMessageSent.bind(this));
         this.ezsp.on(ezsp_1.EzspEvents.ZDO_RESPONSE, this.onZDOResponse.bind(this));
         this.ezsp.on(ezsp_1.EzspEvents.END_DEVICE_ANNOUNCE, this.onEndDeviceAnnounce.bind(this));
         this.ezsp.on(ezsp_1.EzspEvents.INCOMING_MESSAGE, this.onIncomingMessage.bind(this));
@@ -318,27 +321,27 @@ class EmberAdapter extends __1.Adapter {
         // to be extra careful, should clear network cache upon receiving this.
         this.clearNetworkCache();
         switch (status) {
-            case enums_2.EmberStatus.NETWORK_UP: {
+            case enums_3.EmberStatus.NETWORK_UP: {
                 this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_UP);
                 logger_1.logger.info(`[STACK STATUS] Network up.`, NS);
                 break;
             }
-            case enums_2.EmberStatus.NETWORK_DOWN: {
+            case enums_3.EmberStatus.NETWORK_DOWN: {
                 this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_DOWN);
                 logger_1.logger.info(`[STACK STATUS] Network down.`, NS);
                 break;
             }
-            case enums_2.EmberStatus.NETWORK_OPENED: {
+            case enums_3.EmberStatus.NETWORK_OPENED: {
                 this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_OPENED);
                 logger_1.logger.info(`[STACK STATUS] Network opened.`, NS);
                 break;
             }
-            case enums_2.EmberStatus.NETWORK_CLOSED: {
+            case enums_3.EmberStatus.NETWORK_CLOSED: {
                 this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_CLOSED);
                 logger_1.logger.info(`[STACK STATUS] Network closed.`, NS);
                 break;
             }
-            case enums_2.EmberStatus.CHANNEL_CHANGED: {
+            case enums_3.EmberStatus.CHANNEL_CHANGED: {
                 this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_CHANNEL_CHANGED);
                 // invalidate cache
                 this.networkCache.parameters.radioChannel = consts_2.INVALID_RADIO_CHANNEL;
@@ -346,7 +349,7 @@ class EmberAdapter extends __1.Adapter {
                 break;
             }
             default: {
-                logger_1.logger.debug(`[STACK STATUS] ${enums_2.EmberStatus[status]}.`, NS);
+                logger_1.logger.debug(`[STACK STATUS] ${enums_3.EmberStatus[status]}.`, NS);
                 break;
             }
         }
@@ -359,24 +362,59 @@ class EmberAdapter extends __1.Adapter {
      * @param indexOrDestination
      * @param apsFrame
      * @param messageTag
+     * @param status
      */
-    async onMessageSentDeliveryFailed(type, indexOrDestination, apsFrame, messageTag) {
-        switch (type) {
-            case enums_2.EmberOutgoingMessageType.BROADCAST:
-            case enums_2.EmberOutgoingMessageType.BROADCAST_WITH_ALIAS:
-            case enums_2.EmberOutgoingMessageType.MULTICAST:
-            case enums_2.EmberOutgoingMessageType.MULTICAST_WITH_ALIAS: {
-                // BC/MC not checking for message sent, avoid unnecessary waitress lookups
-                logger_1.logger.error(`Delivery of ${enums_2.EmberOutgoingMessageType[type]} failed for "${indexOrDestination}" `
-                    + `[apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
-                break;
+    async onMessageSent(type, indexOrDestination, apsFrame, messageTag, status) {
+        if (status === enums_3.EmberStatus.DELIVERY_FAILED) {
+            // no ACK was received from the destination
+            switch (type) {
+                case enums_3.EmberOutgoingMessageType.BROADCAST:
+                case enums_3.EmberOutgoingMessageType.BROADCAST_WITH_ALIAS:
+                case enums_3.EmberOutgoingMessageType.MULTICAST:
+                case enums_3.EmberOutgoingMessageType.MULTICAST_WITH_ALIAS: {
+                    // BC/MC not checking for message sent, avoid unnecessary waitress lookups
+                    logger_1.logger.error(`Delivery of ${enums_3.EmberOutgoingMessageType[type]} failed for "${indexOrDestination}" `
+                        + `[apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
+                    break;
+                }
+                default: {
+                    // reject any waitress early (don't wait for timeout if we know we're gonna get there eventually)
+                    this.oneWaitress.deliveryFailedFor(indexOrDestination, apsFrame);
+                    break;
+                }
             }
-            default: {
-                // reject any waitress early (don't wait for timeout if we know we're gonna get there eventually)
-                this.oneWaitress.deliveryFailedFor(indexOrDestination, apsFrame);
-                break;
+        }
+        else if (status === enums_3.EmberStatus.SUCCESS) {
+            if (type === enums_3.EmberOutgoingMessageType.MULTICAST && apsFrame.destinationEndpoint === 0xFF &&
+                apsFrame.groupId < consts_2.EMBER_MIN_BROADCAST_ADDRESS && !this.multicastTable.includes(apsFrame.groupId)) {
+                // workaround for devices using multicast for state update (coordinator passthrough)
+                const tableIdx = this.multicastTable.length;
+                const multicastEntry = {
+                    multicastId: apsFrame.groupId,
+                    endpoint: endpoints_1.FIXED_ENDPOINTS[0].endpoint,
+                    networkIndex: endpoints_1.FIXED_ENDPOINTS[0].networkIndex,
+                };
+                // set immediately to avoid potential race
+                this.multicastTable.push(multicastEntry.multicastId);
+                await new Promise((resolve, reject) => {
+                    this.requestQueue.enqueue(async () => {
+                        const status = (await this.ezsp.ezspSetMulticastTableEntry(tableIdx, multicastEntry));
+                        if (status !== enums_3.EmberStatus.SUCCESS) {
+                            logger_1.logger.error(`Failed to register group "${multicastEntry.multicastId}" in multicast table with status=${enums_3.EmberStatus[status]}.`, NS);
+                            return status;
+                        }
+                        logger_1.logger.debug(`Registered multicast table entry (${tableIdx}): ${JSON.stringify(multicastEntry)}.`, NS);
+                        resolve();
+                        return enums_3.EmberStatus.SUCCESS;
+                    }, (reason) => {
+                        // remove to allow retry on next occurrence
+                        this.multicastTable.splice(tableIdx, 1);
+                        reject(reason);
+                    }, true);
+                });
             }
         }
+        // shouldn't be any other status
     }
     /**
      * Emitted from @see Ezsp.ezspIncomingMessageHandler
@@ -420,7 +458,7 @@ class EmberAdapter extends __1.Adapter {
             endpoint: apsFrame.sourceEndpoint,
             linkquality: lastHopLqi,
             groupID: apsFrame.groupId,
-            wasBroadcast: ((type === enums_2.EmberIncomingMessageType.BROADCAST) || (type === enums_2.EmberIncomingMessageType.BROADCAST_LOOPBACK)),
+            wasBroadcast: ((type === enums_3.EmberIncomingMessageType.BROADCAST) || (type === enums_3.EmberIncomingMessageType.BROADCAST_LOOPBACK)),
             destinationEndpoint: apsFrame.destinationEndpoint,
         };
         this.oneWaitress.resolveZCL(payload);
@@ -480,11 +518,11 @@ class EmberAdapter extends __1.Adapter {
                 data,
                 clusterID: Zcl.Clusters.greenPower.ID,
                 address: sourceId,
-                endpoint: consts_2.GP_ENDPOINT,
+                endpoint: ZSpec.GP_ENDPOINT,
                 linkquality: gpdLink,
                 groupID: this.greenPowerGroup,
                 wasBroadcast: true,
-                destinationEndpoint: consts_2.GP_ENDPOINT,
+                destinationEndpoint: ZSpec.GP_ENDPOINT,
             };
             this.oneWaitress.resolveZCL(payload);
             this.emit(events_1.Events.zclPayload, payload);
@@ -505,7 +543,7 @@ class EmberAdapter extends __1.Adapter {
      * @param parentOfNewNodeId
      */
     async onTrustCenterJoin(newNodeId, newNodeEui64, status, policyDecision, parentOfNewNodeId) {
-        if (status === enums_2.EmberDeviceUpdate.DEVICE_LEFT) {
+        if (status === enums_3.EmberDeviceUpdate.DEVICE_LEFT) {
             const payload = {
                 networkAddress: newNodeId,
                 ieeeAddr: newNodeEui64,
@@ -513,7 +551,7 @@ class EmberAdapter extends __1.Adapter {
             this.emit(events_1.Events.deviceLeave, payload);
         }
         else {
-            if (policyDecision !== enums_2.EmberJoinDecision.DENY_JOIN) {
+            if (policyDecision !== enums_3.EmberJoinDecision.DENY_JOIN) {
                 const payload = {
                     networkAddress: newNodeId,
                     ieeeAddr: newNodeEui64,
@@ -528,7 +566,7 @@ class EmberAdapter extends __1.Adapter {
                             this.manufacturerCode = joinManufCode;
                             this.emit(events_1.Events.deviceJoined, payload);
                             resolve();
-                            return enums_2.EmberStatus.SUCCESS;
+                            return enums_3.EmberStatus.SUCCESS;
                         }, reject, true);
                     });
                 }
@@ -550,12 +588,12 @@ class EmberAdapter extends __1.Adapter {
                 const ashCounters = this.ezsp.ash.readAndClearCounters();
                 logger_1.logger.info(`[ASH COUNTERS] ${ashCounters.join(',')}`, NS);
                 resolve();
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
     initVariables() {
-        this.ezsp.removeAllListeners(ezsp_1.EzspEvents.ncpNeedsResetAndInit);
+        this.ezsp.removeAllListeners(ezsp_1.EzspEvents.NCP_NEEDS_RESET_AND_INIT);
         clearInterval(this.watchdogCountersHandle);
         this.zdoRequestBuffalo.setPosition(0);
         this.zdoRequestSequence = 0; // start at 1
@@ -563,7 +601,8 @@ class EmberAdapter extends __1.Adapter {
         this.interpanLock = false;
         this.networkCache = (0, initters_1.initNetworkCache)();
         this.manufacturerCode = DEFAULT_MANUFACTURER_CODE; // will be set in NCP in initEzsp
-        this.ezsp.once(ezsp_1.EzspEvents.ncpNeedsResetAndInit, this.onNcpNeedsResetAndInit.bind(this));
+        this.multicastTable = [];
+        this.ezsp.once(ezsp_1.EzspEvents.NCP_NEEDS_RESET_AND_INIT, this.onNcpNeedsResetAndInit.bind(this));
     }
     /**
      * Proceed to execute the long list of commands required to setup comms between Host<>NCP.
@@ -573,8 +612,8 @@ class EmberAdapter extends __1.Adapter {
         let result = "resumed";
         // NOTE: something deep in this call can throw too
         const startResult = (await this.ezsp.start());
-        if (startResult !== enums_2.EzspStatus.SUCCESS) {
-            throw new Error(`Failed to start EZSP layer with status=${enums_2.EzspStatus[startResult]}.`);
+        if (startResult !== enums_3.EzspStatus.SUCCESS) {
+            throw new Error(`Failed to start EZSP layer with status=${enums_3.EzspStatus[startResult]}.`);
         }
         // call before any other command, else fails
         await this.emberVersion();
@@ -590,8 +629,8 @@ class EmberAdapter extends __1.Adapter {
         // await (this.emberStartEnergyScan());// TODO: via config of some kind, better off waiting for UI supports though
         // populate network cache info
         const [status, , parameters] = (await this.ezsp.ezspGetNetworkParameters());
-        if (status !== enums_2.EmberStatus.SUCCESS) {
-            throw new Error(`Failed to get network parameters with status=${enums_2.EmberStatus[status]}.`);
+        if (status !== enums_3.EmberStatus.SUCCESS) {
+            throw new Error(`Failed to get network parameters with status=${enums_3.EmberStatus[status]}.`);
         }
         this.networkCache.parameters = parameters;
         this.networkCache.status = (await this.ezsp.ezspNetworkState());
@@ -607,28 +646,28 @@ class EmberAdapter extends __1.Adapter {
      */
     async initNCPPreConfiguration() {
         // this can only decrease, not increase, NCP-side value
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.ADDRESS_TABLE_SIZE, this.stackConfig.ADDRESS_TABLE_SIZE);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.TRUST_CENTER_ADDRESS_CACHE_SIZE, this.stackConfig.TRUST_CENTER_ADDRESS_CACHE_SIZE);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.ADDRESS_TABLE_SIZE, this.stackConfig.ADDRESS_TABLE_SIZE);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.TRUST_CENTER_ADDRESS_CACHE_SIZE, this.stackConfig.TRUST_CENTER_ADDRESS_CACHE_SIZE);
         // BUG 14222: If stack profile is 2 (ZigBee Pro), we need to enforce
         // the standard stack configuration values for that feature set.
         /** MAC indirect timeout should be 7.68 secs */
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.INDIRECT_TRANSMISSION_TIMEOUT, 7680);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.INDIRECT_TRANSMISSION_TIMEOUT, 7680);
         /** Max hops should be 2 * nwkMaxDepth, where nwkMaxDepth is 15 */
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.MAX_HOPS, 30);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.TX_POWER_MODE, enums_2.EmberTXPowerMode.USE_TOKEN);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.SUPPORTED_NETWORKS, 1);
-        await this.emberSetEzspValue(enums_1.EzspValueId.END_DEVICE_KEEP_ALIVE_SUPPORT_MODE, 1, [enums_2.EmberKeepAliveMode.KEEP_ALIVE_SUPPORT_ALL]);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.MAX_HOPS, 30);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.TX_POWER_MODE, enums_3.EmberTXPowerMode.USE_TOKEN);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.SUPPORTED_NETWORKS, 1);
+        await this.emberSetEzspValue(enums_2.EzspValueId.END_DEVICE_KEEP_ALIVE_SUPPORT_MODE, 1, [enums_3.EmberKeepAliveMode.KEEP_ALIVE_SUPPORT_ALL]);
         // allow other devices to modify the binding table
-        await this.emberSetEzspPolicy(enums_1.EzspPolicyId.BINDING_MODIFICATION_POLICY, enums_1.EzspDecisionId.CHECK_BINDING_MODIFICATIONS_ARE_VALID_ENDPOINT_CLUSTERS);
+        await this.emberSetEzspPolicy(enums_2.EzspPolicyId.BINDING_MODIFICATION_POLICY, enums_2.EzspDecisionId.CHECK_BINDING_MODIFICATIONS_ARE_VALID_ENDPOINT_CLUSTERS);
         // return message tag and message contents in ezspMessageSentHandler()
-        await this.emberSetEzspPolicy(enums_1.EzspPolicyId.MESSAGE_CONTENTS_IN_CALLBACK_POLICY, enums_1.EzspDecisionId.MESSAGE_TAG_AND_CONTENTS_IN_CALLBACK);
-        await this.emberSetEzspValue(enums_1.EzspValueId.MAXIMUM_INCOMING_TRANSFER_SIZE, 2, (0, math_1.lowHighBytes)(consts_2.MAXIMUM_APS_PAYLOAD_LENGTH));
-        await this.emberSetEzspValue(enums_1.EzspValueId.MAXIMUM_OUTGOING_TRANSFER_SIZE, 2, (0, math_1.lowHighBytes)(consts_2.MAXIMUM_APS_PAYLOAD_LENGTH));
-        await this.emberSetEzspValue(enums_1.EzspValueId.TRANSIENT_DEVICE_TIMEOUT, 2, (0, math_1.lowHighBytes)(this.stackConfig.TRANSIENT_DEVICE_TIMEOUT));
+        await this.emberSetEzspPolicy(enums_2.EzspPolicyId.MESSAGE_CONTENTS_IN_CALLBACK_POLICY, enums_2.EzspDecisionId.MESSAGE_TAG_AND_CONTENTS_IN_CALLBACK);
+        await this.emberSetEzspValue(enums_2.EzspValueId.MAXIMUM_INCOMING_TRANSFER_SIZE, 2, (0, math_1.lowHighBytes)(consts_2.MAXIMUM_APS_PAYLOAD_LENGTH));
+        await this.emberSetEzspValue(enums_2.EzspValueId.MAXIMUM_OUTGOING_TRANSFER_SIZE, 2, (0, math_1.lowHighBytes)(consts_2.MAXIMUM_APS_PAYLOAD_LENGTH));
+        await this.emberSetEzspValue(enums_2.EzspValueId.TRANSIENT_DEVICE_TIMEOUT, 2, (0, math_1.lowHighBytes)(this.stackConfig.TRANSIENT_DEVICE_TIMEOUT));
         await this.ezsp.ezspSetManufacturerCode(this.manufacturerCode);
         // network security init
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.STACK_PROFILE, consts_2.STACK_PROFILE_ZIGBEE_PRO);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.SECURITY_LEVEL, consts_2.SECURITY_LEVEL_Z3);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.STACK_PROFILE, consts_2.STACK_PROFILE_ZIGBEE_PRO);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.SECURITY_LEVEL, consts_2.SECURITY_LEVEL_Z3);
     }
     /**
      * NCP Address table init.
@@ -637,29 +676,29 @@ class EmberAdapter extends __1.Adapter {
     async initNCPAddressTable() {
         const desiredTableSize = this.stackConfig.ADDRESS_TABLE_SIZE;
         // If the host and the ncp disagree on the address table size, explode.
-        const [status, addressTableSize] = (await this.ezsp.ezspGetConfigurationValue(enums_1.EzspConfigId.ADDRESS_TABLE_SIZE));
+        const [status, addressTableSize] = (await this.ezsp.ezspGetConfigurationValue(enums_2.EzspConfigId.ADDRESS_TABLE_SIZE));
         // After the change of ncp memory model in UC, we can not increase the default NCP table sizes anymore.
         // Therefore, checking for desiredTableSize == (ncp)addressTableSize might not be always true anymore
         // assert(desiredTableSize <= addressTableSize);
-        if ((status !== enums_2.EzspStatus.SUCCESS) || (addressTableSize > desiredTableSize)) {
-            throw new Error(`[INIT] NCP (${addressTableSize}) disagrees with Host (min ${desiredTableSize}) on table size. status=${enums_2.EzspStatus[status]}`);
+        if ((status !== enums_3.EzspStatus.SUCCESS) || (addressTableSize > desiredTableSize)) {
+            throw new Error(`[INIT] NCP (${addressTableSize}) disagrees with Host (min ${desiredTableSize}) on table size. status=${enums_3.EzspStatus[status]}`);
         }
     }
     /**
      * NCP configuration init
      */
     async initNCPConfiguration() {
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.BINDING_TABLE_SIZE, this.stackConfig.BINDING_TABLE_SIZE);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.KEY_TABLE_SIZE, this.stackConfig.KEY_TABLE_SIZE);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.MAX_END_DEVICE_CHILDREN, this.stackConfig.MAX_END_DEVICE_CHILDREN);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.APS_UNICAST_MESSAGE_COUNT, this.stackConfig.APS_UNICAST_MESSAGE_COUNT);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.BROADCAST_TABLE_SIZE, this.stackConfig.BROADCAST_TABLE_SIZE);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.NEIGHBOR_TABLE_SIZE, this.stackConfig.NEIGHBOR_TABLE_SIZE);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.END_DEVICE_POLL_TIMEOUT, this.stackConfig.END_DEVICE_POLL_TIMEOUT);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.TRANSIENT_KEY_TIMEOUT_S, this.stackConfig.TRANSIENT_KEY_TIMEOUT_S);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.RETRY_QUEUE_SIZE, this.stackConfig.RETRY_QUEUE_SIZE);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.SOURCE_ROUTE_TABLE_SIZE, this.stackConfig.SOURCE_ROUTE_TABLE_SIZE);
-        await this.emberSetEzspConfigValue(enums_1.EzspConfigId.MULTICAST_TABLE_SIZE, this.stackConfig.MULTICAST_TABLE_SIZE);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.BINDING_TABLE_SIZE, this.stackConfig.BINDING_TABLE_SIZE);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.KEY_TABLE_SIZE, this.stackConfig.KEY_TABLE_SIZE);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.MAX_END_DEVICE_CHILDREN, this.stackConfig.MAX_END_DEVICE_CHILDREN);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.APS_UNICAST_MESSAGE_COUNT, this.stackConfig.APS_UNICAST_MESSAGE_COUNT);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.BROADCAST_TABLE_SIZE, this.stackConfig.BROADCAST_TABLE_SIZE);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.NEIGHBOR_TABLE_SIZE, this.stackConfig.NEIGHBOR_TABLE_SIZE);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.END_DEVICE_POLL_TIMEOUT, this.stackConfig.END_DEVICE_POLL_TIMEOUT);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.TRANSIENT_KEY_TIMEOUT_S, this.stackConfig.TRANSIENT_KEY_TIMEOUT_S);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.RETRY_QUEUE_SIZE, this.stackConfig.RETRY_QUEUE_SIZE);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.SOURCE_ROUTE_TABLE_SIZE, this.stackConfig.SOURCE_ROUTE_TABLE_SIZE);
+        await this.emberSetEzspConfigValue(enums_2.EzspConfigId.MULTICAST_TABLE_SIZE, this.stackConfig.MULTICAST_TABLE_SIZE);
     }
     /**
      * NCP concentrator init. Also enables source route discovery mode with RESCHEDULE.
@@ -677,17 +716,16 @@ class EmberAdapter extends __1.Adapter {
      */
     async initNCPConcentrator() {
         const status = (await this.ezsp.ezspSetConcentrator(true, (this.stackConfig.CONCENTRATOR_RAM_TYPE === 'low') ? consts_2.EMBER_LOW_RAM_CONCENTRATOR : consts_2.EMBER_HIGH_RAM_CONCENTRATOR, this.stackConfig.CONCENTRATOR_MIN_TIME, this.stackConfig.CONCENTRATOR_MAX_TIME, this.stackConfig.CONCENTRATOR_ROUTE_ERROR_THRESHOLD, this.stackConfig.CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD, this.stackConfig.CONCENTRATOR_MAX_HOPS));
-        if (status !== enums_2.EmberStatus.SUCCESS) {
+        if (status !== enums_3.EmberStatus.SUCCESS) {
             throw new Error(`[CONCENTRATOR] Failed to set concentrator with status=${status}.`);
         }
-        const remainTilMTORR = (await this.ezsp.ezspSetSourceRouteDiscoveryMode(enums_2.EmberSourceRouteDiscoveryMode.RESCHEDULE));
+        const remainTilMTORR = (await this.ezsp.ezspSetSourceRouteDiscoveryMode(enums_3.EmberSourceRouteDiscoveryMode.RESCHEDULE));
         logger_1.logger.info(`[CONCENTRATOR] Started source route discovery. ${remainTilMTORR}ms until next broadcast.`, NS);
     }
     /**
      * Register fixed endpoints and set any related multicast entries that need to be.
      */
     async registerFixedEndpoints() {
-        let mcTableIdx = 0;
         for (const ep of endpoints_1.FIXED_ENDPOINTS) {
             if (ep.networkIndex !== 0x00) {
                 logger_1.logger.debug(`Multi-network not currently supported. Skipping endpoint ${JSON.stringify(ep)}.`, NS);
@@ -695,16 +733,16 @@ class EmberAdapter extends __1.Adapter {
             }
             const [epStatus,] = (await this.ezsp.ezspGetEndpointFlags(ep.endpoint));
             // endpoint not already registered
-            if (epStatus !== enums_2.EzspStatus.SUCCESS) {
+            if (epStatus !== enums_3.EzspStatus.SUCCESS) {
                 // check to see if ezspAddEndpoint needs to be called
                 // if ezspInit is called without NCP reset, ezspAddEndpoint is not necessary and will return an error
                 const status = (await this.ezsp.ezspAddEndpoint(ep.endpoint, ep.profileId, ep.deviceId, ep.deviceVersion, ep.inClusterList.slice(), // copy
                 ep.outClusterList.slice()));
-                if (status === enums_2.EzspStatus.SUCCESS) {
-                    logger_1.logger.debug(`Registered endpoint "${ep.endpoint}" with status=${enums_2.EzspStatus[status]}.`, NS);
+                if (status === enums_3.EzspStatus.SUCCESS) {
+                    logger_1.logger.debug(`Registered endpoint "${ep.endpoint}" with status=${enums_3.EzspStatus[status]}.`, NS);
                 }
                 else {
-                    throw new Error(`Failed to register endpoint "${ep.endpoint}" with status=${enums_2.EzspStatus[status]}.`);
+                    throw new Error(`Failed to register endpoint "${ep.endpoint}" with status=${enums_3.EzspStatus[status]}.`);
                 }
             }
             else {
@@ -716,11 +754,12 @@ class EmberAdapter extends __1.Adapter {
                     endpoint: ep.endpoint,
                     networkIndex: ep.networkIndex,
                 };
-                const status = (await this.ezsp.ezspSetMulticastTableEntry(mcTableIdx++, multicastEntry));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    throw new Error(`Failed to register group "${multicastId}" in multicast table with status=${enums_2.EmberStatus[status]}.`);
+                const status = (await this.ezsp.ezspSetMulticastTableEntry(this.multicastTable.length, multicastEntry));
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    throw new Error(`Failed to register group "${multicastId}" in multicast table with status=${enums_3.EmberStatus[status]}.`);
                 }
-                logger_1.logger.debug(`Registered multicast table entry: ${JSON.stringify(multicastEntry)}.`, NS);
+                logger_1.logger.debug(`Registered multicast table entry (${this.multicastTable.length}): ${JSON.stringify(multicastEntry)}.`, NS);
+                this.multicastTable.push(multicastEntry.multicastId);
             }
         }
     }
@@ -731,47 +770,47 @@ class EmberAdapter extends __1.Adapter {
     async initTrustCenter() {
         // init TC policies
         {
-            let status = (await this.emberSetEzspPolicy(enums_1.EzspPolicyId.TC_KEY_REQUEST_POLICY, enums_1.EzspDecisionId.ALLOW_TC_KEY_REQUESTS_AND_SEND_CURRENT_KEY));
-            if (status !== enums_2.EzspStatus.SUCCESS) {
+            let status = (await this.emberSetEzspPolicy(enums_2.EzspPolicyId.TC_KEY_REQUEST_POLICY, enums_2.EzspDecisionId.ALLOW_TC_KEY_REQUESTS_AND_SEND_CURRENT_KEY));
+            if (status !== enums_3.EzspStatus.SUCCESS) {
                 throw new Error(`[INIT TC] Failed to set EzspPolicyId TC_KEY_REQUEST_POLICY to ALLOW_TC_KEY_REQUESTS_AND_SEND_CURRENT_KEY `
-                    + `with status=${enums_2.EzspStatus[status]}.`);
+                    + `with status=${enums_3.EzspStatus[status]}.`);
             }
-            const appKeyPolicy = this.stackConfig.KEY_TABLE_SIZE ? enums_1.EzspDecisionId.ALLOW_APP_KEY_REQUESTS : enums_1.EzspDecisionId.DENY_APP_KEY_REQUESTS;
-            status = (await this.emberSetEzspPolicy(enums_1.EzspPolicyId.APP_KEY_REQUEST_POLICY, appKeyPolicy));
-            if (status !== enums_2.EzspStatus.SUCCESS) {
-                throw new Error(`[INIT TC] Failed to set EzspPolicyId APP_KEY_REQUEST_POLICY to ${enums_1.EzspDecisionId[appKeyPolicy]} `
-                    + `with status=${enums_2.EzspStatus[status]}.`);
+            const appKeyPolicy = this.stackConfig.KEY_TABLE_SIZE ? enums_2.EzspDecisionId.ALLOW_APP_KEY_REQUESTS : enums_2.EzspDecisionId.DENY_APP_KEY_REQUESTS;
+            status = (await this.emberSetEzspPolicy(enums_2.EzspPolicyId.APP_KEY_REQUEST_POLICY, appKeyPolicy));
+            if (status !== enums_3.EzspStatus.SUCCESS) {
+                throw new Error(`[INIT TC] Failed to set EzspPolicyId APP_KEY_REQUEST_POLICY to ${enums_2.EzspDecisionId[appKeyPolicy]} `
+                    + `with status=${enums_3.EzspStatus[status]}.`);
             }
-            status = (await this.emberSetJoinPolicy(enums_2.EmberJoinDecision.USE_PRECONFIGURED_KEY));
-            if (status !== enums_2.EzspStatus.SUCCESS) {
-                throw new Error(`[INIT TC] Failed to set join policy to USE_PRECONFIGURED_KEY with status=${enums_2.EzspStatus[status]}.`);
+            status = (await this.emberSetJoinPolicy(enums_3.EmberJoinDecision.USE_PRECONFIGURED_KEY));
+            if (status !== enums_3.EzspStatus.SUCCESS) {
+                throw new Error(`[INIT TC] Failed to set join policy to USE_PRECONFIGURED_KEY with status=${enums_3.EzspStatus[status]}.`);
             }
         }
         const configNetworkKey = Buffer.from(this.networkOptions.networkKey);
         const networkInitStruct = {
-            bitmask: (enums_2.EmberNetworkInitBitmask.PARENT_INFO_IN_TOKEN | enums_2.EmberNetworkInitBitmask.END_DEVICE_REJOIN_ON_REBOOT)
+            bitmask: (enums_3.EmberNetworkInitBitmask.PARENT_INFO_IN_TOKEN | enums_3.EmberNetworkInitBitmask.END_DEVICE_REJOIN_ON_REBOOT)
         };
         const initStatus = (await this.ezsp.ezspNetworkInit(networkInitStruct));
-        logger_1.logger.debug(`[INIT TC] Network init status=${enums_2.EmberStatus[initStatus]}.`, NS);
-        if ((initStatus !== enums_2.EmberStatus.SUCCESS) && (initStatus !== enums_2.EmberStatus.NOT_JOINED)) {
-            throw new Error(`[INIT TC] Failed network init request with status=${enums_2.EmberStatus[initStatus]}.`);
+        logger_1.logger.debug(`[INIT TC] Network init status=${enums_3.EmberStatus[initStatus]}.`, NS);
+        if ((initStatus !== enums_3.EmberStatus.SUCCESS) && (initStatus !== enums_3.EmberStatus.NOT_JOINED)) {
+            throw new Error(`[INIT TC] Failed network init request with status=${enums_3.EmberStatus[initStatus]}.`);
         }
         let action = NetworkInitAction.DONE;
-        if (initStatus === enums_2.EmberStatus.SUCCESS) {
+        if (initStatus === enums_3.EmberStatus.SUCCESS) {
             // network
             await this.oneWaitress.startWaitingForEvent({ eventName: oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_UP }, DEFAULT_NETWORK_REQUEST_TIMEOUT, '[INIT TC] Network init');
             const [npStatus, nodeType, netParams] = (await this.ezsp.ezspGetNetworkParameters());
             logger_1.logger.debug(`[INIT TC] Current network config=${JSON.stringify(this.networkOptions)}`, NS);
-            logger_1.logger.debug(`[INIT TC] Current NCP network: nodeType=${enums_2.EmberNodeType[nodeType]} params=${JSON.stringify(netParams)}`, NS);
-            if ((npStatus === enums_2.EmberStatus.SUCCESS) && (nodeType === enums_2.EmberNodeType.COORDINATOR) && (this.networkOptions.panID === netParams.panId)
+            logger_1.logger.debug(`[INIT TC] Current NCP network: nodeType=${enums_3.EmberNodeType[nodeType]} params=${JSON.stringify(netParams)}`, NS);
+            if ((npStatus === enums_3.EmberStatus.SUCCESS) && (nodeType === enums_3.EmberNodeType.COORDINATOR) && (this.networkOptions.panID === netParams.panId)
                 && ((0, es6_1.default)(this.networkOptions.extendedPanID, netParams.extendedPanId))) {
                 // config matches adapter so far, no error, we can check the network key
                 const context = (0, initters_1.initSecurityManagerContext)();
-                context.coreKeyType = enums_2.SecManKeyType.NETWORK;
+                context.coreKeyType = enums_3.SecManKeyType.NETWORK;
                 context.keyIndex = 0;
                 const [networkKey, nkStatus] = (await this.ezsp.ezspExportKey(context));
-                if (nkStatus !== enums_2.SLStatus.OK) {
-                    throw new Error(`[BACKUP] Failed to export Network Key with status=${enums_2.SLStatus[nkStatus]}.`);
+                if (nkStatus !== enums_3.SLStatus.OK) {
+                    throw new Error(`[BACKUP] Failed to export Network Key with status=${enums_3.SLStatus[nkStatus]}.`);
                 }
                 logger_1.logger.debug(`[INIT TC] Current NCP network: networkKey=${networkKey.contents.toString('hex')}`, NS);
                 // config doesn't match adapter anymore
@@ -786,8 +825,8 @@ class EmberAdapter extends __1.Adapter {
             if (action === NetworkInitAction.LEAVE) {
                 logger_1.logger.info(`[INIT TC] NCP network does not match config. Leaving network...`, NS);
                 const leaveStatus = (await this.ezsp.ezspLeaveNetwork());
-                if (leaveStatus !== enums_2.EmberStatus.SUCCESS) {
-                    throw new Error(`[INIT TC] Failed leave network request with status=${enums_2.EmberStatus[leaveStatus]}.`);
+                if (leaveStatus !== enums_3.EmberStatus.SUCCESS) {
+                    throw new Error(`[INIT TC] Failed leave network request with status=${enums_3.EmberStatus[leaveStatus]}.`);
                 }
                 await this.oneWaitress.startWaitingForEvent({ eventName: oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_DOWN }, DEFAULT_NETWORK_REQUEST_TIMEOUT, '[INIT TC] Leave network');
                 await (0, utils_1.Wait)(200); // settle down
@@ -795,7 +834,7 @@ class EmberAdapter extends __1.Adapter {
             }
         }
         const backup = this.getStoredBackup();
-        if ((initStatus === enums_2.EmberStatus.NOT_JOINED) || (action === NetworkInitAction.LEFT)) {
+        if ((initStatus === enums_3.EmberStatus.NOT_JOINED) || (action === NetworkInitAction.LEFT)) {
             // no network
             if (backup != null) {
                 if ((this.networkOptions.panID === backup.networkOptions.panId)
@@ -877,30 +916,30 @@ class EmberAdapter extends __1.Adapter {
      */
     async formNetwork(fromBackup, networkKey, networkKeySequenceNumber, panId, extendedPanId, radioChannel, tcLinkKey) {
         const state = {
-            bitmask: (enums_2.EmberInitialSecurityBitmask.TRUST_CENTER_GLOBAL_LINK_KEY | enums_2.EmberInitialSecurityBitmask.HAVE_PRECONFIGURED_KEY
-                | enums_2.EmberInitialSecurityBitmask.HAVE_NETWORK_KEY | enums_2.EmberInitialSecurityBitmask.TRUST_CENTER_USES_HASHED_LINK_KEY
-                | enums_2.EmberInitialSecurityBitmask.REQUIRE_ENCRYPTED_KEY),
+            bitmask: (enums_3.EmberInitialSecurityBitmask.TRUST_CENTER_GLOBAL_LINK_KEY | enums_3.EmberInitialSecurityBitmask.HAVE_PRECONFIGURED_KEY
+                | enums_3.EmberInitialSecurityBitmask.HAVE_NETWORK_KEY | enums_3.EmberInitialSecurityBitmask.TRUST_CENTER_USES_HASHED_LINK_KEY
+                | enums_3.EmberInitialSecurityBitmask.REQUIRE_ENCRYPTED_KEY),
             preconfiguredKey: { contents: tcLinkKey },
             networkKey: { contents: networkKey },
             networkKeySequenceNumber: networkKeySequenceNumber,
-            preconfiguredTrustCenterEui64: consts_2.BLANK_EUI64,
+            preconfiguredTrustCenterEui64: ZSpec.BLANK_EUI64,
         };
         if (fromBackup) {
-            state.bitmask |= enums_2.EmberInitialSecurityBitmask.NO_FRAME_COUNTER_RESET;
+            state.bitmask |= enums_3.EmberInitialSecurityBitmask.NO_FRAME_COUNTER_RESET;
         }
         let emberStatus = (await this.ezsp.ezspSetInitialSecurityState(state));
-        if (emberStatus !== enums_2.EmberStatus.SUCCESS) {
-            throw new Error(`[INIT FORM] Failed to set initial security state with status=${enums_2.EmberStatus[emberStatus]}.`);
+        if (emberStatus !== enums_3.EmberStatus.SUCCESS) {
+            throw new Error(`[INIT FORM] Failed to set initial security state with status=${enums_3.EmberStatus[emberStatus]}.`);
         }
-        const extended = (enums_2.EmberExtendedSecurityBitmask.JOINER_GLOBAL_LINK_KEY | enums_2.EmberExtendedSecurityBitmask.NWK_LEAVE_REQUEST_NOT_ALLOWED);
+        const extended = (enums_3.EmberExtendedSecurityBitmask.JOINER_GLOBAL_LINK_KEY | enums_3.EmberExtendedSecurityBitmask.NWK_LEAVE_REQUEST_NOT_ALLOWED);
         const extSecStatus = (await this.ezsp.ezspSetExtendedSecurityBitmask(extended));
-        if (extSecStatus !== enums_2.EzspStatus.SUCCESS) {
-            throw new Error(`[INIT FORM] Failed to set extended security bitmask to ${extended} with status=${enums_2.EzspStatus[extSecStatus]}.`);
+        if (extSecStatus !== enums_3.EzspStatus.SUCCESS) {
+            throw new Error(`[INIT FORM] Failed to set extended security bitmask to ${extended} with status=${enums_3.EzspStatus[extSecStatus]}.`);
         }
         if (!fromBackup && this.stackConfig.KEY_TABLE_SIZE > 0) {
             emberStatus = await this.ezsp.ezspClearKeyTable();
-            if (emberStatus !== enums_2.EmberStatus.SUCCESS) {
-                throw new Error(`[INIT FORM] Failed to clear key table with status=${enums_2.EmberStatus[emberStatus]}.`);
+            if (emberStatus !== enums_3.EmberStatus.SUCCESS) {
+                throw new Error(`[INIT FORM] Failed to clear key table with status=${enums_3.EmberStatus[emberStatus]}.`);
             }
         }
         const netParams = {
@@ -908,19 +947,19 @@ class EmberAdapter extends __1.Adapter {
             extendedPanId,
             radioTxPower: 5,
             radioChannel,
-            joinMethod: enums_2.EmberJoinMethod.MAC_ASSOCIATION,
-            nwkManagerId: consts_2.ZIGBEE_COORDINATOR_ADDRESS,
+            joinMethod: enums_3.EmberJoinMethod.MAC_ASSOCIATION,
+            nwkManagerId: ZSpec.COORDINATOR_ADDRESS,
             nwkUpdateId: 0,
             channels: consts_2.EMBER_ALL_802_15_4_CHANNELS_MASK,
         };
         logger_1.logger.info(`[INIT FORM] Forming new network with: ${JSON.stringify(netParams)}`, NS);
         emberStatus = (await this.ezsp.ezspFormNetwork(netParams));
-        if (emberStatus !== enums_2.EmberStatus.SUCCESS) {
-            throw new Error(`[INIT FORM] Failed form network request with status=${enums_2.EmberStatus[emberStatus]}.`);
+        if (emberStatus !== enums_3.EmberStatus.SUCCESS) {
+            throw new Error(`[INIT FORM] Failed form network request with status=${enums_3.EmberStatus[emberStatus]}.`);
         }
         await this.oneWaitress.startWaitingForEvent({ eventName: oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_UP }, DEFAULT_NETWORK_REQUEST_TIMEOUT, '[INIT FORM] Form network');
         const stStatus = await this.ezsp.ezspStartWritingStackTokens();
-        logger_1.logger.debug(`[INIT FORM] Start writing stack tokens status=${enums_2.EzspStatus[stStatus]}.`, NS);
+        logger_1.logger.debug(`[INIT FORM] Start writing stack tokens status=${enums_3.EzspStatus[stStatus]}.`, NS);
         logger_1.logger.info(`[INIT FORM] New network formed!`, NS);
     }
     /**
@@ -945,7 +984,9 @@ class EmberAdapter extends __1.Adapter {
                 throw new Error(`[BACKUP] Current backup file is not for EmberZNet stack.`);
             }
             if (data.metadata.internal.ezspVersion < BACKUP_OLDEST_SUPPORTED_EZSP_VERSION) {
-                throw new Error(`[BACKUP] Current backup file is from an unsupported EZSP version (min: ${BACKUP_OLDEST_SUPPORTED_EZSP_VERSION}).`);
+                (0, fs_1.renameSync)(this.backupPath, `${this.backupPath}.old`);
+                logger_1.logger.warning(`[BACKUP] Current backup file is from an unsupported EZSP version. Renaming and ignoring.`, NS);
+                return null;
             }
             return utils_1.BackupUtils.fromUnifiedBackup(data);
         }
@@ -959,9 +1000,9 @@ class EmberAdapter extends __1.Adapter {
      * @return List of keys data with AES hashed keys
      */
     async exportLinkKeys() {
-        const [confStatus, keyTableSize] = (await this.ezsp.ezspGetConfigurationValue(enums_1.EzspConfigId.KEY_TABLE_SIZE));
-        if (confStatus !== enums_2.EzspStatus.SUCCESS) {
-            throw new Error(`[BACKUP] Failed to retrieve key table size from NCP with status=${enums_2.EzspStatus[confStatus]}.`);
+        const [confStatus, keyTableSize] = (await this.ezsp.ezspGetConfigurationValue(enums_2.EzspConfigId.KEY_TABLE_SIZE));
+        if (confStatus !== enums_3.EzspStatus.SUCCESS) {
+            throw new Error(`[BACKUP] Failed to retrieve key table size from NCP with status=${enums_3.EzspStatus[confStatus]}.`);
         }
         let deviceEui64;
         let plaintextKey;
@@ -970,14 +1011,14 @@ class EmberAdapter extends __1.Adapter {
         const keyList = [];
         for (let i = 0; i < keyTableSize; i++) {
             [deviceEui64, plaintextKey, apsKeyMeta, status] = (await this.ezsp.ezspExportLinkKeyByIndex(i));
-            logger_1.logger.debug(`[BACKUP] Export link key at index ${i}, status=${enums_2.SLStatus[status]}.`, NS);
+            logger_1.logger.debug(`[BACKUP] Export link key at index ${i}, status=${enums_3.SLStatus[status]}.`, NS);
             // only include key if we could retrieve one at index and hash it properly
-            if (status === enums_2.SLStatus.OK) {
+            if (status === enums_3.SLStatus.OK) {
                 // Rather than give the real link key, the backup contains a hashed version of the key.
                 // This is done to prevent a compromise of the backup data from compromising the current link keys.
                 // This is per the Smart Energy spec.
                 const [hashStatus, hashedKey] = (await this.emberAesHashSimple(plaintextKey.contents));
-                if (hashStatus === enums_2.EmberStatus.SUCCESS) {
+                if (hashStatus === enums_3.EmberStatus.SUCCESS) {
                     keyList.push({
                         deviceEui64,
                         key: { contents: hashedKey },
@@ -987,7 +1028,7 @@ class EmberAdapter extends __1.Adapter {
                 }
                 else {
                     // this should never happen?
-                    logger_1.logger.error(`[BACKUP] Failed to hash link key at index ${i} with status=${enums_2.EmberStatus[hashStatus]}. Omitting from backup.`, NS);
+                    logger_1.logger.error(`[BACKUP] Failed to hash link key at index ${i} with status=${enums_3.EmberStatus[hashStatus]}. Omitting from backup.`, NS);
                 }
             }
         }
@@ -1003,16 +1044,16 @@ class EmberAdapter extends __1.Adapter {
         if (!backupData?.length) {
             return;
         }
-        const [confStatus, keyTableSize] = (await this.ezsp.ezspGetConfigurationValue(enums_1.EzspConfigId.KEY_TABLE_SIZE));
-        if (confStatus !== enums_2.EzspStatus.SUCCESS) {
-            throw new Error(`[BACKUP] Failed to retrieve key table size from NCP with status=${enums_2.EzspStatus[confStatus]}.`);
+        const [confStatus, keyTableSize] = (await this.ezsp.ezspGetConfigurationValue(enums_2.EzspConfigId.KEY_TABLE_SIZE));
+        if (confStatus !== enums_3.EzspStatus.SUCCESS) {
+            throw new Error(`[BACKUP] Failed to retrieve key table size from NCP with status=${enums_3.EzspStatus[confStatus]}.`);
         }
         if (backupData.length > keyTableSize) {
             throw new Error(`[BACKUP] Current key table of ${keyTableSize} is too small to import backup of ${backupData.length}!`);
         }
         const networkStatus = (await this.emberNetworkState());
-        if (networkStatus !== enums_2.EmberNetworkStatus.NO_NETWORK) {
-            throw new Error(`[BACKUP] Cannot import TC data while network is up, networkStatus=${enums_2.EmberNetworkStatus[networkStatus]}.`);
+        if (networkStatus !== enums_3.EmberNetworkStatus.NO_NETWORK) {
+            throw new Error(`[BACKUP] Cannot import TC data while network is up, networkStatus=${enums_3.EmberNetworkStatus[networkStatus]}.`);
         }
         let status;
         for (let i = 0; i < keyTableSize; i++) {
@@ -1022,11 +1063,11 @@ class EmberAdapter extends __1.Adapter {
             }
             else {
                 const importStatus = (await this.ezsp.ezspImportLinkKey(i, backupData[i].deviceEui64, backupData[i].key));
-                status = ((importStatus === enums_2.SLStatus.OK) ? enums_2.EmberStatus.SUCCESS : enums_2.EmberStatus.KEY_TABLE_INVALID_ADDRESS);
+                status = ((importStatus === enums_3.SLStatus.OK) ? enums_3.EmberStatus.SUCCESS : enums_3.EmberStatus.KEY_TABLE_INVALID_ADDRESS);
             }
-            if (status !== enums_2.EmberStatus.SUCCESS) {
+            if (status !== enums_3.EmberStatus.SUCCESS) {
                 throw new Error(`[BACKUP] Failed to ${((i >= backupData.length) ? "erase" : "set")} key table entry at index ${i} `
-                    + `with status=${enums_2.EmberStatus[status]}`);
+                    + `with status=${enums_3.EmberStatus[status]}`);
             }
         }
         logger_1.logger.info(`[BACKUP] Imported ${backupData.length} keys.`, NS);
@@ -1043,17 +1084,17 @@ class EmberAdapter extends __1.Adapter {
                 logger_1.logger.warning(`[TRUST CENTER] Performing a network key update. This might take a while and disrupt normal operation.`, NS);
                 // zero-filled = let stack generate new random network key
                 let status = await this.ezsp.ezspBroadcastNextNetworkKey({ contents: Buffer.alloc(consts_1.EMBER_ENCRYPTION_KEY_SIZE) });
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[TRUST CENTER] Failed to broadcast next network key with status=${enums_2.EmberStatus[status]}.`, NS);
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`[TRUST CENTER] Failed to broadcast next network key with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 // XXX: this will block other requests for a while, but should ensure the key propagates without interference?
                 //      could also stop dispatching entirely and do this outside the queue if necessary/better
                 await (0, utils_1.Wait)(BROADCAST_NETWORK_KEY_SWITCH_WAIT_TIME);
                 status = (await this.ezsp.ezspBroadcastNetworkKeySwitch());
-                if (status !== enums_2.EmberStatus.SUCCESS) {
+                if (status !== enums_3.EmberStatus.SUCCESS) {
                     // XXX: Not sure how likely this is, but this is bad, probably should hard fail?
-                    logger_1.logger.error(`[TRUST CENTER] Failed to broadcast network key switch with status=${enums_2.EmberStatus[status]}.`, NS);
+                    logger_1.logger.error(`[TRUST CENTER] Failed to broadcast network key switch with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 resolve();
@@ -1066,7 +1107,7 @@ class EmberAdapter extends __1.Adapter {
      * @param status
      */
     async onNcpNeedsResetAndInit(status) {
-        logger_1.logger.error(`!!! NCP FATAL ERROR reason=${enums_2.EzspStatus[status]}. ATTEMPTING RESET... !!!`, NS);
+        logger_1.logger.error(`!!! NCP FATAL ERROR reason=${enums_3.EzspStatus[status]}. ATTEMPTING RESET... !!!`, NS);
         try {
             await this.stop();
             await (0, utils_1.Wait)(500); // just because
@@ -1104,7 +1145,7 @@ class EmberAdapter extends __1.Adapter {
      * Check against BLANK_EUI64 for validity.
      */
     async emberGetEui64() {
-        if (this.networkCache.eui64 === consts_2.BLANK_EUI64) {
+        if (this.networkCache.eui64 === ZSpec.BLANK_EUI64) {
             this.networkCache.eui64 = (await this.ezsp.ezspGetEui64());
         }
         return this.networkCache.eui64;
@@ -1115,13 +1156,13 @@ class EmberAdapter extends __1.Adapter {
      * Check against INVALID_PAN_ID for validity.
      */
     async emberGetPanId() {
-        if (this.networkCache.parameters.panId === consts_2.INVALID_PAN_ID) {
+        if (this.networkCache.parameters.panId === ZSpec.INVALID_PAN_ID) {
             const [status, , parameters] = (await this.ezsp.ezspGetNetworkParameters());
-            if (status === enums_2.EmberStatus.SUCCESS) {
+            if (status === enums_3.EmberStatus.SUCCESS) {
                 this.networkCache.parameters = parameters;
             }
             else {
-                logger_1.logger.error(`Failed to get PAN ID (via network parameters) with status=${enums_2.EmberStatus[status]}.`, NS);
+                logger_1.logger.error(`Failed to get PAN ID (via network parameters) with status=${enums_3.EmberStatus[status]}.`, NS);
             }
         }
         return this.networkCache.parameters.panId;
@@ -1132,13 +1173,13 @@ class EmberAdapter extends __1.Adapter {
      * Check against BLANK_EXTENDED_PAN_ID for validity.
      */
     async emberGetExtendedPanId() {
-        if ((0, es6_1.default)(this.networkCache.parameters.extendedPanId, consts_2.BLANK_EXTENDED_PAN_ID)) {
+        if ((0, es6_1.default)(this.networkCache.parameters.extendedPanId, ZSpec.BLANK_EXTENDED_PAN_ID)) {
             const [status, , parameters] = (await this.ezsp.ezspGetNetworkParameters());
-            if (status === enums_2.EmberStatus.SUCCESS) {
+            if (status === enums_3.EmberStatus.SUCCESS) {
                 this.networkCache.parameters = parameters;
             }
             else {
-                logger_1.logger.error(`Failed to get Extended PAN ID (via network parameters) with status=${enums_2.EmberStatus[status]}.`, NS);
+                logger_1.logger.error(`Failed to get Extended PAN ID (via network parameters) with status=${enums_3.EmberStatus[status]}.`, NS);
             }
         }
         return this.networkCache.parameters.extendedPanId;
@@ -1151,11 +1192,11 @@ class EmberAdapter extends __1.Adapter {
     async emberGetRadioChannel() {
         if (this.networkCache.parameters.radioChannel === consts_2.INVALID_RADIO_CHANNEL) {
             const [status, , parameters] = (await this.ezsp.ezspGetNetworkParameters());
-            if (status === enums_2.EmberStatus.SUCCESS) {
+            if (status === enums_3.EmberStatus.SUCCESS) {
                 this.networkCache.parameters = parameters;
             }
             else {
-                logger_1.logger.error(`Failed to get radio channel (via network parameters) with status=${enums_2.EmberStatus[status]}.`, NS);
+                logger_1.logger.error(`Failed to get radio channel (via network parameters) with status=${enums_3.EmberStatus[status]}.`, NS);
             }
         }
         return this.networkCache.parameters.radioChannel;
@@ -1164,14 +1205,14 @@ class EmberAdapter extends __1.Adapter {
     async emberStartEnergyScan() {
         return new Promise((resolve, reject) => {
             this.requestQueue.enqueue(async () => {
-                const status = (await this.ezsp.ezspStartScan(enums_2.EzspNetworkScanType.ENERGY_SCAN, consts_2.EMBER_ALL_802_15_4_CHANNELS_MASK, ENERGY_SCAN_DURATION));
-                if (status !== enums_2.SLStatus.OK) {
-                    logger_1.logger.error(`Failed energy scan request with status=${enums_2.SLStatus[status]}.`, NS);
-                    return enums_2.EmberStatus.ERR_FATAL;
+                const status = (await this.ezsp.ezspStartScan(enums_3.EzspNetworkScanType.ENERGY_SCAN, consts_2.EMBER_ALL_802_15_4_CHANNELS_MASK, ENERGY_SCAN_DURATION));
+                if (status !== enums_3.SLStatus.OK) {
+                    logger_1.logger.error(`Failed energy scan request with status=${enums_3.SLStatus[status]}.`, NS);
+                    return enums_3.EmberStatus.ERR_FATAL;
                 }
                 // TODO: result in logs only atm, since UI doesn't support it
                 resolve();
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -1202,17 +1243,17 @@ class EmberAdapter extends __1.Adapter {
         }
         logger_1.logger.debug(`NCP info: EZSPVersion=${ncpEzspProtocolVer} StackType=${ncpStackType} StackVersion=${ncpStackVer}`, NS);
         const [status, versionStruct] = (await this.ezsp.ezspGetVersionStruct());
-        if (status !== enums_2.EzspStatus.SUCCESS) {
+        if (status !== enums_3.EzspStatus.SUCCESS) {
             // Should never happen with support of only EZSP v13+
             throw new Error(`NCP has old-style version number. Not supported.`);
         }
         this.version = {
             ezsp: ncpEzspProtocolVer,
-            revision: `${versionStruct.major}.${versionStruct.minor}.${versionStruct.patch} [${enums_2.EmberVersionType[versionStruct.type]}]`,
+            revision: `${versionStruct.major}.${versionStruct.minor}.${versionStruct.patch} [${enums_3.EmberVersionType[versionStruct.type]}]`,
             ...versionStruct,
         };
-        if (versionStruct.type !== enums_2.EmberVersionType.GA) {
-            logger_1.logger.warning(`NCP is running a non-GA version (${enums_2.EmberVersionType[versionStruct.type]}).`, NS);
+        if (versionStruct.type !== enums_3.EmberVersionType.GA) {
+            logger_1.logger.warning(`NCP is running a non-GA version (${enums_3.EmberVersionType[versionStruct.type]}).`, NS);
         }
         logger_1.logger.debug(`NCP version info: ${JSON.stringify(this.version)}`, NS);
     }
@@ -1226,13 +1267,13 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberSetEzspConfigValue(configId, value) {
         const status = (await this.ezsp.ezspSetConfigurationValue(configId, value));
-        logger_1.logger.debug(`[EzspConfigId] SET "${enums_1.EzspConfigId[configId]}" TO "${value}" with status=${enums_2.EzspStatus[status]}.`, NS);
-        if (status === enums_2.EzspStatus.ERROR_INVALID_ID) {
+        logger_1.logger.debug(`[EzspConfigId] SET "${enums_2.EzspConfigId[configId]}" TO "${value}" with status=${enums_3.EzspStatus[status]}.`, NS);
+        if (status === enums_3.EzspStatus.ERROR_INVALID_ID) {
             // can be ZLL where not all NCPs need or support it.
-            logger_1.logger.warning(`[EzspConfigId] Unsupported configuration ID ${enums_1.EzspConfigId[configId]} by NCP.`, NS);
+            logger_1.logger.warning(`[EzspConfigId] Unsupported configuration ID ${enums_2.EzspConfigId[configId]} by NCP.`, NS);
         }
-        else if (status !== enums_2.EzspStatus.SUCCESS) {
-            logger_1.logger.warning(`[EzspConfigId] Failed to SET "${enums_1.EzspConfigId[configId]}" TO "${value}" with status=${enums_2.EzspStatus[status]}. `
+        else if (status !== enums_3.EzspStatus.SUCCESS) {
+            logger_1.logger.warning(`[EzspConfigId] Failed to SET "${enums_2.EzspConfigId[configId]}" TO "${value}" with status=${enums_3.EzspStatus[status]}. `
                 + `Firmware value will be used instead.`, NS);
         }
         return status;
@@ -1246,7 +1287,7 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberSetEzspValue(valueId, valueLength, value) {
         const status = (await this.ezsp.ezspSetValue(valueId, valueLength, value));
-        logger_1.logger.debug(`[EzspValueId] SET "${enums_1.EzspValueId[valueId]}" TO "${value}" with status=${enums_2.EzspStatus[status]}.`, NS);
+        logger_1.logger.debug(`[EzspValueId] SET "${enums_2.EzspValueId[valueId]}" TO "${value}" with status=${enums_3.EzspStatus[status]}.`, NS);
         return status;
     }
     /**
@@ -1257,7 +1298,7 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberSetEzspPolicy(policyId, decisionId) {
         const status = (await this.ezsp.ezspSetPolicy(policyId, decisionId));
-        logger_1.logger.debug(`[EzspPolicyId] SET "${enums_1.EzspPolicyId[policyId]}" TO "${decisionId}" with status=${enums_2.EzspStatus[status]}.`, NS);
+        logger_1.logger.debug(`[EzspPolicyId] SET "${enums_2.EzspPolicyId[policyId]}" TO "${decisionId}" with status=${enums_3.EzspStatus[status]}.`, NS);
         return status;
     }
     /**
@@ -1273,7 +1314,7 @@ class EmberAdapter extends __1.Adapter {
      */
     async aesMmoHash(context, finalize, data) {
         if (data.length > 255) {
-            throw new Error(enums_2.EzspStatus[enums_2.EzspStatus.ERROR_INVALID_CALL]);
+            throw new Error(enums_3.EzspStatus[enums_3.EzspStatus.ERROR_INVALID_CALL]);
         }
         const [status, reContext] = (await this.ezsp.ezspAesMmoHash(context, finalize, data));
         return [status, reContext];
@@ -1352,7 +1393,7 @@ class EmberAdapter extends __1.Adapter {
         logger_1.logger.debug(`Permit joining for ${duration} sec. status=${[status]}`, NS);
         if (broadcastMgmtPermitJoin) {
             // `authentication`: TC significance always 1 (zb specs)
-            [status, apsFrame, messageTag] = (await this.emberPermitJoiningRequest(consts_2.EMBER_BROADCAST_ADDRESS, duration, 1, DEFAULT_APS_OPTIONS));
+            [status, apsFrame, messageTag] = (await this.emberPermitJoiningRequest(enums_1.BroadcastAddress.DEFAULT, duration, 1, DEFAULT_APS_OPTIONS));
         }
         return [status, apsFrame, messageTag];
     }
@@ -1362,17 +1403,17 @@ class EmberAdapter extends __1.Adapter {
      * @returns
      */
     async emberSetJoinPolicy(decision) {
-        let policy = enums_1.EzspDecisionBitmask.DEFAULT_CONFIGURATION;
-        if (decision == enums_2.EmberJoinDecision.USE_PRECONFIGURED_KEY) {
-            policy = (enums_1.EzspDecisionBitmask.ALLOW_JOINS | enums_1.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS);
+        let policy = enums_2.EzspDecisionBitmask.DEFAULT_CONFIGURATION;
+        if (decision == enums_3.EmberJoinDecision.USE_PRECONFIGURED_KEY) {
+            policy = (enums_2.EzspDecisionBitmask.ALLOW_JOINS | enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS);
         }
-        else if (decision == enums_2.EmberJoinDecision.SEND_KEY_IN_THE_CLEAR) {
-            policy = (enums_1.EzspDecisionBitmask.ALLOW_JOINS | enums_1.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS | enums_1.EzspDecisionBitmask.SEND_KEY_IN_CLEAR);
+        else if (decision == enums_3.EmberJoinDecision.SEND_KEY_IN_THE_CLEAR) {
+            policy = (enums_2.EzspDecisionBitmask.ALLOW_JOINS | enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS | enums_2.EzspDecisionBitmask.SEND_KEY_IN_CLEAR);
         }
-        else if (decision == enums_2.EmberJoinDecision.ALLOW_REJOINS_ONLY) {
-            policy = enums_1.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS;
+        else if (decision == enums_3.EmberJoinDecision.ALLOW_REJOINS_ONLY) {
+            policy = enums_2.EzspDecisionBitmask.ALLOW_UNSECURED_REJOINS;
         }
-        return this.emberSetEzspPolicy(enums_1.EzspPolicyId.TRUST_CENTER_POLICY, policy);
+        return this.emberSetEzspPolicy(enums_2.EzspPolicyId.TRUST_CENTER_POLICY, policy);
     }
     /**
      * Get Source Route Overhead
@@ -1389,11 +1430,11 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberGetSourceRouteOverhead(destination) {
         const [status, value] = (await this.ezsp.ezspGetSourceRouteOverhead(destination));
-        if (status === enums_2.EzspStatus.SUCCESS) {
+        if (status === enums_3.EzspStatus.SUCCESS) {
             return value;
         }
         else {
-            logger_1.logger.debug(`Failed to get source route overhead (via extended value), status=${enums_2.EzspStatus[status]}.`, NS);
+            logger_1.logger.debug(`Failed to get source route overhead (via extended value), status=${enums_3.EzspStatus[status]}.`, NS);
         }
         return 0;
     }
@@ -1414,34 +1455,34 @@ class EmberAdapter extends __1.Adapter {
     async maximumApsPayloadLength(type, indexOrDestination, apsFrame) {
         let destination = consts_2.EMBER_UNKNOWN_NODE_ID;
         let max = consts_2.MAXIMUM_APS_PAYLOAD_LENGTH; // uint8_t
-        if ((apsFrame.options & enums_2.EmberApsOption.ENCRYPTION) !== 0) {
+        if ((apsFrame.options & enums_3.EmberApsOption.ENCRYPTION) !== 0) {
             max -= consts_2.APS_ENCRYPTION_OVERHEAD;
         }
-        if ((apsFrame.options & enums_2.EmberApsOption.SOURCE_EUI64) !== 0) {
+        if ((apsFrame.options & enums_3.EmberApsOption.SOURCE_EUI64) !== 0) {
             max -= consts_1.EUI64_SIZE;
         }
-        if ((apsFrame.options & enums_2.EmberApsOption.DESTINATION_EUI64) !== 0) {
+        if ((apsFrame.options & enums_3.EmberApsOption.DESTINATION_EUI64) !== 0) {
             max -= consts_1.EUI64_SIZE;
         }
-        if ((apsFrame.options & enums_2.EmberApsOption.FRAGMENT) !== 0) {
+        if ((apsFrame.options & enums_3.EmberApsOption.FRAGMENT) !== 0) {
             max -= consts_2.APS_FRAGMENTATION_OVERHEAD;
         }
         switch (type) {
-            case enums_2.EmberOutgoingMessageType.DIRECT:
+            case enums_3.EmberOutgoingMessageType.DIRECT:
                 destination = indexOrDestination;
                 break;
-            case enums_2.EmberOutgoingMessageType.VIA_ADDRESS_TABLE:
+            case enums_3.EmberOutgoingMessageType.VIA_ADDRESS_TABLE:
                 destination = (await this.ezsp.ezspGetAddressTableRemoteNodeId(indexOrDestination));
                 break;
-            case enums_2.EmberOutgoingMessageType.VIA_BINDING:
+            case enums_3.EmberOutgoingMessageType.VIA_BINDING:
                 destination = (await this.ezsp.ezspGetBindingRemoteNodeId(indexOrDestination));
                 break;
-            case enums_2.EmberOutgoingMessageType.MULTICAST:
+            case enums_3.EmberOutgoingMessageType.MULTICAST:
                 // APS multicast messages include the two-byte group id and exclude the one-byte destination endpoint,
                 // for a net loss of an extra byte.
                 max--;
                 break;
-            case enums_2.EmberOutgoingMessageType.BROADCAST:
+            case enums_3.EmberOutgoingMessageType.BROADCAST:
                 break;
             default:
                 break;
@@ -1495,7 +1536,7 @@ class EmberAdapter extends __1.Adapter {
      */
     async sendZDORequestBuffer(destination, clusterId, options) {
         if (this.zdoRequestBuffalo.getPosition() > consts_1.EZSP_MAX_FRAME_LENGTH) {
-            return [enums_2.EmberStatus.MESSAGE_TOO_LONG, null, null];
+            return [enums_3.EmberStatus.MESSAGE_TOO_LONG, null, null];
         }
         const messageTag = this.nextZDORequestSequence();
         this.zdoRequestBuffalo.setCommandByte(0, messageTag);
@@ -1509,19 +1550,19 @@ class EmberAdapter extends __1.Adapter {
             sequence: 0, // set by stack
         };
         const messageContents = this.zdoRequestBuffalo.getWritten();
-        if (destination === consts_2.EMBER_BROADCAST_ADDRESS || destination === consts_2.EMBER_RX_ON_WHEN_IDLE_BROADCAST_ADDRESS
-            || destination === consts_2.EMBER_SLEEPY_BROADCAST_ADDRESS) {
+        if (destination === enums_1.BroadcastAddress.DEFAULT || destination === enums_1.BroadcastAddress.RX_ON_WHEN_IDLE
+            || destination === enums_1.BroadcastAddress.SLEEPY) {
             logger_1.logger.debug(`~~~> [ZDO BROADCAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
             const [status, apsSequence] = (await this.ezsp.ezspSendBroadcast(destination, apsFrame, this.getZDORequestRadius(), messageTag, messageContents));
             apsFrame.sequence = apsSequence;
-            logger_1.logger.debug(`~~~> [SENT ZDO type=BROADCAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag} status=${enums_2.EmberStatus[status]}]`, NS);
+            logger_1.logger.debug(`~~~> [SENT ZDO type=BROADCAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag} status=${enums_3.EmberStatus[status]}]`, NS);
             return [status, apsFrame, messageTag];
         }
         else {
             logger_1.logger.debug(`~~~> [ZDO UNICAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
-            const [status, apsSequence] = (await this.ezsp.ezspSendUnicast(enums_2.EmberOutgoingMessageType.DIRECT, destination, apsFrame, messageTag, messageContents));
+            const [status, apsSequence] = (await this.ezsp.ezspSendUnicast(enums_3.EmberOutgoingMessageType.DIRECT, destination, apsFrame, messageTag, messageContents));
             apsFrame.sequence = apsSequence;
-            logger_1.logger.debug(`~~~> [SENT ZDO type=DIRECT apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag} status=${enums_2.EmberStatus[status]}]`, NS);
+            logger_1.logger.debug(`~~~> [SENT ZDO type=DIRECT apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag} status=${enums_3.EmberStatus[status]}]`, NS);
             return [status, apsFrame, messageTag];
         }
     }
@@ -1554,7 +1595,7 @@ class EmberAdapter extends __1.Adapter {
         const length = (zdo_1.ZDO_MESSAGE_OVERHEAD + 2 + 2 + 1 + (inClusters.length * 2) + 1 + (outClusters.length * 2));
         // sanity check
         if (length > consts_1.EZSP_MAX_FRAME_LENGTH) {
-            return [enums_2.EmberStatus.MESSAGE_TOO_LONG, null, null];
+            return [enums_3.EmberStatus.MESSAGE_TOO_LONG, null, null];
         }
         this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
         this.zdoRequestBuffalo.writeUInt16(target);
@@ -1589,7 +1630,7 @@ class EmberAdapter extends __1.Adapter {
         this.zdoRequestBuffalo.writeUInt8(reportKids ? 1 : 0);
         this.zdoRequestBuffalo.writeUInt8(childStartIndex);
         logger_1.logger.debug(`~~~> [ZDO NETWORK_ADDRESS_REQUEST target=${target} reportKids=${reportKids} childStartIndex=${childStartIndex}]`, NS);
-        return this.sendZDORequestBuffer(consts_2.EMBER_RX_ON_WHEN_IDLE_BROADCAST_ADDRESS, zdo_1.NETWORK_ADDRESS_REQUEST, enums_2.EmberApsOption.SOURCE_EUI64);
+        return this.sendZDORequestBuffer(enums_1.BroadcastAddress.RX_ON_WHEN_IDLE, zdo_1.NETWORK_ADDRESS_REQUEST, enums_3.EmberApsOption.SOURCE_EUI64);
     }
     /**
      * ZDO
@@ -1711,7 +1752,7 @@ class EmberAdapter extends __1.Adapter {
                 this.zdoRequestBuffalo.writeUInt16(groupAddress);
                 break;
             default:
-                return [enums_2.EmberStatus.ERR_FATAL, null, null];
+                return [enums_3.EmberStatus.ERR_FATAL, null, null];
         }
         return this.sendZDORequestBuffer(target, bindClusterId, options);
     }
@@ -2022,7 +2063,6 @@ class EmberAdapter extends __1.Adapter {
     async start() {
         logger_1.logger.info(`======== Ember Adapter Starting ========`, NS);
         this.initVariables();
-        logger_1.logger.debug(`Starting EZSP with stack configuration: "${this.stackConfig}".`, NS);
         const result = await this.initEzsp();
         return result;
     }
@@ -2041,7 +2081,7 @@ class EmberAdapter extends __1.Adapter {
                 const ieeeAddr = (await this.emberGetEui64());
                 resolve({
                     ieeeAddr,
-                    networkAddress: consts_2.ZIGBEE_COORDINATOR_ADDRESS,
+                    networkAddress: ZSpec.COORDINATOR_ADDRESS,
                     manufacturerID: DEFAULT_MANUFACTURER_CODE,
                     endpoints: endpoints_1.FIXED_ENDPOINTS.map((ep) => {
                         return {
@@ -2053,7 +2093,7 @@ class EmberAdapter extends __1.Adapter {
                         };
                     }),
                 });
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2078,7 +2118,7 @@ class EmberAdapter extends __1.Adapter {
             this.requestQueue.enqueue(async () => {
                 // grab fresh version here, bypass cache
                 const [netStatus, , netParams] = (await this.ezsp.ezspGetNetworkParameters());
-                if (netStatus !== enums_2.EmberStatus.SUCCESS) {
+                if (netStatus !== enums_3.EmberStatus.SUCCESS) {
                     logger_1.logger.error(`[BACKUP] Failed to get network parameters.`, NS);
                     return netStatus;
                 }
@@ -2086,10 +2126,10 @@ class EmberAdapter extends __1.Adapter {
                 this.networkCache.parameters = netParams;
                 this.networkCache.eui64 = (await this.ezsp.ezspGetEui64());
                 const [netKeyStatus, netKeyInfo] = (await this.ezsp.ezspGetNetworkKeyInfo());
-                if (netKeyStatus !== enums_2.SLStatus.OK) {
+                if (netKeyStatus !== enums_3.SLStatus.OK) {
                     logger_1.logger.error(`[BACKUP] Failed to get network keys info.`, NS);
-                    return ((netKeyStatus === enums_2.SLStatus.BUSY) || (netKeyStatus === enums_2.SLStatus.NOT_READY))
-                        ? enums_2.EmberStatus.NETWORK_BUSY : enums_2.EmberStatus.ERR_FATAL; // allow retry on statuses that should be temporary
+                    return ((netKeyStatus === enums_3.SLStatus.BUSY) || (netKeyStatus === enums_3.SLStatus.NOT_READY))
+                        ? enums_3.EmberStatus.NETWORK_BUSY : enums_3.EmberStatus.ERR_FATAL; // allow retry on statuses that should be temporary
                 }
                 if (!netKeyInfo.networkKeySet) {
                     throw new Error(`[BACKUP] No network key set.`);
@@ -2104,17 +2144,17 @@ class EmberAdapter extends __1.Adapter {
                 //     Buffer.from(this.networkCache.eui64.substring(2/*0x*/), 'hex').reverse()
                 // ));
                 let context = (0, initters_1.initSecurityManagerContext)();
-                context.coreKeyType = enums_2.SecManKeyType.TC_LINK;
+                context.coreKeyType = enums_3.SecManKeyType.TC_LINK;
                 const [tcLinkKey, tclkStatus] = (await this.ezsp.ezspExportKey(context));
-                if (tclkStatus !== enums_2.SLStatus.OK) {
-                    throw new Error(`[BACKUP] Failed to export TC Link Key with status=${enums_2.SLStatus[tclkStatus]}.`);
+                if (tclkStatus !== enums_3.SLStatus.OK) {
+                    throw new Error(`[BACKUP] Failed to export TC Link Key with status=${enums_3.SLStatus[tclkStatus]}.`);
                 }
                 context = (0, initters_1.initSecurityManagerContext)(); // make sure it's back to zeroes
-                context.coreKeyType = enums_2.SecManKeyType.NETWORK;
+                context.coreKeyType = enums_3.SecManKeyType.NETWORK;
                 context.keyIndex = 0;
                 const [networkKey, nkStatus] = (await this.ezsp.ezspExportKey(context));
-                if (nkStatus !== enums_2.SLStatus.OK) {
-                    throw new Error(`[BACKUP] Failed to export Network Key with status=${enums_2.SLStatus[nkStatus]}.`);
+                if (nkStatus !== enums_3.SLStatus.OK) {
+                    throw new Error(`[BACKUP] Failed to export Network Key with status=${enums_3.SLStatus[nkStatus]}.`);
                 }
                 const zbChannels = Array.from(Array(consts_2.EMBER_NUM_802_15_4_CHANNELS), (e, i) => i + consts_2.EMBER_MIN_802_15_4_CHANNEL_NUMBER);
                 resolve({
@@ -2150,7 +2190,7 @@ class EmberAdapter extends __1.Adapter {
                         // altNetworkKey: altNetworkKey.contents,
                     }
                 });
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject, true);
         });
     }
@@ -2169,7 +2209,7 @@ class EmberAdapter extends __1.Adapter {
                     extendedPanID: parseInt(Buffer.from(extendedPanID).toString('hex'), 16),
                     channel,
                 });
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2182,15 +2222,15 @@ class EmberAdapter extends __1.Adapter {
             this.requestQueue.enqueue(async () => {
                 this.checkInterpanLock();
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [status, apsFrame, messageTag] = (await this.emberChannelChangeRequest(consts_2.EMBER_SLEEPY_BROADCAST_ADDRESS, newChannel, DEFAULT_APS_OPTIONS));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed broadcast channel change to "${newChannel}" with status=${enums_2.EmberStatus[status]}.`, NS);
+                const [status, apsFrame, messageTag] = (await this.emberChannelChangeRequest(enums_1.BroadcastAddress.SLEEPY, newChannel, DEFAULT_APS_OPTIONS));
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`[ZDO] Failed broadcast channel change to "${newChannel}" with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 await this.oneWaitress.startWaitingForEvent({ eventName: oneWaitress_1.OneWaitressEvents.STACK_STATUS_CHANNEL_CHANGED }, DEFAULT_NETWORK_REQUEST_TIMEOUT * 2, // observed to ~9sec
                 '[ZDO] Change Channel');
                 resolve();
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2203,12 +2243,12 @@ class EmberAdapter extends __1.Adapter {
         return new Promise((resolve, reject) => {
             this.requestQueue.enqueue(async () => {
                 const status = await this.ezsp.ezspSetRadioPower(value);
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`Failed to set transmit power to ${value} status=${enums_2.EmberStatus[status]}.`, NS);
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`Failed to set transmit power to ${value} status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 resolve();
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2242,22 +2282,22 @@ class EmberAdapter extends __1.Adapter {
             this.requestQueue.enqueue(async () => {
                 // Compute the key from the install code and CRC.
                 const [aesStatus, keyContents] = (await this.emberAesHashSimple(key));
-                if (aesStatus !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[ADD INSTALL CODE] Failed AES hash for '${ieeeAddress}' with status=${enums_2.EmberStatus[aesStatus]}.`, NS);
+                if (aesStatus !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`[ADD INSTALL CODE] Failed AES hash for '${ieeeAddress}' with status=${enums_3.EmberStatus[aesStatus]}.`, NS);
                     return aesStatus;
                 }
                 // Add the key to the transient key table.
                 // This will be used while the DUT joins.
-                const impStatus = (await this.ezsp.ezspImportTransientKey(ieeeAddress, { contents: keyContents }, enums_2.SecManFlag.NONE));
-                if (impStatus == enums_2.SLStatus.OK) {
+                const impStatus = (await this.ezsp.ezspImportTransientKey(ieeeAddress, { contents: keyContents }, enums_3.SecManFlag.NONE));
+                if (impStatus == enums_3.SLStatus.OK) {
                     logger_1.logger.debug(`[ADD INSTALL CODE] Success for '${ieeeAddress}'.`, NS);
                 }
                 else {
-                    logger_1.logger.error(`[ADD INSTALL CODE] Failed for '${ieeeAddress}' with status=${enums_2.SLStatus[impStatus]}.`, NS);
-                    return enums_2.EmberStatus.ERR_FATAL;
+                    logger_1.logger.error(`[ADD INSTALL CODE] Failed for '${ieeeAddress}' with status=${enums_3.SLStatus[impStatus]}.`, NS);
+                    return enums_3.EmberStatus.ERR_FATAL;
                 }
                 resolve();
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2273,7 +2313,7 @@ class EmberAdapter extends __1.Adapter {
                 sourceEndpoint: sourceEndpointInfo.endpoint,
                 destinationEndpoint: endpoint,
                 groupId: 0,
-                options: enums_2.EmberApsOption.NONE,
+                options: enums_3.EmberApsOption.NONE,
             },
             zclSequence: transactionSequenceNumber,
             commandIdentifier,
@@ -2289,17 +2329,17 @@ class EmberAdapter extends __1.Adapter {
         const preJoining = async () => {
             if (seconds) {
                 const plaintextKey = { contents: Buffer.from(consts_2.ZIGBEE_PROFILE_INTEROPERABILITY_LINK_KEY) };
-                const impKeyStatus = (await this.ezsp.ezspImportTransientKey(consts_2.BLANK_EUI64, plaintextKey, enums_2.SecManFlag.NONE));
-                if (impKeyStatus !== enums_2.SLStatus.OK) {
-                    logger_1.logger.error(`[ZDO] Failed import transient key with status=${enums_2.SLStatus[impKeyStatus]}.`, NS);
-                    return enums_2.EmberStatus.ERR_FATAL;
+                const impKeyStatus = (await this.ezsp.ezspImportTransientKey(ZSpec.BLANK_EUI64, plaintextKey, enums_3.SecManFlag.NONE));
+                if (impKeyStatus !== enums_3.SLStatus.OK) {
+                    logger_1.logger.error(`[ZDO] Failed import transient key with status=${enums_3.SLStatus[impKeyStatus]}.`, NS);
+                    return enums_3.EmberStatus.ERR_FATAL;
                 }
-                const setJPstatus = (await this.emberSetJoinPolicy(enums_2.EmberJoinDecision.USE_PRECONFIGURED_KEY));
-                if (setJPstatus !== enums_2.EzspStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed set join policy with status=${enums_2.EzspStatus[setJPstatus]}.`, NS);
-                    return enums_2.EmberStatus.ERR_FATAL;
+                const setJPstatus = (await this.emberSetJoinPolicy(enums_3.EmberJoinDecision.USE_PRECONFIGURED_KEY));
+                if (setJPstatus !== enums_3.EzspStatus.SUCCESS) {
+                    logger_1.logger.error(`[ZDO] Failed set join policy with status=${enums_3.EzspStatus[setJPstatus]}.`, NS);
+                    return enums_3.EmberStatus.ERR_FATAL;
                 }
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }
             else {
                 if (this.manufacturerCode !== DEFAULT_MANUFACTURER_CODE) {
@@ -2308,12 +2348,12 @@ class EmberAdapter extends __1.Adapter {
                     this.manufacturerCode = DEFAULT_MANUFACTURER_CODE;
                 }
                 await this.ezsp.ezspClearTransientLinkKeys();
-                const setJPstatus = (await this.emberSetJoinPolicy(enums_2.EmberJoinDecision.ALLOW_REJOINS_ONLY));
-                if (setJPstatus !== enums_2.EzspStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed set join policy for with status=${enums_2.EzspStatus[setJPstatus]}.`, NS);
-                    return enums_2.EmberStatus.ERR_FATAL;
+                const setJPstatus = (await this.emberSetJoinPolicy(enums_3.EmberJoinDecision.ALLOW_REJOINS_ONLY));
+                if (setJPstatus !== enums_3.EzspStatus.SUCCESS) {
+                    logger_1.logger.error(`[ZDO] Failed set join policy for with status=${enums_3.EzspStatus[setJPstatus]}.`, NS);
+                    return enums_3.EmberStatus.ERR_FATAL;
                 }
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }
         };
         if (networkAddress) {
@@ -2322,15 +2362,15 @@ class EmberAdapter extends __1.Adapter {
                 this.requestQueue.enqueue(async () => {
                     this.checkInterpanLock();
                     const pjStatus = (await preJoining());
-                    if (pjStatus !== enums_2.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed pre joining request for "${networkAddress}" with status=${enums_2.EmberStatus[pjStatus]}.`, NS);
+                    if (pjStatus !== enums_3.EmberStatus.SUCCESS) {
+                        logger_1.logger.error(`[ZDO] Failed pre joining request for "${networkAddress}" with status=${enums_3.EmberStatus[pjStatus]}.`, NS);
                         return pjStatus;
                     }
                     // `authentication`: TC significance always 1 (zb specs)
                     // eslint-disable-next-line @typescript-eslint/no-unused-vars
                     const [status, apsFrame, messageTag] = (await this.emberPermitJoiningRequest(networkAddress, seconds, 1, 0));
-                    if (status !== enums_2.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed permit joining request for "${networkAddress}" with status=${enums_2.EmberStatus[status]}.`, NS);
+                    if (status !== enums_3.EmberStatus.SUCCESS) {
+                        logger_1.logger.error(`[ZDO] Failed permit joining request for "${networkAddress}" with status=${enums_3.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     (await this.oneWaitress.startWaitingFor({
@@ -2339,7 +2379,7 @@ class EmberAdapter extends __1.Adapter {
                         responseClusterId: zdo_1.PERMIT_JOINING_RESPONSE,
                     }, DEFAULT_ZDO_REQUEST_TIMEOUT));
                     resolve();
-                    return enums_2.EmberStatus.SUCCESS;
+                    return enums_3.EmberStatus.SUCCESS;
                 }, reject);
             });
         }
@@ -2349,15 +2389,15 @@ class EmberAdapter extends __1.Adapter {
                 this.requestQueue.enqueue(async () => {
                     this.checkInterpanLock();
                     const pjStatus = (await preJoining());
-                    if (pjStatus !== enums_2.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed pre joining request for "${networkAddress}" with status=${enums_2.EmberStatus[pjStatus]}.`, NS);
+                    if (pjStatus !== enums_3.EmberStatus.SUCCESS) {
+                        logger_1.logger.error(`[ZDO] Failed pre joining request for "${networkAddress}" with status=${enums_3.EmberStatus[pjStatus]}.`, NS);
                         return pjStatus;
                     }
                     // local permit join if `Coordinator`-only requested, else local + broadcast
                     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const [status, apsFrame, messageTag] = (await this.emberPermitJoining(seconds, (networkAddress === consts_2.ZIGBEE_COORDINATOR_ADDRESS) ? false : true));
-                    if (status !== enums_2.EmberStatus.SUCCESS) {
-                        logger_1.logger.error(`[ZDO] Failed permit joining request with status=${enums_2.EmberStatus[status]}.`, NS);
+                    const [status, apsFrame, messageTag] = (await this.emberPermitJoining(seconds, (networkAddress === ZSpec.COORDINATOR_ADDRESS) ? false : true));
+                    if (status !== enums_3.EmberStatus.SUCCESS) {
+                        logger_1.logger.error(`[ZDO] Failed permit joining request with status=${enums_3.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     // NOTE: because Z2M is refreshing the permit join duration early to prevent it from closing
@@ -2378,7 +2418,7 @@ class EmberAdapter extends __1.Adapter {
                     //     //       same kind of problem as described above (upstream always tries to close after start, but EZSP already is)
                     // }
                     resolve();
-                    return enums_2.EmberStatus.SUCCESS;
+                    return enums_3.EmberStatus.SUCCESS;
                 }, reject);
             });
         }
@@ -2389,8 +2429,8 @@ class EmberAdapter extends __1.Adapter {
         const request = async (startIndex) => {
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const [reqStatus, apsFrame, messageTag] = (await this.emberLqiTableRequest(networkAddress, startIndex, DEFAULT_APS_OPTIONS));
-            if (reqStatus !== enums_2.EmberStatus.SUCCESS) {
-                logger_1.logger.error(`[ZDO] Failed LQI request for "${networkAddress}" (index "${startIndex}") with status=${enums_2.EmberStatus[reqStatus]}.`, NS);
+            if (reqStatus !== enums_3.EmberStatus.SUCCESS) {
+                logger_1.logger.error(`[ZDO] Failed LQI request for "${networkAddress}" (index "${startIndex}") with status=${enums_3.EmberStatus[reqStatus]}.`, NS);
                 return [reqStatus, null, null];
             }
             const result = (await this.oneWaitress.startWaitingFor({
@@ -2407,20 +2447,20 @@ class EmberAdapter extends __1.Adapter {
                     depth: entry.depth,
                 });
             }
-            return [enums_2.EmberStatus.SUCCESS, result.neighborTableEntries, result.entryList.length];
+            return [enums_3.EmberStatus.SUCCESS, result.neighborTableEntries, result.entryList.length];
         };
         return new Promise((resolve, reject) => {
             this.requestQueue.enqueue(async () => {
                 this.checkInterpanLock();
                 let [status, tableEntries, entryCount] = (await request(0));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
+                if (status !== enums_3.EmberStatus.SUCCESS) {
                     return status;
                 }
                 const size = tableEntries;
                 let nextStartIndex = entryCount;
                 while (neighbors.length < size) {
                     [status, tableEntries, entryCount] = (await request(nextStartIndex));
-                    if (status !== enums_2.EmberStatus.SUCCESS) {
+                    if (status !== enums_3.EmberStatus.SUCCESS) {
                         return status;
                     }
                     nextStartIndex += entryCount;
@@ -2436,8 +2476,8 @@ class EmberAdapter extends __1.Adapter {
         const request = async (startIndex) => {
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const [reqStatus, apsFrame, messageTag] = (await this.emberRoutingTableRequest(networkAddress, startIndex, DEFAULT_APS_OPTIONS));
-            if (reqStatus !== enums_2.EmberStatus.SUCCESS) {
-                logger_1.logger.error(`[ZDO] Failed routing table request for "${networkAddress}" (index "${startIndex}") with status=${enums_2.EmberStatus[reqStatus]}.`, NS);
+            if (reqStatus !== enums_3.EmberStatus.SUCCESS) {
+                logger_1.logger.error(`[ZDO] Failed routing table request for "${networkAddress}" (index "${startIndex}") with status=${enums_3.EmberStatus[reqStatus]}.`, NS);
                 return [reqStatus, null, null];
             }
             const result = (await this.oneWaitress.startWaitingFor({
@@ -2452,26 +2492,26 @@ class EmberAdapter extends __1.Adapter {
                     nextHop: entry.nextHopAddress,
                 });
             }
-            return [enums_2.EmberStatus.SUCCESS, result.routingTableEntries, result.entryList.length];
+            return [enums_3.EmberStatus.SUCCESS, result.routingTableEntries, result.entryList.length];
         };
         return new Promise((resolve, reject) => {
             this.requestQueue.enqueue(async () => {
                 this.checkInterpanLock();
                 let [status, tableEntries, entryCount] = (await request(0));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
+                if (status !== enums_3.EmberStatus.SUCCESS) {
                     return status;
                 }
                 const size = tableEntries;
                 let nextStartIndex = entryCount;
                 while (table.length < size) {
                     [status, tableEntries, entryCount] = (await request(nextStartIndex));
-                    if (status !== enums_2.EmberStatus.SUCCESS) {
+                    if (status !== enums_3.EmberStatus.SUCCESS) {
                         return status;
                     }
                     nextStartIndex += entryCount;
                 }
                 resolve({ table });
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2482,8 +2522,8 @@ class EmberAdapter extends __1.Adapter {
                 this.checkInterpanLock();
                 /* eslint-disable @typescript-eslint/no-unused-vars */
                 const [status, apsFrame, messageTag] = (await this.emberNodeDescriptorRequest(networkAddress, DEFAULT_APS_OPTIONS));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed node descriptor for "${networkAddress}" with status=${enums_2.EmberStatus[status]}.`, NS);
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`[ZDO] Failed node descriptor for "${networkAddress}" with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 const result = (await this.oneWaitress.startWaitingFor({
@@ -2510,7 +2550,7 @@ class EmberAdapter extends __1.Adapter {
                         + `(current revision: ${CURRENT_ZIGBEE_SPEC_REVISION}).`, NS);
                 }
                 resolve({ type, manufacturerCode: result.manufacturerCode });
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2521,8 +2561,8 @@ class EmberAdapter extends __1.Adapter {
                 this.checkInterpanLock();
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 const [status, apsFrame, messageTag] = (await this.emberActiveEndpointsRequest(networkAddress, DEFAULT_APS_OPTIONS));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`[ZDO] Failed active endpoints request for "${networkAddress}" with status=${enums_2.EmberStatus[status]}.`, NS);
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`[ZDO] Failed active endpoints request for "${networkAddress}" with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 const result = (await this.oneWaitress.startWaitingFor({
@@ -2531,7 +2571,7 @@ class EmberAdapter extends __1.Adapter {
                     responseClusterId: zdo_1.ACTIVE_ENDPOINTS_RESPONSE,
                 }, DEFAULT_ZDO_REQUEST_TIMEOUT));
                 resolve({ endpoints: result.endpointList });
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2542,9 +2582,9 @@ class EmberAdapter extends __1.Adapter {
                 this.checkInterpanLock();
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 const [status, apsFrame, messageTag] = (await this.emberSimpleDescriptorRequest(networkAddress, endpointID, DEFAULT_APS_OPTIONS));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
+                if (status !== enums_3.EmberStatus.SUCCESS) {
                     logger_1.logger.error(`[ZDO] Failed simple descriptor request for "${networkAddress}" endpoint "${endpointID}" `
-                        + `with status=${enums_2.EmberStatus[status]}.`, NS);
+                        + `with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 const result = (await this.oneWaitress.startWaitingFor({
@@ -2559,7 +2599,7 @@ class EmberAdapter extends __1.Adapter {
                     inputClusters: result.inClusterList,
                     outputClusters: result.outClusterList,
                 });
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2573,9 +2613,9 @@ class EmberAdapter extends __1.Adapter {
                     // eslint-disable-next-line @typescript-eslint/no-unused-vars
                     const [status, apsFrame, messageTag] = (await this.emberBindRequest(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, zdo_1.UNICAST_BINDING, destinationAddressOrGroup, null, // doesn't matter
                     destinationEndpoint, DEFAULT_APS_OPTIONS));
-                    if (status !== enums_2.EmberStatus.SUCCESS) {
+                    if (status !== enums_3.EmberStatus.SUCCESS) {
                         logger_1.logger.error(`[ZDO] Failed bind request for "${destinationNetworkAddress}" destination "${destinationAddressOrGroup}" `
-                            + `endpoint "${destinationEndpoint}" with status=${enums_2.EmberStatus[status]}.`, NS);
+                            + `endpoint "${destinationEndpoint}" with status=${enums_3.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     await this.oneWaitress.startWaitingFor({
@@ -2584,7 +2624,7 @@ class EmberAdapter extends __1.Adapter {
                         responseClusterId: zdo_1.BIND_RESPONSE,
                     }, DEFAULT_ZDO_REQUEST_TIMEOUT);
                     resolve();
-                    return enums_2.EmberStatus.SUCCESS;
+                    return enums_3.EmberStatus.SUCCESS;
                 }, reject);
             });
         }
@@ -2597,9 +2637,9 @@ class EmberAdapter extends __1.Adapter {
                     const [status, apsFrame, messageTag] = (await this.emberBindRequest(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, zdo_1.MULTICAST_BINDING, null, // doesn't matter
                     destinationAddressOrGroup, destinationEndpoint, // doesn't matter
                     DEFAULT_APS_OPTIONS));
-                    if (status !== enums_2.EmberStatus.SUCCESS) {
+                    if (status !== enums_3.EmberStatus.SUCCESS) {
                         logger_1.logger.error(`[ZDO] Failed bind request for "${destinationNetworkAddress}" group "${destinationAddressOrGroup}" `
-                            + `with status=${enums_2.EmberStatus[status]}.`, NS);
+                            + `with status=${enums_3.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     await this.oneWaitress.startWaitingFor({
@@ -2608,7 +2648,7 @@ class EmberAdapter extends __1.Adapter {
                         responseClusterId: zdo_1.BIND_RESPONSE,
                     }, DEFAULT_ZDO_REQUEST_TIMEOUT);
                     resolve();
-                    return enums_2.EmberStatus.SUCCESS;
+                    return enums_3.EmberStatus.SUCCESS;
                 }, reject);
             });
         }
@@ -2623,9 +2663,9 @@ class EmberAdapter extends __1.Adapter {
                     // eslint-disable-next-line @typescript-eslint/no-unused-vars
                     const [status, apsFrame, messageTag] = (await this.emberUnbindRequest(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, zdo_1.UNICAST_BINDING, destinationAddressOrGroup, null, // doesn't matter
                     destinationEndpoint, DEFAULT_APS_OPTIONS));
-                    if (status !== enums_2.EmberStatus.SUCCESS) {
+                    if (status !== enums_3.EmberStatus.SUCCESS) {
                         logger_1.logger.error(`[ZDO] Failed unbind request for "${destinationNetworkAddress}" destination "${destinationAddressOrGroup}" `
-                            + `endpoint "${destinationEndpoint}" with status=${enums_2.EmberStatus[status]}.`, NS);
+                            + `endpoint "${destinationEndpoint}" with status=${enums_3.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     await this.oneWaitress.startWaitingFor({
@@ -2634,7 +2674,7 @@ class EmberAdapter extends __1.Adapter {
                         responseClusterId: zdo_1.UNBIND_RESPONSE,
                     }, DEFAULT_ZDO_REQUEST_TIMEOUT);
                     resolve();
-                    return enums_2.EmberStatus.SUCCESS;
+                    return enums_3.EmberStatus.SUCCESS;
                 }, reject);
             });
         }
@@ -2647,9 +2687,9 @@ class EmberAdapter extends __1.Adapter {
                     const [status, apsFrame, messageTag] = (await this.emberUnbindRequest(destinationNetworkAddress, sourceIeeeAddress, sourceEndpoint, clusterID, zdo_1.MULTICAST_BINDING, null, // doesn't matter
                     destinationAddressOrGroup, destinationEndpoint, // doesn't matter
                     DEFAULT_APS_OPTIONS));
-                    if (status !== enums_2.EmberStatus.SUCCESS) {
+                    if (status !== enums_3.EmberStatus.SUCCESS) {
                         logger_1.logger.error(`[ZDO] Failed unbind request for "${destinationNetworkAddress}" group "${destinationAddressOrGroup}" `
-                            + `with status=${enums_2.EmberStatus[status]}.`, NS);
+                            + `with status=${enums_3.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     await this.oneWaitress.startWaitingFor({
@@ -2658,7 +2698,7 @@ class EmberAdapter extends __1.Adapter {
                         responseClusterId: zdo_1.UNBIND_RESPONSE,
                     }, DEFAULT_ZDO_REQUEST_TIMEOUT);
                     resolve();
-                    return enums_2.EmberStatus.SUCCESS;
+                    return enums_3.EmberStatus.SUCCESS;
                 }, reject);
             });
         }
@@ -2669,10 +2709,10 @@ class EmberAdapter extends __1.Adapter {
             this.requestQueue.enqueue(async () => {
                 this.checkInterpanLock();
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [status, apsFrame, messageTag] = (await this.emberLeaveRequest(networkAddress, ieeeAddr, enums_2.EmberLeaveRequestFlags.WITHOUT_REJOIN, DEFAULT_APS_OPTIONS));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
+                const [status, apsFrame, messageTag] = (await this.emberLeaveRequest(networkAddress, ieeeAddr, enums_3.EmberLeaveRequestFlags.WITHOUT_REJOIN, DEFAULT_APS_OPTIONS));
+                if (status !== enums_3.EmberStatus.SUCCESS) {
                     logger_1.logger.error(`[ZDO] Failed remove device request for "${networkAddress}" target "${ieeeAddr}" `
-                        + `with status=${enums_2.EmberStatus[status]}.`, NS);
+                        + `with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 await this.oneWaitress.startWaitingFor({
@@ -2681,7 +2721,7 @@ class EmberAdapter extends __1.Adapter {
                     responseClusterId: zdo_1.LEAVE_RESPONSE,
                 }, DEFAULT_ZDO_REQUEST_TIMEOUT);
                 resolve();
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2709,24 +2749,24 @@ class EmberAdapter extends __1.Adapter {
         };
         // don't RETRY if no response expected
         if (commandResponseId == null) {
-            apsFrame.options &= ~enums_2.EmberApsOption.RETRY;
+            apsFrame.options &= ~enums_3.EmberApsOption.RETRY;
         }
         const data = zclFrame.toBuffer();
         return new Promise((resolve, reject) => {
             this.requestQueue.enqueue(async () => {
                 this.checkInterpanLock();
                 if (CHECK_APS_PAYLOAD_LENGTH) {
-                    const maxPayloadLength = (await this.maximumApsPayloadLength(enums_2.EmberOutgoingMessageType.DIRECT, networkAddress, apsFrame));
+                    const maxPayloadLength = (await this.maximumApsPayloadLength(enums_3.EmberOutgoingMessageType.DIRECT, networkAddress, apsFrame));
                     if (data.length > maxPayloadLength) {
-                        return enums_2.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
+                        return enums_3.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
                     }
                 }
                 logger_1.logger.debug(`~~~> [ZCL to=${networkAddress} apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [status, messageTag] = (await this.ezsp.send(enums_2.EmberOutgoingMessageType.DIRECT, networkAddress, apsFrame, data, 0, // alias
+                const [status, messageTag] = (await this.ezsp.send(enums_3.EmberOutgoingMessageType.DIRECT, networkAddress, apsFrame, data, 0, // alias
                 0));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`~x~> [ZCL to=${networkAddress}] Failed to send request with status=${enums_2.EmberStatus[status]}.`, NS);
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`~x~> [ZCL to=${networkAddress}] Failed to send request with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status; // let queue handle retry based on status
                 }
                 if (commandResponseId != null) {
@@ -2741,7 +2781,7 @@ class EmberAdapter extends __1.Adapter {
                 }
                 else {
                     resolve(null); // don't expect a response
-                    return enums_2.EmberStatus.SUCCESS;
+                    return enums_3.EmberStatus.SUCCESS;
                 }
             }, reject);
         });
@@ -2764,23 +2804,23 @@ class EmberAdapter extends __1.Adapter {
             this.requestQueue.enqueue(async () => {
                 this.checkInterpanLock();
                 if (CHECK_APS_PAYLOAD_LENGTH) {
-                    const maxPayloadLength = (await this.maximumApsPayloadLength(enums_2.EmberOutgoingMessageType.MULTICAST, groupID, apsFrame));
+                    const maxPayloadLength = (await this.maximumApsPayloadLength(enums_3.EmberOutgoingMessageType.MULTICAST, groupID, apsFrame));
                     if (data.length > maxPayloadLength) {
-                        return enums_2.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
+                        return enums_3.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
                     }
                 }
                 logger_1.logger.debug(`~~~> [ZCL GROUP apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [status, messageTag] = (await this.ezsp.send(enums_2.EmberOutgoingMessageType.MULTICAST, apsFrame.groupId, // not used for MC
+                const [status, messageTag] = (await this.ezsp.send(enums_3.EmberOutgoingMessageType.MULTICAST, apsFrame.groupId, // not used for MC
                 apsFrame, data, 0, // alias
                 0));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`~x~> [ZCL GROUP] Failed to send with status=${enums_2.EmberStatus[status]}.`, NS);
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`~x~> [ZCL GROUP] Failed to send with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status; // let queue handle retry based on status
                 }
                 // NOTE: since ezspMessageSentHandler could take a while here, we don't block, it'll just be logged if the delivery failed
                 resolve();
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2802,22 +2842,22 @@ class EmberAdapter extends __1.Adapter {
             this.requestQueue.enqueue(async () => {
                 this.checkInterpanLock();
                 if (CHECK_APS_PAYLOAD_LENGTH) {
-                    const maxPayloadLength = (await this.maximumApsPayloadLength(enums_2.EmberOutgoingMessageType.BROADCAST, destination, apsFrame));
+                    const maxPayloadLength = (await this.maximumApsPayloadLength(enums_3.EmberOutgoingMessageType.BROADCAST, destination, apsFrame));
                     if (data.length > maxPayloadLength) {
-                        return enums_2.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
+                        return enums_3.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
                     }
                 }
                 logger_1.logger.debug(`~~~> [ZCL BROADCAST apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.header)}]`, NS);
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [status, messageTag] = (await this.ezsp.send(enums_2.EmberOutgoingMessageType.BROADCAST, destination, apsFrame, data, 0, // alias
+                const [status, messageTag] = (await this.ezsp.send(enums_3.EmberOutgoingMessageType.BROADCAST, destination, apsFrame, data, 0, // alias
                 0));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`~x~> [ZCL BROADCAST] Failed to send with status=${enums_2.EmberStatus[status]}.`, NS);
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`~x~> [ZCL BROADCAST] Failed to send with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status; // let queue handle retry based on status
                 }
                 // NOTE: since ezspMessageSentHandler could take a while here, we don't block, it'll just be logged if the delivery failed
                 resolve();
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2834,9 +2874,9 @@ class EmberAdapter extends __1.Adapter {
             this.requestQueue.enqueue(async () => {
                 this.interpanLock = true;
                 const status = (await this.ezsp.ezspSetLogicalAndRadioChannel(channel));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
+                if (status !== enums_3.EmberStatus.SUCCESS) {
                     this.interpanLock = false; // XXX: ok?
-                    logger_1.logger.error(`Failed to set InterPAN channel to ${channel} with status=${enums_2.EmberStatus[status]}.`, NS);
+                    logger_1.logger.error(`Failed to set InterPAN channel to ${channel} with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 resolve();
@@ -2854,18 +2894,18 @@ class EmberAdapter extends __1.Adapter {
                 const sourceEui64 = (await this.emberGetEui64());
                 msgBuffalo.writeUInt16((consts_2.LONG_DEST_FRAME_CONTROL | consts_2.MAC_ACK_REQUIRED)); // macFrameControl
                 msgBuffalo.writeUInt8(0); // sequence Skip Sequence number, stack sets the sequence number.
-                msgBuffalo.writeUInt16(consts_2.INVALID_PAN_ID); // destPanId
+                msgBuffalo.writeUInt16(ZSpec.INVALID_PAN_ID); // destPanId
                 msgBuffalo.writeIeeeAddr(ieeeAddress); // destAddress (longAddress)
                 msgBuffalo.writeUInt16(sourcePanId); // sourcePanId
                 msgBuffalo.writeIeeeAddr(sourceEui64); // sourceAddress
                 msgBuffalo.writeUInt16(consts_2.STUB_NWK_FRAME_CONTROL); // nwkFrameControl
-                msgBuffalo.writeUInt8((enums_2.EmberInterpanMessageType.UNICAST | consts_2.INTERPAN_APS_FRAME_TYPE)); // apsFrameControl
+                msgBuffalo.writeUInt8((enums_3.EmberInterpanMessageType.UNICAST | consts_2.INTERPAN_APS_FRAME_TYPE)); // apsFrameControl
                 msgBuffalo.writeUInt16(zclFrame.cluster.ID);
-                msgBuffalo.writeUInt16(consts_2.TOUCHLINK_PROFILE_ID);
+                msgBuffalo.writeUInt16(ZSpec.TOUCHLINK_PROFILE_ID);
                 logger_1.logger.debug(`~~~> [ZCL TOUCHLINK to=${ieeeAddress} header=${JSON.stringify(zclFrame.header)}]`, NS);
                 const status = (await this.ezsp.ezspSendRawMessage(Buffer.concat([msgBuffalo.getWritten(), zclFrame.toBuffer()])));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`~x~> [ZCL TOUCHLINK to=${ieeeAddress}] Failed to send with status=${enums_2.EmberStatus[status]}.`, NS);
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`~x~> [ZCL TOUCHLINK to=${ieeeAddress}] Failed to send with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 // NOTE: can use ezspRawTransmitCompleteHandler if needed here
@@ -2882,12 +2922,12 @@ class EmberAdapter extends __1.Adapter {
         }
         // just for waitress
         const apsFrame = {
-            profileId: consts_2.TOUCHLINK_PROFILE_ID,
+            profileId: ZSpec.TOUCHLINK_PROFILE_ID,
             clusterId: zclFrame.cluster.ID,
             sourceEndpoint: 0,
             destinationEndpoint: 0,
-            options: enums_2.EmberApsOption.NONE,
-            groupId: consts_2.EMBER_SLEEPY_BROADCAST_ADDRESS,
+            options: enums_3.EmberApsOption.NONE,
+            groupId: enums_1.BroadcastAddress.SLEEPY,
             sequence: 0, // set by stack
         };
         return new Promise((resolve, reject) => {
@@ -2898,19 +2938,19 @@ class EmberAdapter extends __1.Adapter {
                 const sourceEui64 = (await this.emberGetEui64());
                 msgBuffalo.writeUInt16(consts_2.SHORT_DEST_FRAME_CONTROL); // macFrameControl
                 msgBuffalo.writeUInt8(0); // sequence Skip Sequence number, stack sets the sequence number.
-                msgBuffalo.writeUInt16(consts_2.INVALID_PAN_ID); // destPanId
+                msgBuffalo.writeUInt16(ZSpec.INVALID_PAN_ID); // destPanId
                 msgBuffalo.writeUInt16(apsFrame.groupId); // destAddress (longAddress)
                 msgBuffalo.writeUInt16(sourcePanId); // sourcePanId
                 msgBuffalo.writeIeeeAddr(sourceEui64); // sourceAddress
                 msgBuffalo.writeUInt16(consts_2.STUB_NWK_FRAME_CONTROL); // nwkFrameControl
-                msgBuffalo.writeUInt8((enums_2.EmberInterpanMessageType.BROADCAST | consts_2.INTERPAN_APS_FRAME_TYPE)); // apsFrameControl
+                msgBuffalo.writeUInt8((enums_3.EmberInterpanMessageType.BROADCAST | consts_2.INTERPAN_APS_FRAME_TYPE)); // apsFrameControl
                 msgBuffalo.writeUInt16(apsFrame.clusterId);
                 msgBuffalo.writeUInt16(apsFrame.profileId);
                 const data = Buffer.concat([msgBuffalo.getWritten(), zclFrame.toBuffer()]);
                 logger_1.logger.debug(`~~~> [ZCL TOUCHLINK BROADCAST header=${JSON.stringify(zclFrame.header)}]`, NS);
                 const status = (await this.ezsp.ezspSendRawMessage(data));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`~x~> [ZCL TOUCHLINK BROADCAST] Failed to send with status=${enums_2.EmberStatus[status]}.`, NS);
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`~x~> [ZCL TOUCHLINK BROADCAST] Failed to send with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 // NOTE: can use ezspRawTransmitCompleteHandler if needed here
@@ -2921,7 +2961,7 @@ class EmberAdapter extends __1.Adapter {
                     commandIdentifier: command.response,
                 }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT * 2)); // XXX: touchlink timeout?
                 resolve(result);
-                return enums_2.EmberStatus.SUCCESS;
+                return enums_3.EmberStatus.SUCCESS;
             }, reject);
         });
     }
@@ -2930,8 +2970,8 @@ class EmberAdapter extends __1.Adapter {
         return new Promise((resolve, reject) => {
             this.requestQueue.enqueue(async () => {
                 const status = (await this.ezsp.ezspSetLogicalAndRadioChannel(this.networkOptions.channelList[0]));
-                if (status !== enums_2.EmberStatus.SUCCESS) {
-                    logger_1.logger.error(`Failed to restore InterPAN channel to ${this.networkOptions.channelList[0]} with status=${enums_2.EmberStatus[status]}.`, NS);
+                if (status !== enums_3.EmberStatus.SUCCESS) {
+                    logger_1.logger.error(`Failed to restore InterPAN channel to ${this.networkOptions.channelList[0]} with status=${enums_3.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 // let adapter settle down
@@ -2947,7 +2987,7 @@ class EmberAdapter extends __1.Adapter {
         if (this.interpanLock) {
             logger_1.logger.error(`[INTERPAN MODE] Cannot execute non-InterPAN commands.`, NS);
             // will be caught by request queue and rejected internally.
-            throw new Error(enums_2.EzspStatus[enums_2.EzspStatus.ERROR_INVALID_CALL]);
+            throw new Error(enums_3.EzspStatus[enums_3.EzspStatus.ERROR_INVALID_CALL]);
         }
     }
 }