@willieee802/zigbee-herdsman 0.34.3 → 0.48.1

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

@@ -1,19 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmberAdapter = void 0;
 /* istanbul ignore file */
-const debug_1 = __importDefault(require("debug"));
 const es6_1 = __importDefault(require("fast-deep-equal/es6"));
 const mz_1 = require("mz");
 const serialPortUtils_1 = __importDefault(require("../../serialPortUtils"));
 const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
 const utils_1 = require("../../../utils");
 const __1 = require("../..");
-const zcl_1 = require("../../../zcl");
-const cluster_1 = __importDefault(require("../../../zcl/definition/cluster"));
+const Zcl = __importStar(require("../../../zspec/zcl"));
 const events_1 = require("../../events");
 const math_1 = require("../utils/math");
 const ezsp_1 = require("../ezsp/ezsp");
@@ -28,7 +49,9 @@ const endpoints_1 = require("./endpoints");
 const initters_1 = require("../utils/initters");
 const crypto_1 = require("crypto");
 const oneWaitress_1 = require("./oneWaitress");
-const debug = (0, debug_1.default)('zigbee-herdsman:adapter:ember:adapter');
+const logger_1 = require("../../../utils/logger");
+// import {EmberTokensManager} from "./tokensManager";
+const NS = 'zh:ember';
 /** Enum to pass strings from numbers up to Z2M. */
 var RoutingTableStatus;
 (function (RoutingTableStatus) {
@@ -42,15 +65,6 @@ var RoutingTableStatus;
     RoutingTableStatus[RoutingTableStatus["RESERVED3"] = 7] = "RESERVED3";
 })(RoutingTableStatus || (RoutingTableStatus = {}));
 ;
-/** Events specific to OneWaitress usage. */
-var OneWaitressEvents;
-(function (OneWaitressEvents) {
-    OneWaitressEvents["STACK_STATUS_NETWORK_UP"] = "STACK_STATUS_NETWORK_UP";
-    OneWaitressEvents["STACK_STATUS_NETWORK_DOWN"] = "STACK_STATUS_NETWORK_DOWN";
-    OneWaitressEvents["STACK_STATUS_NETWORK_OPENED"] = "STACK_STATUS_NETWORK_OPENED";
-    OneWaitressEvents["STACK_STATUS_NETWORK_CLOSED"] = "STACK_STATUS_NETWORK_CLOSED";
-})(OneWaitressEvents || (OneWaitressEvents = {}));
-;
 var NetworkInitAction;
 (function (NetworkInitAction) {
     /** Ain't that nice! */
@@ -116,11 +130,15 @@ const BACKUP_OLDEST_SUPPORTED_EZSP_VERSION = 12;
 const BROADCAST_NETWORK_KEY_SWITCH_WAIT_TIME = 15000;
 /**
  * Stack configuration values for various supported stacks.
+ *
+ * https://github.com/darkxst/silabs-firmware-builder/tree/main/manifests
+ * https://github.com/NabuCasa/silabs-firmware/wiki/Zigbee-EmberZNet-NCP-firmware-configuration#skyconnect
+ * https://github.com/SiliconLabs/UnifySDK/blob/main/applications/zigbeed/project_files/zigbeed.slcp
  */
 const STACK_CONFIGS = {
     "default": {
         /** <1-250> (Default: 2) @see EzspConfigId.ADDRESS_TABLE_SIZE */
-        ADDRESS_TABLE_SIZE: 16, // zigpc: 32, darkxst: 16
+        ADDRESS_TABLE_SIZE: 16, // zigpc: 32, darkxst: 16, nabucasa: 16
         /** <0-4> (Default: 2) @see EzspConfigId.TRUST_CENTER_ADDRESS_CACHE_SIZE */
         TRUST_CENTER_ADDRESS_CACHE_SIZE: 2,
         /** (Default: USE_TOKEN) @see EzspConfigId.TX_POWER_MODE */
@@ -132,7 +150,7 @@ const STACK_CONFIGS = {
         /** <-> (Default: ) @see EzspConfigId.SECURITY_LEVEL */
         SECURITY_LEVEL: consts_2.SECURITY_LEVEL_Z3,
         /** (Default: KEEP_ALIVE_SUPPORT_ALL) @see EzspValueId.END_DEVICE_KEEP_ALIVE_SUPPORT_MODE */
-        END_DEVICE_KEEP_ALIVE_SUPPORT_MODE: enums_2.EmberKeepAliveMode.KEEP_ALIVE_SUPPORT_ALL, // zigpc: KEEP_ALIVE_SUPPORT_ALL
+        END_DEVICE_KEEP_ALIVE_SUPPORT_MODE: enums_2.EmberKeepAliveMode.KEEP_ALIVE_SUPPORT_ALL,
         /** <-> (Default: MAXIMUM_APS_PAYLOAD_LENGTH) @see EzspValueId.MAXIMUM_INCOMING_TRANSFER_SIZE */
         MAXIMUM_INCOMING_TRANSFER_SIZE: consts_2.MAXIMUM_APS_PAYLOAD_LENGTH,
         /** <-> (Default: MAXIMUM_APS_PAYLOAD_LENGTH) @see EzspValueId.MAXIMUM_OUTGOING_TRANSFER_SIZE */
@@ -140,27 +158,27 @@ const STACK_CONFIGS = {
         /** <-> (Default: 10000) @see EzspValueId.TRANSIENT_DEVICE_TIMEOUT */
         TRANSIENT_DEVICE_TIMEOUT: 10000,
         /** <0-127> (Default: 2) @see EzspConfigId.BINDING_TABLE_SIZE */
-        BINDING_TABLE_SIZE: 5, // zigpc: 2, Z3GatewayGPCombo: 5
+        BINDING_TABLE_SIZE: 32, // zigpc: 2, Z3GatewayGPCombo: 5, nabucasa: 32
         /** <0-127> (Default: 0) @see EzspConfigId.KEY_TABLE_SIZE */
         KEY_TABLE_SIZE: 0, // zigpc: 4
         /** <6-64> (Default: 6) @see EzspConfigId.MAX_END_DEVICE_CHILDREN */
-        MAX_END_DEVICE_CHILDREN: 6, // zigpc: 6
+        MAX_END_DEVICE_CHILDREN: 32, // zigpc: 6, nabucasa: 32, Dongle-E (Sonoff firmware): 32
         /** <1-255> (Default: 10) @see EzspConfigId.APS_UNICAST_MESSAGE_COUNT */
-        APS_UNICAST_MESSAGE_COUNT: 20, // zigpc: 10, darkxst: 20
+        APS_UNICAST_MESSAGE_COUNT: 32, // zigpc: 10, darkxst: 20, nabucasa: 20
         /** <15-254> (Default: 15) @see EzspConfigId.BROADCAST_TABLE_SIZE */
         BROADCAST_TABLE_SIZE: 15, // zigpc: 15, Z3GatewayGPCombo: 35 - NOTE: Sonoff Dongle-E fails at 35
         /** [1, 16, 26] (Default: 16). @see EzspConfigId.NEIGHBOR_TABLE_SIZE */
-        NEIGHBOR_TABLE_SIZE: 26, // zigpc: 16, darkxst: 26
+        NEIGHBOR_TABLE_SIZE: 26, // zigpc: 16, darkxst: 26, nabucasa: 26
         /** (Default: 8) @see EzspConfigId.END_DEVICE_POLL_TIMEOUT */
         END_DEVICE_POLL_TIMEOUT: 8, // zigpc: 8
         /** <0-65535> (Default: 300) @see EzspConfigId.TRANSIENT_KEY_TIMEOUT_S */
         TRANSIENT_KEY_TIMEOUT_S: 300, // zigpc: 65535
         /** <-> (Default: 16) @see EzspConfigId.RETRY_QUEUE_SIZE */
-        RETRY_QUEUE_SIZE: 16,
+        RETRY_QUEUE_SIZE: 16, // nabucasa: 16
         /** <0-255> (Default: 0) @see EzspConfigId.SOURCE_ROUTE_TABLE_SIZE */
-        SOURCE_ROUTE_TABLE_SIZE: 200, // Z3GatewayGPCombo: 100, darkxst: 200
+        SOURCE_ROUTE_TABLE_SIZE: 200, // Z3GatewayGPCombo: 100, darkxst: 200, nabucasa: 200
         /** <1-250> (Default: 8) @see EzspConfigId.MULTICAST_TABLE_SIZE */
-        MULTICAST_TABLE_SIZE: 16, // darkxst: 16
+        MULTICAST_TABLE_SIZE: 16, // darkxst: 16, nabucasa: 16 - NOTE: should always be at least enough to register FIXED_ENDPOINTS multicastIds
     },
     "zigbeed": {
         ADDRESS_TABLE_SIZE: 128,
@@ -184,18 +202,17 @@ const STACK_CONFIGS = {
         RETRY_QUEUE_SIZE: 16,
         SOURCE_ROUTE_TABLE_SIZE: 254,
         MULTICAST_TABLE_SIZE: 128,
-        /*
-        ROUTE_TABLE_SIZE: 254,
-        DISCOVERY_TABLE_SIZE: 64,
-        PACKET_BUFFER_COUNT: 255,
-        CUSTOM_MAC_FILTER_TABLE_SIZE: 64,
-        MAC_FILTER_TABLE_SIZE: 32,
-        CHILD_TABLE_SIZE: 64,
-        PLUGIN_ZIGBEE_PRO_STACK_CHILD_TABLE_SIZE: 64,
-        APS_MESSAGE_COUNT: 64,
-        */
     },
 };
+/**
+ * NOTE: This from SDK is currently ignored here because of issues in below links:
+ * - BUGZID 12261: Concentrators use MTORRs for route discovery and should not enable route discovery in the APS options.
+ * - https://community.silabs.com/s/question/0D58Y00008DRfDCSA1/coordinator-cant-send-unicast-to-sleepy-node-after-reboot
+ * - https://community.silabs.com/s/question/0D58Y0000B4nTb7SQE/largedense-network-communication-problem-source-route-table-not-big-enough
+ *
+ * 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);
 /**
  * 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.
@@ -210,12 +227,25 @@ const DEFAULT_ZCL_REQUEST_TIMEOUT = 15000; //msec
 const DEFAULT_NETWORK_REQUEST_TIMEOUT = 10000; // nothing on the network to bother requests, should be much faster than this
 /** Time between watchdog counters reading/clearing */
 const WATCHDOG_COUNTERS_FEED_INTERVAL = 3600000; // every hour...
+/** Default manufacturer code reported by coordinator. */
+const DEFAULT_MANUFACTURER_CODE = Zcl.ManufacturerCode.SILICON_LABORATORIES;
+/**
+ * Workaround for devices that require a specific manufacturer code to be reported by coordinator while interviewing...
+ * - Lumi/Aqara devices do not work properly otherwise (missing features): https://github.com/Koenkk/zigbee2mqtt/issues/9274
+ */
+const WORKAROUND_JOIN_MANUF_IEEE_PREFIX_TO_CODE = {
+    // NOTE: Lumi has a new prefix registered since 2021, in case they start using that one with new devices, it might need to be added here too...
+    //       "0x18c23c" https://maclookup.app/vendors/lumi-united-technology-co-ltd
+    "0x54ef44": Zcl.ManufacturerCode.LUMI_UNITED_TECHOLOGY_LTD_SHENZHEN,
+};
 /**
  * Relay calls between Z2M and EZSP-layer and handle any error that might occur via queue & waitress.
  *
  * Anything post `start` that requests anything from the EZSP layer must run through the request queue for proper execution flow.
  */
 class EmberAdapter extends __1.Adapter {
+    /** Current manufacturer code assigned to the coordinator. Used for join workarounds... */
+    manufacturerCode;
     /** Key in STACK_CONFIGS */
     stackConfig;
     /** EMBER_LOW_RAM_CONCENTRATOR or EMBER_HIGH_RAM_CONCENTRATOR. */
@@ -238,24 +268,19 @@ 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;
-    defaultApsOptions;
-    /**
-     * Mirrors the NCP multicast table. null === not in use.
-     * Index 0 is Green Power and must always remain there.
-     */
-    multicastTable;
-    constructor(networkOptions, serialPortOptions, backupPath, adapterOptions, logger) {
-        super(networkOptions, serialPortOptions, backupPath, adapterOptions, logger);
-        // TODO config, should be fine like this for now?
-        this.stackConfig = socketPortUtils_1.default.isTcpPath(serialPortOptions.path) ? 'zigbeed' : 'default';
+    constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
+        super(networkOptions, serialPortOptions, backupPath, adapterOptions);
+        // TODO config
+        // XXX: 'zigbeed': 4.4.x/7.4.x not supported by multiprotocol at the moment, will need refactoring when/if support is added
+        this.stackConfig = 'default';
         // TODO config
         this.concentratorType = consts_2.EMBER_HIGH_RAM_CONCENTRATOR;
-        // TODO: config dispatch interval, tested at 100, 80, 60
-        this.requestQueue = new requestQueue_1.EmberRequestQueue(60);
+        const delay = (typeof this.adapterOptions.delay === 'number') ? Math.min(Math.max(this.adapterOptions.delay, 5), 60) : 5;
+        logger_1.logger.debug(`Using delay=${delay}.`, NS);
+        this.requestQueue = new requestQueue_1.EmberRequestQueue(delay);
         this.oneWaitress = new oneWaitress_1.EmberOneWaitress();
         this.zdoRequestBuffalo = new buffalo_1.EzspBuffalo(Buffer.alloc(consts_1.EZSP_MAX_FRAME_LENGTH));
-        // TODO: config tick interval, tested at 500, 300, 100, 60, 30, all work fine and only really noticeable with interviews
-        this.ezsp = new ezsp_1.Ezsp(60, serialPortOptions);
+        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.ZDO_RESPONSE, this.onZDOResponse.bind(this));
@@ -274,36 +299,34 @@ class EmberAdapter extends __1.Adapter {
         this.clearNetworkCache();
         switch (status) {
             case enums_2.EmberStatus.NETWORK_UP: {
-                this.oneWaitress.resolveEvent(OneWaitressEvents.STACK_STATUS_NETWORK_UP);
-                console.log(`[STACK STATUS] 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: {
-                this.oneWaitress.resolveEvent(OneWaitressEvents.STACK_STATUS_NETWORK_DOWN);
-                console.log(`[STACK STATUS] 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: {
-                this.oneWaitress.resolveEvent(OneWaitressEvents.STACK_STATUS_NETWORK_OPENED);
-                this.requestQueue.enqueue(async () => {
-                    const setJPstatus = (await this.emberSetJoinPolicy(enums_2.EmberJoinDecision.USE_PRECONFIGURED_KEY));
-                    if (setJPstatus !== enums_2.EzspStatus.SUCCESS) {
-                        console.error(`[ZDO] Failed set join policy for with status=${enums_2.EzspStatus[setJPstatus]}.`);
-                        return enums_2.EmberStatus.ERR_FATAL;
-                    }
-                    return enums_2.EmberStatus.SUCCESS;
-                }, console.error, // no reject, just log error if any
-                true);
-                console.log(`[STACK STATUS] 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: {
-                this.oneWaitress.resolveEvent(OneWaitressEvents.STACK_STATUS_NETWORK_CLOSED);
-                console.log(`[STACK STATUS] 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: {
+                this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_CHANNEL_CHANGED);
+                // invalidate cache
+                this.networkCache.parameters.radioChannel = consts_2.INVALID_RADIO_CHANNEL;
+                logger_1.logger.info(`[STACK STATUS] Channel changed.`, NS);
                 break;
             }
             default: {
-                debug(`[STACK STATUS] ${enums_2.EmberStatus[status]}.`);
+                logger_1.logger.debug(`[STACK STATUS] ${enums_2.EmberStatus[status]}.`, NS);
                 break;
             }
         }
@@ -324,8 +347,8 @@ class EmberAdapter extends __1.Adapter {
             case enums_2.EmberOutgoingMessageType.MULTICAST:
             case enums_2.EmberOutgoingMessageType.MULTICAST_WITH_ALIAS: {
                 // BC/MC not checking for message sent, avoid unnecessary waitress lookups
-                console.error(`Delivery of ${enums_2.EmberOutgoingMessageType[type]} failed for "${indexOrDestination}" `
-                    + `[apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`);
+                logger_1.logger.error(`Delivery of ${enums_2.EmberOutgoingMessageType[type]} failed for "${indexOrDestination}" `
+                    + `[apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`, NS);
                 break;
             }
             default: {
@@ -369,32 +392,19 @@ class EmberAdapter extends __1.Adapter {
      * @param messageContents
      */
     async onIncomingMessage(type, apsFrame, lastHopLqi, sender, messageContents) {
-        try {
-            const payload = {
-                address: sender,
-                frame: zcl_1.ZclFrame.fromBuffer(apsFrame.clusterId, messageContents),
-                endpoint: apsFrame.sourceEndpoint,
-                linkquality: lastHopLqi,
-                groupID: apsFrame.groupId,
-                wasBroadcast: ((type === enums_2.EmberIncomingMessageType.BROADCAST) || (type === enums_2.EmberIncomingMessageType.BROADCAST_LOOPBACK)),
-                destinationEndpoint: apsFrame.destinationEndpoint,
-            };
-            this.oneWaitress.resolveZCL(payload);
-            this.emit(events_1.Events.zclData, payload);
-        }
-        catch (error) {
-            const payload = {
-                clusterID: apsFrame.clusterId,
-                address: sender,
-                data: messageContents,
-                endpoint: apsFrame.sourceEndpoint,
-                linkquality: lastHopLqi,
-                groupID: apsFrame.groupId,
-                wasBroadcast: ((type === enums_2.EmberIncomingMessageType.BROADCAST) || (type === enums_2.EmberIncomingMessageType.BROADCAST_LOOPBACK)),
-                destinationEndpoint: apsFrame.destinationEndpoint,
-            };
-            this.emit(events_1.Events.rawData, payload);
-        }
+        const payload = {
+            clusterID: apsFrame.clusterId,
+            header: Zcl.Header.fromBuffer(messageContents),
+            address: sender,
+            data: messageContents,
+            endpoint: apsFrame.sourceEndpoint,
+            linkquality: lastHopLqi,
+            groupID: apsFrame.groupId,
+            wasBroadcast: ((type === enums_2.EmberIncomingMessageType.BROADCAST) || (type === enums_2.EmberIncomingMessageType.BROADCAST_LOOPBACK)),
+            destinationEndpoint: apsFrame.destinationEndpoint,
+        };
+        this.oneWaitress.resolveZCL(payload);
+        this.emit(events_1.Events.zclPayload, payload);
     }
     /**
      * Emitted from @see Ezsp.ezspMacFilterMatchMessageHandler when the message is a valid InterPAN touchlink message.
@@ -407,7 +417,9 @@ class EmberAdapter extends __1.Adapter {
      */
     async onTouchlinkMessage(sourcePanId, sourceAddress, groupId, lastHopLqi, messageContents) {
         const payload = {
-            frame: zcl_1.ZclFrame.fromBuffer(cluster_1.default.touchlink.ID, messageContents),
+            clusterID: Zcl.Clusters.touchlink.ID,
+            data: messageContents,
+            header: Zcl.Header.fromBuffer(messageContents),
             address: sourceAddress,
             endpoint: 1, // arbitrary since not sent over-the-air
             linkquality: lastHopLqi,
@@ -416,7 +428,7 @@ class EmberAdapter extends __1.Adapter {
             destinationEndpoint: endpoints_1.FIXED_ENDPOINTS[0].endpoint,
         };
         this.oneWaitress.resolveZCL(payload);
-        this.emit(events_1.Events.zclData, payload);
+        this.emit(events_1.Events.zclPayload, payload);
     }
     /**
      * Emitted from @see Ezsp.ezspGpepIncomingMessageHandler
@@ -442,27 +454,29 @@ class EmberAdapter extends __1.Adapter {
             gpdHeader.writeUInt32LE(frameCounter, 9); // frameCounter
             gpdHeader.writeUInt8(gpdCommandId, 13); // commandID
             gpdHeader.writeUInt8(gpdCommandPayload.length, 14); // payloadSize
-            const gpFrame = zcl_1.ZclFrame.fromBuffer(cluster_1.default.greenPower.ID, Buffer.concat([gpdHeader, gpdCommandPayload]));
+            const data = Buffer.concat([gpdHeader, gpdCommandPayload]);
             const payload = {
-                frame: gpFrame,
+                header: Zcl.Header.fromBuffer(data),
+                data,
+                clusterID: Zcl.Clusters.greenPower.ID,
                 address: sourceId,
                 endpoint: consts_2.GP_ENDPOINT,
                 linkquality: gpdLink,
                 groupID: this.greenPowerGroup,
-                // XXX: upstream sends to `gppNwkAddr` if `wasBroadcast` is false, even if `gppNwkAddr` is null
-                wasBroadcast: (gpFrame.Payload.gppNwkAddr != null) ? false : true,
+                wasBroadcast: true,
                 destinationEndpoint: consts_2.GP_ENDPOINT,
             };
             this.oneWaitress.resolveZCL(payload);
-            this.emit(events_1.Events.zclData, payload);
+            this.emit(events_1.Events.zclPayload, payload);
         }
         catch (err) {
-            console.error(`<~x~ [GP] Failed creating ZCL payload. Skipping. ${err}`);
+            logger_1.logger.error(`<~x~ [GP] Failed creating ZCL payload. Skipping. ${err}`, NS);
             return;
         }
     }
     /**
      * Emitted from @see Ezsp.ezspTrustCenterJoinHandler
+     * Also from @see Ezsp.ezspIdConflictHandler as a DEVICE_LEFT
      *
      * @param newNodeId
      * @param newNodeEui64
@@ -472,7 +486,6 @@ class EmberAdapter extends __1.Adapter {
      */
     async onTrustCenterJoin(newNodeId, newNodeEui64, status, policyDecision, parentOfNewNodeId) {
         if (status === enums_2.EmberDeviceUpdate.DEVICE_LEFT) {
-            // NOTE: `policyDecision` here is NO_ACTION and `parentOfNewNodeId` is 65535
             const payload = {
                 networkAddress: newNodeId,
                 ieeeAddr: newNodeEui64,
@@ -485,24 +498,41 @@ class EmberAdapter extends __1.Adapter {
                     networkAddress: newNodeId,
                     ieeeAddr: newNodeEui64,
                 };
-                this.emit(events_1.Events.deviceJoined, payload);
+                // set workaround manuf code if necessary, or revert to default if previous joined device required workaround and new one does not
+                const joinManufCode = WORKAROUND_JOIN_MANUF_IEEE_PREFIX_TO_CODE[newNodeEui64.substring(0, 8)] ?? DEFAULT_MANUFACTURER_CODE;
+                if (this.manufacturerCode !== joinManufCode) {
+                    await new Promise((resolve, reject) => {
+                        this.requestQueue.enqueue(async () => {
+                            logger_1.logger.debug(`[WORKAROUND] Setting coordinator manufacturer code to ${Zcl.ManufacturerCode[joinManufCode]}.`, NS);
+                            await this.ezsp.ezspSetManufacturerCode(joinManufCode);
+                            this.manufacturerCode = joinManufCode;
+                            this.emit(events_1.Events.deviceJoined, payload);
+                            resolve();
+                            return enums_2.EmberStatus.SUCCESS;
+                        }, reject, true);
+                    });
+                }
+                else {
+                    this.emit(events_1.Events.deviceJoined, payload);
+                }
             }
             else {
-                console.log(`[TRUST CENTER] Device ${newNodeId}:${newNodeEui64} was denied joining via ${parentOfNewNodeId}.`);
+                logger_1.logger.warning(`[TRUST CENTER] Device ${newNodeId}:${newNodeEui64} was denied joining via ${parentOfNewNodeId}.`, NS);
             }
         }
     }
     async watchdogCounters() {
-        this.requestQueue.enqueue(async () => {
-            // listed as per EmberCounterType
-            const counters = (await this.ezsp.ezspReadAndClearCounters());
-            let countersLogString = "[NCP COUNTERS] ";
-            for (let i = 0; i < enums_2.EmberCounterType.COUNT; i++) {
-                countersLogString += `${enums_2.EmberCounterType[i]}: ${counters[i]} | `;
-            }
-            console.log(countersLogString);
-            return enums_2.EmberStatus.SUCCESS;
-        }, console.error);
+        await new Promise((resolve, reject) => {
+            this.requestQueue.enqueue(async () => {
+                // listed as per EmberCounterType
+                const ncpCounters = (await this.ezsp.ezspReadAndClearCounters());
+                logger_1.logger.info(`[NCP COUNTERS] ${ncpCounters.join(',')}`, NS);
+                const ashCounters = this.ezsp.ash.readAndClearCounters();
+                logger_1.logger.info(`[ASH COUNTERS] ${ashCounters.join(',')}`, NS);
+                resolve();
+                return enums_2.EmberStatus.SUCCESS;
+            }, reject);
+        });
     }
     initVariables() {
         this.ezsp.removeAllListeners(ezsp_1.EzspEvents.ncpNeedsResetAndInit);
@@ -512,9 +542,7 @@ class EmberAdapter extends __1.Adapter {
         this.zdoRequestRadius = 255;
         this.interpanLock = false;
         this.networkCache = (0, initters_1.initNetworkCache)();
-        this.defaultApsOptions = (enums_2.EmberApsOption.RETRY | enums_2.EmberApsOption.ENABLE_ROUTE_DISCOVERY | enums_2.EmberApsOption.ENABLE_ADDRESS_DISCOVERY);
-        // always at least length==1 because of allowed MULTICAST_TABLE_SIZE range
-        this.multicastTable = new Array(STACK_CONFIGS[this.stackConfig].MULTICAST_TABLE_SIZE).fill(null);
+        this.manufacturerCode = DEFAULT_MANUFACTURER_CODE; // will be set in NCP in initEzsp
         this.ezsp.once(ezsp_1.EzspEvents.ncpNeedsResetAndInit, this.onNcpNeedsResetAndInit.bind(this));
     }
     /**
@@ -523,16 +551,10 @@ class EmberAdapter extends __1.Adapter {
      */
     async initEzsp() {
         let result = "resumed";
-        await this.onNCPPreReset();
-        try {
-            // NOTE: something deep in this call can throw too
-            const result = (await this.ezsp.start());
-            if (result !== enums_2.EzspStatus.SUCCESS) {
-                throw new Error(`Failed to start EZSP layer with status=${enums_2.EzspStatus[result]}.`);
-            }
-        }
-        catch (err) {
-            throw err;
+        // 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]}.`);
         }
         // call before any other command, else fails
         await this.emberVersion();
@@ -540,7 +562,6 @@ class EmberAdapter extends __1.Adapter {
         await this.initNCPAddressTable();
         await this.initNCPConfiguration();
         // WARNING: From here on EZSP commands that affect memory allocation on the NCP should no longer be called (like resizing tables)
-        await this.onNCPPostReset();
         await this.registerFixedEndpoints();
         this.clearNetworkCache();
         result = (await this.initTrustCenter());
@@ -555,7 +576,9 @@ class EmberAdapter extends __1.Adapter {
         this.networkCache.parameters = parameters;
         this.networkCache.status = (await this.ezsp.ezspNetworkState());
         this.networkCache.eui64 = (await this.ezsp.ezspGetEui64());
-        debug(`[INIT] Network Ready! ${JSON.stringify(this.networkCache)}`);
+        logger_1.logger.debug(`[INIT] Network Ready! ${JSON.stringify(this.networkCache)}`, NS);
+        this.watchdogCountersHandle = setInterval(this.watchdogCounters.bind(this), WATCHDOG_COUNTERS_FEED_INTERVAL);
+        this.requestQueue.startDispatching();
         return result;
     }
     /**
@@ -584,9 +607,7 @@ class EmberAdapter extends __1.Adapter {
         await this.emberSetEzspValue(enums_1.EzspValueId.MAXIMUM_INCOMING_TRANSFER_SIZE, 2, (0, math_1.lowHighBytes)(STACK_CONFIGS[this.stackConfig].MAXIMUM_INCOMING_TRANSFER_SIZE));
         await this.emberSetEzspValue(enums_1.EzspValueId.MAXIMUM_OUTGOING_TRANSFER_SIZE, 2, (0, math_1.lowHighBytes)(STACK_CONFIGS[this.stackConfig].MAXIMUM_OUTGOING_TRANSFER_SIZE));
         await this.emberSetEzspValue(enums_1.EzspValueId.TRANSIENT_DEVICE_TIMEOUT, 2, (0, math_1.lowHighBytes)(STACK_CONFIGS[this.stackConfig].TRANSIENT_DEVICE_TIMEOUT));
-        // Set the manufacturing code. This is defined by ZigBee document 053874r10
-        // Ember's ID is 0x1002 and is the default, but this can be overridden in App Builder.
-        await this.ezsp.ezspSetManufacturerCode(consts_2.MANUFACTURER_CODE);
+        await this.ezsp.ezspSetManufacturerCode(this.manufacturerCode);
         // network security init
         await this.emberSetEzspConfigValue(enums_1.EzspConfigId.STACK_PROFILE, STACK_CONFIGS[this.stackConfig].STACK_PROFILE);
         await this.emberSetEzspConfigValue(enums_1.EzspConfigId.SECURITY_LEVEL, STACK_CONFIGS[this.stackConfig].SECURITY_LEVEL);
@@ -643,15 +664,16 @@ class EmberAdapter extends __1.Adapter {
             throw new Error(`[CONCENTRATOR] Failed to set concentrator with status=${status}.`);
         }
         const remainTilMTORR = (await this.ezsp.ezspSetSourceRouteDiscoveryMode(enums_2.EmberSourceRouteDiscoveryMode.RESCHEDULE));
-        console.log(`[CONCENTRATOR] Started source route discovery. ${remainTilMTORR}ms until next broadcast.`);
+        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) {
-                debug(`Multi-network not currently supported. Skipping endpoint ${JSON.stringify(ep)}.`);
+                logger_1.logger.debug(`Multi-network not currently supported. Skipping endpoint ${JSON.stringify(ep)}.`, NS);
                 continue;
             }
             const [epStatus,] = (await this.ezsp.ezspGetEndpointFlags(ep.endpoint));
@@ -659,30 +681,29 @@ class EmberAdapter extends __1.Adapter {
             if (epStatus !== enums_2.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, ep.outClusterList));
+                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) {
-                    debug(`Registered endpoint "${ep.endpoint}" with status=${enums_2.EzspStatus[status]}.`);
+                    logger_1.logger.debug(`Registered endpoint "${ep.endpoint}" with status=${enums_2.EzspStatus[status]}.`, NS);
                 }
                 else {
                     throw new Error(`Failed to register endpoint "${ep.endpoint}" with status=${enums_2.EzspStatus[status]}.`);
                 }
             }
             else {
-                debug(`Endpoint "${ep.endpoint}" already registered.`);
+                logger_1.logger.debug(`Endpoint "${ep.endpoint}" already registered.`, NS);
             }
-            if (ep.endpoint === consts_2.GP_ENDPOINT) {
-                const gpMulticastEntry = {
-                    multicastId: this.greenPowerGroup,
+            for (const multicastId of ep.multicastIds) {
+                const multicastEntry = {
+                    multicastId,
                     endpoint: ep.endpoint,
                     networkIndex: ep.networkIndex,
                 };
-                const status = (await this.ezsp.ezspSetMulticastTableEntry(0, gpMulticastEntry));
+                const status = (await this.ezsp.ezspSetMulticastTableEntry(mcTableIdx++, multicastEntry));
                 if (status !== enums_2.EmberStatus.SUCCESS) {
-                    throw new Error(`Failed to register group "Green Power" in multicast table with status=${enums_2.EmberStatus[status]}.`);
+                    throw new Error(`Failed to register group "${multicastId}" in multicast table with status=${enums_2.EmberStatus[status]}.`);
                 }
-                // NOTE: ensure GP is always added first in the table
-                this.multicastTable[0] = gpMulticastEntry;
-                debug(`Registered multicast table entry: ${JSON.stringify(gpMulticastEntry)}.`);
+                logger_1.logger.debug(`Registered multicast table entry: ${JSON.stringify(multicastEntry)}.`, NS);
             }
         }
     }
@@ -715,21 +736,19 @@ class EmberAdapter extends __1.Adapter {
             bitmask: (enums_2.EmberNetworkInitBitmask.PARENT_INFO_IN_TOKEN | enums_2.EmberNetworkInitBitmask.END_DEVICE_REJOIN_ON_REBOOT)
         };
         const initStatus = (await this.ezsp.ezspNetworkInit(networkInitStruct));
-        debug(`[INIT TC] Network init status=${enums_2.EmberStatus[initStatus]}.`);
+        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]}.`);
         }
         let action = NetworkInitAction.DONE;
         if (initStatus === enums_2.EmberStatus.SUCCESS) {
             // network
-            await this.oneWaitress.startWaitingForEvent({ eventName: OneWaitressEvents.STACK_STATUS_NETWORK_UP }, DEFAULT_NETWORK_REQUEST_TIMEOUT, '[INIT TC] Network init');
+            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());
-            debug(`[INIT TC] Current network config=${JSON.stringify(this.networkOptions)}`);
-            debug(`[INIT TC] Current NCP network: nodeType=${enums_2.EmberNodeType[nodeType]} params=${JSON.stringify(netParams)}`);
-            // XXX: should not force a form when it's only a channel change, just change the channel, wait a sec, then continue the logic
+            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)
-                && ((0, es6_1.default)(this.networkOptions.extendedPanID, netParams.extendedPanId))
-                && (this.networkOptions.channelList.includes(netParams.radioChannel))) {
+                && ((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;
@@ -738,7 +757,7 @@ class EmberAdapter extends __1.Adapter {
                 if (nkStatus !== enums_2.SLStatus.OK) {
                     throw new Error(`[BACKUP] Failed to export Network Key with status=${enums_2.SLStatus[nkStatus]}.`);
                 }
-                debug(`[INIT TC] Current NCP network: networkKey=${networkKey.contents.toString('hex')}`);
+                logger_1.logger.debug(`[INIT TC] Current NCP network: networkKey=${networkKey.contents.toString('hex')}`, NS);
                 // config doesn't match adapter anymore
                 if (!networkKey.contents.equals(configNetworkKey)) {
                     action = NetworkInitAction.LEAVE;
@@ -749,12 +768,12 @@ class EmberAdapter extends __1.Adapter {
                 action = NetworkInitAction.LEAVE;
             }
             if (action === NetworkInitAction.LEAVE) {
-                console.log(`[INIT TC] NCP network does not match config. Leaving network...`);
+                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]}.`);
                 }
-                await this.oneWaitress.startWaitingForEvent({ eventName: OneWaitressEvents.STACK_STATUS_NETWORK_DOWN }, DEFAULT_NETWORK_REQUEST_TIMEOUT, '[INIT TC] Leave network');
+                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
                 action = NetworkInitAction.LEFT;
             }
@@ -772,24 +791,21 @@ class EmberAdapter extends __1.Adapter {
                 }
                 else {
                     // config doesn't match backup
-                    console.log(`[INIT TC] Config does not match backup.`);
+                    logger_1.logger.info(`[INIT TC] Config does not match backup.`, NS);
                     action = NetworkInitAction.FORM_CONFIG;
                 }
             }
             else {
                 // no backup
-                console.log(`[INIT TC] No valid backup found.`);
+                logger_1.logger.info(`[INIT TC] No valid backup found.`, NS);
                 action = NetworkInitAction.FORM_CONFIG;
             }
         }
-        else {
-            action = NetworkInitAction.DONE; // just to be clear
-        }
         //---- from here on, we assume everything is in place for whatever decision was taken above
         let result = 'resumed';
         switch (action) {
             case NetworkInitAction.FORM_BACKUP: {
-                console.log(`[INIT TC] Forming from backup.`);
+                logger_1.logger.info(`[INIT TC] Forming from backup.`, NS);
                 const keyList = backup.devices.map((device) => {
                     const octets = Array.from(device.ieeeAddress.reverse());
                     const deviceEui64 = '0x' + octets.map(octet => octet.toString(16).padStart(2, '0')).join("");
@@ -808,13 +824,13 @@ class EmberAdapter extends __1.Adapter {
                 break;
             }
             case NetworkInitAction.FORM_CONFIG: {
-                console.log(`[INIT TC] Forming from config.`);
+                logger_1.logger.info(`[INIT TC] Forming from config.`, NS);
                 await this.formNetwork(false, /*from config*/ configNetworkKey, 0, this.networkOptions.panID, this.networkOptions.extendedPanID, this.networkOptions.channelList[0], (0, crypto_1.randomBytes)(consts_1.EMBER_ENCRYPTION_KEY_SIZE));
                 result = 'reset';
                 break;
             }
             case NetworkInitAction.DONE: {
-                console.log(`[INIT TC] NCP network matches config.`);
+                logger_1.logger.info(`[INIT TC] NCP network matches config.`, NS);
                 break;
             }
             default: {
@@ -826,17 +842,17 @@ class EmberAdapter extends __1.Adapter {
             // XXX: while this remains a pretty low occurrence in most (small) networks,
             //      currently Z2M won't support the key update because of one-way config...
             //      need to investigate handling this properly
-            // console.warn(`[INIT TC] Network key frame counter is reaching its limit. Scheduling broadcast to update network key. `
-            //     + `This may result in some devices (especially battery-powered) temporarily losing connection.`);
+            // logger.warning(`[INIT TC] Network key frame counter is reaching its limit. Scheduling broadcast to update network key. `
+            //     + `This may result in some devices (especially battery-powered) temporarily losing connection.`, NS);
             // // XXX: no idea here on the proper timer value, but this will block the network for several seconds on exec
             // //      (probably have to take the behavior of sleepy-end devices into account to improve chances of reaching everyone right away?)
             // setTimeout(async () => {
             //     this.requestQueue.enqueue(async (): Promise<EmberStatus> => {
             //         await this.broadcastNetworkKeyUpdate();
             //         return EmberStatus.SUCCESS;
-            //     }, console.error, true);// no reject just log error if any, will retry next start, & prioritize so we know it'll run when expected
+            //     }, logger.error, true);// no reject just log error if any, will retry next start, & prioritize so we know it'll run when expected
             // }, 300000);
-            console.warn(`[INIT TC] Network key frame counter is reaching its limit. A new network key will have to be instaured soon.`);
+            logger_1.logger.warning(`[INIT TC] Network key frame counter is reaching its limit. A new network key will have to be instaured soon.`, NS);
         }
         return result;
     }
@@ -881,15 +897,15 @@ class EmberAdapter extends __1.Adapter {
             nwkUpdateId: 0,
             channels: consts_2.EMBER_ALL_802_15_4_CHANNELS_MASK,
         };
-        console.log(`[INIT FORM] Forming new network with: ${JSON.stringify(netParams)}`);
+        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]}.`);
         }
-        await this.oneWaitress.startWaitingForEvent({ eventName: OneWaitressEvents.STACK_STATUS_NETWORK_UP }, DEFAULT_NETWORK_REQUEST_TIMEOUT, '[INIT FORM] Form network');
+        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();
-        debug(`[INIT FORM] Start writing stack tokens status=${enums_2.EzspStatus[stStatus]}.`);
-        console.log(`[INIT FORM] New network formed!`);
+        logger_1.logger.debug(`[INIT FORM] Start writing stack tokens status=${enums_2.EzspStatus[stStatus]}.`, NS);
+        logger_1.logger.info(`[INIT FORM] New network formed!`, NS);
     }
     /**
      * Loads currently stored backup and returns it in internal backup model.
@@ -913,10 +929,10 @@ class EmberAdapter extends __1.Adapter {
                 throw new Error(`[BACKUP] Unsupported open coordinator backup version (version=${data.metadata?.version}).`);
             }
             if (!data.stack_specific?.ezsp || !data.metadata.internal.ezspVersion) {
-                throw new Error(`[BACKUP] Specified backup is not EZSP.`);
+                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] Specified backup is not a supported EZSP version (min: ${BACKUP_OLDEST_SUPPORTED_EZSP_VERSION}).`);
+                throw new Error(`[BACKUP] Current backup file is from an unsupported EZSP version (min: ${BACKUP_OLDEST_SUPPORTED_EZSP_VERSION}).`);
             }
             return utils_1.BackupUtils.fromUnifiedBackup(data);
         }
@@ -941,7 +957,7 @@ class EmberAdapter extends __1.Adapter {
         const keyList = [];
         for (let i = 0; i < keyTableSize; i++) {
             [deviceEui64, plaintextKey, apsKeyMeta, status] = (await this.ezsp.ezspExportLinkKeyByIndex(i));
-            debug(`[BACKUP] Export link key at index ${i}, status=${enums_2.SLStatus[status]}.`);
+            logger_1.logger.debug(`[BACKUP] Export link key at index ${i}, status=${enums_2.SLStatus[status]}.`, NS);
             // only include key if we could retrieve one at index and hash it properly
             if (status === enums_2.SLStatus.OK) {
                 // Rather than give the real link key, the backup contains a hashed version of the key.
@@ -958,11 +974,11 @@ class EmberAdapter extends __1.Adapter {
                 }
                 else {
                     // this should never happen?
-                    console.error(`[BACKUP] Failed to hash link key at index ${i} with status=${enums_2.EmberStatus[hashStatus]}. Omitting from backup.`);
+                    logger_1.logger.error(`[BACKUP] Failed to hash link key at index ${i} with status=${enums_2.EmberStatus[hashStatus]}. Omitting from backup.`, NS);
                 }
             }
         }
-        console.log(`[BACKUP] Retrieved ${keyList.length} link keys.`);
+        logger_1.logger.info(`[BACKUP] Retrieved ${keyList.length} link keys.`, NS);
         return keyList;
     }
     /**
@@ -1000,7 +1016,7 @@ class EmberAdapter extends __1.Adapter {
                     + `with status=${enums_2.EmberStatus[status]}`);
             }
         }
-        debug(`[BACKUP] Imported ${backupData.length} keys.`);
+        logger_1.logger.info(`[BACKUP] Imported ${backupData.length} keys.`, NS);
     }
     /**
      * Routine to update the network key and broadcast the update to the network after a set time.
@@ -1011,11 +1027,11 @@ class EmberAdapter extends __1.Adapter {
     async broadcastNetworkKeyUpdate() {
         return new Promise((resolve, reject) => {
             this.requestQueue.enqueue(async () => {
-                console.warn(`[TRUST CENTER] Performing a network key update. This might take a while and disrupt normal operation.`);
+                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) {
-                    console.error(`[TRUST CENTER] Failed to broadcast next network key with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`[TRUST CENTER] Failed to broadcast next network key with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 // XXX: this will block other requests for a while, but should ensure the key propagates without interference?
@@ -1024,7 +1040,7 @@ class EmberAdapter extends __1.Adapter {
                 status = (await this.ezsp.ezspBroadcastNetworkKeySwitch());
                 if (status !== enums_2.EmberStatus.SUCCESS) {
                     // XXX: Not sure how likely this is, but this is bad, probably should hard fail?
-                    console.error(`[TRUST CENTER] Failed to broadcast network key switch with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`[TRUST CENTER] Failed to broadcast network key switch with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 resolve();
@@ -1037,117 +1053,17 @@ class EmberAdapter extends __1.Adapter {
      * @param status
      */
     async onNcpNeedsResetAndInit(status) {
-        console.error(`!!! NCP FATAL ERROR reason=${enums_2.EzspStatus[status]}. ATTEMPTING RESET... !!!`);
+        logger_1.logger.error(`!!! NCP FATAL ERROR reason=${enums_2.EzspStatus[status]}. ATTEMPTING RESET... !!!`, NS);
         try {
             await this.stop();
             await (0, utils_1.Wait)(500); // just because
             await this.start();
         }
         catch (err) {
-            console.error(`Failed to reset and init NCP. ${err}`);
+            logger_1.logger.error(`Failed to reset and init NCP. ${err}`, NS);
             this.emit(events_1.Events.disconnected);
         }
     }
-    /**
-     * Called right before a NCP reset.
-     */
-    async onNCPPreReset() {
-        this.requestQueue.stopDispatching();
-    }
-    /**
-     * Called right after a NCP reset, right before the creation of endpoints.
-     */
-    async onNCPPostReset() {
-        this.requestQueue.startDispatching();
-        this.watchdogCountersHandle = setInterval(this.watchdogCounters.bind(this), WATCHDOG_COUNTERS_FEED_INTERVAL);
-    }
-    /**
-     * Handle changes in groups that needs to be propagated to the NCP multicast table.
-     *
-     * XXX: Since Z2M doesn't explicitly check-in downstream when groups are created/removed, we look at outgoing genGroups commands.
-     * If the NCP doesn't know about groups, it can miss messages from some devices (remotes for example), so we add it...
-     *
-     * @param commandId
-     * @param groupId
-     */
-    async onGroupChange(commandId, groupId) {
-        switch (commandId) {
-            case cluster_1.default.genGroups.commands.add.ID: {
-                // check if group already in multicast table, should not happen...
-                const existingIndex = this.multicastTable.findIndex((e) => ((e != null) && (e.multicastId === groupId)));
-                if (existingIndex == -1) {
-                    // find first unused index
-                    const newEntryIndex = this.multicastTable.findIndex((e) => (!e));
-                    if (newEntryIndex != -1) {
-                        const newEntry = {
-                            multicastId: groupId,
-                            endpoint: endpoints_1.FIXED_ENDPOINTS[0].endpoint,
-                            networkIndex: endpoints_1.FIXED_ENDPOINTS[0].networkIndex,
-                        };
-                        const status = (await this.ezsp.ezspSetMulticastTableEntry(newEntryIndex, newEntry));
-                        if (status !== enums_2.EmberStatus.SUCCESS) {
-                            console.error(`Failed to register group "${groupId}" in multicast table at index "${newEntryIndex}" with status=${enums_2.EmberStatus[status]}.`);
-                        }
-                        else {
-                            debug(`Registered multicast table entry: ${JSON.stringify(newEntry)}.`);
-                        }
-                        // always assume "it worked" to keep sync with Z2M first, NCP second, otherwise trouble might arise... should always work anyway
-                        this.multicastTable[newEntryIndex] = newEntry;
-                    }
-                    else {
-                        console.warn(`Coordinator multicast table is full (max: ${STACK_CONFIGS[this.stackConfig].MULTICAST_TABLE_SIZE}). `
-                            + `Some devices in new groups may not work properly, including in group "${groupId}". `
-                            + `If that happens, please remove groups to be below the limit. `
-                            + `Removed groups are only removed from coordinator after a Zigbee2MQTT restart.`);
-                    }
-                }
-                else {
-                    debug(`Added group "${groupId}", but local table says it is already registered at index "${existingIndex}". Skipping.`);
-                }
-                break;
-            }
-            // NOTE: Can't remove groups, since we watch from command exec to group members, that would trigger from any removed member,
-            //       even though the group might still exist...
-            //       Leaving this here (since it's done...), just in case we get better notifications for groups from upstream.
-            // case Cluster.genGroups.commands.remove.ID: {
-            //     const entryIndex = this.multicastTable.findIndex((e) => ((e != null) && (e.multicastId === groupId)));
-            //     // just in case, never remove GP at i zero, should never be the case...
-            //     if (entryIndex > 0) {
-            //         const entry = this.multicastTable[entryIndex];
-            //         entry.endpoint = 0;// signals "not in use" in the stack
-            //         const status = (await this.ezsp.ezspSetMulticastTableEntry(entryIndex, entry));
-            //         if (status !== EmberStatus.SUCCESS) {
-            //             console.error(`Failed to remove multicast table entry at index "${entryIndex}" for group "${groupId}".`);
-            //         } else {
-            //             debug(`Removed multicast table entry at index "${entryIndex}".`);
-            //         }
-            //         // always assume "it worked" to keep sync with Z2M first, NCP second, otherwise trouble might arise... should always work anyway
-            //         this.multicastTable[entryIndex] = null;
-            //     } else {
-            //         debug(`Removed group "${groupId}", but local table did not have a reference to it.`);
-            //     }
-            //     break;
-            // }
-            // case Cluster.genGroups.commands.removeAll.ID: {
-            //     // this can create quite a few NCP calls, but hopefully shouldn't happen often
-            //     // always skip green power at i==0
-            //     for (let i = 1; i < this.multicastTable.length; i++) {
-            //         const entry = this.multicastTable[i];
-            //         if (entry != null) {
-            //             entry.endpoint = 0;// signals "not in use" in the stack
-            //             const status = (await this.ezsp.ezspSetMulticastTableEntry(i, entry));
-            //             if (status !== EmberStatus.SUCCESS) {
-            //                 console.error(`Failed to remove multicast entry at index "${i}" with status=${EmberStatus[status]}.`);
-            //             } else {
-            //                 debug(`Removed multicast table entry at index "${i}".`);
-            //             }
-            //         }
-            //         this.multicastTable[i] = null;
-            //     }
-            //     break;
-            // }
-        }
-    }
     //---- START Events
     //---- END Events
     //---- START Cache-enabled EZSP wrappers
@@ -1192,7 +1108,7 @@ class EmberAdapter extends __1.Adapter {
                 this.networkCache.parameters = parameters;
             }
             else {
-                console.error(`Failed to get PAN ID (via network parameters) with status=${enums_2.EmberStatus[status]}.`);
+                logger_1.logger.error(`Failed to get PAN ID (via network parameters) with status=${enums_2.EmberStatus[status]}.`, NS);
             }
         }
         return this.networkCache.parameters.panId;
@@ -1209,7 +1125,7 @@ class EmberAdapter extends __1.Adapter {
                 this.networkCache.parameters = parameters;
             }
             else {
-                console.error(`Failed to get Extended PAN ID (via network parameters) with status=${enums_2.EmberStatus[status]}.`);
+                logger_1.logger.error(`Failed to get Extended PAN ID (via network parameters) with status=${enums_2.EmberStatus[status]}.`, NS);
             }
         }
         return this.networkCache.parameters.extendedPanId;
@@ -1226,7 +1142,7 @@ class EmberAdapter extends __1.Adapter {
                 this.networkCache.parameters = parameters;
             }
             else {
-                console.error(`Failed to get radio channel (via network parameters) with status=${enums_2.EmberStatus[status]}.`);
+                logger_1.logger.error(`Failed to get radio channel (via network parameters) with status=${enums_2.EmberStatus[status]}.`, NS);
             }
         }
         return this.networkCache.parameters.radioChannel;
@@ -1237,7 +1153,7 @@ class EmberAdapter extends __1.Adapter {
             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) {
-                    console.error(`Failed energy scan request with status=${enums_2.SLStatus[status]}.`);
+                    logger_1.logger.error(`Failed energy scan request with status=${enums_2.SLStatus[status]}.`, NS);
                     return enums_2.EmberStatus.ERR_FATAL;
                 }
                 // TODO: result in logs only atm, since UI doesn't support it
@@ -1271,34 +1187,21 @@ class EmberAdapter extends __1.Adapter {
         if (ncpEzspProtocolVer !== consts_1.EZSP_PROTOCOL_VERSION) {
             throw new Error(`NCP EZSP protocol version of ${ncpEzspProtocolVer} does not match Host version ${hostEzspProtocolVer}`);
         }
-        debug(`NCP info: EZSPVersion=${ncpEzspProtocolVer} StackType=${ncpStackType} StackVersion=${ncpStackVer}`);
+        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) {
-            // NCP has old style version number
-            debug(`NCP has old-style version number.`);
-            this.version = {
-                ezsp: ncpEzspProtocolVer,
-                revision: `${ncpStackVer}`,
-                major: ncpStackVer,
-                minor: 0,
-                patch: 0,
-                special: 0,
-                build: 0,
-                type: enums_2.EmberVersionType.GA, // default...
-            };
+            // Should never happen with support of only EZSP v13+
+            throw new Error(`NCP has old-style version number. Not supported.`);
         }
-        else {
-            // NCP has new style version number
-            this.version = {
-                ezsp: ncpEzspProtocolVer,
-                revision: `${versionStruct.major}.${versionStruct.minor}.${versionStruct.patch} [${enums_2.EmberVersionType[versionStruct.type]}]`,
-                ...versionStruct,
-            };
-            if (versionStruct.type !== enums_2.EmberVersionType.GA) {
-                console.warn(`NCP is running a non-GA version (${enums_2.EmberVersionType[versionStruct.type]}).`);
-            }
+        this.version = {
+            ezsp: ncpEzspProtocolVer,
+            revision: `${versionStruct.major}.${versionStruct.minor}.${versionStruct.patch} [${enums_2.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);
         }
-        debug(`NCP version info: ${JSON.stringify(this.version)}`);
+        logger_1.logger.debug(`NCP version info: ${JSON.stringify(this.version)}`, NS);
     }
     /**
      * This function sets an EZSP config value.
@@ -1310,14 +1213,14 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberSetEzspConfigValue(configId, value) {
         const status = (await this.ezsp.ezspSetConfigurationValue(configId, value));
-        debug(`[EzspConfigId] SET "${enums_1.EzspConfigId[configId]}" TO "${value}" with status=${enums_2.EzspStatus[status]}.`);
+        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) {
             // can be ZLL where not all NCPs need or support it.
-            console.warn(`[EzspConfigId] Unsupported configuration ID ${enums_1.EzspConfigId[configId]} by NCP.`);
+            logger_1.logger.warning(`[EzspConfigId] Unsupported configuration ID ${enums_1.EzspConfigId[configId]} by NCP.`, NS);
         }
         else if (status !== enums_2.EzspStatus.SUCCESS) {
-            // don't fail in case a set value gets called "out of time"
-            console.error(`[EzspConfigId] Failed to SET "${enums_1.EzspConfigId[configId]}" TO "${value}" with status=${enums_2.EzspStatus[status]}.`);
+            logger_1.logger.warning(`[EzspConfigId] Failed to SET "${enums_1.EzspConfigId[configId]}" TO "${value}" with status=${enums_2.EzspStatus[status]}. `
+                + `Firmware value will be used instead.`, NS);
         }
         return status;
     }
@@ -1330,7 +1233,7 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberSetEzspValue(valueId, valueLength, value) {
         const status = (await this.ezsp.ezspSetValue(valueId, valueLength, value));
-        debug(`[EzspValueId] SET "${enums_1.EzspValueId[valueId]}" TO "${value}" with status=${enums_2.EzspStatus[status]}.`);
+        logger_1.logger.debug(`[EzspValueId] SET "${enums_1.EzspValueId[valueId]}" TO "${value}" with status=${enums_2.EzspStatus[status]}.`, NS);
         return status;
     }
     /**
@@ -1341,7 +1244,7 @@ class EmberAdapter extends __1.Adapter {
      */
     async emberSetEzspPolicy(policyId, decisionId) {
         const status = (await this.ezsp.ezspSetPolicy(policyId, decisionId));
-        debug(`[EzspPolicyId] SET "${enums_1.EzspPolicyId[policyId]}" TO "${decisionId}" with status=${enums_2.EzspStatus[status]}.`);
+        logger_1.logger.debug(`[EzspPolicyId] SET "${enums_1.EzspPolicyId[policyId]}" TO "${decisionId}" with status=${enums_2.EzspStatus[status]}.`, NS);
         return status;
     }
     /**
@@ -1433,10 +1336,10 @@ class EmberAdapter extends __1.Adapter {
         let status = (await this.ezsp.ezspPermitJoining(duration));
         let apsFrame = null;
         let messageTag = null;
-        debug(`Permit joining for ${duration} sec. status=${[status]}`);
+        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, this.defaultApsOptions));
+            [status, apsFrame, messageTag] = (await this.emberPermitJoiningRequest(consts_2.EMBER_BROADCAST_ADDRESS, duration, 1, DEFAULT_APS_OPTIONS));
         }
         return [status, apsFrame, messageTag];
     }
@@ -1477,7 +1380,7 @@ class EmberAdapter extends __1.Adapter {
             return value;
         }
         else {
-            debug(`Failed to get source route overhead (via extended value), status=${enums_2.EzspStatus[status]}.`);
+            logger_1.logger.debug(`Failed to get source route overhead (via extended value), status=${enums_2.EzspStatus[status]}.`, NS);
         }
         return 0;
     }
@@ -1595,17 +1498,17 @@ class EmberAdapter extends __1.Adapter {
         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) {
-            debug(`~~~> [ZDO BROADCAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`);
+            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;
-            debug(`~~~> [SENT ZDO type=BROADCAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag} status=${enums_2.EmberStatus[status]}]`);
+            logger_1.logger.debug(`~~~> [SENT ZDO type=BROADCAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag} status=${enums_2.EmberStatus[status]}]`, NS);
             return [status, apsFrame, messageTag];
         }
         else {
-            debug(`~~~> [ZDO UNICAST apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag}]`);
+            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));
             apsFrame.sequence = apsSequence;
-            debug(`~~~> [SENT ZDO type=DIRECT apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag} status=${enums_2.EmberStatus[status]}]`);
+            logger_1.logger.debug(`~~~> [SENT ZDO type=DIRECT apsFrame=${JSON.stringify(apsFrame)} messageTag=${messageTag} status=${enums_2.EmberStatus[status]}]`, NS);
             return [status, apsFrame, messageTag];
         }
     }
@@ -1647,7 +1550,7 @@ class EmberAdapter extends __1.Adapter {
         this.zdoRequestBuffalo.writeListUInt16(inClusters);
         this.zdoRequestBuffalo.writeUInt8(outClusters.length);
         this.zdoRequestBuffalo.writeListUInt16(outClusters);
-        debug(`~~~> [ZDO MATCH DESCRIPTOR target=${target} profile=${profile} inClusters=${inClusters} outClusters=${outClusters}]`);
+        logger_1.logger.debug(`~~~> [ZDO MATCH_DESCRIPTORS_REQUEST target=${target} profile=${profile} inClusters=${inClusters} outClusters=${outClusters}]`, NS);
         return this.sendZDORequestBuffer(target, zdo_1.MATCH_DESCRIPTORS_REQUEST, options);
     }
     /**
@@ -1672,7 +1575,7 @@ class EmberAdapter extends __1.Adapter {
         this.zdoRequestBuffalo.writeIeeeAddr(target);
         this.zdoRequestBuffalo.writeUInt8(reportKids ? 1 : 0);
         this.zdoRequestBuffalo.writeUInt8(childStartIndex);
-        debug(`~~~> [ZDO NETWORK ADDRESS target=${target} reportKids=${reportKids} childStartIndex=${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);
     }
     /**
@@ -1698,7 +1601,7 @@ class EmberAdapter extends __1.Adapter {
         this.zdoRequestBuffalo.writeUInt16(target);
         this.zdoRequestBuffalo.writeUInt8(reportKids ? 1 : 0);
         this.zdoRequestBuffalo.writeUInt8(childStartIndex);
-        debug(`~~~> [ZDO IEEE ADDRESS target=${target} reportKids=${reportKids} childStartIndex=${childStartIndex}]`);
+        logger_1.logger.debug(`~~~> [ZDO IEEE_ADDRESS_REQUEST target=${target} reportKids=${reportKids} childStartIndex=${childStartIndex}]`, NS);
         return this.sendZDORequestBuffer(target, zdo_1.IEEE_ADDRESS_REQUEST, options);
     }
     /**
@@ -1714,8 +1617,8 @@ class EmberAdapter extends __1.Adapter {
         this.zdoRequestBuffalo.writeUInt16(discoveryNodeId);
         this.zdoRequestBuffalo.writeUInt8(reportKids ? 1 : 0);
         this.zdoRequestBuffalo.writeUInt8(childStartIndex);
-        debug(`~~~> [ZDO IEEE ADDRESS targetNodeIdOfRequest=${targetNodeIdOfRequest} discoveryNodeId=${discoveryNodeId} `
-            + `reportKids=${reportKids} childStartIndex=${childStartIndex}]`);
+        logger_1.logger.debug(`~~~> [ZDO IEEE_ADDRESS_REQUEST targetNodeIdOfRequest=${targetNodeIdOfRequest} discoveryNodeId=${discoveryNodeId} `
+            + `reportKids=${reportKids} childStartIndex=${childStartIndex}]`, NS);
         return this.sendZDORequestBuffer(targetNodeIdOfRequest, zdo_1.IEEE_ADDRESS_REQUEST, options);
     }
     /**
@@ -1754,45 +1657,31 @@ class EmberAdapter extends __1.Adapter {
         this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
         this.zdoRequestBuffalo.writeUInt16(target);
         this.zdoRequestBuffalo.writeUInt8(targetEndpoint);
-        debug(`~~~> [ZDO SIMPLE DESCRIPTOR target=${target} targetEndpoint=${targetEndpoint}]`);
+        logger_1.logger.debug(`~~~> [ZDO SIMPLE_DESCRIPTOR_REQUEST target=${target} targetEndpoint=${targetEndpoint}]`, NS);
         return this.sendZDORequestBuffer(target, zdo_1.SIMPLE_DESCRIPTOR_REQUEST, options);
     }
     /**
      * ZDO
-     * @brief Send a request to remove a binding entry with the specified
-     * contents from the specified node.
-     *
-     * @param target          The node on which the binding will be removed.
-     * @param source          The source EUI64 in the binding entry.
-     * @param sourceEndpoint  The source endpoint in the binding entry.
-     * @param clusterId       The cluster ID in the binding entry.
-     * @param type            The type of binding, either ::UNICAST_BINDING,
-     *  ::MULTICAST_BINDING, or ::UNICAST_MANY_TO_ONE_BINDING.
-     *  ::UNICAST_MANY_TO_ONE_BINDING is an Ember-specific extension
-     *  and should be used only when the target is an Ember device.
-     * @param destination     The destination EUI64 in the binding entry for the
-     *   ::UNICAST_BINDING or ::UNICAST_MANY_TO_ONE_BINDING.
-     * @param groupAddress    The group address for the ::MULTICAST_BINDING.
-     * @param destinationEndpoint  The destination endpoint in the binding entry for
-     *   the ::UNICAST_BINDING or ::UNICAST_MANY_TO_ONE_BINDING.
-     * @param options         The options to use when sending the request. See
-     * emberSendUnicast() for a description.
+     * Common logic used by `emberBindRequest` & `emberUnbindRequest`.
      *
-     * @return An ::EmberStatus value.
-     * - ::EMBER_SUCCESS
-     * - ::EMBER_NO_BUFFERS
-     * _ ::EMBER_NETWORK_DOWN
-     * - ::EMBER_NETWORK_BUSY
      * @param target
      * @param bindClusterId
      * @param source
-     * @param sourceEndpoint uint8_t
-     * @param clusterId uint16_t
-     * @param type uint8_t
+     * @param sourceEndpoint
+     * @param clusterId
+     * @param type
      * @param destination
-     * @param groupAddress uint16_t
-     * @param destinationEndpoint uint8_t
+     * @param groupAddress
+     * @param destinationEndpoint
      * @param options
+     *
+     * @returns An ::EmberStatus value.
+     * - ::EMBER_SUCCESS
+     * - ::EMBER_NO_BUFFERS
+     * - ::EMBER_NETWORK_DOWN
+     * - ::EMBER_NETWORK_BUSY
+     * @returns APS frame created for the request
+     * @returns The tag used on the message.
      */
     async emberSendZigDevBindRequest(target, bindClusterId, source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint, options) {
         this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
@@ -1834,12 +1723,17 @@ class EmberAdapter extends __1.Adapter {
      * @param options  The options to use when sending the request. See
      * emberSendUnicast() for a description.
      *
-     * @return An EmberStatus value. ::EMBER_SUCCESS, ::EMBER_NO_BUFFERS,
-     * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
+     * @returns An ::EmberStatus value.
+     * - ::EMBER_SUCCESS
+     * - ::EMBER_NO_BUFFERS
+     * - ::EMBER_NETWORK_DOWN
+     * - ::EMBER_NETWORK_BUSY
+     * @returns APS frame created for the request
+     * @returns The tag used on the message.
      */
     async emberBindRequest(target, source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint, options) {
-        debug(`~~~> [ZDO BIND target=${target} source=${source} sourceEndpoint=${sourceEndpoint} clusterId=${clusterId} type=${type} `
-            + `destination=${destination} groupAddress=${groupAddress} destinationEndpoint=${destinationEndpoint}]`);
+        logger_1.logger.debug(`~~~> [ZDO BIND_REQUEST target=${target} source=${source} sourceEndpoint=${sourceEndpoint} clusterId=${clusterId} type=${type} `
+            + `destination=${destination} groupAddress=${groupAddress} destinationEndpoint=${destinationEndpoint}]`, NS);
         return this.emberSendZigDevBindRequest(target, zdo_1.BIND_REQUEST, source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint, options);
     }
     /**
@@ -1863,15 +1757,17 @@ class EmberAdapter extends __1.Adapter {
      * @param options         The options to use when sending the request. See
      * emberSendUnicast() for a description.
      *
-     * @return An ::EmberStatus value.
+     * @returns An ::EmberStatus value.
      * - ::EMBER_SUCCESS
      * - ::EMBER_NO_BUFFERS
-     * _ ::EMBER_NETWORK_DOWN
+     * - ::EMBER_NETWORK_DOWN
      * - ::EMBER_NETWORK_BUSY
+     * @returns APS frame created for the request
+     * @returns The tag used on the message.
      */
     async emberUnbindRequest(target, source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint, options) {
-        debug(`~~~> [ZDO UNBIND target=${target} source=${source} sourceEndpoint=${sourceEndpoint} clusterId=${clusterId} type=${type} `
-            + `destination=${destination} groupAddress=${groupAddress} destinationEndpoint=${destinationEndpoint}]`);
+        logger_1.logger.debug(`~~~> [ZDO UNBIND_REQUEST target=${target} source=${source} sourceEndpoint=${sourceEndpoint} clusterId=${clusterId} type=${type} `
+            + `destination=${destination} groupAddress=${groupAddress} destinationEndpoint=${destinationEndpoint}]`, NS);
         return this.emberSendZigDevBindRequest(target, zdo_1.UNBIND_REQUEST, source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint, options);
     }
     /**
@@ -1888,7 +1784,7 @@ class EmberAdapter extends __1.Adapter {
      * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
      */
     async emberActiveEndpointsRequest(target, options) {
-        debug(`~~~> [ZDO ACTIVE ENDPOINTS target=${target}]`);
+        logger_1.logger.debug(`~~~> [ZDO ACTIVE_ENDPOINTS_REQUEST target=${target}]`, NS);
         return this.emberSendZigDevRequestTarget(target, zdo_1.ACTIVE_ENDPOINTS_REQUEST, options);
     }
     /**
@@ -1908,7 +1804,7 @@ class EmberAdapter extends __1.Adapter {
      * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
      */
     async emberPowerDescriptorRequest(target, options) {
-        debug(`~~~> [ZDO POWER DESCRIPTOR target=${target}]`);
+        logger_1.logger.debug(`~~~> [ZDO POWER_DESCRIPTOR_REQUEST target=${target}]`, NS);
         return this.emberSendZigDevRequestTarget(target, zdo_1.POWER_DESCRIPTOR_REQUEST, options);
     }
     /**
@@ -1927,7 +1823,7 @@ class EmberAdapter extends __1.Adapter {
      * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
      */
     async emberNodeDescriptorRequest(target, options) {
-        debug(`~~~> [ZDO NODE DESCRIPTOR target=${target}]`);
+        logger_1.logger.debug(`~~~> [ZDO NODE_DESCRIPTOR_REQUEST target=${target}]`, NS);
         return this.emberSendZigDevRequestTarget(target, zdo_1.NODE_DESCRIPTOR_REQUEST, options);
     }
     /**
@@ -1948,7 +1844,7 @@ class EmberAdapter extends __1.Adapter {
      * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
      */
     async emberLqiTableRequest(target, startIndex, options) {
-        debug(`~~~> [ZDO LQI TABLE target=${target} startIndex=${startIndex}]`);
+        logger_1.logger.debug(`~~~> [ZDO LQI_TABLE_REQUEST target=${target} startIndex=${startIndex}]`, NS);
         return this.emberTableRequest(zdo_1.LQI_TABLE_REQUEST, target, startIndex, options);
     }
     /**
@@ -1969,7 +1865,7 @@ class EmberAdapter extends __1.Adapter {
      * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
      */
     async emberRoutingTableRequest(target, startIndex, options) {
-        debug(`~~~> [ZDO ROUTING TABLE target=${target} startIndex=${startIndex}]`);
+        logger_1.logger.debug(`~~~> [ZDO ROUTING_TABLE_REQUEST target=${target} startIndex=${startIndex}]`, NS);
         return this.emberTableRequest(zdo_1.ROUTING_TABLE_REQUEST, target, startIndex, options);
     }
     /**
@@ -1991,7 +1887,7 @@ class EmberAdapter extends __1.Adapter {
      * ::EMBER_NETWORK_DOWN or ::EMBER_NETWORK_BUSY.
      */
     async emberBindingTableRequest(target, startIndex, options) {
-        debug(`~~~> [ZDO BINDING TABLE target=${target} startIndex=${startIndex}]`);
+        logger_1.logger.debug(`~~~> [ZDO BINDING_TABLE_REQUEST target=${target} startIndex=${startIndex}]`, NS);
         return this.emberTableRequest(zdo_1.BINDING_TABLE_REQUEST, target, startIndex, options);
     }
     /**
@@ -2030,7 +1926,7 @@ class EmberAdapter extends __1.Adapter {
         this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
         this.zdoRequestBuffalo.writeIeeeAddr(deviceAddress);
         this.zdoRequestBuffalo.writeUInt8(leaveRequestFlags);
-        debug(`~~~> [ZDO LEAVE target=${target} deviceAddress=${deviceAddress} leaveRequestFlags=${leaveRequestFlags}]`);
+        logger_1.logger.debug(`~~~> [ZDO LEAVE_REQUEST target=${target} deviceAddress=${deviceAddress} leaveRequestFlags=${leaveRequestFlags}]`, NS);
         return this.sendZDORequestBuffer(target, zdo_1.LEAVE_REQUEST, options);
     }
     /**
@@ -2054,9 +1950,42 @@ class EmberAdapter extends __1.Adapter {
         this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
         this.zdoRequestBuffalo.writeUInt8(duration);
         this.zdoRequestBuffalo.writeUInt8(authentication);
-        debug(`~~~> [ZDO PERMIT JOINING target=${target} duration=${duration} authentication=${authentication}]`);
+        logger_1.logger.debug(`~~~> [ZDO PERMIT_JOINING_REQUEST target=${target} duration=${duration} authentication=${authentication}]`, NS);
         return this.sendZDORequestBuffer(target, zdo_1.PERMIT_JOINING_REQUEST, options);
     }
+    /**
+     * ZDO
+     *
+     * @see NWK_UPDATE_REQUEST
+     *
+     * @param target
+     * @param scanChannels uint8_t[]
+     * @param duration uint8_t
+     * @param count uint8_t
+     * @param manager
+     */
+    async emberNetworkUpdateRequest(target, scanChannels, duration, count, manager, options) {
+        this.zdoRequestBuffalo.setPosition(zdo_1.ZDO_MESSAGE_OVERHEAD);
+        this.zdoRequestBuffalo.writeUInt32(scanChannels.reduce((a, c) => a + (1 << c), 0)); // to uint32_t
+        this.zdoRequestBuffalo.writeUInt8(duration);
+        if (count != null) {
+            this.zdoRequestBuffalo.writeUInt8(count);
+        }
+        if (manager != null) {
+            this.zdoRequestBuffalo.writeUInt16(manager);
+        }
+        logger_1.logger.debug(`~~~> [ZDO NWK_UPDATE_REQUEST target=${target} scanChannels=${scanChannels} duration=${duration} count=${count} manager=${manager}]`, NS);
+        return this.sendZDORequestBuffer(target, zdo_1.NWK_UPDATE_REQUEST, options);
+    }
+    async emberScanChannelsRequest(target, scanChannels, duration, count, options) {
+        return this.emberNetworkUpdateRequest(target, scanChannels, duration, count, null, options);
+    }
+    async emberChannelChangeRequest(target, channel, options) {
+        return this.emberNetworkUpdateRequest(target, [channel], 0xFE, null, null, options);
+    }
+    async emberSetActiveChannelsAndNwkManagerIdRequest(target, scanChannels, manager, options) {
+        return this.emberNetworkUpdateRequest(target, scanChannels, 0xFF, null, manager, options);
+    }
     //---- END Ember ZDO
     //-- START Adapter implementation
     static async isValidPath(path) {
@@ -2068,7 +1997,7 @@ class EmberAdapter extends __1.Adapter {
             return serialPortUtils_1.default.is((0, utils_1.RealpathSync)(path), autoDetectDefinitions);
         }
         catch (error) {
-            debug(`Failed to determine if path is valid: '${error}'`);
+            logger_1.logger.debug(`Failed to determine if path is valid: '${error}'`, NS);
             return false;
         }
     }
@@ -2078,16 +2007,17 @@ class EmberAdapter extends __1.Adapter {
         return paths.length > 0 ? paths[0] : null;
     }
     async start() {
-        console.log(`======== Ember Adapter Starting ========`);
+        logger_1.logger.info(`======== Ember Adapter Starting ========`, NS);
         this.initVariables();
-        debug(`Starting EZSP with stack configuration: "${this.stackConfig}".`);
+        logger_1.logger.debug(`Starting EZSP with stack configuration: "${this.stackConfig}".`, NS);
         const result = await this.initEzsp();
         return result;
     }
     async stop() {
+        this.requestQueue.stopDispatching();
         await this.ezsp.stop();
         this.initVariables();
-        console.log(`======== Ember Adapter Stopped ========`);
+        logger_1.logger.info(`======== Ember Adapter Stopped ========`, NS);
     }
     // queued, non-InterPAN
     async getCoordinator() {
@@ -2099,14 +2029,14 @@ class EmberAdapter extends __1.Adapter {
                 resolve({
                     ieeeAddr,
                     networkAddress: consts_2.ZIGBEE_COORDINATOR_ADDRESS,
-                    manufacturerID: consts_2.MANUFACTURER_CODE,
+                    manufacturerID: DEFAULT_MANUFACTURER_CODE,
                     endpoints: endpoints_1.FIXED_ENDPOINTS.map((ep) => {
                         return {
                             profileID: ep.profileId,
                             ID: ep.endpoint,
                             deviceID: ep.deviceId,
-                            inputClusters: ep.inClusterList,
-                            outputClusters: ep.outClusterList,
+                            inputClusters: ep.inClusterList.slice(), // copy
+                            outputClusters: ep.outClusterList.slice(), // copy
                         };
                     }),
                 });
@@ -2115,7 +2045,7 @@ class EmberAdapter extends __1.Adapter {
         });
     }
     async getCoordinatorVersion() {
-        return { type: `EZSP v${this.version.ezsp}`, meta: this.version };
+        return { type: `EmberZNet`, meta: this.version };
     }
     // queued
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -2136,7 +2066,7 @@ class EmberAdapter extends __1.Adapter {
                 // grab fresh version here, bypass cache
                 const [netStatus, , netParams] = (await this.ezsp.ezspGetNetworkParameters());
                 if (netStatus !== enums_2.EmberStatus.SUCCESS) {
-                    console.error(`[BACKUP] Failed to get network parameters.`);
+                    logger_1.logger.error(`[BACKUP] Failed to get network parameters.`, NS);
                     return netStatus;
                 }
                 // update cache
@@ -2144,7 +2074,7 @@ class EmberAdapter extends __1.Adapter {
                 this.networkCache.eui64 = (await this.ezsp.ezspGetEui64());
                 const [netKeyStatus, netKeyInfo] = (await this.ezsp.ezspGetNetworkKeyInfo());
                 if (netKeyStatus !== enums_2.SLStatus.OK) {
-                    console.error(`[BACKUP] Failed to get network keys info.`);
+                    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
                 }
@@ -2160,7 +2090,6 @@ class EmberAdapter extends __1.Adapter {
                 //     this.ezsp,
                 //     Buffer.from(this.networkCache.eui64.substring(2/*0x*/), 'hex').reverse()
                 // ));
-                // console.log(tokensBuf.toString('hex'));
                 let context = (0, initters_1.initSecurityManagerContext)();
                 context.coreKeyType = enums_2.SecManKeyType.TC_LINK;
                 const [tcLinkKey, tclkStatus] = (await this.ezsp.ezspExportKey(context));
@@ -2219,29 +2148,50 @@ class EmberAdapter extends __1.Adapter {
                 this.checkInterpanLock();
                 // first call will cache for the others, but in all likelihood, it will all be from freshly cached after init
                 // since Controller caches this also.
+                const channel = (await this.emberGetRadioChannel());
                 const panID = (await this.emberGetPanId());
                 const extendedPanID = (await this.emberGetExtendedPanId());
-                const channel = (await this.emberGetRadioChannel());
                 resolve({
-                    panID: panID,
+                    panID,
                     extendedPanID: parseInt(Buffer.from(extendedPanID).toString('hex'), 16),
-                    channel: channel,
+                    channel,
                 });
                 return enums_2.EmberStatus.SUCCESS;
             }, reject);
         });
     }
+    async supportsChangeChannel() {
+        return true;
+    }
+    // queued
+    async changeChannel(newChannel) {
+        return new Promise((resolve, reject) => {
+            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);
+                    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;
+            }, reject);
+        });
+    }
     // queued
     async setTransmitPower(value) {
         if (typeof value !== 'number') {
-            console.error(`Tried to set transmit power to non-number. Value ${value} of type ${typeof value}.`);
+            logger_1.logger.error(`Tried to set transmit power to non-number. Value ${value} of type ${typeof value}.`, NS);
             return;
         }
         return new Promise((resolve, reject) => {
             this.requestQueue.enqueue(async () => {
                 const status = await this.ezsp.ezspSetRadioPower(value);
                 if (status !== enums_2.EmberStatus.SUCCESS) {
-                    console.error(`Failed to set transmit power to ${value} status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`Failed to set transmit power to ${value} status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 resolve();
@@ -2252,48 +2202,45 @@ class EmberAdapter extends __1.Adapter {
     // queued
     async addInstallCode(ieeeAddress, key) {
         if (!key) {
-            throw new Error(`[ADD INSTALL CODE] Failed for "${ieeeAddress}"; no code given.`);
+            throw new Error(`[ADD INSTALL CODE] Failed for '${ieeeAddress}'; no code given.`);
         }
-        let validInstallCodeSize = false;
-        for (const validCodeSize of consts_2.EMBER_INSTALL_CODE_SIZES) {
-            if (key.length === validCodeSize) {
-                validInstallCodeSize = true;
-                break;
+        // codes with CRC, check CRC before sending to NCP, otherwise let NCP handle
+        if (consts_2.EMBER_INSTALL_CODE_SIZES.indexOf(key.length) !== -1) {
+            // Reverse the bits in a byte (uint8_t)
+            const reverse = (b) => {
+                return (((b * 0x0802 & 0x22110) | (b * 0x8020 & 0x88440)) * 0x10101 >> 16) & 0xFF;
+            };
+            let crc = 0xFFFF; // uint16_t
+            // Compute the CRC and verify that it matches.
+            // The bit reversals, byte swap, and ones' complement are due to differences between halCommonCrc16 and the Smart Energy version.
+            for (let index = 0; index < (key.length - consts_2.EMBER_INSTALL_CODE_CRC_SIZE); index++) {
+                crc = (0, math_1.halCommonCrc16)(reverse(key[index]), crc);
+            }
+            crc = (~(0, math_1.highLowToInt)(reverse((0, math_1.lowByte)(crc)), reverse((0, math_1.highByte)(crc)))) & 0xFFFF;
+            if (key[key.length - consts_2.EMBER_INSTALL_CODE_CRC_SIZE] !== (0, math_1.lowByte)(crc)
+                || key[key.length - consts_2.EMBER_INSTALL_CODE_CRC_SIZE + 1] !== (0, math_1.highByte)(crc)) {
+                throw new Error(`[ADD INSTALL CODE] Failed for '${ieeeAddress}'; invalid code CRC.`);
+            }
+            else {
+                logger_1.logger.debug(`[ADD INSTALL CODE] CRC validated for '${ieeeAddress}'.`, NS);
             }
-        }
-        if (!validInstallCodeSize) {
-            throw new Error(`[ADD INSTALL CODE] Failed for "${ieeeAddress}"; invalid code size.`);
-        }
-        // Reverse the bits in a byte
-        const reverse = (b) => {
-            return ((b * 0x0802 & 0x22110) | (b * 0x8020 & 0x88440)) * 0x10101 >> 16;
-        };
-        let crc = 0xFFFF; // uint16_t
-        // Compute the CRC and verify that it matches.
-        // The bit reversals, byte swap, and ones' complement are due to differences between halCommonCrc16 and the Smart Energy version.
-        for (let index = 0; index < (key.length - consts_2.EMBER_INSTALL_CODE_CRC_SIZE); index++) {
-            crc = (0, math_1.halCommonCrc16)(reverse(key[index]), crc);
-        }
-        crc = ~(0, math_1.highLowToInt)(reverse((0, math_1.lowByte)(crc)), reverse((0, math_1.highByte)(crc)));
-        if (key[key.length - consts_2.EMBER_INSTALL_CODE_CRC_SIZE] !== (0, math_1.lowByte)(crc) || key[key.length - consts_2.EMBER_INSTALL_CODE_CRC_SIZE + 1] !== (0, math_1.highByte)(crc)) {
-            throw new Error(`[ADD INSTALL CODE] Failed for "${ieeeAddress}"; invalid code CRC.`);
         }
         return new Promise((resolve, reject) => {
             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) {
-                    console.error(`[ADD INSTALL CODE] Failed AES hash for "${ieeeAddress}" with status=${enums_2.EmberStatus[aesStatus]}.`);
+                    logger_1.logger.error(`[ADD INSTALL CODE] Failed AES hash for '${ieeeAddress}' with status=${enums_2.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) {
-                    debug(`[ADD INSTALL CODE] Success for "${ieeeAddress}".`);
+                    logger_1.logger.debug(`[ADD INSTALL CODE] Success for '${ieeeAddress}'.`, NS);
                 }
                 else {
-                    console.error(`[ADD INSTALL CODE] Failed for "${ieeeAddress}" with status=${enums_2.SLStatus[impStatus]}.`);
+                    logger_1.logger.error(`[ADD INSTALL CODE] Failed for '${ieeeAddress}' with status=${enums_2.SLStatus[impStatus]}.`, NS);
                     return enums_2.EmberStatus.ERR_FATAL;
                 }
                 resolve();
@@ -2303,19 +2250,21 @@ class EmberAdapter extends __1.Adapter {
     }
     /** WARNING: Adapter impl. Starts timer immediately upon returning */
     waitFor(networkAddress, endpoint, frameType, direction, transactionSequenceNumber, clusterID, commandIdentifier, timeout) {
+        const sourceEndpointInfo = endpoints_1.FIXED_ENDPOINTS[0];
         const waiter = this.oneWaitress.waitFor({
             target: networkAddress,
             apsFrame: {
                 clusterId: clusterID,
-                profileId: consts_2.HA_PROFILE_ID, // XXX: ok? only used by OTA upstream
+                profileId: sourceEndpointInfo.profileId, // XXX: only used by OTA upstream
                 sequence: 0, // set by stack
-                sourceEndpoint: endpoint,
-                destinationEndpoint: 0,
+                sourceEndpoint: sourceEndpointInfo.endpoint,
+                destinationEndpoint: endpoint,
                 groupId: 0,
                 options: enums_2.EmberApsOption.NONE,
             },
             zclSequence: transactionSequenceNumber,
-        }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT * 3); // XXX: since this is used by OTA..?
+            commandIdentifier,
+        }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT * 3); // XXX: since this is used by OTA...
         return {
             cancel: () => this.oneWaitress.remove(waiter.id),
             promise: waiter.start().promise,
@@ -2328,34 +2277,47 @@ class EmberAdapter extends __1.Adapter {
             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));
-                debug(`[ZDO] Pre joining import transient key status=${enums_2.SLStatus[impKeyStatus]}.`);
-                return impKeyStatus === enums_2.SLStatus.OK ? enums_2.EmberStatus.SUCCESS : enums_2.EmberStatus.ERR_FATAL;
+                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 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;
+                }
+                return enums_2.EmberStatus.SUCCESS;
             }
             else {
+                if (this.manufacturerCode !== DEFAULT_MANUFACTURER_CODE) {
+                    logger_1.logger.debug(`[WORKAROUND] Reverting coordinator manufacturer code to default.`, NS);
+                    await this.ezsp.ezspSetManufacturerCode(DEFAULT_MANUFACTURER_CODE);
+                    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) {
-                    console.error(`[ZDO] Failed set join policy for with status=${enums_2.EzspStatus[setJPstatus]}.`);
+                    logger_1.logger.error(`[ZDO] Failed set join policy for with status=${enums_2.EzspStatus[setJPstatus]}.`, NS);
                     return enums_2.EmberStatus.ERR_FATAL;
                 }
                 return enums_2.EmberStatus.SUCCESS;
             }
         };
-        // NOTE: can't ZDO PJ on coordinator, so if network address is null or zero (coordinator), using local permit join
         if (networkAddress) {
+            // specific device that is not `Coordinator`
             return new Promise((resolve, reject) => {
                 this.requestQueue.enqueue(async () => {
                     this.checkInterpanLock();
                     const pjStatus = (await preJoining());
                     if (pjStatus !== enums_2.EmberStatus.SUCCESS) {
-                        console.error(`[ZDO] Failed pre joining request for "${networkAddress}" with status=${enums_2.EmberStatus[pjStatus]}.`);
+                        logger_1.logger.error(`[ZDO] Failed pre joining request for "${networkAddress}" with status=${enums_2.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) {
-                        console.error(`[ZDO] Failed permit joining request for "${networkAddress}" with status=${enums_2.EmberStatus[status]}.`);
+                        logger_1.logger.error(`[ZDO] Failed permit joining request for "${networkAddress}" with status=${enums_2.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     (await this.oneWaitress.startWaitingFor({
@@ -2369,19 +2331,20 @@ class EmberAdapter extends __1.Adapter {
             });
         }
         else {
-            // no device specified to open, open coordinator + broadcast
+            // coordinator-only, or all
             return new Promise((resolve, reject) => {
                 this.requestQueue.enqueue(async () => {
                     this.checkInterpanLock();
                     const pjStatus = (await preJoining());
                     if (pjStatus !== enums_2.EmberStatus.SUCCESS) {
-                        console.error(`[ZDO] Failed pre joining request for "${networkAddress}" with status=${enums_2.EmberStatus[pjStatus]}.`);
+                        logger_1.logger.error(`[ZDO] Failed pre joining request for "${networkAddress}" with status=${enums_2.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, true /*broadcast*/));
+                    const [status, apsFrame, messageTag] = (await this.emberPermitJoining(seconds, (networkAddress === consts_2.ZIGBEE_COORDINATOR_ADDRESS) ? false : true));
                     if (status !== enums_2.EmberStatus.SUCCESS) {
-                        console.error(`[ZDO] Failed permit joining request with status=${enums_2.EmberStatus[status]}.`);
+                        logger_1.logger.error(`[ZDO] Failed permit joining request with status=${enums_2.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     // NOTE: because Z2M is refreshing the permit join duration early to prevent it from closing
@@ -2412,9 +2375,9 @@ class EmberAdapter extends __1.Adapter {
         const neighbors = [];
         const request = async (startIndex) => {
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const [reqStatus, apsFrame, messageTag] = (await this.emberLqiTableRequest(networkAddress, startIndex, this.defaultApsOptions));
+            const [reqStatus, apsFrame, messageTag] = (await this.emberLqiTableRequest(networkAddress, startIndex, DEFAULT_APS_OPTIONS));
             if (reqStatus !== enums_2.EmberStatus.SUCCESS) {
-                console.error(`[ZDO] Failed LQI request for "${networkAddress}" (index "${startIndex}") with status=${enums_2.EmberStatus[reqStatus]}.`);
+                logger_1.logger.error(`[ZDO] Failed LQI request for "${networkAddress}" (index "${startIndex}") with status=${enums_2.EmberStatus[reqStatus]}.`, NS);
                 return [reqStatus, null, null];
             }
             const result = (await this.oneWaitress.startWaitingFor({
@@ -2459,9 +2422,9 @@ class EmberAdapter extends __1.Adapter {
         const table = [];
         const request = async (startIndex) => {
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const [reqStatus, apsFrame, messageTag] = (await this.emberRoutingTableRequest(networkAddress, startIndex, this.defaultApsOptions));
+            const [reqStatus, apsFrame, messageTag] = (await this.emberRoutingTableRequest(networkAddress, startIndex, DEFAULT_APS_OPTIONS));
             if (reqStatus !== enums_2.EmberStatus.SUCCESS) {
-                console.error(`[ZDO] Failed routing table request for "${networkAddress}" (index "${startIndex}") with status=${enums_2.EmberStatus[reqStatus]}.`);
+                logger_1.logger.error(`[ZDO] Failed routing table request for "${networkAddress}" (index "${startIndex}") with status=${enums_2.EmberStatus[reqStatus]}.`, NS);
                 return [reqStatus, null, null];
             }
             const result = (await this.oneWaitress.startWaitingFor({
@@ -2505,9 +2468,9 @@ class EmberAdapter extends __1.Adapter {
             this.requestQueue.enqueue(async () => {
                 this.checkInterpanLock();
                 /* eslint-disable @typescript-eslint/no-unused-vars */
-                const [status, apsFrame, messageTag] = (await this.emberNodeDescriptorRequest(networkAddress, this.defaultApsOptions));
+                const [status, apsFrame, messageTag] = (await this.emberNodeDescriptorRequest(networkAddress, DEFAULT_APS_OPTIONS));
                 if (status !== enums_2.EmberStatus.SUCCESS) {
-                    console.error(`[ZDO] Failed node descriptor for "${networkAddress}" with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`[ZDO] Failed node descriptor for "${networkAddress}" with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 const result = (await this.oneWaitress.startWaitingFor({
@@ -2529,9 +2492,9 @@ class EmberAdapter extends __1.Adapter {
                 }
                 // always 0 before rev. 21 where field was added
                 if (result.stackRevision < CURRENT_ZIGBEE_SPEC_REVISION) {
-                    console.warn(`[ZDO] Node descriptor for "${networkAddress}" reports device is only compliant to revision `
+                    logger_1.logger.warning(`[ZDO] Node descriptor for "${networkAddress}" reports device is only compliant to revision `
                         + `"${(result.stackRevision < 21) ? 'pre-21' : result.stackRevision}" of the ZigBee specification `
-                        + `(current revision: ${CURRENT_ZIGBEE_SPEC_REVISION}).`);
+                        + `(current revision: ${CURRENT_ZIGBEE_SPEC_REVISION}).`, NS);
                 }
                 resolve({ type, manufacturerCode: result.manufacturerCode });
                 return enums_2.EmberStatus.SUCCESS;
@@ -2544,9 +2507,9 @@ 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.emberActiveEndpointsRequest(networkAddress, this.defaultApsOptions));
+                const [status, apsFrame, messageTag] = (await this.emberActiveEndpointsRequest(networkAddress, DEFAULT_APS_OPTIONS));
                 if (status !== enums_2.EmberStatus.SUCCESS) {
-                    console.error(`[ZDO] Failed active endpoints request for "${networkAddress}" with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`[ZDO] Failed active endpoints request for "${networkAddress}" with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 const result = (await this.oneWaitress.startWaitingFor({
@@ -2565,10 +2528,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.emberSimpleDescriptorRequest(networkAddress, endpointID, this.defaultApsOptions));
+                const [status, apsFrame, messageTag] = (await this.emberSimpleDescriptorRequest(networkAddress, endpointID, DEFAULT_APS_OPTIONS));
                 if (status !== enums_2.EmberStatus.SUCCESS) {
-                    console.error(`[ZDO] Failed simple descriptor request for "${networkAddress}" endpoint "${endpointID}" `
-                        + `with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`[ZDO] Failed simple descriptor request for "${networkAddress}" endpoint "${endpointID}" `
+                        + `with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 const result = (await this.oneWaitress.startWaitingFor({
@@ -2596,10 +2559,10 @@ class EmberAdapter extends __1.Adapter {
                     this.checkInterpanLock();
                     // 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, this.defaultApsOptions));
+                    destinationEndpoint, DEFAULT_APS_OPTIONS));
                     if (status !== enums_2.EmberStatus.SUCCESS) {
-                        console.error(`[ZDO] Failed bind request for "${destinationNetworkAddress}" destination "${destinationAddressOrGroup}" `
-                            + `endpoint "${destinationEndpoint}" with status=${enums_2.EmberStatus[status]}.`);
+                        logger_1.logger.error(`[ZDO] Failed bind request for "${destinationNetworkAddress}" destination "${destinationAddressOrGroup}" `
+                            + `endpoint "${destinationEndpoint}" with status=${enums_2.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     await this.oneWaitress.startWaitingFor({
@@ -2620,10 +2583,10 @@ 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.MULTICAST_BINDING, null, // doesn't matter
                     destinationAddressOrGroup, destinationEndpoint, // doesn't matter
-                    this.defaultApsOptions));
+                    DEFAULT_APS_OPTIONS));
                     if (status !== enums_2.EmberStatus.SUCCESS) {
-                        console.error(`[ZDO] Failed bind request for "${destinationNetworkAddress}" group "${destinationAddressOrGroup}" `
-                            + `with status=${enums_2.EmberStatus[status]}.`);
+                        logger_1.logger.error(`[ZDO] Failed bind request for "${destinationNetworkAddress}" group "${destinationAddressOrGroup}" `
+                            + `with status=${enums_2.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     await this.oneWaitress.startWaitingFor({
@@ -2646,10 +2609,10 @@ class EmberAdapter extends __1.Adapter {
                     this.checkInterpanLock();
                     // 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, this.defaultApsOptions));
+                    destinationEndpoint, DEFAULT_APS_OPTIONS));
                     if (status !== enums_2.EmberStatus.SUCCESS) {
-                        console.error(`[ZDO] Failed unbind request for "${destinationNetworkAddress}" destination "${destinationAddressOrGroup}" `
-                            + `endpoint "${destinationEndpoint}" with status=${enums_2.EmberStatus[status]}.`);
+                        logger_1.logger.error(`[ZDO] Failed unbind request for "${destinationNetworkAddress}" destination "${destinationAddressOrGroup}" `
+                            + `endpoint "${destinationEndpoint}" with status=${enums_2.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     await this.oneWaitress.startWaitingFor({
@@ -2670,10 +2633,10 @@ 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.MULTICAST_BINDING, null, // doesn't matter
                     destinationAddressOrGroup, destinationEndpoint, // doesn't matter
-                    this.defaultApsOptions));
+                    DEFAULT_APS_OPTIONS));
                     if (status !== enums_2.EmberStatus.SUCCESS) {
-                        console.error(`[ZDO] Failed unbind request for "${destinationNetworkAddress}" group "${destinationAddressOrGroup}" `
-                            + `with status=${enums_2.EmberStatus[status]}.`);
+                        logger_1.logger.error(`[ZDO] Failed unbind request for "${destinationNetworkAddress}" group "${destinationAddressOrGroup}" `
+                            + `with status=${enums_2.EmberStatus[status]}.`, NS);
                         return status;
                     }
                     await this.oneWaitress.startWaitingFor({
@@ -2693,10 +2656,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, this.defaultApsOptions));
+                const [status, apsFrame, messageTag] = (await this.emberLeaveRequest(networkAddress, ieeeAddr, enums_2.EmberLeaveRequestFlags.WITHOUT_REJOIN, DEFAULT_APS_OPTIONS));
                 if (status !== enums_2.EmberStatus.SUCCESS) {
-                    console.error(`[ZDO] Failed remove device request for "${networkAddress}" target "${ieeeAddr}" `
-                        + `with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`[ZDO] Failed remove device request for "${networkAddress}" target "${ieeeAddr}" `
+                        + `with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 await this.oneWaitress.startWaitingFor({
@@ -2714,20 +2677,20 @@ class EmberAdapter extends __1.Adapter {
     async sendZclFrameToEndpoint(ieeeAddr, networkAddress, endpoint, zclFrame, timeout, disableResponse, disableRecovery, sourceEndpoint) {
         const sourceEndpointInfo = typeof sourceEndpoint === 'number' ?
             endpoints_1.FIXED_ENDPOINTS.find((epi) => (epi.endpoint === sourceEndpoint)) : endpoints_1.FIXED_ENDPOINTS[0];
-        const command = zclFrame.getCommand();
+        const command = zclFrame.command;
         let commandResponseId = null;
         if (command.hasOwnProperty('response') && disableResponse === false) {
             commandResponseId = command.response;
         }
-        else if (!zclFrame.Header.frameControl.disableDefaultResponse) {
-            commandResponseId = zcl_1.Foundation.defaultRsp.ID;
+        else if (!zclFrame.header.frameControl.disableDefaultResponse) {
+            commandResponseId = Zcl.Foundation.defaultRsp.ID;
         }
         const apsFrame = {
             profileId: sourceEndpointInfo.profileId,
-            clusterId: zclFrame.Cluster.ID,
+            clusterId: zclFrame.cluster.ID,
             sourceEndpoint: sourceEndpointInfo.endpoint,
             destinationEndpoint: (typeof endpoint === 'number') ? endpoint : endpoints_1.FIXED_ENDPOINTS[0].endpoint,
-            options: this.defaultApsOptions,
+            options: DEFAULT_APS_OPTIONS,
             groupId: 0,
             sequence: 0, // set by stack
         };
@@ -2745,16 +2708,12 @@ class EmberAdapter extends __1.Adapter {
                         return enums_2.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
                     }
                 }
-                // track group changes in NCP multicast table
-                if (apsFrame.clusterId === cluster_1.default.genGroups.ID) {
-                    await this.onGroupChange(command.ID, zclFrame.Payload.groupid);
-                }
-                debug(`~~~> [ZCL to=${networkAddress} apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.Header)}]`);
+                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
                 0));
                 if (status !== enums_2.EmberStatus.SUCCESS) {
-                    console.error(`~x~> [ZCL to=${networkAddress}] Failed to send request with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`~x~> [ZCL to=${networkAddress}] Failed to send request with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status; // let queue handle retry based on status
                 }
                 if (commandResponseId != null) {
@@ -2762,7 +2721,8 @@ class EmberAdapter extends __1.Adapter {
                     const result = (await this.oneWaitress.startWaitingFor({
                         target: networkAddress,
                         apsFrame,
-                        zclSequence: zclFrame.Header.transactionSequenceNumber,
+                        zclSequence: zclFrame.header.transactionSequenceNumber,
+                        commandIdentifier: commandResponseId,
                     }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT));
                     resolve(result);
                 }
@@ -2779,10 +2739,10 @@ class EmberAdapter extends __1.Adapter {
             endpoints_1.FIXED_ENDPOINTS.find((epi) => (epi.endpoint === sourceEndpoint)) : endpoints_1.FIXED_ENDPOINTS[0];
         const apsFrame = {
             profileId: sourceEndpointInfo.profileId,
-            clusterId: zclFrame.Cluster.ID,
+            clusterId: zclFrame.cluster.ID,
             sourceEndpoint: sourceEndpointInfo.endpoint,
             destinationEndpoint: endpoints_1.FIXED_ENDPOINTS[0].endpoint,
-            options: this.defaultApsOptions,
+            options: DEFAULT_APS_OPTIONS,
             groupId: groupID,
             sequence: 0, // set by stack
         };
@@ -2796,13 +2756,13 @@ class EmberAdapter extends __1.Adapter {
                         return enums_2.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
                     }
                 }
-                debug(`~~~> [ZCL GROUP apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.Header)}]`);
+                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
                 apsFrame, data, 0, // alias
                 0));
                 if (status !== enums_2.EmberStatus.SUCCESS) {
-                    console.error(`~x~> [ZCL GROUP] Failed to send with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`~x~> [ZCL GROUP] Failed to send with status=${enums_2.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
@@ -2812,16 +2772,16 @@ class EmberAdapter extends __1.Adapter {
         });
     }
     // queued, non-InterPAN
-    async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint) {
+    async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint, destination) {
         const sourceEndpointInfo = typeof sourceEndpoint === 'number' ?
             endpoints_1.FIXED_ENDPOINTS.find((epi) => (epi.endpoint === sourceEndpoint)) : endpoints_1.FIXED_ENDPOINTS[0];
         const apsFrame = {
             profileId: sourceEndpointInfo.profileId,
-            clusterId: zclFrame.Cluster.ID,
+            clusterId: zclFrame.cluster.ID,
             sourceEndpoint: sourceEndpointInfo.endpoint,
             destinationEndpoint: (typeof endpoint === 'number') ? endpoint : endpoints_1.FIXED_ENDPOINTS[0].endpoint,
-            options: this.defaultApsOptions,
-            groupId: consts_2.EMBER_RX_ON_WHEN_IDLE_BROADCAST_ADDRESS,
+            options: DEFAULT_APS_OPTIONS,
+            groupId: destination,
             sequence: 0, // set by stack
         };
         const data = zclFrame.toBuffer();
@@ -2829,17 +2789,17 @@ 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, consts_2.EMBER_RX_ON_WHEN_IDLE_BROADCAST_ADDRESS, apsFrame));
+                    const maxPayloadLength = (await this.maximumApsPayloadLength(enums_2.EmberOutgoingMessageType.BROADCAST, destination, apsFrame));
                     if (data.length > maxPayloadLength) {
                         return enums_2.EmberStatus.MESSAGE_TOO_LONG; // queue will reject
                     }
                 }
-                debug(`~~~> [ZCL BROADCAST apsFrame=${JSON.stringify(apsFrame)} header=${JSON.stringify(zclFrame.Header)}]`);
+                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, consts_2.EMBER_RX_ON_WHEN_IDLE_BROADCAST_ADDRESS, apsFrame, data, 0, // alias
+                const [status, messageTag] = (await this.ezsp.send(enums_2.EmberOutgoingMessageType.BROADCAST, destination, apsFrame, data, 0, // alias
                 0));
                 if (status !== enums_2.EmberStatus.SUCCESS) {
-                    console.error(`~x~> [ZCL BROADCAST] Failed to send with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`~x~> [ZCL BROADCAST] Failed to send with status=${enums_2.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
@@ -2854,7 +2814,7 @@ class EmberAdapter extends __1.Adapter {
     // queued
     async setChannelInterPAN(channel) {
         if (typeof channel !== 'number') {
-            console.error(`Tried to set channel InterPAN to non-number. Channel ${channel} of type ${typeof channel}.`);
+            logger_1.logger.error(`Tried to set channel InterPAN to non-number. Channel ${channel} of type ${typeof channel}.`, NS);
             return;
         }
         return new Promise((resolve, reject) => {
@@ -2863,7 +2823,7 @@ class EmberAdapter extends __1.Adapter {
                 const status = (await this.ezsp.ezspSetLogicalAndRadioChannel(channel));
                 if (status !== enums_2.EmberStatus.SUCCESS) {
                     this.interpanLock = false; // XXX: ok?
-                    console.error(`Failed to set InterPAN channel to ${channel} with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`Failed to set InterPAN channel to ${channel} with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 resolve();
@@ -2887,12 +2847,12 @@ class EmberAdapter extends __1.Adapter {
                 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.writeUInt16(zclFrame.Cluster.ID);
+                msgBuffalo.writeUInt16(zclFrame.cluster.ID);
                 msgBuffalo.writeUInt16(consts_2.TOUCHLINK_PROFILE_ID);
-                debug(`~~~> [ZCL TOUCHLINK to=${ieeeAddress} header=${JSON.stringify(zclFrame.Header)}]`);
+                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) {
-                    console.error(`~x~> [ZCL TOUCHLINK to=${ieeeAddress}] Failed to send with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`~x~> [ZCL TOUCHLINK to=${ieeeAddress}] Failed to send with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 // NOTE: can use ezspRawTransmitCompleteHandler if needed here
@@ -2903,14 +2863,14 @@ class EmberAdapter extends __1.Adapter {
     }
     // queued
     async sendZclFrameInterPANBroadcast(zclFrame, timeout) {
-        const command = zclFrame.getCommand();
+        const command = zclFrame.command;
         if (!command.hasOwnProperty('response')) {
             throw new Error(`Command '${command.name}' has no response, cannot wait for response.`);
         }
         // just for waitress
         const apsFrame = {
             profileId: consts_2.TOUCHLINK_PROFILE_ID,
-            clusterId: zclFrame.Cluster.ID,
+            clusterId: zclFrame.cluster.ID,
             sourceEndpoint: 0,
             destinationEndpoint: 0,
             options: enums_2.EmberApsOption.NONE,
@@ -2934,17 +2894,18 @@ class EmberAdapter extends __1.Adapter {
                 msgBuffalo.writeUInt16(apsFrame.clusterId);
                 msgBuffalo.writeUInt16(apsFrame.profileId);
                 const data = Buffer.concat([msgBuffalo.getWritten(), zclFrame.toBuffer()]);
-                debug(`~~~> [ZCL TOUCHLINK BROADCAST header=${JSON.stringify(zclFrame.Header)}]`);
+                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) {
-                    console.error(`~x~> [ZCL TOUCHLINK BROADCAST] Failed to send with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`~x~> [ZCL TOUCHLINK BROADCAST] Failed to send with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 // NOTE: can use ezspRawTransmitCompleteHandler if needed here
                 const result = (await this.oneWaitress.startWaitingFor({
                     target: null,
                     apsFrame: apsFrame,
-                    zclSequence: zclFrame.Header.transactionSequenceNumber,
+                    zclSequence: zclFrame.header.transactionSequenceNumber,
+                    commandIdentifier: command.response,
                 }, timeout || DEFAULT_ZCL_REQUEST_TIMEOUT * 2)); // XXX: touchlink timeout?
                 resolve(result);
                 return enums_2.EmberStatus.SUCCESS;
@@ -2957,7 +2918,7 @@ class EmberAdapter extends __1.Adapter {
             this.requestQueue.enqueue(async () => {
                 const status = (await this.ezsp.ezspSetLogicalAndRadioChannel(this.networkOptions.channelList[0]));
                 if (status !== enums_2.EmberStatus.SUCCESS) {
-                    console.error(`Failed to restore InterPAN channel to ${this.networkOptions.channelList[0]} with status=${enums_2.EmberStatus[status]}.`);
+                    logger_1.logger.error(`Failed to restore InterPAN channel to ${this.networkOptions.channelList[0]} with status=${enums_2.EmberStatus[status]}.`, NS);
                     return status;
                 }
                 // let adapter settle down
@@ -2971,7 +2932,7 @@ class EmberAdapter extends __1.Adapter {
     //-- END Adapter implementation
     checkInterpanLock() {
         if (this.interpanLock) {
-            console.error(`[INTERPAN MODE] Cannot execute non-InterPAN commands.`);
+            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]);
         }